denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use wrapped semaphore in callback_job_t.

Browse Source
This commit is contained in:
Tobias Brunner
2012-05-02 14:45:38 +02:00
parent aac20ec784
commit 052e0a17b8
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/processing/jobs/callback_job.c
+9 -12
View File
@@ -17,10 +17,9 @@
#include "callback_job.h" #include "callback_job.h"
#include <semaphore.h>
#include <threading/thread.h> #include <threading/thread.h>
#include <threading/condvar.h> #include <threading/condvar.h>
#include <threading/semaphore.h>
#include <threading/mutex.h> #include <threading/mutex.h>
#include <utils/linked_list.h> #include <utils/linked_list.h>
@@ -84,10 +83,10 @@ struct private_callback_job_t {
/** /**
* semaphore to synchronize the termination of the assigned thread. * semaphore to synchronize the termination of the assigned thread.
* *
* separately allocated during cancellation, so that we can wait on it * separately created during cancellation, so that we can wait on it
* without risking that it gets freed too early during destruction. * without risking that it gets destroyed too early during destruction.
*/ */
sem_t *terminated; semaphore_t *terminated;
/** /**
* Priority of this job * Priority of this job
@@ -129,7 +128,7 @@ METHOD(job_t, destroy, void,
} }
if (this->terminated) if (this->terminated)
{ {
sem_post(this->terminated); this->terminated->post(this->terminated);
} }
this->children->destroy(this->children); this->children->destroy(this->children);
this->destroyable->destroy(this->destroyable); this->destroyable->destroy(this->destroyable);
@@ -142,7 +141,7 @@ METHOD(callback_job_t, cancel, void,
private_callback_job_t *this) private_callback_job_t *this)
{ {
callback_job_t *child; callback_job_t *child;
sem_t *terminated = NULL; semaphore_t *terminated = NULL;
this->mutex->lock(this->mutex); this->mutex->lock(this->mutex);
this->cancelled = TRUE; this->cancelled = TRUE;
@@ -158,8 +157,7 @@ METHOD(callback_job_t, cancel, void,
/* terminate the thread, if there is currently one executing the job. /* terminate the thread, if there is currently one executing the job.
* we wait for its termination using a semaphore */ * we wait for its termination using a semaphore */
this->thread->cancel(this->thread); this->thread->cancel(this->thread);
terminated = this->terminated = malloc_thing(sem_t); terminated = this->terminated = semaphore_create(0);
sem_init(terminated, 0, 0);
} }
else else
{ {
@@ -174,9 +172,8 @@ METHOD(callback_job_t, cancel, void,
if (terminated) if (terminated)
{ {
sem_wait(terminated); terminated->wait(terminated);
sem_destroy(terminated); terminated->destroy(terminated);
free(terminated);
} }
} }