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

Only create more threads if needed in host_resolver_t

Browse Source
This commit is contained in:
Tobias Brunner
2012-10-18 12:26:00 +02:00
parent eecd41e349
commit 49e2d109a3
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/host_resolver.c
+9 -1
View File
@@ -69,6 +69,11 @@ struct private_host_resolver_t {
*/ */
u_int threads; u_int threads;
/**
* Current number of busy threads
*/
u_int busy_threads;
/** /**
* TRUE if no new queries are accepted * TRUE if no new queries are accepted
*/ */
@@ -148,6 +153,7 @@ static job_requeue_t resolve_hosts(private_host_resolver_t *this)
thread_cancelability(old); thread_cancelability(old);
thread_cleanup_pop(FALSE); thread_cleanup_pop(FALSE);
} }
this->busy_threads++;
this->mutex->unlock(this->mutex); this->mutex->unlock(this->mutex);
memset(&hints, 0, sizeof(hints)); memset(&hints, 0, sizeof(hints));
@@ -160,6 +166,7 @@ static job_requeue_t resolve_hosts(private_host_resolver_t *this)
thread_cleanup_pop(FALSE); thread_cleanup_pop(FALSE);
this->mutex->lock(this->mutex); this->mutex->lock(this->mutex);
this->busy_threads--;
if (error != 0) if (error != 0)
{ {
DBG1(DBG_LIB, "resolving '%s' failed: %s", query->name, DBG1(DBG_LIB, "resolving '%s' failed: %s", query->name,
@@ -218,7 +225,8 @@ METHOD(host_resolver_t, resolve, host_t*,
this->new_query->signal(this->new_query); this->new_query->signal(this->new_query);
} }
ref_get(&query->refcount); ref_get(&query->refcount);
if (this->threads < this->max_threads) if (this->busy_threads == this->threads &&
this->threads < this->max_threads)
{ {
this->threads++; this->threads++;
lib->processor->queue_job(lib->processor, lib->processor->queue_job(lib->processor,