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

Centralized thread cancellation in processor_t

Browse Source 
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.
This commit is contained in:
Tobias Brunner
2012-06-25 17:38:59 +02:00
parent 7fec83af28
commit 26d77eb3e6
31 changed files with 263 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/network/receiver.c
+3 -14
View File
@@ -54,11 +54,6 @@ struct private_receiver_t {
*/
receiver_t public;
/**
* Threads job receiving packets
*/
callback_job_t *job;
/**
* current secret to use for cookie calculation
*/
@@ -393,8 +388,6 @@ static job_requeue_t receive_packets(private_receiver_t *this)
status = charon->socket->receive(charon->socket, &packet);
if (status == NOT_SUPPORTED)
{
/* the processor destroys this job */
this->job = NULL;
return JOB_REQUEUE_NONE;
}
else if (status != SUCCESS)
@@ -504,10 +497,6 @@ static job_requeue_t receive_packets(private_receiver_t *this)
METHOD(receiver_t, destroy, void,
private_receiver_t *this)
{
if (this->job)
{
this->job->cancel(this->job);
}
this->rng->destroy(this->rng);
this->hasher->destroy(this->hasher);
free(this);
@@ -568,9 +557,9 @@ receiver_t *receiver_create()
this->rng->get_bytes(this->rng, SECRET_LENGTH, this->secret);
memcpy(this->secret_old, this->secret, SECRET_LENGTH);
this->job = callback_job_create_with_prio((callback_job_cb_t)receive_packets,
this, NULL, NULL, JOB_PRIO_CRITICAL);
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)receive_packets,
this, NULL, (callback_job_cancel_t)return_false, JOB_PRIO_CRITICAL));
return &this->public;
}
src/libcharon/network/sender.c
+3 -9
View File
@@ -38,11 +38,6 @@ struct private_sender_t {
*/
sender_t public;
/**
* Sender threads job.
*/
callback_job_t *job;
/**
* The packets are stored in a linked 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;
}