X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=sched.h;h=36d0769beac802d118a8e9db668cb1d2196a0fbc;hb=335730538150250f32c0df0b184fb494e2bb0df3;hp=bdca15f828cb60c177b7d8fb0cb497c1eb99b375;hpb=27638103f249ffbe9768603b9baff199950fd9f6;p=paraslash.git

diff --git a/sched.h b/sched.h
index bdca15f8..36d0769b 100644
--- a/sched.h
+++ b/sched.h
@@ -1,19 +1,7 @@
 /*
  * Copyright (C) 2006 Andre Noll <maan@systemlinux.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file sched.h sched and task structures and exported symbols from sched.c */
@@ -22,7 +10,7 @@
 /**
  * paraslash's scheduler
  *
- * desinged with KISS in mind. It manages two lists of tasks.  The pre_select
+ * Designed with KISS in mind. It manages two lists of tasks.  The pre_select
  * list contains pointers to functions that are called before calling select()
  * from the main loop. Similarly, \a post_select_list is a list of function
  * pointers each of which is called after the select call. Tasks add hooks to
@@ -39,8 +27,6 @@ struct sched {
 	fd_set wfds;
 	/** highest numbered file descriptor in any of the above fd sets */
 	int max_fileno;
-	/** the return value of the previous select call */
-	int select_ret;
 };
 
 /**
@@ -51,20 +37,18 @@ struct sched {
  *
  * If one of these functions return a negative value via \a t->ret the
  * (optional) event_handler gets called (it may also be called in case another
- * event happend). In many cases the only possible event is an error or an eof
+ * event happened). In many cases the only possible event is an error or an eof
  * condition and the event handler simply unregisters the task from the
  * scheduler.
  *
  * \sa struct sched
  */
 struct task {
-	/** pointer to the struct this task is embedded in */
-	void *private_data;
 	/**
 	 * the pre select hook of \a t
 	 *
 	 * Its purpose is to add file descriptors to the fd sets of the
-	 * scheduler and to decrease the select timeout if neccessary.
+	 * scheduler and to decrease the select timeout if necessary.
 	 */
 	void (*pre_select)(struct sched *s, struct task *t);
 	/**
@@ -73,10 +57,8 @@ struct task {
 	 * evaluate and act upon the results of the previous select call.
 	 */
 	void (*post_select)(struct sched *s, struct task *t);
-	/** gets called if pre_select or post_select returned an error */
-	void (*event_handler)(struct task *t);
-	/** pre_select() and post_select store their return value here */
-	int ret;
+	/** Whether this task is in error state. */
+	int error;
 	/** position of the task in the pre_select list of the scheduler */
 	struct list_head pre_select_node;
 	/** position of the task in the post_select list of the scheduler */
@@ -95,6 +77,6 @@ extern struct timeval *now;
 
 void register_task(struct task *t);
 void unregister_task(struct task *t);
-int sched(struct sched *s);
+int schedule(struct sched *s);
 char *get_task_list(void);
 int kill_task(char *id);