request->buf = NULL;
request->completed = 0;
+ request->consumed = 0;
request->data = NULL;
request->forward = 0;
}
return retval;
}
+
/* FIXME: understand what they do and put the prototypes in a header file (live in smpi_base.c) */
void smpi_mpi_land_func(void *a, void *b, int *length,
MPI_Datatype * datatype);
void smpi_mpi_sum_func(void *a, void *b, int *length,
MPI_Datatype * datatype);
+void smpi_mpi_prod_func(void *a, void *b, int *length,
+ MPI_Datatype * datatype);
+void smpi_mpi_min_func(void *a, void *b, int *length,
+ MPI_Datatype * datatype);
+void smpi_mpi_max_func(void *a, void *b, int *length,
+ MPI_Datatype * datatype);
void smpi_global_init()
{
smpi_message_free, smpi_message_reset);
smpi_global->process_count = SIMIX_process_count();
- DEBUG1("There is %d processes",smpi_global->process_count);
+ DEBUG1("There is %d processes", smpi_global->process_count);
// sender/receiver processes
- smpi_global->main_processes = xbt_new(smx_process_t, smpi_global->process_count);
+ smpi_global->main_processes =
+ xbt_new(smx_process_t, smpi_global->process_count);
// timers
smpi_global->timer = xbt_os_timer_new();
// mpi datatypes
smpi_mpi_global->mpi_byte = xbt_new(s_smpi_mpi_datatype_t, 1);
smpi_mpi_global->mpi_byte->size = (size_t) 1;
+ smpi_mpi_global->mpi_char = xbt_new(s_smpi_mpi_datatype_t, 1);
+ smpi_mpi_global->mpi_char->size = (size_t) 1;
smpi_mpi_global->mpi_int = xbt_new(s_smpi_mpi_datatype_t, 1);
smpi_mpi_global->mpi_int->size = sizeof(int);
+ smpi_mpi_global->mpi_float = xbt_new(s_smpi_mpi_datatype_t, 1);
+ smpi_mpi_global->mpi_float->size = sizeof(float);
smpi_mpi_global->mpi_double = xbt_new(s_smpi_mpi_datatype_t, 1);
smpi_mpi_global->mpi_double->size = sizeof(double);
smpi_mpi_global->mpi_land->func = smpi_mpi_land_func;
smpi_mpi_global->mpi_sum = xbt_new(s_smpi_mpi_op_t, 1);
smpi_mpi_global->mpi_sum->func = smpi_mpi_sum_func;
+ smpi_mpi_global->mpi_prod = xbt_new(s_smpi_mpi_op_t, 1);
+ smpi_mpi_global->mpi_prod->func = smpi_mpi_prod_func;
+ smpi_mpi_global->mpi_min = xbt_new(s_smpi_mpi_op_t, 1);
+ smpi_mpi_global->mpi_min->func = smpi_mpi_min_func;
+ smpi_mpi_global->mpi_max = xbt_new(s_smpi_mpi_op_t, 1);
+ smpi_mpi_global->mpi_max->func = smpi_mpi_max_func;
}
/* free smpi_mpi_global */
SIMIX_mutex_destroy(smpi_mpi_global->mpi_comm_world->barrier_mutex);
SIMIX_cond_destroy(smpi_mpi_global->mpi_comm_world->barrier_cond);
+ xbt_free(smpi_mpi_global->mpi_comm_world->rank_to_index_map);
xbt_free(smpi_mpi_global->mpi_comm_world);
xbt_free(smpi_mpi_global->mpi_byte);
+ xbt_free(smpi_mpi_global->mpi_char);
xbt_free(smpi_mpi_global->mpi_int);
xbt_free(smpi_mpi_global->mpi_double);
+ xbt_free(smpi_mpi_global->mpi_float);
xbt_free(smpi_mpi_global->mpi_land);
xbt_free(smpi_mpi_global->mpi_sum);
+ xbt_free(smpi_mpi_global->mpi_prod);
+ xbt_free(smpi_mpi_global->mpi_max);
+ xbt_free(smpi_mpi_global->mpi_min);
xbt_free(smpi_mpi_global);
int smpi_process_index()
{
- smpi_process_data_t pdata = (smpi_process_data_t) SIMIX_process_get_data(SIMIX_process_self());
+ smpi_process_data_t pdata =
+ (smpi_process_data_t) SIMIX_process_get_data(SIMIX_process_self());
return pdata->index;
}
smx_mutex_t smpi_process_mutex()
{
- smpi_process_data_t pdata = (smpi_process_data_t) SIMIX_process_get_data(SIMIX_process_self());
+ smpi_process_data_t pdata =
+ (smpi_process_data_t) SIMIX_process_get_data(SIMIX_process_self());
return pdata->mutex;
}
smx_cond_t smpi_process_cond()
{
- smpi_process_data_t pdata = (smpi_process_data_t) SIMIX_process_get_data(SIMIX_process_self());
+ smpi_process_data_t pdata =
+ (smpi_process_data_t) SIMIX_process_get_data(SIMIX_process_self());
return pdata->cond;
}
-static void smpi_cfg_cb_host_speed(const char *name, int pos) {
- smpi_global->reference_speed = xbt_cfg_get_double_at(_surf_cfg_set,name,pos);
+static void smpi_cfg_cb_host_speed(const char *name, int pos)
+{
+ smpi_global->reference_speed =
+ xbt_cfg_get_double_at(_surf_cfg_set, name, pos);
}
int smpi_run_simulation(int *argc, char **argv)
{
- smx_cond_t cond = NULL;
smx_action_t action = NULL;
xbt_fifo_t actions_failed = xbt_fifo_new();
srand(SMPI_RAND_SEED);
double default_reference_speed = 20000.0;
- xbt_cfg_register(&_surf_cfg_set,"reference_speed","Power of the host running the simulation (in flop/s). Used to bench the operations.",
- xbt_cfgelm_double,&default_reference_speed,1,1,smpi_cfg_cb_host_speed,NULL);
+ xbt_cfg_register(&_surf_cfg_set, "reference_speed",
+ "Power of the host running the simulation (in flop/s). Used to bench the operations.",
+ xbt_cfgelm_double, &default_reference_speed, 1, 1,
+ smpi_cfg_cb_host_speed, NULL);
+
+ int default_display_timing = 0;
+ xbt_cfg_register(&_surf_cfg_set, "display_timing",
+ "Boolean indicating whether we should display the timing after simulation.",
+ xbt_cfgelm_int, &default_display_timing, 1, 1, NULL, NULL);
+
SIMIX_global_init(argc, argv);
+
// parse the platform file: get the host list
SIMIX_create_environment(argv[1]);
while (SIMIX_solve(actions_done, actions_failed) != -1.0) {
while ((action = xbt_fifo_pop(actions_failed))) {
- DEBUG1("** %s failed **", action->name);
- while ((cond = xbt_fifo_pop(action->cond_list))) {
- SIMIX_cond_broadcast(cond);
- }
+ DEBUG1("** %s failed **", SIMIX_action_get_name(action));
+ SIMIX_action_signal_all(action);
}
while ((action = xbt_fifo_pop(actions_done))) {
- DEBUG1("** %s done **", action->name);
- while ((cond = xbt_fifo_pop(action->cond_list))) {
- SIMIX_cond_broadcast(cond);
- }
+ DEBUG1("** %s done **", SIMIX_action_get_name(action));
+ SIMIX_action_signal_all(action);
}
}
xbt_fifo_free(actions_failed);
xbt_fifo_free(actions_done);
- smpi_global_destroy();
- INFO1("simulation time %g", SIMIX_get_clock());
+ if (xbt_cfg_get_int(_surf_cfg_set, "display_timing"))
+ INFO1("simulation time %g", SIMIX_get_clock());
+ smpi_global_destroy();
SIMIX_clean();
return 0;
