#include <atomic>
-#include "internal_config.h"
-#ifdef HAVE_UNISTD_H
+#include "src/internal_config.h"
+#if HAVE_UNISTD_H
#include <unistd.h>
#endif
-#ifndef _XBT_WIN32
+#ifndef _WIN32
#include <sys/syscall.h>
#endif
-#ifdef HAVE_FUTEX_H
+#if HAVE_FUTEX_H
#include <linux/futex.h>
#include <limits.h>
#endif
#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");
static void xbt_parmap_posix_master_signal(xbt_parmap_t parmap);
static void xbt_parmap_posix_worker_wait(xbt_parmap_t parmap, unsigned round);
-#ifdef HAVE_FUTEX_H
+#if HAVE_FUTEX_H
static void xbt_parmap_futex_master_wait(xbt_parmap_t parmap);
static void xbt_parmap_futex_worker_signal(xbt_parmap_t parmap);
static void xbt_parmap_futex_master_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);
-#ifdef HAVE_MC
+#if HAVE_MC
static void xbt_parmap_mc_work(xbt_parmap_t parmap, int worker_id);
static void *xbt_parmap_mc_worker_main(void *arg);
#endif
xbt_dynar_t data; /**< parameters to pass to fun in parallel */
std::atomic<unsigned int> index; /**< index of the next element of data to pick */
-#ifdef HAVE_MC
+#if HAVE_MC
int finish;
void* ref_snapshot;
int_f_pvoid_pvoid_t snapshot_compare;
*/
xbt_parmap_t xbt_parmap_new(unsigned int num_workers, e_xbt_parmap_mode_t mode)
{
- unsigned int i;
-
XBT_DEBUG("Create new parmap (%u workers)", num_workers);
/* Initialize the thread pool data structure */
/* Create the pool of worker threads */
xbt_parmap_thread_data_t data;
parmap->workers[0] = NULL;
-#ifdef CORE_BINDING
- unsigned int core_bind = 0;
+#if HAVE_PTHREAD_SETAFFINITY
+ int core_bind = 0;
#endif
- for (i = 1; i < num_workers; i++) {
+ for (unsigned int i = 1; i < num_workers; i++) {
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);
-#ifdef CORE_BINDING
+ parmap->workers[i] = xbt_os_thread_create(NULL, xbt_parmap_worker_main, data, NULL);
+#if HAVE_PTHREAD_SETAFFINITY
xbt_os_thread_bind(parmap->workers[i], core_bind);
- if(core_bind!=xbt_os_get_numcores()){
+ if (core_bind != xbt_os_get_numcores())
core_bind++;
- } else {
+ else
core_bind = 0;
- }
#endif
}
return parmap;
}
-#ifdef HAVE_MC
+#if HAVE_MC
/**
* \brief Creates a parallel map object
* \param num_workers number of worker threads to create
static void xbt_parmap_set_mode(xbt_parmap_t parmap, e_xbt_parmap_mode_t mode)
{
if (mode == XBT_PARMAP_DEFAULT) {
-#ifdef HAVE_FUTEX_H
+#if HAVE_FUTEX_H
mode = XBT_PARMAP_FUTEX;
#else
mode = XBT_PARMAP_POSIX;
case XBT_PARMAP_FUTEX:
-#ifdef HAVE_FUTEX_H
+#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;
#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;
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;
}
}
-#ifdef HAVE_MC
+#if HAVE_MC
/**
* \brief Applies a list of tasks in parallel.
}
#endif
-#ifdef HAVE_FUTEX_H
+#if HAVE_FUTEX_H
static void futex_wait(unsigned *uaddr, unsigned val)
{
XBT_VERB("Waiting on futex %p", uaddr);
xbt_os_mutex_release(parmap->ready_mutex);
}
-#ifdef HAVE_FUTEX_H
+#if HAVE_FUTEX_H
/**
* \brief Starts the parmap: waits for all workers to be ready and returns.
*
}
#endif
+#ifndef _MSC_VER
/**
* \brief Starts the parmap: waits for all workers to be ready and returns.
*
xbt_os_thread_yield();
}
}
+#endif /* ! _MSC_VER */