XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
"Messages specific for this msg example");
-int smpi_replay(int argc, char *argv[]);
-
-int smpi_replay(int argc, char *argv[])
-{
- smpi_replay_init(&argc, &argv);
- smpi_replay_finalize();
+static int smpi_replay(int argc, char *argv[]) {
+ smpi_replay_run(&argc, &argv);
return 0;
}
XBT_PUBLIC(void) smpi_process_init(int *argc, char ***argv);
/* Trace replay specific stuff */
-XBT_PUBLIC(void) smpi_replay_init(int *argc, char***argv);
-XBT_PUBLIC(int) smpi_replay_finalize(void);
+XBT_PUBLIC(void) smpi_replay_run(int *argc, char***argv);
XBT_PUBLIC(void) SMPI_app_instance_register(const char *name, xbt_main_func_t code, int num_processes);
XBT_PUBLIC(void) SMPI_init(void);
xbt_free(recvdisps);
}
-void smpi_replay_init(int *argc, char***argv){
+void smpi_replay_run(int *argc, char***argv){
+ /* First initializes everything */
smpi_process_init(argc, argv);
smpi_process_mark_as_initialized();
smpi_process_set_replaying(1);
TRACE_smpi_computing_init(rank);
instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1);
extra->type = TRACING_INIT;
- TRACE_smpi_collective_in(rank, -1, __FUNCTION__, extra);
- TRACE_smpi_collective_out(rank, -1, __FUNCTION__);
+ char *operation =bprintf("%s_init",__FUNCTION__);
+ TRACE_smpi_collective_in(rank, -1, operation, extra);
+ TRACE_smpi_collective_out(rank, -1, operation);
+ free(operation);
if (!_xbt_replay_action_init()) {
xbt_replay_action_register("init", action_init);
smpi_execute_flops(0.0);
}
+ /* Actually run the replay */
xbt_replay_action_runner(*argc, *argv);
-}
-int smpi_replay_finalize(){
+ /* and now, finalize everything */
double sim_time= 1.;
/* One active process will stop. Decrease the counter*/
XBT_DEBUG("There are %lu elements in reqq[*]",
reqq = NULL;
}
-
- int rank = smpi_process_index();
- instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1);
- extra->type = TRACING_FINALIZE;
- TRACE_smpi_collective_in(rank, -1, __FUNCTION__, extra);
+ instr_extra_data extra_fin = xbt_new0(s_instr_extra_data_t,1);
+ extra_fin->type = TRACING_FINALIZE;
+ operation =bprintf("%s_finalize",__FUNCTION__);
+ TRACE_smpi_collective_in(rank, -1, operation, extra_fin);
smpi_process_finalize();
- TRACE_smpi_collective_out(rank, -1, __FUNCTION__);
+ TRACE_smpi_collective_out(rank, -1, operation);
TRACE_smpi_finalize(smpi_process_index());
smpi_process_destroy();
- return MPI_SUCCESS;
+ free(operation);
}