X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=sched.c;h=1db9169b38b511918cc711fc28dcb667e1242e5f;hp=13993b13be128e261e989cb3963cfc2e73a693b4;hb=eeeab4239843e716b3fd4dd259985a4cd4c487a5;hpb=57a04f35f4e97d5f63079620dab3493832a851af

diff --git a/sched.c b/sched.c
index 13993b13..1db9169b 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)
 {
@@ -67,7 +60,7 @@ static void sched_preselect(struct sched *s)
 		if (t->notification != 0)
 			sched_min_delay(s);
 		if (t->info.pre_select)
-			t->info.pre_select(s, t);
+			t->info.pre_select(s, t->info.context);
 	}
 }
 
@@ -85,13 +78,13 @@ static inline void call_post_select(struct sched *s, struct task *t)
 	int ret;
 
 #ifndef SCHED_DEBUG
-	ret = t->info.post_select(s, t);
+	ret = t->info.post_select(s, t->info.context);
 #else
 	struct timeval t1, t2, diff;
 	unsigned long pst;
 
 	clock_get_realtime(&t1);
-	ret = t->info.post_select(s, t);
+	ret = t->info.post_select(s, t->info.context);
 	clock_get_realtime(&t2);
 	tv_diff(&t1, &t2, &diff);
 	pst = tv2ms(&diff);
@@ -133,7 +126,7 @@ static unsigned sched_post_select(struct sched *s)
  * \return Zero if no more tasks are left in the task list, negative if the
  * select function returned an error.
  *
- * \sa \ref task, \ref now.
+ * \sa \ref now.
  */
 int schedule(struct sched *s)
 {
@@ -147,7 +140,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 +156,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;
@@ -262,19 +255,6 @@ struct task *task_register(struct task_info *info, struct sched *s)
 	return t;
 }
 
-/**
- * Obtain the context pointer of a task.
- *
- * \param t Return this task's context pointer.
- *
- * \return A pointer to the memory location specified previously as \a
- * task_info->context when the task was registered with \ref task_register().
- */
-void *task_context(struct task *t)
-{
-	return t->info.context;
-}
-
 /**
  * Get the list of all registered tasks.
  *