A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
SMPI: Use the amount of processes to malloc the process list, not the amount of hosts
[simgrid.git]
/
src
/
smpi
/
smpi_global.c
diff --git
a/src/smpi/smpi_global.c
b/src/smpi/smpi_global.c
index
8e1057b
..
fc9d793
100644
(file)
--- a/
src/smpi/smpi_global.c
+++ b/
src/smpi/smpi_global.c
@@
-130,8
+130,6
@@
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);
@@
-147,14
+145,6
@@
void smpi_global_init()
// 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;
-
- // running hosts
- smpi_global->running_hosts_count = 0;
-
// mallocators
smpi_global->request_mallocator =
xbt_mallocator_new(SMPI_REQUEST_MALLOCATOR_SIZE, smpi_request_new,
@@
-163,12
+153,11
@@
void smpi_global_init()
xbt_mallocator_new(SMPI_MESSAGE_MALLOCATOR_SIZE, smpi_message_new,
smpi_message_free, smpi_message_reset);
- // queues
- smpi_global->pending_send_request_queues = xbt_new(xbt_fifo_t, size);
- smpi_global->received_message_queues = xbt_new(xbt_fifo_t, size);
+ smpi_global->process_count = SIMIX_process_count();
+ fprintf(stderr,"There is %d processes\n",smpi_global->process_count);
// sender/receiver processes
- smpi_global->main_processes = xbt_new(smx_process_t, s
ize
);
+ smpi_global->main_processes = xbt_new(smx_process_t, s
mpi_global->process_count
);
// timers
smpi_global->timer = xbt_os_timer_new();
@@
-179,27
+168,20
@@
void smpi_global_init()
smpi_global->do_once_duration = NULL;
smpi_global->do_once_mutex = SIMIX_mutex_init();
- for (i = 0; i < size; i++) {
- smpi_global->pending_send_request_queues[i] = xbt_fifo_new();
- smpi_global->received_message_queues[i] = xbt_fifo_new();
- }
-
- 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;
}
@@
-222,10
+204,6
@@
void smpi_global_init()
void smpi_global_destroy()
{
- int i;
-
- int size = SIMIX_host_get_number();
-
smpi_do_once_duration_node_t curr, next;
// processes
@@
-247,38
+225,41
@@
void smpi_global_destroy()
SIMIX_mutex_destroy(smpi_global->do_once_mutex);
- for (i = 0; i < size; i++) {
- xbt_fifo_free(smpi_global->pending_send_request_queues[i]);
- xbt_fifo_free(smpi_global->received_message_queues[i]);
- }
+ xbt_free(smpi_global);
+ smpi_global = NULL;
- xbt_free(smpi_global->pending_send_request_queues);
- xbt_free(smpi_global->received_message_queues);
+ /* 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);
- xbt_free(smpi_global);
+ 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_land);
+ xbt_free(smpi_mpi_global->mpi_sum);
+
+ xbt_free(smpi_mpi_global);
- smpi_global = NULL;
}
-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;
}
int smpi_run_simulation(int *argc, char **argv)