Author: Pekka Riikonen <priikone@silcnet.org>
- Copyright (C) 1998 - 2001 Pekka Riikonen
+ Copyright (C) 1998 - 2007 Pekka Riikonen
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
+ the Free Software Foundation; version 2 of the License.
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
*/
/* $Id$ */
-#include "silcincludes.h"
+#include "silc.h"
-/* Routine to remove the task. Implemented in silctask.c. */
-int silc_task_remove(SilcTaskQueue queue, SilcTask task);
+/************************** Types and definitions ***************************/
-/* System specific routines. Implemented under unix/ and win32/. */
+/* Connected event context */
+typedef struct SilcScheduleEventConnectionStruct {
+ SilcSchedule schedule;
+ SilcTaskEventCallback callback;
+ void *context;
+ struct SilcScheduleEventConnectionStruct *next;
+} *SilcScheduleEventConnection;
-/* System specific select(). */
-int silc_select(int n, fd_set *readfds, fd_set *writefds,
- fd_set *exceptfds, struct timeval *timeout);
+/* Platform specific implementation */
+extern const SilcScheduleOps schedule_ops;
-/* Initializes the wakeup of the scheduler. In multi-threaded environment
- the scheduler needs to be wakenup when tasks are added or removed from
- the task queues. This will initialize the wakeup for the scheduler.
- Any tasks that needs to be registered must be registered to the `queue'.
- It is guaranteed that the scheduler will automatically free any
- registered tasks in this queue. This is system specific routine. */
-void *silc_schedule_wakeup_init(void *queue);
+static void silc_schedule_task_remove(SilcSchedule schedule, SilcTask task);
+static void silc_schedule_dispatch_fd(SilcSchedule schedule);
+static void silc_schedule_dispatch_timeout(SilcSchedule schedule,
+ SilcBool dispatch_all);
+SILC_TASK_CALLBACK(silc_schedule_event_del_timeout);
-/* Uninitializes the system specific wakeup. */
-void silc_schedule_wakeup_uninit(void *context);
+/************************ Static utility functions **************************/
-/* Wakes up the scheduler. This is platform specific routine */
-void silc_schedule_wakeup_internal(void *context);
+/* Fd task hash table destructor */
-/* Structure holding list of file descriptors, scheduler is supposed to
- be listenning. The max_fd field is the maximum number of possible file
- descriptors in the list. This value is set at the initialization
- of the scheduler and it usually is the maximum number of connections
- allowed. */
-typedef struct {
- int *fd;
- uint32 last_fd;
- uint32 max_fd;
-} SilcScheduleFdList;
+static void silc_schedule_fd_destructor(void *key, void *context,
+ void *user_context)
+{
+ silc_free(context);
+}
-/*
- SILC Scheduler structure.
+/* Executes file descriptor tasks. Invalid tasks are removed here. */
- This is the actual schedule object in SILC. Both SILC client and server
- uses this same scheduler. Actually, this scheduler could be used by any
- program needing scheduling.
+static void silc_schedule_dispatch_fd(SilcSchedule schedule)
+{
+ SilcTaskFd task;
+ SilcTask t;
+
+ /* The dispatch list includes only valid tasks, and tasks that have
+ something to dispatch. Dispatching is atomic; no matter if another
+ thread invalidates a task when we unlock, we dispatch to completion. */
+ SILC_SCHEDULE_UNLOCK(schedule);
+ silc_list_start(schedule->fd_dispatch);
+ while ((task = silc_list_get(schedule->fd_dispatch))) {
+ t = (SilcTask)task;
+
+ /* Is the task ready for reading */
+ if (task->revents & SILC_TASK_READ)
+ t->callback(schedule, schedule->app_context, SILC_TASK_READ,
+ task->fd, t->context);
+
+ /* Is the task ready for writing */
+ if (t->valid && task->revents & SILC_TASK_WRITE)
+ t->callback(schedule, schedule->app_context, SILC_TASK_WRITE,
+ task->fd, t->context);
+ }
+ SILC_SCHEDULE_LOCK(schedule);
- Following short description of the fields:
+ /* Remove invalidated tasks */
+ silc_list_start(schedule->fd_dispatch);
+ while ((task = silc_list_get(schedule->fd_dispatch)))
+ if (silc_unlikely(!task->header.valid))
+ silc_schedule_task_remove(schedule, (SilcTask)task);
+}
- SilcTaskQueue fd_queue
+/* Executes all tasks whose timeout has expired. The task is removed from
+ the task queue after the callback function has returned. Also, invalid
+ tasks are removed here. */
- Task queue hook for non-timeout tasks. Usually this means that these
- tasks perform different kind of I/O on file descriptors. File
- descriptors are usually network sockets but they actually can be
- any file descriptors. This hook is initialized in silc_schedule_init
- function. Timeout tasks should not be added to this queue because
- they will never expire.
+static void silc_schedule_dispatch_timeout(SilcSchedule schedule,
+ SilcBool dispatch_all)
+{
+ SilcTask t;
+ SilcTaskTimeout task;
+ struct timeval curtime;
+ int count = 0;
- SilcTaskQueue timeout_queue
+ SILC_LOG_DEBUG(("Running timeout tasks"));
- Task queue hook for timeout tasks. This hook is reserved specificly
- for tasks with timeout. Non-timeout tasks should not be added to this
- queue because they will never get scheduled. This hook is also
- initialized in silc_schedule_init function.
+ silc_gettimeofday(&curtime);
- SilcTaskQueue generic_queue
+ /* First task in the task queue has always the earliest timeout. */
+ silc_list_start(schedule->timeout_queue);
+ task = silc_list_get(schedule->timeout_queue);
+ if (silc_unlikely(!task))
+ return;
+ do {
+ t = (SilcTask)task;
- Task queue hook for generic tasks. This hook is reserved specificly
- for generic tasks, tasks that apply to all file descriptors, except
- to those that have specificly registered a non-timeout task. This hook
- is also initialized in silc_schedule_init function.
+ /* Remove invalid task */
+ if (silc_unlikely(!t->valid)) {
+ silc_schedule_task_remove(schedule, t);
+ continue;
+ }
- SilcScheduleFdList fd_list
+ /* Execute the task if the timeout has expired */
+ if (silc_compare_timeval(&task->timeout, &curtime) > 0 && !dispatch_all)
+ break;
- List of file descriptors the scheduler is supposed to be listenning.
- This is updated internally.
+ t->valid = FALSE;
+ SILC_SCHEDULE_UNLOCK(schedule);
+ t->callback(schedule, schedule->app_context, SILC_TASK_EXPIRE, 0,
+ t->context);
+ SILC_SCHEDULE_LOCK(schedule);
- struct timeval *timeout;
+ /* Remove the expired task */
+ silc_schedule_task_remove(schedule, t);
- Pointer to the schedules next timeout. Value of this timeout is
- automatically updated in the silc_schedule function.
+ /* Balance when we have lots of small timeouts */
+ if (silc_unlikely((++count) > 40))
+ break;
+ } while (silc_likely((task = silc_list_get(schedule->timeout_queue))));
+}
- int valid
+/* Calculates next timeout. This is the timeout value when at earliest some
+ of the timeout tasks expire. If this is in the past, they will be
+ dispatched now. */
- Marks validity of the scheduler. This is a boolean value. When this
- is false the scheduler is terminated and the program will end. This
- set to true when the scheduler is initialized with silc_schedule_init
- function.
+static void silc_schedule_select_timeout(SilcSchedule schedule)
+{
+ SilcTask t;
+ SilcTaskTimeout task;
+ struct timeval curtime;
+ SilcBool dispatch = TRUE;
- fd_set in
- fd_set out
+ /* Get the current time */
+ silc_gettimeofday(&curtime);
+ schedule->has_timeout = FALSE;
- File descriptor sets for select(). These are automatically managed
- by the scheduler and should not be touched otherwise.
+ /* First task in the task queue has always the earliest timeout. */
+ silc_list_start(schedule->timeout_queue);
+ task = silc_list_get(schedule->timeout_queue);
+ if (silc_unlikely(!task))
+ return;
+ do {
+ t = (SilcTask)task;
+
+ /* Remove invalid task */
+ if (silc_unlikely(!t->valid)) {
+ silc_schedule_task_remove(schedule, t);
+ continue;
+ }
+
+ /* If the timeout is in past, we will run the task and all other
+ timeout tasks from the past. */
+ if (silc_compare_timeval(&task->timeout, &curtime) <= 0 && dispatch) {
+ silc_schedule_dispatch_timeout(schedule, FALSE);
+ if (silc_unlikely(!schedule->valid))
+ return;
+
+ /* Start selecting new timeout again after dispatch */
+ silc_list_start(schedule->timeout_queue);
+ dispatch = FALSE;
+ continue;
+ }
+
+ /* Calculate the next timeout */
+ curtime.tv_sec = task->timeout.tv_sec - curtime.tv_sec;
+ curtime.tv_usec = task->timeout.tv_usec - curtime.tv_usec;
+ if (curtime.tv_sec < 0)
+ curtime.tv_sec = 0;
+
+ /* We wouldn't want to go under zero, check for it. */
+ if (curtime.tv_usec < 0) {
+ curtime.tv_sec -= 1;
+ if (curtime.tv_sec < 0)
+ curtime.tv_sec = 0;
+ curtime.tv_usec += 1000000L;
+ }
+ break;
+ } while ((task = silc_list_get(schedule->timeout_queue)));
+
+ /* Save the timeout */
+ if (task) {
+ schedule->timeout = curtime;
+ schedule->has_timeout = TRUE;
+ SILC_LOG_DEBUG(("timeout: sec=%d, usec=%d", schedule->timeout.tv_sec,
+ schedule->timeout.tv_usec));
+ }
+}
- int max_fd
+/* Removes task from the scheduler. This must be called with scheduler
+ locked. */
- Number of maximum file descriptors for select(). This, as well, is
- managed automatically by the scheduler and should be considered to
- be read-only field otherwise.
+static void silc_schedule_task_remove(SilcSchedule schedule, SilcTask task)
+{
+ SilcSchedule parent;
+
+ if (silc_unlikely(task == SILC_ALL_TASKS)) {
+ SilcTask task;
+ SilcEventTask etask;
+ SilcHashTableList htl;
+ void *fd;
+
+ /* Delete from fd queue */
+ silc_hash_table_list(schedule->fd_queue, &htl);
+ while (silc_hash_table_get(&htl, &fd, (void *)&task))
+ silc_hash_table_del(schedule->fd_queue, fd);
+ silc_hash_table_list_reset(&htl);
+
+ /* Delete from timeout queue */
+ silc_list_start(schedule->timeout_queue);
+ while ((task = silc_list_get(schedule->timeout_queue))) {
+ silc_list_del(schedule->timeout_queue, task);
+ silc_free(task);
+ }
+
+ /* Delete even tasks */
+ parent = silc_schedule_get_parent(schedule);
+ silc_hash_table_list(parent->events, &htl);
+ while (silc_hash_table_get(&htl, NULL, (void *)&etask)) {
+ silc_hash_table_del_by_context(parent->events, etask->event, etask);
+ silc_free(etask->event);
+ silc_free(etask);
+ }
+ silc_hash_table_list_reset(&htl);
+ return;
+ }
+
+ switch (task->type) {
+ case SILC_TASK_FD:
+ {
+ /* Delete from fd queue */
+ SilcTaskFd ftask = (SilcTaskFd)task;
+ silc_hash_table_del(schedule->fd_queue, SILC_32_TO_PTR(ftask->fd));
+ }
+ break;
- void *wakeup
+ case SILC_TASK_TIMEOUT:
+ {
+ /* Delete from timeout queue */
+ silc_list_del(schedule->timeout_queue, task);
- System specific wakeup context. On multi-threaded environments the
- scheduler needs to be wakenup (in the thread) when tasks are added
- or removed. This is initialized by silc_schedule_wakeup_init.
+ /* Put to free list */
+ silc_list_add(schedule->free_tasks, task);
+ }
+ break;
-*/
-struct SilcScheduleStruct {
- SilcTaskQueue fd_queue;
- SilcTaskQueue timeout_queue;
- SilcTaskQueue generic_queue;
- SilcScheduleFdList fd_list;
- struct timeval *timeout;
- bool valid;
- fd_set in;
- fd_set out;
- int max_fd;
- void *wakeup;
- SILC_MUTEX_DEFINE(lock);
- bool is_locked;
-};
-
-/* Initializes the scheduler. Sets the non-timeout task queue hook and
- the timeout task queue hook. This must be called before the scheduler
- is able to work. This will allocate the queue pointers if they are
- not allocated. Returns the scheduler context that must be freed by
- the silc_schedule_uninit function. */
-
-SilcSchedule silc_schedule_init(SilcTaskQueue *fd_queue,
- SilcTaskQueue *timeout_queue,
- SilcTaskQueue *generic_queue,
- int max_fd)
+ case SILC_TASK_EVENT:
+ {
+ SilcEventTask etask = (SilcEventTask)task;
+ SilcScheduleEventConnection conn;
+
+ parent = silc_schedule_get_parent(schedule);
+
+ /* Delete event */
+ silc_hash_table_del_by_context(parent->events, etask->event, etask);
+
+ /* Remove all connections */
+ silc_list_start(etask->connections);
+ while ((conn = silc_list_get(etask->connections)))
+ silc_free(conn);
+
+ silc_free(etask->event);
+ silc_free(etask);
+ }
+ break;
+
+ default:
+ break;
+ }
+}
+
+/* Timeout freelist garbage collection */
+
+SILC_TASK_CALLBACK(silc_schedule_timeout_gc)
+{
+ SilcTaskTimeout t;
+ int c;
+
+ if (!schedule->valid)
+ return;
+
+ SILC_LOG_DEBUG(("Timeout freelist garbage collection"));
+
+ SILC_SCHEDULE_LOCK(schedule);
+
+ if (silc_list_count(schedule->free_tasks) <= 10) {
+ SILC_SCHEDULE_UNLOCK(schedule);
+ silc_schedule_task_add_timeout(schedule, silc_schedule_timeout_gc,
+ schedule, 3600, 0);
+ return;
+ }
+ if (silc_list_count(schedule->timeout_queue) >
+ silc_list_count(schedule->free_tasks)) {
+ SILC_SCHEDULE_UNLOCK(schedule);
+ silc_schedule_task_add_timeout(schedule, silc_schedule_timeout_gc,
+ schedule, 3600, 0);
+ return;
+ }
+
+ c = silc_list_count(schedule->free_tasks) / 2;
+ if (c > silc_list_count(schedule->timeout_queue))
+ c = (silc_list_count(schedule->free_tasks) -
+ silc_list_count(schedule->timeout_queue));
+ if (silc_list_count(schedule->free_tasks) - c < 10)
+ c -= (10 - (silc_list_count(schedule->free_tasks) - c));
+
+ SILC_LOG_DEBUG(("Freeing %d unused tasks, leaving %d", c,
+ silc_list_count(schedule->free_tasks) - c));
+
+ silc_list_start(schedule->free_tasks);
+ while ((t = silc_list_get(schedule->free_tasks)) && c-- > 0) {
+ silc_list_del(schedule->free_tasks, t);
+ silc_free(t);
+ }
+ silc_list_start(schedule->free_tasks);
+
+ SILC_SCHEDULE_UNLOCK(schedule);
+
+ silc_schedule_task_add_timeout(schedule, silc_schedule_timeout_gc,
+ schedule, 3600, 0);
+}
+
+#ifdef SILC_DIST_INPLACE
+/* Print schedule statistics to stdout */
+
+void silc_schedule_stats(SilcSchedule schedule)
+{
+ SilcTaskFd ftask;
+ fprintf(stdout, "Schedule %p statistics:\n\n", schedule);
+ fprintf(stdout, "Num FD tasks : %d (%lu bytes allocated)\n",
+ silc_hash_table_count(schedule->fd_queue),
+ sizeof(*ftask) * silc_hash_table_count(schedule->fd_queue));
+ fprintf(stdout, "Num Timeout tasks : %d (%lu bytes allocated)\n",
+ silc_list_count(schedule->timeout_queue),
+ sizeof(struct SilcTaskTimeoutStruct) *
+ silc_list_count(schedule->timeout_queue));
+ fprintf(stdout, "Num Timeout freelist : %d (%lu bytes allocated)\n",
+ silc_list_count(schedule->free_tasks),
+ sizeof(struct SilcTaskTimeoutStruct) *
+ silc_list_count(schedule->free_tasks));
+}
+#endif /* SILC_DIST_INPLACE */
+
+/****************************** Public API **********************************/
+
+/* Initializes the scheduler. This returns the scheduler context that
+ is given as arugment usually to all silc_schedule_* functions.
+ The `max_tasks' indicates the number of maximum tasks that the
+ scheduler can handle. The `app_context' is application specific
+ context that is delivered to task callbacks. */
+
+SilcSchedule silc_schedule_init(int max_tasks, void *app_context,
+ SilcStack stack, SilcSchedule parent)
{
SilcSchedule schedule;
- int i;
-
- SILC_LOG_DEBUG(("Initializing scheduler"));
-
- schedule = silc_calloc(1, sizeof(*schedule));
-
- /* Register the task queues if they are not registered already. In SILC
- we have by default three task queues. One task queue for non-timeout
- tasks which perform different kind of I/O on file descriptors, timeout
- task queue for timeout tasks, and, generic non-timeout task queue whose
- tasks apply to all connections. */
- if (!*fd_queue)
- silc_task_queue_alloc(schedule, fd_queue, TRUE);
- if (!*timeout_queue)
- silc_task_queue_alloc(schedule, timeout_queue, TRUE);
- if (!*generic_queue)
- silc_task_queue_alloc(schedule, generic_queue, TRUE);
-
- /* Initialize the scheduler */
- schedule->fd_queue = *fd_queue;
- schedule->timeout_queue = *timeout_queue;
- schedule->generic_queue = *generic_queue;
- schedule->fd_list.fd = silc_calloc(max_fd, sizeof(*schedule->fd_list.fd));
- schedule->fd_list.last_fd = 0;
- schedule->fd_list.max_fd = max_fd;
- schedule->timeout = NULL;
+
+ /* Initialize Tls, in case it hasn't been done yet */
+ silc_thread_tls_init();
+
+ stack = silc_stack_alloc(0, stack);
+ if (!stack)
+ return NULL;
+
+ /* Allocate scheduler from the stack */
+ schedule = silc_scalloc(stack, 1, sizeof(*schedule));
+ if (!schedule)
+ return NULL;
+
+ SILC_LOG_DEBUG(("Initializing scheduler %p", schedule));
+
+ /* Allocate Fd task hash table dynamically */
+ schedule->fd_queue =
+ silc_hash_table_alloc(NULL, 0, silc_hash_uint, NULL, NULL, NULL,
+ silc_schedule_fd_destructor, NULL, TRUE);
+ if (!schedule->fd_queue) {
+ silc_stack_free(stack);
+ return NULL;
+ }
+
+ silc_list_init(schedule->timeout_queue, struct SilcTaskStruct, next);
+ silc_list_init(schedule->free_tasks, struct SilcTaskStruct, next);
+
+ /* Get the parent */
+ if (parent && parent->parent)
+ parent = parent->parent;
+
+ schedule->stack = stack;
+ schedule->app_context = app_context;
schedule->valid = TRUE;
- FD_ZERO(&schedule->in);
- FD_ZERO(&schedule->out);
- schedule->max_fd = -1;
- for (i = 0; i < max_fd; i++)
- schedule->fd_list.fd[i] = -1;
+ schedule->max_tasks = max_tasks;
+ schedule->parent = parent;
+ /* Allocate scheduler lock */
silc_mutex_alloc(&schedule->lock);
- /* Initialize the wakeup */
- schedule->wakeup = silc_schedule_wakeup_init(schedule->fd_queue);
+ /* Initialize the platform specific scheduler. */
+ schedule->internal = schedule_ops.init(schedule, app_context);
+ if (!schedule->internal) {
+ silc_hash_table_free(schedule->fd_queue);
+ silc_mutex_free(schedule->lock);
+ silc_stack_free(stack);
+ return NULL;
+ }
+
+ /* Timeout freelist garbage collection */
+ silc_schedule_task_add_timeout(schedule, silc_schedule_timeout_gc,
+ schedule, 3600, 0);
return schedule;
}
scheduler could not be uninitialized. This happens when the scheduler
is still valid and silc_schedule_stop has not been called. */
-bool silc_schedule_uninit(SilcSchedule schedule)
+SilcBool silc_schedule_uninit(SilcSchedule schedule)
{
+ SilcTask task;
- SILC_LOG_DEBUG(("Uninitializing scheduler"));
+ SILC_VERIFY(schedule);
+
+ SILC_LOG_DEBUG(("Uninitializing scheduler %p", schedule));
if (schedule->valid == TRUE)
return FALSE;
+ /* Dispatch all timeouts before going away */
+ SILC_SCHEDULE_LOCK(schedule);
+ silc_schedule_dispatch_timeout(schedule, TRUE);
+ SILC_SCHEDULE_UNLOCK(schedule);
+
+ /* Deliver signals before going away */
+ if (schedule->signal_tasks) {
+ schedule_ops.signals_call(schedule, schedule->internal);
+ schedule->signal_tasks = FALSE;
+ }
+
/* Unregister all tasks */
- if (schedule->fd_queue)
- silc_task_remove(schedule->fd_queue, SILC_ALL_TASKS);
- if (schedule->timeout_queue)
- silc_task_remove(schedule->timeout_queue, SILC_ALL_TASKS);
- if (schedule->generic_queue)
- silc_task_remove(schedule->generic_queue, SILC_ALL_TASKS);
+ silc_schedule_task_del(schedule, SILC_ALL_TASKS);
+ silc_schedule_task_remove(schedule, SILC_ALL_TASKS);
- /* Unregister all task queues */
- if (schedule->fd_queue)
- silc_task_queue_free(schedule->fd_queue);
- if (schedule->timeout_queue)
- silc_task_queue_free(schedule->timeout_queue);
- if (schedule->generic_queue)
- silc_task_queue_free(schedule->generic_queue);
+ /* Delete timeout task freelist */
+ silc_list_start(schedule->free_tasks);
+ while ((task = silc_list_get(schedule->free_tasks)))
+ silc_free(task);
- /* Clear the fd list */
- if (schedule->fd_list.fd) {
- memset(schedule->fd_list.fd, -1, schedule->fd_list.max_fd);
- silc_free(schedule->fd_list.fd);
- }
+ /* Unregister all task queues */
+ silc_hash_table_free(schedule->fd_queue);
- /* Uninit the wakeup */
- silc_schedule_wakeup_uninit(schedule->wakeup);
+ /* Uninit the platform specific scheduler. */
+ schedule_ops.uninit(schedule, schedule->internal);
silc_mutex_free(schedule->lock);
+ silc_stack_free(schedule->stack);
return TRUE;
}
-/* Stops the schedule even if it is not supposed to be stopped yet.
- After calling this, one should call silc_schedule_uninit (after the
+/* Stops the schedule even if it is not supposed to be stopped yet.
+ After calling this, one should call silc_schedule_uninit (after the
silc_schedule has returned). */
void silc_schedule_stop(SilcSchedule schedule)
{
SILC_LOG_DEBUG(("Stopping scheduler"));
- silc_mutex_lock(schedule->lock);
+ SILC_VERIFY(schedule);
+ SILC_SCHEDULE_LOCK(schedule);
schedule->valid = FALSE;
- silc_mutex_unlock(schedule->lock);
+ SILC_SCHEDULE_UNLOCK(schedule);
+}
+
+/* Runs the scheduler once and then returns. Must be called locked. */
+
+static SilcBool silc_schedule_iterate(SilcSchedule schedule, int timeout_usecs)
+{
+ struct timeval timeout;
+ int ret;
+
+ do {
+ SILC_LOG_DEBUG(("In scheduler loop"));
+
+ /* Deliver signals if any has been set to be called */
+ if (silc_unlikely(schedule->signal_tasks)) {
+ SILC_SCHEDULE_UNLOCK(schedule);
+ schedule_ops.signals_call(schedule, schedule->internal);
+ schedule->signal_tasks = FALSE;
+ SILC_SCHEDULE_LOCK(schedule);
+ }
+
+ /* Check if scheduler is valid */
+ if (silc_unlikely(schedule->valid == FALSE)) {
+ SILC_LOG_DEBUG(("Scheduler not valid anymore, exiting"));
+ return FALSE;
+ }
+
+ /* Calculate next timeout for silc_select(). This is the timeout value
+ when at earliest some of the timeout tasks expire. This may dispatch
+ already expired timeouts. */
+ silc_schedule_select_timeout(schedule);
+
+ /* Check if scheduler is valid */
+ if (silc_unlikely(schedule->valid == FALSE)) {
+ SILC_LOG_DEBUG(("Scheduler not valid anymore, exiting"));
+ return FALSE;
+ }
+
+ if (timeout_usecs >= 0) {
+ timeout.tv_sec = 0;
+ timeout.tv_usec = timeout_usecs;
+ schedule->timeout = timeout;
+ schedule->has_timeout = TRUE;
+ }
+
+ /* This is the main silc_select(). The program blocks here until some
+ of the selected file descriptors change status or the selected
+ timeout expires. */
+ SILC_LOG_DEBUG(("Select"));
+ ret = schedule_ops.schedule(schedule, schedule->internal);
+
+ if (silc_likely(ret == 0)) {
+ /* Timeout */
+ SILC_LOG_DEBUG(("Running timeout tasks"));
+ if (silc_likely(silc_list_count(schedule->timeout_queue)))
+ silc_schedule_dispatch_timeout(schedule, FALSE);
+ continue;
+
+ } else if (silc_likely(ret > 0)) {
+ /* There is some data available now */
+ SILC_LOG_DEBUG(("Running fd tasks"));
+ silc_schedule_dispatch_fd(schedule);
+
+ /* If timeout was very short, dispatch also timeout tasks */
+ if (schedule->has_timeout && schedule->timeout.tv_sec == 0 &&
+ schedule->timeout.tv_usec < 50000)
+ silc_schedule_dispatch_timeout(schedule, FALSE);
+ continue;
+
+ } else {
+ /* Error or special case handling */
+ if (errno == EINTR)
+ continue;
+ if (ret == -2)
+ break;
+
+ SILC_LOG_ERROR(("Error in select()/poll(): %s", strerror(errno)));
+ continue;
+ }
+ } while (timeout_usecs == -1);
+
+ return TRUE;
}
-/* Sets a file descriptor to be listened by select() in scheduler. One can
- call this directly if wanted. This can be called multiple times for
- one file descriptor to set different iomasks. */
+/* Runs the scheduler once and then returns. */
-void silc_schedule_set_listen_fd(SilcSchedule schedule, int fd, uint32 iomask)
+SilcBool silc_schedule_one(SilcSchedule schedule, int timeout_usecs)
{
- silc_mutex_lock(schedule->lock);
+ SilcBool ret;
+ SILC_SCHEDULE_LOCK(schedule);
+ ret = silc_schedule_iterate(schedule, timeout_usecs);
+ SILC_SCHEDULE_UNLOCK(schedule);
+ return ret;
+}
- schedule->fd_list.fd[fd] = iomask;
-
- if (fd > schedule->fd_list.last_fd)
- schedule->fd_list.last_fd = fd;
+/* Runs the scheduler and blocks here. When this returns the scheduler
+ has ended. */
+
+#ifndef SILC_SYMBIAN
+void silc_schedule(SilcSchedule schedule)
+{
+ SILC_LOG_DEBUG(("Running scheduler"));
- silc_mutex_unlock(schedule->lock);
+ /* Start the scheduler loop */
+ SILC_SCHEDULE_LOCK(schedule);
+ silc_schedule_iterate(schedule, -1);
+ SILC_SCHEDULE_UNLOCK(schedule);
}
+#endif /* !SILC_SYMBIAN */
-/* Removes a file descriptor from listen list. */
+/* Wakes up the scheduler. This is used only in multi-threaded
+ environments where threads may add new tasks or remove old tasks
+ from task queues. This is called to wake up the scheduler in the
+ main thread so that it detects the changes in the task queues.
+ If threads support is not compiled in this function has no effect.
+ Implementation of this function is platform specific. */
+
+void silc_schedule_wakeup(SilcSchedule schedule)
+{
+#ifdef SILC_THREADS
+ SILC_LOG_DEBUG(("Wakeup scheduler"));
+ SILC_SCHEDULE_LOCK(schedule);
+ schedule_ops.wakeup(schedule, schedule->internal);
+ SILC_SCHEDULE_UNLOCK(schedule);
+#endif
+}
+
+/* Returns parent scheduler */
+
+SilcSchedule silc_schedule_get_parent(SilcSchedule schedule)
+{
+ return schedule->parent ? schedule->parent : schedule;
+}
+
+/* Returns the application specific context that was saved into the
+ scheduler in silc_schedule_init function. The context is also
+ returned to application in task callback functions, but this function
+ may be used to get it as well if needed. */
+
+void *silc_schedule_get_context(SilcSchedule schedule)
+{
+ return schedule->app_context;
+}
+
+/* Return the stack of the scheduler */
+
+SilcStack silc_schedule_get_stack(SilcSchedule schedule)
+{
+ return schedule->stack;
+}
+
+/* Set notify callback */
+
+void silc_schedule_set_notify(SilcSchedule schedule,
+ SilcTaskNotifyCb notify, void *context)
+{
+ schedule->notify = notify;
+ schedule->notify_context = context;
+}
+
+/* Set global scheduler */
+
+void silc_schedule_set_global(SilcSchedule schedule)
+{
+ SilcTls tls = silc_thread_get_tls();
+
+ if (!tls) {
+ /* Try to initialize Tls */
+ tls = silc_thread_tls_init();
+ SILC_VERIFY(tls);
+ if (!tls)
+ return;
+ }
+
+ SILC_LOG_DEBUG(("Setting global scheduler %p", schedule));
+
+ tls->schedule = schedule;
+}
+
+/* Return global scheduler */
+
+SilcSchedule silc_schedule_get_global(void)
+{
+ SilcTls tls = silc_thread_get_tls();
-void silc_schedule_unset_listen_fd(SilcSchedule schedule, int fd)
+ if (!tls)
+ return NULL;
+
+ SILC_LOG_DEBUG(("Return global scheduler %p", tls->schedule));
+
+ return tls->schedule;
+}
+
+/* Add new task to the scheduler */
+
+SilcTask silc_schedule_task_add(SilcSchedule schedule, SilcUInt32 fd,
+ SilcTaskCallback callback, void *context,
+ long seconds, long useconds,
+ SilcTaskType type)
{
- silc_mutex_lock(schedule->lock);
+ SilcTask task = NULL;
+
+ if (!schedule) {
+ schedule = silc_schedule_get_global();
+ SILC_VERIFY(schedule);
+ if (!schedule) {
+ silc_set_errno(SILC_ERR_INVALID_ARGUMENT);
+ return NULL;
+ }
+ }
- schedule->fd_list.fd[fd] = -1;
-
- if (fd == schedule->fd_list.last_fd) {
- int i;
+ if (silc_unlikely(!schedule->valid)) {
+ silc_set_errno(SILC_ERR_NOT_VALID);
+ return NULL;
+ }
- for (i = fd; i >= 0; i--)
- if (schedule->fd_list.fd[i] != -1)
+ SILC_SCHEDULE_LOCK(schedule);
+
+ if (silc_likely(type == SILC_TASK_TIMEOUT)) {
+ SilcTaskTimeout tmp, prev, ttask;
+ SilcList list;
+
+ silc_list_start(schedule->free_tasks);
+ ttask = silc_list_get(schedule->free_tasks);
+ if (silc_unlikely(!ttask)) {
+ ttask = silc_calloc(1, sizeof(*ttask));
+ if (silc_unlikely(!ttask))
+ goto out;
+ } else
+ silc_list_del(schedule->free_tasks, ttask);
+
+ ttask->header.type = 1;
+ ttask->header.callback = callback;
+ ttask->header.context = context;
+ ttask->header.valid = TRUE;
+
+ /* Add timeout */
+ silc_gettimeofday(&ttask->timeout);
+ if ((seconds + useconds) > 0) {
+ ttask->timeout.tv_sec += seconds + (useconds / 1000000L);
+ ttask->timeout.tv_usec += (useconds % 1000000L);
+ if (ttask->timeout.tv_usec >= 1000000L) {
+ ttask->timeout.tv_sec += 1;
+ ttask->timeout.tv_usec -= 1000000L;
+ }
+ }
+
+ SILC_LOG_DEBUG(("New timeout task %p: sec=%d, usec=%d", ttask,
+ seconds, useconds));
+
+ /* Add task to correct spot so that the first task in the list has
+ the earliest timeout. */
+ list = schedule->timeout_queue;
+ silc_list_start(list);
+ prev = NULL;
+ while ((tmp = silc_list_get(list)) != SILC_LIST_END) {
+ /* If we have shorter timeout, we have found our spot */
+ if (silc_compare_timeval(&ttask->timeout, &tmp->timeout) < 0) {
+ silc_list_insert(schedule->timeout_queue, prev, ttask);
break;
+ }
+ prev = tmp;
+ }
+ if (!tmp)
+ silc_list_add(schedule->timeout_queue, ttask);
+
+ task = (SilcTask)ttask;
+
+ /* Call notify callback */
+ if (schedule->notify)
+ schedule->notify(schedule, TRUE, task, FALSE, 0, 0, seconds, useconds,
+ schedule->notify_context);
+
+ } else if (silc_likely(type == SILC_TASK_FD)) {
+ SilcTaskFd ftask;
+
+ /* Check if fd is already added */
+ if (silc_unlikely(silc_hash_table_find(schedule->fd_queue,
+ SILC_32_TO_PTR(fd),
+ NULL, (void *)&task))) {
+ if (task->valid)
+ goto out;
+
+ /* Remove invalid task. We must have unique fd key to hash table. */
+ silc_schedule_task_remove(schedule, task);
+ }
+
+ /* Check max tasks */
+ if (silc_unlikely(schedule->max_tasks > 0 &&
+ silc_hash_table_count(schedule->fd_queue) >=
+ schedule->max_tasks)) {
+ SILC_LOG_WARNING(("Scheduler task limit reached: cannot add new task"));
+ task = NULL;
+ silc_set_errno(SILC_ERR_LIMIT);
+ goto out;
+ }
+
+ ftask = silc_calloc(1, sizeof(*ftask));
+ if (silc_unlikely(!ftask)) {
+ task = NULL;
+ goto out;
+ }
+
+ SILC_LOG_DEBUG(("New fd task %p fd=%d", ftask, fd));
+
+ ftask->header.type = 0;
+ ftask->header.callback = callback;
+ ftask->header.context = context;
+ ftask->header.valid = TRUE;
+ ftask->events = SILC_TASK_READ;
+ ftask->fd = fd;
+
+ /* Add task and schedule it */
+ if (!silc_hash_table_add(schedule->fd_queue, SILC_32_TO_PTR(fd), ftask)) {
+ silc_free(ftask);
+ task = NULL;
+ goto out;
+ }
+ if (!schedule_ops.schedule_fd(schedule, schedule->internal,
+ ftask, ftask->events)) {
+ silc_hash_table_del(schedule->fd_queue, SILC_32_TO_PTR(fd));
+ task = NULL;
+ goto out;
+ }
+
+ task = (SilcTask)ftask;
+
+ /* Call notify callback */
+ if (schedule->notify)
+ schedule->notify(schedule, TRUE, task, TRUE, ftask->fd,
+ SILC_TASK_READ, 0, 0, schedule->notify_context);
+
+ } else if (silc_unlikely(type == SILC_TASK_SIGNAL)) {
+ SILC_SCHEDULE_UNLOCK(schedule);
+ schedule_ops.signal_register(schedule, schedule->internal, fd,
+ callback, context);
+ return NULL;
+ }
- schedule->fd_list.last_fd = i < 0 ? 0 : i;
- }
-
- silc_mutex_unlock(schedule->lock);
-}
-
-/* Executes tasks matching the file descriptor set by select(). The task
- remains on the task queue after execution. Invalid tasks are removed
- here from the task queue. This macro is used by silc_schedule function.
- We don't have to care about the tasks priority here because the tasks
- are sorted in their priority order already at the registration phase. */
-/* This must be called holding the schedule->lock and the
- schedule->fd_queue->lock. */
-
-#define SILC_SCHEDULE_RUN_TASKS \
-do { \
- queue = schedule->fd_queue; \
- if (queue && queue->valid == TRUE && queue->task) { \
- task = queue->task; \
- \
- /* Walk thorugh all tasks in the particular task queue and \
- execute the callback functions of those tasks matching the \
- fd set by select(). */ \
- while(1) { \
- /* Validity of the task is checked always before and after \
- execution beacuse the task might have been unregistered \
- in the callback function, ie. it is not valid anymore. */ \
- \
- if (task->valid) { \
- /* Task ready for reading */ \
- if ((FD_ISSET(task->fd, &schedule->in)) && \
- (task->iomask & (1L << SILC_TASK_READ))) { \
- silc_mutex_unlock(queue->lock); \
- silc_mutex_unlock(schedule->lock); \
- task->callback(queue, SILC_TASK_READ, task->context, task->fd); \
- silc_mutex_lock(schedule->lock); \
- silc_mutex_lock(queue->lock); \
- is_run = TRUE; \
- } \
- } \
- \
- if (task->valid) { \
- /* Task ready for writing */ \
- if ((FD_ISSET(task->fd, &schedule->out)) && \
- (task->iomask & (1L << SILC_TASK_WRITE))) { \
- silc_mutex_unlock(queue->lock); \
- silc_mutex_unlock(schedule->lock); \
- task->callback(queue, SILC_TASK_WRITE, task->context, task->fd); \
- silc_mutex_lock(schedule->lock); \
- silc_mutex_lock(queue->lock); \
- is_run = TRUE; \
- } \
- } \
- \
- if (!task->valid) { \
- /* Invalid (unregistered) tasks are removed from the \
- task queue. */ \
- if (queue->task == task->next) { \
- silc_task_remove(queue, task); \
- break; \
- } \
- \
- task = task->next; \
- silc_task_remove(queue, task->prev); \
- continue; \
- } \
- \
- /* Break if there isn't more tasks in the queue */ \
- if (queue->task == task->next) \
- break; \
- \
- task = task->next; \
- } \
- } \
-} while(0)
-
-/* Selects tasks to be listened by select(). These are the non-timeout
- tasks. This checks the scheduler's fd list. This macro is used by
- silc_schedule function. */
-/* This must be called holding schedule->lock. */
-
-#define SILC_SCHEDULE_SELECT_TASKS \
-do { \
- for (i = 0; i <= schedule->fd_list.last_fd; i++) { \
- if (schedule->fd_list.fd[i] != -1) { \
- \
- /* Set the max fd value for select() to listen */ \
- if (i > schedule->max_fd) \
- schedule->max_fd = i; \
- \
- /* Add tasks for reading */ \
- if ((schedule->fd_list.fd[i] & (1L << SILC_TASK_READ))) \
- FD_SET(i, &schedule->in); \
- \
- /* Add tasks for writing */ \
- if ((schedule->fd_list.fd[i] & (1L << SILC_TASK_WRITE))) \
- FD_SET(i, &schedule->out); \
- } \
- } \
-} while(0)
+ out:
+ SILC_SCHEDULE_UNLOCK(schedule);
-/* Executes all tasks whose timeout has expired. The task is removed from
- the task queue after the callback function has returned. Also, invalid
- tasks are removed here. The current time must be get before calling this
- macro. This macro is used by silc_schedule function. We don't have to
- care about priorities because tasks are already sorted in their priority
- order at the registration phase. */
-/* This must be called with holding the schedule->lock and the
- schedule->timeout_queue->lock */
-
-#define SILC_SCHEDULE_RUN_TIMEOUT_TASKS \
-do { \
- queue = schedule->timeout_queue; \
- if (queue && queue->valid == TRUE && queue->task) { \
- task = queue->task; \
- \
- /* Walk thorugh all tasks in the particular task queue \
- and run all the expired tasks. */ \
- while(1) { \
- /* Execute the task if the timeout has expired */ \
- if (silc_task_timeout_compare(&task->timeout, &curtime)) { \
- \
- /* Task ready for reading */ \
- if (task->valid) { \
- if ((task->iomask & (1L << SILC_TASK_READ))) { \
- silc_mutex_unlock(queue->lock); \
- silc_mutex_unlock(schedule->lock); \
- task->callback(queue, SILC_TASK_READ, \
- task->context, task->fd); \
- silc_mutex_lock(schedule->lock); \
- silc_mutex_lock(queue->lock); \
- } \
- } \
- \
- /* Task ready for writing */ \
- if (task->valid) { \
- if ((task->iomask & (1L << SILC_TASK_WRITE))) { \
- silc_mutex_unlock(queue->lock); \
- silc_mutex_unlock(schedule->lock); \
- task->callback(queue, SILC_TASK_WRITE, \
- task->context, task->fd); \
- silc_mutex_lock(schedule->lock); \
- silc_mutex_lock(queue->lock); \
- } \
- } \
- \
- /* Break if there isn't more tasks in the queue */ \
- if (queue->task == task->next) { \
- /* Remove the task from queue */ \
- silc_task_remove(queue, task); \
- break; \
- } \
- \
- task = task->next; \
- \
- /* Remove the task from queue */ \
- silc_task_remove(queue, task->prev); \
- } else { \
- /* The timeout hasn't expired, check for next one */ \
- \
- /* Break if there isn't more tasks in the queue */ \
- if (queue->task == task->next) \
- break; \
- \
- task = task->next; \
- } \
- } \
- } \
-} while(0)
-
-/* Calculates next timeout for select(). This is the timeout value
- when at earliest some of the timeout tasks expire. If this is in the
- past, they will be run now. This macro is used by the silc_schedule
- function. */
-/* This must be called with holding the schedule->lock and the
- schedule->timeout_queue->lock */
-
-#define SILC_SCHEDULE_SELECT_TIMEOUT \
-do { \
- if (schedule->timeout_queue && schedule->timeout_queue->valid == TRUE) { \
- queue = schedule->timeout_queue; \
- task = NULL; \
- \
- /* Get the current time */ \
- silc_gettimeofday(&curtime); \
- schedule->timeout = NULL; \
- \
- /* First task in the task queue has always the smallest timeout. */ \
- task = queue->task; \
- while(1) { \
- if (task && task->valid == TRUE) { \
- \
- /* If the timeout is in past, we will run the task and all other \
- timeout tasks from the past. */ \
- if (silc_task_timeout_compare(&task->timeout, &curtime)) { \
- SILC_SCHEDULE_RUN_TIMEOUT_TASKS; \
- \
- /* The task(s) has expired and doesn't exist on the task queue \
- anymore. We continue with new timeout. */ \
- queue = schedule->timeout_queue; \
- task = queue->task; \
- if (task == NULL || task->valid == FALSE) \
- break; \
- goto cont; \
- } else { \
- cont: \
- /* Calculate the next timeout for select() */ \
- queue->timeout.tv_sec = task->timeout.tv_sec - curtime.tv_sec; \
- queue->timeout.tv_usec = task->timeout.tv_usec - curtime.tv_usec; \
- if (queue->timeout.tv_sec < 0) \
- queue->timeout.tv_sec = 0; \
- \
- /* We wouldn't want to go under zero, check for it. */ \
- if (queue->timeout.tv_usec < 0) { \
- queue->timeout.tv_sec -= 1; \
- if (queue->timeout.tv_sec < 0) \
- queue->timeout.tv_sec = 0; \
- queue->timeout.tv_usec += 1000000L; \
- } \
- } \
- /* We've got the timeout value */ \
- break; \
- } else { \
- /* Task is not valid, remove it and try next one. */ \
- silc_task_remove(queue, task); \
- task = queue->task; \
- if (queue->task == NULL) \
- break; \
- } \
- } \
- /* Save the timeout */ \
- if (task) \
- schedule->timeout = &queue->timeout; \
- } \
-} while(0)
-
-/* Execute generic tasks. These are executed only and only if for the
- specific fd there wasn't other non-timeout tasks. This checks the earlier
- set fd list, thus the generic tasks apply to all specified fd's. All the
- generic tasks are executed at once. */
-/* This must be called holding the schedule->lock and the
- schedule->generic_queue->lock. */
-
-#define SILC_SCHEDULE_RUN_GENERIC_TASKS \
-do { \
- if (is_run == FALSE) { \
- SILC_LOG_DEBUG(("Running generic tasks")); \
- for (i = 0; i <= schedule->fd_list.last_fd; i++) \
- if (schedule->fd_list.fd[i] != -1) { \
- \
- /* Check whether this fd is select()ed. */ \
- if ((FD_ISSET(i, &schedule->in)) || (FD_ISSET(i, &schedule->out))) { \
- \
- /* It was selected. Now find the tasks from task queue and execute \
- all generic tasks. */ \
- if (schedule->generic_queue && schedule->generic_queue->valid) { \
- queue = schedule->generic_queue; \
- \
- if (!queue->task) \
- break; \
- \
- task = queue->task; \
- \
- while(1) { \
- /* Validity of the task is checked always before and after \
- execution beacuse the task might have been unregistered \
- in the callback function, ie. it is not valid anymore. */ \
- \
- if (task->valid && schedule->fd_list.fd[i] != -1) { \
- /* Task ready for reading */ \
- if ((schedule->fd_list.fd[i] & (1L << SILC_TASK_READ))) { \
- silc_mutex_unlock(queue->lock); \
- silc_mutex_unlock(schedule->lock); \
- task->callback(queue, SILC_TASK_READ, \
- task->context, i); \
- silc_mutex_lock(schedule->lock); \
- silc_mutex_lock(queue->lock); \
- } \
- } \
- \
- if (task->valid && schedule->fd_list.fd[i] != -1) { \
- /* Task ready for writing */ \
- if ((schedule->fd_list.fd[i] & (1L << SILC_TASK_WRITE))) { \
- silc_mutex_unlock(queue->lock); \
- silc_mutex_unlock(schedule->lock); \
- task->callback(queue, SILC_TASK_WRITE, \
- task->context, i); \
- silc_mutex_lock(schedule->lock); \
- silc_mutex_lock(queue->lock); \
- } \
- } \
- \
- if (!task->valid) { \
- /* Invalid (unregistered) tasks are removed from the \
- task queue. */ \
- if (queue->task == task->next) { \
- silc_task_remove(queue, task); \
- break; \
- } \
- \
- task = task->next; \
- silc_task_remove(queue, task->prev); \
- continue; \
- } \
- \
- /* Break if there isn't more tasks in the queue */ \
- if (queue->task == task->next) \
- break; \
- \
- task = task->next; \
- } \
- } \
- } \
- } \
- } \
-} while(0)
-
-bool silc_schedule_one(SilcSchedule schedule, int timeout_usecs)
+#ifdef SILC_SYMBIAN
+ /* On symbian we wakeup scheduler immediately after adding timeout task
+ in case the task is added outside the scheduler loop (in some active
+ object). */
+ if (task && task->type == 1)
+ silc_schedule_wakeup(schedule);
+#endif /* SILC_SYMBIAN */
+
+ return task;
+}
+
+/* Invalidates task */
+
+SilcBool silc_schedule_task_del(SilcSchedule schedule, SilcTask task)
+{
+ SilcSchedule parent;
+
+ if (!schedule) {
+ schedule = silc_schedule_get_global();
+ SILC_VERIFY(schedule);
+ if (!schedule) {
+ silc_set_errno(SILC_ERR_INVALID_ARGUMENT);
+ return FALSE;
+ }
+ }
+
+ if (silc_unlikely(task == SILC_ALL_TASKS)) {
+ SilcHashTableList htl;
+
+ SILC_LOG_DEBUG(("Unregister all tasks"));
+
+ SILC_SCHEDULE_LOCK(schedule);
+
+ /* Delete from fd queue */
+ silc_hash_table_list(schedule->fd_queue, &htl);
+ while (silc_hash_table_get(&htl, NULL, (void *)&task)) {
+ task->valid = FALSE;
+
+ /* Call notify callback */
+ if (schedule->notify)
+ schedule->notify(schedule, FALSE, task, TRUE,
+ ((SilcTaskFd)task)->fd, 0, 0, 0,
+ schedule->notify_context);
+ }
+ silc_hash_table_list_reset(&htl);
+
+ /* Delete from timeout queue */
+ silc_list_start(schedule->timeout_queue);
+ while ((task = (SilcTask)silc_list_get(schedule->timeout_queue))) {
+ task->valid = FALSE;
+
+ /* Call notify callback */
+ if (schedule->notify)
+ schedule->notify(schedule, FALSE, task, FALSE, 0, 0, 0, 0,
+ schedule->notify_context);
+ }
+
+ /* Delete even tasks */
+ parent = silc_schedule_get_parent(schedule);
+ silc_hash_table_list(parent->events, &htl);
+ while (silc_hash_table_get(&htl, NULL, (void *)&task))
+ task->valid = FALSE;
+ silc_hash_table_list_reset(&htl);
+
+ SILC_SCHEDULE_UNLOCK(schedule);
+ return TRUE;
+ }
+
+ SILC_LOG_DEBUG(("Unregistering task %p, type %d", task, task->type));
+ SILC_SCHEDULE_LOCK(schedule);
+ task->valid = FALSE;
+
+ /* Call notify callback */
+ if (schedule->notify && task->type != SILC_TASK_EVENT)
+ schedule->notify(schedule, FALSE, task, task->type == SILC_TASK_FD,
+ 0, 0, 0, 0, schedule->notify_context);
+ SILC_SCHEDULE_UNLOCK(schedule);
+
+ if (task->type == SILC_TASK_EVENT) {
+ /* Schedule removal of deleted event task */
+ parent = silc_schedule_get_parent(schedule);
+ silc_schedule_task_add_timeout(parent, silc_schedule_event_del_timeout,
+ task, 0, 1);
+ }
+
+ return TRUE;
+}
+
+/* Invalidate task by fd */
+
+SilcBool silc_schedule_task_del_by_fd(SilcSchedule schedule, SilcUInt32 fd)
+{
+ SilcTask task = NULL;
+ SilcBool ret = FALSE;
+
+ SILC_LOG_DEBUG(("Unregister task by fd %d", fd));
+
+ if (!schedule) {
+ schedule = silc_schedule_get_global();
+ SILC_VERIFY(schedule);
+ if (!schedule) {
+ silc_set_errno(SILC_ERR_INVALID_ARGUMENT);
+ return FALSE;
+ }
+ }
+
+ SILC_SCHEDULE_LOCK(schedule);
+
+ /* fd is unique, so there is only one task with this fd in the table */
+ if (silc_likely(silc_hash_table_find(schedule->fd_queue,
+ SILC_32_TO_PTR(fd), NULL,
+ (void *)&task))) {
+ SILC_LOG_DEBUG(("Deleting task %p", task));
+ task->valid = FALSE;
+
+ /* Call notify callback */
+ if (schedule->notify)
+ schedule->notify(schedule, FALSE, task, TRUE, fd, 0, 0, 0,
+ schedule->notify_context);
+ ret = TRUE;
+ }
+
+ SILC_SCHEDULE_UNLOCK(schedule);
+
+ /* If it is signal, remove it */
+ if (silc_unlikely(!task)) {
+ schedule_ops.signal_unregister(schedule, schedule->internal, fd);
+ ret = TRUE;
+ }
+
+ if (ret == FALSE)
+ silc_set_errno(SILC_ERR_NOT_FOUND);
+
+ return ret;
+}
+
+/* Invalidate task by task callback. */
+
+SilcBool silc_schedule_task_del_by_callback(SilcSchedule schedule,
+ SilcTaskCallback callback)
{
- struct timeval timeout;
- int is_run, i;
SilcTask task;
- SilcTaskQueue queue;
- struct timeval curtime;
- int ret;
+ SilcHashTableList htl;
+ SilcList list;
+ SilcBool ret = FALSE;
+
+ SILC_LOG_DEBUG(("Unregister task by callback"));
+
+ if (!schedule) {
+ schedule = silc_schedule_get_global();
+ SILC_VERIFY(schedule);
+ if (!schedule) {
+ silc_set_errno(SILC_ERR_INVALID_ARGUMENT);
+ return FALSE;
+ }
+ }
+
+ SILC_SCHEDULE_LOCK(schedule);
+
+ /* Delete from fd queue */
+ silc_hash_table_list(schedule->fd_queue, &htl);
+ while (silc_hash_table_get(&htl, NULL, (void *)&task)) {
+ if (task->callback == callback) {
+ task->valid = FALSE;
+
+ /* Call notify callback */
+ if (schedule->notify)
+ schedule->notify(schedule, FALSE, task, TRUE,
+ ((SilcTaskFd)task)->fd, 0, 0, 0,
+ schedule->notify_context);
+ ret = TRUE;
+ }
+ }
+ silc_hash_table_list_reset(&htl);
+
+ /* Delete from timeout queue */
+ list = schedule->timeout_queue;
+ silc_list_start(list);
+ while ((task = (SilcTask)silc_list_get(list))) {
+ if (task->callback == callback) {
+ task->valid = FALSE;
+
+ /* Call notify callback */
+ if (schedule->notify)
+ schedule->notify(schedule, FALSE, task, FALSE, 0, 0, 0, 0,
+ schedule->notify_context);
+ ret = TRUE;
+ }
+ }
+
+ SILC_SCHEDULE_UNLOCK(schedule);
+
+ if (ret == FALSE)
+ silc_set_errno(SILC_ERR_NOT_FOUND);
+
+ return ret;
+}
+
+/* Invalidate task by context. */
+
+SilcBool silc_schedule_task_del_by_context(SilcSchedule schedule,
+ void *context)
+{
+ SilcTask task;
+ SilcHashTableList htl;
+ SilcList list;
+ SilcBool ret = FALSE;
+
+ SILC_LOG_DEBUG(("Unregister task by context"));
+
+ if (!schedule) {
+ schedule = silc_schedule_get_global();
+ SILC_VERIFY(schedule);
+ if (!schedule) {
+ silc_set_errno(SILC_ERR_INVALID_ARGUMENT);
+ return FALSE;
+ }
+ }
+
+ SILC_SCHEDULE_LOCK(schedule);
+
+ /* Delete from fd queue */
+ silc_hash_table_list(schedule->fd_queue, &htl);
+ while (silc_hash_table_get(&htl, NULL, (void *)&task)) {
+ if (task->context == context) {
+ task->valid = FALSE;
+
+ /* Call notify callback */
+ if (schedule->notify)
+ schedule->notify(schedule, FALSE, task, TRUE,
+ ((SilcTaskFd)task)->fd, 0, 0, 0,
+ schedule->notify_context);
+ ret = TRUE;
+ }
+ }
+ silc_hash_table_list_reset(&htl);
+
+ /* Delete from timeout queue */
+ list = schedule->timeout_queue;
+ silc_list_start(list);
+ while ((task = (SilcTask)silc_list_get(list))) {
+ if (task->context == context) {
+ task->valid = FALSE;
+
+ /* Call notify callback */
+ if (schedule->notify)
+ schedule->notify(schedule, FALSE, task, FALSE, 0, 0, 0, 0,
+ schedule->notify_context);
+ ret = TRUE;
+ }
+ }
+
+ SILC_SCHEDULE_UNLOCK(schedule);
+
+ if (ret == FALSE)
+ silc_set_errno(SILC_ERR_NOT_FOUND);
+
+ return ret;
+}
+
+/* Invalidate task by all */
+
+SilcBool silc_schedule_task_del_by_all(SilcSchedule schedule, int fd,
+ SilcTaskCallback callback,
+ void *context)
+{
+ SilcTask task;
+ SilcList list;
+ SilcBool ret = FALSE;
+
+ SILC_LOG_DEBUG(("Unregister task by fd, callback and context"));
+
+ /* For fd task, callback and context is irrelevant as fd is unique */
+ if (fd)
+ return silc_schedule_task_del_by_fd(schedule, fd);
+
+ if (!schedule) {
+ schedule = silc_schedule_get_global();
+ SILC_VERIFY(schedule);
+ if (!schedule) {
+ silc_set_errno(SILC_ERR_INVALID_ARGUMENT);
+ return FALSE;
+ }
+ }
+
+ SILC_SCHEDULE_LOCK(schedule);
+
+ /* Delete from timeout queue */
+ list = schedule->timeout_queue;
+ silc_list_start(list);
+ while ((task = (SilcTask)silc_list_get(list))) {
+ if (task->callback == callback && task->context == context) {
+ task->valid = FALSE;
+
+ /* Call notify callback */
+ if (schedule->notify)
+ schedule->notify(schedule, FALSE, task, FALSE, 0, 0, 0, 0,
+ schedule->notify_context);
+ ret = TRUE;
+ }
+ }
+
+ SILC_SCHEDULE_UNLOCK(schedule);
+
+ if (ret == FALSE)
+ silc_set_errno(SILC_ERR_NOT_FOUND);
+
+ return TRUE;
+}
+
+/* Sets a file descriptor to be listened by scheduler. One can call this
+ directly if wanted. This can be called multiple times for one file
+ descriptor to set different iomasks. */
+
+SilcBool silc_schedule_set_listen_fd(SilcSchedule schedule, SilcUInt32 fd,
+ SilcTaskEvent mask, SilcBool send_events)
+{
+ SilcTaskFd task;
+
+ if (!schedule) {
+ schedule = silc_schedule_get_global();
+ SILC_VERIFY(schedule);
+ if (!schedule) {
+ silc_set_errno(SILC_ERR_INVALID_ARGUMENT);
+ return FALSE;
+ }
+ }
+
+ if (silc_unlikely(!schedule->valid)) {
+ silc_set_errno(SILC_ERR_NOT_VALID);
+ return FALSE;
+ }
+
+ SILC_SCHEDULE_LOCK(schedule);
+
+ if (silc_hash_table_find(schedule->fd_queue, SILC_32_TO_PTR(fd),
+ NULL, (void *)&task)) {
+ if (!schedule_ops.schedule_fd(schedule, schedule->internal, task, mask)) {
+ SILC_SCHEDULE_UNLOCK(schedule);
+ return FALSE;
+ }
+ task->events = mask;
+ if (silc_unlikely(send_events) && mask) {
+ task->revents = mask;
+ silc_schedule_dispatch_fd(schedule);
+ }
+
+ /* Call notify callback */
+ if (schedule->notify)
+ schedule->notify(schedule, TRUE, (SilcTask)task,
+ TRUE, task->fd, mask, 0, 0,
+ schedule->notify_context);
+ }
+
+ SILC_SCHEDULE_UNLOCK(schedule);
+
+ return TRUE;
+}
+
+/* Returns the file descriptor's current requested event mask. */
+
+SilcTaskEvent silc_schedule_get_fd_events(SilcSchedule schedule,
+ SilcUInt32 fd)
+{
+ SilcTaskFd task;
+ SilcTaskEvent event = 0;
+
+ if (!schedule) {
+ schedule = silc_schedule_get_global();
+ SILC_VERIFY(schedule);
+ if (!schedule) {
+ silc_set_errno(SILC_ERR_INVALID_ARGUMENT);
+ return 0;
+ }
+ }
+
+ if (silc_unlikely(!schedule->valid)) {
+ silc_set_errno(SILC_ERR_NOT_VALID);
+ return 0;
+ }
+
+ SILC_SCHEDULE_LOCK(schedule);
+ if (silc_hash_table_find(schedule->fd_queue, SILC_32_TO_PTR(fd),
+ NULL, (void *)&task))
+ event = task->events;
+ SILC_SCHEDULE_UNLOCK(schedule);
+
+ return event;
+}
+
+/* Removes a file descriptor from listen list. */
+
+void silc_schedule_unset_listen_fd(SilcSchedule schedule, SilcUInt32 fd)
+{
+ silc_schedule_set_listen_fd(schedule, fd, 0, FALSE);
+}
+
+/*************************** Asynchronous Events ****************************/
+
+/* Add event */
+
+SilcTask silc_schedule_task_add_event(SilcSchedule schedule,
+ const char *event, ...)
+{
+ SilcEventTask task;
+ SilcSchedule parent;
+
+ if (!schedule) {
+ schedule = silc_schedule_get_global();
+ SILC_VERIFY(schedule);
+ if (!schedule) {
+ silc_set_errno(SILC_ERR_INVALID_ARGUMENT);
+ return NULL;
+ }
+ }
+
+ /* Get parent scheduler */
+ parent = silc_schedule_get_parent(schedule);
+
+ SILC_LOG_DEBUG(("Adding event '%s' to scheduler %p", event, parent));
+
+ SILC_SCHEDULE_LOCK(parent);
+
+ /* Create events hash table if not already done */
+ if (!parent->events) {
+ parent->events = silc_hash_table_alloc(NULL, 3,
+ silc_hash_string, NULL,
+ silc_hash_string_compare, NULL,
+ NULL, NULL, FALSE);
+ if (!parent->events) {
+ SILC_SCHEDULE_UNLOCK(parent);
+ return NULL;
+ }
+ }
+
+ /* Check if this event is added already */
+ if (silc_hash_table_find(parent->events, (void *)event, NULL, NULL)) {
+ SILC_SCHEDULE_UNLOCK(parent);
+ return NULL;
+ }
+
+ /* Add new event */
+ task = silc_calloc(1, sizeof(*task));
+ if (!task) {
+ SILC_SCHEDULE_UNLOCK(parent);
+ return NULL;
+ }
+
+ task->header.type = SILC_TASK_EVENT;
+ task->header.valid = TRUE;
+ task->event = silc_strdup(event);
+ if (!task->event) {
+ SILC_SCHEDULE_UNLOCK(parent);
+ silc_free(task);
+ return NULL;
+ }
+ silc_list_init(task->connections, struct SilcScheduleEventConnectionStruct,
+ next);
+
+ if (!silc_hash_table_add(parent->events, task->event, task)) {
+ SILC_SCHEDULE_UNLOCK(parent);
+ silc_free(task->event);
+ silc_free(task);
+ return NULL;
+ }
- SILC_LOG_DEBUG(("In scheduler loop"));
+ SILC_SCHEDULE_UNLOCK(parent);
- if (!schedule->is_locked)
- silc_mutex_lock(schedule->lock);
+ return (SilcTask)task;
+}
+
+/* Connect to event task */
+
+SilcBool silc_schedule_event_connect(SilcSchedule schedule,
+ const char *event, SilcTask task,
+ SilcTaskEventCallback callback,
+ void *context)
+{
+ SilcSchedule parent;
+ SilcScheduleEventConnection conn;
+ SilcEventTask etask;
+
+ if (!schedule) {
+ schedule = silc_schedule_get_global();
+ SILC_VERIFY(schedule);
+ if (!schedule) {
+ silc_set_errno(SILC_ERR_INVALID_ARGUMENT);
+ return FALSE;
+ }
+ }
+
+ if (!event && !task) {
+ silc_set_errno(SILC_ERR_INVALID_ARGUMENT);
+ return FALSE;
+ }
+
+ if (task && task->type != SILC_TASK_EVENT) {
+ silc_set_errno(SILC_ERR_INVALID_ARGUMENT);
+ return FALSE;
+ }
- /* If the task queues aren't initialized or we aren't valid anymore
- we will return */
- if ((!schedule->fd_queue && !schedule->timeout_queue
- && !schedule->generic_queue) || schedule->valid == FALSE) {
- SILC_LOG_DEBUG(("Scheduler not valid anymore, exiting"));
- if (!schedule->is_locked)
- silc_mutex_unlock(schedule->lock);
+ /* Get parent scheduler */
+ parent = silc_schedule_get_parent(schedule);
+
+ SILC_SCHEDULE_LOCK(parent);
+
+ if (!task) {
+ /* Get the event task */
+ if (!silc_hash_table_find(parent->events, (void *)event, NULL,
+ (void *)&task)) {
+ SILC_SCHEDULE_UNLOCK(parent);
+ return FALSE;
+ }
+ }
+ etask = (SilcEventTask)task;
+
+ /* See if task is deleted */
+ if (task->valid == FALSE) {
+ SILC_SCHEDULE_UNLOCK(parent);
+ silc_set_errno(SILC_ERR_NOT_VALID);
return FALSE;
}
- /* Clear everything */
- FD_ZERO(&schedule->in);
- FD_ZERO(&schedule->out);
- schedule->max_fd = -1;
- is_run = FALSE;
+ SILC_LOG_DEBUG(("Connect callback %p with context %p to event '%s'",
+ callback, context, etask->event));
+
+ /* See if already connected */
+ silc_list_start(etask->connections);
+ while ((conn = silc_list_get(etask->connections))) {
+ if (conn->callback == callback && conn->context == context) {
+ SILC_SCHEDULE_UNLOCK(parent);
+ silc_set_errno(SILC_ERR_ALREADY_EXISTS);
+ return FALSE;
+ }
+ }
+
+ conn = silc_calloc(1, sizeof(*conn));
+ if (!conn) {
+ SILC_SCHEDULE_UNLOCK(parent);
+ return FALSE;
+ }
+
+ /* Connect to the event */
+ conn->schedule = schedule;
+ conn->callback = callback;
+ conn->context = context;
+ silc_list_add(etask->connections, conn);
+
+ SILC_SCHEDULE_UNLOCK(parent);
+
+ return TRUE;
+}
+
+/* Disconnect from event */
+
+SilcBool silc_schedule_event_disconnect(SilcSchedule schedule,
+ const char *event, SilcTask task,
+ SilcTaskEventCallback callback,
+ void *context)
+{
+ SilcSchedule parent;
+ SilcScheduleEventConnection conn;
+ SilcEventTask etask;
+
+ if (!schedule) {
+ schedule = silc_schedule_get_global();
+ SILC_VERIFY(schedule);
+ if (!schedule) {
+ silc_set_errno(SILC_ERR_INVALID_ARGUMENT);
+ return FALSE;
+ }
+ }
+
+ if (!event && !task) {
+ silc_set_errno(SILC_ERR_INVALID_ARGUMENT);
+ return FALSE;
+ }
+
+ if (task && task->type != SILC_TASK_EVENT) {
+ silc_set_errno(SILC_ERR_INVALID_ARGUMENT);
+ return FALSE;
+ }
+
+ /* Get parent scheduler */
+ parent = silc_schedule_get_parent(schedule);
+
+ SILC_SCHEDULE_LOCK(parent);
+
+ if (!task) {
+ /* Get the event task */
+ if (!silc_hash_table_find(parent->events, (void *)event, NULL,
+ (void *)&task)) {
+ SILC_SCHEDULE_UNLOCK(parent);
+ return FALSE;
+ }
+ }
+ etask = (SilcEventTask)task;
+
+ /* See if task is deleted */
+ if (task->valid == FALSE) {
+ SILC_SCHEDULE_UNLOCK(parent);
+ silc_set_errno(SILC_ERR_NOT_VALID);
+ return FALSE;
+ }
+
+ SILC_LOG_DEBUG(("Disconnect callback %p with context %p from event '%s'",
+ callback, context, etask->event));
+
+ /* Disconnect */
+ silc_list_start(etask->connections);
+ while ((conn = silc_list_get(etask->connections))) {
+ if (conn->callback == callback && conn->context == context) {
+ silc_list_del(etask->connections, conn);
+ silc_free(conn);
+ SILC_SCHEDULE_UNLOCK(parent);
+ return TRUE;
+ }
+ }
+
+ SILC_SCHEDULE_UNLOCK(parent);
+ silc_set_errno(SILC_ERR_NOT_FOUND);
+ return FALSE;
+}
- /* Calculate next timeout for silc_select(). This is the timeout value
- when at earliest some of the timeout tasks expire. */
- silc_mutex_lock(schedule->timeout_queue->lock);
- SILC_SCHEDULE_SELECT_TIMEOUT;
- silc_mutex_unlock(schedule->timeout_queue->lock);
+/* Signal event */
- /* Add the file descriptors to the fd sets. These are the non-timeout
- tasks. The silc_select() listens to these file descriptors. */
- SILC_SCHEDULE_SELECT_TASKS;
+SilcBool silc_schedule_event_signal(SilcSchedule schedule, const char *event,
+ SilcTask task, ...)
+{
+ SilcSchedule parent;
+ SilcScheduleEventConnection conn;
+ SilcEventTask etask;
+ SilcBool stop;
+ va_list ap, cp;
+
+ if (silc_unlikely(!schedule)) {
+ schedule = silc_schedule_get_global();
+ SILC_VERIFY(schedule);
+ if (!schedule) {
+ silc_set_errno(SILC_ERR_INVALID_ARGUMENT);
+ return FALSE;
+ }
+ }
- if (schedule->max_fd == -1 && !schedule->timeout) {
- if (!schedule->is_locked)
- silc_mutex_unlock(schedule->lock);
+ if (silc_unlikely(!event && !task)) {
+ silc_set_errno(SILC_ERR_INVALID_ARGUMENT);
return FALSE;
}
- if (schedule->timeout) {
- SILC_LOG_DEBUG(("timeout: sec=%d, usec=%d", schedule->timeout->tv_sec,
- schedule->timeout->tv_usec));
+ if (silc_unlikely(task && task->type != SILC_TASK_EVENT)) {
+ silc_set_errno(SILC_ERR_INVALID_ARGUMENT);
+ return FALSE;
}
- if (timeout_usecs >= 0) {
- timeout.tv_sec = 0;
- timeout.tv_usec = timeout_usecs;
- schedule->timeout = &timeout;
+ /* Get parent scheduler */
+ parent = silc_schedule_get_parent(schedule);
+
+ SILC_SCHEDULE_LOCK(parent);
+
+ if (!task) {
+ /* Get the event task */
+ if (!silc_hash_table_find(parent->events, (void *)event, NULL,
+ (void *)&task)) {
+ SILC_SCHEDULE_UNLOCK(parent);
+ return FALSE;
+ }
}
+ etask = (SilcEventTask)task;
+
+ /* See if task is deleted */
+ if (task->valid == FALSE) {
+ SILC_SCHEDULE_UNLOCK(parent);
+ silc_set_errno(SILC_ERR_NOT_VALID);
+ return FALSE;
+ }
+
+ SILC_LOG_DEBUG(("Signal event '%s'", etask->event));
- silc_mutex_unlock(schedule->lock);
+ va_start(ap, task);
- /* This is the main select(). The program blocks here until some
- of the selected file descriptors change status or the selected
- timeout expires. */
- SILC_LOG_DEBUG(("Select"));
- ret = silc_select(schedule->max_fd + 1, &schedule->in,
- &schedule->out, 0, schedule->timeout);
+ /* Deliver the signal */
+ silc_list_start(etask->connections);
+ while ((conn = silc_list_get(etask->connections))) {
+ SILC_SCHEDULE_UNLOCK(parent);
- silc_mutex_lock(schedule->lock);
+ silc_va_copy(cp, ap);
+ stop = conn->callback(conn->schedule, conn->schedule->app_context,
+ task, conn->context, cp);
+ va_end(cp);
- switch (ret) {
- case -1:
- /* Error */
- if (errno == EINTR)
+ SILC_SCHEDULE_LOCK(parent);
+
+ /* Stop signal if wanted or if the task was deleted */
+ if (!stop || !task->valid)
break;
- SILC_LOG_ERROR(("Error in select(): %s", strerror(errno)));
- break;
- case 0:
- /* Timeout */
- SILC_LOG_DEBUG(("Running timeout tasks"));
- silc_mutex_lock(schedule->timeout_queue->lock);
- silc_gettimeofday(&curtime);
- SILC_SCHEDULE_RUN_TIMEOUT_TASKS;
- silc_mutex_unlock(schedule->timeout_queue->lock);
- break;
- default:
- /* There is some data available now */
- SILC_LOG_DEBUG(("Running non-timeout tasks"));
- silc_mutex_lock(schedule->fd_queue->lock);
- SILC_SCHEDULE_RUN_TASKS;
- silc_mutex_unlock(schedule->fd_queue->lock);
-
- silc_mutex_lock(schedule->generic_queue->lock);
- SILC_SCHEDULE_RUN_GENERIC_TASKS;
- silc_mutex_unlock(schedule->generic_queue->lock);
- break;
}
- if (!schedule->is_locked)
- silc_mutex_unlock(schedule->lock);
+ va_end(ap);
+
+ SILC_SCHEDULE_UNLOCK(parent);
return TRUE;
}
-/* The SILC scheduler. This is actually the main routine in SILC programs.
- When this returns the program is to be ended. Before this function can
- be called, one must call silc_schedule_init function. */
+/* Delete event */
-void silc_schedule(SilcSchedule schedule)
+SilcBool silc_schedule_task_del_event(SilcSchedule schedule, const char *event)
{
- SILC_LOG_DEBUG(("Running scheduler"));
+ SilcSchedule parent;
+ SilcTask task;
- if (schedule->valid == FALSE) {
- SILC_LOG_ERROR(("Scheduler is not valid, stopping"));
- return;
+ if (!schedule) {
+ schedule = silc_schedule_get_global();
+ SILC_VERIFY(schedule);
+ if (!schedule) {
+ silc_set_errno(SILC_ERR_INVALID_ARGUMENT);
+ return FALSE;
+ }
}
- silc_mutex_lock(schedule->lock);
- schedule->is_locked = TRUE;
+ if (!event) {
+ silc_set_errno(SILC_ERR_INVALID_ARGUMENT);
+ return FALSE;
+ }
- /* Start the scheduler loop */
- while (silc_schedule_one(schedule, -1))
- ;
+ /* Get parent scheduler */
+ parent = silc_schedule_get_parent(schedule);
+
+ SILC_SCHEDULE_LOCK(parent);
+
+ /* Get the event task */
+ if (!silc_hash_table_find(parent->events, (void *)event, NULL,
+ (void *)&task)) {
+ SILC_SCHEDULE_UNLOCK(parent);
+ return FALSE;
+ }
- silc_mutex_unlock(schedule->lock);
+ /* See if already deleted */
+ if (task->valid == FALSE)
+ return TRUE;
+
+ SILC_LOG_DEBUG(("Delete event '%s'", ((SilcEventTask)task)->event));
+
+ SILC_SCHEDULE_UNLOCK(parent);
+
+ silc_schedule_task_del(parent, task);
+
+ return TRUE;
}
-/* Wakes up the scheduler. This is used only in multi-threaded
- environments where threads may add new tasks or remove old tasks
- from task queues. This is called to wake up the scheduler in the
- main thread so that it detects the changes in the task queues.
- If threads support is not compiled in this function has no effect.
- Implementation of this function is platform specific. */
+/* Timeout to remove deleted event task */
-void silc_schedule_wakeup(SilcSchedule schedule)
+SILC_TASK_CALLBACK(silc_schedule_event_del_timeout)
{
-#ifdef SILC_THREADS
- SILC_LOG_DEBUG(("Wakeup scheduler"));
- silc_mutex_lock(schedule->lock);
- silc_schedule_wakeup_internal(schedule->wakeup);
- silc_mutex_unlock(schedule->lock);
-#endif
+ SILC_SCHEDULE_LOCK(schedule);
+ silc_schedule_task_remove(schedule, context);
+ SILC_SCHEDULE_UNLOCK(schedule);
}
projects / crypto.git / blobdiff