#include "private.h"
#include "xbt/log.h"
+#include "xbt/dict.h"
+
+/* Pimple to get an histogram of message sizes in the simulation */
+xbt_dict_t msg_sizes = NULL;
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_network, simix,
"Logging specific to SIMIX (network)");
* \param type The type of communication we are looking for (comm_send, comm_recv)
* \return The communication request if found, NULL otherwise.
*/
-smx_comm_t SIMIX_rdv_get_request(smx_rdv_t rdv, smx_comm_type_t type)
-{
+smx_comm_t SIMIX_rdv_get_request(smx_rdv_t rdv, smx_comm_type_t type) {
smx_comm_t comm = (smx_comm_t)xbt_fifo_get_item_content(
xbt_fifo_get_first_item(rdv->comm_fifo));
return comm;
}
- /* no relevant request found. Return NULL */
DEBUG0("Communication request not found");
return NULL;
}
comm->act = SIMIX_action_communicate(comm->src_proc->smx_host,
comm->dst_proc->smx_host, NULL,
comm->task_size, comm->rate);
+#ifdef HAVE_TRACING
+ TRACE_smx_action_communicate (comm->act, comm->src_proc);
+#endif
/* If any of the process is suspend, create the action but stop its execution,
it will be restarted when the sender process resume */
if(SIMIX_process_is_suspended(comm->src_proc) ||
SIMIX_process_is_suspended(comm->dst_proc)) {
- SIMIX_action_set_priority(comm->act, 0);
+ SIMIX_action_suspend(comm->act);
}
/* Add the communication as user data of the action */
SIMIX_communication_destroy(comm);
THROW0(network_error, 0, "Link failure");
}
+ SIMIX_communication_destroy(comm);
}
/**
return SIMIX_action_get_remains(comm->act);
}
+/******************************************************************************/
+/* SIMIX_network_copy_data callbacks */
+/******************************************************************************/
+static void (*SIMIX_network_copy_data_callback)(smx_comm_t, size_t) = &SIMIX_network_copy_pointer_callback;
+
+void SIMIX_network_set_copy_data_callback(void (*callback)(smx_comm_t, size_t)) {
+ SIMIX_network_copy_data_callback = callback;
+}
+
+void SIMIX_network_copy_pointer_callback(smx_comm_t comm, size_t buff_size) {
+ xbt_assert1((buff_size == sizeof(void*)), "Cannot copy %zu bytes: must be sizeof(void*)",buff_size);
+ *(void**)(comm->dst_buff) = comm->src_buff;
+}
+
+void SIMIX_network_copy_buffer_callback(smx_comm_t comm, size_t buff_size) {
+ memcpy(comm->dst_buff, comm->src_buff, buff_size);
+}
+
/**
* \brief Copy the communication data from the sender's buffer to the receiver's one
* \param comm The communication
if(buff_size == 0)
return;
-
-#ifdef HAVE_RUBY /* FIXME: KILLME */
- INFO6("Copying comm %p data from %s (%p) -> %s (%p) (%zu bytes)",
- comm,
- comm->src_proc->smx_host->name, comm->src_buff,
- comm->dst_proc->smx_host->name, comm->dst_buff,
- buff_size);
-#else
DEBUG6("Copying comm %p data from %s (%p) -> %s (%p) (%zu bytes)",
comm,
comm->src_proc->smx_host->name, comm->src_buff,
comm->dst_proc->smx_host->name, comm->dst_buff,
buff_size);
-#endif
+ (*SIMIX_network_copy_data_callback)(comm, buff_size);
- memcpy(comm->dst_buff, comm->src_buff, buff_size);
+ /* pimple to display the message sizes */
+ {
+ if (msg_sizes == NULL)
+ msg_sizes = xbt_dict_new();
+ uintptr_t casted_size = comm->task_size;
+ uintptr_t amount = xbt_dicti_get(msg_sizes, casted_size);
+ amount++;
+
+ xbt_dicti_set(msg_sizes,casted_size, amount);
+ }
+}
+#include "xbt.h"
+/* pimple to display the message sizes */
+void SIMIX_message_sizes_output(const char *filename) {
+ FILE * out = fopen(filename,"w");
+ xbt_assert1(out,"Cannot open file %s",filename);
+ uintptr_t key,data;
+ xbt_dict_cursor_t cursor;
+ xbt_dict_foreach(msg_sizes,cursor,key,data) {
+ fprintf(out,"%zu %zu\n",key,data);
+ }
+ fclose(out);
}
/**
XBT_INLINE void SIMIX_network_wait(smx_comm_t comm, double timeout) {
/* Wait for communication completion */
SIMIX_communication_wait_for_completion(comm, timeout);
-
- SIMIX_communication_destroy(comm);
}
/** @Returns whether the (asynchronous) communication is done yet or not */
SIMIX_communication_destroy(comm_finished);
THROW0(network_error, 0, "Link failure");
}
+ SIMIX_communication_destroy(comm_finished);
return found_comm;
}