X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3c8840eaf6650f0f066493d1c8f97eeb08c6afe9..ba221c8370d9d092fae68858cd4004250030740e:/examples/msg/actions/actions.c diff --git a/examples/msg/actions/actions.c b/examples/msg/actions/actions.c index fc1b72a93c..aec65c79b4 100644 --- a/examples/msg/actions/actions.c +++ b/examples/msg/actions/actions.c @@ -12,18 +12,23 @@ #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; -static void action_Isend(xbt_dynar_t action); +static void action_Isend(char*const* action); typedef struct { int last_Irecv_sender_id; int bcast_counter; int reduce_counter; int allReduce_counter; - xbt_dynar_t isends; + 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 m_task_t */ } s_process_globals_t, *process_globals_t; /* Helper function */ @@ -56,33 +61,22 @@ static void asynchronous_cleanup(void) { } /* My actions */ -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; -} - -static void action_send(xbt_dynar_t action) +static void action_send(char*const* action) { char *name = NULL; char to[250]; - char *size_str = xbt_dynar_get_as(action, 3, 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 */ - 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 *); + 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(action, " "); + 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(xbt_dynar_get_as(action, 2, char *)); + int dst_traced = get_rank(action[2]); TRACE_smpi_ptp_in(rank, rank, dst_traced, "send"); TRACE_smpi_send(rank, rank, dst_traced); #endif @@ -106,46 +100,42 @@ static void action_send(xbt_dynar_t action) asynchronous_cleanup(); } -static void action_Isend(xbt_dynar_t action) +static void action_Isend(char*const* action) { char to[250]; - // char *to = xbt_dynar_get_as(action, 2, char *); - char *size = xbt_dynar_get_as(action, 3, char *); + const char *size = action[3]; double clock = MSG_get_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()), - xbt_dynar_get_as(action, 2, char *)); - + 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); DEBUG1("Isend on %s", MSG_process_get_name(MSG_process_self())); - VERB2("%s %f", xbt_str_join(action, " "), MSG_get_clock() - clock); + VERB2("%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(char*const* action) { char *name = NULL; char mailbox_name[250]; m_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, " "); #ifdef HAVE_TRACING int rank = get_rank(MSG_process_get_name(MSG_process_self())); - int src_traced = get_rank(xbt_dynar_get_as(action, 2, char *)); + int src_traced = get_rank(action[2]); TRACE_smpi_ptp_in(rank, src_traced, rank, "recv"); #endif @@ -165,55 +155,34 @@ static void action_recv(xbt_dynar_t action) asynchronous_cleanup(); } -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())); - - MSG_task_destroy(task); - return 0; -} - - -static void action_Irecv(xbt_dynar_t action) +static void action_Irecv(char*const* action) { - char *name; - m_process_t comm_helper; - char mailbox_name[250]; - char **myargv; + char mailbox[250]; double clock = MSG_get_clock(); + process_globals_t globals = (process_globals_t) MSG_process_get_data(MSG_process_self()); - DEBUG1("Irecv on %s: spawn process ", - MSG_process_get_name(MSG_process_self())); + DEBUG1("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(xbt_dynar_get_as(action, 2, char *)); - process_globals_t counters = (process_globals_t) MSG_process_get_data(MSG_process_self()); - counters->last_Irecv_sender_id = src_traced; - MSG_process_set_data(MSG_process_self(), (void *) counters); + 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_name, "%s_%s", xbt_dynar_get_as(action, 2, char *), + sprintf(mailbox, "%s_%s", action[2], MSG_process_get_name(MSG_process_self())); - name = bprintf("%s_wait", MSG_process_get_name(MSG_process_self())); - myargv = (char **) calloc(2, sizeof(char *)); - - 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); + m_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); + VERB2("%s %f", xbt_str_join_array(action, " "), MSG_get_clock() - clock); - free(name); #ifdef HAVE_TRACING TRACE_smpi_ptp_out(rank, src_traced, rank, "Irecv"); #endif @@ -222,15 +191,19 @@ static void action_Irecv(xbt_dynar_t action) } -static void action_wait(xbt_dynar_t action) +static void action_wait(char*const* action) { char *name = NULL; - char task_name[80]; m_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_assert1(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, " "); #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; @@ -239,10 +212,12 @@ static void action_wait(xbt_dynar_t action) #endif 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); + 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); @@ -254,7 +229,7 @@ static void action_wait(xbt_dynar_t action) } /* FIXME: that's a poor man's implementation: we should take the message exchanges into account */ -static void action_barrier(xbt_dynar_t action) +static void action_barrier(char*const* action) { char *name = NULL; static smx_mutex_t mutex = NULL; @@ -262,7 +237,7 @@ static void action_barrier(xbt_dynar_t action) static int processes_arrived_sofar=0; if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose)) - name = xbt_str_join(action, " "); + name = xbt_str_join_array(action, " "); if (mutex == NULL) { // first arriving on the barrier mutex = SIMIX_req_mutex_init(); @@ -294,13 +269,13 @@ static void action_barrier(xbt_dynar_t action) } -static void action_reduce(xbt_dynar_t action) +static void action_reduce(char*const* action) { int i; char *reduce_identifier; char mailbox[80]; - double comm_size = parse_double(xbt_dynar_get_as(action, 2, char *)); - double comp_size = parse_double(xbt_dynar_get_as(action, 3, char *)); + double comm_size = parse_double(action[2]); + double comp_size = parse_double(action[3]); m_task_t comp_task = NULL; const char *process_name; double clock = MSG_get_clock(); @@ -344,16 +319,16 @@ static void action_reduce(xbt_dynar_t action) mailbox); } - VERB2("%s %f", xbt_str_join(action, " "), MSG_get_clock() - clock); + VERB2("%s %f", xbt_str_join_array(action, " "), MSG_get_clock() - clock); free(reduce_identifier); } -static void action_bcast(xbt_dynar_t action) +static void action_bcast(char*const* action) { int i; char *bcast_identifier; char mailbox[80]; - double comm_size = parse_double(xbt_dynar_get_as(action, 2, char *)); + double comm_size = parse_double(action[2]); m_task_t task = NULL; const char *process_name; double clock = MSG_get_clock(); @@ -393,19 +368,19 @@ static void action_bcast(xbt_dynar_t action) DEBUG2("%s: %s has received", bcast_identifier, process_name); } - VERB2("%s %f", xbt_str_join(action, " "), MSG_get_clock() - clock); + VERB2("%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(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); MSG_process_sleep(parse_double(duration)); @@ -415,12 +390,12 @@ static void action_sleep(xbt_dynar_t action) free(name); } -static void action_allReduce(xbt_dynar_t action) { +static void action_allReduce(char*const* action) { int i; char *allreduce_identifier; char mailbox[80]; - double comm_size = parse_double(xbt_dynar_get_as(action, 2, char *)); - double comp_size = parse_double(xbt_dynar_get_as(action, 3, char *)); + double comm_size = parse_double(action[2]); + double comp_size = parse_double(action[3]); m_task_t task = NULL, comp_task = NULL; const char *process_name; double clock = MSG_get_clock(); @@ -483,33 +458,33 @@ static void action_allReduce(xbt_dynar_t action) { DEBUG2("%s: %s has received", allreduce_identifier, process_name); } - VERB2("%s %f", xbt_str_join(action, " "), MSG_get_clock() - clock); + VERB2("%s %f", xbt_str_join_array(action, " "), MSG_get_clock() - clock); free(allreduce_identifier); } -static void action_comm_size(xbt_dynar_t action) +static void action_comm_size(char*const* action) { char *name = NULL; - char *size = xbt_dynar_get_as(action, 2, char *); + const char *size = 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, " "); communicator_size = parse_double(size); VERB2("%s %f", name, MSG_get_clock() - clock); if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose)) free(name); } -static void action_compute(xbt_dynar_t action) +static void action_compute(char*const* action) { char *name = NULL; - char *amout = xbt_dynar_get_as(action, 2, char *); + const char *amout = action[2]; m_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, " "); + name = xbt_str_join_array(action, " "); DEBUG1("Entering %s", name); MSG_task_execute(task); MSG_task_destroy(task); @@ -518,7 +493,7 @@ static void action_compute(xbt_dynar_t action) free(name); } -static void action_init(xbt_dynar_t action) +static void action_init(char*const* action) { #ifdef HAVE_TRACING TRACE_smpi_init(get_rank(MSG_process_get_name(MSG_process_self()))); @@ -526,11 +501,13 @@ static void action_init(xbt_dynar_t action) DEBUG0("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(m_task_t),NULL); MSG_process_set_data(MSG_process_self(),globals); } -static void action_finalize(xbt_dynar_t action) +static void action_finalize(char*const* action) { #ifdef HAVE_TRACING TRACE_smpi_finalize(get_rank(MSG_process_get_name(MSG_process_self()))); @@ -538,6 +515,8 @@ static void action_finalize(xbt_dynar_t 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); } } @@ -547,6 +526,8 @@ 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) {