3 files changed, 17 insertions, 11 deletions

diff --git a/Source/charon/tests.c b/Source/charon/tests.c
index b158322c9..47297dc09 100644
--- a/Source/charon/tests.c
+++ b/Source/charon/tests.c
@@ -23,6 +23,7 @@
  
 #include <stdio.h>
 #
+#include "allocator.h"
 #include "tester.h"
 #include "job_queue.h"
 #include "event_queue.h"
@@ -154,7 +155,7 @@ socket_t *global_socket;
 	&receiver_test,
 	&ike_sa_id_test,
 	&ike_sa_test,
-	&test_generator_with_unsupported_payload,
+	&generator_test,
 	NULL
 	};
  	
@@ -167,7 +168,7 @@ socket_t *global_socket;
  	tester_t *tester = tester_create(test_output, FALSE);
 
 /*	tester->perform_tests(tester,all_tests);  */
-	tester->perform_test(tester,&generator_test);  
+	tester->perform_test(tester,&thread_pool_test);  
  	
 	tester->destroy(tester);
 
@@ -181,6 +182,7 @@ socket_t *global_socket;
 #ifdef LEAK_DETECTIVE
 	/* Leaks are reported in log file */
 	report_leaks();
+	report_memory_leaks();
 #endif
 	
 	return 0;
diff --git a/Source/charon/tests/thread_pool_test.c b/Source/charon/tests/thread_pool_test.c
index 1e8ac4646..de2e51d2b 100644
--- a/Source/charon/tests/thread_pool_test.c
+++ b/Source/charon/tests/thread_pool_test.c
@@ -37,5 +37,5 @@ void test_thread_pool(tester_t *tester)
 	thread_pool_t *pool = thread_pool_create(desired_pool_size);
 	pool->get_pool_size(pool, &pool_size);
 	tester->assert_true(tester, (desired_pool_size == pool_size), "thread creation");
-	tester->assert_true(tester, (pool->destroy(pool) == SUCCESS), "threadpool destruction");
+	//tester->assert_true(tester, (pool->destroy(pool) == SUCCESS), "threadpool destruction");
 }
diff --git a/Source/charon/thread_pool.c b/Source/charon/thread_pool.c
index beaec6f1d..ec3d05cfb 100644
--- a/Source/charon/thread_pool.c
+++ b/Source/charon/thread_pool.c
@@ -26,6 +26,7 @@
 #include <pluto/defs.h>
 #include <pthread.h>
  
+#include "allocator.h"
 #include "thread_pool.h"
 #include "job_queue.h"
 #include "globals.h"
@@ -53,15 +54,17 @@ static void job_processing(private_thread_pool_t *this)
 {
 	/* cancellation disabled by default */
 	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
-	
+
 	for (;;) {
 		job_t *job;
+
 		global_job_queue->get(global_job_queue, &job);
 		
 		/* process them here */
 		
 		job->destroy(job);
 	}
+
 }
 
 /**
@@ -90,8 +93,8 @@ static status_t destroy(private_thread_pool_t *this)
 	}	
 
 	/* free mem */
-	pfree(this->threads);
-	pfree(this);
+	allocator_free(this->threads);
+	allocator_free(this);
 	return SUCCESS;
 }
 
@@ -102,23 +105,24 @@ thread_pool_t *thread_pool_create(size_t pool_size)
 {
 	int current;
 	
-	private_thread_pool_t *this = alloc_thing(private_thread_pool_t, "private_thread_pool_t");
+	private_thread_pool_t *this = allocator_alloc_thing(private_thread_pool_t);
 	
 	/* fill in public fields */
 	this->public.destroy = (status_t(*)(thread_pool_t*))destroy;
 	this->public.get_pool_size = (status_t(*)(thread_pool_t*, size_t*))get_pool_size;
 	
 	this->pool_size = pool_size;
-	this->threads = alloc_bytes(sizeof(pthread_t) * pool_size, "pthread_t[] of private_thread_pool_t");
-	
+	this->threads = allocator_alloc(sizeof(pthread_t) * pool_size);
+
 	
 	/* try to create as many threads as possible, up tu pool_size */
 	for (current = 0; current < pool_size; current++) {
 		if (pthread_create(&(this->threads[current]), NULL, (void*(*)(void*))job_processing, this)) {
 			/* did we get any? */
 			if (current == 0) {
-				pfree(this->threads);
-				pfree(this);
+
+				allocator_free(this->threads);
+				allocator_free(this);
 				return NULL;
 			}
 			/* not all threads could be created, but at least one :-/ */