diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2012-06-19 13:29:09 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2012-06-25 17:38:59 +0200 |
| commit | 26d77eb3e61b2ff929dff96bbb53a5d22d76ce4f (patch) | |
| tree | 5d5b7bd7bb2cd6a721c65b82f8ce2a8b3f4fdf22 /src/libcharon/network/sender.c | |
| parent | 7fec83af28f233a02b7ae08c6fd4de65799cb6b4 (diff) | |
| download | strongswan-26d77eb3e61b2ff929dff96bbb53a5d22d76ce4f.tar.bz2 strongswan-26d77eb3e61b2ff929dff96bbb53a5d22d76ce4f.tar.xz | |
Centralized thread cancellation in processor_t
This ensures that no threads are active when plugins and the rest of the
daemon are unloaded.
callback_job_t was simplified a lot in the process as its main
functionality is now contained in processor_t. The parent-child
relationships were abandoned as these were only needed to simplify job
cancellation.
Diffstat (limited to 'src/libcharon/network/sender.c')
| -rw-r--r-- | src/libcharon/network/sender.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/libcharon/network/sender.c b/src/libcharon/network/sender.c index dc2641f7f..75635d2e3 100644 --- a/src/libcharon/network/sender.c +++ b/src/libcharon/network/sender.c @@ -39,11 +39,6 @@ struct private_sender_t { sender_t public; /** - * Sender threads job. - */ - callback_job_t *job; - - /** * The packets are stored in a linked list */ linked_list_t *list; @@ -164,7 +159,6 @@ METHOD(sender_t, flush, void, METHOD(sender_t, destroy, void, private_sender_t *this) { - this->job->cancel(this->job); this->list->destroy_offset(this->list, offsetof(packet_t, destroy)); this->got->destroy(this->got); this->sent->destroy(this->sent); @@ -189,8 +183,6 @@ sender_t * sender_create() .mutex = mutex_create(MUTEX_TYPE_DEFAULT), .got = condvar_create(CONDVAR_TYPE_DEFAULT), .sent = condvar_create(CONDVAR_TYPE_DEFAULT), - .job = callback_job_create_with_prio((callback_job_cb_t)send_packets, - this, NULL, NULL, JOB_PRIO_CRITICAL), .send_delay = lib->settings->get_int(lib->settings, "%s.send_delay", 0, charon->name), .send_delay_type = lib->settings->get_int(lib->settings, @@ -201,7 +193,9 @@ sender_t * sender_create() "%s.send_delay_response", TRUE, charon->name), ); - lib->processor->queue_job(lib->processor, (job_t*)this->job); + lib->processor->queue_job(lib->processor, + (job_t*)callback_job_create_with_prio((callback_job_cb_t)send_packets, + this, NULL, (callback_job_cancel_t)return_false, JOB_PRIO_CRITICAL)); return &this->public; } |