X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/debd23d022bac4392bf3847e611b81cfd4915ffc..6e5cfd7ff86900354c20502af95ee5f751492753:/src/xbt/parmap.c diff --git a/src/xbt/parmap.c b/src/xbt/parmap.c index a11f84e91f..19dcb58027 100644 --- a/src/xbt/parmap.c +++ b/src/xbt/parmap.c @@ -3,182 +3,192 @@ /* 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. */ - +#include "gras_config.h" +#include +#ifndef _XBT_WIN32 +#include +#endif + +#ifdef HAVE_FUTEX_H + #include +#else + #include "xbt/xbt_os_thread.h" +#endif +#include #include "parmap_private.h" -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_parmap, xbt, - "parmap: parallel map"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_parmap, xbt, "parmap: parallel map"); +XBT_LOG_NEW_SUBCATEGORY(xbt_parmap_unit, xbt_parmap, "parmap unit testing"); static void *_xbt_parmap_worker_main(void *parmap); - +#ifdef HAVE_FUTEX_H + static void futex_wait(int *uaddr, int val); + static void futex_wake(int *uaddr, int val); +#endif xbt_parmap_t xbt_parmap_new(unsigned int num_workers) { unsigned int i; xbt_os_thread_t worker = NULL; - DEBUG1("Create new parmap (%u workers)", num_workers); + XBT_DEBUG("Create new parmap (%u workers)", num_workers); - /* Initialize thread pool data structure */ + /* Initialize the thread pool data structure */ xbt_parmap_t parmap = xbt_new0(s_xbt_parmap_t, 1); - parmap->mutex = xbt_os_mutex_init(); - parmap->job_posted = xbt_os_cond_init(); - parmap->all_done = xbt_os_cond_init(); - parmap->flags = xbt_new0(e_xbt_parmap_flag_t, num_workers + 1); +#ifdef HAVE_FUTEX_H + parmap->sync_event = xbt_new0(s_xbt_event_t, 1); +#endif parmap->num_workers = num_workers; - parmap->num_idle_workers = 0; - parmap->workers_max_id = 0; - - /* Init our flag to wait (for workers' initialization) */ - parmap->flags[num_workers] = PARMAP_WAIT; - + parmap->status = PARMAP_WORK; +#ifdef HAVE_FUTEX_H + parmap->sync_event->threads_to_wait = num_workers; +#endif /* Create the pool of worker threads */ for(i=0; i < num_workers; i++){ worker = xbt_os_thread_create(NULL, _xbt_parmap_worker_main, parmap, NULL); xbt_os_thread_detach(worker); } - - /* wait for the workers to initialize */ - xbt_os_mutex_acquire(parmap->mutex); - while(parmap->flags[num_workers] == PARMAP_WAIT) - xbt_os_cond_wait(parmap->all_done, parmap->mutex); - xbt_os_mutex_release(parmap->mutex); - +#ifdef HAVE_FUTEX_H + xbt_event_init(parmap->sync_event); +#endif return parmap; } void xbt_parmap_destroy(xbt_parmap_t parmap) { - DEBUG1("Destroy parmap %p", parmap); - - unsigned int i; - - /* Lock the parmap, then signal every worker an wait for each to finish */ - xbt_os_mutex_acquire(parmap->mutex); - for(i=0; i < parmap->num_workers; i++){ - parmap->flags[i] = PARMAP_DESTROY; - } - - xbt_os_cond_broadcast(parmap->job_posted); - while(parmap->num_workers){ - DEBUG1("Still %u workers, waiting...", parmap->num_workers); - xbt_os_cond_wait(parmap->all_done, parmap->mutex); - } - - /* Destroy pool's data structures */ - xbt_os_cond_destroy(parmap->job_posted); - xbt_os_cond_destroy(parmap->all_done); - xbt_free(parmap->flags); - xbt_os_mutex_release(parmap->mutex); - xbt_os_mutex_destroy(parmap->mutex); + parmap->status = PARMAP_DESTROY; +#ifdef HAVE_FUTEX_H + xbt_event_signal(parmap->sync_event); + xbt_free(parmap->sync_event); +#endif xbt_free(parmap); } -void xbt_parmap_apply(xbt_parmap_t parmap, void_f_pvoid_t fun, xbt_dynar_t data) + void xbt_parmap_apply(xbt_parmap_t parmap, void_f_pvoid_t fun, xbt_dynar_t data) { - unsigned int i; - unsigned int myflag_idx = parmap->num_workers; - - /* Assign resources to worker threads */ - xbt_os_mutex_acquire(parmap->mutex); + /* Assign resources to worker threads*/ parmap->fun = fun; parmap->data = data; - parmap->num_idle_workers = 0; - - /* Set worker flags to work */ - for(i=0; i < parmap->num_workers; i++){ - parmap->flags[i] = PARMAP_WORK; - } - - /* Set our flag to wait (for the job to be completed)*/ - parmap->flags[myflag_idx] = PARMAP_WAIT; - - /* Notify workers that there is a job */ - xbt_os_cond_broadcast(parmap->job_posted); - DEBUG0("Job dispatched, lets wait..."); + parmap->index = 0; +#ifdef HAVE_FUTEX_H + xbt_event_signal(parmap->sync_event); +#endif + XBT_DEBUG("Job done"); +} - /* wait for the workers to finish */ - while(parmap->flags[myflag_idx] == PARMAP_WAIT) - xbt_os_cond_wait(parmap->all_done, parmap->mutex); +void* xbt_parmap_next(xbt_parmap_t parmap) { - DEBUG0("Job done"); - parmap->fun = NULL; - parmap->data = NULL; + unsigned int index = __sync_fetch_and_add(&parmap->index, 1); + if (index < xbt_dynar_length(parmap->data)) { + return xbt_dynar_get_as(parmap->data, index, void*); + } + return NULL; +} - xbt_os_mutex_release(parmap->mutex); - return; +unsigned long xbt_parmap_get_worker_id(xbt_parmap_t parmap) { + return (unsigned long) xbt_os_thread_get_extra_data(); } static void *_xbt_parmap_worker_main(void *arg) { - unsigned int data_start, data_end, data_size, worker_id; - xbt_parmap_t parmap = (xbt_parmap_t)arg; + unsigned int worker_id; + xbt_parmap_t parmap = (xbt_parmap_t) arg; /* Fetch a worker id */ - xbt_os_mutex_acquire(parmap->mutex); - worker_id = parmap->workers_max_id++; - xbt_os_mutex_release(parmap->mutex); + worker_id = __sync_fetch_and_add(&parmap->workers_max_id, 1); + xbt_os_thread_set_extra_data((void*) (unsigned long) worker_id); - DEBUG1("New worker thread created (%u)", worker_id); + XBT_DEBUG("New worker thread created (%u)", worker_id); /* Worker's main loop */ - while(1){ - xbt_os_mutex_acquire(parmap->mutex); - parmap->flags[worker_id] = PARMAP_WAIT; - parmap->num_idle_workers++; - - /* If everybody is done set the parmap work flag and signal it */ - if(parmap->num_idle_workers == parmap->num_workers){ - DEBUG1("Worker %u: All done, signal the parmap", worker_id); - parmap->flags[parmap->num_workers] = PARMAP_WORK; - xbt_os_cond_signal(parmap->all_done); + while (1) { +#ifdef HAVE_FUTEX_H + xbt_event_wait(parmap->sync_event); +#endif + if (parmap->status == PARMAP_WORK) { + + XBT_DEBUG("Worker %u got a job", worker_id); + + void* work = xbt_parmap_next(parmap); + if (work != NULL) { + parmap->fun(work); + } + + XBT_DEBUG("Worker %u has finished", worker_id); + + /* We are destroying the parmap */ + } else { +#ifdef HAVE_FUTEX_H + xbt_event_end(parmap->sync_event); +#endif + XBT_DEBUG("Shutting down worker %u", worker_id); + return NULL; } + } +} - /* If the wait flag is set then ... wait. */ - while(parmap->flags[worker_id] == PARMAP_WAIT) - xbt_os_cond_wait(parmap->job_posted, parmap->mutex); +#ifdef HAVE_FUTEX_H +static void futex_wait(int *uaddr, int val) +{ + XBT_VERB("Waiting on futex %p", uaddr); + syscall(SYS_futex, uaddr, FUTEX_WAIT_PRIVATE, val, NULL, NULL, 0); +} - DEBUG1("Worker %u got a job", worker_id); +static void futex_wake(int *uaddr, int val) +{ + XBT_VERB("Waking futex %p", uaddr); + syscall(SYS_futex, uaddr, FUTEX_WAKE_PRIVATE, val, NULL, NULL, 0); +} - /* If we are shutting down, the last worker is going to signal the - * parmap so it can finish destroying the data structure */ - if(parmap->flags[worker_id] == PARMAP_DESTROY){ - DEBUG1("Shutting down worker %u", worker_id); - parmap->num_workers--; - if(parmap->num_workers == 0) - xbt_os_cond_signal(parmap->all_done); - xbt_os_mutex_release(parmap->mutex); - return NULL; - } - xbt_os_mutex_release(parmap->mutex); +void xbt_event_init(xbt_event_t event) +{ + int myflag = event->done; + if(event->thread_counter < event->threads_to_wait) + futex_wait(&event->done, myflag); +} - /* Compute how much data does every worker gets */ - data_size = (xbt_dynar_length(parmap->data) / parmap->num_workers) - + ((xbt_dynar_length(parmap->data) % parmap->num_workers) ? 1 : 0); +void xbt_event_signal(xbt_event_t event) +{ + int myflag = event->done; + event->thread_counter = 0; + event->work++; + futex_wake(&event->work, event->threads_to_wait); + futex_wait(&event->done, myflag); +} - /* Each worker data segment starts in a position associated with its id*/ - data_start = data_size * worker_id; +void xbt_event_wait(xbt_event_t event) +{ + int myflag; + unsigned int mycount; + + myflag = event->work; + mycount = __sync_add_and_fetch(&event->thread_counter, 1); + if(mycount == event->threads_to_wait){ + event->done++; + futex_wake(&event->done, 1); + } - /* The end of the worker data segment must be bounded by the end of the data vector */ - data_end = MIN(data_start + data_size, xbt_dynar_length(parmap->data)); + futex_wait(&event->work, myflag); +} - DEBUG4("Worker %u: data_start=%u data_end=%u (data_size=%u)", worker_id, data_start, data_end, data_size); +void xbt_event_end(xbt_event_t event) +{ + unsigned int mycount; - /* While the worker don't pass the end of it data segment apply the function */ - while(data_start < data_end){ - parmap->fun(*(void **)xbt_dynar_get_ptr(parmap->data, data_start)); - data_start++; - } + mycount = __sync_add_and_fetch(&event->thread_counter, 1); + if(mycount == event->threads_to_wait){ + event->done++; + futex_wake(&event->done, 1); } } +#endif #ifdef SIMGRID_TEST #include "xbt.h" #include "xbt/ex.h" XBT_TEST_SUITE("parmap", "Parallel Map"); +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(xbt_parmap_unit); -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_parmap_unit, xbt, - "unit parmap"); xbt_parmap_t parmap; @@ -187,27 +197,29 @@ void fun(void *arg); void fun(void *arg) { - INFO1("I'm job %lu", (unsigned long)arg); + //XBT_INFO("I'm job %lu", (unsigned long)arg); } XBT_TEST_UNIT("basic", test_parmap_basic, "Basic usage") { - xbt_test_add0("Create the parmap"); + xbt_test_add("Create the parmap"); - unsigned long j; + unsigned long i,j; xbt_dynar_t data = xbt_dynar_new(sizeof(void *), NULL); /* Create the parallel map */ - parmap = xbt_parmap_new(5); + parmap = xbt_parmap_new(10); - for(j=0; j < 200; j++){ + for(j=0; j < 100; j++){ xbt_dynar_push_as(data, void *, (void *)j); } - xbt_parmap_apply(parmap, fun, data); + for(i=0; i < 5; i++) + xbt_parmap_apply(parmap, fun, data); /* Destroy the parmap */ xbt_parmap_destroy(parmap); + xbt_dynar_free(&data); } #endif /* SIMGRID_TEST */