X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=sched.c;h=8deb7f383596162e97444c7766f6d15bc60eb92c;hb=fdd8a22e1df57a8c9254e7d0074301e7dde2c557;hp=297348a16e0c3e85ea683dccf681c2ecbf278a4b;hpb=9d24300965cbcdfddb9f63b6bc8018da50d7d8e1;p=paraslash.git

diff --git a/sched.c b/sched.c
index 297348a1..8deb7f38 100644
--- a/sched.c
+++ b/sched.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file sched.c Paraslash's scheduling functions. */
 
@@ -141,12 +137,12 @@ int schedule(struct sched *s)
 again:
 	FD_ZERO(&s->rfds);
 	FD_ZERO(&s->wfds);
-	s->select_timeout = s->default_timeout;
+	s->timeout = s->default_timeout;
 	s->max_fileno = -1;
 	clock_get_realtime(&now_struct);
 	sched_preselect(s);
 	ret = s->select_function(s->max_fileno + 1, &s->rfds, &s->wfds,
-		&s->select_timeout);
+		s->timeout);
 	if (ret < 0)
 		return ret;
 	if (ret == 0) {
@@ -172,7 +168,7 @@ again:
  * \param tptr Identifies the task to reap.
  *
  * This function is similar to wait(2) in that it returns information about a
- * terminated task and allows to release the resources associated with the
+ * terminated task which allows releasing the resources associated with the
  * task. Until this function is called, the terminated task remains in a zombie
  * state.
  *
@@ -248,7 +244,7 @@ struct task *task_register(struct task_info *info, struct sched *s)
 	assert(info->post_select);
 
 	if (!s->task_list.next)
-		INIT_LIST_HEAD(&s->task_list);
+		init_list_head(&s->task_list);
 
 	t->info = *info;
 	t->name = para_strdup(info->name);
@@ -374,7 +370,7 @@ void task_notify_all(struct sched *s, int err)
  */
 void sched_min_delay(struct sched *s)
 {
-	s->select_timeout.tv_sec = s->select_timeout.tv_usec = 0;
+	s->timeout = 0;
 }
 
 /**
@@ -391,8 +387,9 @@ void sched_min_delay(struct sched *s)
  */
 void sched_request_timeout(struct timeval *to, struct sched *s)
 {
-	if (tv_diff(&s->select_timeout, to, NULL) > 0)
-		s->select_timeout = *to;
+	long unsigned ms = tv2ms(to);
+	if (s->timeout > ms)
+		s->timeout = ms;
 }
 
 /**