/* 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 "internal_config.h"
#include <unistd.h>
#ifndef _XBT_WIN32
#ifdef HAVE_FUTEX_H
#include <linux/futex.h>
+#include <limits.h>
#endif
#include "xbt/parmap.h"
#include "xbt/dynar.h"
#include "xbt/xbt_os_thread.h"
#include "xbt/sysdep.h"
+#include "simix/smx_private.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_parmap, xbt, "parmap: parallel map");
-XBT_LOG_NEW_SUBCATEGORY(xbt_parmap_unit, xbt_parmap, "parmap unit testing");
typedef enum {
XBT_PARMAP_WORK,
static void xbt_parmap_busy_master_signal(xbt_parmap_t parmap);
static void xbt_parmap_busy_worker_wait(xbt_parmap_t parmap, unsigned round);
+
/**
* \brief Parallel map structure
*/
void (*worker_wait_f)(xbt_parmap_t, unsigned); /**< waits for more work */
} s_xbt_parmap_t;
+/**
+ * \brief Thread data transmission structure
+ */
+typedef struct s_xbt_parmap_thread_data{
+ xbt_parmap_t parmap;
+ int worker_id;
+} s_xbt_parmap_thread_data_t;
+
+typedef s_xbt_parmap_thread_data_t *xbt_parmap_thread_data_t;
+
/**
* \brief Creates a parallel map object
* \param num_workers number of worker threads to create
xbt_parmap_set_mode(parmap, mode);
/* Create the pool of worker threads */
+ xbt_parmap_thread_data_t data;
for (i = 1; i < num_workers; i++) {
- worker = xbt_os_thread_create(NULL, xbt_parmap_worker_main, parmap, NULL);
+ data = xbt_new0(s_xbt_parmap_thread_data_t, 1);
+ data->parmap = parmap;
+ data->worker_id = i;
+ worker = xbt_os_thread_create(NULL, xbt_parmap_worker_main, data, NULL);
xbt_os_thread_detach(worker);
}
return parmap;
*/
static void *xbt_parmap_worker_main(void *arg)
{
- xbt_parmap_t parmap = (xbt_parmap_t) 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");
parmap->worker_wait_f(parmap, ++round);
if (parmap->status == XBT_PARMAP_WORK) {
- XBT_DEBUG("Worker got a job");
+ XBT_DEBUG("Worker %d got a job", data->worker_id);
xbt_parmap_work(parmap);
parmap->worker_signal_f(parmap);
- XBT_DEBUG("Worker has finished");
+ XBT_DEBUG("Worker %d has finished", data->worker_id);
/* We are destroying the parmap */
} else {
+ xbt_free(data);
parmap->worker_signal_f(parmap);
return NULL;
}
{
xbt_os_mutex_acquire(parmap->ready_mutex);
/* wait for more work */
- if (parmap->work < round) {
+ if (parmap->work != round) {
xbt_os_cond_wait(parmap->ready_cond, parmap->ready_mutex);
}
xbt_os_mutex_release(parmap->ready_mutex);
unsigned count = __sync_add_and_fetch(&parmap->thread_counter, 1);
if (count == parmap->num_workers) {
/* all workers have finished, wake the controller */
- futex_wake(&parmap->thread_counter, 1);
+ futex_wake(&parmap->thread_counter, INT_MAX);
}
}
parmap->thread_counter = 1;
__sync_add_and_fetch(&parmap->work, 1);
/* wake all workers */
- futex_wake(&parmap->work, parmap->num_workers - 1);
+ futex_wake(&parmap->work, INT_MAX);
}
/**
{
unsigned work = parmap->work;
/* wait for more work */
- if (work < round)
+ while (work != round) {
futex_wait(&parmap->work, work);
+ work = parmap->work;
+ }
}
#endif
static void xbt_parmap_busy_worker_wait(xbt_parmap_t parmap, unsigned round)
{
/* wait for more work */
- while (parmap->work < round) {
+ while (parmap->work != round) {
xbt_os_thread_yield();
}
}
-
-#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_parmap_t parmap;
-
-void fun(void *arg);
-
-void fun(void *arg)
-{
- //XBT_INFO("I'm job %lu", (unsigned long)arg);
-}
-
-XBT_TEST_UNIT("basic", test_parmap_basic, "Basic usage")
-{
- xbt_test_add("Create the parmap");
-
- unsigned long i, j;
- xbt_dynar_t data = xbt_dynar_new(sizeof(void *), NULL);
-
- /* Create the parallel map */
-#ifdef HAVE_FUTEX_H
- parmap = xbt_parmap_new(10, XBT_PARMAP_FUTEX);
-#else
- parmap = xbt_parmap_new(10, XBT_PARMAP_BUSY_WAIT);
-#endif
- for (j = 0; j < 100; j++) {
- xbt_dynar_push_as(data, void *, (void *)j);
- }
-
- 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 */