#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 */
- 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;
/* 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
+#endif
}
return parmap;
}
-#ifdef HAVE_MC
+#if HAVE_MC
/**
* \brief Creates a parallel map object
* \param num_workers number of worker threads to create
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;
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_mc_worker_main,
- data, NULL);
+ parmap->workers[i] = xbt_os_thread_create(NULL, xbt_parmap_mc_worker_main, data, NULL);
}
return parmap;
}
xbt_os_mutex_destroy(parmap->done_mutex);
xbt_free(parmap->workers);
- xbt_free(parmap);
+ delete parmap;
}
/**
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;
parmap->mode = 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->done_cond = xbt_os_cond_init();
parmap->done_mutex = xbt_os_mutex_init();
break;
-
-
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;
#else
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;
xbt_os_cond_destroy(parmap->done_cond);
xbt_os_mutex_destroy(parmap->done_mutex);
break;
-
case XBT_PARMAP_DEFAULT:
THROW_IMPOSSIBLE;
break;
static void xbt_parmap_work(xbt_parmap_t parmap)
{
unsigned index;
- while ((index = parmap->index++)
- < xbt_dynar_length(parmap->data))
+ while ((index = parmap->index++) < xbt_dynar_length(parmap->data))
parmap->fun(xbt_dynar_get_as(parmap->data, index, void*));
}
while (1) {
parmap->worker_wait_f(parmap, ++round);
if (parmap->status == XBT_PARMAP_WORK) {
-
XBT_DEBUG("Worker %d got a job", data->worker_id);
xbt_parmap_work(parmap);
parmap->worker_signal_f(parmap);
XBT_DEBUG("Worker %d has finished", data->worker_id);
-
/* We are destroying the parmap */
} else {
SIMIX_context_free(context);
}
}
-#ifdef HAVE_MC
-
+#if HAVE_MC
/**
* \brief Applies a list of tasks in parallel.
* \param parmap a parallel map object
* \param fun the function to call in parallel
* \param data each element of this dynar will be passed as an argument to fun
*/
-int xbt_parmap_mc_apply(xbt_parmap_t parmap, int_f_pvoid_pvoid_t fun,
- void* data, unsigned int length, void* ref_snapshot)
+int xbt_parmap_mc_apply(xbt_parmap_t parmap, int_f_pvoid_pvoid_t fun, void* data, unsigned int length,
+ void* ref_snapshot)
{
/* Assign resources to worker threads */
parmap->snapshot_compare = fun;
static void xbt_parmap_mc_work(xbt_parmap_t parmap, int worker_id)
{
- unsigned int data_size = (parmap->length / parmap->num_workers) +
- ((parmap->length % parmap->num_workers) ? 1 :0);
+ unsigned int data_size = (parmap->length / parmap->num_workers) + ((parmap->length % parmap->num_workers) ? 1 :0);
void* start = (char*)parmap->mc_data + (data_size*worker_id*sizeof(void*));
void* end = MIN((char *)start + data_size* sizeof(void*), (char*)parmap->mc_data + parmap->length*sizeof(void*));
-
+
//XBT_CRITICAL("Worker %d : %p -> %p (%d)", worker_id, start, end, data_size);
while ( start < end && parmap->finish == -1) {
int res = parmap->snapshot_compare(*(void**)start, parmap->ref_snapshot);
start = (char *)start + sizeof(start);
if (!res){
-
parmap->finish = ((char*)start - (char*)parmap->mc_data) / sizeof(void*);
//XBT_CRITICAL("Find good one %p (%p)", start, parmap->mc_data);
break;
while (1) {
parmap->worker_wait_f(parmap, ++round);
if (parmap->status == XBT_PARMAP_WORK) {
-
XBT_DEBUG("Worker %d got a job", data->worker_id);
xbt_parmap_mc_work(parmap, data->worker_id);
parmap->worker_signal_f(parmap);
XBT_DEBUG("Worker %d has finished", data->worker_id);
-
/* We are destroying the parmap */
} else {
xbt_free(data);
}
#endif
-#ifdef HAVE_FUTEX_H
+#if HAVE_FUTEX_H
static void futex_wait(unsigned *uaddr, unsigned val)
{
XBT_VERB("Waiting on futex %p", uaddr);
/**
* \brief Ends the parmap: wakes the controller thread when all workers terminate.
*
- * This function is called by all worker threads when they end (not including
- * the controller).
+ * This function is called by all worker threads when they end (not including the controller).
*
* \param parmap a parmap
*/
/**
* \brief Waits for some work to process.
*
- * This function is called by each worker thread (not including the controller)
- * when it has no more work to do.
+ * This function is called by each worker thread (not including the controller) when it has no more work to do.
*
* \param parmap a parmap
* \param round the expected round number
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.
*
/**
* \brief Ends the parmap: wakes the controller thread when all workers terminate.
*
- * This function is called by all worker threads when they end (not including
- * the controller).
+ * This function is called by all worker threads when they end (not including the controller).
*
* \param parmap a parmap
*/
/**
* \brief Waits for some work to process.
*
- * This function is called by each worker thread (not including the controller)
- * when it has no more work to do.
+ * This function is called by each worker thread (not including the controller) when it has no more work to do.
*
* \param parmap a parmap
* \param round the expected round number
/**
* \brief Waits for some work to process.
*
- * This function is called by each worker thread (not including the controller)
- * when it has no more work to do.
+ * This function is called by each worker thread (not including the controller) when it has no more work to do.
*
* \param parmap a parmap
* \param round the expected round number
