* under the terms of the license (GNU LGPL) which comes with this package. */
#include "private.h"
-#include "xbt/sysdep.h"
-#include "xbt/synchro_core.h"
-#include "xbt/log.h"
+#include "simgrid/msg.h" /* barrier */
#include "xbt/dict.h"
+#include "xbt/log.h"
+#include "xbt/sysdep.h"
-static xbt_dict_t smpi_instances = NULL;
+static xbt_dict_t smpi_instances = nullptr;
extern int process_count;
extern int* index_to_process_data;
int present_processes;
int index;
MPI_Comm comm_world;
- xbt_bar_t finalization_barrier;
+ msg_bar_t finalization_barrier;
} s_smpi_mpi_instance_t;
/** \ingroup smpi_simulation
instance->present_processes = 0;
instance->index = process_count;
instance->comm_world = MPI_COMM_NULL;
- instance->finalization_barrier=xbt_barrier_init(num_processes);
+ instance->finalization_barrier = MSG_barrier_init(num_processes);
process_count+=num_processes;
- if(smpi_instances==NULL){
+ if(smpi_instances==nullptr){
smpi_instances = xbt_dict_new_homogeneous(xbt_free_f);
}
- xbt_dict_set(smpi_instances, name, (void*)instance, NULL);
+ xbt_dict_set(smpi_instances, name, (void*)instance, nullptr);
return;
}
//get the index of the process in the process_data array
-void smpi_deployment_register_process(const char* instance_id, int rank, int index,MPI_Comm** comm, xbt_bar_t* bar){
+void smpi_deployment_register_process(const char* instance_id, int rank, int index, MPI_Comm** comm, msg_bar_t* bar)
+{
- if(smpi_instances==NULL){//no instance registered, we probably used smpirun.
+ if(smpi_instances==nullptr){//no instance registered, we probably used smpirun.
index_to_process_data[index]=index;
- *bar = NULL;
- *comm = NULL;
+ *bar = nullptr;
+ *comm = nullptr;
return;
}
if(instance->comm_world == MPI_COMM_NULL){
MPI_Group group = smpi_group_new(instance->size);
- instance->comm_world = smpi_comm_new(group, NULL);
+ instance->comm_world = smpi_comm_new(group, nullptr);
}
instance->present_processes++;
index_to_process_data[index]=instance->index+rank;
}
void smpi_deployment_cleanup_instances(){
- xbt_dict_cursor_t cursor = NULL;
- s_smpi_mpi_instance_t* instance = NULL;
- char *name = NULL;
+ xbt_dict_cursor_t cursor = nullptr;
+ s_smpi_mpi_instance_t* instance = nullptr;
+ char *name = nullptr;
xbt_dict_foreach(smpi_instances, cursor, name, instance) {
if(instance->comm_world!=MPI_COMM_NULL)
while (smpi_group_unuse(smpi_comm_group(instance->comm_world)) > 0);
xbt_free(instance->comm_world);
- xbt_barrier_destroy(instance->finalization_barrier);
+ MSG_barrier_destroy(instance->finalization_barrier);
}
xbt_dict_free(&smpi_instances);
}