/* 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 <unistd.h>
+#ifndef _XBT_WIN32
#include <sys/syscall.h>
-#include <linux/futex.h>
+#endif
+
+#ifdef HAVE_FUTEX_H
+ #include <linux/futex.h>
+#else
+ #include "xbt/xbt_os_thread.h"
+#endif
#include <errno.h>
#include "parmap_private.h"
XBT_LOG_NEW_SUBCATEGORY(xbt_parmap_unit, xbt_parmap, "parmap unit testing");
static void *_xbt_parmap_worker_main(void *parmap);
-
-static void futex_wait(int *uaddr, int val);
-static void futex_wake(int *uaddr, int val);
-
+#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 the thread pool data structure */
xbt_parmap_t parmap = xbt_new0(s_xbt_parmap_t, 1);
+#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);
}
/* 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;
+ parmap->index = 0;
+#ifdef HAVE_FUTEX_H
+ xbt_event_signal(parmap->sync_event);
+#endif
+ XBT_DEBUG("Job done");
}
static void *_xbt_parmap_worker_main(void *arg)
{
- unsigned int data_start, data_end, data_size, worker_id;
+ unsigned int worker_id;
xbt_parmap_t parmap = (xbt_parmap_t)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);
+ unsigned int i;
+ unsigned int n = 0;
- /* 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);
+ XBT_DEBUG("Worker %u got a job", worker_id);
- /* Each worker data segment starts in a position associated with its id*/
- data_start = data_size * worker_id;
-
- /* 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)",
- worker_id, data_start, data_end, data_size);
-
- /* 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++;
+ while ((i = __sync_fetch_and_add(&parmap->index, 1))
+ < xbt_dynar_length(parmap->data)) {
+ parmap->fun(xbt_dynar_get_as(parmap->data, i, void*));
+ n++;
}
- xbt_barrier_wait(parmap->workers_done);
+ XBT_DEBUG("Worker %u processed %u tasks", worker_id, n);
/* 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, val, NULL, NULL, 0);
+ XBT_VERB("Waiting on futex %p", 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, val, NULL, NULL, 0);
+ XBT_VERB("Waking futex %p", uaddr);
+ syscall(SYS_futex, uaddr, FUTEX_WAKE_PRIVATE, val, NULL, NULL, 0);
+}
+
+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);
}
-/* Futex based implementation of the barrier */
-void xbt_barrier_init(xbt_barrier_t barrier, unsigned int threads_to_wait)
+void xbt_event_signal(xbt_event_t event)
{
- barrier->threads_to_wait = threads_to_wait;
- barrier->thread_count = 0;
+ 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_barrier_wait(xbt_barrier_t barrier)
+void xbt_event_end(xbt_event_t event)
{
- 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);
+ 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
#include "xbt.h"
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);
/* Destroy the parmap */
xbt_parmap_destroy(parmap);
+ xbt_dynar_free(&data);
}
#endif /* SIMGRID_TEST */
