return comm->index_to_rank_map[smpi_host_index()];
}
-void smpi_process_init()
+void smpi_process_init(int *argc, char***argv)
{
smx_host_t host;
- int i;
smpi_host_data_t hdata;
- smpi_global->running_hosts_count++;
-
// initialize some local variables
host = SIMIX_host_self();
SIMIX_host_set_data(host, hdata);
SIMIX_process_set_data(SIMIX_process_self(),hdata);
- for (i = 0; i < smpi_global->host_count && host != smpi_global->hosts[i]; i++);
+ /* get rank from command line, and remove it from argv */
+ hdata->index = atoi( (*argv)[1] );
+ if (*argc>2) {
+ memmove((*argv)[1],(*argv)[2], sizeof(char*)* (*argc-2));
+ (*argv)[ (*argc)-1] = NULL;
+ }
+ (*argc)--;
- hdata->index = i;
hdata->mutex = SIMIX_mutex_init();
hdata->cond = SIMIX_cond_init();
hdata->finalize = 0;
hdata->pending_recv_request_queue = xbt_fifo_new();
+ hdata->pending_send_request_queue = xbt_fifo_new();
+ hdata->received_message_queue = xbt_fifo_new();
hdata->main = SIMIX_process_self();
hdata->sender = SIMIX_process_create("smpi_sender",
void smpi_process_finalize()
{
- int i;
smpi_host_data_t hdata = SIMIX_host_get_data(SIMIX_host_self());
- i = --smpi_global->running_hosts_count;
-
hdata->finalize = 2; /* Tell sender and receiver to quit */
SIMIX_process_resume(hdata->sender);
SIMIX_process_resume(hdata->receiver);
SIMIX_mutex_destroy(hdata->mutex);
SIMIX_cond_destroy(hdata->cond);
xbt_fifo_free(hdata->pending_recv_request_queue);
-
-
- if (0 >= i) {
-
- // wake up senders/receivers
- /* MQ: (FIXME) Don't do so: it breaks since some hosts are already gone
- for (i = 0; i < smpi_global->host_count; i++) {
- smpi_host_data_t remote_hdata = SIMIX_process_get_data(smpi_global->main_processes[i]);
-
- if (SIMIX_process_is_suspended(remote_hdata->sender))
- SIMIX_process_resume(remote_hdata->sender);
-
- if (SIMIX_process_is_suspended(remote_hdata->receiver))
- SIMIX_process_resume(remote_hdata->receiver);
- }*/
-
- 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_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);
- }
+ xbt_fifo_free(hdata->pending_send_request_queue);
+ xbt_fifo_free(hdata->received_message_queue);
}
int smpi_mpi_barrier(smpi_mpi_communicator_t comm)
if (NULL == request) {
retval = MPI_ERR_INTERN;
} else {
- xbt_fifo_push(smpi_global->pending_send_request_queues[hdata->index], request);
-
- if (SIMIX_process_is_suspended(hdata->sender)) {
- SIMIX_process_resume(hdata->sender);
- }
+ xbt_fifo_push(hdata->pending_send_request_queue, request);
+ SIMIX_process_resume(hdata->sender);
}
return retval;