From 11f89bc948a9814dad77010eeecb0bb285b57a1b Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Tue, 15 Mar 2011 11:48:19 +0100 Subject: Do not invoke processor restart() if not required Doing so might result in a deadlock during shutdown if a delayed restart is locked on the bus during the debug statement. --- src/libstrongswan/processing/processor.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/libstrongswan/processing/processor.c') diff --git a/src/libstrongswan/processing/processor.c b/src/libstrongswan/processing/processor.c index 723aec908..3d28ff18f 100644 --- a/src/libstrongswan/processing/processor.c +++ b/src/libstrongswan/processing/processor.c @@ -136,8 +136,9 @@ static void process_jobs(private_processor_t *this) thread_cleanup_pop(FALSE); this->mutex->lock(this->mutex); } + this->total_threads--; + this->thread_terminated->signal(this->thread_terminated); this->mutex->unlock(this->mutex); - restart(this); } /** -- cgit v1.2.3