[svn-upgrade] Integrating new upstream version, strongswan (4.2.4)

1 files changed, 32 insertions, 17 deletions

diff --git a/src/charon/processing/processor.c b/src/charon/processing/processor.c
index b3815eeb1..010f6624f 100644
--- a/src/charon/processing/processor.c
+++ b/src/charon/processing/processor.c
@@ -1,10 +1,3 @@
-/**
- * @file processor.c
- *
- * @brief Implementation of processor_t.
- *
- */
-
 /*
  * Copyright (C) 2005-2007 Martin Willi
  * Copyright (C) 2005 Jan Hutter
@@ -19,6 +12,8 @@
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
+ *
+ * $Id: processor.c 3742 2008-04-03 09:19:12Z tobias $
  */
  
 #include <stdlib.h>
@@ -35,7 +30,7 @@
 typedef struct private_processor_t private_processor_t;
 
 /**
- * @brief Private data of processor_t class.
+ * Private data of processor_t class.
  */
 struct private_processor_t {
 	/**
@@ -71,7 +66,12 @@ struct private_processor_t {
 	/**
 	 * Condvar to wait for new jobs
 	 */
-	pthread_cond_t condvar;
+	pthread_cond_t jobadded;
+	
+	/**
+	 * Condvar to wait for terminated threads
+	 */
+	pthread_cond_t threadterminated;
 };
 
 static void process_jobs(private_processor_t *this);
@@ -85,7 +85,10 @@ static void restart(private_processor_t *this)
 	
 	if (pthread_create(&thread, NULL, (void*)process_jobs, this) != 0)
 	{
+		pthread_mutex_lock(&this->mutex);
 		this->total_threads--;
+		pthread_cond_broadcast(&this->threadterminated);
+		pthread_mutex_unlock(&this->mutex);
 	}
 }
 
@@ -108,7 +111,7 @@ static void process_jobs(private_processor_t *this)
 		if (this->list->get_count(this->list) == 0)
 		{
 			this->idle_threads++;
-			pthread_cond_wait(&this->condvar, &this->mutex);
+			pthread_cond_wait(&this->jobadded, &this->mutex);
 			this->idle_threads--;
 			continue;
 		}
@@ -121,7 +124,7 @@ static void process_jobs(private_processor_t *this)
 		pthread_mutex_lock(&this->mutex);
 	}
 	this->total_threads--;
-	pthread_cond_broadcast(&this->condvar);
+	pthread_cond_signal(&this->threadterminated);
 	pthread_mutex_unlock(&this->mutex);
 }
 
@@ -130,7 +133,11 @@ static void process_jobs(private_processor_t *this)
  */
 static u_int get_total_threads(private_processor_t *this)
 {
-	return this->total_threads;
+	u_int count;
+	pthread_mutex_lock(&this->mutex);
+	count = this->total_threads; 
+	pthread_mutex_unlock(&this->mutex);
+	return count;
 }
 
 /**
@@ -138,7 +145,11 @@ static u_int get_total_threads(private_processor_t *this)
  */
 static u_int get_idle_threads(private_processor_t *this)
 {
-	return this->idle_threads;
+	u_int count;
+	pthread_mutex_lock(&this->mutex);
+	count = this->idle_threads;
+	pthread_mutex_unlock(&this->mutex);
+	return count;
 }
 
 /**
@@ -160,8 +171,8 @@ static void queue_job(private_processor_t *this, job_t *job)
 {
 	pthread_mutex_lock(&this->mutex);
 	this->list->insert_last(this->list, job);
+	pthread_cond_signal(&this->jobadded);
 	pthread_mutex_unlock(&this->mutex);
-	pthread_cond_signal(&this->condvar);
 }
 	
 /**
@@ -189,6 +200,7 @@ static void set_threads(private_processor_t *this, u_int count)
 	{	/* decrease thread count */
 		this->desired_threads = count;
 	}
+	pthread_cond_broadcast(&this->jobadded);
 	pthread_mutex_unlock(&this->mutex);
 }
 
@@ -198,11 +210,13 @@ static void set_threads(private_processor_t *this, u_int count)
 static void destroy(private_processor_t *this)
 {
 	set_threads(this, 0);
+	pthread_mutex_lock(&this->mutex);
 	while (this->total_threads > 0)
 	{
-		pthread_cond_broadcast(&this->condvar);
-		pthread_cond_wait(&this->condvar, &this->mutex);
+		pthread_cond_broadcast(&this->jobadded);
+		pthread_cond_wait(&this->threadterminated, &this->mutex);
 	}
+	pthread_mutex_unlock(&this->mutex);
 	this->list->destroy_offset(this->list, offsetof(job_t, destroy));
 	free(this);
 }
@@ -223,7 +237,8 @@ processor_t *processor_create(size_t pool_size)
 	
 	this->list = linked_list_create();
 	pthread_mutex_init(&this->mutex, NULL);
-	pthread_cond_init(&this->condvar, NULL);
+	pthread_cond_init(&this->jobadded, NULL);
+	pthread_cond_init(&this->threadterminated, NULL);
 	this->total_threads = 0;
 	this->desired_threads = 0;
 	this->idle_threads = 0;