From: Andre Date: Tue, 13 Jun 2006 04:26:45 +0000 (+0200) Subject: get rid of init_shed() X-Git-Tag: v0.2.14~62^2~9 X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=639a90049f74b4ce528376afe8ec8e84edf16208;p=paraslash.git get rid of init_shed() Instead, the first call to register_task initializes the scheduler. User-friendly. Also, make pre_select_list and post_select_list static. --- diff --git a/audiod.c b/audiod.c index 032f9cd0..52f4ff4c 100644 --- a/audiod.c +++ b/audiod.c @@ -1052,8 +1052,6 @@ int main(int argc, char *argv[]) struct command_task command_task_struct, *cmd_task = &command_task_struct; struct task audiod_task_struct, *audiod_task = &audiod_task_struct; - init_sched(); - valid_fd_012(); cmdline_parser(argc, argv, &conf); para_drop_privileges(conf.user_arg, conf.group_arg); diff --git a/client.c b/client.c index 97d52746..94fff72d 100644 --- a/client.c +++ b/client.c @@ -422,7 +422,6 @@ int main(int argc, char *argv[]) int ret; struct sched s; - init_sched(); s.default_timeout.tv_sec = 1; s.default_timeout.tv_usec = 0; ret = client_parse_config(argc, argv, &pcd); diff --git a/error.h b/error.h index 0c862a57..f6f916ae 100644 --- a/error.h +++ b/error.h @@ -114,6 +114,7 @@ extern const char **para_errlist[]; #define SCHED_ERRORS \ PARA_ERROR(TASK_KILLED, "task killed"), \ PARA_ERROR(NO_SUCH_TASK, "task not found"), \ + PARA_ERROR(NOT_INITIALIZED, "scheduler not yet initialized"), \ #define STDIN_ERRORS \ diff --git a/filter.c b/filter.c index 608bb8b3..f49042f8 100644 --- a/filter.c +++ b/filter.c @@ -140,7 +140,6 @@ int main(int argc, char *argv[]) int ret; struct sched s; - init_sched(); stdin_set_defaults(sit); sit->buf = para_malloc(sit->bufsize), diff --git a/recv.c b/recv.c index 8639ce2b..555b7c51 100644 --- a/recv.c +++ b/recv.c @@ -72,7 +72,6 @@ int main(int argc, char *argv[]) struct stdout_task sot; struct sched s; - init_sched(); s.default_timeout.tv_sec = 1; s.default_timeout.tv_usec = 0; diff --git a/sched.c b/sched.c index 6b893d33..c2a0e64b 100644 --- a/sched.c +++ b/sched.c @@ -27,16 +27,10 @@ #include "string.h" #include "error.h" -/** - * The scheduler 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. - */ -struct list_head pre_select_list, post_select_list; +static struct list_head pre_select_list, post_select_list; +static int initialized; static struct timeval now_struct; - struct timeval *now = &now_struct; static void sched_preselect(struct sched *s) @@ -83,7 +77,8 @@ static void sched_post_select(struct sched *s) */ int sched(struct sched *s) { - + if (!initialized) + return -E_NOT_INITIALIZED; gettimeofday(now, NULL); again: FD_ZERO(&s->rfds); @@ -102,6 +97,17 @@ again: goto again; } +/** + * initialize the paraslash scheduler + */ +static void init_sched(void) +{ + PARA_INFO_LOG("%s", "initializing scheduler\n"); + INIT_LIST_HEAD(&pre_select_list); + INIT_LIST_HEAD(&post_select_list); + initialized = 1; +}; + /** * add a task to the scheduler * @@ -114,6 +120,8 @@ again: */ void register_task(struct task *t) { + if (!initialized) + init_sched(); PARA_INFO_LOG("registering %s (%p)\n", t->status, t); if (t->pre_select) { PARA_DEBUG_LOG("pre_select: %p\n", &t->pre_select); @@ -135,6 +143,8 @@ void register_task(struct task *t) */ void unregister_task(struct task *t) { + if (!initialized) + return; PARA_INFO_LOG("unregistering %s (%p)\n", t->status, t); if (t->pre_select) list_del(&t->pre_select_node); @@ -142,15 +152,6 @@ void unregister_task(struct task *t) list_del(&t->post_select_node); }; -/** - * initialize the paraslash scheduler - */ -void init_sched(void) -{ - INIT_LIST_HEAD(&pre_select_list); - INIT_LIST_HEAD(&post_select_list); -}; - /** * unregister all tasks * @@ -161,11 +162,14 @@ void sched_shutdown(void) { struct task *t, *tmp; + if (!initialized) + return; list_for_each_entry_safe(t, tmp, &pre_select_list, pre_select_node) unregister_task(t); /* remove tasks which do not have a pre_select hook */ list_for_each_entry_safe(t, tmp, &post_select_list, post_select_node) unregister_task(t); + initialized = 0; }; /** @@ -181,6 +185,9 @@ char *get_task_list(void) { struct task *t, *tmp; char *msg = NULL; + + if (!initialized) + return NULL; list_for_each_entry_safe(t, tmp, &pre_select_list, pre_select_node) { char *tmp_msg; tmp_msg = make_message("%s%p\tpre\t%s\n", msg? msg : "", t, t->status); @@ -207,13 +214,16 @@ char *get_task_list(void) * Find the task identified by \a id, set the tasks' return value to * \p -E_TASK_KILLED and call the event handler of the task. * - * \return Positive on sucess, negative if \a id does not correspond to a - * registered task. + * \return Positive on success, negative on errors (e.g. if \a id does not + * correspond to a registered task). */ int kill_task(char *id) { struct task *t, *tmp; char buf[20]; + + if (!initialized) + return -E_NOT_INITIALIZED; list_for_each_entry_safe(t, tmp, &pre_select_list, pre_select_node) { sprintf(buf, "%p", t); if (strcmp(id, buf)) diff --git a/sched.h b/sched.h index ebd38a8c..bdca15f8 100644 --- a/sched.h +++ b/sched.h @@ -22,9 +22,11 @@ /** * paraslash's scheduler * - * desinged with KISS in mind. It maintains two lists: The pre_select list - * and the post_select list. Tasks add hokks to these lists by registering - * themselves to the scheduler. + * desinged 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 + * these lists by registering themselves to the scheduler. */ struct sched { /** initial value before any pre_select call */ @@ -94,6 +96,5 @@ extern struct timeval *now; void register_task(struct task *t); void unregister_task(struct task *t); int sched(struct sched *s); -void init_sched(void); char *get_task_list(void); int kill_task(char *id); diff --git a/write.c b/write.c index 56b4401a..66cdd7f0 100644 --- a/write.c +++ b/write.c @@ -214,7 +214,6 @@ int main(int argc, char *argv[]) cmdline_parser(argc, argv, &conf); init_supported_writers(); - init_sched(); wng = check_args(); if (!wng)