#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"
+#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,
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];
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);
+ 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_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);
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)
{
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]);
#endif
XBT_DEBUG("Receiving: %s", name);
- MSG_task_receive(&task, mailbox_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()));
XBT_VERB("%s %f", name, MSG_get_clock() - clock);
MSG_task_destroy(task);
