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/charon-nm/nm/nm_backend.c
+18 -10
View File
@@ -67,6 +67,22 @@ static job_requeue_t run(nm_backend_t *this)
return JOB_REQUEUE_NONE;
}
/**
* Cancel the GLib Main Event Loop
*/
static bool cancel(nm_backend_t *this)
{
if (this->loop)
{
if (g_main_loop_is_running(this->loop))
{
g_main_loop_quit(this->loop);
}
g_main_loop_unref(this->loop);
}
return TRUE;
}
/*
* see header file
*/
@@ -78,14 +94,6 @@ void nm_backend_deinit()
{
return;
}
if (this->loop)
{
if (g_main_loop_is_running(this->loop))
{
g_main_loop_quit(this->loop);
}
g_main_loop_unref(this->loop);
}
if (this->plugin)
{
g_object_unref(this->plugin);
@@ -132,8 +140,8 @@ bool nm_backend_init()
charon->keep_cap(charon, CAP_DAC_OVERRIDE);
lib->processor->queue_job(lib->processor,
(job_t*)callback_job_create_with_prio((callback_job_cb_t)run,
this, NULL, NULL, JOB_PRIO_CRITICAL));
(job_t*)callback_job_create_with_prio((callback_job_cb_t)run, this,
NULL, (callback_job_cancel_t)cancel, JOB_PRIO_CRITICAL));
return TRUE;
}