#include <stdio.h>
#include <stdlib.h>
#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"
-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;
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");
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);
- msg_comm_t comm = MSG_task_isend_with_matching(task, to, /*matching madness*/NULL,task);
+ 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()));
asynchronous_cleanup();
}
-static int task_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)
{
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_matching,NULL);
- if (act!=NULL){
- /* FIXME account for the memcopy time if needed */
- SIMIX_comm_finish(act);
- return;
- }
-
#ifdef HAVE_TRACING
int rank = get_rank(MSG_process_get_name(MSG_process_self()));
int src_traced = get_rank(action[2]);
#endif
XBT_DEBUG("Receiving: %s", name);
- MSG_task_receive(&task, mailbox_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);
- MSG_task_destroy(task);
- 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);
MSG_task_destroy(task);
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, src_traced, rank, "wait");
TRACE_smpi_recv(rank, src_traced, rank);
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;
}
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);
}
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);
}
MSG_process_sleep(parse_double(duration));
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) {
name = xbt_str_join_array(action, " ");
communicator_size = parse_double(size);
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_compute(const char *const *action)
MSG_task_execute(task);
MSG_task_destroy(task);
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_init(const char *const *action)
{
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) {