X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ab7832b0c07c62e8337dde2b452ab79f94ecf63f..9fa23a65176e4aa86c5336fd131307297e540fd2:/examples/msg/actions/actions.c diff --git a/examples/msg/actions/actions.c b/examples/msg/actions/actions.c index 0edf514bab..dab03cd8a5 100644 --- a/examples/msg/actions/actions.c +++ b/examples/msg/actions/actions.c @@ -7,19 +7,54 @@ #include #include #include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */ -#include "simix/simix.h" /* semaphores for the barrier */ +#include "simgrid/simix.h" /* semaphores for the barrier */ #include "xbt.h" /* calloc, printf */ -#include "simgrid_config.h" /* getline */ - -XBT_LOG_NEW_DEFAULT_CATEGORY(actions, - "Messages specific for this msg example"); +#include "instr/instr_private.h" +#include + +/** @addtogroup MSG_examples + * + * @section MSG_ex_actions Trace driven simulations + * + * The actions/actions.c example demonstrates how to run trace-driven simulations. It + * is very handy when you want to test an algorithm or protocol that + * does nothing unless it receives some events from outside. For + * example, a P2P protocol reacts to requests from the user, but + * does nothing if there is no such event. + * + * In such situations, SimGrid allows to write your protocol in your + * C file, and the events to react to in a separate text file. + * Declare a function handling each of the events that you want to + * accept in your trace files, register them using \ref + * xbt_replay_action_register in your main, and then use \ref + * MSG_action_trace_run to launch the simulation. You can either + * have one trace file containing all your events, or a file per + * simulated process. Check the tesh files in the example directory + * for details on how to do it. + * + * This example uses this approach to replay MPI-like traces. It + * comes with a set of event handlers reproducing MPI events. This + * is somehow similar to SMPI, yet differently implemented. This + * code should probably be changed to use SMPI internals instead, + * but wasn't, so far. + * + */ + +XBT_LOG_NEW_DEFAULT_CATEGORY(actions, "Messages specific for this msg example"); int communicator_size = 0; -typedef struct coll_ctr_t { +static void action_Isend(const char *const *action); + +typedef struct { + int last_Irecv_sender_id; int bcast_counter; int reduce_counter; int allReduce_counter; -} *coll_ctr; + xbt_dynar_t isends; /* of msg_comm_t */ + /* Used to implement irecv+wait */ + xbt_dynar_t irecvs; /* of msg_comm_t */ + xbt_dynar_t tasks; /* of msg_task_t */ +} s_process_globals_t, *process_globals_t; /* Helper function */ static double parse_double(const char *string) @@ -29,477 +64,476 @@ static double parse_double(const char *string) value = strtod(string, &endptr); if (*endptr != '\0') - THROW1(unknown_error, 0, "%s is not a double", string); + THROWF(unknown_error, 0, "%s is not a double", string); return value; } +static int get_rank(const char *process_name) +{ + return atoi(&(process_name[1])); +} + +static void asynchronous_cleanup(void) +{ + process_globals_t globals = + (process_globals_t) MSG_process_get_data(MSG_process_self()); + + /* Destroy any isend which correspond to completed communications */ + int found; + msg_comm_t comm; + while ((found = MSG_comm_testany(globals->isends)) != -1) { + xbt_dynar_remove_at(globals->isends, found, &comm); + MSG_comm_destroy(comm); + } +} /* My actions */ -static void action_send(xbt_dynar_t action) +static void action_send(const char *const *action) { char *name = NULL; char to[250]; - char *size = xbt_dynar_get_as(action, 3, char *); - double clock = MSG_get_clock(); - sprintf(to, "%s_%s", MSG_process_get_name(MSG_process_self()), - xbt_dynar_get_as(action, 2, char *)); - // char *to = xbt_dynar_get_as(action, 2, char *); + const char *size_str = action[3]; + double size = parse_double(size_str); + double clock = MSG_get_clock(); /* this "call" is free thanks to inlining */ - if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose)) - name = xbt_str_join(action, " "); - - DEBUG2("Entering Send: %s (size: %lg)", name, parse_double(size)); - MSG_task_send(MSG_task_create(name, 0, parse_double(size), NULL), to); - VERB2("%s %f", name, MSG_get_clock() - clock); + sprintf(to, "%s_%s", MSG_process_get_name(MSG_process_self()), action[2]); if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose)) - free(name); -} + name = xbt_str_join_array(action, " "); + XBT_DEBUG("Entering Send: %s (size: %lg)", name, size); + if (size < 65536) { + action_Isend(action); + } else { + MSG_task_send(MSG_task_create(name, 0, size, NULL), to); + } -static int spawned_send(int argc, char *argv[]) -{ - DEBUG3("%s: Sending %s on %s", MSG_process_get_name(MSG_process_self()), - argv[1], argv[0]); - MSG_task_send(MSG_task_create(argv[0], 0, parse_double(argv[1]), NULL), - argv[0]); - return 0; + XBT_VERB("%s %f", name, MSG_get_clock() - clock); + + free(name); + asynchronous_cleanup(); } -static void Isend(xbt_dynar_t action) +static void action_Isend(const char *const *action) { - char spawn_name[80]; char to[250]; - // char *to = xbt_dynar_get_as(action, 2, char *); - char *size = xbt_dynar_get_as(action, 3, char *); - char **myargv; - m_process_t comm_helper; + const char *size = action[3]; double clock = MSG_get_clock(); - DEBUG1("Isend on %s: spawn process ", - MSG_process_get_name(MSG_process_self())); - - sprintf(to, "%s_%s", MSG_process_get_name(MSG_process_self()), - xbt_dynar_get_as(action, 2, char *)); - myargv = (char **) calloc(3, sizeof(char *)); - - myargv[0] = xbt_strdup(to); - myargv[1] = xbt_strdup(size); - myargv[2] = NULL; - - // sprintf(spawn_name,"%s_wait",MSG_process_get_name(MSG_process_self())); - sprintf(spawn_name, "%s_wait", to); - comm_helper = - MSG_process_create_with_arguments(spawn_name, spawned_send, - NULL, MSG_host_self(), 2, myargv); - VERB2("%s %f", xbt_str_join(action, " "), MSG_get_clock() - clock); + process_globals_t globals = + (process_globals_t) MSG_process_get_data(MSG_process_self()); + + + sprintf(to, "%s_%s", MSG_process_get_name(MSG_process_self()), action[2]); + msg_comm_t comm = + MSG_task_isend(MSG_task_create(to, 0, parse_double(size), NULL), to); + xbt_dynar_push(globals->isends, &comm); + + XBT_DEBUG("Isend on %s", MSG_process_get_name(MSG_process_self())); + XBT_VERB("%s %f", xbt_str_join_array(action, " "), MSG_get_clock() - clock); + + asynchronous_cleanup(); } -static void action_recv(xbt_dynar_t action) +static void action_recv(const char *const *action) { char *name = NULL; char mailbox_name[250]; - m_task_t task = NULL; + msg_task_t task = NULL; double clock = MSG_get_clock(); - //FIXME: argument of action ignored so far; semantic not clear - //char *from=xbt_dynar_get_as(action,2,char*); - sprintf(mailbox_name, "%s_%s", xbt_dynar_get_as(action, 2, char *), + + sprintf(mailbox_name, "%s_%s", action[2], MSG_process_get_name(MSG_process_self())); if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose)) - name = xbt_str_join(action, " "); + name = xbt_str_join_array(action, " "); - DEBUG1("Receiving: %s", name); - MSG_task_receive(&task, mailbox_name); + XBT_DEBUG("Receiving: %s", name); + msg_error_t res = MSG_task_receive(&task, mailbox_name); // MSG_task_receive(&task, MSG_process_get_name(MSG_process_self())); - DEBUG2("%s %f", name, MSG_get_clock() - clock); - MSG_task_destroy(task); + XBT_VERB("%s %f", name, MSG_get_clock() - clock); - if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose)) - free(name); -} - -static int spawned_recv(int argc, char *argv[]) -{ - m_task_t task = NULL; - DEBUG1("Receiving on %s", argv[0]); - MSG_task_receive(&task, argv[0]); - DEBUG1("Received %s", MSG_task_get_name(task)); - DEBUG1("waiter on %s", MSG_process_get_name(MSG_process_self())); - MSG_task_send(MSG_task_create("waiter", 0, 0, NULL), - MSG_process_get_name(MSG_process_self())); + if (res == MSG_OK) { + MSG_task_destroy(task); + } - MSG_task_destroy(task); - return 0; + free(name); + asynchronous_cleanup(); } - -static void Irecv(xbt_dynar_t action) +static void action_Irecv(const char *const *action) { - char *name; - m_process_t comm_helper; - char mailbox_name[250]; - char **myargv; + char mailbox[250]; double clock = MSG_get_clock(); - DEBUG1("Irecv on %s: spawn process ", - MSG_process_get_name(MSG_process_self())); + process_globals_t globals = + (process_globals_t) MSG_process_get_data(MSG_process_self()); - sprintf(mailbox_name, "%s_%s", xbt_dynar_get_as(action, 2, char *), - MSG_process_get_name(MSG_process_self())); - name = bprintf("%s_wait", MSG_process_get_name(MSG_process_self())); - myargv = (char **) calloc(2, sizeof(char *)); + XBT_DEBUG("Irecv on %s", MSG_process_get_name(MSG_process_self())); - myargv[0] = xbt_strdup(mailbox_name); - myargv[1] = NULL; - comm_helper = MSG_process_create_with_arguments(name, spawned_recv, - NULL, MSG_host_self(), - 1, myargv); + sprintf(mailbox, "%s_%s", action[2], + MSG_process_get_name(MSG_process_self())); + msg_task_t t = NULL; + xbt_dynar_push(globals->tasks, &t); + msg_comm_t c = + MSG_task_irecv(xbt_dynar_get_ptr + (globals->tasks, xbt_dynar_length(globals->tasks) - 1), + mailbox); + xbt_dynar_push(globals->irecvs, &c); - VERB2("%s %f", xbt_str_join(action, " "), MSG_get_clock() - clock); + XBT_VERB("%s %f", xbt_str_join_array(action, " "), MSG_get_clock() - clock); - free(name); + asynchronous_cleanup(); } -static void action_wait(xbt_dynar_t action) +static void action_wait(const char *const *action) { char *name = NULL; - char task_name[80]; - m_task_t task = NULL; + msg_task_t task = NULL; + msg_comm_t comm; double clock = MSG_get_clock(); + process_globals_t globals = + (process_globals_t) MSG_process_get_data(MSG_process_self()); + + xbt_assert(xbt_dynar_length(globals->irecvs), + "action wait not preceded by any irecv: %s", + xbt_str_join_array(action, " ")); if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose)) - name = xbt_str_join(action, " "); + name = xbt_str_join_array(action, " "); - DEBUG1("Entering %s", name); - sprintf(task_name, "%s_wait", MSG_process_get_name(MSG_process_self())); - DEBUG1("wait: %s", task_name); - MSG_task_receive(&task, task_name); + XBT_DEBUG("Entering %s", name); + comm = xbt_dynar_pop_as(globals->irecvs, msg_comm_t); + MSG_comm_wait(comm, -1); + task = xbt_dynar_pop_as(globals->tasks, msg_task_t); + MSG_comm_destroy(comm); MSG_task_destroy(task); - VERB2("%s %f", name, MSG_get_clock() - clock); - if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose)) - free(name); + + XBT_VERB("%s %f", name, MSG_get_clock() - clock); + free(name); } /* FIXME: that's a poor man's implementation: we should take the message exchanges into account */ -smx_sem_t barrier_semaphore = NULL; -static void barrier(xbt_dynar_t action) +static void action_barrier(const char *const *action) { char *name = NULL; + static smx_mutex_t mutex = NULL; + static smx_cond_t cond = NULL; + static int processes_arrived_sofar = 0; if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose)) - name = xbt_str_join(action, " "); - - DEBUG1("Entering barrier: %s", name); - if (barrier_semaphore == NULL) // first arriving on the barrier - barrier_semaphore = SIMIX_sem_init(0); - - if (SIMIX_sem_get_capacity(barrier_semaphore) == -communicator_size + 1) { // last arriving - SIMIX_sem_release_forever(barrier_semaphore); - SIMIX_sem_destroy(barrier_semaphore); - barrier_semaphore = NULL; - } else { // not last - SIMIX_sem_acquire(barrier_semaphore); + name = xbt_str_join_array(action, " "); + + if (mutex == NULL) { // first arriving on the barrier + mutex = simcall_mutex_init(); + cond = simcall_cond_init(); + processes_arrived_sofar = 0; } + XBT_DEBUG("Entering barrier: %s (%d already there)", name, + processes_arrived_sofar); - DEBUG1("Exiting barrier: %s", name); + simcall_mutex_lock(mutex); + if (++processes_arrived_sofar == communicator_size) { + simcall_cond_broadcast(cond); + simcall_mutex_unlock(mutex); + } else { + simcall_cond_wait(cond, mutex); + simcall_mutex_unlock(mutex); + } - if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose)) - free(name); + XBT_DEBUG("Exiting barrier: %s", name); + + processes_arrived_sofar--; + if (!processes_arrived_sofar) { + simcall_cond_destroy(cond); + simcall_mutex_destroy(mutex); + mutex = NULL; + } + + free(name); } -static void reduce(xbt_dynar_t action) +static void action_reduce(const char *const *action) { - int i; - char *name; - char task_name[80]; - char spawn_name[80]; - char **myargv; - char *comm_size = xbt_dynar_get_as(action, 2, char *); - char *comp_size = xbt_dynar_get_as(action, 3, char *); - m_process_t comm_helper = NULL; - m_task_t task = NULL, comp_task = NULL; + char *reduce_identifier; + char mailbox[80]; + double comm_size = parse_double(action[2]); + double comp_size = parse_double(action[3]); + msg_task_t comp_task = NULL; const char *process_name; double clock = MSG_get_clock(); - coll_ctr counters = (coll_ctr) MSG_process_get_data(MSG_process_self()); + process_globals_t counters = + (process_globals_t) MSG_process_get_data(MSG_process_self()); - xbt_assert0(communicator_size, "Size of Communicator is not defined" - ", can't use collective operations"); + xbt_assert(communicator_size, "Size of Communicator is not defined, " + "can't use collective operations"); process_name = MSG_process_get_name(MSG_process_self()); - if (!counters) { - DEBUG0("Initialize the counters"); - counters = (coll_ctr) calloc(1, sizeof(struct coll_ctr_t)); - } - - name = bprintf("reduce_%d", counters->reduce_counter++); + reduce_identifier = bprintf("reduce_%d", counters->reduce_counter++); if (!strcmp(process_name, "p0")) { - DEBUG2("%s: %s is the Root", name, process_name); + XBT_DEBUG("%s: %s is the Root", reduce_identifier, process_name); + + xbt_dynar_t comms = xbt_dynar_new(sizeof(msg_comm_t), NULL); + msg_task_t *tasks = xbt_new0(msg_task_t, communicator_size - 1); + int i; + for (i = 1; i < communicator_size; i++) { - sprintf(spawn_name, "%s_p%d_%s", name, i, - MSG_process_get_name(MSG_process_self())); - sprintf(task_name, "%s_wait", spawn_name); - myargv = (char **) calloc(2, sizeof(char *)); - - myargv[0] = xbt_strdup(spawn_name); - myargv[1] = NULL; - - comm_helper = - MSG_process_create_with_arguments(task_name, spawned_recv, - NULL, MSG_host_self(), - 1, myargv); + sprintf(mailbox, "%s_p%d_p0", reduce_identifier, i); + xbt_dynar_push_as(comms, msg_comm_t, + MSG_task_irecv(&(tasks[i - 1]), mailbox)); } + MSG_comm_waitall(comms, -1); - for (i = 1; i < communicator_size; i++) { - sprintf(task_name, "%s_p%d_p0_wait", name, i); - MSG_task_receive(&task, task_name); - MSG_task_destroy(task); - task = NULL; + msg_comm_t comm; + unsigned int cursor; + xbt_dynar_foreach(comms, cursor, comm) { + MSG_comm_destroy(comm); + MSG_task_destroy(tasks[cursor]); } + free(tasks); + xbt_dynar_free(&comms); - comp_task = - MSG_task_create("reduce_comp", parse_double(comp_size), 0, NULL); - DEBUG1("%s: computing 'reduce_comp'", name); + comp_task = MSG_task_create("reduce_comp", comp_size, 0, NULL); + XBT_DEBUG("%s: computing 'reduce_comp'", reduce_identifier); MSG_task_execute(comp_task); MSG_task_destroy(comp_task); - DEBUG1("%s: computed", name); + XBT_DEBUG("%s: computed", reduce_identifier); + } else { - DEBUG2("%s: %s sends", name, process_name); - sprintf(task_name, "%s_%s_p0", name, process_name); - DEBUG1("put on %s", task_name); - MSG_task_send(MSG_task_create(name, 0, parse_double(comm_size), NULL), - task_name); + XBT_DEBUG("%s: %s sends", reduce_identifier, process_name); + sprintf(mailbox, "%s_%s_p0", reduce_identifier, process_name); + XBT_DEBUG("put on %s", mailbox); + MSG_task_send(MSG_task_create(reduce_identifier, 0, comm_size, NULL), + mailbox); } - MSG_process_set_data(MSG_process_self(), (void *) counters); - VERB2("%s %f", xbt_str_join(action, " "), MSG_get_clock() - clock); - free(name); + XBT_VERB("%s %f", xbt_str_join_array(action, " "), MSG_get_clock() - clock); + free(reduce_identifier); } -static void bcast(xbt_dynar_t action) +static void action_bcast(const char *const *action) { int i; - char *name; + char *bcast_identifier; + char mailbox[80]; + double comm_size = parse_double(action[2]); + msg_task_t task = NULL; const char *process_name; - char task_name[80]; - char spawn_name[80]; - char **myargv; - m_process_t comm_helper = NULL; - m_task_t task = NULL; - char *size = xbt_dynar_get_as(action, 2, char *); - coll_ctr counters = (coll_ctr) MSG_process_get_data(MSG_process_self()); double clock = MSG_get_clock(); - xbt_assert0(communicator_size, "Size of Communicator is not defined" - ", can't use collective operations"); + process_globals_t counters = + (process_globals_t) MSG_process_get_data(MSG_process_self()); + xbt_assert(communicator_size, "Size of Communicator is not defined, " + "can't use collective operations"); process_name = MSG_process_get_name(MSG_process_self()); - if (!counters) { - DEBUG0("Initialize the counters"); - counters = (coll_ctr) calloc(1, sizeof(struct coll_ctr_t)); - } - name = bprintf("bcast_%d", counters->bcast_counter++); + bcast_identifier = bprintf("bcast_%d", counters->bcast_counter++); + if (!strcmp(process_name, "p0")) { - DEBUG2("%s: %s is the Root", name, process_name); + XBT_DEBUG("%s: %s is the Root", bcast_identifier, process_name); + + xbt_dynar_t comms = xbt_dynar_new(sizeof(msg_comm_t), NULL); + for (i = 1; i < communicator_size; i++) { - myargv = (char **) calloc(3, sizeof(char *)); - myargv[0] = xbt_strdup(name); - myargv[1] = xbt_strdup(size); - myargv[2] = NULL; - - sprintf(spawn_name, "%s_%d", myargv[0], i); - comm_helper = - MSG_process_create_with_arguments(spawn_name, spawned_send, - NULL, MSG_host_self(), 2, - myargv); + sprintf(mailbox, "%s_p0_p%d", bcast_identifier, i); + xbt_dynar_push_as(comms, msg_comm_t, + MSG_task_isend(MSG_task_create + (mailbox, 0, comm_size, NULL), mailbox)); } + MSG_comm_waitall(comms, -1); - for (i = 1; i < communicator_size; i++) { - sprintf(task_name, "p%d_wait", i); - DEBUG1("get on %s", task_name); - MSG_task_receive(&task, task_name); - MSG_task_destroy(task); - task = NULL; + msg_comm_t comm; + unsigned int cursor; + xbt_dynar_foreach(comms, cursor, comm) { + MSG_comm_destroy(comm); } - DEBUG2("%s: all messages sent by %s have been received", - name, process_name); + xbt_dynar_free(&comms); + + + XBT_DEBUG("%s: all messages sent by %s have been received", + bcast_identifier, process_name); + } else { - DEBUG2("%s: %s receives", name, process_name); - MSG_task_receive(&task, name); + sprintf(mailbox, "%s_p0_%s", bcast_identifier, process_name); + MSG_task_receive(&task, mailbox); MSG_task_destroy(task); - DEBUG2("%s: %s has received", name, process_name); - sprintf(task_name, "%s_wait", process_name); - DEBUG1("put on %s", task_name); - MSG_task_send(MSG_task_create("waiter", 0, 0, NULL), task_name); + XBT_DEBUG("%s: %s has received", bcast_identifier, process_name); } - MSG_process_set_data(MSG_process_self(), (void *) counters); - VERB2("%s %f", xbt_str_join(action, " "), MSG_get_clock() - clock); - free(name); + XBT_VERB("%s %f", xbt_str_join_array(action, " "), MSG_get_clock() - clock); + free(bcast_identifier); } -static void action_sleep(xbt_dynar_t action) +static void action_sleep(const char *const *action) { char *name = NULL; - char *duration = xbt_dynar_get_as(action, 2, char *); + const char *duration = action[2]; double clock = MSG_get_clock(); if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose)) - name = xbt_str_join(action, " "); + name = xbt_str_join_array(action, " "); - DEBUG1("Entering %s", name); + XBT_DEBUG("Entering %s", name); MSG_process_sleep(parse_double(duration)); - VERB2("%s %f ", name, MSG_get_clock() - clock); + XBT_VERB("%s %f ", name, MSG_get_clock() - clock); - if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose)) - free(name); + free(name); } -static void allReduce(xbt_dynar_t action) +static void action_allReduce(const char *const *action) { - int i; - char *name; - char task_name[80]; - char spawn_name[80]; - char **myargv; - char *comm_size = xbt_dynar_get_as(action, 2, char *); - char *comp_size = xbt_dynar_get_as(action, 3, char *); - m_process_t comm_helper = NULL; - m_task_t task = NULL, comp_task = NULL; + char *allreduce_identifier; + char mailbox[80]; + double comm_size = parse_double(action[2]); + double comp_size = parse_double(action[3]); + msg_task_t task = NULL, comp_task = NULL; const char *process_name; double clock = MSG_get_clock(); - coll_ctr counters = (coll_ctr) MSG_process_get_data(MSG_process_self()); + process_globals_t counters = + (process_globals_t) MSG_process_get_data(MSG_process_self()); - xbt_assert0(communicator_size, "Size of Communicator is not defined" - ", can't use collective operations"); + xbt_assert(communicator_size, "Size of Communicator is not defined, " + "can't use collective operations"); process_name = MSG_process_get_name(MSG_process_self()); - if (!counters) { - DEBUG0("Initialize the counters"); - counters = (coll_ctr) calloc(1, sizeof(struct coll_ctr_t)); - } - - name = bprintf("allReduce_%d", counters->allReduce_counter++); + allreduce_identifier = bprintf("allReduce_%d", counters->allReduce_counter++); if (!strcmp(process_name, "p0")) { - DEBUG2("%s: %s is the Root", name, process_name); + XBT_DEBUG("%s: %s is the Root", allreduce_identifier, process_name); + + xbt_dynar_t comms = xbt_dynar_new(sizeof(msg_comm_t), NULL); + msg_task_t *tasks = xbt_new0(msg_task_t, communicator_size - 1); + int i; for (i = 1; i < communicator_size; i++) { - sprintf(spawn_name, "%s_p%d_%s", name, i, - MSG_process_get_name(MSG_process_self())); - sprintf(task_name, "%s_wait", spawn_name); - myargv = (char **) calloc(2, sizeof(char *)); - - myargv[0] = xbt_strdup(spawn_name); - myargv[1] = NULL; - - comm_helper = - MSG_process_create_with_arguments(task_name, spawned_recv, - NULL, MSG_host_self(), - 1, myargv); + sprintf(mailbox, "%s_p%d_p0", allreduce_identifier, i); + xbt_dynar_push_as(comms, msg_comm_t, + MSG_task_irecv(&(tasks[i - 1]), mailbox)); } + MSG_comm_waitall(comms, -1); - for (i = 1; i < communicator_size; i++) { - sprintf(task_name, "%s_p%d_p0_wait", name, i); - MSG_task_receive(&task, task_name); - MSG_task_destroy(task); - task = NULL; + msg_comm_t comm; + unsigned int cursor; + xbt_dynar_foreach(comms, cursor, comm) { + MSG_comm_destroy(comm); + MSG_task_destroy(tasks[cursor]); } + free(tasks); - comp_task = - MSG_task_create("allReduce_comp", parse_double(comp_size), 0, - NULL); - DEBUG1("%s: computing 'reduce_comp'", name); + comp_task = MSG_task_create("allReduce_comp", comp_size, 0, NULL); + XBT_DEBUG("%s: computing 'reduce_comp'", allreduce_identifier); MSG_task_execute(comp_task); MSG_task_destroy(comp_task); - DEBUG1("%s: computed", name); + XBT_DEBUG("%s: computed", allreduce_identifier); + xbt_dynar_reset(comms); for (i = 1; i < communicator_size; i++) { - myargv = (char **) calloc(3, sizeof(char *)); - myargv[0] = xbt_strdup(name); - myargv[1] = xbt_strdup(comm_size); - myargv[2] = NULL; - - sprintf(spawn_name, "%s_%d", myargv[0], i); - comm_helper = - MSG_process_create_with_arguments(spawn_name, spawned_send, - NULL, MSG_host_self(), 2, - myargv); + sprintf(mailbox, "%s_p0_p%d", allreduce_identifier, i); + xbt_dynar_push_as(comms, msg_comm_t, + MSG_task_isend(MSG_task_create + (mailbox, 0, comm_size, NULL), mailbox)); } - - for (i = 1; i < communicator_size; i++) { - sprintf(task_name, "p%d_wait", i); - DEBUG1("get on %s", task_name); - MSG_task_receive(&task, task_name); - MSG_task_destroy(task); - task = NULL; + MSG_comm_waitall(comms, -1); + xbt_dynar_foreach(comms, cursor, comm) { + MSG_comm_destroy(comm); } - DEBUG2("%s: all messages sent by %s have been received", - name, process_name); + xbt_dynar_free(&comms); - } else { - DEBUG2("%s: %s sends", name, process_name); - sprintf(task_name, "%s_%s_p0", name, process_name); - DEBUG1("put on %s", task_name); - MSG_task_send(MSG_task_create(name, 0, parse_double(comm_size), NULL), - task_name); + XBT_DEBUG("%s: all messages sent by %s have been received", + allreduce_identifier, process_name); - MSG_task_receive(&task, name); + } else { + XBT_DEBUG("%s: %s sends", allreduce_identifier, process_name); + sprintf(mailbox, "%s_%s_p0", allreduce_identifier, process_name); + XBT_DEBUG("put on %s", mailbox); + MSG_task_send(MSG_task_create(allreduce_identifier, 0, comm_size, NULL), + mailbox); + + sprintf(mailbox, "%s_p0_%s", allreduce_identifier, process_name); + MSG_task_receive(&task, mailbox); MSG_task_destroy(task); - DEBUG2("%s: %s has received", name, process_name); - sprintf(task_name, "%s_wait", process_name); - DEBUG1("put on %s", task_name); - MSG_task_send(MSG_task_create("waiter", 0, 0, NULL), task_name); - + XBT_DEBUG("%s: %s has received", allreduce_identifier, process_name); } - MSG_process_set_data(MSG_process_self(), (void *) counters); - VERB2("%s %f", xbt_str_join(action, " "), MSG_get_clock() - clock); - free(name); + if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose)) { + char *a = xbt_str_join_array(action, " "); + XBT_VERB("%s %f", a, MSG_get_clock() - clock); + free(a); + } + free(allreduce_identifier); } -static void comm_size(xbt_dynar_t action) +static void action_comm_size(const char *const *action) { - char *size = xbt_dynar_get_as(action, 2, char *); + char *name = NULL; + const char *size = action[2]; + double clock = MSG_get_clock(); + + if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose)) + name = xbt_str_join_array(action, " "); communicator_size = parse_double(size); + XBT_VERB("%s %f", name, MSG_get_clock() - clock); + free(name); } -static void compute(xbt_dynar_t action) +static void action_compute(const char *const *action) { char *name = NULL; - char *amout = xbt_dynar_get_as(action, 2, char *); - m_task_t task = MSG_task_create(name, parse_double(amout), 0, NULL); + const char *amout = action[2]; + msg_task_t task = MSG_task_create(name, parse_double(amout), 0, NULL); double clock = MSG_get_clock(); if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose)) - name = xbt_str_join(action, " "); - DEBUG1("Entering %s", name); + name = xbt_str_join_array(action, " "); + XBT_DEBUG("Entering %s", name); MSG_task_execute(task); MSG_task_destroy(task); - VERB2("%s %f", name, MSG_get_clock() - clock); - if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose)) - free(name); + XBT_VERB("%s %f", name, MSG_get_clock() - clock); + free(name); +} + +static void action_init(const char *const *action) +{ + XBT_DEBUG("Initialize the counters"); + process_globals_t globals = + (process_globals_t) calloc(1, sizeof(s_process_globals_t)); + globals->isends = xbt_dynar_new(sizeof(msg_comm_t), NULL); + globals->irecvs = xbt_dynar_new(sizeof(msg_comm_t), NULL); + globals->tasks = xbt_dynar_new(sizeof(msg_task_t), NULL); + MSG_process_set_data(MSG_process_self(), globals); + +} + +static void action_finalize(const char *const *action) +{ + process_globals_t globals = + (process_globals_t) MSG_process_get_data(MSG_process_self()); + if (globals) { + xbt_dynar_free_container(&(globals->isends)); + xbt_dynar_free_container(&(globals->irecvs)); + xbt_dynar_free_container(&(globals->tasks)); + free(globals); + } } /** Main function */ int main(int argc, char *argv[]) { - MSG_error_t res = MSG_OK; + msg_error_t res = MSG_OK; /* Check the given arguments */ - MSG_global_init(&argc, argv); + MSG_init(&argc, argv); if (argc < 3) { - printf("Usage: %s platform_file deployment_file [action_files]\n", - argv[0]); + printf("Usage: %s platform_file deployment_file [action_files]\n", argv[0]); printf ("example: %s msg_platform.xml msg_deployment.xml actions # if all actions are in the same file\n", argv[0]); @@ -516,25 +550,26 @@ int main(int argc, char *argv[]) MSG_launch_application(argv[2]); /* Action registration */ - MSG_action_register("comm_size", comm_size); - MSG_action_register("send", action_send); - MSG_action_register("Isend", Isend); - MSG_action_register("recv", action_recv); - MSG_action_register("Irecv", Irecv); - MSG_action_register("wait", action_wait); - MSG_action_register("barrier", barrier); - MSG_action_register("bcast", bcast); - MSG_action_register("reduce", reduce); - MSG_action_register("allReduce", allReduce); - MSG_action_register("sleep", action_sleep); - MSG_action_register("compute", compute); + xbt_replay_action_register("init", action_init); + xbt_replay_action_register("finalize", action_finalize); + xbt_replay_action_register("comm_size", action_comm_size); + xbt_replay_action_register("send", action_send); + xbt_replay_action_register("Isend", action_Isend); + xbt_replay_action_register("recv", action_recv); + xbt_replay_action_register("Irecv", action_Irecv); + xbt_replay_action_register("wait", action_wait); + xbt_replay_action_register("barrier", action_barrier); + xbt_replay_action_register("bcast", action_bcast); + xbt_replay_action_register("reduce", action_reduce); + xbt_replay_action_register("allReduce", action_allReduce); + xbt_replay_action_register("sleep", action_sleep); + xbt_replay_action_register("compute", action_compute); /* Actually do the simulation using MSG_action_trace_run */ res = MSG_action_trace_run(argv[3]); // it's ok to pass a NULL argument here - INFO1("Simulation time %g", MSG_get_clock()); - MSG_clean(); + XBT_INFO("Simulation time %g", MSG_get_clock()); if (res == MSG_OK) return 0;