X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8bd1d4d43b1cbdeec15247821932f6ca0971fd96..5ee23970780a802b53a76ca272464a462223e7e8:/src/xbt/parmap.cpp diff --git a/src/xbt/parmap.cpp b/src/xbt/parmap.cpp index de1dc57c1a..ac967527b3 100644 --- a/src/xbt/parmap.cpp +++ b/src/xbt/parmap.cpp @@ -27,7 +27,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"); @@ -59,11 +58,6 @@ 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); -#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 - /** * \brief Parallel map structure */ @@ -78,14 +72,6 @@ typedef struct s_xbt_parmap { xbt_dynar_t data; /**< parameters to pass to fun in parallel */ std::atomic index; /**< index of the next element of data to pick */ -#if HAVE_MC - int finish; - void* ref_snapshot; - int_f_pvoid_pvoid_t snapshot_compare; - unsigned int length; - void* mc_data; -#endif - /* posix only */ xbt_os_cond_t ready_cond; xbt_os_mutex_t ready_mutex; @@ -130,7 +116,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 @@ -138,7 +124,7 @@ 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()) @@ -150,40 +136,6 @@ xbt_parmap_t xbt_parmap_new(unsigned int num_workers, e_xbt_parmap_mode_t mode) return parmap; } -#if HAVE_MC -/** - * \brief Creates a parallel map object - * \param num_workers number of worker threads to create - * \param mode how to synchronize the worker threads - * \return the parmap created - */ -xbt_parmap_t xbt_parmap_mc_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 = new s_xbt_parmap_t(); - parmap->workers = xbt_new(xbt_os_thread_t, num_workers); - - parmap->num_workers = num_workers; - parmap->status = XBT_PARMAP_WORK; - xbt_parmap_set_mode(parmap, mode); - - /* Create the pool of worker threads */ - xbt_parmap_thread_data_t data; - parmap->workers[0] = NULL; - for (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_mc_worker_main, data, NULL); - } - return parmap; -} -#endif - /** * \brief Destroys a parmap * \param parmap the parmap to destroy @@ -199,7 +151,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); @@ -293,7 +245,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) { @@ -301,7 +253,7 @@ 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) @@ -320,7 +272,7 @@ static void *xbt_parmap_worker_main(void *arg) xbt_parmap_thread_data_t data = (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(), nullptr, nullptr); SIMIX_context_set_current(context); XBT_DEBUG("New worker thread created"); @@ -337,101 +289,24 @@ static void *xbt_parmap_worker_main(void *arg) XBT_DEBUG("Worker %d has finished", data->worker_id); /* We are destroying the parmap */ } else { - SIMIX_context_free(context); - xbt_free(data); - return NULL; - } - } -} - -#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) -{ - /* Assign resources to worker threads */ - parmap->snapshot_compare = fun; - parmap->mc_data = data; - parmap->index = 0; - parmap->finish = -1; - parmap->length = length; - parmap->ref_snapshot = ref_snapshot; - parmap->master_signal_f(parmap); - xbt_parmap_mc_work(parmap, 0); - parmap->master_wait_f(parmap); - XBT_DEBUG("Job done"); - return parmap->finish; -} - -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); - 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) { - //XBT_CRITICAL("Starting with %p", start); - 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; - } - } -} - -/** - * \brief Main function of a worker thread. - * \param arg the parmap - */ -static void *xbt_parmap_mc_worker_main(void *arg) -{ - xbt_parmap_thread_data_t data = (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); */ - /* SIMIX_context_set_current(context); */ - - XBT_DEBUG("New worker thread created"); - - /* Worker's main loop */ - 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 { + delete context; xbt_free(data); - return NULL; + return nullptr; } } } -#endif #if HAVE_FUTEX_H 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