X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=sched.c;h=297348a16e0c3e85ea683dccf681c2ecbf278a4b;hp=f355c9750bc3ee2c426b2b5505073813973ce3cb;hb=8c3b190d0d80b5416e62b0c6383531bcdd777e6c;hpb=879e52d49df6d00aa9eafe5cccb48bbd24ed4c81

diff --git a/sched.c b/sched.c
index f355c975..297348a1 100644
--- a/sched.c
+++ b/sched.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2014 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -7,7 +7,6 @@
 /** \file sched.c Paraslash's scheduling functions. */
 
 #include <regex.h>
-#include <assert.h>
 
 #include "para.h"
 #include "ipc.h"
@@ -49,13 +48,7 @@ struct task {
 };
 
 static struct timeval now_struct;
-struct timeval *now = &now_struct;
-
-static inline bool timeout_is_zero(struct sched *s)
-{
-	struct timeval *tv = &s->select_timeout;
-	return tv->tv_sec == 0 && tv->tv_usec == 0;
-}
+const struct timeval *now = &now_struct;
 
 static void sched_preselect(struct sched *s)
 {
@@ -73,7 +66,10 @@ static void sched_preselect(struct sched *s)
 
 static void unlink_and_free_task(struct task *t)
 {
-	PARA_INFO_LOG("freeing task %s\n", t->name);
+	PARA_INFO_LOG("freeing task %s (%s)\n", t->name, t->status < 0?
+		para_strerror(-t->status) :
+		(t->status == TS_DEAD? "[dead]" : "[running]"));
+
 	list_del(&t->node);
 	free(t->name);
 	free(t);
@@ -147,7 +143,7 @@ again:
 	FD_ZERO(&s->wfds);
 	s->select_timeout = s->default_timeout;
 	s->max_fileno = -1;
-	clock_get_realtime(now);
+	clock_get_realtime(&now_struct);
 	sched_preselect(s);
 	ret = s->select_function(s->max_fileno + 1, &s->rfds, &s->wfds,
 		&s->select_timeout);
@@ -163,7 +159,7 @@ again:
 		FD_ZERO(&s->rfds);
 		FD_ZERO(&s->wfds);
 	}
-	clock_get_realtime(now);
+	clock_get_realtime(&now_struct);
 	num_running_tasks = sched_post_select(s);
 	if (num_running_tasks == 0)
 		return 0;
@@ -391,7 +387,7 @@ void sched_min_delay(struct sched *s)
  * function does nothing. Otherwise the timeout for the next select() call is
  * set to the given value.
  *
- * \sa sched_request_timeout_ms().
+ * \sa \ref sched_request_timeout_ms().
  */
 void sched_request_timeout(struct timeval *to, struct sched *s)
 {
@@ -424,7 +420,7 @@ void sched_request_timeout_ms(long unsigned ms, struct sched *s)
  * \return If \a barrier is in the past, this function does nothing and returns
  * zero. Otherwise it returns one.
  *
- * \sa sched_request_barrier_or_min_delay().
+ * \sa \ref sched_request_barrier_or_min_delay().
  */
 int sched_request_barrier(struct timeval *barrier, struct sched *s)
 {
@@ -445,7 +441,7 @@ int sched_request_barrier(struct timeval *barrier, struct sched *s)
  * \return If \a barrier is in the past, this function requests a minimal
  * timeout and returns zero. Otherwise it returns one.
  *
- * \sa sched_min_delay(), sched_request_barrier().
+ * \sa \ref sched_min_delay(), \ref sched_request_barrier().
  */
 int sched_request_barrier_or_min_delay(struct timeval *barrier, struct sched *s)
 {