#include "simix/smx_private.h"
-XBT_LOG_NEW_CATEGORY(smpi, "All SMPI categories");
-
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_kernel, smpi,
"Logging specific to SMPI (kernel)");
xbt_os_timer_t timer;
double simulated;
MPI_Comm comm_self;
+ void *data; /* user data */
} s_smpi_process_data_t;
static smpi_process_data_t *process_data = NULL;
(*argc)--;
data->argc = argc;
data->argv = argv;
- SIMIX_rdv_set_receiver(data->mailbox_small, proc);// set the process attached to the mailbox
+ simcall_rdv_set_receiver(data->mailbox_small, proc);// set the process attached to the mailbox
XBT_DEBUG("<%d> New process in the game: %p", index, proc);
}
}
char* value = getenv("SMPI_GLOBAL_SIZE");
if(!value) {
- fprintf(stderr, "Please set env var SMPI_GLOBAL_SIZE to expected number of processes.\n");
- abort();
+ fprintf(stderr, "Please set env var SMPI_GLOBAL_SIZE to expected number of processes.\n");
+ xbt_abort();
}
return atoi(value);
}
return process_data[index];
}
+void smpi_process_set_user_data(void *data)
+{
+ smpi_process_data_t process_data = smpi_process_data();
+ process_data->data = data;
+}
+
+void* smpi_process_get_user_data(){
+ smpi_process_data_t process_data = smpi_process_data();
+ return process_data->data;
+}
+
int smpi_process_count(void)
{
return process_count;
request->src, request->dst, request->tag, request->flags);
}
+void SMPI_comm_copy_buffer_callback(smx_action_t comm, void* buff, size_t buff_size)
+{
+ XBT_DEBUG("Copy the data over");
+ memcpy(comm->comm.dst_buff, buff, buff_size);
+ if (comm->comm.detached) { // if this is a detached send, the source buffer was duplicated by SMPI sender to make the original buffer available to the application ASAP
+ xbt_free(buff);
+ xbt_free(comm->comm.src_data);// inside SMPI the request is keep
+ //inside the user data and should be free
+ comm->comm.src_buff = NULL;
+ }
+}
+
void smpi_global_init(void)
{
int i;
MPI_Group group;
char name[MAILBOX_NAME_MAXLEN];
- SIMIX_comm_set_copy_data_callback(&smpi_comm_copy_data_callback);
+ SIMIX_comm_set_copy_data_callback(&SMPI_comm_copy_buffer_callback);
process_count = SIMIX_process_count();
process_data = xbt_new(smpi_process_data_t, process_count);
for (i = 0; i < process_count; i++) {
}
/* Connect log categories. See xbt/log.c */
- XBT_LOG_CONNECT(smpi);
+ XBT_LOG_CONNECT(smpi); /* Keep this line as soon as possible in this function: xbt_log_appender_file.c depends on it
+ DO NOT connect this in XBT or so, or it will be useless to xbt_log_appender_file.c */
XBT_LOG_CONNECT(smpi_base);
XBT_LOG_CONNECT(smpi_bench);
XBT_LOG_CONNECT(smpi_coll);
TRACE_end();
#endif
- SIMIX_clean();
return 0;
}