#include <stdio.h>
#include <stdlib.h>
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_kernel, smpi,
- "Logging specific to SMPI (kernel)");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_kernel, smpi, "Logging specific to SMPI (kernel)");
typedef struct s_smpi_process_data {
double simulated;
int *argc;
char ***argv;
- smx_rdv_t mailbox;
- smx_rdv_t mailbox_small;
+ smx_mailbox_t mailbox;
+ smx_mailbox_t mailbox_small;
xbt_mutex_t mailboxes_mutex;
xbt_os_timer_t timer;
MPI_Comm comm_self;
char* instance_id;
int replaying; /* is the process replaying a trace */
xbt_bar_t finalization_barrier;
+ int return_value;
} s_smpi_process_data_t;
static smpi_process_data_t *process_data = NULL;
static char *get_mailbox_name(char *str, int index)
{
- snprintf(str, MAILBOX_NAME_MAXLEN, "SMPI-%0*x", (int) (sizeof(int) * 2),
- index);
+ snprintf(str, MAILBOX_NAME_MAXLEN, "SMPI-%0*x", (int) (sizeof(int) * 2), index);
return str;
}
static char *get_mailbox_name_small(char *str, int index)
{
- snprintf(str, MAILBOX_NAME_MAXLEN, "small%0*x", (int) (sizeof(int) * 2),
- index);
+ snprintf(str, MAILBOX_NAME_MAXLEN, "small%0*x", (int) (sizeof(int) * 2), index);
return str;
}
MPI_Comm* temp_comm_world;
xbt_bar_t temp_bar;
- smpi_deployment_register_process(instance_id, rank, index, &temp_comm_world ,&temp_bar);
- data = smpi_process_remote_data(index);
- data->comm_world = temp_comm_world;
+ smpi_deployment_register_process(instance_id, rank, index, &temp_comm_world, &temp_bar);
+ data = smpi_process_remote_data(index);
+ data->comm_world = temp_comm_world;
if(temp_bar != NULL) data->finalization_barrier = temp_bar;
- data->index = index;
+ data->index = index;
data->instance_id = instance_id;
- data->replaying = 0;
+ data->replaying = 0;
//xbt_free(simcall_process_get_data(proc));
- simdata_process_t simdata = static_cast<simdata_process_t>(simcall_process_get_data(proc));
- simdata->data = data;
+ simdata_process_t simdata = static_cast<simdata_process_t>(simcall_process_get_data(proc));
+ simdata->data = data;
if (*argc > 3) {
free((*argv)[1]);
data->argc = argc;
data->argv = argv;
// set the process attached to the mailbox
- simcall_rdv_set_receiver(data->mailbox_small, proc);
+ simcall_mbox_set_receiver(data->mailbox_small, proc);
XBT_DEBUG("<%d> New process in the game: %p", index, proc);
-
}
xbt_assert(smpi_process_data(),
- "smpi_process_data() returned NULL. You probably gave a NULL parameter to MPI_Init. Although it's required by MPI-2, this is currently not supported by SMPI.");
+ "smpi_process_data() returned NULL. You probably gave a NULL parameter to MPI_Init. Although it's required by "
+ "MPI-2, this is currently not supported by SMPI.");
}
void smpi_process_destroy(void)
XBT_DEBUG("<%d> Process left the game", index);
}
-/**
- * @brief Prepares the current process for termination.
- */
+/** @brief Prepares the current process for termination. */
void smpi_process_finalize(void)
{
- // This leads to an explosion of the search graph
- // which cannot be reduced:
+ // This leads to an explosion of the search graph which cannot be reduced:
if(MC_is_active() || MC_record_replay_is_active())
return;
xbt_barrier_wait(process_data[index_to_process_data[index]]->finalization_barrier);
}
-/**
- * @brief Check if a process is finalized
- */
+/** @brief Check if a process is finalized */
int smpi_process_finalized()
{
int index = smpi_process_index();
return 0;
}
-/**
- * @brief Check if a process is initialized
- */
+/** @brief Check if a process is initialized */
int smpi_process_initialized(void)
{
if (!index_to_process_data){
return false;
- }
- else{
+ } else{
int index = smpi_process_index();
- return ( (index != MPI_UNDEFINED)
- && (process_data[index_to_process_data[index]]->state == SMPI_INITIALIZED));
+ return ((index != MPI_UNDEFINED) && (process_data[index_to_process_data[index]]->state == SMPI_INITIALIZED));
}
}
-/**
- * @brief Mark a process as initialized (=MPI_Init called)
- */
+/** @brief Mark a process as initialized (=MPI_Init called) */
void smpi_process_mark_as_initialized(void)
{
int index = smpi_process_index();
else return _xbt_replay_is_active();
}
-
int smpi_global_size(void)
{
char *value = getenv("SMPI_GLOBAL_SIZE");
smpi_process_data_t smpi_process_data(void)
{
- simdata_process_t simdata = static_cast<simdata_process_t>(SIMIX_process_self_get_data(SIMIX_process_self()));
+ simdata_process_t simdata = static_cast<simdata_process_t>(SIMIX_process_self_get_data());
return static_cast<smpi_process_data_t>(simdata->data);
}
return data ? *data->comm_world : MPI_COMM_NULL;
}
-smx_rdv_t smpi_process_mailbox(void)
+smx_mailbox_t smpi_process_mailbox(void)
{
smpi_process_data_t data = smpi_process_data();
return data->mailbox;
}
-smx_rdv_t smpi_process_mailbox_small(void)
+smx_mailbox_t smpi_process_mailbox_small(void)
{
smpi_process_data_t data = smpi_process_data();
return data->mailbox_small;
return data->mailboxes_mutex;
}
-smx_rdv_t smpi_process_remote_mailbox(int index)
+smx_mailbox_t smpi_process_remote_mailbox(int index)
{
smpi_process_data_t data = smpi_process_remote_data(index);
return data->mailbox;
}
-
-smx_rdv_t smpi_process_remote_mailbox_small(int index)
+smx_mailbox_t smpi_process_remote_mailbox_small(int index)
{
smpi_process_data_t data = smpi_process_remote_data(index);
return data->mailbox_small;
return data->sampling;
}
-
void print_request(const char *message, MPI_Request request)
{
- XBT_VERB
- ("%s request %p [buf = %p, size = %zu, src = %d, dst = %d, tag = %d, flags = %x]",
- message, request, request->buf, request->size, request->src,
- request->dst, request->tag, request->flags);
+ XBT_VERB("%s request %p [buf = %p, size = %zu, src = %d, dst = %d, tag = %d, flags = %x]",
+ message, request, request->buf, request->size, request->src, request->dst, request->tag, request->flags);
}
-void smpi_comm_copy_buffer_callback(smx_synchro_t comm,
- void *buff, size_t buff_size)
+void smpi_comm_copy_buffer_callback(smx_synchro_t comm, void *buff, size_t buff_size)
{
XBT_DEBUG("Copy the data over");
void* tmpbuff=buff;
- if((smpi_privatize_global_variables)
- && ((char*)buff >= smpi_start_data_exe)
+ if((smpi_privatize_global_variables) && ((char*)buff >= smpi_start_data_exe)
&& ((char*)buff < smpi_start_data_exe + smpi_size_data_exe )
){
XBT_DEBUG("Privatization : We are copying from a zone inside global memory... Saving data to temp buffer !");
memcpy(tmpbuff, buff, buff_size);
}
-
- if((smpi_privatize_global_variables)
- && ((char*)comm->comm.dst_buff >= smpi_start_data_exe)
- && ((char*)comm->comm.dst_buff < smpi_start_data_exe + smpi_size_data_exe )
- ){
+ if((smpi_privatize_global_variables) && ((char*)comm->comm.dst_buff >= smpi_start_data_exe)
+ && ((char*)comm->comm.dst_buff < smpi_start_data_exe + smpi_size_data_exe )){
XBT_DEBUG("Privatization : We are copying to a zone inside global memory - Switch data segment");
smpi_switch_data_segment(((smpi_process_data_t)(((simdata_process_t)SIMIX_process_get_data(comm->comm.dst_proc))->data))->index);
}
-
memcpy(comm->comm.dst_buff, tmpbuff, 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);
- //It seems that the request is used after the call there this should
- //be free somewhereelse but where???
- //xbt_free(comm->comm.src_data);// inside SMPI the request is keep
- //inside the user data and should be free
+ //It seems that the request is used after the call there this should be free somewhere else but where???
+ //xbt_free(comm->comm.src_data);// inside SMPI the request is kept inside the user data and should be free
comm->comm.src_buff = NULL;
}
if(tmpbuff!=buff)xbt_free(tmpbuff);
-
}
-
-void smpi_comm_null_copy_buffer_callback(smx_synchro_t comm,
- void *buff, size_t buff_size)
+void smpi_comm_null_copy_buffer_callback(smx_synchro_t comm, void *buff, size_t buff_size)
{
return;
}
static void smpi_check_options(){
//check correctness of MPI parameters
- xbt_assert(sg_cfg_get_int("smpi/async_small_thresh") <=
- sg_cfg_get_int("smpi/send_is_detached_thresh"));
+ xbt_assert(xbt_cfg_get_int("smpi/async-small-thresh") <= xbt_cfg_get_int("smpi/send-is-detached-thresh"));
- if (sg_cfg_is_default_value("smpi/running_power")) {
+ if (xbt_cfg_is_default_value("smpi/running-power")) {
XBT_INFO("You did not set the power of the host running the simulation. "
"The timings will certainly not be accurate. "
- "Use the option \"--cfg=smpi/running_power:<flops>\" to set its value."
+ "Use the option \"--cfg=smpi/running-power:<flops>\" to set its value."
"Check http://simgrid.org/simgrid/latest/doc/options.html#options_smpi_bench for more information.");
}
}
smpi_universe_size = process_count;
process_data = xbt_new0(smpi_process_data_t, process_count);
for (i = 0; i < process_count; i++) {
- process_data[i] = xbt_new(s_smpi_process_data_t, 1);
- //process_data[i]->index = i;
- process_data[i]->argc = NULL;
- process_data[i]->argv = NULL;
- process_data[i]->mailbox = simcall_rdv_create(get_mailbox_name(name, i));
- process_data[i]->mailbox_small =
- simcall_rdv_create(get_mailbox_name_small(name, i));
- process_data[i]->mailboxes_mutex = xbt_mutex_init();
- process_data[i]->timer = xbt_os_timer_new();
+ process_data[i] = xbt_new(s_smpi_process_data_t, 1);
+ //process_data[i]->index = i;
+ process_data[i]->argc = NULL;
+ process_data[i]->argv = NULL;
+ process_data[i]->mailbox = simcall_mbox_create(get_mailbox_name(name, i));
+ process_data[i]->mailbox_small = simcall_mbox_create(get_mailbox_name_small(name, i));
+ process_data[i]->mailboxes_mutex = xbt_mutex_init();
+ process_data[i]->timer = xbt_os_timer_new();
if (MC_is_active())
MC_ignore_heap(process_data[i]->timer, xbt_os_timer_size());
process_data[i]->comm_self = MPI_COMM_NULL;
process_data[i]->state = SMPI_UNINITIALIZED;
process_data[i]->sampling = 0;
process_data[i]->finalization_barrier = NULL;
+ process_data[i]->return_value = 0;
}
- //if the process was launched through smpirun script
- //we generate a global mpi_comm_world
- //if not, we let MPI_COMM_NULL, and the comm world
- //will be private to each mpi instance
+ //if the process was launched through smpirun script we generate a global mpi_comm_world
+ //if not, we let MPI_COMM_NULL, and the comm world will be private to each mpi instance
if(smpirun){
group = smpi_group_new(process_count);
MPI_COMM_WORLD = smpi_comm_new(group, NULL);
smpi_bench_destroy();
if (MPI_COMM_WORLD != MPI_COMM_UNINITIALIZED){
while (smpi_group_unuse(smpi_comm_group(MPI_COMM_WORLD)) > 0);
- xbt_free(MPI_COMM_WORLD);
xbt_barrier_destroy(process_data[0]->finalization_barrier);
}else{
smpi_deployment_cleanup_instances();
}
- MPI_COMM_WORLD = MPI_COMM_NULL;
for (i = 0; i < count; i++) {
if(process_data[i]->comm_self!=MPI_COMM_NULL){
- smpi_group_unuse(smpi_comm_group(process_data[i]->comm_self));
smpi_comm_destroy(process_data[i]->comm_self);
}
if(process_data[i]->comm_intra!=MPI_COMM_NULL){
- smpi_group_unuse(smpi_comm_group(process_data[i]->comm_intra));
smpi_comm_destroy(process_data[i]->comm_intra);
}
xbt_os_timer_free(process_data[i]->timer);
- simcall_rdv_destroy(process_data[i]->mailbox);
- simcall_rdv_destroy(process_data[i]->mailbox_small);
xbt_mutex_destroy(process_data[i]->mailboxes_mutex);
xbt_free(process_data[i]);
}
xbt_free(process_data);
process_data = NULL;
+ if (MPI_COMM_WORLD != MPI_COMM_UNINITIALIZED){
+ smpi_comm_cleanup_smp(MPI_COMM_WORLD);
+ smpi_comm_cleanup_attributes(MPI_COMM_WORLD);
+ xbt_free(MPI_COMM_WORLD);
+ }
+
+ MPI_COMM_WORLD = MPI_COMM_NULL;
+
+ if (!MC_is_active()) {
+ xbt_os_timer_free(global_timer);
+ }
+
xbt_free(index_to_process_data);
if(smpi_privatize_global_variables)
smpi_destroy_global_memory_segments();
}
#ifndef WIN32
+
void __attribute__ ((weak)) user_main_()
{
xbt_die("Should not be in this smpi_simulated_main");
return 0;
}
+inline static int smpi_main_wrapper(int argc, char **argv){
+ int ret = smpi_simulated_main_(argc,argv);
+ if(ret !=0){
+ XBT_WARN("SMPI process did not return 0. Return value : %d", ret);
+ smpi_process_data()->return_value=ret;
+ }
+ return 0;
+}
+
int __attribute__ ((weak)) main(int argc, char **argv)
{
- return smpi_main(smpi_simulated_main_, argc, argv);
+ return smpi_main(smpi_main_wrapper, argc, argv);
}
#endif
/* Connect log categories. See xbt/log.c */
- 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); /* 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(instr_smpi);
XBT_LOG_CONNECT(smpi_base);
XBT_LOG_CONNECT(smpi_bench);
}
static void smpi_init_options(){
- int gather_id = find_coll_description(mpi_coll_gather_description,
- sg_cfg_get_string("smpi/gather"),"gather");
- mpi_coll_gather_fun = (int (*)(void *, int, MPI_Datatype,
- void *, int, MPI_Datatype, int, MPI_Comm))
+ int gather_id = find_coll_description(mpi_coll_gather_description, xbt_cfg_get_string("smpi/gather"),"gather");
+ mpi_coll_gather_fun = (int (*)(void *, int, MPI_Datatype, void *, int, MPI_Datatype, int, MPI_Comm))
mpi_coll_gather_description[gather_id].coll;
int allgather_id = find_coll_description(mpi_coll_allgather_description,
- sg_cfg_get_string("smpi/allgather"),"allgather");
- mpi_coll_allgather_fun = (int (*)(void *, int, MPI_Datatype,
- void *, int, MPI_Datatype, MPI_Comm))
+ xbt_cfg_get_string("smpi/allgather"),"allgather");
+ mpi_coll_allgather_fun = (int (*)(void *, int, MPI_Datatype, void *, int, MPI_Datatype, MPI_Comm))
mpi_coll_allgather_description[allgather_id].coll;
int allgatherv_id = find_coll_description(mpi_coll_allgatherv_description,
- sg_cfg_get_string("smpi/allgatherv"),"allgatherv");
- mpi_coll_allgatherv_fun = (int (*)(void *, int, MPI_Datatype, void *, int *,
- int *, MPI_Datatype, MPI_Comm))
+ xbt_cfg_get_string("smpi/allgatherv"),"allgatherv");
+ mpi_coll_allgatherv_fun = (int (*)(void *, int, MPI_Datatype, void *, int *, int *, MPI_Datatype, MPI_Comm))
mpi_coll_allgatherv_description[allgatherv_id].coll;
int allreduce_id = find_coll_description(mpi_coll_allreduce_description,
- sg_cfg_get_string("smpi/allreduce"),"allreduce");
- mpi_coll_allreduce_fun = (int (*)(void *sbuf, void *rbuf, int rcount,
- MPI_Datatype dtype, MPI_Op op,
- MPI_Comm comm))
+ xbt_cfg_get_string("smpi/allreduce"),"allreduce");
+ mpi_coll_allreduce_fun = (int (*)(void *sbuf, void *rbuf, int rcount, MPI_Datatype dtype, MPI_Op op, MPI_Comm comm))
mpi_coll_allreduce_description[allreduce_id].coll;
int alltoall_id = find_coll_description(mpi_coll_alltoall_description,
- sg_cfg_get_string("smpi/alltoall"),"alltoall");
- mpi_coll_alltoall_fun = (int (*)(void *, int, MPI_Datatype,
- void *, int, MPI_Datatype, MPI_Comm))
+ xbt_cfg_get_string("smpi/alltoall"),"alltoall");
+ mpi_coll_alltoall_fun = (int (*)(void *, int, MPI_Datatype, void *, int, MPI_Datatype, MPI_Comm))
mpi_coll_alltoall_description[alltoall_id].coll;
int alltoallv_id = find_coll_description(mpi_coll_alltoallv_description,
- sg_cfg_get_string("smpi/alltoallv"),"alltoallv");
- mpi_coll_alltoallv_fun = (int (*)(void *, int *, int *, MPI_Datatype,
- void *, int *, int *, MPI_Datatype,
- MPI_Comm))
+ xbt_cfg_get_string("smpi/alltoallv"),"alltoallv");
+ mpi_coll_alltoallv_fun = (int (*)(void *, int *, int *, MPI_Datatype, void *, int *, int *, MPI_Datatype, MPI_Comm))
mpi_coll_alltoallv_description[alltoallv_id].coll;
- int bcast_id = find_coll_description(mpi_coll_bcast_description,
- sg_cfg_get_string("smpi/bcast"),"bcast");
- mpi_coll_bcast_fun = (int (*)(void *buf, int count, MPI_Datatype datatype,
- int root, MPI_Comm com))
+ int bcast_id = find_coll_description(mpi_coll_bcast_description, xbt_cfg_get_string("smpi/bcast"),"bcast");
+ mpi_coll_bcast_fun = (int (*)(void *buf, int count, MPI_Datatype datatype, int root, MPI_Comm com))
mpi_coll_bcast_description[bcast_id].coll;
- int reduce_id = find_coll_description(mpi_coll_reduce_description,
- sg_cfg_get_string("smpi/reduce"),"reduce");
- mpi_coll_reduce_fun = (int (*)(void *buf, void *rbuf, int count,
- MPI_Datatype datatype, MPI_Op op,
- int root, MPI_Comm comm))
- mpi_coll_reduce_description[reduce_id].coll;
+ int reduce_id = find_coll_description(mpi_coll_reduce_description, xbt_cfg_get_string("smpi/reduce"),"reduce");
+ mpi_coll_reduce_fun = (int (*)(void *buf, void *rbuf, int count, MPI_Datatype datatype, MPI_Op op, int root,
+ MPI_Comm comm)) mpi_coll_reduce_description[reduce_id].coll;
int reduce_scatter_id =
find_coll_description(mpi_coll_reduce_scatter_description,
- sg_cfg_get_string("smpi/reduce_scatter"),"reduce_scatter");
- mpi_coll_reduce_scatter_fun = (int (*)(void *sbuf, void *rbuf, int *rcounts,
- MPI_Datatype dtype, MPI_Op op,
- MPI_Comm comm))
- mpi_coll_reduce_scatter_description[reduce_scatter_id].coll;
-
- int scatter_id = find_coll_description(mpi_coll_scatter_description,
- sg_cfg_get_string("smpi/scatter"),"scatter");
- mpi_coll_scatter_fun = (int (*)(void *sendbuf, int sendcount,
- MPI_Datatype sendtype, void *recvbuf,
- int recvcount, MPI_Datatype recvtype,
- int root, MPI_Comm comm))
+ xbt_cfg_get_string("smpi/reduce-scatter"),"reduce_scatter");
+ mpi_coll_reduce_scatter_fun = (int (*)(void *sbuf, void *rbuf, int *rcounts,MPI_Datatype dtype, MPI_Op op,
+ MPI_Comm comm)) mpi_coll_reduce_scatter_description[reduce_scatter_id].coll;
+
+ int scatter_id = find_coll_description(mpi_coll_scatter_description, xbt_cfg_get_string("smpi/scatter"),"scatter");
+ mpi_coll_scatter_fun = (int (*)(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf,
+ int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm))
mpi_coll_scatter_description[scatter_id].coll;
- int barrier_id = find_coll_description(mpi_coll_barrier_description,
- sg_cfg_get_string("smpi/barrier"),"barrier");
- mpi_coll_barrier_fun = (int (*)(MPI_Comm comm))
- mpi_coll_barrier_description[barrier_id].coll;
+ int barrier_id = find_coll_description(mpi_coll_barrier_description, xbt_cfg_get_string("smpi/barrier"),"barrier");
+ mpi_coll_barrier_fun = (int (*)(MPI_Comm comm)) mpi_coll_barrier_description[barrier_id].coll;
- smpi_cpu_threshold = sg_cfg_get_double("smpi/cpu_threshold");
- smpi_running_power = sg_cfg_get_double("smpi/running_power");
- smpi_privatize_global_variables = sg_cfg_get_boolean("smpi/privatize_global_variables");
+ smpi_cpu_threshold = xbt_cfg_get_double("smpi/cpu-threshold");
+ smpi_running_power = xbt_cfg_get_double("smpi/running-power");
+ smpi_privatize_global_variables = xbt_cfg_get_boolean("smpi/privatize-global-variables");
if (smpi_cpu_threshold < 0)
smpi_cpu_threshold = DBL_MAX;
-
}
int smpi_main(int (*realmain) (int argc, char *argv[]), int argc, char *argv[])
srand(SMPI_RAND_SEED);
if (getenv("SMPI_PRETEND_CC") != NULL) {
- /* Hack to ensure that smpicc can pretend to be a simple
- * compiler. Particularly handy to pass it to the configuration tools */
+ /* Hack to ensure that smpicc can pretend to be a simple compiler. Particularly handy to pass it to the
+ * configuration tools */
return 0;
}
-
smpi_init_logs();
TRACE_global_init(&argc, argv);
-
TRACE_add_start_function(TRACE_smpi_alloc);
TRACE_add_end_function(TRACE_smpi_release);
SIMIX_run();
xbt_os_walltimer_stop(global_timer);
- if (sg_cfg_get_boolean("smpi/display_timing")){
+ if (xbt_cfg_get_boolean("smpi/display-timing")){
double global_time = xbt_os_timer_elapsed(global_timer);
XBT_INFO("Simulated time: %g seconds. \n\n"
"The simulation took %g seconds (after parsing and platform setup)\n"
- "%g seconds were actual computation of the application"
- , SIMIX_get_clock(), global_time , smpi_total_benched_time);
+ "%g seconds were actual computation of the application",
+ SIMIX_get_clock(), global_time , smpi_total_benched_time);
if (smpi_total_benched_time/global_time>=0.75)
XBT_INFO("More than 75%% of the time was spent inside the application code.\n"
"You may want to use sampling functions or trace replay to reduce this.");
}
}
-
+ int count = smpi_process_count();
+ int i, ret=0;
+ for (i = 0; i < count; i++) {
+ if(process_data[i]->return_value!=0){
+ ret=process_data[i]->return_value;//return first non 0 value
+ break;
+ }
+ }
smpi_global_destroy();
TRACE_end();
- return 0;
+ return ret;
}
// This function can be called from extern file, to initialize logs, options, and processes of smpi