*(int *)z = *(int *)x + *(int *)y;
}
-int inline smpi_mpi_comm_size(smpi_mpi_communicator_t comm)
+int inline smpi_mpi_comm_size(smpi_mpi_communicator_t comm, int *size)
{
- return comm->size;
+ int retval = MPI_SUCCESS;
+ if (NULL == size) {
+ retval = MPI_ERR_ARG;
+ } else {
+ *size = comm->size;
+ }
+ return retval;
}
// FIXME: smarter algorithm?
-int smpi_mpi_comm_rank(smpi_mpi_communicator_t comm, smx_host_t host)
+int smpi_mpi_comm_rank(smpi_mpi_communicator_t comm, int *rank)
{
int i;
+ int retval = MPI_SUCCESS;
- for(i = comm->size - 1; i > 0 && host != comm->hosts[i]; i--);
+ if (NULL == rank) {
+ retval = MPI_ERR_ARG;
+ } else {
+ smx_host_t host = SIMIX_host_self();
- return i;
-}
+ for (i = 0; i < comm->size && host != smpi_global->hosts[comm->rank_to_index_map[i]]; i++);
-int inline smpi_mpi_comm_rank_self(smpi_mpi_communicator_t comm)
-{
- return smpi_mpi_comm_rank(comm, SIMIX_host_self());
+ *rank = i;
+ }
+
+ return retval;
}
void smpi_mpi_init()
{
- smx_process_t process;
smx_host_t host;
smx_host_t *hosts;
- int size;
+ int host_count;
+ int i;
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
- process = SIMIX_process_self();
- host = SIMIX_host_self();
- hosts = SIMIX_host_get_table();
- size = SIMIX_host_get_number();
+ host = SIMIX_host_self();
+ hosts = SIMIX_host_get_table();
+ host_count = SIMIX_host_get_number();
// node 0 sets the globals
if (host == hosts[0]) {
- smpi_mpi_global = xbt_new(s_smpi_mpi_global_t, 1);
+ smpi_global->hosts = hosts;
+ smpi_global->host_count = host_count;
+
+ 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 = size;
- smpi_mpi_global->mpi_comm_world->hosts = hosts;
- smpi_mpi_global->mpi_comm_world->processes = xbt_new(smx_process_t, size);
- smpi_mpi_global->mpi_comm_world->processes[0] = process;
- 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 = xbt_new(s_smpi_mpi_communicator_t, 1);
+ smpi_mpi_global->mpi_comm_world->size = host_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, host_count);
+ smpi_mpi_global->mpi_comm_world->index_to_rank_map = xbt_new(int, host_count);
+ for (i = 0; i < host_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;
+ }
// 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_int = xbt_new(s_smpi_mpi_datatype_t, 1);
- smpi_mpi_global->mpi_int->size = sizeof(int);
- 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_byte = xbt_new(s_smpi_mpi_datatype_t, 1);
+ 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_double = xbt_new(s_smpi_mpi_datatype_t, 1);
+ smpi_mpi_global->mpi_double->size = sizeof(double);
// mpi operations
- smpi_mpi_global->mpi_land = xbt_new(s_smpi_mpi_op_t, 1);
- 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_land = xbt_new(s_smpi_mpi_op_t, 1);
+ 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;
// signal all nodes to perform initialization
SIMIX_mutex_lock(smpi_global->start_stop_mutex);
}
SIMIX_mutex_unlock(smpi_global->start_stop_mutex);
- smpi_mpi_global->mpi_comm_world->processes[smpi_mpi_comm_rank_self(smpi_mpi_global->mpi_comm_world)] = process;
}
// wait for all nodes to signal initializatin complete
SIMIX_mutex_lock(smpi_global->start_stop_mutex);
smpi_global->ready_process_count++;
- if (smpi_global->ready_process_count < 3 * size) {
+ if (smpi_global->ready_process_count < 3 * host_count) {
SIMIX_cond_wait(smpi_global->start_stop_cond, smpi_global->start_stop_mutex);
} else {
SIMIX_cond_broadcast(smpi_global->start_stop_cond);
if (0 >= i) {
// wake up senders/receivers
- for (i = 0; i < smpi_mpi_global->mpi_comm_world->size; i++) {
+ for (i = 0; i < smpi_global->host_count; i++) {
if (SIMIX_process_is_suspended(smpi_global->sender_processes[i])) {
SIMIX_process_resume(smpi_global->sender_processes[i]);
}
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->processes);
xbt_free(smpi_mpi_global->mpi_comm_world);
xbt_free(smpi_mpi_global->mpi_byte);
int smpi_mpi_isend(smpi_mpi_request_t request)
{
int retval = MPI_SUCCESS;
- int rank = smpi_mpi_comm_rank_self(smpi_mpi_global->mpi_comm_world);
+ int index = smpi_host_index();
if (NULL == request) {
retval = MPI_ERR_INTERN;
} else {
- SIMIX_mutex_lock(smpi_global->pending_send_request_queues_mutexes[rank]);
- xbt_fifo_push(smpi_global->pending_send_request_queues[rank], request);
- SIMIX_mutex_unlock(smpi_global->pending_send_request_queues_mutexes[rank]);
+ SIMIX_mutex_lock(smpi_global->pending_send_request_queues_mutexes[index]);
+ xbt_fifo_push(smpi_global->pending_send_request_queues[index], request);
+ SIMIX_mutex_unlock(smpi_global->pending_send_request_queues_mutexes[index]);
- if (SIMIX_process_is_suspended(smpi_global->sender_processes[rank])) {
- SIMIX_process_resume(smpi_global->sender_processes[rank]);
+ if (SIMIX_process_is_suspended(smpi_global->sender_processes[index])) {
+ SIMIX_process_resume(smpi_global->sender_processes[index]);
}
}
int smpi_mpi_irecv(smpi_mpi_request_t request)
{
int retval = MPI_SUCCESS;
- int rank = smpi_mpi_comm_rank_self(smpi_mpi_global->mpi_comm_world);
+ int index = smpi_host_index();
if (NULL == request) {
retval = MPI_ERR_INTERN;
} else {
- SIMIX_mutex_lock(smpi_global->pending_recv_request_queues_mutexes[rank]);
- xbt_fifo_push(smpi_global->pending_recv_request_queues[rank], request);
- SIMIX_mutex_unlock(smpi_global->pending_recv_request_queues_mutexes[rank]);
+ SIMIX_mutex_lock(smpi_global->pending_recv_request_queues_mutexes[index]);
+ xbt_fifo_push(smpi_global->pending_recv_request_queues[index], request);
+ SIMIX_mutex_unlock(smpi_global->pending_recv_request_queues_mutexes[index]);
- if (SIMIX_process_is_suspended(smpi_global->receiver_processes[rank])) {
- SIMIX_process_resume(smpi_global->receiver_processes[rank]);
+ if (SIMIX_process_is_suspended(smpi_global->receiver_processes[index])) {
+ SIMIX_process_resume(smpi_global->receiver_processes[index]);
}
}
