Merge branch 'master' into clean_events

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

diff --git a/src/xbt/parmap.cpp b/src/xbt/parmap.cpp
index 62a691d..4afc9f7 100644 (file)
--- a/src/xbt/parmap.cpp
+++ b/src/xbt/parmap.cpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2004-2005, 2007, 2009-2014. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2004-2017. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -115,13 +114,12 @@ xbt_parmap_t xbt_parmap_new(unsigned int num_workers, e_xbt_parmap_mode_t mode)
   xbt_parmap_set_mode(parmap, mode);
 
   /* Create the pool of worker threads */
-  xbt_parmap_thread_data_t data;
   parmap->workers[0] = nullptr;
 #if HAVE_PTHREAD_SETAFFINITY
   int core_bind = 0;
-#endif  
+#endif
   for (unsigned int i = 1; i < num_workers; i++) {
-    data = xbt_new0(s_xbt_parmap_thread_data_t, 1);
+    xbt_parmap_thread_data_t data = xbt_new0(s_xbt_parmap_thread_data_t, 1);
     data->parmap = parmap;
     data->worker_id = i;
     parmap->workers[i] = xbt_os_thread_create(nullptr, xbt_parmap_worker_main, data, nullptr);
@@ -130,7 +128,7 @@ xbt_parmap_t xbt_parmap_new(unsigned int num_workers, e_xbt_parmap_mode_t mode)
     if (core_bind != xbt_os_get_numcores() - 1)
       core_bind++;
     else
-      core_bind = 0; 
+      core_bind = 0;
 #endif
   }
   return parmap;
@@ -142,7 +140,7 @@ xbt_parmap_t xbt_parmap_new(unsigned int num_workers, e_xbt_parmap_mode_t mode)
  */
 void xbt_parmap_destroy(xbt_parmap_t parmap)
 {
-  if (!parmap) {
+  if (not parmap) {
     return;
   }
 
@@ -180,10 +178,10 @@ static void xbt_parmap_set_mode(xbt_parmap_t parmap, e_xbt_parmap_mode_t mode)
 
   switch (mode) {
     case XBT_PARMAP_POSIX:
-      parmap->master_wait_f = xbt_parmap_posix_master_wait;
-      parmap->worker_signal_f = xbt_parmap_posix_worker_signal;
-      parmap->master_signal_f = xbt_parmap_posix_master_signal;
-      parmap->worker_wait_f = xbt_parmap_posix_worker_wait;
+      parmap->master_wait_f   = &xbt_parmap_posix_master_wait;
+      parmap->worker_signal_f = &xbt_parmap_posix_worker_signal;
+      parmap->master_signal_f = &xbt_parmap_posix_master_signal;
+      parmap->worker_wait_f   = &xbt_parmap_posix_worker_wait;
 
       parmap->ready_cond = xbt_os_cond_init();
       parmap->ready_mutex = xbt_os_mutex_init();
@@ -192,10 +190,10 @@ static void xbt_parmap_set_mode(xbt_parmap_t parmap, e_xbt_parmap_mode_t mode)
       break;
     case XBT_PARMAP_FUTEX:
 #if HAVE_FUTEX_H
-      parmap->master_wait_f = xbt_parmap_futex_master_wait;
-      parmap->worker_signal_f = xbt_parmap_futex_worker_signal;
-      parmap->master_signal_f = xbt_parmap_futex_master_signal;
-      parmap->worker_wait_f = xbt_parmap_futex_worker_wait;
+      parmap->master_wait_f   = &xbt_parmap_futex_master_wait;
+      parmap->worker_signal_f = &xbt_parmap_futex_worker_signal;
+      parmap->master_signal_f = &xbt_parmap_futex_master_signal;
+      parmap->worker_wait_f   = &xbt_parmap_futex_worker_wait;
 
       xbt_os_cond_destroy(parmap->ready_cond);
       xbt_os_mutex_destroy(parmap->ready_mutex);
@@ -206,10 +204,10 @@ static void xbt_parmap_set_mode(xbt_parmap_t parmap, e_xbt_parmap_mode_t mode)
       xbt_die("Futex is not available on this OS.");
 #endif
     case XBT_PARMAP_BUSY_WAIT:
-      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;
-      parmap->worker_wait_f = xbt_parmap_busy_worker_wait;
+      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;
+      parmap->worker_wait_f   = &xbt_parmap_busy_worker_wait;
 
       xbt_os_cond_destroy(parmap->ready_cond);
       xbt_os_mutex_destroy(parmap->ready_mutex);
@@ -219,6 +217,8 @@ static void xbt_parmap_set_mode(xbt_parmap_t parmap, e_xbt_parmap_mode_t mode)
     case XBT_PARMAP_DEFAULT:
       THROW_IMPOSSIBLE;
       break;
+    default:
+      THROW_IMPOSSIBLE;
   }
 }
 
@@ -258,9 +258,11 @@ void* xbt_parmap_next(xbt_parmap_t parmap)
 
 static void xbt_parmap_work(xbt_parmap_t parmap)
 {
-  unsigned index;
-  while ((index = parmap->index++) < xbt_dynar_length(parmap->data))
+  unsigned int index = parmap->index++;
+  while (index < xbt_dynar_length(parmap->data)){
     parmap->fun(xbt_dynar_get_as(parmap->data, index, void*));
+    index = parmap->index++;
+  }
 }
 
 /**
@@ -269,7 +271,7 @@ static void xbt_parmap_work(xbt_parmap_t parmap)
  */
 static void *xbt_parmap_worker_main(void *arg)
 {
-  xbt_parmap_thread_data_t data = (xbt_parmap_thread_data_t) arg;
+  xbt_parmap_thread_data_t data = static_cast<xbt_parmap_thread_data_t>(arg);
   xbt_parmap_t parmap = data->parmap;
   unsigned round = 0;
   smx_context_t context = SIMIX_context_new(std::function<void()>(), nullptr, nullptr);
@@ -279,7 +281,8 @@ static void *xbt_parmap_worker_main(void *arg)
 
   /* Worker's main loop */
   while (1) {
-    parmap->worker_wait_f(parmap, ++round);
+    round++;
+    parmap->worker_wait_f(parmap, round);
     if (parmap->status == XBT_PARMAP_WORK) {
       XBT_DEBUG("Worker %d got a job", data->worker_id);
 
@@ -337,7 +340,8 @@ static void xbt_parmap_posix_master_wait(xbt_parmap_t parmap)
 static void xbt_parmap_posix_worker_signal(xbt_parmap_t parmap)
 {
   xbt_os_mutex_acquire(parmap->done_mutex);
-  if (++parmap->thread_counter == parmap->num_workers) {
+  parmap->thread_counter++;
+  if (parmap->thread_counter == parmap->num_workers) {
     /* all workers have finished, wake the controller */
     xbt_os_cond_signal(parmap->done_cond);
   }