#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 "simgrid_config.h" /* getline */
#include "instr/instr_private.h"
-void SIMIX_ctx_raw_factory_init(smx_context_factory_t *factory);
+#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;
-static void action_Isend(xbt_dynar_t action);
+static void action_Isend(const char *const *action);
typedef struct {
int last_Irecv_sender_id;
}
/* My actions */
-static void action_send(xbt_dynar_t action)
+static void action_send(const 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
- 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);
asynchronous_cleanup();
}
-static void action_Isend(xbt_dynar_t action)
+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];
- // 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]);
+ m_task_t task = MSG_task_create(to,0,parse_double(size),NULL);
+
+ smx_rdv_t rdv = MSG_mailbox_get_by_alias(to);
+
+ 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);
+ return;
+ }
- msg_comm_t comm =
- MSG_task_isend( MSG_task_create(to,0,parse_double(size),NULL), to);
+ msg_comm_t comm = MSG_task_isend_with_matching(task, to, /*matching madness*/NULL,task);
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);
+ 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);
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(xbt_dynar_t action)
+static void action_recv(const char *const *action)
{
char *name = NULL;
char mailbox_name[250];
m_task_t task = NULL;
double clock = MSG_get_clock();
- 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, " ");
+
+ /* 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(xbt_dynar_get_as(action, 2, char *));
+ int src_traced = get_rank(action[2]);
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);
+ /* Mimic a call to MSG_task_receive(&task, mailbox_name); */
+ SIMIX_req_comm_recv(rdv, &task, NULL, NULL, &task, -1.0);
+
// MSG_task_receive(&task, MSG_process_get_name(MSG_process_self()));
- VERB2("%s %f", name, MSG_get_clock() - clock);
+ XBT_VERB("%s %f", name, MSG_get_clock() - clock);
MSG_task_destroy(task);
if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))
asynchronous_cleanup();
}
-static void action_Irecv(xbt_dynar_t action)
+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());
- 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(xbt_dynar_get_as(action, 2, char *));
+ 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", xbt_dynar_get_as(action, 2, char *),
+ sprintf(mailbox, "%s_%s", action[2],
MSG_process_get_name(MSG_process_self()));
m_task_t t=NULL;
xbt_dynar_push(globals->tasks,&t);
mailbox);
xbt_dynar_push(globals->irecvs,&c);
- VERB2("%s %f", xbt_str_join(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");
}
-static void action_wait(xbt_dynar_t action)
+static void action_wait(const char *const *action)
{
char *name = NULL;
m_task_t task = NULL;
process_globals_t globals = (process_globals_t) MSG_process_get_data(MSG_process_self());
xbt_assert1(xbt_dynar_length(globals->irecvs),
- "action wait not preceeded by any irecv: %s", xbt_str_join(action," "));
+ "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;
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);
+ XBT_VERB("%s %f", name, MSG_get_clock() - clock);
if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))
free(name);
#ifdef HAVE_TRACING
}
/* 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(const char *const *action)
{
char *name = NULL;
static smx_mutex_t mutex = NULL;
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();
cond = SIMIX_req_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);
if (++processes_arrived_sofar == communicator_size) {
SIMIX_req_mutex_unlock(mutex);
}
- DEBUG1("Exiting barrier: %s", name);
+ XBT_DEBUG("Exiting barrier: %s", name);
processes_arrived_sofar--;
if (!processes_arrived_sofar) {
}
-static void action_reduce(xbt_dynar_t action)
+static void action_reduce(const 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();
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);
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(action, " "), MSG_get_clock() - clock);
+ XBT_VERB("%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(const 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();
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);
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(action, " "), MSG_get_clock() - clock);
+ XBT_VERB("%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(const 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);
+ 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);
}
-static void action_allReduce(xbt_dynar_t action) {
+static void action_allReduce(const 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();
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);
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);
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(action, " "), MSG_get_clock() - clock);
+ XBT_VERB("%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(const 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);
+ XBT_VERB("%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(const 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, " ");
- DEBUG1("Entering %s", name);
+ name = xbt_str_join_array(action, " ");
+ XBT_DEBUG("Entering %s", name);
MSG_task_execute(task);
MSG_task_destroy(task);
- 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);
}
-static void action_init(xbt_dynar_t action)
+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);
}
-static void action_finalize(xbt_dynar_t action)
+static void action_finalize(const char *const *action)
{
#ifdef HAVE_TRACING
TRACE_smpi_finalize(get_rank(MSG_process_get_name(MSG_process_self())));
{
MSG_error_t res = MSG_OK;
- factory_initializer_to_use = SIMIX_ctx_raw_factory_init;
+ smx_factory_initializer_to_use = SIMIX_ctx_raw_factory_init;
+
/* Check the given arguments */
MSG_global_init(&argc, argv);
if (argc < 3) {
/* 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)
