X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Ftimed_thread.c;h=ee4346dcdca5a7369c947f7c9d2837fe65e5945a;hb=dc55c7d0a90b79105cd9b20cb86af94a20a2daab;hp=8226d465e366cda7bd0d335b58fa4926c9bac528;hpb=e80ec4cc5f68fd07cb25792017ea3fa3c78c398b;p=monky

diff --git a/src/timed_thread.c b/src/timed_thread.c
index 8226d46..ee4346d 100644
--- a/src/timed_thread.c
+++ b/src/timed_thread.c
@@ -1,6 +1,7 @@
-/* $Id$ */
-
-/* timed_thread.c: Abstraction layer for timed threads
+/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*-
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
+ * timed_thread.c: Abstraction layer for timed threads
  *
  * Copyright (C) 2006-2007 Philip Kovacs pkovacs@users.sourceforge.net
  *
@@ -17,7 +18,9 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
- * USA. */
+ * USA.
+ *
+ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -49,6 +52,7 @@ struct _timed_thread {
 	struct timespec interval_time;	/* interval_usecs as a struct timespec */
 	struct timespec wait_time;		/* absolute future time next timed_thread_test will wait until */
 	int pipefd[2];
+	int die;
 };
 
 /* linked list of created threads */
@@ -158,6 +162,7 @@ void timed_thread_destroy(timed_thread *p_timed_thread,
 	/* signal thread to stop */
 	pthread_mutex_lock(&p_timed_thread->runnable_mutex);
 	pthread_cond_signal(&p_timed_thread->runnable_cond);
+	p_timed_thread->die = 1;
 	pthread_mutex_unlock(&p_timed_thread->runnable_mutex);
 	write(p_timed_thread->pipefd[1], "die", 3);
 
@@ -197,7 +202,7 @@ int timed_thread_unlock(timed_thread *p_timed_thread)
 /* thread waits interval_usecs for runnable_cond to be signaled.
  * returns 1 if signaled, -1 on error, and 0 otherwise.
  * caller should call timed_thread_exit() on any non-zero return value. */
-int timed_thread_test(timed_thread *p_timed_thread)
+int timed_thread_test(timed_thread *p_timed_thread, int override_wait_time)
 {
 	struct timespec now_time;
 	int rc;
@@ -211,6 +216,15 @@ int timed_thread_test(timed_thread *p_timed_thread)
 		return -1;
 	}
 
+	if (p_timed_thread->die) {
+		/* if we were kindly asked to die, then die */
+		return 1;
+	}
+
+	if (override_wait_time && now(&p_timed_thread->wait_time)) {
+		return -1;
+	}
+
 	/* release mutex and wait until future time for runnable_cond to signal */
 	rc = pthread_cond_timedwait(&p_timed_thread->runnable_cond,
 			&p_timed_thread->runnable_mutex, &p_timed_thread->wait_time);