1 files changed, 74 insertions, 90 deletions

diff --git a/src/charon/bus/bus.c b/src/charon/bus/bus.c
index 2671f848e..524a77682 100644
--- a/src/charon/bus/bus.c
+++ b/src/charon/bus/bus.c
@@ -15,11 +15,13 @@
 
 #include "bus.h"
 
-#include <pthread.h>
 #include <stdint.h>
 
 #include <daemon.h>
-#include <utils/mutex.h>
+#include <threading/thread.h>
+#include <threading/thread_value.h>
+#include <threading/condvar.h>
+#include <threading/mutex.h>
 
 ENUM(debug_names, DBG_DMN, DBG_LIB,
 	"DMN",
@@ -57,26 +59,21 @@ struct private_bus_t {
 	 * Public part of a bus_t object.
 	 */
 	bus_t public;
-	
+
 	/**
 	 * List of registered listeners as entry_t's
 	 */
 	linked_list_t *listeners;
-	
+
 	/**
 	 * mutex to synchronize active listeners, recursively
 	 */
 	mutex_t *mutex;
-	
-	/**
-	 * Thread local storage for a unique, simple thread ID
-	 */
-	pthread_key_t thread_id;
-	
+
 	/**
 	 * Thread local storage the threads IKE_SA
 	 */
-	pthread_key_t thread_sa;
+	thread_value_t *thread_sa;
 };
 
 typedef struct entry_t entry_t;
@@ -90,17 +87,17 @@ struct entry_t {
 	 * registered listener interface
 	 */
 	listener_t *listener;
-	
+
 	/**
 	 * is this a active listen() call with a blocking thread
 	 */
 	bool blocker;
-	
+
 	/**
 	 * are we currently calling this listener
 	 */
 	int calling;
-	
+
 	/**
 	 * condvar where active listeners wait
 	 */
@@ -113,12 +110,12 @@ struct entry_t {
 static entry_t *entry_create(listener_t *listener, bool blocker)
 {
 	entry_t *this = malloc_thing(entry_t);
-	
+
 	this->listener = listener;
 	this->blocker = blocker;
 	this->calling = 0;
 	this->condvar = condvar_create(CONDVAR_TYPE_DEFAULT);
-	
+
 	return this;
 }
 
@@ -132,28 +129,6 @@ static void entry_destroy(entry_t *entry)
 }
 
 /**
- * Get a unique thread number for a calling thread. Since
- * pthread_self returns large and ugly numbers, use this function
- * for logging; these numbers are incremental starting at 1
- */
-static u_int get_thread_number(private_bus_t *this)
-{
-	static uintptr_t current_num = 0;
-	uintptr_t stored_num;
-	
-	stored_num = (uintptr_t)pthread_getspecific(this->thread_id);
-	if (stored_num == 0)
-	{	/* first call of current thread */
-		pthread_setspecific(this->thread_id, (void*)++current_num);
-		return current_num;
-	}
-	else
-	{
-		return stored_num;
-	}
-}
-
-/**
  * Implementation of bus_t.add_listener.
  */
 static void add_listener(private_bus_t *this, listener_t *listener)
@@ -189,7 +164,7 @@ static void remove_listener(private_bus_t *this, listener_t *listener)
 typedef struct cleanup_data_t cleanup_data_t;
 
 /**
- * data to remove a listener using pthread_cleanup handler
+ * data to remove a listener using thread_cleanup_t handler
  */
 struct cleanup_data_t {
 	/** bus instance */
@@ -199,7 +174,7 @@ struct cleanup_data_t {
 };
 
 /**
- * pthread_cleanup handler to remove a listener
+ * thread_cleanup_t handler to remove a listener
  */
 static void listener_cleanup(cleanup_data_t *data)
 {
@@ -212,26 +187,26 @@ static void listener_cleanup(cleanup_data_t *data)
  */
 static void listen_(private_bus_t *this, listener_t *listener, job_t *job)
 {
-	int old;
+	bool old;
 	cleanup_data_t data;
-	
+
 	data.this = this;
 	data.entry = entry_create(listener, TRUE);
 
 	this->mutex->lock(this->mutex);
 	this->listeners->insert_last(this->listeners, data.entry);
 	charon->processor->queue_job(charon->processor, job);
-	pthread_cleanup_push((void*)this->mutex->unlock, this->mutex);
-	pthread_cleanup_push((void*)listener_cleanup, &data);
-	pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &old);
+	thread_cleanup_push((thread_cleanup_t)this->mutex->unlock, this->mutex);
+	thread_cleanup_push((thread_cleanup_t)listener_cleanup, &data);
+	old = thread_cancelability(TRUE);
 	while (data.entry->blocker)
 	{
 		data.entry->condvar->wait(data.entry->condvar, this->mutex);
 	}
-	pthread_setcancelstate(old, NULL);
-	pthread_cleanup_pop(FALSE);
+	thread_cancelability(old);
+	thread_cleanup_pop(FALSE);
 	/* unlock mutex */
-	pthread_cleanup_pop(TRUE);
+	thread_cleanup_pop(TRUE);
 	entry_destroy(data.entry);
 }
 
@@ -240,7 +215,15 @@ static void listen_(private_bus_t *this, listener_t *listener, job_t *job)
  */
 static void set_sa(private_bus_t *this, ike_sa_t *ike_sa)
 {
-	pthread_setspecific(this->thread_sa, ike_sa);
+	this->thread_sa->set(this->thread_sa, ike_sa);
+}
+
+/**
+ * Implementation of bus_t.get_sa
+ */
+static ike_sa_t* get_sa(private_bus_t *this)
+{
+	return this->thread_sa->get(this->thread_sa);
 }
 
 /**
@@ -302,20 +285,20 @@ static void vlog(private_bus_t *this, debug_t group, level_t level,
 				 char* format, va_list args)
 {
 	log_data_t data;
-	
-	data.ike_sa = pthread_getspecific(this->thread_sa);
-	data.thread = get_thread_number(this);
+
+	data.ike_sa = this->thread_sa->get(this->thread_sa);
+	data.thread = thread_current_id();
 	data.group = group;
 	data.level = level;
 	data.format = format;
 	va_copy(data.args, args);
-	
+
 	this->mutex->lock(this->mutex);
 	/* We use the remove() method to invoke all listeners. This is cheap and
 	 * does not require an allocation for this performance critical function. */
 	this->listeners->remove(this->listeners, &data, (void*)log_cb);
 	this->mutex->unlock(this->mutex);
-	
+
 	va_end(data.args);
 }
 
@@ -326,7 +309,7 @@ static void log_(private_bus_t *this, debug_t group, level_t level,
 				 char* format, ...)
 {
 	va_list args;
-	
+
 	va_start(args, format);
 	vlog(this, group, level, format, args);
 	va_end(args);
@@ -360,9 +343,9 @@ static void alert(private_bus_t *this, alert_t alert, ...)
 	entry_t *entry;
 	va_list args;
 	bool keep;
-	
-	ike_sa = pthread_getspecific(this->thread_sa);
-	
+
+	ike_sa = this->thread_sa->get(this->thread_sa);
+
 	this->mutex->lock(this->mutex);
 	enumerator = this->listeners->create_enumerator(this->listeners);
 	while (enumerator->enumerate(enumerator, &entry))
@@ -394,7 +377,7 @@ static void ike_state_change(private_bus_t *this, ike_sa_t *ike_sa,
 	enumerator_t *enumerator;
 	entry_t *entry;
 	bool keep;
-	
+
 	this->mutex->lock(this->mutex);
 	enumerator = this->listeners->create_enumerator(this->listeners);
 	while (enumerator->enumerate(enumerator, &entry))
@@ -425,9 +408,9 @@ static void child_state_change(private_bus_t *this, child_sa_t *child_sa,
 	ike_sa_t *ike_sa;
 	entry_t *entry;
 	bool keep;
-	
-	ike_sa = pthread_getspecific(this->thread_sa);
-	
+
+	ike_sa = this->thread_sa->get(this->thread_sa);
+
 	this->mutex->lock(this->mutex);
 	enumerator = this->listeners->create_enumerator(this->listeners);
 	while (enumerator->enumerate(enumerator, &entry))
@@ -458,9 +441,9 @@ static void message(private_bus_t *this, message_t *message, bool incoming)
 	ike_sa_t *ike_sa;
 	entry_t *entry;
 	bool keep;
-	
-	ike_sa = pthread_getspecific(this->thread_sa);
-	
+
+	ike_sa = this->thread_sa->get(this->thread_sa);
+
 	this->mutex->lock(this->mutex);
 	enumerator = this->listeners->create_enumerator(this->listeners);
 	while (enumerator->enumerate(enumerator, &entry))
@@ -492,7 +475,7 @@ static void ike_keys(private_bus_t *this, ike_sa_t *ike_sa,
 	enumerator_t *enumerator;
 	entry_t *entry;
 	bool keep;
-	
+
 	this->mutex->lock(this->mutex);
 	enumerator = this->listeners->create_enumerator(this->listeners);
 	while (enumerator->enumerate(enumerator, &entry))
@@ -524,9 +507,9 @@ static void child_keys(private_bus_t *this, child_sa_t *child_sa,
 	ike_sa_t *ike_sa;
 	entry_t *entry;
 	bool keep;
-	
-	ike_sa = pthread_getspecific(this->thread_sa);
-	
+
+	ike_sa = this->thread_sa->get(this->thread_sa);
+
 	this->mutex->lock(this->mutex);
 	enumerator = this->listeners->create_enumerator(this->listeners);
 	while (enumerator->enumerate(enumerator, &entry))
@@ -557,9 +540,9 @@ static void child_updown(private_bus_t *this, child_sa_t *child_sa, bool up)
 	ike_sa_t *ike_sa;
 	entry_t *entry;
 	bool keep;
-	
-	ike_sa = pthread_getspecific(this->thread_sa);
-	
+
+	ike_sa = this->thread_sa->get(this->thread_sa);
+
 	this->mutex->lock(this->mutex);
 	enumerator = this->listeners->create_enumerator(this->listeners);
 	while (enumerator->enumerate(enumerator, &entry))
@@ -590,9 +573,9 @@ static void child_rekey(private_bus_t *this, child_sa_t *old, child_sa_t *new)
 	ike_sa_t *ike_sa;
 	entry_t *entry;
 	bool keep;
-	
-	ike_sa = pthread_getspecific(this->thread_sa);
-	
+
+	ike_sa = this->thread_sa->get(this->thread_sa);
+
 	this->mutex->lock(this->mutex);
 	enumerator = this->listeners->create_enumerator(this->listeners);
 	while (enumerator->enumerate(enumerator, &entry))
@@ -621,7 +604,7 @@ static void ike_updown(private_bus_t *this, ike_sa_t *ike_sa, bool up)
 	enumerator_t *enumerator;
 	entry_t *entry;
 	bool keep;
-	
+
 	this->mutex->lock(this->mutex);
 	enumerator = this->listeners->create_enumerator(this->listeners);
 	while (enumerator->enumerate(enumerator, &entry))
@@ -640,13 +623,13 @@ static void ike_updown(private_bus_t *this, ike_sa_t *ike_sa, bool up)
 	}
 	enumerator->destroy(enumerator);
 	this->mutex->unlock(this->mutex);
-	
+
 	/* a down event for IKE_SA implicitly downs all CHILD_SAs */
 	if (!up)
 	{
 		iterator_t *iterator;
 		child_sa_t *child_sa;
-		
+
 		iterator = ike_sa->create_child_sa_iterator(ike_sa);
 		while (iterator->iterate(iterator, (void**)&child_sa))
 		{
@@ -664,7 +647,7 @@ static void ike_rekey(private_bus_t *this, ike_sa_t *old, ike_sa_t *new)
 	enumerator_t *enumerator;
 	entry_t *entry;
 	bool keep;
-	
+
 	this->mutex->lock(this->mutex);
 	enumerator = this->listeners->create_enumerator(this->listeners);
 	while (enumerator->enumerate(enumerator, &entry))
@@ -688,15 +671,15 @@ static void ike_rekey(private_bus_t *this, ike_sa_t *old, ike_sa_t *new)
 /**
  * Implementation of bus_t.authorize
  */
-static bool authorize(private_bus_t *this, linked_list_t *auth, bool final)
+static bool authorize(private_bus_t *this, bool final)
 {
 	enumerator_t *enumerator;
 	ike_sa_t *ike_sa;
 	entry_t *entry;
 	bool keep, success = TRUE;
-	
-	ike_sa = pthread_getspecific(this->thread_sa);
-	
+
+	ike_sa = this->thread_sa->get(this->thread_sa);
+
 	this->mutex->lock(this->mutex);
 	enumerator = this->listeners->create_enumerator(this->listeners);
 	while (enumerator->enumerate(enumerator, &entry))
@@ -707,7 +690,7 @@ static bool authorize(private_bus_t *this, linked_list_t *auth, bool final)
 		}
 		entry->calling++;
 		keep = entry->listener->authorize(entry->listener, ike_sa,
-										  auth, final, &success);
+										  final, &success);
 		entry->calling--;
 		if (!keep)
 		{
@@ -728,6 +711,7 @@ static bool authorize(private_bus_t *this, linked_list_t *auth, bool final)
  */
 static void destroy(private_bus_t *this)
 {
+	this->thread_sa->destroy(this->thread_sa);
 	this->mutex->destroy(this->mutex);
 	this->listeners->destroy_function(this->listeners, (void*)entry_destroy);
 	free(this);
@@ -739,11 +723,12 @@ static void destroy(private_bus_t *this)
 bus_t *bus_create()
 {
 	private_bus_t *this = malloc_thing(private_bus_t);
-	
+
 	this->public.add_listener = (void(*)(bus_t*,listener_t*))add_listener;
 	this->public.remove_listener = (void(*)(bus_t*,listener_t*))remove_listener;
 	this->public.listen = (void(*)(bus_t*, listener_t *listener, job_t *job))listen_;
 	this->public.set_sa = (void(*)(bus_t*,ike_sa_t*))set_sa;
+	this->public.get_sa = (ike_sa_t*(*)(bus_t*))get_sa;
 	this->public.log = (void(*)(bus_t*,debug_t,level_t,char*,...))log_;
 	this->public.vlog = (void(*)(bus_t*,debug_t,level_t,char*,va_list))vlog;
 	this->public.alert = (void(*)(bus_t*, alert_t alert, ...))alert;
@@ -756,14 +741,13 @@ bus_t *bus_create()
 	this->public.ike_rekey = (void(*)(bus_t*, ike_sa_t *old, ike_sa_t *new))ike_rekey;
 	this->public.child_updown = (void(*)(bus_t*, child_sa_t *child_sa, bool up))child_updown;
 	this->public.child_rekey = (void(*)(bus_t*, child_sa_t *old, child_sa_t *new))child_rekey;
-	this->public.authorize = (bool(*)(bus_t*, linked_list_t *auth, bool final))authorize;
+	this->public.authorize = (bool(*)(bus_t*, bool final))authorize;
 	this->public.destroy = (void(*)(bus_t*)) destroy;
-	
+
 	this->listeners = linked_list_create();
 	this->mutex = mutex_create(MUTEX_TYPE_RECURSIVE);
-	pthread_key_create(&this->thread_id, NULL);
-	pthread_key_create(&this->thread_sa, NULL);
-	
+	this->thread_sa = thread_value_create(NULL);
+
 	return &this->public;
 }