From: Martin Willi <martin@revosec.ch>
Date: Tue, 15 Mar 2011 10:48:19 +0000 (+0100)
Subject: Do not invoke processor restart() if not required
X-Git-Tag: 4.5.2~225
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=11f89bc948a9814dad77010eeecb0bb285b57a1b;p=thirdparty%2Fstrongswan.git

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.
---

diff --git a/src/libstrongswan/processing/processor.c b/src/libstrongswan/processing/processor.c
index 723aec908d..3d28ff18fe 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);
 }
 
 /**