X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/768675e35464a15a586df2e8efb23a6625cc033b..1189d1797cc934d847d6641d809bbe060729f064:/src/xbt/parmap.c diff --git a/src/xbt/parmap.c b/src/xbt/parmap.c index 6852623d1c..b48954960f 100644 --- a/src/xbt/parmap.c +++ b/src/xbt/parmap.c @@ -5,7 +5,10 @@ * 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 @@ -27,43 +30,37 @@ 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 the thread pool data structure */ xbt_parmap_t parmap = xbt_new0(s_xbt_parmap_t, 1); - #ifndef HAVE_FUTEX_H - parmap->workers_ready->mutex = xbt_os_mutex_init(); - parmap->workers_ready->cond = xbt_os_cond_init(); - #endif +#ifdef HAVE_FUTEX_H + parmap->sync_event = xbt_new0(s_xbt_event_t, 1); +#endif parmap->num_workers = num_workers; parmap->status = PARMAP_WORK; - - parmap->workers_ready = xbt_new0(s_xbt_barrier_t, 1); - xbt_barrier_init(parmap->workers_ready, num_workers + 1); - parmap->workers_done = xbt_new0(s_xbt_barrier_t, 1); - xbt_barrier_init(parmap->workers_done, num_workers + 1); - +#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); } - +#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); - + XBT_DEBUG("Destroy parmap %p", parmap); parmap->status = PARMAP_DESTROY; - - xbt_barrier_wait(parmap->workers_ready); - DEBUG0("Kill job sent"); - xbt_barrier_wait(parmap->workers_done); - - xbt_free(parmap->workers_ready); - xbt_free(parmap->workers_done); +#ifdef HAVE_FUTEX_H + xbt_event_signal(parmap->sync_event); + xbt_free(parmap->sync_event); +#endif xbt_free(parmap); } @@ -72,15 +69,10 @@ void xbt_parmap_destroy(xbt_parmap_t parmap) /* Assign resources to worker threads*/ parmap->fun = fun; parmap->data = data; - - /* Notify workers that there is a job */ - xbt_barrier_wait(parmap->workers_ready); - DEBUG0("Job dispatched, lets wait..."); - xbt_barrier_wait(parmap->workers_done); - - DEBUG0("Job done"); - parmap->fun = NULL; - parmap->data = NULL; +#ifdef HAVE_FUTEX_H + xbt_event_signal(parmap->sync_event); +#endif + XBT_DEBUG("Job done"); } static void *_xbt_parmap_worker_main(void *arg) @@ -90,15 +82,17 @@ static void *_xbt_parmap_worker_main(void *arg) /* Fetch a worker id */ 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_barrier_wait(parmap->workers_ready); - +#ifdef HAVE_FUTEX_H + xbt_event_wait(parmap->sync_event); +#endif if(parmap->status == PARMAP_WORK){ - DEBUG1("Worker %u got a job", worker_id); + XBT_DEBUG("Worker %u got a job", worker_id); /* Compute how much data does every worker gets */ data_size = (xbt_dynar_length(parmap->data) / parmap->num_workers) @@ -110,7 +104,7 @@ static void *_xbt_parmap_worker_main(void *arg) /* 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)); - DEBUG4("Worker %u: data_start=%u data_end=%u (data_size=%u)", + XBT_DEBUG("Worker %u: data_start=%u data_end=%u (data_size=%u)", worker_id, data_start, data_end, data_size); /* While the worker don't pass the end of it data segment apply the function */ @@ -119,71 +113,73 @@ static void *_xbt_parmap_worker_main(void *arg) data_start++; } - xbt_barrier_wait(parmap->workers_done); - /* We are destroying the parmap */ }else{ - xbt_barrier_wait(parmap->workers_done); - DEBUG1("Shutting down worker %u", worker_id); +#ifdef HAVE_FUTEX_H + xbt_event_end(parmap->sync_event); +#endif + XBT_DEBUG("Shutting down worker %u", worker_id); return NULL; } } } #ifdef HAVE_FUTEX_H - static void futex_wait(int *uaddr, int val) - { - DEBUG1("Waiting on futex %d", *uaddr); - syscall(SYS_futex, uaddr, FUTEX_WAIT_PRIVATE, val, NULL, NULL, 0); - } - - static void futex_wake(int *uaddr, int val) - { - DEBUG1("Waking futex %d", *uaddr); - syscall(SYS_futex, uaddr, FUTEX_WAKE_PRIVATE, val, NULL, NULL, 0); - } -#endif +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); +} -/* Futex based implementation of the barrier */ -void xbt_barrier_init(xbt_barrier_t barrier, unsigned int threads_to_wait) +static void futex_wake(int *uaddr, int val) { - barrier->threads_to_wait = threads_to_wait; - barrier->thread_count = 0; + XBT_VERB("Waking futex %p", uaddr); + syscall(SYS_futex, uaddr, FUTEX_WAKE_PRIVATE, val, NULL, NULL, 0); } -#ifdef HAVE_FUTEX_H - void xbt_barrier_wait(xbt_barrier_t barrier) - { - int myflag = 0; - unsigned int mycount = 0; - - myflag = barrier->futex; - mycount = __sync_add_and_fetch(&barrier->thread_count, 1); - if(mycount < barrier->threads_to_wait){ - futex_wait(&barrier->futex, myflag); - }else{ - barrier->futex = __sync_add_and_fetch(&barrier->futex, 1); - barrier->thread_count = 0; - futex_wake(&barrier->futex, barrier->threads_to_wait); - } - } -#else - void xbt_barrier_wait(xbt_barrier_t barrier) - { - int myflag = 0; - unsigned int mycount = 0; - - xbt_os_mutex_acquire(barrier->mutex); - - barrier->thread_count++; - if(barrier->thread_count < barrier->threads_to_wait){ - xbt_os_cond_wait(barrier->cond,barrier->mutex); - }else{ - barrier->thread_count = 0; - xbt_os_cond_broadcast(barrier->cond); - } - xbt_os_mutex_release(barrier->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); +} + +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); +} + +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); + } + + futex_wait(&event->work, myflag); +} + +void xbt_event_end(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); + } +} #endif #ifdef SIMGRID_TEST @@ -201,12 +197,12 @@ 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 i,j; xbt_dynar_t data = xbt_dynar_new(sizeof(void *), NULL); @@ -223,6 +219,7 @@ XBT_TEST_UNIT("basic", test_parmap_basic, "Basic usage") /* Destroy the parmap */ xbt_parmap_destroy(parmap); + xbt_dynar_free(&data); } #endif /* SIMGRID_TEST */