/*
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
* 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_NO
+
/**
* Depth of the traces collected via EXECINFO.
*/
* Set if we only wait for writing to a single FD, otherwise -1.
*/
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
/**
/**
- * Handle for the scheduling service.
+ * List of tasks waiting for an event.
*/
-struct GNUNET_SCHEDULER_Handle
-{
-
- /**
- * List of tasks waiting for an event.
- */
- struct Task *pending;
+static struct Task *pending;
- /**
- * 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).
- */
- struct Task *pending_timeout;
-
- /**
- * Last inserted task waiting ONLY for a timeout event.
- * Used to (heuristically) speed up insertion.
- */
- struct Task *pending_timeout_last;
-
- /**
- * ID of the task that is running right now.
- */
- struct Task *active_task;
+/**
+ * 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 Task *pending_timeout;
- /**
- * List of tasks ready to run right now,
- * grouped by importance.
- */
- struct Task *ready[GNUNET_SCHEDULER_PRIORITY_COUNT];
+/**
+ * Last inserted task waiting ONLY for a timeout event.
+ * Used to (heuristically) speed up insertion.
+ */
+static struct Task *pending_timeout_last;
- /**
- * 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).
- */
- GNUNET_SCHEDULER_TaskIdentifier last_id;
+/**
+ * ID of the task that is running right now.
+ */
+static struct Task *active_task;
- /**
- * Highest number so that all tasks with smaller identifiers
- * have already completed. Also the lowest number of a task
- * still waiting to be executed.
- */
- GNUNET_SCHEDULER_TaskIdentifier lowest_pending_id;
+/**
+ * List of tasks ready to run right now,
+ * grouped by importance.
+ */
+static struct Task *ready[GNUNET_SCHEDULER_PRIORITY_COUNT];
- /**
- * Number of tasks on the ready list.
- */
- unsigned int ready_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).
+ */
+static GNUNET_SCHEDULER_TaskIdentifier last_id;
- /**
- * How many tasks have we run so far?
- */
- unsigned long long tasks_run;
+/**
+ * Highest number so that all tasks with smaller identifiers
+ * have already completed. Also the lowest number of a task
+ * still waiting to be executed.
+ */
+static GNUNET_SCHEDULER_TaskIdentifier lowest_pending_id;
- /**
- * Priority of the task running right now. Only
- * valid while a task is running.
- */
- enum GNUNET_SCHEDULER_Priority current_priority;
+/**
+ * Number of tasks on the ready list.
+ */
+static unsigned int ready_count;
- /**
- * Priority of the highest task added in the current select
- * iteration.
- */
- enum GNUNET_SCHEDULER_Priority max_priority_added;
+/**
+ * How many tasks have we run so far?
+ */
+static unsigned long long tasks_run;
- /**
- * How 'nice' are we right now?
- */
- int nice_level;
+/**
+ * Priority of the task running right now. Only
+ * valid while a task is running.
+ */
+static enum GNUNET_SCHEDULER_Priority current_priority;
-};
+/**
+ * Priority of the highest task added in the current select
+ * iteration.
+ */
+static enum GNUNET_SCHEDULER_Priority max_priority_added;
+/**
+ * Value of the 'lifeness' flag for the current task.
+ */
+static int current_lifeness;
/**
* Check that the given priority is legal (and return it).
* future), but only if the return value is "GNUNET_NO" (and
* the "lowest_pending_id" check failed).
*
- * @param sched the scheduler
* @param id which task are we checking for
* @return GNUNET_YES if so, GNUNET_NO if not
*/
static int
-is_pending (struct GNUNET_SCHEDULER_Handle *sched,
- GNUNET_SCHEDULER_TaskIdentifier id)
+is_pending (GNUNET_SCHEDULER_TaskIdentifier id)
{
struct Task *pos;
enum GNUNET_SCHEDULER_Priority p;
GNUNET_SCHEDULER_TaskIdentifier min;
- if (id < sched->lowest_pending_id)
+ if (id < lowest_pending_id)
return GNUNET_NO;
min = -1; /* maximum value */
- pos = sched->pending;
+ pos = pending;
while (pos != NULL)
{
if (pos->id == id)
min = pos->id;
pos = pos->next;
}
- pos = sched->pending_timeout;
+ pos = pending_timeout;
while (pos != NULL)
{
if (pos->id == id)
}
for (p = 0; p < GNUNET_SCHEDULER_PRIORITY_COUNT; p++)
{
- pos = sched->ready[p];
+ pos = ready[p];
while (pos != NULL)
{
if (pos->id == id)
pos = pos->next;
}
}
- sched->lowest_pending_id = min;
+ lowest_pending_id = min;
return GNUNET_NO;
}
/**
* Update all sets and timeout for select.
*
- * @param sched the scheduler
* @param rs read-set, set to all FDs we would like to read (updated)
* @param ws write-set, set to all FDs we would like to write (updated)
* @param timeout next timeout (updated)
*/
static void
-update_sets (struct GNUNET_SCHEDULER_Handle *sched,
- struct GNUNET_NETWORK_FDSet *rs,
+update_sets (struct GNUNET_NETWORK_FDSet *rs,
struct GNUNET_NETWORK_FDSet *ws,
struct GNUNET_TIME_Relative *timeout)
{
struct GNUNET_TIME_Relative to;
now = GNUNET_TIME_absolute_get ();
- pos = sched->pending_timeout;
+ pos = pending_timeout;
if (pos != NULL)
{
to = GNUNET_TIME_absolute_get_difference (now, pos->timeout);
- if (timeout->value > to.value)
+ if (timeout->rel_value > to.rel_value)
*timeout = to;
if (pos->reason != 0)
*timeout = GNUNET_TIME_UNIT_ZERO;
}
- pos = sched->pending;
+ pos = pending;
while (pos != NULL)
{
if ((pos->prereq_id != GNUNET_SCHEDULER_NO_TASK) &&
- (GNUNET_YES == is_pending (sched, pos->prereq_id)))
+ (GNUNET_YES == is_pending (pos->prereq_id)))
{
pos = pos->next;
continue;
}
- if (pos->timeout.value != GNUNET_TIME_UNIT_FOREVER_ABS.value)
+ if (pos->timeout.abs_value != GNUNET_TIME_UNIT_FOREVER_ABS.abs_value)
{
to = GNUNET_TIME_absolute_get_difference (now, pos->timeout);
- if (timeout->value > to.value)
+ if (timeout->rel_value > to.rel_value)
*timeout = to;
}
if (pos->read_fd != -1)
* Check if the given task is eligible to run now.
* Also set the reason why it is eligible.
*
- * @param sched the scheduler
* @param task task to check if it is ready
* @param now the current time
* @param rs set of FDs ready for reading
* @return GNUNET_YES if we can run it, GNUNET_NO if not.
*/
static int
-is_ready (struct GNUNET_SCHEDULER_Handle *sched,
- struct Task *task,
+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.value >= task->timeout.value)
+ 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) &&
return GNUNET_NO; /* not ready */
if (task->prereq_id != GNUNET_SCHEDULER_NO_TASK)
{
- if (GNUNET_YES == is_pending (sched, task->prereq_id))
+ if (GNUNET_YES == is_pending (task->prereq_id))
{
task->reason = reason;
return GNUNET_NO; /* prereq waiting */
/**
* Put a task that is ready for execution into the ready queue.
*
- * @param handle the scheduler
* @param task task ready for execution
*/
static void
-queue_ready_task (struct GNUNET_SCHEDULER_Handle *handle,
- struct Task *task)
+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 = handle->ready[check_priority (p)];
- handle->ready[check_priority (p)] = task;
- handle->ready_count++;
+ task->next = ready[check_priority (p)];
+ ready[check_priority (p)] = task;
+ ready_count++;
}
* Check which tasks are ready and move them
* to the respective ready queue.
*
- * @param handle the scheduler
* @param rs FDs ready for reading
* @param ws FDs ready for writing
*/
static void
-check_ready (struct GNUNET_SCHEDULER_Handle *handle,
- const struct GNUNET_NETWORK_FDSet *rs,
+check_ready (const struct GNUNET_NETWORK_FDSet *rs,
const struct GNUNET_NETWORK_FDSet *ws)
{
struct Task *pos;
now = GNUNET_TIME_absolute_get ();
prev = NULL;
- pos = handle->pending_timeout;
+ pos = pending_timeout;
while (pos != NULL)
{
next = pos->next;
- if (now.value >= pos->timeout.value)
+ if (now.abs_value >= pos->timeout.abs_value)
pos->reason |= GNUNET_SCHEDULER_REASON_TIMEOUT;
if (0 == pos->reason)
break;
- handle->pending_timeout = next;
- if (handle->pending_timeout_last == pos)
- handle->pending_timeout_last = NULL;
- queue_ready_task (handle, pos);
+ pending_timeout = next;
+ if (pending_timeout_last == pos)
+ pending_timeout_last = NULL;
+ queue_ready_task (pos);
pos = next;
}
- pos = handle->pending;
+ pos = pending;
while (pos != NULL)
{
#if DEBUG_TASKS
pos->id, pos->callback_cls);
#endif
next = pos->next;
- if (GNUNET_YES == is_ready (handle, pos, now, rs, ws))
+ if (GNUNET_YES == is_ready (pos, now, rs, ws))
{
if (prev == NULL)
- handle->pending = next;
+ pending = next;
else
prev->next = next;
- queue_ready_task (handle, pos);
+ queue_ready_task (pos);
pos = next;
continue;
}
* 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.
- *
- * @param sched the scheduler
*/
void
-GNUNET_SCHEDULER_shutdown (struct GNUNET_SCHEDULER_Handle *sched)
+GNUNET_SCHEDULER_shutdown ()
{
struct Task *pos;
int i;
- pos = sched->pending_timeout;
+ pos = pending_timeout;
while (pos != NULL)
{
pos->reason |= GNUNET_SCHEDULER_REASON_SHUTDOWN;
readiness-factors */
pos = pos->next;
}
- pos = sched->pending;
+ pos = pending;
while (pos != NULL)
{
pos->reason |= GNUNET_SCHEDULER_REASON_SHUTDOWN;
}
for (i=0;i<GNUNET_SCHEDULER_PRIORITY_COUNT;i++)
{
- pos = sched->ready[i];
+ pos = ready[i];
while (pos != NULL)
{
pos->reason |= GNUNET_SCHEDULER_REASON_SHUTDOWN;
* may become ready, hence we should select on it). Naturally, if
* there are no more ready tasks, we also return.
*
- * @param sched the scheduler
* @param rs FDs ready for reading
* @param ws FDs ready for writing
*/
static void
-run_ready (struct GNUNET_SCHEDULER_Handle *sched,
- struct GNUNET_NETWORK_FDSet *rs,
+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;
- sched->max_priority_added = GNUNET_SCHEDULER_PRIORITY_KEEP;
+ max_priority_added = GNUNET_SCHEDULER_PRIORITY_KEEP;
do
{
- if (sched->ready_count == 0)
+ if (ready_count == 0)
return;
- GNUNET_assert (sched->ready[GNUNET_SCHEDULER_PRIORITY_KEEP] == NULL);
+ 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)! */
for (p = GNUNET_SCHEDULER_PRIORITY_COUNT - 1; p > 0; p--)
{
- pos = sched->ready[p];
+ pos = ready[p];
if (pos != NULL)
break;
}
GNUNET_assert (pos != NULL); /* ready_count wrong? */
- sched->ready[p] = pos->next;
- sched->ready_count--;
- if (sched->current_priority != pos->priority)
+ ready[p] = pos->next;
+ ready_count--;
+ if (current_priority != pos->priority)
{
- sched->current_priority = pos->priority;
- (void) GNUNET_OS_set_process_priority (0, pos->priority);
+ current_priority = pos->priority;
+ (void) GNUNET_OS_set_process_priority (GNUNET_OS_process_current (),
+ pos->priority);
}
- sched->active_task = pos;
+ current_lifeness = pos->lifeness;
+ active_task = pos;
#if PROFILE_DELAYS
- if (GNUNET_TIME_absolute_get_duration (pos->start_time).value >
- DELAY_THRESHOLD.value)
+ if (GNUNET_TIME_absolute_get_duration (pos->start_time).rel_value >
+ DELAY_THRESHOLD.rel_value)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Task %u took %llums to be scheduled\n",
+ "Task %llu took %llums to be scheduled\n",
pos->id,
- (unsigned long long) GNUNET_TIME_absolute_get_duration (pos->start_time).value);
+ (unsigned long long) GNUNET_TIME_absolute_get_duration (pos->start_time).rel_value);
}
#endif
- tc.sched = sched;
tc.reason = pos->reason;
tc.read_ready = (pos->read_set == NULL) ? rs : pos->read_set;
if ( (pos->read_fd != -1) &&
int i;
for (i=0;i<pos->num_backtrace_strings;i++)
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Task %u trace %d: %s\n",
+ "Task %llu trace %d: %s\n",
pos->id,
i,
pos->backtrace_strings[i]);
#endif
- sched->active_task = NULL;
+ active_task = NULL;
destroy_task (pos);
- sched->tasks_run++;
+ tasks_run++;
}
- while ( (sched->pending == NULL) || (p >= sched->max_priority_added) );
+ while ( (pending == NULL) || (p >= max_priority_added) );
}
/**
/**
* Signal handler called for SIGPIPE.
*/
+#ifndef MINGW
static void
sighandler_pipe ()
{
return;
}
-
+#endif
/**
* Signal handler called for signals that should cause us to shutdown.
*/
}
+/**
+ * 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
void
GNUNET_SCHEDULER_run (GNUNET_SCHEDULER_Task task, void *task_cls)
{
- struct GNUNET_SCHEDULER_Handle sched;
struct GNUNET_NETWORK_FDSet *rs;
struct GNUNET_NETWORK_FDSet *ws;
struct GNUNET_TIME_Relative timeout;
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;
struct GNUNET_SIGNAL_Context *shc_pipe;
+#endif
unsigned long long last_tr;
unsigned int busy_wait_warning;
const struct GNUNET_DISK_FileHandle *pr;
char c;
+ GNUNET_assert (active_task == NULL);
rs = GNUNET_NETWORK_fdset_create ();
ws = GNUNET_NETWORK_fdset_create ();
GNUNET_assert (shutdown_pipe_handle == NULL);
- shutdown_pipe_handle = GNUNET_DISK_pipe (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);
GNUNET_assert (pr != NULL);
shc_quit = GNUNET_SIGNAL_handler_install (SIGQUIT, &sighandler_shutdown);
shc_hup = GNUNET_SIGNAL_handler_install (SIGHUP, &sighandler_shutdown);
#endif
- memset (&sched, 0, sizeof (sched));
- sched.current_priority = GNUNET_SCHEDULER_PRIORITY_DEFAULT;
- GNUNET_SCHEDULER_add_continuation (&sched,
- task,
+ current_priority = GNUNET_SCHEDULER_PRIORITY_DEFAULT;
+ current_lifeness = GNUNET_YES;
+ GNUNET_SCHEDULER_add_continuation (task,
task_cls,
GNUNET_SCHEDULER_REASON_STARTUP);
+#if ENABLE_WINDOWS_WORKAROUNDS
+ 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 ((sched.pending != NULL) ||
- (sched.pending_timeout != NULL) ||
- (sched.ready_count > 0))
+ while (GNUNET_OK == check_lifeness ())
{
GNUNET_NETWORK_fdset_zero (rs);
GNUNET_NETWORK_fdset_zero (ws);
timeout = GNUNET_TIME_UNIT_FOREVER_REL;
- update_sets (&sched, rs, ws, &timeout);
+ update_sets (rs, ws, &timeout);
GNUNET_NETWORK_fdset_handle_set (rs, pr);
- if (sched.ready_count > 0)
+ if (ready_count > 0)
{
/* no blocking, more work already ready! */
timeout = GNUNET_TIME_UNIT_ZERO;
#if USE_LSOF
char lsof[512];
snprintf (lsof, sizeof (lsof), "lsof -p %d", getpid());
- close (1);
- dup2 (2, 1);
- system (lsof);
+ (void) close (1);
+ (void) dup2 (2, 1);
+ if (0 != system (lsof))
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "system");
#endif
#endif
abort ();
break;
}
- if ((ret == 0) && (timeout.value == 0) && (busy_wait_warning > 16))
+ 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 */
}
- check_ready (&sched, rs, ws);
- run_ready (&sched, rs, ws);
+ 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 (&sched);
+ GNUNET_SCHEDULER_shutdown ();
}
- if (last_tr == sched.tasks_run)
+ if (last_tr == tasks_run)
{
busy_wait_warning++;
}
else
{
- last_tr = sched.tasks_run;
+ last_tr = tasks_run;
busy_wait_warning = 0;
}
}
* started. Will return the same value as
* the GNUNET_SCHEDULER_TaskContext's reason field.
*
- * @param sched scheduler to query
* @return reason(s) why the current task is run
*/
enum GNUNET_SCHEDULER_Reason
-GNUNET_SCHEDULER_get_reason (struct GNUNET_SCHEDULER_Handle *sched)
+GNUNET_SCHEDULER_get_reason ()
{
- return sched->active_task->reason;
+ GNUNET_assert (active_task != NULL);
+ return active_task->reason;
}
* dropped (if the decision should be made based on the number of
* tasks ready to run).
*
- * @param sched scheduler to query
* @param p priority level to look at
* @return number of tasks pending right now
*/
unsigned int
-GNUNET_SCHEDULER_get_load (struct GNUNET_SCHEDULER_Handle *sched,
- enum GNUNET_SCHEDULER_Priority p)
+GNUNET_SCHEDULER_get_load (enum GNUNET_SCHEDULER_Priority p)
{
struct Task *pos;
unsigned int ret;
+ GNUNET_assert (active_task != NULL);
if (p == GNUNET_SCHEDULER_PRIORITY_COUNT)
- return sched->ready_count;
+ return ready_count;
if (p == GNUNET_SCHEDULER_PRIORITY_KEEP)
- p = sched->current_priority;
+ p = current_priority;
ret = 0;
- pos = sched->ready[check_priority (p)];
+ pos = ready[check_priority (p)];
while (pos != NULL)
{
pos = pos->next;
* Cancel the task with the specified identifier.
* The task must not yet have run.
*
- * @param sched scheduler to use
* @param task id of the task to cancel
* @return original closure of the task
*/
void *
-GNUNET_SCHEDULER_cancel (struct GNUNET_SCHEDULER_Handle *sched,
- GNUNET_SCHEDULER_TaskIdentifier task)
+GNUNET_SCHEDULER_cancel (GNUNET_SCHEDULER_TaskIdentifier task)
{
struct Task *t;
struct Task *prev;
int to;
void *ret;
+ GNUNET_assert (active_task != NULL);
to = 0;
prev = NULL;
- t = sched->pending;
+ t = pending;
while (t != NULL)
{
if (t->id == task)
{
prev = NULL;
to = 1;
- t = sched->pending_timeout;
+ t = pending_timeout;
while (t != NULL)
{
if (t->id == task)
prev = t;
t = t->next;
}
- if (sched->pending_timeout_last == t)
- sched->pending_timeout_last = NULL;
+ if (pending_timeout_last == t)
+ pending_timeout_last = NULL;
}
p = 0;
while (t == NULL)
{
p++;
- GNUNET_assert (p < GNUNET_SCHEDULER_PRIORITY_COUNT);
+ if (p >= GNUNET_SCHEDULER_PRIORITY_COUNT)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Attempt to cancel dead task %llu!\n"),
+ (unsigned long long) task);
+ GNUNET_assert (0);
+ }
prev = NULL;
- t = sched->ready[p];
+ t = ready[p];
while (t != NULL)
{
if (t->id == task)
{
- sched->ready_count--;
+ ready_count--;
break;
}
prev = t;
{
if (to == 0)
{
- sched->pending = t->next;
+ pending = t->next;
}
else
{
- sched->pending_timeout = t->next;
+ pending_timeout = t->next;
}
}
else
{
- sched->ready[p] = t->next;
+ ready[p] = t->next;
}
}
else
* similar to the other "add" functions except that there is no delay
* and the reason code can be specified.
*
- * @param sched scheduler to use
* @param task main function of the task
* @param task_cls closure for 'main'
* @param reason reason for task invocation
*/
void
-GNUNET_SCHEDULER_add_continuation (struct GNUNET_SCHEDULER_Handle *sched,
- GNUNET_SCHEDULER_Task task,
+GNUNET_SCHEDULER_add_continuation (GNUNET_SCHEDULER_Task task,
void *task_cls,
enum GNUNET_SCHEDULER_Reason reason)
{
#if EXECINFO
void *backtrace_array[50];
#endif
+
+ 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->write_fd = -1;
t->callback = task;
t->callback_cls = task_cls;
- t->id = ++sched->last_id;
+ t->id = ++last_id;
#if PROFILE_DELAYS
t->start_time = GNUNET_TIME_absolute_get ();
#endif
t->reason = reason;
- t->priority = sched->current_priority;
+ 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);
#endif
- queue_ready_task (sched, t);
+ queue_ready_task (t);
}
* has completed. It will be run with the priority of the calling
* task.
*
- * @param sched scheduler to use
* @param prerequisite_task run this task after the task with the given
* task identifier completes (and any of our other
* conditions, such as delay, read or write-readiness
* only valid until "task" is started!
*/
GNUNET_SCHEDULER_TaskIdentifier
-GNUNET_SCHEDULER_add_after (struct GNUNET_SCHEDULER_Handle *sched,
- GNUNET_SCHEDULER_TaskIdentifier prerequisite_task,
+GNUNET_SCHEDULER_add_after (GNUNET_SCHEDULER_TaskIdentifier prerequisite_task,
GNUNET_SCHEDULER_Task task, void *task_cls)
{
- return GNUNET_SCHEDULER_add_select (sched,
- GNUNET_SCHEDULER_PRIORITY_KEEP,
+ return GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_KEEP,
prerequisite_task,
GNUNET_TIME_UNIT_ZERO,
NULL, NULL, task, task_cls);
/**
* Schedule a new task to be run with a specified priority.
*
- * @param sched scheduler to use
* @param prio how important is the new task?
* @param task main function of the task
* @param task_cls closure of task
* only valid until "task" is started!
*/
GNUNET_SCHEDULER_TaskIdentifier
-GNUNET_SCHEDULER_add_with_priority (struct GNUNET_SCHEDULER_Handle * sched,
- enum GNUNET_SCHEDULER_Priority prio,
+GNUNET_SCHEDULER_add_with_priority (enum GNUNET_SCHEDULER_Priority prio,
GNUNET_SCHEDULER_Task task,
void *task_cls)
{
- return GNUNET_SCHEDULER_add_select (sched,
- prio,
+ 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 sched scheduler to 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
* only valid until "task" is started!
*/
GNUNET_SCHEDULER_TaskIdentifier
-GNUNET_SCHEDULER_add_delayed (struct GNUNET_SCHEDULER_Handle * sched,
- struct GNUNET_TIME_Relative delay,
+GNUNET_SCHEDULER_add_delayed (struct GNUNET_TIME_Relative delay,
GNUNET_SCHEDULER_Task task, void *task_cls)
{
#if 1
void *backtrace_array[MAX_TRACE_DEPTH];
#endif
+ GNUNET_assert (active_task != NULL);
GNUNET_assert (NULL != task);
t = GNUNET_malloc (sizeof (struct Task));
t->callback = task;
#endif
t->read_fd = -1;
t->write_fd = -1;
- t->id = ++sched->last_id;
+ 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 = sched->current_priority;
+ 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) */
- prev = sched->pending_timeout_last;
+ prev = pending_timeout_last;
if (prev != NULL)
{
- if (prev->timeout.value > t->timeout.value)
+ if (prev->timeout.abs_value > t->timeout.abs_value)
prev = NULL;
else
pos = prev->next; /* heuristic success! */
if (prev == NULL)
{
/* heuristic failed, do traversal of timeout list */
- pos = sched->pending_timeout;
+ pos = pending_timeout;
}
while ( (pos != NULL) &&
- ( (pos->timeout.value <= t->timeout.value) ||
+ ( (pos->timeout.abs_value <= t->timeout.abs_value) ||
(pos->reason != 0) ) )
{
prev = pos;
pos = pos->next;
}
if (prev == NULL)
- sched->pending_timeout = t;
+ pending_timeout = t;
else
prev->next = t;
t->next = pos;
/* hyper-optimization... */
- sched->pending_timeout_last = t;
+ pending_timeout_last = t;
#if DEBUG_TASKS
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
for (i=0;i<t->num_backtrace_strings;i++)
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Task %u trace %d: %s\n",
+ "Task %llu trace %d: %s\n",
t->id,
i,
t->backtrace_strings[i]);
#else
/* unoptimized version */
- return GNUNET_SCHEDULER_add_select (sched,
- GNUNET_SCHEDULER_PRIORITY_KEEP,
+ return GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_KEEP,
GNUNET_SCHEDULER_NO_TASK, delay,
NULL, NULL, task, task_cls);
#endif
* Schedule a new task to be run as soon as possible. The task
* will be run with the priority of the calling task.
*
- * @param sched scheduler to use
* @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 (struct GNUNET_SCHEDULER_Handle *sched,
- GNUNET_SCHEDULER_Task task,
+GNUNET_SCHEDULER_add_now (GNUNET_SCHEDULER_Task task,
void *task_cls)
{
- return GNUNET_SCHEDULER_add_select (sched,
- GNUNET_SCHEDULER_PRIORITY_KEEP,
+ return GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_KEEP,
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;
+}
+
+
/**
* || shutdown-active )
* </code>
*
- * @param sched scheduler to use
* @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 rfd file descriptor we want to read (can be -1)
* @return unique task identifier for the job
* only valid until "task" is started!
*/
+#ifndef MINGW
GNUNET_SCHEDULER_TaskIdentifier
-add_without_sets (struct GNUNET_SCHEDULER_Handle * sched,
- struct GNUNET_TIME_Relative delay,
+add_without_sets (struct GNUNET_TIME_Relative delay,
int rfd,
int wfd,
GNUNET_SCHEDULER_Task task, void *task_cls)
void *backtrace_array[MAX_TRACE_DEPTH];
#endif
+ GNUNET_assert (active_task != NULL);
GNUNET_assert (NULL != task);
t = GNUNET_malloc (sizeof (struct Task));
t->callback = task;
#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)
+ {
+ int flags = fcntl(rfd, F_GETFD);
+ if (flags == -1 && errno == EBADF)
+ {
+ GNUNET_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++)
+ GNUNET_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)
+ {
+ GNUNET_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++)
+ GNUNET_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);
t->write_fd = wfd;
- t->id = ++sched->last_id;
+ t->id = ++last_id;
#if PROFILE_DELAYS
t->start_time = GNUNET_TIME_absolute_get ();
#endif
t->prereq_id = GNUNET_SCHEDULER_NO_TASK;
t->timeout = GNUNET_TIME_relative_to_absolute (delay);
- t->priority = check_priority (sched->current_priority);
- t->next = sched->pending;
- sched->pending = t;
- sched->max_priority_added = GNUNET_MAX (sched->max_priority_added,
+ 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);
#if DEBUG_TASKS
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
for (i=0;i<t->num_backtrace_strings;i++)
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Task %u trace %d: %s\n",
+ "Task %llu trace %d: %s\n",
t->id,
i,
t->backtrace_strings[i]);
#endif
return t->id;
}
+#endif
* socket operation is ready. It will be run with the priority of
* the calling task.
*
- * @param sched scheduler to use
* @param delay when should this operation time out? Use
* GNUNET_TIME_UNIT_FOREVER_REL for "on shutdown"
* @param rfd read file-descriptor
* only valid until "task" is started!
*/
GNUNET_SCHEDULER_TaskIdentifier
-GNUNET_SCHEDULER_add_read_net (struct GNUNET_SCHEDULER_Handle * sched,
- struct GNUNET_TIME_Relative delay,
+GNUNET_SCHEDULER_add_read_net (struct GNUNET_TIME_Relative delay,
struct GNUNET_NETWORK_Handle * rfd,
GNUNET_SCHEDULER_Task task, void *task_cls)
{
- return add_without_sets (sched,
- delay,
+#if MINGW
+ struct GNUNET_NETWORK_FDSet *rs;
+ GNUNET_SCHEDULER_TaskIdentifier ret;
+
+ 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);
+ GNUNET_NETWORK_fdset_destroy (rs);
+ return ret;
+#else
+ 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 sched scheduler to use
* @param delay when should this operation time out? Use
* GNUNET_TIME_UNIT_FOREVER_REL for "on shutdown"
* @param wfd write file-descriptor
* only valid until "task" is started!
*/
GNUNET_SCHEDULER_TaskIdentifier
-GNUNET_SCHEDULER_add_write_net (struct GNUNET_SCHEDULER_Handle * sched,
- struct GNUNET_TIME_Relative delay,
+GNUNET_SCHEDULER_add_write_net (struct GNUNET_TIME_Relative delay,
struct GNUNET_NETWORK_Handle * wfd,
GNUNET_SCHEDULER_Task task, void *task_cls)
{
- return add_without_sets (sched,
- delay,
+#if MINGW
+ struct GNUNET_NETWORK_FDSet *ws;
+ GNUNET_SCHEDULER_TaskIdentifier ret;
+
+ 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);
+ 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,
task_cls);
+#endif
}
* socket operation is ready. It will be run with the priority of
* the calling task.
*
- * @param sched scheduler to use
* @param delay when should this operation time out? Use
* GNUNET_TIME_UNIT_FOREVER_REL for "on shutdown"
* @param rfd read file-descriptor
* only valid until "task" is started!
*/
GNUNET_SCHEDULER_TaskIdentifier
-GNUNET_SCHEDULER_add_read_file (struct GNUNET_SCHEDULER_Handle * sched,
- struct GNUNET_TIME_Relative delay,
+GNUNET_SCHEDULER_add_read_file (struct GNUNET_TIME_Relative delay,
const struct GNUNET_DISK_FileHandle * rfd,
GNUNET_SCHEDULER_Task task, void *task_cls)
{
GNUNET_assert (rfd != NULL);
rs = GNUNET_NETWORK_fdset_create ();
GNUNET_NETWORK_fdset_handle_set (rs, rfd);
- ret = GNUNET_SCHEDULER_add_select (sched,
- GNUNET_SCHEDULER_PRIORITY_KEEP,
+ ret = GNUNET_SCHEDULER_add_select (check_priority (current_priority),
GNUNET_SCHEDULER_NO_TASK, delay,
rs, NULL, task, task_cls);
GNUNET_NETWORK_fdset_destroy (rs);
int fd;
GNUNET_DISK_internal_file_handle_ (rfd, &fd, sizeof (int));
- return add_without_sets (sched,
- delay,
+ return add_without_sets (delay,
fd,
-1,
task,
* socket operation is ready. It will be run with the priority of
* the calling task.
*
- * @param sched scheduler to use
* @param delay when should this operation time out? Use
* GNUNET_TIME_UNIT_FOREVER_REL for "on shutdown"
* @param wfd write file-descriptor
* only valid until "task" is started!
*/
GNUNET_SCHEDULER_TaskIdentifier
-GNUNET_SCHEDULER_add_write_file (struct GNUNET_SCHEDULER_Handle * sched,
- struct GNUNET_TIME_Relative delay,
+GNUNET_SCHEDULER_add_write_file (struct GNUNET_TIME_Relative delay,
const struct GNUNET_DISK_FileHandle * wfd,
GNUNET_SCHEDULER_Task task, void *task_cls)
{
GNUNET_assert (wfd != NULL);
ws = GNUNET_NETWORK_fdset_create ();
GNUNET_NETWORK_fdset_handle_set (ws, wfd);
- ret = GNUNET_SCHEDULER_add_select (sched,
- GNUNET_SCHEDULER_PRIORITY_KEEP,
+ ret = GNUNET_SCHEDULER_add_select (check_priority (current_priority),
GNUNET_SCHEDULER_NO_TASK,
delay, NULL, ws, task, task_cls);
GNUNET_NETWORK_fdset_destroy (ws);
int fd;
GNUNET_DISK_internal_file_handle_ (wfd, &fd, sizeof (int));
- return add_without_sets (sched,
- delay,
+ GNUNET_assert(fd >= 0);
+ return add_without_sets (delay,
-1,
fd,
task,
* || (shutdown-active && run-on-shutdown) )
* </code>
*
- * @param sched scheduler to use
* @param prio how important is this task?
* @param prerequisite_task run this task after the task with the given
* task identifier completes (and any of our other
* only valid until "task" is started!
*/
GNUNET_SCHEDULER_TaskIdentifier
-GNUNET_SCHEDULER_add_select (struct GNUNET_SCHEDULER_Handle * sched,
- enum GNUNET_SCHEDULER_Priority prio,
+GNUNET_SCHEDULER_add_select (enum GNUNET_SCHEDULER_Priority prio,
GNUNET_SCHEDULER_TaskIdentifier
prerequisite_task,
struct GNUNET_TIME_Relative delay,
void *backtrace_array[MAX_TRACE_DEPTH];
#endif
+ GNUNET_assert (active_task != NULL);
GNUNET_assert (NULL != task);
t = GNUNET_malloc (sizeof (struct Task));
t->callback = task;
t->write_set = GNUNET_NETWORK_fdset_create ();
GNUNET_NETWORK_fdset_copy (t->write_set, ws);
}
- t->id = ++sched->last_id;
+ 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 ((prio ==
- GNUNET_SCHEDULER_PRIORITY_KEEP) ? sched->current_priority
+ GNUNET_SCHEDULER_PRIORITY_KEEP) ? current_priority
: prio);
- t->next = sched->pending;
- sched->pending = t;
- sched->max_priority_added = GNUNET_MAX (sched->max_priority_added,
- t->priority);
+ t->lifeness = current_lifeness;
+ t->next = pending;
+ pending = t;
+ 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);
for (i=0;i<t->num_backtrace_strings;i++)
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Task %u trace %d: %s\n",
+ "Task %llu trace %d: %s\n",
t->id,
i,
t->backtrace_strings[i]);
projects / oweals / gnunet.git / blobdiff