X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4937aa0ad4627d301682b278527aef71f2095e55..15badc71ce964f6dae6428c9a4c0198fad5d4936:/examples/msg/actions/actions.c diff --git a/examples/msg/actions/actions.c b/examples/msg/actions/actions.c index 22e5961ea6..25baa9a7b3 100644 --- a/examples/msg/actions/actions.c +++ b/examples/msg/actions/actions.c @@ -7,7 +7,7 @@ #include #include #include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */ -#include "simgrid/simix.h" /* semaphores for the barrier */ +#include "simgrid/simix.h" /* semaphores for the barrier */ #include "xbt.h" /* calloc, printf */ #include "instr/instr_private.h" #include @@ -40,21 +40,20 @@ * */ -XBT_LOG_NEW_DEFAULT_CATEGORY(actions, - "Messages specific for this msg example"); +XBT_LOG_NEW_DEFAULT_CATEGORY(actions, "Messages specific for this msg example"); int communicator_size = 0; static void action_Isend(const char *const *action); -typedef struct { +typedef struct { int last_Irecv_sender_id; int bcast_counter; int reduce_counter; int allReduce_counter; - xbt_dynar_t isends; /* of msg_comm_t */ + 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 */ + 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 */ @@ -69,19 +68,32 @@ static double parse_double(const char *string) return value; } -static int get_rank (const char *process_name) +#define ACT_DEBUG(...) \ + if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose)) { \ + char *NAME = xbt_str_join_array(action, " "); \ + XBT_DEBUG(__VA_ARGS__); \ + xbt_free(NAME); \ + } else ((void)0) + +static void log_action(const char *const *action, double date) { - return atoi(&(process_name[1])); -} + if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose)) { + char *name = xbt_str_join_array(action, " "); + XBT_VERB("%s %f", name, date); + xbt_free(name); + } +} -static void asynchronous_cleanup(void) { - process_globals_t globals = (process_globals_t) MSG_process_get_data(MSG_process_self()); +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); + xbt_dynar_remove_at(globals->isends, found, &comm); MSG_comm_destroy(comm); } } @@ -89,39 +101,21 @@ static void asynchronous_cleanup(void) { /* My actions */ static void action_send(const char *const *action) { - char *name = NULL; char to[250]; const char *size_str = action[3]; - double size=parse_double(size_str); - double clock = MSG_get_clock(); /* this "call" is free thanks to inlining */ - - sprintf(to, "%s_%s", MSG_process_get_name(MSG_process_self()),action[2]); - - if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose)) - name = xbt_str_join_array(action, " "); - -#ifdef HAVE_TRACING - int rank = get_rank(MSG_process_get_name(MSG_process_self())); - int dst_traced = get_rank(action[2]); - TRACE_smpi_ptp_in(rank, rank, dst_traced, "send"); - TRACE_smpi_send(rank, rank, dst_traced); -#endif - - 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); - } - - XBT_VERB("%s %f", name, MSG_get_clock() - clock); + double size = parse_double(size_str); + double clock = MSG_get_clock(); /* this "call" is free thanks to inlining */ - free(name); + sprintf(to, "%s_%s", MSG_process_get_name(MSG_process_self()), action[2]); -#ifdef HAVE_TRACING - TRACE_smpi_ptp_out(rank, rank, dst_traced, "send"); -#endif + ACT_DEBUG("Entering Send: %s (size: %lg)", NAME, size); + if (size < 65536) { + action_Isend(action); + } else { + MSG_task_send(MSG_task_create(to, 0, size, NULL), to); + } + log_action(action, MSG_get_clock() - clock); asynchronous_cleanup(); } @@ -130,24 +124,22 @@ static void action_Isend(const char *const *action) char to[250]; const char *size = action[3]; double clock = MSG_get_clock(); - process_globals_t globals = (process_globals_t) MSG_process_get_data(MSG_process_self()); - + 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]); + 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); + 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); - + log_action(action, MSG_get_clock() - clock); asynchronous_cleanup(); } static void action_recv(const char *const *action) { - char *name = NULL; char mailbox_name[250]; msg_task_t task = NULL; double clock = MSG_get_clock(); @@ -155,30 +147,13 @@ static void action_recv(const char *const *action) 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_array(action, " "); - -#ifdef HAVE_TRACING - int rank = get_rank(MSG_process_get_name(MSG_process_self())); - int src_traced = get_rank(action[2]); - TRACE_smpi_ptp_in(rank, src_traced, rank, "recv"); -#endif - - XBT_DEBUG("Receiving: %s", name); + ACT_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())); - XBT_VERB("%s %f", name, MSG_get_clock() - clock); + log_action(action, MSG_get_clock() - clock); if (res == MSG_OK) { MSG_task_destroy(task); } - - free(name); -#ifdef HAVE_TRACING - TRACE_smpi_ptp_out(rank, src_traced, rank, "recv"); - TRACE_smpi_recv(rank, src_traced, rank); -#endif - asynchronous_cleanup(); } @@ -186,112 +161,80 @@ static void action_Irecv(const char *const *action) { char mailbox[250]; double clock = MSG_get_clock(); - process_globals_t globals = (process_globals_t) MSG_process_get_data(MSG_process_self()); + process_globals_t globals = + (process_globals_t) MSG_process_get_data(MSG_process_self()); XBT_DEBUG("Irecv on %s", MSG_process_get_name(MSG_process_self())); -#ifdef HAVE_TRACING - int rank = get_rank(MSG_process_get_name(MSG_process_self())); - int src_traced = get_rank(action[2]); - globals->last_Irecv_sender_id = src_traced; - MSG_process_set_data(MSG_process_self(), (void *) globals); - - TRACE_smpi_ptp_in(rank, src_traced, rank, "Irecv"); -#endif 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_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); - - XBT_VERB("%s %f", xbt_str_join_array(action, " "), MSG_get_clock() - clock); - -#ifdef HAVE_TRACING - TRACE_smpi_ptp_out(rank, src_traced, rank, "Irecv"); -#endif + MSG_task_irecv(xbt_dynar_get_ptr + (globals->tasks, xbt_dynar_length(globals->tasks) - 1), + mailbox); + xbt_dynar_push(globals->irecvs, &c); + log_action(action, MSG_get_clock() - clock); asynchronous_cleanup(); } static void action_wait(const char *const *action) { - char *name = 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()); + 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_array(action, " "); -#ifdef HAVE_TRACING - process_globals_t counters = (process_globals_t) MSG_process_get_data(MSG_process_self()); - int src_traced = counters->last_Irecv_sender_id; - int rank = get_rank(MSG_process_get_name(MSG_process_self())); - TRACE_smpi_ptp_in(rank, src_traced, rank, "wait"); -#endif - - 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); + "action wait not preceded by any irecv: %s", + xbt_str_join_array(action, " ")); + + ACT_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); - XBT_VERB("%s %f", name, MSG_get_clock() - clock); - free(name); -#ifdef HAVE_TRACING - TRACE_smpi_ptp_out(rank, src_traced, rank, "wait"); - TRACE_smpi_recv(rank, src_traced, rank); -#endif - + log_action(action, MSG_get_clock() - clock); } /* FIXME: that's a poor man's implementation: we should take the message exchanges into account */ 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_array(action, " "); + static int processes_arrived_sofar = 0; - if (mutex == NULL) { // first arriving on the barrier + if (mutex == NULL) { // first arriving on the barrier mutex = simcall_mutex_init(); cond = simcall_cond_init(); - processes_arrived_sofar=0; + processes_arrived_sofar = 0; } - XBT_DEBUG("Entering barrier: %s (%d already there)", name,processes_arrived_sofar); + ACT_DEBUG("Entering barrier: %s (%d already there)", NAME, + processes_arrived_sofar); 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_cond_wait(cond, mutex); simcall_mutex_unlock(mutex); } - XBT_DEBUG("Exiting barrier: %s", name); + ACT_DEBUG("Exiting barrier: %s", NAME); processes_arrived_sofar--; if (!processes_arrived_sofar) { simcall_cond_destroy(cond); simcall_mutex_destroy(mutex); - mutex=NULL; + mutex = NULL; } - - free(name); - } static void action_reduce(const char *const *action) @@ -305,10 +248,11 @@ static void action_reduce(const char *const *action) const char *process_name; double clock = MSG_get_clock(); - process_globals_t counters = (process_globals_t) MSG_process_get_data(MSG_process_self()); + 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"); + "can't use collective operations"); process_name = MSG_process_get_name(MSG_process_self()); @@ -317,35 +261,36 @@ static void action_reduce(const char *const *action) if (!strcmp(process_name, "p0")) { XBT_DEBUG("%s: %s is the Root", reduce_identifier, process_name); - msg_comm_t *comms = xbt_new0(msg_comm_t,communicator_size-1); - msg_task_t *tasks = xbt_new0(msg_task_t,communicator_size-1); - for (i = 1; i < communicator_size; i++) { - sprintf(mailbox, "%s_p%d_p0", reduce_identifier, i); - comms[i-1] = MSG_task_irecv(&(tasks[i-1]),mailbox); - } - MSG_comm_waitall(comms,communicator_size-1,-1); - for (i = 1; i < communicator_size; i++) { - MSG_comm_destroy(comms[i-1]); - MSG_task_destroy(tasks[i-1]); - } - free(tasks); - - 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); - XBT_DEBUG("%s: computed", reduce_identifier); + msg_comm_t *comms = xbt_new0(msg_comm_t, communicator_size - 1); + msg_task_t *tasks = xbt_new0(msg_task_t, communicator_size - 1); + for (i = 1; i < communicator_size; i++) { + sprintf(mailbox, "%s_p%d_p0", reduce_identifier, i); + comms[i - 1] = MSG_task_irecv(&(tasks[i - 1]), mailbox); + } + MSG_comm_waitall(comms, communicator_size - 1, -1); + for (i = 1; i < communicator_size; i++) { + MSG_comm_destroy(comms[i - 1]); + MSG_task_destroy(tasks[i - 1]); + } + xbt_free(comms); + xbt_free(tasks); + + 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); + XBT_DEBUG("%s: computed", reduce_identifier); } else { 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); + XBT_DEBUG("put on %s", mailbox); + MSG_task_send(MSG_task_create(reduce_identifier, 0, comm_size, NULL), + mailbox); } - XBT_VERB("%s %f", xbt_str_join_array(action, " "), MSG_get_clock() - clock); - free(reduce_identifier); + log_action(action, MSG_get_clock() - clock); + xbt_free(reduce_identifier); } static void action_bcast(const char *const *action) @@ -358,10 +303,11 @@ static void action_bcast(const char *const *action) const char *process_name; double clock = MSG_get_clock(); - process_globals_t counters = (process_globals_t) MSG_process_get_data(MSG_process_self()); + 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"); + "can't use collective operations"); process_name = MSG_process_get_name(MSG_process_self()); @@ -370,51 +316,45 @@ static void action_bcast(const char *const *action) if (!strcmp(process_name, "p0")) { XBT_DEBUG("%s: %s is the Root", bcast_identifier, process_name); - msg_comm_t *comms = xbt_new0(msg_comm_t,communicator_size-1); + msg_comm_t *comms = xbt_new0(msg_comm_t, communicator_size - 1); - for (i = 1; i < communicator_size; i++) { - sprintf(mailbox, "%s_p0_p%d", bcast_identifier, i); - comms[i-1] = - MSG_task_isend(MSG_task_create(mailbox,0,comm_size,NULL), - mailbox); - } - MSG_comm_waitall(comms,communicator_size-1,-1); + for (i = 1; i < communicator_size; i++) { + sprintf(mailbox, "%s_p0_p%d", bcast_identifier, i); + comms[i - 1] = + MSG_task_isend(MSG_task_create(mailbox, 0, comm_size, NULL), mailbox); + } + MSG_comm_waitall(comms, communicator_size - 1, -1); for (i = 1; i < communicator_size; i++) - MSG_comm_destroy(comms[i-1]); - free(comms); + MSG_comm_destroy(comms[i - 1]); + xbt_free(comms); - XBT_DEBUG("%s: all messages sent by %s have been received", - bcast_identifier, process_name); + XBT_DEBUG("%s: all messages sent by %s have been received", + bcast_identifier, process_name); } else { - sprintf(mailbox, "%s_p0_%s", bcast_identifier, process_name); - MSG_task_receive(&task, mailbox); - MSG_task_destroy(task); - XBT_DEBUG("%s: %s has received", bcast_identifier, process_name); + sprintf(mailbox, "%s_p0_%s", bcast_identifier, process_name); + MSG_task_receive(&task, mailbox); + MSG_task_destroy(task); + XBT_DEBUG("%s: %s has received", bcast_identifier, process_name); } - XBT_VERB("%s %f", xbt_str_join_array(action, " "), MSG_get_clock() - clock); - free(bcast_identifier); + log_action(action, MSG_get_clock() - clock); + xbt_free(bcast_identifier); } static void action_sleep(const char *const *action) { - char *name = NULL; const char *duration = action[2]; double clock = MSG_get_clock(); - if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose)) - name = xbt_str_join_array(action, " "); - - XBT_DEBUG("Entering %s", name); + ACT_DEBUG("Entering %s", NAME); MSG_process_sleep(parse_double(duration)); - XBT_VERB("%s %f ", name, MSG_get_clock() - clock); - - free(name); + log_action(action, MSG_get_clock() - clock); } -static void action_allReduce(const char *const *action) { +static void action_allReduce(const char *const *action) +{ int i; char *allreduce_identifier; char mailbox[80]; @@ -424,10 +364,11 @@ static void action_allReduce(const char *const *action) { const char *process_name; double clock = MSG_get_clock(); - process_globals_t counters = (process_globals_t) MSG_process_get_data(MSG_process_self()); + 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"); + "can't use collective operations"); process_name = MSG_process_get_name(MSG_process_self()); @@ -436,18 +377,18 @@ static void action_allReduce(const char *const *action) { if (!strcmp(process_name, "p0")) { XBT_DEBUG("%s: %s is the Root", allreduce_identifier, process_name); - msg_comm_t *comms = xbt_new0(msg_comm_t,communicator_size-1); - msg_task_t *tasks = xbt_new0(msg_task_t,communicator_size-1); + msg_comm_t *comms = xbt_new0(msg_comm_t, communicator_size - 1); + msg_task_t *tasks = xbt_new0(msg_task_t, communicator_size - 1); for (i = 1; i < communicator_size; i++) { sprintf(mailbox, "%s_p%d_p0", allreduce_identifier, i); - comms[i-1] = MSG_task_irecv(&(tasks[i-1]),mailbox); + comms[i - 1] = MSG_task_irecv(&(tasks[i - 1]), mailbox); } - MSG_comm_waitall(comms,communicator_size-1,-1); + MSG_comm_waitall(comms, communicator_size - 1, -1); for (i = 1; i < communicator_size; i++) { - MSG_comm_destroy(comms[i-1]); - MSG_task_destroy(tasks[i-1]); + MSG_comm_destroy(comms[i - 1]); + MSG_task_destroy(tasks[i - 1]); } - free(tasks); + xbt_free(tasks); comp_task = MSG_task_create("allReduce_comp", comp_size, 0, NULL); XBT_DEBUG("%s: computing 'reduce_comp'", allreduce_identifier); @@ -457,17 +398,16 @@ static void action_allReduce(const char *const *action) { for (i = 1; i < communicator_size; i++) { sprintf(mailbox, "%s_p0_p%d", allreduce_identifier, i); - comms[i-1] = - MSG_task_isend(MSG_task_create(mailbox,0,comm_size,NULL), - mailbox); + comms[i - 1] = + MSG_task_isend(MSG_task_create(mailbox, 0, comm_size, NULL), mailbox); } - MSG_comm_waitall(comms,communicator_size-1,-1); + MSG_comm_waitall(comms, communicator_size - 1, -1); for (i = 1; i < communicator_size; i++) - MSG_comm_destroy(comms[i-1]); - free(comms); + MSG_comm_destroy(comms[i - 1]); + xbt_free(comms); XBT_DEBUG("%s: all messages sent by %s have been received", - allreduce_identifier, process_name); + allreduce_identifier, process_name); } else { XBT_DEBUG("%s: %s sends", allreduce_identifier, process_name); @@ -482,64 +422,53 @@ static void action_allReduce(const char *const *action) { XBT_DEBUG("%s: %s has received", allreduce_identifier, process_name); } - XBT_VERB("%s %f", xbt_str_join_array(action, " "), MSG_get_clock() - clock); - free(allreduce_identifier); + log_action(action, MSG_get_clock() - clock); + xbt_free(allreduce_identifier); } static void action_comm_size(const char *const *action) { - 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); + log_action(action, MSG_get_clock() - clock); } static void action_compute(const char *const *action) { - char *name = NULL; const char *amout = action[2]; - msg_task_t task = MSG_task_create(name, parse_double(amout), 0, NULL); + msg_task_t task = MSG_task_create("task", parse_double(amout), 0, NULL); double clock = MSG_get_clock(); - if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose)) - name = xbt_str_join_array(action, " "); - XBT_DEBUG("Entering %s", name); + ACT_DEBUG("Entering %s", NAME); MSG_task_execute(task); MSG_task_destroy(task); - XBT_VERB("%s %f", name, MSG_get_clock() - clock); - free(name); + log_action(action, MSG_get_clock() - clock); } static void action_init(const char *const *action) -{ -#ifdef HAVE_TRACING - TRACE_smpi_init(get_rank(MSG_process_get_name(MSG_process_self()))); -#endif +{ 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); + 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) { -#ifdef HAVE_TRACING - TRACE_smpi_finalize(get_rank(MSG_process_get_name(MSG_process_self()))); -#endif - process_globals_t globals = (process_globals_t) MSG_process_get_data(MSG_process_self()); - if (globals){ + process_globals_t globals = + (process_globals_t) MSG_process_get_data(MSG_process_self()); + if (globals) { + asynchronous_cleanup(); xbt_dynar_free_container(&(globals->isends)); xbt_dynar_free_container(&(globals->irecvs)); xbt_dynar_free_container(&(globals->tasks)); - free(globals); + xbt_free(globals); } } @@ -551,8 +480,7 @@ int main(int argc, char *argv[]) /* Check the given arguments */ 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]); @@ -561,7 +489,11 @@ int main(int argc, char *argv[]) argv[0]); exit(1); } - + printf("WARNING: THIS BINARY IS KINDA DEPRECATED\n" + "This example is still relevant if you want to learn about MSG-based trace replay, " + "but if you want to simulate MPI-like traces, you should use the newer version " + "that is in the examples/smpi/replay directory instead.\n"); + /* Simulation setting */ MSG_create_environment(argv[1]); @@ -569,20 +501,20 @@ int main(int argc, char *argv[]) MSG_launch_application(argv[2]); /* Action registration */ - xbt_replay_action_register("init", action_init); + 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); + 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 */