diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2017-05-03 17:35:45 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2017-05-23 18:29:12 +0200 |
| commit | 83eacc448c94e7cb8cd11720aab505d865eeb6ef (patch) | |
| tree | 72c3c090faed1d76a5e7d21b9198764de7ca8628 | |
| parent | 05eeffb2f2f42f3f66a1b9f3c128768af756fac2 (diff) | |
| download | strongswan-83eacc448c94e7cb8cd11720aab505d865eeb6ef.tar.bz2 strongswan-83eacc448c94e7cb8cd11720aab505d865eeb6ef.tar.xz | |
processor: Move priority threads assignment to set_threads()
This avoids the evaluation of %N even if the thread pool is never used.
We need to avoid as many custom printf specifiers as possible when
fuzzing our code to avoid excessive log messages.
| -rw-r--r-- | src/libstrongswan/processing/processor.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/libstrongswan/processing/processor.c b/src/libstrongswan/processing/processor.c index 27e5ab5f6..bd8d534a5 100644 --- a/src/libstrongswan/processing/processor.c +++ b/src/libstrongswan/processing/processor.c @@ -429,7 +429,15 @@ METHOD(processor_t, execute_job, void, METHOD(processor_t, set_threads, void, private_processor_t *this, u_int count) { + int i; + this->mutex->lock(this->mutex); + for (i = 0; i < JOB_PRIO_MAX; i++) + { + this->prio_threads[i] = lib->settings->get_int(lib->settings, + "%s.processor.priority_threads.%N", 0, lib->ns, + job_priority_names, i); + } if (count > this->total_threads) { /* increase thread count */ worker_thread_t *worker; @@ -551,13 +559,10 @@ processor_t *processor_create() .job_added = condvar_create(CONDVAR_TYPE_DEFAULT), .thread_terminated = condvar_create(CONDVAR_TYPE_DEFAULT), ); + for (i = 0; i < JOB_PRIO_MAX; i++) { this->jobs[i] = linked_list_create(); - this->prio_threads[i] = lib->settings->get_int(lib->settings, - "%s.processor.priority_threads.%N", 0, lib->ns, - job_priority_names, i); } - return &this->public; } |