#include "private.h"
+#include "xbt/time.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_base, smpi,
"Logging specific to SMPI (base)");
return comm->index_to_rank_map[smpi_host_index()];
}
-void smpi_init_process()
+void smpi_process_init()
{
smx_host_t host;
int i;
smpi_host_data_t hdata;
- SIMIX_mutex_lock(smpi_global->running_hosts_count_mutex);
smpi_global->running_hosts_count++;
- SIMIX_mutex_unlock(smpi_global->running_hosts_count_mutex);
// initialize some local variables
host = SIMIX_host_self();
hdata = xbt_new(s_smpi_host_data_t, 1);
+ SIMIX_host_set_data(host, hdata);
for (i = 0; i < smpi_global->host_count && host != smpi_global->hosts[i]; i++);
hdata->mutex = SIMIX_mutex_init();
hdata->cond = SIMIX_cond_init();
- SIMIX_host_set_data(host, hdata);
+ hdata->pending_recv_request_queue = xbt_fifo_new();
+ hdata->main = SIMIX_process_self();
+ hdata->sender = SIMIX_process_create("smpi_sender",
+ smpi_sender, hdata,
+ SIMIX_host_get_name(SIMIX_host_self()), 0, NULL,
+ /*props */ NULL);
+ hdata->receiver = SIMIX_process_create("smpi_receiver",
+ smpi_receiver, hdata,
+ SIMIX_host_get_name(SIMIX_host_self()), 0, NULL,
+ /*props */ NULL);
+
+ smpi_global->main_processes[hdata->index] = SIMIX_process_self();
return;
}
-void smpi_mpi_finalize()
+void smpi_process_finalize()
{
int i;
+ smpi_host_data_t hdata = SIMIX_host_get_data(SIMIX_host_self());
- SIMIX_mutex_lock(smpi_global->running_hosts_count_mutex);
i = --smpi_global->running_hosts_count;
- SIMIX_mutex_unlock(smpi_global->running_hosts_count_mutex);
SIMIX_mutex_destroy(smpi_host_mutex());
SIMIX_cond_destroy(smpi_host_cond());
+ xbt_fifo_free(hdata->pending_recv_request_queue);
if (0 >= i) {
int smpi_mpi_irecv(smpi_mpi_request_t request)
{
int retval = MPI_SUCCESS;
- int index = smpi_host_index();
+ smpi_host_data_t hdata = SIMIX_host_get_data(SIMIX_host_self());
if (NULL == request) {
retval = MPI_ERR_INTERN;
} else {
- xbt_fifo_push(smpi_global->pending_recv_request_queues[index], request);
+ xbt_fifo_push(hdata->pending_recv_request_queue, request);
- if (SIMIX_process_is_suspended(smpi_global->receiver_processes[index])) {
- SIMIX_process_resume(smpi_global->receiver_processes[index]);
+ if (SIMIX_process_is_suspended(smpi_global->receiver_processes[hdata->index])) {
+ SIMIX_process_resume(smpi_global->receiver_processes[hdata->index]);
}
}