X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ec16845133f5f1b5262d2d77d8ba22824fa8a446..3048f34c0542db89e3f6ebc66ad9fce8999879c1:/examples/msg/actions/actions.c diff --git a/examples/msg/actions/actions.c b/examples/msg/actions/actions.c index f764cb64e7..ca75da4b3e 100644 --- a/examples/msg/actions/actions.c +++ b/examples/msg/actions/actions.c @@ -7,16 +7,10 @@ #include #include #include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */ -#include "msg/mailbox.h" /* we play funny tricks with mailboxes and rdv points */ #include "simix/simix.h" /* semaphores for the barrier */ #include "xbt.h" /* calloc, printf */ #include "instr/instr_private.h" -#include "msg/private.h" /* You don't want to know why, trust us */ -#include "simix/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; @@ -103,11 +97,6 @@ static void action_send(const char *const *action) asynchronous_cleanup(); } -static int task_recv_matching(void*ignored,void*recv_task) { - XBT_DEBUG("Trying to recv_match with %p", recv_task); - return recv_task != NULL; -} - static void action_Isend(const char *const *action) { char to[250]; @@ -117,42 +106,16 @@ static void action_Isend(const char *const *action) sprintf(to, "%s_%s", MSG_process_get_name(MSG_process_self()),action[2]); - m_task_t task = MSG_task_create(to,0,parse_double(size),NULL); - - smx_rdv_t rdv = MSG_mailbox_get_by_alias(to); + msg_comm_t comm = + MSG_task_isend( MSG_task_create(to,0,parse_double(size),NULL), to); + xbt_dynar_push(globals->isends,&comm); - if(SIMIX_comm_has_recv_match(rdv, task_recv_matching, NULL)) { - XBT_DEBUG("Switching back to MSG_task_send: %s", to); - MSG_task_send(task, to); - } else { - - msg_comm_t comm = MSG_task_isend_with_matching(task, to, /*matching madness*/NULL,task); - xbt_dynar_push(globals->isends,&comm); - - if (task->simdata->message_size < 65536) { - /* Close your eyes, it burns ! */ - comm->s_comm->comm.dst_proc = SIMIX_process_get_by_name(action[2]); - comm->s_comm->comm.dst_buff = NULL; - comm->s_comm->comm.dst_buff_size = NULL; - comm->s_comm->comm.dst_data = NULL; - comm->s_comm->state = SIMIX_READY; - comm->s_comm->comm.refcount++; - SIMIX_comm_start(comm->s_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); - } + 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 int task_sent_matching(void*ignored,void*sent_task) { - m_task_t t = (m_task_t)sent_task; - if (t!=NULL && MSG_task_get_data_size(t)<65536) - return 1; /* that's supposed to be already arrived */ - return 0; /* rendez-vous mode: it's not there yet */ -} static void action_recv(const char *const *action) { @@ -167,30 +130,6 @@ static void action_recv(const char *const *action) if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose)) name = xbt_str_join_array(action, " "); - /* The next chunk is to deal with the fact that for short messages, - * if the send occurs before the receive, the message is already sent and - * buffered on receiver side when the recv() occurs. - * - * So the next chunk detects this fact and cancel the simix communication instead. - */ - - /* make sure the rdv is created on need by asking to MSG instead of simix directly */ - smx_rdv_t rdv = MSG_mailbox_get_by_alias(mailbox_name); - smx_action_t act = SIMIX_comm_get_send_match(rdv, task_sent_matching, NULL); - if (act!=NULL){ - /* FIXME account for the memcopy time if needed */ - task = act->comm.src_data; - - if (task->simdata->message_size < 65536) { - act->comm.refcount--; /* See action_send for more pain */ - if(act->state == SIMIX_DONE) - SIMIX_comm_finish(act); - else - SIMIX_req_comm_wait(act, -1.0); - return; - } - } - #ifdef HAVE_TRACING int rank = get_rank(MSG_process_get_name(MSG_process_self())); int src_traced = get_rank(action[2]); @@ -198,12 +137,13 @@ static void action_recv(const char *const *action) #endif XBT_DEBUG("Receiving: %s", name); - /* Mimic a call to MSG_task_receive(&task, mailbox_name); */ - SIMIX_req_comm_recv(rdv, &task, NULL, NULL, &task, -1.0); - + 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); - MSG_task_destroy(task); + + if (res == MSG_OK) { + MSG_task_destroy(task); + } if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose)) free(name); @@ -259,7 +199,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)) @@ -342,7 +282,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()); @@ -395,7 +335,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()); @@ -462,7 +402,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()); @@ -586,8 +526,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) {