/*
This file is part of GNUnet
- (C) 2009 Christian Grothoff (and other contributing authors)
+ (C) 2009, 2011 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
#include "gnunet_signal_lib.h"
#include "gnunet_time_lib.h"
#include "disk.h"
+#define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__)
+
+#define LOG_STRERROR(kind,syscall) GNUNET_log_from_strerror (kind, "util", syscall)
#ifdef LINUX
#include "execinfo.h"
+
/**
* Use lsof to generate file descriptor reports on select error?
* (turn off for stable releases).
*/
-#define USE_LSOF GNUNET_YES
+#define USE_LSOF GNUNET_NO
/**
* Obtain trace information for all scheduler calls that schedule tasks.
*/
#define EXECINFO GNUNET_NO
+/**
+ * Check each file descriptor before adding
+ */
+#define DEBUG_FDS GNUNET_EXTRA_LOGGING
+
/**
* Depth of the traces collected via EXECINFO.
*/
#define MAX_TRACE_DEPTH 50
#endif
-#define DEBUG_TASKS GNUNET_NO
+#define DEBUG_TASKS GNUNET_EXTRA_LOGGING
/**
* Should we figure out which tasks are delayed for a while
*/
int write_fd;
+ /**
+ * Should the existence of this task in the queue be counted as
+ * reason to not shutdown the scheduler?
+ */
+ int lifeness;
+
#if EXECINFO
/**
* Array of strings which make up a backtrace from the point when this
*/
static enum GNUNET_SCHEDULER_Priority max_priority_added;
+/**
+ * Value of the 'lifeness' flag for the current task.
+ */
+static int current_lifeness;
+
+/**
+ * Function to use as a select() in the scheduler.
+ * If NULL, we use GNUNET_NETWORK_socket_select ().
+ */
+static GNUNET_SCHEDULER_select scheduler_select;
+
+/**
+ * Closure for 'scheduler_select'.
+ */
+static void *scheduler_select_cls;
+
+/**
+ * Sets the select function to use in the scheduler (scheduler_select).
+ *
+ * @param new_select new select function to use
+ * @param new_select_cls closure for 'new_select'
+ * @return previously used select function, NULL for default
+ */
+void
+GNUNET_SCHEDULER_set_select (GNUNET_SCHEDULER_select new_select,
+ void *new_select_cls)
+{
+ scheduler_select = new_select;
+ scheduler_select_cls = new_select_cls;
+}
+
/**
* Check that the given priority is legal (and return it).
if ((p >= 0) && (p < GNUNET_SCHEDULER_PRIORITY_COUNT))
return p;
GNUNET_assert (0);
- return 0; /* make compiler happy */
+ return 0; /* make compiler happy */
}
if (id < lowest_pending_id)
return GNUNET_NO;
- min = -1; /* maximum value */
+ min = -1; /* maximum value */
pos = pending;
while (pos != NULL)
{
if (pos->id == id)
- return GNUNET_YES;
+ return GNUNET_YES;
if (pos->id < min)
- min = pos->id;
+ min = pos->id;
pos = pos->next;
}
pos = pending_timeout;
while (pos != NULL)
{
if (pos->id == id)
- return GNUNET_YES;
+ return GNUNET_YES;
if (pos->id < min)
- min = pos->id;
+ min = pos->id;
pos = pos->next;
}
for (p = 0; p < GNUNET_SCHEDULER_PRIORITY_COUNT; p++)
{
pos = ready[p];
while (pos != NULL)
- {
- if (pos->id == id)
- return GNUNET_YES;
- if (pos->id < min)
- min = pos->id;
- pos = pos->next;
- }
+ {
+ if (pos->id == id)
+ return GNUNET_YES;
+ if (pos->id < min)
+ min = pos->id;
+ pos = pos->next;
+ }
}
lowest_pending_id = min;
return GNUNET_NO;
* @param timeout next timeout (updated)
*/
static void
-update_sets (struct GNUNET_NETWORK_FDSet *rs,
- struct GNUNET_NETWORK_FDSet *ws,
- struct GNUNET_TIME_Relative *timeout)
+update_sets (struct GNUNET_NETWORK_FDSet *rs, struct GNUNET_NETWORK_FDSet *ws,
+ struct GNUNET_TIME_Relative *timeout)
{
struct Task *pos;
struct GNUNET_TIME_Absolute now;
now = GNUNET_TIME_absolute_get ();
pos = pending_timeout;
- if (pos != NULL)
+ if (pos != NULL)
{
to = GNUNET_TIME_absolute_get_difference (now, pos->timeout);
if (timeout->rel_value > to.rel_value)
*timeout = to;
if (pos->reason != 0)
- *timeout = GNUNET_TIME_UNIT_ZERO;
+ *timeout = GNUNET_TIME_UNIT_ZERO;
}
pos = pending;
while (pos != NULL)
{
if ((pos->prereq_id != GNUNET_SCHEDULER_NO_TASK) &&
- (GNUNET_YES == is_pending (pos->prereq_id)))
- {
- pos = pos->next;
- continue;
- }
+ (GNUNET_YES == is_pending (pos->prereq_id)))
+ {
+ pos = pos->next;
+ continue;
+ }
if (pos->timeout.abs_value != GNUNET_TIME_UNIT_FOREVER_ABS.abs_value)
- {
- to = GNUNET_TIME_absolute_get_difference (now, pos->timeout);
- if (timeout->rel_value > to.rel_value)
- *timeout = to;
- }
+ {
+ to = GNUNET_TIME_absolute_get_difference (now, pos->timeout);
+ if (timeout->rel_value > to.rel_value)
+ *timeout = to;
+ }
if (pos->read_fd != -1)
GNUNET_NETWORK_fdset_set_native (rs, pos->read_fd);
if (pos->write_fd != -1)
GNUNET_NETWORK_fdset_set_native (ws, pos->write_fd);
if (pos->read_set != NULL)
- GNUNET_NETWORK_fdset_add (rs, pos->read_set);
+ GNUNET_NETWORK_fdset_add (rs, pos->read_set);
if (pos->write_set != NULL)
- GNUNET_NETWORK_fdset_add (ws, pos->write_set);
+ GNUNET_NETWORK_fdset_add (ws, pos->write_set);
if (pos->reason != 0)
- *timeout = GNUNET_TIME_UNIT_ZERO;
+ *timeout = GNUNET_TIME_UNIT_ZERO;
pos = pos->next;
}
}
*/
static int
set_overlaps (const struct GNUNET_NETWORK_FDSet *ready,
- struct GNUNET_NETWORK_FDSet *want)
+ struct GNUNET_NETWORK_FDSet *want)
{
- if ( (NULL == want) || (NULL == ready) )
+ if ((NULL == want) || (NULL == ready))
return GNUNET_NO;
if (GNUNET_NETWORK_fdset_overlap (ready, want))
{
/* copy all over (yes, there maybe unrelated bits,
- but this should not hurt well-written clients) */
+ * but this should not hurt well-written clients) */
GNUNET_NETWORK_fdset_copy (want, ready);
return GNUNET_YES;
}
* @return GNUNET_YES if we can run it, GNUNET_NO if not.
*/
static int
-is_ready (struct Task *task,
- struct GNUNET_TIME_Absolute now,
- const struct GNUNET_NETWORK_FDSet *rs,
- const struct GNUNET_NETWORK_FDSet *ws)
+is_ready (struct Task *task, struct GNUNET_TIME_Absolute now,
+ const struct GNUNET_NETWORK_FDSet *rs,
+ const struct GNUNET_NETWORK_FDSet *ws)
{
enum GNUNET_SCHEDULER_Reason reason;
reason = task->reason;
if (now.abs_value >= task->timeout.abs_value)
reason |= GNUNET_SCHEDULER_REASON_TIMEOUT;
- if ( (0 == (reason & GNUNET_SCHEDULER_REASON_READ_READY)) &&
- ( ( (task->read_fd != -1) &&
- (GNUNET_YES == GNUNET_NETWORK_fdset_test_native (rs, task->read_fd)) ) ||
- (set_overlaps (rs, task->read_set) ) ) )
+ if ((0 == (reason & GNUNET_SCHEDULER_REASON_READ_READY)) &&
+ (((task->read_fd != -1) &&
+ (GNUNET_YES == GNUNET_NETWORK_fdset_test_native (rs, task->read_fd)))
+ || (set_overlaps (rs, task->read_set))))
reason |= GNUNET_SCHEDULER_REASON_READ_READY;
if ((0 == (reason & GNUNET_SCHEDULER_REASON_WRITE_READY)) &&
- ( ( (task->write_fd != -1) &&
- (GNUNET_YES == GNUNET_NETWORK_fdset_test_native (ws, task->write_fd)) ) ||
- (set_overlaps (ws, task->write_set) ) ) )
+ (((task->write_fd != -1) &&
+ (GNUNET_YES == GNUNET_NETWORK_fdset_test_native (ws, task->write_fd)))
+ || (set_overlaps (ws, task->write_set))))
reason |= GNUNET_SCHEDULER_REASON_WRITE_READY;
if (reason == 0)
- return GNUNET_NO; /* not ready */
+ return GNUNET_NO; /* not ready */
if (task->prereq_id != GNUNET_SCHEDULER_NO_TASK)
{
if (GNUNET_YES == is_pending (task->prereq_id))
{
task->reason = reason;
- return GNUNET_NO; /* prereq waiting */
+ return GNUNET_NO; /* prereq waiting */
}
reason |= GNUNET_SCHEDULER_REASON_PREREQ_DONE;
}
queue_ready_task (struct Task *task)
{
enum GNUNET_SCHEDULER_Priority p = task->priority;
+
if (0 != (task->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
p = GNUNET_SCHEDULER_PRIORITY_SHUTDOWN;
task->next = ready[check_priority (p)];
*/
static void
check_ready (const struct GNUNET_NETWORK_FDSet *rs,
- const struct GNUNET_NETWORK_FDSet *ws)
+ const struct GNUNET_NETWORK_FDSet *ws)
{
struct Task *pos;
struct Task *prev;
while (pos != NULL)
{
#if DEBUG_TASKS
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Checking readiness of task: %llu / %p\n",
- pos->id, pos->callback_cls);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Checking readiness of task: %llu / %p\n", pos->id,
+ pos->callback_cls);
#endif
next = pos->next;
if (GNUNET_YES == is_ready (pos, now, rs, ws))
- {
- if (prev == NULL)
- pending = next;
- else
- prev->next = next;
- queue_ready_task (pos);
- pos = next;
- continue;
- }
+ {
+ if (prev == NULL)
+ pending = next;
+ else
+ prev->next = next;
+ queue_ready_task (pos);
+ pos = next;
+ continue;
+ }
prev = pos;
pos = next;
}
{
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 */
+ * will do that later, possibly adding additional
+ * readiness-factors */
pos = pos->next;
}
pos = pending;
{
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 */
+ * will do that later, possibly adding additional
+ * readiness-factors */
pos = pos->next;
}
- for (i=0;i<GNUNET_SCHEDULER_PRIORITY_COUNT;i++)
+ for (i = 0; i < GNUNET_SCHEDULER_PRIORITY_COUNT; i++)
{
pos = ready[i];
while (pos != NULL)
{
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 */
+ * will do that later, possibly adding additional
+ * readiness-factors */
pos = pos->next;
}
- }
+ }
}
* empty. Keep running tasks until we are either no longer running
* "URGENT" tasks or until we have at least one "pending" task (which
* may become ready, hence we should select on it). Naturally, if
- * there are no more ready tasks, we also return.
+ * there are no more ready tasks, we also return.
*
* @param rs FDs ready for reading
* @param ws FDs ready for writing
*/
static void
-run_ready (struct GNUNET_NETWORK_FDSet *rs,
- struct GNUNET_NETWORK_FDSet *ws)
+run_ready (struct GNUNET_NETWORK_FDSet *rs, struct GNUNET_NETWORK_FDSet *ws)
{
enum GNUNET_SCHEDULER_Priority p;
struct Task *pos;
do
{
if (ready_count == 0)
- return;
+ return;
GNUNET_assert (ready[GNUNET_SCHEDULER_PRIORITY_KEEP] == NULL);
/* yes, p>0 is correct, 0 is "KEEP" which should
- always be an empty queue (see assertion)! */
+ * always be an empty queue (see assertion)! */
for (p = GNUNET_SCHEDULER_PRIORITY_COUNT - 1; p > 0; p--)
- {
- pos = ready[p];
- if (pos != NULL)
- break;
- }
- GNUNET_assert (pos != NULL); /* ready_count wrong? */
+ {
+ pos = ready[p];
+ if (pos != NULL)
+ break;
+ }
+ GNUNET_assert (pos != NULL); /* ready_count wrong? */
ready[p] = pos->next;
ready_count--;
if (current_priority != pos->priority)
{
current_priority = pos->priority;
- (void) GNUNET_OS_set_process_priority (GNUNET_OS_process_current (),
+ (void) GNUNET_OS_set_process_priority (GNUNET_OS_process_current (),
pos->priority);
}
+ current_lifeness = pos->lifeness;
active_task = pos;
#if PROFILE_DELAYS
if (GNUNET_TIME_absolute_get_duration (pos->start_time).rel_value >
DELAY_THRESHOLD.rel_value)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Task %llu took %llums to be scheduled\n",
- pos->id,
- (unsigned long long) GNUNET_TIME_absolute_get_duration (pos->start_time).rel_value);
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ "Task %llu took %llums to be scheduled\n", pos->id,
+ (unsigned long long)
+ GNUNET_TIME_absolute_get_duration (pos->start_time).rel_value);
}
#endif
tc.reason = pos->reason;
- tc.read_ready = (pos->read_set == NULL) ? rs : pos->read_set;
- if ( (pos->read_fd != -1) &&
- (0 != (pos->reason & GNUNET_SCHEDULER_REASON_READ_READY)) )
- GNUNET_NETWORK_fdset_set_native (rs,
- pos->read_fd);
+ tc.read_ready = (pos->read_set == NULL) ? rs : pos->read_set;
+ if ((pos->read_fd != -1) &&
+ (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) &&
- (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) &&
- (! GNUNET_NETWORK_fdset_test_native (ws,
- pos->write_fd)))
- abort (); // added to ready in previous select loop!
+ if ((pos->write_fd != -1) &&
+ (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) &&
+ (!GNUNET_NETWORK_fdset_test_native (ws, pos->write_fd)))
+ abort (); // added to ready in previous select loop!
#if DEBUG_TASKS
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Running task: %llu / %p\n", pos->id, pos->callback_cls);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Running task: %llu / %p\n", pos->id, pos->callback_cls);
#endif
pos->callback (pos->callback_cls, &tc);
#if EXECINFO
int i;
- for (i=0;i<pos->num_backtrace_strings;i++)
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Task %llu trace %d: %s\n",
- pos->id,
- i,
- pos->backtrace_strings[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
active_task = NULL;
destroy_task (pos);
tasks_run++;
}
- while ( (pending == NULL) || (p >= max_priority_added) );
+ while ((pending == NULL) || (p >= max_priority_added));
}
/**
sighandler_shutdown ()
{
static char c;
- int old_errno = errno; /* backup errno */
+ int old_errno = errno; /* backup errno */
GNUNET_DISK_file_write (GNUNET_DISK_pipe_handle
- (shutdown_pipe_handle, GNUNET_DISK_PIPE_END_WRITE), &c,
- sizeof (c));
+ (shutdown_pipe_handle, GNUNET_DISK_PIPE_END_WRITE),
+ &c, sizeof (c));
errno = old_errno;
}
+/**
+ * Check if the system is still life. Trigger shutdown if we
+ * have tasks, but none of them give us lifeness.
+ *
+ * @return GNUNET_OK to continue the main loop,
+ * GNUNET_NO to exit
+ */
+static int
+check_lifeness ()
+{
+ struct Task *t;
+
+ if (ready_count > 0)
+ return GNUNET_OK;
+ for (t = pending; NULL != t; t = t->next)
+ if (t->lifeness == GNUNET_YES)
+ return GNUNET_OK;
+ for (t = pending_timeout; NULL != t; t = t->next)
+ if (t->lifeness == GNUNET_YES)
+ return GNUNET_OK;
+ if ((NULL != pending) || (NULL != pending_timeout))
+ {
+ GNUNET_SCHEDULER_shutdown ();
+ return GNUNET_OK;
+ }
+ return GNUNET_NO;
+}
+
+
/**
* Initialize and run scheduler. This function will return when all
* tasks have completed. On systems with signals, receiving a SIGTERM
int ret;
struct GNUNET_SIGNAL_Context *shc_int;
struct GNUNET_SIGNAL_Context *shc_term;
+
#ifndef MINGW
struct GNUNET_SIGNAL_Context *shc_quit;
struct GNUNET_SIGNAL_Context *shc_hup;
rs = GNUNET_NETWORK_fdset_create ();
ws = GNUNET_NETWORK_fdset_create ();
GNUNET_assert (shutdown_pipe_handle == NULL);
- shutdown_pipe_handle = GNUNET_DISK_pipe (GNUNET_NO, GNUNET_NO, GNUNET_NO);
+ shutdown_pipe_handle = GNUNET_DISK_pipe (GNUNET_NO, GNUNET_NO, GNUNET_NO);
GNUNET_assert (shutdown_pipe_handle != NULL);
- pr = GNUNET_DISK_pipe_handle (shutdown_pipe_handle, GNUNET_DISK_PIPE_END_READ);
+ pr = GNUNET_DISK_pipe_handle (shutdown_pipe_handle,
+ GNUNET_DISK_PIPE_END_READ);
GNUNET_assert (pr != NULL);
shc_int = GNUNET_SIGNAL_handler_install (SIGINT, &sighandler_shutdown);
shc_term = GNUNET_SIGNAL_handler_install (SIGTERM, &sighandler_shutdown);
shc_hup = GNUNET_SIGNAL_handler_install (SIGHUP, &sighandler_shutdown);
#endif
current_priority = GNUNET_SCHEDULER_PRIORITY_DEFAULT;
- GNUNET_SCHEDULER_add_continuation (task,
- task_cls,
- GNUNET_SCHEDULER_REASON_STARTUP);
+ current_lifeness = GNUNET_YES;
+ GNUNET_SCHEDULER_add_continuation (task, task_cls,
+ GNUNET_SCHEDULER_REASON_STARTUP);
#if ENABLE_WINDOWS_WORKAROUNDS
- GNUNET_SCHEDULER_add_continuation (&GNUNET_OS_install_parent_control_handler,
- NULL, GNUNET_SCHEDULER_REASON_STARTUP);
+ active_task = (void *) (long) -1; /* force passing of sanity check */
+ GNUNET_SCHEDULER_add_now_with_lifeness (GNUNET_NO,
+ &GNUNET_OS_install_parent_control_handler,
+ NULL);
+ active_task = NULL;
#endif
last_tr = 0;
busy_wait_warning = 0;
- while ((pending != NULL) ||
- (pending_timeout != NULL) ||
- (ready_count > 0))
+ while (GNUNET_OK == check_lifeness ())
{
GNUNET_NETWORK_fdset_zero (rs);
GNUNET_NETWORK_fdset_zero (ws);
update_sets (rs, ws, &timeout);
GNUNET_NETWORK_fdset_handle_set (rs, pr);
if (ready_count > 0)
- {
- /* no blocking, more work already ready! */
- timeout = GNUNET_TIME_UNIT_ZERO;
- }
- ret = GNUNET_NETWORK_socket_select (rs, ws, NULL, timeout);
+ {
+ /* no blocking, more work already ready! */
+ timeout = GNUNET_TIME_UNIT_ZERO;
+ }
+ if (NULL == scheduler_select)
+ ret = GNUNET_NETWORK_socket_select (rs, ws, NULL, timeout);
+ else
+ ret = scheduler_select (scheduler_select_cls, rs, ws, NULL, timeout);
if (ret == GNUNET_SYSERR)
- {
- if (errno == EINTR)
- continue;
+ {
+ if (errno == EINTR)
+ continue;
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "select");
+ LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "select");
#ifndef MINGW
#if USE_LSOF
char lsof[512];
- snprintf (lsof, sizeof (lsof), "lsof -p %d", getpid());
+
+ snprintf (lsof, sizeof (lsof), "lsof -p %d", getpid ());
(void) close (1);
(void) dup2 (2, 1);
- (void) system (lsof);
+ if (0 != system (lsof))
+ LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "system");
#endif
#endif
- abort ();
+ abort ();
break;
- }
+ }
if ((ret == 0) && (timeout.rel_value == 0) && (busy_wait_warning > 16))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Looks like we're busy waiting...\n"));
- sleep (1); /* mitigate */
- }
+ {
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ _("Looks like we're busy waiting...\n"));
+ sleep (1); /* mitigate */
+ }
check_ready (rs, ws);
run_ready (rs, ws);
if (GNUNET_NETWORK_fdset_handle_isset (rs, pr))
- {
- /* consume the signal */
- GNUNET_DISK_file_read (pr, &c, sizeof (c));
- /* mark all active tasks as ready due to shutdown */
- GNUNET_SCHEDULER_shutdown ();
- }
+ {
+ /* consume the signal */
+ GNUNET_DISK_file_read (pr, &c, sizeof (c));
+ /* mark all active tasks as ready due to shutdown */
+ GNUNET_SCHEDULER_shutdown ();
+ }
if (last_tr == tasks_run)
- {
- busy_wait_warning++;
- }
+ {
+ busy_wait_warning++;
+ }
else
- {
- last_tr = tasks_run;
- busy_wait_warning = 0;
- }
+ {
+ last_tr = tasks_run;
+ busy_wait_warning = 0;
+ }
}
GNUNET_SIGNAL_handler_uninstall (shc_int);
GNUNET_SIGNAL_handler_uninstall (shc_term);
/**
* Obtain the reason code for why the current task was
- * started. Will return the same value as
+ * started. Will return the same value as
* the GNUNET_SCHEDULER_TaskContext's reason field.
*
* @return reason(s) why the current task is run
while (t != NULL)
{
if (t->id == task)
- break;
+ break;
prev = t;
t = t->next;
}
while (t == NULL)
{
p++;
- GNUNET_assert (p < GNUNET_SCHEDULER_PRIORITY_COUNT);
+ 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 (t != NULL)
- {
- if (t->id == task)
- {
- ready_count--;
- break;
- }
- prev = t;
- t = t->next;
- }
+ {
+ if (t->id == task)
+ {
+ ready_count--;
+ break;
+ }
+ prev = t;
+ t = t->next;
+ }
}
if (prev == NULL)
{
}
ret = t->callback_cls;
#if DEBUG_TASKS
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Canceling task: %llu / %p\n", task, t->callback_cls);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Canceling task: %llu / %p\n", task, t->callback_cls);
#endif
destroy_task (t);
return ret;
* @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 (GNUNET_SCHEDULER_Task task, void *task_cls,
+ enum GNUNET_SCHEDULER_Reason reason)
{
struct Task *t;
+
#if EXECINFO
void *backtrace_array[50];
#endif
- GNUNET_assert ( (active_task != NULL) ||
- (reason == GNUNET_SCHEDULER_REASON_STARTUP) );
+ GNUNET_assert (NULL != task);
+ GNUNET_assert ((active_task != NULL) ||
+ (reason == GNUNET_SCHEDULER_REASON_STARTUP));
t = GNUNET_malloc (sizeof (struct Task));
#if EXECINFO
- t->num_backtrace_strings = backtrace(backtrace_array, 50);
- t->backtrace_strings = backtrace_symbols(backtrace_array, t->num_backtrace_strings);
+ t->num_backtrace_strings = backtrace (backtrace_array, 50);
+ t->backtrace_strings =
+ backtrace_symbols (backtrace_array, t->num_backtrace_strings);
#endif
t->read_fd = -1;
t->write_fd = -1;
#endif
t->reason = reason;
t->priority = current_priority;
+ t->lifeness = current_lifeness;
#if DEBUG_TASKS
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Adding continuation task: %llu / %p\n",
- t->id, t->callback_cls);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Adding continuation task: %llu / %p\n", t->id, t->callback_cls);
#endif
queue_ready_task (t);
}
*/
GNUNET_SCHEDULER_TaskIdentifier
GNUNET_SCHEDULER_add_after (GNUNET_SCHEDULER_TaskIdentifier prerequisite_task,
- GNUNET_SCHEDULER_Task task, void *task_cls)
+ GNUNET_SCHEDULER_Task task, void *task_cls)
{
return GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_KEEP,
- prerequisite_task,
- GNUNET_TIME_UNIT_ZERO,
- NULL, NULL, task, task_cls);
+ prerequisite_task,
+ GNUNET_TIME_UNIT_ZERO, NULL, NULL, task,
+ task_cls);
}
*/
GNUNET_SCHEDULER_TaskIdentifier
GNUNET_SCHEDULER_add_with_priority (enum GNUNET_SCHEDULER_Priority prio,
- GNUNET_SCHEDULER_Task task,
- void *task_cls)
+ GNUNET_SCHEDULER_Task task,
+ void *task_cls)
{
- return GNUNET_SCHEDULER_add_select (prio,
- GNUNET_SCHEDULER_NO_TASK,
- GNUNET_TIME_UNIT_ZERO,
- NULL, NULL, task, task_cls);
+ return GNUNET_SCHEDULER_add_select (prio, GNUNET_SCHEDULER_NO_TASK,
+ GNUNET_TIME_UNIT_ZERO, NULL, NULL, task,
+ task_cls);
}
* will be scheduled for execution once the delay has expired. It
* will be run with the priority of the calling task.
*
- * @param delay when should this operation time out? Use
+ * @param delay when should this operation time out? Use
* GNUNET_TIME_UNIT_FOREVER_REL for "on shutdown"
* @param task main function of the task
* @param task_cls closure of task
*/
GNUNET_SCHEDULER_TaskIdentifier
GNUNET_SCHEDULER_add_delayed (struct GNUNET_TIME_Relative delay,
- GNUNET_SCHEDULER_Task task, void *task_cls)
+ GNUNET_SCHEDULER_Task task, void *task_cls)
{
#if 1
/* new, optimized version */
struct Task *t;
struct Task *pos;
struct Task *prev;
+
#if EXECINFO
void *backtrace_array[MAX_TRACE_DEPTH];
#endif
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);
+ 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;
#endif
t->timeout = GNUNET_TIME_relative_to_absolute (delay);
t->priority = current_priority;
+ t->lifeness = current_lifeness;
/* try tail first (optimization in case we are
- appending to a long list of tasks with timeouts) */
+ * appending to a long list of tasks with timeouts) */
prev = pending_timeout_last;
- if (prev != NULL)
+ if (prev != NULL)
{
if (prev->timeout.abs_value > t->timeout.abs_value)
prev = NULL;
else
- pos = prev->next; /* heuristic success! */
+ pos = prev->next; /* heuristic success! */
}
if (prev == NULL)
{
/* heuristic failed, do traversal of timeout list */
pos = pending_timeout;
}
- while ( (pos != NULL) &&
- ( (pos->timeout.abs_value <= t->timeout.abs_value) ||
- (pos->reason != 0) ) )
+ while ((pos != NULL) &&
+ ((pos->timeout.abs_value <= t->timeout.abs_value) ||
+ (pos->reason != 0)))
{
prev = pos;
pos = pos->next;
pending_timeout_last = t;
#if DEBUG_TASKS
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Adding task: %llu / %p\n", t->id, t->callback_cls);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Adding task: %llu / %p\n", t->id, t->callback_cls);
#endif
#if EXECINFO
int i;
- for (i=0;i<t->num_backtrace_strings;i++)
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Task %llu trace %d: %s\n",
- t->id,
- i,
- t->backtrace_strings[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;
#else
/* unoptimized version */
return GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_KEEP,
- GNUNET_SCHEDULER_NO_TASK, delay,
- NULL, NULL, task, task_cls);
+ GNUNET_SCHEDULER_NO_TASK, delay, NULL,
+ NULL, task, task_cls);
#endif
}
* only valid until "task" is started!
*/
GNUNET_SCHEDULER_TaskIdentifier
-GNUNET_SCHEDULER_add_now (GNUNET_SCHEDULER_Task task,
- void *task_cls)
+GNUNET_SCHEDULER_add_now (GNUNET_SCHEDULER_Task task, void *task_cls)
{
return GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_KEEP,
- GNUNET_SCHEDULER_NO_TASK,
- GNUNET_TIME_UNIT_ZERO,
- NULL, NULL, task, task_cls);
+ GNUNET_SCHEDULER_NO_TASK,
+ GNUNET_TIME_UNIT_ZERO, NULL, NULL, task,
+ task_cls);
+}
+
+
+/**
+ * Schedule a new task to be run as soon as possible with the
+ * (transitive) ignore-shutdown flag either explicitly set or
+ * explicitly enabled. This task (and all tasks created from it,
+ * other than by another call to this function) will either count or
+ * not count for the 'lifeness' of the process. This API is only
+ * useful in a few special cases.
+ *
+ * @param lifeness GNUNET_YES if the task counts for lifeness, GNUNET_NO if not.
+ * @param task main function of the task
+ * @param task_cls closure of task
+ * @return unique task identifier for the job
+ * only valid until "task" is started!
+ */
+GNUNET_SCHEDULER_TaskIdentifier
+GNUNET_SCHEDULER_add_now_with_lifeness (int lifeness,
+ GNUNET_SCHEDULER_Task task,
+ void *task_cls)
+{
+ GNUNET_SCHEDULER_TaskIdentifier ret;
+
+ ret =
+ GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_KEEP,
+ GNUNET_SCHEDULER_NO_TASK,
+ GNUNET_TIME_UNIT_ZERO, NULL, NULL, task,
+ task_cls);
+ GNUNET_assert (pending->id == ret);
+ pending->lifeness = lifeness;
+ return ret;
}
*/
#ifndef MINGW
GNUNET_SCHEDULER_TaskIdentifier
-add_without_sets (struct GNUNET_TIME_Relative delay,
- int rfd,
- int wfd,
+add_without_sets (struct GNUNET_TIME_Relative delay, int rfd, int wfd,
GNUNET_SCHEDULER_Task task, void *task_cls)
{
struct Task *t;
+
#if EXECINFO
void *backtrace_array[MAX_TRACE_DEPTH];
#endif
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);
+ 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)
+ {
+ int flags = fcntl (rfd, F_GETFD);
+
+ if ((flags == -1) && (errno == EBADF))
+ {
+ 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
+ GNUNET_assert (0);
+ }
+ }
+ if (-1 != wfd)
+ {
+ int flags = fcntl (wfd, F_GETFD);
+
+ if (flags == -1 && errno == EBADF)
+ {
+ 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
+ GNUNET_assert (0);
+ }
+ }
#endif
t->read_fd = rfd;
- GNUNET_assert(wfd >= -1);
+ GNUNET_assert (wfd >= -1);
t->write_fd = wfd;
t->id = ++last_id;
#if PROFILE_DELAYS
t->prereq_id = GNUNET_SCHEDULER_NO_TASK;
t->timeout = GNUNET_TIME_relative_to_absolute (delay);
t->priority = check_priority (current_priority);
+ t->lifeness = current_lifeness;
t->next = pending;
pending = t;
- max_priority_added = GNUNET_MAX (max_priority_added,
- t->priority);
+ max_priority_added = GNUNET_MAX (max_priority_added, t->priority);
#if DEBUG_TASKS
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Adding task: %llu / %p\n", t->id, t->callback_cls);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Adding task: %llu / %p\n", t->id, t->callback_cls);
#endif
#if EXECINFO
int i;
- for (i=0;i<t->num_backtrace_strings;i++)
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Task %llu trace %d: %s\n",
- t->id,
- i,
- t->backtrace_strings[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;
}
* socket operation is ready. It will be run with the priority of
* the calling task.
*
- * @param delay when should this operation time out? Use
+ * @param delay when should this operation time out? Use
* GNUNET_TIME_UNIT_FOREVER_REL for "on shutdown"
* @param rfd read file-descriptor
* @param task main function of the task
*/
GNUNET_SCHEDULER_TaskIdentifier
GNUNET_SCHEDULER_add_read_net (struct GNUNET_TIME_Relative delay,
- struct GNUNET_NETWORK_Handle * rfd,
- GNUNET_SCHEDULER_Task task, void *task_cls)
+ struct GNUNET_NETWORK_Handle * rfd,
+ GNUNET_SCHEDULER_Task task, void *task_cls)
{
#if MINGW
struct GNUNET_NETWORK_FDSet *rs;
GNUNET_assert (rfd != NULL);
rs = GNUNET_NETWORK_fdset_create ();
GNUNET_NETWORK_fdset_set (rs, rfd);
- ret = GNUNET_SCHEDULER_add_select (check_priority (current_priority),
- GNUNET_SCHEDULER_NO_TASK, delay,
- rs, NULL, task, task_cls);
+ ret =
+ GNUNET_SCHEDULER_add_select (check_priority (current_priority),
+ GNUNET_SCHEDULER_NO_TASK, delay, rs, NULL,
+ task, task_cls);
GNUNET_NETWORK_fdset_destroy (rs);
return ret;
#else
- return add_without_sets (delay,
- GNUNET_NETWORK_get_fd (rfd),
- -1,
- task,
+ return add_without_sets (delay, GNUNET_NETWORK_get_fd (rfd), -1, task,
task_cls);
#endif
}
* socket operation is ready. It will be run with the priority of
* the calling task.
*
- * @param delay when should this operation time out? Use
+ * @param delay when should this operation time out? Use
* GNUNET_TIME_UNIT_FOREVER_REL for "on shutdown"
* @param wfd write file-descriptor
* @param task main function of the task
*/
GNUNET_SCHEDULER_TaskIdentifier
GNUNET_SCHEDULER_add_write_net (struct GNUNET_TIME_Relative delay,
- struct GNUNET_NETWORK_Handle * wfd,
- GNUNET_SCHEDULER_Task task, void *task_cls)
+ struct GNUNET_NETWORK_Handle * wfd,
+ GNUNET_SCHEDULER_Task task, void *task_cls)
{
#if MINGW
struct GNUNET_NETWORK_FDSet *ws;
GNUNET_assert (wfd != NULL);
ws = GNUNET_NETWORK_fdset_create ();
GNUNET_NETWORK_fdset_set (ws, wfd);
- ret = GNUNET_SCHEDULER_add_select (check_priority (current_priority),
- GNUNET_SCHEDULER_NO_TASK, delay,
- NULL, ws, task, task_cls);
+ ret =
+ GNUNET_SCHEDULER_add_select (check_priority (current_priority),
+ GNUNET_SCHEDULER_NO_TASK, delay, NULL, ws,
+ task, task_cls);
GNUNET_NETWORK_fdset_destroy (ws);
return ret;
#else
- GNUNET_assert(GNUNET_NETWORK_get_fd(wfd) >= 0);
- return add_without_sets (delay,
- -1,
- GNUNET_NETWORK_get_fd (wfd),
- task,
+ GNUNET_assert (GNUNET_NETWORK_get_fd (wfd) >= 0);
+ return add_without_sets (delay, -1, GNUNET_NETWORK_get_fd (wfd), task,
task_cls);
#endif
}
* socket operation is ready. It will be run with the priority of
* the calling task.
*
- * @param delay when should this operation time out? Use
+ * @param delay when should this operation time out? Use
* GNUNET_TIME_UNIT_FOREVER_REL for "on shutdown"
* @param rfd read file-descriptor
* @param task main function of the task
*/
GNUNET_SCHEDULER_TaskIdentifier
GNUNET_SCHEDULER_add_read_file (struct GNUNET_TIME_Relative delay,
- const struct GNUNET_DISK_FileHandle * rfd,
- GNUNET_SCHEDULER_Task task, void *task_cls)
+ const struct GNUNET_DISK_FileHandle * rfd,
+ GNUNET_SCHEDULER_Task task, void *task_cls)
{
#if MINGW
struct GNUNET_NETWORK_FDSet *rs;
GNUNET_assert (rfd != NULL);
rs = GNUNET_NETWORK_fdset_create ();
GNUNET_NETWORK_fdset_handle_set (rs, rfd);
- ret = GNUNET_SCHEDULER_add_select (check_priority (current_priority),
- GNUNET_SCHEDULER_NO_TASK, delay,
- rs, NULL, task, task_cls);
+ ret =
+ GNUNET_SCHEDULER_add_select (check_priority (current_priority),
+ GNUNET_SCHEDULER_NO_TASK, delay, rs, NULL,
+ task, task_cls);
GNUNET_NETWORK_fdset_destroy (rs);
return ret;
#else
int fd;
GNUNET_DISK_internal_file_handle_ (rfd, &fd, sizeof (int));
- return add_without_sets (delay,
- fd,
- -1,
- task,
- task_cls);
+ return add_without_sets (delay, fd, -1, task, task_cls);
#endif
}
* socket operation is ready. It will be run with the priority of
* the calling task.
*
- * @param delay when should this operation time out? Use
+ * @param delay when should this operation time out? Use
* GNUNET_TIME_UNIT_FOREVER_REL for "on shutdown"
* @param wfd write file-descriptor
* @param task main function of the task
*/
GNUNET_SCHEDULER_TaskIdentifier
GNUNET_SCHEDULER_add_write_file (struct GNUNET_TIME_Relative delay,
- const struct GNUNET_DISK_FileHandle * wfd,
- GNUNET_SCHEDULER_Task task, void *task_cls)
+ const struct GNUNET_DISK_FileHandle * wfd,
+ GNUNET_SCHEDULER_Task task, void *task_cls)
{
#if MINGW
struct GNUNET_NETWORK_FDSet *ws;
GNUNET_assert (wfd != NULL);
ws = GNUNET_NETWORK_fdset_create ();
GNUNET_NETWORK_fdset_handle_set (ws, wfd);
- ret = GNUNET_SCHEDULER_add_select (check_priority (current_priority),
- GNUNET_SCHEDULER_NO_TASK,
- delay, NULL, ws, task, task_cls);
+ ret =
+ GNUNET_SCHEDULER_add_select (check_priority (current_priority),
+ GNUNET_SCHEDULER_NO_TASK, delay, NULL, ws,
+ task, task_cls);
GNUNET_NETWORK_fdset_destroy (ws);
return ret;
#else
int fd;
GNUNET_DISK_internal_file_handle_ (wfd, &fd, sizeof (int));
- GNUNET_assert(fd >= 0);
- return add_without_sets (delay,
- -1,
- fd,
- task,
- task_cls);
+ GNUNET_assert (fd >= 0);
+ return add_without_sets (delay, -1, fd, task, task_cls);
#endif
}
*/
GNUNET_SCHEDULER_TaskIdentifier
GNUNET_SCHEDULER_add_select (enum GNUNET_SCHEDULER_Priority prio,
- GNUNET_SCHEDULER_TaskIdentifier
- prerequisite_task,
- 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_TaskIdentifier
+ prerequisite_task,
+ struct GNUNET_TIME_Relative delay,
+ const struct GNUNET_NETWORK_FDSet * rs,
+ const struct GNUNET_NETWORK_FDSet * ws,
+ GNUNET_SCHEDULER_Task task, void *task_cls)
{
struct Task *t;
+
#if EXECINFO
void *backtrace_array[MAX_TRACE_DEPTH];
#endif
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);
+ 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->timeout = GNUNET_TIME_relative_to_absolute (delay);
t->priority =
check_priority ((prio ==
- GNUNET_SCHEDULER_PRIORITY_KEEP) ? current_priority
- : prio);
+ GNUNET_SCHEDULER_PRIORITY_KEEP) ? current_priority :
+ prio);
+ t->lifeness = current_lifeness;
t->next = pending;
pending = t;
- max_priority_added = GNUNET_MAX (max_priority_added,
- t->priority);
+ max_priority_added = GNUNET_MAX (max_priority_added, t->priority);
#if DEBUG_TASKS
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Adding task: %llu / %p\n", t->id, t->callback_cls);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Adding task: %llu / %p\n", t->id, t->callback_cls);
#endif
#if EXECINFO
int i;
- for (i=0;i<t->num_backtrace_strings;i++)
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Task %llu trace %d: %s\n",
- t->id,
- i,
- t->backtrace_strings[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;
}
projects / oweals / gnunet.git / blobdiff