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_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_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()
{
int i;
- int size = SIMIX_host_get_number();
-
/* Connect our log channels: that must be done manually under windows */
#ifdef XBT_LOG_CONNECT
XBT_LOG_CONNECT(smpi_base, smpi);
#endif
smpi_global = xbt_new(s_smpi_global_t, 1);
- // config variable
- smpi_global->reference_speed = SMPI_DEFAULT_SPEED;
-
- // host info blank until sim starts
- // FIXME: is this okay?
- smpi_global->hosts = NULL;
- smpi_global->host_count = 0;
// mallocators
smpi_global->request_mallocator =
xbt_mallocator_new(SMPI_MESSAGE_MALLOCATOR_SIZE, smpi_message_new,
smpi_message_free, smpi_message_reset);
+ smpi_global->process_count = SIMIX_process_count();
+ DEBUG1("There is %d processes",smpi_global->process_count);
+
// sender/receiver processes
- smpi_global->main_processes = xbt_new(smx_process_t, size);
+ smpi_global->main_processes = xbt_new(smx_process_t, smpi_global->process_count);
// timers
smpi_global->timer = xbt_os_timer_new();
smpi_global->do_once_duration = NULL;
smpi_global->do_once_mutex = SIMIX_mutex_init();
- smpi_global->hosts = SIMIX_host_get_table();
- smpi_global->host_count = SIMIX_host_get_number();
smpi_mpi_global = xbt_new(s_smpi_mpi_global_t, 1);
// global communicator
smpi_mpi_global->mpi_comm_world = xbt_new(s_smpi_mpi_communicator_t, 1);
- smpi_mpi_global->mpi_comm_world->size = smpi_global->host_count;
+ smpi_mpi_global->mpi_comm_world->size = smpi_global->process_count;
smpi_mpi_global->mpi_comm_world->barrier_count = 0;
smpi_mpi_global->mpi_comm_world->barrier_mutex = SIMIX_mutex_init();
smpi_mpi_global->mpi_comm_world->barrier_cond = SIMIX_cond_init();
smpi_mpi_global->mpi_comm_world->rank_to_index_map =
- xbt_new(int, smpi_global->host_count);
+ xbt_new(int, smpi_global->process_count);
smpi_mpi_global->mpi_comm_world->index_to_rank_map =
- xbt_new(int, smpi_global->host_count);
- for (i = 0; i < smpi_global->host_count; i++) {
+ xbt_new(int, smpi_global->process_count);
+ for (i = 0; i < smpi_global->process_count; i++) {
smpi_mpi_global->mpi_comm_world->rank_to_index_map[i] = i;
smpi_mpi_global->mpi_comm_world->index_to_rank_map[i] = i;
}
smpi_mpi_global->mpi_byte->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_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_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_max);
+ xbt_free(smpi_mpi_global->mpi_min);
xbt_free(smpi_mpi_global);
}
-int smpi_host_index()
+int smpi_process_index()
{
- smx_host_t host = SIMIX_host_self();
- smpi_host_data_t hdata = (smpi_host_data_t) SIMIX_host_get_data(host);
- return hdata->index;
+ smpi_process_data_t pdata = (smpi_process_data_t) SIMIX_process_get_data(SIMIX_process_self());
+ return pdata->index;
}
-smx_mutex_t smpi_host_mutex()
+smx_mutex_t smpi_process_mutex()
{
- smx_host_t host = SIMIX_host_self();
- smpi_host_data_t hdata = (smpi_host_data_t) SIMIX_host_get_data(host);
- return hdata->mutex;
+ smpi_process_data_t pdata = (smpi_process_data_t) SIMIX_process_get_data(SIMIX_process_self());
+ return pdata->mutex;
}
-smx_cond_t smpi_host_cond()
+smx_cond_t smpi_process_cond()
{
- smx_host_t host = SIMIX_host_self();
- smpi_host_data_t hdata = (smpi_host_data_t) SIMIX_host_get_data(host);
- return hdata->cond;
+ 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);
}
int smpi_run_simulation(int *argc, char **argv)
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);
+
+ 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]);
// must initialize globals between creating environment and launching app....
smpi_global_init();
- /* Prepare to display some more info when dying on Ctrl-C pressing */
- // FIXME: doesn't work
- //signal(SIGINT, inthandler);
-
/* Clean IO before the run */
fflush(stdout);
fflush(stderr);
xbt_fifo_free(actions_failed);
xbt_fifo_free(actions_done);
- INFO1("simulation time %g", SIMIX_get_clock());
- smpi_global_destroy();
+ if (xbt_cfg_get_int(_surf_cfg_set,"display_timing"))
+ INFO1("simulation time %g", SIMIX_get_clock());
+ smpi_global_destroy();
SIMIX_clean();
return 0;
