Free memory after parmap test.

[simgrid.git] / src / xbt / parmap.c

diff --git a/src/xbt/parmap.c b/src/xbt/parmap.c
index 61c94f8..25cf6ff 100644 (file)
--- a/src/xbt/parmap.c
+++ b/src/xbt/parmap.c
@@ -5,7 +5,10 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 #include "gras_config.h"
 #include <unistd.h>
+#ifndef _XBT_WIN32
 #include <sys/syscall.h>
+#endif
+
 #ifdef HAVE_FUTEX_H
        #include <linux/futex.h>
 #else
@@ -27,14 +30,10 @@ xbt_parmap_t xbt_parmap_new(unsigned int num_workers)
   unsigned int i;
   xbt_os_thread_t worker = NULL;
 
-  DEBUG1("Create new parmap (%u workers)", num_workers);
+  XBT_DEBUG("Create new parmap (%u workers)", num_workers);
 
   /* Initialize the thread pool data structure */
   xbt_parmap_t parmap = xbt_new0(s_xbt_parmap_t, 1);
-  #ifndef HAVE_FUTEX_H
-         parmap->workers_ready->mutex = xbt_os_mutex_init();
-         parmap->workers_ready->cond = xbt_os_cond_init();
-  #endif
   parmap->num_workers = num_workers;
   parmap->status = PARMAP_WORK;
 
@@ -42,7 +41,10 @@ xbt_parmap_t xbt_parmap_new(unsigned int num_workers)
   xbt_barrier_init(parmap->workers_ready, num_workers + 1);
   parmap->workers_done = xbt_new0(s_xbt_barrier_t, 1);
   xbt_barrier_init(parmap->workers_done, num_workers + 1);
-
+#ifndef HAVE_FUTEX_H
+  parmap->workers_ready->mutex = xbt_os_mutex_init();
+  parmap->workers_ready->cond = xbt_os_cond_init();
+#endif
   /* Create the pool of worker threads */
   for(i=0; i < num_workers; i++){
     worker = xbt_os_thread_create(NULL, _xbt_parmap_worker_main, parmap, NULL);
@@ -54,14 +56,17 @@ xbt_parmap_t xbt_parmap_new(unsigned int num_workers)
 
 void xbt_parmap_destroy(xbt_parmap_t parmap)
 { 
-  DEBUG1("Destroy parmap %p", parmap);
+  XBT_DEBUG("Destroy parmap %p", parmap);
 
   parmap->status = PARMAP_DESTROY;
 
   xbt_barrier_wait(parmap->workers_ready);
-  DEBUG0("Kill job sent");
+  XBT_DEBUG("Kill job sent");
   xbt_barrier_wait(parmap->workers_done);
-
+#ifndef HAVE_FUTEX_H
+  xbt_os_mutex_destroy(parmap->workers_ready->mutex);
+  xbt_os_cond_destroy(parmap->workers_ready->cond);
+#endif
   xbt_free(parmap->workers_ready);
   xbt_free(parmap->workers_done);
   xbt_free(parmap);
@@ -75,10 +80,10 @@ void xbt_parmap_destroy(xbt_parmap_t parmap)
 
   /* Notify workers that there is a job */
   xbt_barrier_wait(parmap->workers_ready);
-  DEBUG0("Job dispatched, lets wait...");
+  XBT_DEBUG("Job dispatched, lets wait...");
   xbt_barrier_wait(parmap->workers_done);
 
-  DEBUG0("Job done");
+  XBT_DEBUG("Job done");
   parmap->fun = NULL;
   parmap->data = NULL;
 }
@@ -90,15 +95,16 @@ static void *_xbt_parmap_worker_main(void *arg)
 
   /* Fetch a worker id */
   worker_id = __sync_fetch_and_add(&parmap->workers_max_id, 1);
+  xbt_os_thread_set_extra_data((void *)(unsigned long)worker_id);
 
-  DEBUG1("New worker thread created (%u)", worker_id);
+  XBT_DEBUG("New worker thread created (%u)", worker_id);
   
   /* Worker's main loop */
   while(1){
     xbt_barrier_wait(parmap->workers_ready);
 
     if(parmap->status == PARMAP_WORK){
-      DEBUG1("Worker %u got a job", worker_id);
+      XBT_DEBUG("Worker %u got a job", worker_id);
 
       /* Compute how much data does every worker gets */
       data_size = (xbt_dynar_length(parmap->data) / parmap->num_workers)
@@ -110,7 +116,7 @@ static void *_xbt_parmap_worker_main(void *arg)
       /* The end of the worker data segment must be bounded by the end of the data vector */
       data_end = MIN(data_start + data_size, xbt_dynar_length(parmap->data));
 
-      DEBUG4("Worker %u: data_start=%u data_end=%u (data_size=%u)",
+      XBT_DEBUG("Worker %u: data_start=%u data_end=%u (data_size=%u)",
           worker_id, data_start, data_end, data_size);
 
       /* While the worker don't pass the end of it data segment apply the function */
@@ -124,7 +130,7 @@ static void *_xbt_parmap_worker_main(void *arg)
     /* We are destroying the parmap */
     }else{
       xbt_barrier_wait(parmap->workers_done);
-      DEBUG1("Shutting down worker %u", worker_id);
+      XBT_DEBUG("Shutting down worker %u", worker_id);
       return NULL;
     }
   }
@@ -133,13 +139,13 @@ static void *_xbt_parmap_worker_main(void *arg)
 #ifdef HAVE_FUTEX_H
        static void futex_wait(int *uaddr, int val)
        {
-         DEBUG1("Waiting on futex %d", *uaddr);
+         XBT_DEBUG("Waiting on futex %d", *uaddr);
          syscall(SYS_futex, uaddr, FUTEX_WAIT_PRIVATE, val, NULL, NULL, 0);
        }
 
        static void futex_wake(int *uaddr, int val)
        {
-         DEBUG1("Waking futex %d", *uaddr);
+         XBT_DEBUG("Waking futex %d", *uaddr);
          syscall(SYS_futex, uaddr, FUTEX_WAKE_PRIVATE, val, NULL, NULL, 0);
        }
 #endif
@@ -170,23 +176,16 @@ void xbt_barrier_init(xbt_barrier_t barrier, unsigned int threads_to_wait)
 #else
        void xbt_barrier_wait(xbt_barrier_t barrier)
        {
-         int myflag = 0;
-         unsigned int mycount = 0;
-
          xbt_os_mutex_acquire(barrier->mutex);
-         //pthread_mutex_lock(&barrier->mutex);
 
          barrier->thread_count++;
          if(barrier->thread_count < barrier->threads_to_wait){
                  xbt_os_cond_wait(barrier->cond,barrier->mutex);
-                 //pthread_cond_wait(&barrier->mutex,&barrier->cond);
          }else{
                barrier->thread_count = 0;
                xbt_os_cond_broadcast(barrier->cond);
-               //pthread_cond_broadcast(&barrier->mutex, &barrier->cond);
          }
          xbt_os_mutex_release(barrier->mutex);
-         //pthread_mutex_unlock(&barrier->mutex);
        }
 #endif
 
@@ -205,12 +204,12 @@ void fun(void *arg);
 
 void fun(void *arg)
 {
-  //INFO1("I'm job %lu", (unsigned long)arg);
+  //XBT_INFO("I'm job %lu", (unsigned long)arg);
 }
 
 XBT_TEST_UNIT("basic", test_parmap_basic, "Basic usage")
 {
-  xbt_test_add0("Create the parmap");
+  xbt_test_add("Create the parmap");
 
   unsigned long i,j;
   xbt_dynar_t data = xbt_dynar_new(sizeof(void *), NULL);
@@ -227,6 +226,7 @@ XBT_TEST_UNIT("basic", test_parmap_basic, "Basic usage")
 
   /* Destroy the parmap */
   xbt_parmap_destroy(parmap);
+  xbt_dynar_free(&data);
 }
 
 #endif /* SIMGRID_TEST */