X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/972162bac11e3df7266030562100d2f8e43870b2..4a69abcc786d029bd2962537f767d12a0f808d11:/src/xbt/parmap.cpp

diff --git a/src/xbt/parmap.cpp b/src/xbt/parmap.cpp
index 95abdcea15..67ed936e31 100644
--- 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. */
@@ -27,7 +26,6 @@
 #include "xbt/xbt_os_thread.h"
 #include "xbt/sysdep.h"
 #include "src/simix/smx_private.h"
-#include "src/simix/smx_private.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_parmap, xbt, "parmap: parallel map");
 
@@ -117,7 +115,7 @@ xbt_parmap_t xbt_parmap_new(unsigned int num_workers, e_xbt_parmap_mode_t mode)
 
   /* Create the pool of worker threads */
   xbt_parmap_thread_data_t data;
-  parmap->workers[0] = NULL;
+  parmap->workers[0] = nullptr;
 #if HAVE_PTHREAD_SETAFFINITY
   int core_bind = 0;
 #endif  
@@ -125,10 +123,10 @@ xbt_parmap_t xbt_parmap_new(unsigned int num_workers, e_xbt_parmap_mode_t mode)
     data = xbt_new0(s_xbt_parmap_thread_data_t, 1);
     data->parmap = parmap;
     data->worker_id = i;
-    parmap->workers[i] = xbt_os_thread_create(NULL, xbt_parmap_worker_main, data, NULL);
+    parmap->workers[i] = xbt_os_thread_create(nullptr, xbt_parmap_worker_main, data, nullptr);
 #if HAVE_PTHREAD_SETAFFINITY
-    xbt_os_thread_bind(parmap->workers[i], core_bind); 
-    if (core_bind != xbt_os_get_numcores())
+    xbt_os_thread_bind(parmap->workers[i], core_bind);
+    if (core_bind != xbt_os_get_numcores() - 1)
       core_bind++;
     else
       core_bind = 0; 
@@ -152,7 +150,7 @@ void xbt_parmap_destroy(xbt_parmap_t parmap)
 
   unsigned int i;
   for (i = 1; i < parmap->num_workers; i++)
-    xbt_os_thread_join(parmap->workers[i], NULL);
+    xbt_os_thread_join(parmap->workers[i], nullptr);
 
   xbt_os_cond_destroy(parmap->ready_cond);
   xbt_os_mutex_destroy(parmap->ready_mutex);
@@ -181,10 +179,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();
@@ -193,10 +191,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);
@@ -207,10 +205,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);
@@ -246,7 +244,7 @@ void xbt_parmap_apply(xbt_parmap_t parmap, void_f_pvoid_t fun, xbt_dynar_t data)
  *
  * Worker threads call this function to get more work.
  *
- * \return the next task to process, or NULL if there is no more work
+ * \return the next task to process, or nullptr if there is no more work
  */
 void* xbt_parmap_next(xbt_parmap_t parmap)
 {
@@ -254,14 +252,16 @@ void* xbt_parmap_next(xbt_parmap_t parmap)
   if (index < xbt_dynar_length(parmap->data)) {
     return xbt_dynar_get_as(parmap->data, index, void*);
   }
-  return NULL;
+  return nullptr;
 }
 
 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++;
+  }
 }
 
 /**
@@ -270,17 +270,18 @@ 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(NULL, 0, NULL, NULL, NULL);
+  smx_context_t context = SIMIX_context_new(std::function<void()>(), nullptr, nullptr);
   SIMIX_context_set_current(context);
 
   XBT_DEBUG("New worker thread created");
 
   /* 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);
 
@@ -292,7 +293,7 @@ static void *xbt_parmap_worker_main(void *arg)
     } else {
       delete context;
       xbt_free(data);
-      return NULL;
+      return nullptr;
     }
   }
 }
@@ -301,13 +302,13 @@ static void *xbt_parmap_worker_main(void *arg)
 static void futex_wait(unsigned *uaddr, unsigned val)
 {
   XBT_VERB("Waiting on futex %p", uaddr);
-  syscall(SYS_futex, uaddr, FUTEX_WAIT_PRIVATE, val, NULL, NULL, 0);
+  syscall(SYS_futex, uaddr, FUTEX_WAIT_PRIVATE, val, nullptr, nullptr, 0);
 }
 
 static void futex_wake(unsigned *uaddr, unsigned val)
 {
   XBT_VERB("Waking futex %p", uaddr);
-  syscall(SYS_futex, uaddr, FUTEX_WAKE_PRIVATE, val, NULL, NULL, 0);
+  syscall(SYS_futex, uaddr, FUTEX_WAKE_PRIVATE, val, nullptr, nullptr, 0);
 }
 #endif
 
@@ -338,7 +339,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);
   }