diff options
| author | Martin Willi <martin@strongswan.org> | 2006-07-10 14:24:04 +0000 |
|---|---|---|
| committer | Martin Willi <martin@strongswan.org> | 2006-07-10 14:24:04 +0000 |
| commit | abba7ecb9d454d2cf0b51b17c3442132435b05b0 (patch) | |
| tree | 5dc0667752f515620a2b6e6a2c61b87a35dddb0f /src/charon/threads/scheduler.c | |
| parent | c5d2d7c0230569c7995c34d538abd03c737b9281 (diff) | |
| download | strongswan-abba7ecb9d454d2cf0b51b17c3442132435b05b0.tar.bz2 strongswan-abba7ecb9d454d2cf0b51b17c3442132435b05b0.tar.xz | |
further work done for simultaneous rekeying/delete
still some cases which cause trouble
Diffstat (limited to 'src/charon/threads/scheduler.c')
| -rw-r--r-- | src/charon/threads/scheduler.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/charon/threads/scheduler.c b/src/charon/threads/scheduler.c index 759a69c83..d3013cb95 100644 --- a/src/charon/threads/scheduler.c +++ b/src/charon/threads/scheduler.c @@ -42,15 +42,6 @@ struct private_scheduler_t { * Public part of a scheduler_t object. */ scheduler_t public; - - /** - * @brief Get events from the event queue and add them to to job queue. - * - * Thread function started at creation of the scheduler object. - * - * @param this calling object - */ - void (*get_events) (private_scheduler_t *this); /** * Assigned thread. @@ -75,7 +66,7 @@ static void get_events(private_scheduler_t * this) this->logger->log(this->logger, CONTROL, "scheduler thread running, thread_ID: %06u", (int)pthread_self()); - for (;;) + while (TRUE) { this->logger->log(this->logger, CONTROL|LEVEL2, "Waiting for next event..."); /* get a job, this block until one is available */ @@ -109,11 +100,10 @@ scheduler_t * scheduler_create() private_scheduler_t *this = malloc_thing(private_scheduler_t); this->public.destroy = (void(*)(scheduler_t*)) destroy; - this->get_events = get_events; this->logger = logger_manager->get_logger(logger_manager, SCHEDULER); - if (pthread_create(&(this->assigned_thread), NULL, (void*(*)(void*))this->get_events, this) != 0) + if (pthread_create(&(this->assigned_thread), NULL, (void*(*)(void*))get_events, this) != 0) { /* thread could not be created */ this->logger->log(this->logger, ERROR, "Scheduler thread could not be created!"); |