X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Futil%2Fscheduler.c;h=409a0942f553acfe3fab620e13f8693228f60df1;hb=263e1a188460cc89c1341422a7338aaf0645b190;hp=2a9623428a33a84ef9c5ced0150386c1ec2f0988;hpb=6e03d509075d2cd38fabab6568b4c2bf2451505e;p=oweals%2Fgnunet.git diff --git a/src/util/scheduler.c b/src/util/scheduler.c index 2a9623428..409a0942f 100644 --- a/src/util/scheduler.c +++ b/src/util/scheduler.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet - (C) 2009-2013 Christian Grothoff (and other contributing authors) + Copyright (C) 2009-2016 GNUnet e.V. GNUnet is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -14,8 +14,8 @@ You should have received a copy of the GNU General Public License along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ /** @@ -71,19 +71,24 @@ /** - * Linked list of pending tasks. + * Entry in list of pending tasks. */ -struct Task +struct GNUNET_SCHEDULER_Task { /** * This is a linked list. */ - struct Task *next; + struct GNUNET_SCHEDULER_Task *next; + + /** + * This is a linked list. + */ + struct GNUNET_SCHEDULER_Task *prev; /** * Function to run when ready. */ - GNUNET_SCHEDULER_Task callback; + GNUNET_SCHEDULER_TaskCallback callback; /** * Closure for the @e callback. @@ -105,14 +110,9 @@ struct Task */ struct GNUNET_NETWORK_FDSet *write_set; - /** - * Unique task identifier. - */ - GNUNET_SCHEDULER_TaskIdentifier id; - /** * Absolute timeout value for the task, or - * GNUNET_TIME_UNIT_FOREVER_ABS for "no timeout". + * #GNUNET_TIME_UNIT_FOREVER_ABS for "no timeout". */ struct GNUNET_TIME_Absolute timeout; @@ -151,6 +151,16 @@ struct Task */ int lifeness; + /** + * Is this task run on shutdown? + */ + int on_shutdown; + + /** + * Is this task in the ready list? + */ + int in_ready_list; + #if EXECINFO /** * Array of strings which make up a backtrace from the point when this @@ -169,9 +179,24 @@ struct Task /** - * List of tasks waiting for an event. + * Head of list of tasks waiting for an event. + */ +static struct GNUNET_SCHEDULER_Task *pending_head; + +/** + * Tail of list of tasks waiting for an event. + */ +static struct GNUNET_SCHEDULER_Task *pending_tail; + +/** + * Head of list of tasks waiting for shutdown. + */ +static struct GNUNET_SCHEDULER_Task *shutdown_head; + +/** + * Tail of list of tasks waiting for shutdown. */ -static struct Task *pending; +static struct GNUNET_SCHEDULER_Task *shutdown_tail; /** * List of tasks waiting ONLY for a timeout event. @@ -180,31 +205,37 @@ static struct Task *pending; * building select sets (we just look at the head * to determine the respective timeout ONCE). */ -static struct Task *pending_timeout; +static struct GNUNET_SCHEDULER_Task *pending_timeout_head; + +/** + * List of tasks waiting ONLY for a timeout event. + * Sorted by timeout (earliest first). Used so that + * we do not traverse the list of these tasks when + * building select sets (we just look at the head + * to determine the respective timeout ONCE). + */ +static struct GNUNET_SCHEDULER_Task *pending_timeout_tail; /** * Last inserted task waiting ONLY for a timeout event. * Used to (heuristically) speed up insertion. */ -static struct Task *pending_timeout_last; +static struct GNUNET_SCHEDULER_Task *pending_timeout_last; /** * ID of the task that is running right now. */ -static struct Task *active_task; +static struct GNUNET_SCHEDULER_Task *active_task; /** - * List of tasks ready to run right now, - * grouped by importance. + * Head of list of tasks ready to run right now, grouped by importance. */ -static struct Task *ready[GNUNET_SCHEDULER_PRIORITY_COUNT]; +static struct GNUNET_SCHEDULER_Task *ready_head[GNUNET_SCHEDULER_PRIORITY_COUNT]; /** - * Identity of the last task queued. Incremented for each task to - * generate a unique task ID (it is virtually impossible to start - * more than 2^64 tasks during the lifetime of a process). + * Tail of list of tasks ready to run right now, grouped by importance. */ -static GNUNET_SCHEDULER_TaskIdentifier last_id; +static struct GNUNET_SCHEDULER_Task *ready_tail[GNUNET_SCHEDULER_PRIORITY_COUNT]; /** * Number of tasks on the ready list. @@ -240,10 +271,16 @@ static int current_lifeness; static GNUNET_SCHEDULER_select scheduler_select; /** - * Closure for 'scheduler_select'. + * Task context of the current task. + */ +static struct GNUNET_SCHEDULER_TaskContext tc; + +/** + * Closure for #scheduler_select. */ static void *scheduler_select_cls; + /** * Sets the select function to use in the scheduler (scheduler_select). * @@ -284,25 +321,25 @@ check_priority (enum GNUNET_SCHEDULER_Priority p) * @param timeout next timeout (updated) */ static void -update_sets (struct GNUNET_NETWORK_FDSet *rs, struct GNUNET_NETWORK_FDSet *ws, +update_sets (struct GNUNET_NETWORK_FDSet *rs, + struct GNUNET_NETWORK_FDSet *ws, struct GNUNET_TIME_Relative *timeout) { - struct Task *pos; + struct GNUNET_SCHEDULER_Task *pos; struct GNUNET_TIME_Absolute now; struct GNUNET_TIME_Relative to; now = GNUNET_TIME_absolute_get (); - pos = pending_timeout; + pos = pending_timeout_head; if (NULL != pos) { to = GNUNET_TIME_absolute_get_difference (now, pos->timeout); if (timeout->rel_value_us > to.rel_value_us) *timeout = to; - if (pos->reason != 0) + if (0 != pos->reason) *timeout = GNUNET_TIME_UNIT_ZERO; } - pos = pending; - while (NULL != pos) + for (pos = pending_head; NULL != pos; pos = pos->next) { if (pos->timeout.abs_value_us != GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us) { @@ -320,7 +357,6 @@ update_sets (struct GNUNET_NETWORK_FDSet *rs, struct GNUNET_NETWORK_FDSet *ws, GNUNET_NETWORK_fdset_add (ws, pos->write_set); if (0 != pos->reason) *timeout = GNUNET_TIME_UNIT_ZERO; - pos = pos->next; } } @@ -328,11 +364,11 @@ update_sets (struct GNUNET_NETWORK_FDSet *rs, struct GNUNET_NETWORK_FDSet *ws, /** * Check if the ready set overlaps with the set we want to have ready. * If so, update the want set (set all FDs that are ready). If not, - * return GNUNET_NO. + * return #GNUNET_NO. * * @param ready set that is ready * @param want set that we want to be ready - * @return GNUNET_YES if there was some overlap + * @return #GNUNET_YES if there was some overlap */ static int set_overlaps (const struct GNUNET_NETWORK_FDSet *ready, @@ -362,7 +398,8 @@ set_overlaps (const struct GNUNET_NETWORK_FDSet *ready, * @return #GNUNET_YES if we can run it, #GNUNET_NO if not. */ static int -is_ready (struct Task *task, struct GNUNET_TIME_Absolute now, +is_ready (struct GNUNET_SCHEDULER_Task *task, + struct GNUNET_TIME_Absolute now, const struct GNUNET_NETWORK_FDSet *rs, const struct GNUNET_NETWORK_FDSet *ws) { @@ -395,14 +432,14 @@ is_ready (struct Task *task, struct GNUNET_TIME_Absolute now, * @param task task ready for execution */ static void -queue_ready_task (struct Task *task) +queue_ready_task (struct GNUNET_SCHEDULER_Task *task) { - enum GNUNET_SCHEDULER_Priority p = task->priority; + enum GNUNET_SCHEDULER_Priority p = check_priority (task->priority); - if (0 != (task->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) - p = GNUNET_SCHEDULER_PRIORITY_SHUTDOWN; - task->next = ready[check_priority (p)]; - ready[check_priority (p)] = task; + GNUNET_CONTAINER_DLL_insert (ready_head[p], + ready_tail[p], + task); + task->in_ready_list = GNUNET_YES; ready_count++; } @@ -418,92 +455,58 @@ static void check_ready (const struct GNUNET_NETWORK_FDSet *rs, const struct GNUNET_NETWORK_FDSet *ws) { - struct Task *pos; - struct Task *prev; - struct Task *next; + struct GNUNET_SCHEDULER_Task *pos; + struct GNUNET_SCHEDULER_Task *next; struct GNUNET_TIME_Absolute now; now = GNUNET_TIME_absolute_get (); - prev = NULL; - pos = pending_timeout; - while (NULL != pos) + while (NULL != (pos = pending_timeout_head)) { - next = pos->next; if (now.abs_value_us >= pos->timeout.abs_value_us) pos->reason |= GNUNET_SCHEDULER_REASON_TIMEOUT; if (0 == pos->reason) break; - pending_timeout = next; + GNUNET_CONTAINER_DLL_remove (pending_timeout_head, + pending_timeout_tail, + pos); if (pending_timeout_last == pos) pending_timeout_last = NULL; queue_ready_task (pos); - pos = next; } - pos = pending; + pos = pending_head; while (NULL != pos) { - LOG (GNUNET_ERROR_TYPE_DEBUG, - "Checking readiness of task: %llu / %p\n", - pos->id, pos->callback_cls); next = pos->next; if (GNUNET_YES == is_ready (pos, now, rs, ws)) { - if (NULL == prev) - pending = next; - else - prev->next = next; + GNUNET_CONTAINER_DLL_remove (pending_head, + pending_tail, + pos); queue_ready_task (pos); - pos = next; - continue; } - prev = pos; pos = next; } } /** - * Request the shutdown of a scheduler. Marks all currently - * pending tasks as ready because of shutdown. This will - * cause all tasks to run (as soon as possible, respecting - * priorities and prerequisite tasks). Note that tasks - * scheduled AFTER this call may still be delayed arbitrarily. + * Request the shutdown of a scheduler. Marks all tasks + * awaiting shutdown as ready. Note that tasks + * scheduled with #GNUNET_SCHEDULER_add_shutdown() AFTER this call + * will be delayed until the next shutdown signal. */ void GNUNET_SCHEDULER_shutdown () { - struct Task *pos; - int i; + struct GNUNET_SCHEDULER_Task *pos; - pos = pending_timeout; - while (NULL != pos) - { - pos->reason |= GNUNET_SCHEDULER_REASON_SHUTDOWN; - /* we don't move the task into the ready queue yet; check_ready - * will do that later, possibly adding additional - * readiness-factors */ - pos = pos->next; - } - pos = pending; - while (NULL != pos) + while (NULL != (pos = shutdown_head)) { + GNUNET_CONTAINER_DLL_remove (shutdown_head, + shutdown_tail, + pos); pos->reason |= GNUNET_SCHEDULER_REASON_SHUTDOWN; - /* we don't move the task into the ready queue yet; check_ready - * will do that later, possibly adding additional - * readiness-factors */ - pos = pos->next; - } - for (i = 0; i < GNUNET_SCHEDULER_PRIORITY_COUNT; i++) - { - pos = ready[i]; - while (NULL != pos) - { - pos->reason |= GNUNET_SCHEDULER_REASON_SHUTDOWN; - /* we don't move the task into the ready queue yet; check_ready - * will do that later, possibly adding additional - * readiness-factors */ - pos = pos->next; - } + queue_ready_task (pos); } } @@ -514,7 +517,7 @@ GNUNET_SCHEDULER_shutdown () * @param t task to destroy */ static void -destroy_task (struct Task *t) +destroy_task (struct GNUNET_SCHEDULER_Task *t) { if (NULL != t->read_set) GNUNET_NETWORK_fdset_destroy (t->read_set); @@ -527,6 +530,27 @@ destroy_task (struct Task *t) } +/** + * Output stack trace of task @a t. + * + * @param t task to dump stack trace of + */ +static void +dump_backtrace (struct GNUNET_SCHEDULER_Task *t) +{ +#if EXECINFO + unsigned int i; + + for (i = 0; i < t->num_backtrace_strings; i++) + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Task %p trace %u: %s\n", + t, + i, + t->backtrace_strings[i]); +#endif +} + + /** * Run at least one task in the highest-priority queue that is not * empty. Keep running tasks until we are either no longer running @@ -542,25 +566,26 @@ run_ready (struct GNUNET_NETWORK_FDSet *rs, struct GNUNET_NETWORK_FDSet *ws) { enum GNUNET_SCHEDULER_Priority p; - struct Task *pos; - struct GNUNET_SCHEDULER_TaskContext tc; + struct GNUNET_SCHEDULER_Task *pos; max_priority_added = GNUNET_SCHEDULER_PRIORITY_KEEP; do { if (0 == ready_count) return; - GNUNET_assert (ready[GNUNET_SCHEDULER_PRIORITY_KEEP] == NULL); + GNUNET_assert (NULL == ready_head[GNUNET_SCHEDULER_PRIORITY_KEEP]); /* yes, p>0 is correct, 0 is "KEEP" which should * always be an empty queue (see assertion)! */ for (p = GNUNET_SCHEDULER_PRIORITY_COUNT - 1; p > 0; p--) { - pos = ready[p]; + pos = ready_head[p]; if (NULL != pos) break; } GNUNET_assert (NULL != pos); /* ready_count wrong? */ - ready[p] = pos->next; + GNUNET_CONTAINER_DLL_remove (ready_head[p], + ready_tail[p], + pos); ready_count--; current_priority = pos->priority; current_lifeness = pos->lifeness; @@ -570,46 +595,38 @@ run_ready (struct GNUNET_NETWORK_FDSet *rs, DELAY_THRESHOLD.rel_value_us) { LOG (GNUNET_ERROR_TYPE_DEBUG, - "Task %llu took %s to be scheduled\n", - (unsigned long long) pos->id, + "Task %p took %s to be scheduled\n", + pos, GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_duration (pos->start_time), GNUNET_YES)); } #endif tc.reason = pos->reason; - tc.read_ready = (pos->read_set == NULL) ? rs : pos->read_set; - if ((pos->read_fd != -1) && + tc.read_ready = (NULL == pos->read_set) ? rs : pos->read_set; + if ((-1 != pos->read_fd) && (0 != (pos->reason & GNUNET_SCHEDULER_REASON_READ_READY))) GNUNET_NETWORK_fdset_set_native (rs, pos->read_fd); - tc.write_ready = (pos->write_set == NULL) ? ws : pos->write_set; - if ((pos->write_fd != -1) && + tc.write_ready = (NULL == pos->write_set) ? ws : pos->write_set; + if ((-1 != pos->write_fd) && (0 != (pos->reason & GNUNET_SCHEDULER_REASON_WRITE_READY))) GNUNET_NETWORK_fdset_set_native (ws, pos->write_fd); - if (((tc.reason & GNUNET_SCHEDULER_REASON_WRITE_READY) != 0) && - (pos->write_fd != -1) && + if ((0 != (tc.reason & GNUNET_SCHEDULER_REASON_WRITE_READY)) && + (-1 != pos->write_fd) && (!GNUNET_NETWORK_fdset_test_native (ws, pos->write_fd))) - GNUNET_abort (); // added to ready in previous select loop! + GNUNET_assert (0); // added to ready in previous select loop! LOG (GNUNET_ERROR_TYPE_DEBUG, - "Running task: %llu / %p\n", pos->id, - pos->callback_cls); - pos->callback (pos->callback_cls, &tc); -#if EXECINFO - int i; - - for (i = 0; i < pos->num_backtrace_strings; i++) - LOG (GNUNET_ERROR_TYPE_ERROR, - "Task %llu trace %d: %s\n", - pos->id, - i, - pos->backtrace_strings[i]); -#endif + "Running task: %p\n", + pos); + pos->callback (pos->callback_cls); + dump_backtrace (pos); active_task = NULL; destroy_task (pos); tasks_run++; } - while ((NULL == pending) || (p >= max_priority_added)); + while ((NULL == pending_head) || (p >= max_priority_added)); } + /** * Pipe used to communicate shutdown via signal. */ @@ -671,7 +688,7 @@ sighandler_shutdown () /** - * Check if the system is still life. Trigger shutdown if we + * Check if the system is still alive. Trigger shutdown if we * have tasks, but none of them give us lifeness. * * @return #GNUNET_OK to continue the main loop, @@ -680,17 +697,20 @@ sighandler_shutdown () static int check_lifeness () { - struct Task *t; + struct GNUNET_SCHEDULER_Task *t; if (ready_count > 0) return GNUNET_OK; - for (t = pending; NULL != t; t = t->next) + for (t = pending_head; NULL != t; t = t->next) if (t->lifeness == GNUNET_YES) return GNUNET_OK; - for (t = pending_timeout; NULL != t; t = t->next) + for (t = shutdown_head; NULL != t; t = t->next) if (t->lifeness == GNUNET_YES) return GNUNET_OK; - if ((NULL != pending) || (NULL != pending_timeout)) + for (t = pending_timeout_head; NULL != t; t = t->next) + if (t->lifeness == GNUNET_YES) + return GNUNET_OK; + if (NULL != shutdown_head) { GNUNET_SCHEDULER_shutdown (); return GNUNET_OK; @@ -714,7 +734,8 @@ check_lifeness () * @param task_cls closure of @a task */ void -GNUNET_SCHEDULER_run (GNUNET_SCHEDULER_Task task, void *task_cls) +GNUNET_SCHEDULER_run (GNUNET_SCHEDULER_TaskCallback task, + void *task_cls) { struct GNUNET_NETWORK_FDSet *rs; struct GNUNET_NETWORK_FDSet *ws; @@ -740,27 +761,39 @@ GNUNET_SCHEDULER_run (GNUNET_SCHEDULER_Task task, void *task_cls) rs = GNUNET_NETWORK_fdset_create (); ws = GNUNET_NETWORK_fdset_create (); GNUNET_assert (NULL == shutdown_pipe_handle); - shutdown_pipe_handle = GNUNET_DISK_pipe (GNUNET_NO, GNUNET_NO, GNUNET_NO, GNUNET_NO); + shutdown_pipe_handle = GNUNET_DISK_pipe (GNUNET_NO, + GNUNET_NO, + GNUNET_NO, + GNUNET_NO); GNUNET_assert (NULL != shutdown_pipe_handle); pr = GNUNET_DISK_pipe_handle (shutdown_pipe_handle, GNUNET_DISK_PIPE_END_READ); - GNUNET_assert (pr != NULL); + GNUNET_assert (NULL != pr); my_pid = getpid (); - LOG (GNUNET_ERROR_TYPE_DEBUG, "Registering signal handlers\n"); - shc_int = GNUNET_SIGNAL_handler_install (SIGINT, &sighandler_shutdown); - shc_term = GNUNET_SIGNAL_handler_install (SIGTERM, &sighandler_shutdown); + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Registering signal handlers\n"); + shc_int = GNUNET_SIGNAL_handler_install (SIGINT, + &sighandler_shutdown); + shc_term = GNUNET_SIGNAL_handler_install (SIGTERM, + &sighandler_shutdown); #if (SIGTERM != GNUNET_TERM_SIG) - shc_gterm = GNUNET_SIGNAL_handler_install (GNUNET_TERM_SIG, &sighandler_shutdown); + shc_gterm = GNUNET_SIGNAL_handler_install (GNUNET_TERM_SIG, + &sighandler_shutdown); #endif #ifndef MINGW - shc_pipe = GNUNET_SIGNAL_handler_install (SIGPIPE, &sighandler_pipe); - shc_quit = GNUNET_SIGNAL_handler_install (SIGQUIT, &sighandler_shutdown); - shc_hup = GNUNET_SIGNAL_handler_install (SIGHUP, &sighandler_shutdown); + shc_pipe = GNUNET_SIGNAL_handler_install (SIGPIPE, + &sighandler_pipe); + shc_quit = GNUNET_SIGNAL_handler_install (SIGQUIT, + &sighandler_shutdown); + shc_hup = GNUNET_SIGNAL_handler_install (SIGHUP, + &sighandler_shutdown); #endif current_priority = GNUNET_SCHEDULER_PRIORITY_DEFAULT; current_lifeness = GNUNET_YES; - GNUNET_SCHEDULER_add_continuation (task, task_cls, - GNUNET_SCHEDULER_REASON_STARTUP); + GNUNET_SCHEDULER_add_with_reason_and_priority (task, + task_cls, + GNUNET_SCHEDULER_REASON_STARTUP, + GNUNET_SCHEDULER_PRIORITY_DEFAULT); active_task = (void *) (long) -1; /* force passing of sanity check */ GNUNET_SCHEDULER_add_now_with_lifeness (GNUNET_NO, &GNUNET_OS_install_parent_control_handler, @@ -781,9 +814,16 @@ GNUNET_SCHEDULER_run (GNUNET_SCHEDULER_Task task, void *task_cls) timeout = GNUNET_TIME_UNIT_ZERO; } if (NULL == scheduler_select) - ret = GNUNET_NETWORK_socket_select (rs, ws, NULL, timeout); + ret = GNUNET_NETWORK_socket_select (rs, + ws, + NULL, + timeout); else - ret = scheduler_select (scheduler_select_cls, rs, ws, NULL, timeout); + ret = scheduler_select (scheduler_select_cls, + rs, + ws, + NULL, + timeout); if (ret == GNUNET_SYSERR) { if (errno == EINTR) @@ -802,15 +842,45 @@ GNUNET_SCHEDULER_run (GNUNET_SCHEDULER_Task task, void *task_cls) "system"); #endif #endif - GNUNET_abort (); +#if DEBUG_FDS + struct GNUNET_SCHEDULER_Task *t; + + for (t = pending_head; NULL != t; t = t->next) + { + if (-1 != t->read_fd) + { + int flags = fcntl (t->read_fd, F_GETFD); + if ((flags == -1) && (errno == EBADF)) + { + LOG (GNUNET_ERROR_TYPE_ERROR, + "Got invalid file descriptor %d!\n", + t->read_fd); + dump_backtrace (t); + } + } + if (-1 != t->write_fd) + { + int flags = fcntl (t->write_fd, F_GETFD); + if ((flags == -1) && (errno == EBADF)) + { + LOG (GNUNET_ERROR_TYPE_ERROR, + "Got invalid file descriptor %d!\n", + t->write_fd); + dump_backtrace (t); + } + } + } +#endif + GNUNET_assert (0); break; } + if ( (0 == ret) && (0 == timeout.rel_value_us) && (busy_wait_warning > 16) ) { LOG (GNUNET_ERROR_TYPE_WARNING, - _("Looks like we're busy waiting...\n")); + "Looks like we're busy waiting...\n"); short_wait (100); /* mitigate */ } check_ready (rs, ws); @@ -851,17 +921,16 @@ GNUNET_SCHEDULER_run (GNUNET_SCHEDULER_Task task, void *task_cls) /** - * Obtain the reason code for why the current task was - * started. Will return the same value as - * the `struct GNUNET_SCHEDULER_TaskContext`'s reason field. + * Obtain the task context, giving the reason why the current task was + * started. * - * @return reason(s) why the current task is run + * @return current tasks' scheduler context */ -enum GNUNET_SCHEDULER_Reason -GNUNET_SCHEDULER_get_reason () +const struct GNUNET_SCHEDULER_TaskContext * +GNUNET_SCHEDULER_get_task_context () { - GNUNET_assert (active_task != NULL); - return active_task->reason; + GNUNET_assert (NULL != active_task); + return &tc; } @@ -877,21 +946,17 @@ GNUNET_SCHEDULER_get_reason () unsigned int GNUNET_SCHEDULER_get_load (enum GNUNET_SCHEDULER_Priority p) { - struct Task *pos; + struct GNUNET_SCHEDULER_Task *pos; unsigned int ret; - GNUNET_assert (active_task != NULL); + GNUNET_assert (NULL != active_task); if (p == GNUNET_SCHEDULER_PRIORITY_COUNT) return ready_count; if (p == GNUNET_SCHEDULER_PRIORITY_KEEP) p = current_priority; ret = 0; - pos = ready[check_priority (p)]; - while (NULL != pos) - { - pos = pos->next; + for (pos = ready_head[check_priority (p)]; NULL != pos; pos = pos->next) ret++; - } return ret; } @@ -904,96 +969,76 @@ GNUNET_SCHEDULER_get_load (enum GNUNET_SCHEDULER_Priority p) * @return original closure of the task */ void * -GNUNET_SCHEDULER_cancel (GNUNET_SCHEDULER_TaskIdentifier task) +GNUNET_SCHEDULER_cancel (struct GNUNET_SCHEDULER_Task *task) { - struct Task *t; - struct Task *prev; enum GNUNET_SCHEDULER_Priority p; - int to; void *ret; - GNUNET_assert (NULL != active_task); - to = 0; - prev = NULL; - t = pending; - while (NULL != t) + GNUNET_assert ( (NULL != active_task) || + (GNUNET_NO == task->lifeness) ); + if (! task->in_ready_list) { - if (t->id == task) - break; - prev = t; - t = t->next; - } - if (NULL == t) - { - prev = NULL; - to = 1; - t = pending_timeout; - while (t != NULL) + if ( (-1 == task->read_fd) && + (-1 == task->write_fd) && + (NULL == task->read_set) && + (NULL == task->write_set) ) { - if (t->id == task) - break; - prev = t; - t = t->next; - } - if (pending_timeout_last == t) - pending_timeout_last = NULL; - } - p = 0; - while (NULL == t) - { - p++; - if (p >= GNUNET_SCHEDULER_PRIORITY_COUNT) - { - LOG (GNUNET_ERROR_TYPE_ERROR, - _("Attempt to cancel dead task %llu!\n"), - (unsigned long long) task); - GNUNET_assert (0); - } - prev = NULL; - t = ready[p]; - while (NULL != t) - { - if (t->id == task) - { - ready_count--; - break; - } - prev = t; - t = t->next; - } - } - if (NULL == prev) - { - if (0 == p) - { - if (0 == to) - { - pending = t->next; - } + if (GNUNET_YES == task->on_shutdown) + GNUNET_CONTAINER_DLL_remove (shutdown_head, + shutdown_tail, + task); else - { - pending_timeout = t->next; - } + GNUNET_CONTAINER_DLL_remove (pending_timeout_head, + pending_timeout_tail, + task); + if (task == pending_timeout_last) + pending_timeout_last = NULL; } else { - ready[p] = t->next; + GNUNET_CONTAINER_DLL_remove (pending_head, + pending_tail, + task); } } else { - prev->next = t->next; + p = check_priority (task->priority); + GNUNET_CONTAINER_DLL_remove (ready_head[p], + ready_tail[p], + task); + ready_count--; } - ret = t->callback_cls; + ret = task->callback_cls; LOG (GNUNET_ERROR_TYPE_DEBUG, - "Canceling task: %llu / %p\n", - task, - t->callback_cls); - destroy_task (t); + "Canceling task %p\n", + task); + destroy_task (task); return ret; } +/** + * Initialize backtrace data for task @a t + * + * @param t task to initialize + */ +static void +init_backtrace (struct GNUNET_SCHEDULER_Task *t) +{ +#if EXECINFO + void *backtrace_array[MAX_TRACE_DEPTH]; + + t->num_backtrace_strings + = backtrace (backtrace_array, MAX_TRACE_DEPTH); + t->backtrace_strings = + backtrace_symbols (backtrace_array, + t->num_backtrace_strings); + dump_backtrace (t); +#endif +} + + /** * Continue the current execution with the given function. This is * similar to the other "add" functions except that there is no delay @@ -1005,30 +1050,21 @@ GNUNET_SCHEDULER_cancel (GNUNET_SCHEDULER_TaskIdentifier task) * @param priority priority to use for the task */ void -GNUNET_SCHEDULER_add_continuation_with_priority (GNUNET_SCHEDULER_Task task, void *task_cls, - enum GNUNET_SCHEDULER_Reason reason, - enum GNUNET_SCHEDULER_Priority priority) +GNUNET_SCHEDULER_add_with_reason_and_priority (GNUNET_SCHEDULER_TaskCallback task, + void *task_cls, + enum GNUNET_SCHEDULER_Reason reason, + enum GNUNET_SCHEDULER_Priority priority) { - struct Task *t; - -#if EXECINFO - void *backtrace_array[50]; -#endif + struct GNUNET_SCHEDULER_Task *t; GNUNET_assert (NULL != task); GNUNET_assert ((NULL != active_task) || (GNUNET_SCHEDULER_REASON_STARTUP == reason)); - t = GNUNET_new (struct Task); -#if EXECINFO - t->num_backtrace_strings = backtrace (backtrace_array, 50); - t->backtrace_strings = - backtrace_symbols (backtrace_array, t->num_backtrace_strings); -#endif + t = GNUNET_new (struct GNUNET_SCHEDULER_Task); t->read_fd = -1; t->write_fd = -1; t->callback = task; t->callback_cls = task_cls; - t->id = ++last_id; #if PROFILE_DELAYS t->start_time = GNUNET_TIME_absolute_get (); #endif @@ -1036,136 +1072,156 @@ GNUNET_SCHEDULER_add_continuation_with_priority (GNUNET_SCHEDULER_Task task, voi t->priority = priority; t->lifeness = current_lifeness; LOG (GNUNET_ERROR_TYPE_DEBUG, - "Adding continuation task: %llu / %p\n", - t->id, - t->callback_cls); + "Adding continuation task %p\n", + t); + init_backtrace (t); queue_ready_task (t); } /** - * Continue the current execution with the given function. This is - * similar to the other "add" functions except that there is no delay - * and the reason code can be specified. - * - * @param task main function of the task - * @param task_cls closure for @a task - * @param reason reason for task invocation - */ -void -GNUNET_SCHEDULER_add_continuation (GNUNET_SCHEDULER_Task task, void *task_cls, - enum GNUNET_SCHEDULER_Reason reason) -{ - GNUNET_SCHEDULER_add_continuation_with_priority (task, task_cls, - reason, - GNUNET_SCHEDULER_PRIORITY_DEFAULT); -} - - -/** - * Schedule a new task to be run with a specified priority. + * Schedule a new task to be run at the specified time. The task + * will be scheduled for execution at time @a at. * - * @param prio how important is the new task? - * @param task main function of the task - * @param task_cls closure of @a task - * @return unique task identifier for the job - * only valid until @a task is started! - */ -GNUNET_SCHEDULER_TaskIdentifier -GNUNET_SCHEDULER_add_with_priority (enum GNUNET_SCHEDULER_Priority prio, - GNUNET_SCHEDULER_Task task, void *task_cls) -{ - return GNUNET_SCHEDULER_add_select (prio, - GNUNET_TIME_UNIT_ZERO, NULL, NULL, task, - task_cls); -} - - - -/** - * Schedule a new task to be run with a specified delay. The task - * will be scheduled for execution once the delay has expired. - * - * @param delay when should this operation time out? Use - * #GNUNET_TIME_UNIT_FOREVER_REL for "on shutdown" + * @param at time when the operation should run * @param priority priority to use for the task * @param task main function of the task * @param task_cls closure of @a task * @return unique task identifier for the job * only valid until @a task is started! */ -GNUNET_SCHEDULER_TaskIdentifier -GNUNET_SCHEDULER_add_delayed_with_priority (struct GNUNET_TIME_Relative delay, - enum GNUNET_SCHEDULER_Priority priority, - GNUNET_SCHEDULER_Task task, void *task_cls) +struct GNUNET_SCHEDULER_Task * +GNUNET_SCHEDULER_add_at_with_priority (struct GNUNET_TIME_Absolute at, + enum GNUNET_SCHEDULER_Priority priority, + GNUNET_SCHEDULER_TaskCallback task, + void *task_cls) { - struct Task *t; - struct Task *pos; - struct Task *prev; - -#if EXECINFO - void *backtrace_array[MAX_TRACE_DEPTH]; -#endif + struct GNUNET_SCHEDULER_Task *t; + struct GNUNET_SCHEDULER_Task *pos; + struct GNUNET_SCHEDULER_Task *prev; GNUNET_assert (NULL != active_task); GNUNET_assert (NULL != task); - t = GNUNET_new (struct Task); + t = GNUNET_new (struct GNUNET_SCHEDULER_Task); t->callback = task; t->callback_cls = task_cls; -#if EXECINFO - t->num_backtrace_strings = backtrace (backtrace_array, MAX_TRACE_DEPTH); - t->backtrace_strings = - backtrace_symbols (backtrace_array, t->num_backtrace_strings); -#endif t->read_fd = -1; t->write_fd = -1; - t->id = ++last_id; #if PROFILE_DELAYS t->start_time = GNUNET_TIME_absolute_get (); #endif - t->timeout = GNUNET_TIME_relative_to_absolute (delay); + t->timeout = at; t->priority = priority; t->lifeness = current_lifeness; /* try tail first (optimization in case we are * appending to a long list of tasks with timeouts) */ - prev = pending_timeout_last; - if (prev != NULL) + if ( (NULL == pending_timeout_head) || + (at.abs_value_us < pending_timeout_head->timeout.abs_value_us) ) { - if (prev->timeout.abs_value_us > t->timeout.abs_value_us) - prev = NULL; - else - pos = prev->next; /* heuristic success! */ + GNUNET_CONTAINER_DLL_insert (pending_timeout_head, + pending_timeout_tail, + t); } - if (prev == NULL) - { - /* heuristic failed, do traversal of timeout list */ - pos = pending_timeout; - } - while ((pos != NULL) && - ((pos->timeout.abs_value_us <= t->timeout.abs_value_us) || - (0 != pos->reason))) + else { - prev = pos; - pos = pos->next; + /* first move from heuristic start backwards to before start time */ + prev = pending_timeout_last; + while ( (NULL != prev) && + (prev->timeout.abs_value_us > t->timeout.abs_value_us) ) + prev = prev->prev; + /* now, move from heuristic start (or head of list) forward to insertion point */ + if (NULL == prev) + pos = pending_timeout_head; + else + pos = prev->next; + while ( (NULL != pos) && + ( (pos->timeout.abs_value_us <= t->timeout.abs_value_us) || + (0 != pos->reason) ) ) + { + prev = pos; + pos = pos->next; + } + GNUNET_CONTAINER_DLL_insert_after (pending_timeout_head, + pending_timeout_tail, + prev, + t); } - if (prev == NULL) - pending_timeout = t; - else - prev->next = t; - t->next = pos; - /* hyper-optimization... */ + /* finally, update heuristic insertion point to last insertion... */ pending_timeout_last = t; - LOG (GNUNET_ERROR_TYPE_DEBUG, "Adding task: %llu / %p\n", t->id, - t->callback_cls); -#if EXECINFO - int i; + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Adding task: %p\n", + t); + init_backtrace (t); + return t; +} - for (i = 0; i < t->num_backtrace_strings; i++) - LOG (GNUNET_ERROR_TYPE_DEBUG, "Task %llu trace %d: %s\n", t->id, i, - t->backtrace_strings[i]); -#endif - return t->id; + +/** + * Schedule a new task to be run with a specified delay. The task + * will be scheduled for execution once the delay has expired. + * + * @param delay when should this operation time out? + * @param priority priority to use for the task + * @param task main function of the task + * @param task_cls closure of @a task + * @return unique task identifier for the job + * only valid until @a task is started! + */ +struct GNUNET_SCHEDULER_Task * +GNUNET_SCHEDULER_add_delayed_with_priority (struct GNUNET_TIME_Relative delay, + enum GNUNET_SCHEDULER_Priority priority, + GNUNET_SCHEDULER_TaskCallback task, + void *task_cls) +{ + return GNUNET_SCHEDULER_add_at_with_priority (GNUNET_TIME_relative_to_absolute (delay), + priority, + task, + task_cls); +} + + +/** + * Schedule a new task to be run with a specified priority. + * + * @param prio how important is the new task? + * @param task main function of the task + * @param task_cls closure of @a task + * @return unique task identifier for the job + * only valid until @a task is started! + */ +struct GNUNET_SCHEDULER_Task * +GNUNET_SCHEDULER_add_with_priority (enum GNUNET_SCHEDULER_Priority prio, + GNUNET_SCHEDULER_TaskCallback task, + void *task_cls) +{ + return GNUNET_SCHEDULER_add_delayed_with_priority (GNUNET_TIME_UNIT_ZERO, + prio, + task, + task_cls); +} + + +/** + * Schedule a new task to be run at the specified time. The task + * will be scheduled for execution once specified time has been + * reached. It will be run with the DEFAULT priority. + * + * @param at time at which this operation should run + * @param task main function of the task + * @param task_cls closure of @a task + * @return unique task identifier for the job + * only valid until @a task is started! + */ +struct GNUNET_SCHEDULER_Task * +GNUNET_SCHEDULER_add_at (struct GNUNET_TIME_Absolute at, + GNUNET_SCHEDULER_TaskCallback task, + void *task_cls) +{ + return GNUNET_SCHEDULER_add_at_with_priority (at, + GNUNET_SCHEDULER_PRIORITY_DEFAULT, + task, + task_cls); } @@ -1174,20 +1230,21 @@ GNUNET_SCHEDULER_add_delayed_with_priority (struct GNUNET_TIME_Relative delay, * will be scheduled for execution once the delay has expired. It * will be run with the DEFAULT priority. * - * @param delay when should this operation time out? Use - * GNUNET_TIME_UNIT_FOREVER_REL for "on shutdown" + * @param delay when should this operation time out? * @param task main function of the task - * @param task_cls closure of task + * @param task_cls closure of @a task * @return unique task identifier for the job - * only valid until "task" is started! + * only valid until @a task is started! */ -GNUNET_SCHEDULER_TaskIdentifier +struct GNUNET_SCHEDULER_Task * GNUNET_SCHEDULER_add_delayed (struct GNUNET_TIME_Relative delay, - GNUNET_SCHEDULER_Task task, void *task_cls) + GNUNET_SCHEDULER_TaskCallback task, + void *task_cls) { return GNUNET_SCHEDULER_add_delayed_with_priority (delay, GNUNET_SCHEDULER_PRIORITY_DEFAULT, - task, task_cls); + task, + task_cls); } @@ -1204,12 +1261,56 @@ GNUNET_SCHEDULER_add_delayed (struct GNUNET_TIME_Relative delay, * @param task main function of the task * @param task_cls closure of @a task * @return unique task identifier for the job - * only valid until "task" is started! + * only valid until @a task is started! */ -GNUNET_SCHEDULER_TaskIdentifier -GNUNET_SCHEDULER_add_now (GNUNET_SCHEDULER_Task task, void *task_cls) +struct GNUNET_SCHEDULER_Task * +GNUNET_SCHEDULER_add_now (GNUNET_SCHEDULER_TaskCallback task, + void *task_cls) { - return GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_ZERO, task, task_cls); + return GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_ZERO, + task, + task_cls); +} + + +/** + * Schedule a new task to be run on shutdown, that is when a CTRL-C + * signal is received, or when #GNUNET_SCHEDULER_shutdown() is being + * invoked. + * + * @param task main function of the task + * @param task_cls closure of @a task + * @return unique task identifier for the job + * only valid until @a task is started! + */ +struct GNUNET_SCHEDULER_Task * +GNUNET_SCHEDULER_add_shutdown (GNUNET_SCHEDULER_TaskCallback task, + void *task_cls) +{ + struct GNUNET_SCHEDULER_Task *t; + + GNUNET_assert (NULL != active_task); + GNUNET_assert (NULL != task); + t = GNUNET_new (struct GNUNET_SCHEDULER_Task); + t->callback = task; + t->callback_cls = task_cls; + t->read_fd = -1; + t->write_fd = -1; +#if PROFILE_DELAYS + t->start_time = GNUNET_TIME_absolute_get (); +#endif + t->timeout = GNUNET_TIME_UNIT_FOREVER_ABS; + t->priority = GNUNET_SCHEDULER_PRIORITY_SHUTDOWN; + t->on_shutdown = GNUNET_YES; + t->lifeness = GNUNET_YES; + GNUNET_CONTAINER_DLL_insert (shutdown_head, + shutdown_tail, + t); + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Adding task: %p\n", + t); + init_backtrace (t); + return t; } @@ -1227,19 +1328,15 @@ GNUNET_SCHEDULER_add_now (GNUNET_SCHEDULER_Task task, void *task_cls) * @return unique task identifier for the job * only valid until @a task is started! */ -GNUNET_SCHEDULER_TaskIdentifier +struct GNUNET_SCHEDULER_Task * GNUNET_SCHEDULER_add_now_with_lifeness (int lifeness, - GNUNET_SCHEDULER_Task task, + GNUNET_SCHEDULER_TaskCallback task, void *task_cls) { - GNUNET_SCHEDULER_TaskIdentifier ret; - - ret = - GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_DEFAULT, - GNUNET_TIME_UNIT_ZERO, NULL, NULL, task, - task_cls); - GNUNET_assert (pending->id == ret); - pending->lifeness = lifeness; + struct GNUNET_SCHEDULER_Task *ret; + + ret = GNUNET_SCHEDULER_add_now (task, task_cls); + ret->lifeness = lifeness; return ret; } @@ -1257,43 +1354,34 @@ GNUNET_SCHEDULER_add_now_with_lifeness (int lifeness, * (prerequisite-run) * && (delay-ready * || any-rs-ready - * || any-ws-ready - * || shutdown-active ) + * || any-ws-ready) * * - * @param delay how long should we wait? Use #GNUNET_TIME_UNIT_FOREVER_REL for "forever", - * which means that the task will only be run after we receive SIGTERM + * @param delay how long should we wait? * @param priority priority to use * @param rfd file descriptor we want to read (can be -1) * @param wfd file descriptors we want to write (can be -1) * @param task main function of the task * @param task_cls closure of @a task * @return unique task identifier for the job - * only valid until "task" is started! + * only valid until @a task is started! */ #ifndef MINGW -static GNUNET_SCHEDULER_TaskIdentifier +static struct GNUNET_SCHEDULER_Task * add_without_sets (struct GNUNET_TIME_Relative delay, enum GNUNET_SCHEDULER_Priority priority, - int rfd, int wfd, - GNUNET_SCHEDULER_Task task, void *task_cls) + int rfd, + int wfd, + GNUNET_SCHEDULER_TaskCallback task, + void *task_cls) { - struct Task *t; - -#if EXECINFO - void *backtrace_array[MAX_TRACE_DEPTH]; -#endif + struct GNUNET_SCHEDULER_Task *t; GNUNET_assert (NULL != active_task); GNUNET_assert (NULL != task); - t = GNUNET_new (struct Task); + t = GNUNET_new (struct GNUNET_SCHEDULER_Task); t->callback = task; t->callback_cls = task_cls; -#if EXECINFO - t->num_backtrace_strings = backtrace (backtrace_array, MAX_TRACE_DEPTH); - t->backtrace_strings = - backtrace_symbols (backtrace_array, t->num_backtrace_strings); -#endif #if DEBUG_FDS if (-1 != rfd) { @@ -1304,14 +1392,7 @@ add_without_sets (struct GNUNET_TIME_Relative delay, LOG (GNUNET_ERROR_TYPE_ERROR, "Got invalid file descriptor %d!\n", rfd); -#if EXECINFO - int i; - - for (i = 0; i < t->num_backtrace_strings; i++) - LOG (GNUNET_ERROR_TYPE_DEBUG, - "Trace: %s\n", - t->backtrace_strings[i]); -#endif + init_backtrace (t); GNUNET_assert (0); } } @@ -1324,14 +1405,7 @@ add_without_sets (struct GNUNET_TIME_Relative delay, LOG (GNUNET_ERROR_TYPE_ERROR, "Got invalid file descriptor %d!\n", wfd); -#if EXECINFO - int i; - - for (i = 0; i < t->num_backtrace_strings; i++) - LOG (GNUNET_ERROR_TYPE_DEBUG, - "Trace: %s\n", - t->backtrace_strings[i]); -#endif + init_backtrace (t); GNUNET_assert (0); } } @@ -1339,36 +1413,26 @@ add_without_sets (struct GNUNET_TIME_Relative delay, t->read_fd = rfd; GNUNET_assert (wfd >= -1); t->write_fd = wfd; - t->id = ++last_id; #if PROFILE_DELAYS t->start_time = GNUNET_TIME_absolute_get (); #endif t->timeout = GNUNET_TIME_relative_to_absolute (delay); t->priority = check_priority ((priority == GNUNET_SCHEDULER_PRIORITY_KEEP) ? current_priority : priority); t->lifeness = current_lifeness; - t->next = pending; - pending = t; - max_priority_added = GNUNET_MAX (max_priority_added, t->priority); + GNUNET_CONTAINER_DLL_insert (pending_head, + pending_tail, + t); + max_priority_added = GNUNET_MAX (max_priority_added, + t->priority); LOG (GNUNET_ERROR_TYPE_DEBUG, - "Adding task: %llu / %p\n", - t->id, - t->callback_cls); -#if EXECINFO - int i; - - for (i = 0; i < t->num_backtrace_strings; i++) - LOG (GNUNET_ERROR_TYPE_DEBUG, - "Task %llu trace %d: %s\n", - t->id, - i, - t->backtrace_strings[i]); -#endif - return t->id; + "Adding task %p\n", + t); + init_backtrace (t); + return t; } #endif - /** * Schedule a new task to be run with a specified delay or when the * specified file descriptor is ready for reading. The delay can be @@ -1376,18 +1440,18 @@ add_without_sets (struct GNUNET_TIME_Relative delay, * scheduled for execution once either the delay has expired or the * socket operation is ready. It will be run with the DEFAULT priority. * - * @param delay when should this operation time out? Use - * #GNUNET_TIME_UNIT_FOREVER_REL for "on shutdown" + * @param delay when should this operation time out? * @param rfd read file-descriptor * @param task main function of the task * @param task_cls closure of @a task * @return unique task identifier for the job * only valid until @a task is started! */ -GNUNET_SCHEDULER_TaskIdentifier +struct GNUNET_SCHEDULER_Task * GNUNET_SCHEDULER_add_read_net (struct GNUNET_TIME_Relative delay, struct GNUNET_NETWORK_Handle *rfd, - GNUNET_SCHEDULER_Task task, void *task_cls) + GNUNET_SCHEDULER_TaskCallback task, + void *task_cls) { return GNUNET_SCHEDULER_add_read_net_with_priority (delay, GNUNET_SCHEDULER_PRIORITY_DEFAULT, @@ -1403,8 +1467,7 @@ GNUNET_SCHEDULER_add_read_net (struct GNUNET_TIME_Relative delay, * either the delay has expired or the socket operation is ready. It * will be run with the DEFAULT priority. * - * @param delay when should this operation time out? Use - * #GNUNET_TIME_UNIT_FOREVER_REL for "on shutdown" + * @param delay when should this operation time out? * @param priority priority to use for the task * @param rfd read file-descriptor * @param task main function of the task @@ -1412,16 +1475,18 @@ GNUNET_SCHEDULER_add_read_net (struct GNUNET_TIME_Relative delay, * @return unique task identifier for the job * only valid until @a task is started! */ -GNUNET_SCHEDULER_TaskIdentifier +struct GNUNET_SCHEDULER_Task * GNUNET_SCHEDULER_add_read_net_with_priority (struct GNUNET_TIME_Relative delay, enum GNUNET_SCHEDULER_Priority priority, struct GNUNET_NETWORK_Handle *rfd, - GNUNET_SCHEDULER_Task task, void *task_cls) + GNUNET_SCHEDULER_TaskCallback task, + void *task_cls) { - return GNUNET_SCHEDULER_add_net_with_priority ( - delay, priority, - rfd, GNUNET_YES, GNUNET_NO, - task, task_cls); + return GNUNET_SCHEDULER_add_net_with_priority (delay, priority, + rfd, + GNUNET_YES, + GNUNET_NO, + task, task_cls); } @@ -1433,23 +1498,24 @@ GNUNET_SCHEDULER_add_read_net_with_priority (struct GNUNET_TIME_Relative delay, * socket operation is ready. It will be run with the priority of * the calling task. * - * @param delay when should this operation time out? Use - * #GNUNET_TIME_UNIT_FOREVER_REL for "on shutdown" + * @param delay when should this operation time out? * @param wfd write file-descriptor * @param task main function of the task * @param task_cls closure of @a task * @return unique task identifier for the job * only valid until @a task is started! */ -GNUNET_SCHEDULER_TaskIdentifier +struct GNUNET_SCHEDULER_Task * GNUNET_SCHEDULER_add_write_net (struct GNUNET_TIME_Relative delay, struct GNUNET_NETWORK_Handle *wfd, - GNUNET_SCHEDULER_Task task, void *task_cls) + GNUNET_SCHEDULER_TaskCallback task, + void *task_cls) { - return GNUNET_SCHEDULER_add_net_with_priority ( - delay, GNUNET_SCHEDULER_PRIORITY_DEFAULT, - wfd, GNUNET_NO, GNUNET_YES, - task, task_cls); + return GNUNET_SCHEDULER_add_net_with_priority (delay, + GNUNET_SCHEDULER_PRIORITY_DEFAULT, + wfd, + GNUNET_NO, GNUNET_YES, + task, task_cls); } /** @@ -1459,8 +1525,7 @@ GNUNET_SCHEDULER_add_write_net (struct GNUNET_TIME_Relative delay, * scheduled for execution once either the delay has expired or the * socket operation is ready. * - * @param delay when should this operation time out? Use - * GNUNET_TIME_UNIT_FOREVER_REL for "on shutdown" + * @param delay when should this operation time out? * @param priority priority of the task * @param fd file-descriptor * @param on_read whether to poll the file-descriptor for readability @@ -1470,18 +1535,20 @@ GNUNET_SCHEDULER_add_write_net (struct GNUNET_TIME_Relative delay, * @return unique task identifier for the job * only valid until "task" is started! */ -GNUNET_SCHEDULER_TaskIdentifier +struct GNUNET_SCHEDULER_Task * GNUNET_SCHEDULER_add_net_with_priority (struct GNUNET_TIME_Relative delay, enum GNUNET_SCHEDULER_Priority priority, struct GNUNET_NETWORK_Handle *fd, - int on_read, int on_write, - GNUNET_SCHEDULER_Task task, void *task_cls) + int on_read, + int on_write, + GNUNET_SCHEDULER_TaskCallback task, + void *task_cls) { #if MINGW struct GNUNET_NETWORK_FDSet *s; - GNUNET_SCHEDULER_TaskIdentifier ret; + struct GNUNET_SCHEDULER_Task * ret; - GNUNET_assert (fd != NULL); + GNUNET_assert (NULL != fd); s = GNUNET_NETWORK_fdset_create (); GNUNET_NETWORK_fdset_set (s, fd); ret = GNUNET_SCHEDULER_add_select ( @@ -1493,11 +1560,10 @@ GNUNET_SCHEDULER_add_net_with_priority (struct GNUNET_TIME_Relative delay, return ret; #else GNUNET_assert (GNUNET_NETWORK_get_fd (fd) >= 0); - return add_without_sets ( - delay, priority, - on_read ? GNUNET_NETWORK_get_fd (fd) : -1, - on_write ? GNUNET_NETWORK_get_fd (fd) : -1, - task, task_cls); + return add_without_sets (delay, priority, + on_read ? GNUNET_NETWORK_get_fd (fd) : -1, + on_write ? GNUNET_NETWORK_get_fd (fd) : -1, + task, task_cls); #endif } @@ -1509,18 +1575,17 @@ GNUNET_SCHEDULER_add_net_with_priority (struct GNUNET_TIME_Relative delay, * scheduled for execution once either the delay has expired or the * socket operation is ready. It will be run with the DEFAULT priority. * - * @param delay when should this operation time out? Use - * #GNUNET_TIME_UNIT_FOREVER_REL for "on shutdown" + * @param delay when should this operation time out? * @param rfd read file-descriptor * @param task main function of the task * @param task_cls closure of @a task * @return unique task identifier for the job * only valid until @a task is started! */ -GNUNET_SCHEDULER_TaskIdentifier +struct GNUNET_SCHEDULER_Task * GNUNET_SCHEDULER_add_read_file (struct GNUNET_TIME_Relative delay, const struct GNUNET_DISK_FileHandle *rfd, - GNUNET_SCHEDULER_Task task, void *task_cls) + GNUNET_SCHEDULER_TaskCallback task, void *task_cls) { return GNUNET_SCHEDULER_add_file_with_priority ( delay, GNUNET_SCHEDULER_PRIORITY_DEFAULT, @@ -1536,18 +1601,17 @@ GNUNET_SCHEDULER_add_read_file (struct GNUNET_TIME_Relative delay, * scheduled for execution once either the delay has expired or the * socket operation is ready. It will be run with the DEFAULT priority. * - * @param delay when should this operation time out? Use - * #GNUNET_TIME_UNIT_FOREVER_REL for "on shutdown" + * @param delay when should this operation time out? * @param wfd write file-descriptor * @param task main function of the task * @param task_cls closure of @a task * @return unique task identifier for the job * only valid until @a task is started! */ -GNUNET_SCHEDULER_TaskIdentifier +struct GNUNET_SCHEDULER_Task * GNUNET_SCHEDULER_add_write_file (struct GNUNET_TIME_Relative delay, const struct GNUNET_DISK_FileHandle *wfd, - GNUNET_SCHEDULER_Task task, void *task_cls) + GNUNET_SCHEDULER_TaskCallback task, void *task_cls) { return GNUNET_SCHEDULER_add_file_with_priority ( delay, GNUNET_SCHEDULER_PRIORITY_DEFAULT, @@ -1563,8 +1627,7 @@ GNUNET_SCHEDULER_add_write_file (struct GNUNET_TIME_Relative delay, * scheduled for execution once either the delay has expired or the * socket operation is ready. * - * @param delay when should this operation time out? Use - * #GNUNET_TIME_UNIT_FOREVER_REL for "on shutdown" + * @param delay when should this operation time out? * @param priority priority of the task * @param fd file-descriptor * @param on_read whether to poll the file-descriptor for readability @@ -1574,18 +1637,18 @@ GNUNET_SCHEDULER_add_write_file (struct GNUNET_TIME_Relative delay, * @return unique task identifier for the job * only valid until @a task is started! */ -GNUNET_SCHEDULER_TaskIdentifier +struct GNUNET_SCHEDULER_Task * GNUNET_SCHEDULER_add_file_with_priority (struct GNUNET_TIME_Relative delay, enum GNUNET_SCHEDULER_Priority priority, const struct GNUNET_DISK_FileHandle *fd, int on_read, int on_write, - GNUNET_SCHEDULER_Task task, void *task_cls) + GNUNET_SCHEDULER_TaskCallback task, void *task_cls) { #if MINGW struct GNUNET_NETWORK_FDSet *s; - GNUNET_SCHEDULER_TaskIdentifier ret; + struct GNUNET_SCHEDULER_Task * ret; - GNUNET_assert (fd != NULL); + GNUNET_assert (NULL != fd); s = GNUNET_NETWORK_fdset_create (); GNUNET_NETWORK_fdset_handle_set (s, fd); ret = GNUNET_SCHEDULER_add_select ( @@ -1599,7 +1662,7 @@ GNUNET_SCHEDULER_add_file_with_priority (struct GNUNET_TIME_Relative delay, int real_fd; GNUNET_DISK_internal_file_handle_ (fd, &real_fd, sizeof (int)); - GNUNET_assert (real_fd > 0); + GNUNET_assert (real_fd >= 0); return add_without_sets ( delay, priority, on_read ? real_fd : -1, @@ -1622,13 +1685,11 @@ GNUNET_SCHEDULER_add_file_with_priority (struct GNUNET_TIME_Relative delay, * (prerequisite-run) * && (delay-ready * || any-rs-ready - * || any-ws-ready - * || (shutdown-active && run-on-shutdown) ) + * || any-ws-ready) ) * * * @param prio how important is this task? - * @param delay how long should we wait? Use #GNUNET_TIME_UNIT_FOREVER_REL for "forever", - * which means that the task will only be run after we receive SIGTERM + * @param delay how long should we wait? * @param rs set of file descriptors we want to read (can be NULL) * @param ws set of file descriptors we want to write (can be NULL) * @param task main function of the task @@ -1636,28 +1697,27 @@ GNUNET_SCHEDULER_add_file_with_priority (struct GNUNET_TIME_Relative delay, * @return unique task identifier for the job * only valid until @a task is started! */ -GNUNET_SCHEDULER_TaskIdentifier +struct GNUNET_SCHEDULER_Task * GNUNET_SCHEDULER_add_select (enum GNUNET_SCHEDULER_Priority prio, struct GNUNET_TIME_Relative delay, const struct GNUNET_NETWORK_FDSet *rs, const struct GNUNET_NETWORK_FDSet *ws, - GNUNET_SCHEDULER_Task task, void *task_cls) + GNUNET_SCHEDULER_TaskCallback task, + void *task_cls) { - struct Task *t; -#if EXECINFO - void *backtrace_array[MAX_TRACE_DEPTH]; -#endif - + struct GNUNET_SCHEDULER_Task *t; + + if ( (NULL == rs) && + (NULL == ws) ) + return GNUNET_SCHEDULER_add_delayed_with_priority (delay, + prio, + task, + task_cls); GNUNET_assert (NULL != active_task); GNUNET_assert (NULL != task); - t = GNUNET_new (struct Task); + t = GNUNET_new (struct GNUNET_SCHEDULER_Task); t->callback = task; t->callback_cls = task_cls; -#if EXECINFO - t->num_backtrace_strings = backtrace (backtrace_array, MAX_TRACE_DEPTH); - t->backtrace_strings = - backtrace_symbols (backtrace_array, t->num_backtrace_strings); -#endif t->read_fd = -1; t->write_fd = -1; if (NULL != rs) @@ -1670,7 +1730,6 @@ GNUNET_SCHEDULER_add_select (enum GNUNET_SCHEDULER_Priority prio, t->write_set = GNUNET_NETWORK_fdset_create (); GNUNET_NETWORK_fdset_copy (t->write_set, ws); } - t->id = ++last_id; #if PROFILE_DELAYS t->start_time = GNUNET_TIME_absolute_get (); #endif @@ -1680,23 +1739,15 @@ GNUNET_SCHEDULER_add_select (enum GNUNET_SCHEDULER_Priority prio, GNUNET_SCHEDULER_PRIORITY_KEEP) ? current_priority : prio); t->lifeness = current_lifeness; - t->next = pending; - pending = t; + GNUNET_CONTAINER_DLL_insert (pending_head, + pending_tail, + t); max_priority_added = GNUNET_MAX (max_priority_added, t->priority); LOG (GNUNET_ERROR_TYPE_DEBUG, - "Adding task: %llu / %p\n", - t->id, - t->callback_cls); -#if EXECINFO - int i; - - for (i = 0; i < t->num_backtrace_strings; i++) - LOG (GNUNET_ERROR_TYPE_DEBUG, - "Task %llu trace %d: %s\n", - t->id, i, - t->backtrace_strings[i]); -#endif - return t->id; + "Adding task %p\n", + t); + init_backtrace (t); + return t; } /* end of scheduler.c */