X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f1664c170760cbfce0ab2698557424304d22e63e..18c57b27dd71ee7839c6a90368c845886a87d638:/examples/msg/actions/actions.c diff --git a/examples/msg/actions/actions.c b/examples/msg/actions/actions.c index 0b42753d65..2448f93fad 100644 --- a/examples/msg/actions/actions.c +++ b/examples/msg/actions/actions.c @@ -9,11 +9,8 @@ #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 "xbt.h" /* calloc, printf */ -#include "simgrid_config.h" /* getline */ #include "instr/instr_private.h" -void SIMIX_ctx_raw_factory_init(smx_context_factory_t *factory); - XBT_LOG_NEW_DEFAULT_CATEGORY(actions, "Messages specific for this msg example"); int communicator_size = 0; @@ -39,7 +36,7 @@ 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; } @@ -81,17 +78,16 @@ static void action_send(const char *const *action) TRACE_smpi_send(rank, rank, dst_traced); #endif - DEBUG2("Entering Send: %s (size: %lg)", name, size); + 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); } - 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); #ifdef HAVE_TRACING TRACE_smpi_ptp_out(rank, rank, dst_traced, "send"); @@ -113,8 +109,8 @@ static void action_Isend(const char *const *action) MSG_task_isend( MSG_task_create(to,0,parse_double(size),NULL), to); xbt_dynar_push(globals->isends,&comm); - DEBUG1("Isend on %s", MSG_process_get_name(MSG_process_self())); - VERB2("%s %f", xbt_str_join_array(action, " "), MSG_get_clock() - clock); + 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(); } @@ -139,14 +135,16 @@ static void action_recv(const char *const *action) TRACE_smpi_ptp_in(rank, src_traced, rank, "recv"); #endif - 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())); - VERB2("%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); + 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); @@ -161,7 +159,7 @@ static void action_Irecv(const char *const *action) double clock = MSG_get_clock(); process_globals_t globals = (process_globals_t) MSG_process_get_data(MSG_process_self()); - DEBUG1("Irecv on %s", MSG_process_get_name(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]); @@ -181,7 +179,7 @@ static void action_Irecv(const char *const *action) mailbox); xbt_dynar_push(globals->irecvs,&c); - VERB2("%s %f", xbt_str_join_array(action, " "), MSG_get_clock() - clock); + 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"); @@ -199,7 +197,7 @@ static void action_wait(const char *const *action) double clock = MSG_get_clock(); process_globals_t globals = (process_globals_t) MSG_process_get_data(MSG_process_self()); - xbt_assert1(xbt_dynar_length(globals->irecvs), + 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)) @@ -211,16 +209,15 @@ static void action_wait(const char *const *action) TRACE_smpi_ptp_in(rank, src_traced, rank, "wait"); #endif - DEBUG1("Entering %s", 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,m_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); #ifdef HAVE_TRACING TRACE_smpi_ptp_out(rank, src_traced, rank, "wait"); TRACE_smpi_recv(rank, src_traced, rank); @@ -240,32 +237,31 @@ static void action_barrier(const char *const *action) name = xbt_str_join_array(action, " "); if (mutex == NULL) { // first arriving on the barrier - mutex = SIMIX_req_mutex_init(); - cond = SIMIX_req_cond_init(); + mutex = simcall_mutex_init(); + cond = simcall_cond_init(); processes_arrived_sofar=0; } - DEBUG2("Entering barrier: %s (%d already there)", name,processes_arrived_sofar); + XBT_DEBUG("Entering barrier: %s (%d already there)", name,processes_arrived_sofar); - SIMIX_req_mutex_lock(mutex); + simcall_mutex_lock(mutex); if (++processes_arrived_sofar == communicator_size) { - SIMIX_req_cond_broadcast(cond); - SIMIX_req_mutex_unlock(mutex); + simcall_cond_broadcast(cond); + simcall_mutex_unlock(mutex); } else { - SIMIX_req_cond_wait(cond,mutex); - SIMIX_req_mutex_unlock(mutex); + simcall_cond_wait(cond,mutex); + simcall_mutex_unlock(mutex); } - DEBUG1("Exiting barrier: %s", name); + XBT_DEBUG("Exiting barrier: %s", name); processes_arrived_sofar--; if (!processes_arrived_sofar) { - SIMIX_req_cond_destroy(cond); - SIMIX_req_mutex_destroy(mutex); + simcall_cond_destroy(cond); + simcall_mutex_destroy(mutex); mutex=NULL; } - if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose)) - free(name); + free(name); } @@ -282,7 +278,7 @@ static void action_reduce(const char *const *action) process_globals_t counters = (process_globals_t) MSG_process_get_data(MSG_process_self()); - xbt_assert0(communicator_size, "Size of Communicator is not defined, " + xbt_assert(communicator_size, "Size of Communicator is not defined, " "can't use collective operations"); process_name = MSG_process_get_name(MSG_process_self()); @@ -290,7 +286,7 @@ static void action_reduce(const char *const *action) reduce_identifier = bprintf("reduce_%d", counters->reduce_counter++); if (!strcmp(process_name, "p0")) { - DEBUG2("%s: %s is the Root", reduce_identifier, process_name); + XBT_DEBUG("%s: %s is the Root", reduce_identifier, process_name); msg_comm_t *comms = xbt_new0(msg_comm_t,communicator_size-1); m_task_t *tasks = xbt_new0(m_task_t,communicator_size-1); @@ -306,20 +302,20 @@ static void action_reduce(const char *const *action) free(tasks); comp_task = MSG_task_create("reduce_comp", comp_size, 0, NULL); - DEBUG1("%s: computing 'reduce_comp'", reduce_identifier); + XBT_DEBUG("%s: computing 'reduce_comp'", reduce_identifier); MSG_task_execute(comp_task); MSG_task_destroy(comp_task); - DEBUG1("%s: computed", reduce_identifier); + XBT_DEBUG("%s: computed", reduce_identifier); } else { - DEBUG2("%s: %s sends", reduce_identifier, process_name); + XBT_DEBUG("%s: %s sends", reduce_identifier, process_name); sprintf(mailbox, "%s_%s_p0", reduce_identifier, process_name); - DEBUG1("put on %s", mailbox); + XBT_DEBUG("put on %s", mailbox); MSG_task_send(MSG_task_create(reduce_identifier, 0, comm_size, NULL), mailbox); } - VERB2("%s %f", xbt_str_join_array(action, " "), MSG_get_clock() - clock); + XBT_VERB("%s %f", xbt_str_join_array(action, " "), MSG_get_clock() - clock); free(reduce_identifier); } @@ -335,7 +331,7 @@ static void action_bcast(const char *const *action) process_globals_t counters = (process_globals_t) MSG_process_get_data(MSG_process_self()); - xbt_assert0(communicator_size, "Size of Communicator is not defined, " + xbt_assert(communicator_size, "Size of Communicator is not defined, " "can't use collective operations"); process_name = MSG_process_get_name(MSG_process_self()); @@ -343,7 +339,7 @@ static void action_bcast(const char *const *action) bcast_identifier = bprintf("bcast_%d", counters->bcast_counter++); if (!strcmp(process_name, "p0")) { - DEBUG2("%s: %s is the Root", bcast_identifier, process_name); + XBT_DEBUG("%s: %s is the Root", bcast_identifier, process_name); msg_comm_t *comms = xbt_new0(msg_comm_t,communicator_size-1); @@ -358,17 +354,17 @@ static void action_bcast(const char *const *action) MSG_comm_destroy(comms[i-1]); free(comms); - DEBUG2("%s: all messages sent by %s have been received", + 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); - DEBUG2("%s: %s has received", bcast_identifier, process_name); + XBT_DEBUG("%s: %s has received", bcast_identifier, process_name); } - VERB2("%s %f", xbt_str_join_array(action, " "), MSG_get_clock() - clock); + XBT_VERB("%s %f", xbt_str_join_array(action, " "), MSG_get_clock() - clock); free(bcast_identifier); } @@ -382,12 +378,11 @@ static void action_sleep(const char *const *action) if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose)) 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 action_allReduce(const char *const *action) { @@ -402,7 +397,7 @@ static void action_allReduce(const char *const *action) { process_globals_t counters = (process_globals_t) MSG_process_get_data(MSG_process_self()); - xbt_assert0(communicator_size, "Size of Communicator is not defined, " + xbt_assert(communicator_size, "Size of Communicator is not defined, " "can't use collective operations"); process_name = MSG_process_get_name(MSG_process_self()); @@ -410,7 +405,7 @@ static void action_allReduce(const char *const *action) { allreduce_identifier = bprintf("allReduce_%d", counters->allReduce_counter++); if (!strcmp(process_name, "p0")) { - DEBUG2("%s: %s is the Root", allreduce_identifier, process_name); + XBT_DEBUG("%s: %s is the Root", allreduce_identifier, process_name); msg_comm_t *comms = xbt_new0(msg_comm_t,communicator_size-1); m_task_t *tasks = xbt_new0(m_task_t,communicator_size-1); @@ -426,10 +421,10 @@ static void action_allReduce(const char *const *action) { free(tasks); comp_task = MSG_task_create("allReduce_comp", comp_size, 0, NULL); - DEBUG1("%s: computing 'reduce_comp'", allreduce_identifier); + XBT_DEBUG("%s: computing 'reduce_comp'", allreduce_identifier); MSG_task_execute(comp_task); MSG_task_destroy(comp_task); - DEBUG1("%s: computed", allreduce_identifier); + XBT_DEBUG("%s: computed", allreduce_identifier); for (i = 1; i < communicator_size; i++) { sprintf(mailbox, "%s_p0_p%d", allreduce_identifier, i); @@ -442,23 +437,23 @@ static void action_allReduce(const char *const *action) { MSG_comm_destroy(comms[i-1]); free(comms); - DEBUG2("%s: all messages sent by %s have been received", + XBT_DEBUG("%s: all messages sent by %s have been received", allreduce_identifier, process_name); } else { - DEBUG2("%s: %s sends", allreduce_identifier, process_name); + XBT_DEBUG("%s: %s sends", allreduce_identifier, process_name); sprintf(mailbox, "%s_%s_p0", allreduce_identifier, process_name); - DEBUG1("put on %s", mailbox); + 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", allreduce_identifier, process_name); + XBT_DEBUG("%s: %s has received", allreduce_identifier, process_name); } - VERB2("%s %f", xbt_str_join_array(action, " "), MSG_get_clock() - clock); + XBT_VERB("%s %f", xbt_str_join_array(action, " "), MSG_get_clock() - clock); free(allreduce_identifier); } @@ -471,9 +466,8 @@ static void action_comm_size(const char *const *action) if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose)) name = xbt_str_join_array(action, " "); communicator_size = parse_double(size); - 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_compute(const char *const *action) @@ -485,12 +479,11 @@ static void action_compute(const char *const *action) if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose)) name = xbt_str_join_array(action, " "); - DEBUG1("Entering %s", name); + 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) @@ -498,7 +491,7 @@ static void action_init(const char *const *action) #ifdef HAVE_TRACING TRACE_smpi_init(get_rank(MSG_process_get_name(MSG_process_self()))); #endif - DEBUG0("Initialize the counters"); + 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); @@ -526,8 +519,6 @@ int main(int argc, char *argv[]) { MSG_error_t res = MSG_OK; - smx_factory_initializer_to_use = SIMIX_ctx_raw_factory_init; - /* Check the given arguments */ MSG_global_init(&argc, argv); if (argc < 3) { @@ -568,7 +559,7 @@ int main(int argc, char *argv[]) /* 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()); + XBT_INFO("Simulation time %g", MSG_get_clock()); MSG_clean(); if (res == MSG_OK)