Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

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

diff --git a/src/xbt/parmap.cpp b/src/xbt/parmap.cpp
index b2c952c..d3edb7b 100644 (file)
--- a/src/xbt/parmap.cpp
+++ b/src/xbt/parmap.cpp
@@ -6,7 +6,7 @@
 
 #include <atomic>
 
-#include "internal_config.h"
+#include "src/internal_config.h"
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -26,7 +26,8 @@
 #include "xbt/dynar.h"
 #include "xbt/xbt_os_thread.h"
 #include "xbt/sysdep.h"
-#include "simix/smx_private.h"
+#include "src/simix/smx_private.h"
+#include "src/simix/smx_private.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_parmap, xbt, "parmap: parallel map");
 
@@ -53,10 +54,12 @@ static void futex_wait(unsigned *uaddr, unsigned val);
 static void futex_wake(unsigned *uaddr, unsigned val);
 #endif
 
+#ifndef _MSC_VER
 static void xbt_parmap_busy_master_wait(xbt_parmap_t parmap);
 static void xbt_parmap_busy_worker_signal(xbt_parmap_t parmap);
 static void xbt_parmap_busy_master_signal(xbt_parmap_t parmap);
 static void xbt_parmap_busy_worker_wait(xbt_parmap_t parmap, unsigned round);
+#endif
 
 #ifdef HAVE_MC
 static void xbt_parmap_mc_work(xbt_parmap_t parmap, int worker_id);
@@ -122,7 +125,7 @@ xbt_parmap_t xbt_parmap_new(unsigned int num_workers, e_xbt_parmap_mode_t mode)
   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);
+  xbt_parmap_t parmap = new s_xbt_parmap_t();
   parmap->workers = xbt_new(xbt_os_thread_t, num_workers);
 
   parmap->num_workers = num_workers;
@@ -167,7 +170,7 @@ xbt_parmap_t xbt_parmap_mc_new(unsigned int num_workers, e_xbt_parmap_mode_t mod
   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);
+  xbt_parmap_t parmap = new s_xbt_parmap_t();
   parmap->workers = xbt_new(xbt_os_thread_t, num_workers);
 
   parmap->num_workers = num_workers;
@@ -211,7 +214,7 @@ void xbt_parmap_destroy(xbt_parmap_t parmap)
   xbt_os_mutex_destroy(parmap->done_mutex);
 
   xbt_free(parmap->workers);
-  xbt_free(parmap);
+  delete parmap;
 }
 
 /**
@@ -262,6 +265,7 @@ static void xbt_parmap_set_mode(xbt_parmap_t parmap, e_xbt_parmap_mode_t mode)
 #endif
 
     case XBT_PARMAP_BUSY_WAIT:
+#ifndef _MSC_VER
       parmap->master_wait_f = xbt_parmap_busy_master_wait;
       parmap->worker_signal_f = xbt_parmap_busy_worker_signal;
       parmap->master_signal_f = xbt_parmap_busy_master_signal;
@@ -272,6 +276,9 @@ static void xbt_parmap_set_mode(xbt_parmap_t parmap, e_xbt_parmap_mode_t mode)
       xbt_os_cond_destroy(parmap->done_cond);
       xbt_os_mutex_destroy(parmap->done_mutex);
       break;
+#else
+      xbt_die("Busy waiting not implemented on Windows yet.");
+#endif
 
     case XBT_PARMAP_DEFAULT:
       THROW_IMPOSSIBLE;
@@ -593,6 +600,7 @@ static void xbt_parmap_futex_worker_wait(xbt_parmap_t parmap, unsigned round)
 }
 #endif
 
+#ifndef _MSC_VER
 /**
  * \brief Starts the parmap: waits for all workers to be ready and returns.
  *
@@ -648,3 +656,4 @@ static void xbt_parmap_busy_worker_wait(xbt_parmap_t parmap, unsigned round)
     xbt_os_thread_yield();
   }
 }
+#endif /* ! _MSC_VER */