X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=sched.c;h=74f6a1b8a5effa6e13996771f4492fdee47d4bc0;hb=748d1368bc96dd7e1af879df1ea41b4d52842f7e;hp=2c49050cb6408085c02951b170d49d34d11169b2;hpb=c79899fe6a1e8eb3086749f46c599d9790d99921;p=paraslash.git diff --git a/sched.c b/sched.c index 2c49050c..74f6a1b8 100644 --- a/sched.c +++ b/sched.c @@ -1,71 +1,114 @@ /* - * Copyright (C) 2006-2007 Andre Noll + * Copyright (C) 2006-2012 Andre Noll * - * 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.c paraslash's scheduling functions */ +/** \file sched.c Paraslash's scheduling functions. */ +#include +#include #include + #include "para.h" #include "ipc.h" #include "fd.h" #include "list.h" #include "sched.h" #include "string.h" +#include "time.h" #include "error.h" -static struct list_head pre_select_list, post_select_list; -static int initialized; - static struct timeval now_struct; struct timeval *now = &now_struct; +/* + * Remove a task from the scheduler. + * + * \param t The task to remove. + * + * If the pre_select pointer of \a t is not \p NULL, it is removed from + * the pre_select list of the scheduler. Same goes for \a post_select. + */ +static void unregister_task(struct task *t) +{ + assert(t->error < 0); + PARA_INFO_LOG("unregistering %s (%s)\n", t->status, + para_strerror(-t->error)); + if (t->pre_select) + list_del(&t->pre_select_node); + if (t->post_select) + list_del(&t->post_select_node); +} + +static inline bool timeout_is_zero(struct sched *s) +{ + struct timeval *tv = &s->select_timeout; + return tv->tv_sec == 0 && tv->tv_usec == 0; +} + static void sched_preselect(struct sched *s) { struct task *t, *tmp; -again: - list_for_each_entry_safe(t, tmp, &pre_select_list, pre_select_node) { - t->pre_select(s, t); -// PARA_INFO_LOG("%s \n", t->status); - if (t->ret > 0) + list_for_each_entry_safe(t, tmp, &s->pre_select_list, pre_select_node) { + if (t->error < 0) { + unregister_task(t); continue; - if (!t->event_handler) + } + if (!t->pre_select) continue; - t->event_handler(t); - goto again; + t->pre_select(s, t); + if (timeout_is_zero(s)) + break; } } +//#define SCHED_DEBUG 1 +static inline void call_post_select(struct sched *s, struct task *t) +{ +#ifndef SCHED_DEBUG + t->post_select(s, t); +#else + struct timeval t1, t2, diff; + unsigned long pst; + + gettimeofday(&t1, NULL); + t->post_select(s, t); + gettimeofday(&t2, NULL); + tv_diff(&t1, &t2, &diff); + pst = tv2ms(&diff); + if (pst > 50) + PARA_WARNING_LOG("%s: post_select time: %lums\n", + t->status, pst); +#endif +} + static void sched_post_select(struct sched *s) { struct task *t, *tmp; - list_for_each_entry_safe(t, tmp, &post_select_list, post_select_node) { - t->post_select(s, t); + list_for_each_entry_safe(t, tmp, &s->post_select_list, post_select_node) { + if (t->error >= 0) + call_post_select(s, t); // PARA_INFO_LOG("%s: %d\n", t->status, t->ret); - if (t->ret > 0 || !t->event_handler) + if (t->error >= 0) continue; - t->event_handler(t); + /* + * We have to check whether the list is empty because the call + * to ->post_select() might have called sched_shutdown(). In + * this case t has been unregistered already, so we must not + * unregister it again. + */ + if (list_empty(&s->post_select_list)) + return; + unregister_task(t); } } /** - * the core function for all paraslash programs + * The core function for all paraslash programs. * - * \param s pointer to the scheduler struct + * \param s Pointer to the scheduler struct. * * This function updates the global \a now pointer, calls all registered * pre_select hooks which may set the timeout and add any file descriptors to @@ -77,126 +120,116 @@ static void sched_post_select(struct sched *s) * * \sa task, now. */ -int sched(struct sched *s) +int schedule(struct sched *s) { - if (!initialized) - return -E_NOT_INITIALIZED; - gettimeofday(now, NULL); + int ret; + + if (!s->select_function) + s->select_function = para_select; again: FD_ZERO(&s->rfds); FD_ZERO(&s->wfds); - s->timeout = s->default_timeout; + s->select_timeout = s->default_timeout; s->max_fileno = -1; - sched_preselect(s); - s->select_ret = para_select(s->max_fileno + 1, &s->rfds, - &s->wfds, &s->timeout); - if (s->select_ret < 0) - return s->select_ret; gettimeofday(now, NULL); + sched_preselect(s); + if (list_empty(&s->pre_select_list) && list_empty(&s->post_select_list)) + return 0; + if (!timeout_is_zero(s)) { + ret = s->select_function(s->max_fileno + 1, &s->rfds, &s->wfds, + &s->select_timeout); + if (ret < 0) + return ret; + if (ret == 0) { + /* + * APUE: Be careful not to check the descriptor sets on return + * unless the return value is greater than zero. The return + * state of the descriptor sets is implementation dependent if + * either a signal is caught or the timer expires. + */ + FD_ZERO(&s->rfds); + FD_ZERO(&s->wfds); + } + gettimeofday(now, NULL); + } else { + FD_ZERO(&s->rfds); + FD_ZERO(&s->wfds); + } sched_post_select(s); - if (list_empty(&pre_select_list) && list_empty(&post_select_list)) + if (list_empty(&s->pre_select_list) && list_empty(&s->post_select_list)) return 0; 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 + * Add a task to the scheduler. * - * \param t the task to add + * \param t The task to add. + * \param s The scheduler instance to add the task to. * * If the pre_select pointer of \a t is not \p NULL, it is added to * the pre_select list of the scheduler. Same goes for post_select. * * \sa task::pre_select, task::post_select */ -void register_task(struct task *t) +void register_task(struct sched *s, struct task *t) { - if (!initialized) - init_sched(); PARA_INFO_LOG("registering %s (%p)\n", t->status, t); + if (!s->pre_select_list.next) + INIT_LIST_HEAD(&s->pre_select_list); + if (!s->post_select_list.next) + INIT_LIST_HEAD(&s->post_select_list); if (t->pre_select) { PARA_DEBUG_LOG("pre_select: %p\n", &t->pre_select); - para_list_add(&t->pre_select_node, &pre_select_list); + list_add_tail(&t->pre_select_node, &s->pre_select_list); } if (t->post_select) { - PARA_DEBUG_LOG("post_select: %p\n", &t->pre_select); - para_list_add(&t->post_select_node, &post_select_list); + PARA_DEBUG_LOG("post_select: %p\n", &t->post_select); + list_add_tail(&t->post_select_node, &s->post_select_list); } } /** - * remove a task from the scheduler - * - * \param t the task to remove - * - * If the pre_select pointer of \a t is not \p NULL, it is removed from - * the pre_select list of the scheduler. Same goes for \a post_select. - */ -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); - if (t->post_select) - list_del(&t->post_select_node); -}; - -/** - * unregister all tasks + * Unregister all tasks. * - * This will cause \a sched() to return immediately because both the - * \a pre_select_list and the \a post_select_list are empty. + * This will cause \a schedule() to return immediately because both the + * \a pre_select_list and the \a post_select_list are empty. This function + * must be called from the post_select (rather than the pre_select) method. */ -void sched_shutdown(void) +void sched_shutdown(struct sched *s) { struct task *t, *tmp; - if (!initialized) - return; - list_for_each_entry_safe(t, tmp, &pre_select_list, pre_select_node) + list_for_each_entry_safe(t, tmp, &s->pre_select_list, pre_select_node) { + t->error = -E_SCHED_SHUTDOWN; 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) + } + list_for_each_entry_safe(t, tmp, &s->post_select_list, post_select_node) { + t->error = -E_SCHED_SHUTDOWN; unregister_task(t); - initialized = 0; -}; + } +} /** - * get the list of all registered tasks. + * Get the list of all registered tasks. * - * \return the task list + * \return The task list. * - * Each entry of the list contains an identifier which is simply a hex number - * that may be used in \a kill_task() to terminate the task. - * The result ist dynamically allocated and must be freed by the caller. + * Each entry of the list contains an identifier which is simply a hex number. + * The result is dynamically allocated and must be freed by the caller. */ -char *get_task_list(void) +char *get_task_list(struct sched *s) { struct task *t, *tmp; char *msg = NULL; - if (!initialized) - return NULL; - list_for_each_entry_safe(t, tmp, &pre_select_list, pre_select_node) { + list_for_each_entry_safe(t, tmp, &s->pre_select_list, pre_select_node) { char *tmp_msg; tmp_msg = make_message("%s%p\tpre\t%s\n", msg? msg : "", t, t->status); free(msg); msg = tmp_msg; } - list_for_each_entry_safe(t, tmp, &post_select_list, post_select_node) { + list_for_each_entry_safe(t, tmp, &s->post_select_list, post_select_node) { char *tmp_msg; // if (t->pre_select) // continue; @@ -209,40 +242,91 @@ char *get_task_list(void) } /** - * simulate an error for the given task + * Set the select timeout to the minimal possible value. * - * \param id the task identifier + * \param s Pointer to the scheduler struct. * - * 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. + * This causes the next select() call to return immediately. + */ +void sched_min_delay(struct sched *s) +{ + s->select_timeout.tv_sec = s->select_timeout.tv_usec = 0; +} + +/** + * Impose an upper bound for the timeout of the next select() call. + * + * \param to Maximal allowed timeout. + * \param s Pointer to the scheduler struct. + * + * If the current scheduler timeout is already smaller than \a to, this + * function does nothing. Otherwise the timeout for the next select() call is + * set to the given value. * - * \return Positive on success, negative on errors (e.g. if \a id does not - * correspond to a registered task). + * \sa sched_request_timeout_ms(). */ -int kill_task(char *id) +void sched_request_timeout(struct timeval *to, struct sched *s) { - struct task *t, *tmp; - char buf[20]; + if (tv_diff(&s->select_timeout, to, NULL) > 0) + s->select_timeout = *to; +} - 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)) - continue; - t->ret = -E_TASK_KILLED; - if (t->event_handler) - t->event_handler(t); - return 1; - } - list_for_each_entry_safe(t, tmp, &post_select_list, post_select_node) { - sprintf(buf, "%p", t); - if (strcmp(id, buf)) - continue; - t->ret = -E_TASK_KILLED; - if (t->event_handler) - t->event_handler(t); - return 1; +/** + * Force the next select() call to return before the given amount of milliseconds. + * + * \param ms The maximal allowed timeout in milliseconds. + * \param s Pointer to the scheduler struct. + * + * Like sched_request_timeout() this imposes an upper bound on the timeout + * value for the next select() call. + */ +void sched_request_timeout_ms(long unsigned ms, struct sched *s) +{ + struct timeval tv; + ms2tv(ms, &tv); + sched_request_timeout(&tv, s); +} + +/** + * Force the next select() call to return before the given future time. + * + * \param barrier Absolute time before select() should return. + * \param s Pointer to the scheduler struct. + * + * \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(). + */ +int sched_request_barrier(struct timeval *barrier, struct sched *s) +{ + struct timeval diff; + + if (tv_diff(now, barrier, &diff) > 0) + return 0; + sched_request_timeout(&diff, s); + return 1; +} + +/** + * Force the next select() call to return before the given time. + * + * \param barrier Absolute time before select() should return. + * \param s Pointer to the scheduler struct. + * + * \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(). + */ +int sched_request_barrier_or_min_delay(struct timeval *barrier, struct sched *s) +{ + struct timeval diff; + + if (tv_diff(now, barrier, &diff) > 0) { + sched_min_delay(s); + return 0; } - return -E_NO_SUCH_TASK; + sched_request_timeout(&diff, s); + return 1; }