[SMPI] Remove function declaration from smpi_bench.cpp

[simgrid.git] / src / smpi / smpi_deployment.cpp

diff --git a/src/smpi/smpi_deployment.cpp b/src/smpi/smpi_deployment.cpp
index e832caa..d841df1 100644 (file)
--- a/src/smpi/smpi_deployment.cpp
+++ b/src/smpi/smpi_deployment.cpp
@@ -10,7 +10,7 @@
 #include "xbt/log.h"
 #include "xbt/dict.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;
 
@@ -23,21 +23,19 @@ typedef struct s_smpi_mpi_instance{
   xbt_bar_t finalization_barrier;
 } s_smpi_mpi_instance_t;
 
-
 /** \ingroup smpi_simulation
  * \brief Registers a running instance of a MPI program.
  *
  * FIXME : remove MSG from the loop at some point.
  * \param name the reference name of the function.
- * \param code the main mpi function (must have the same prototype than the main function of any C program: int ..(int argc, char *argv[]))
+ * \param code the main mpi function (must have a int ..(int argc, char *argv[])) prototype
  * \param num_processes the size of the instance we want to deploy
  */
 void SMPI_app_instance_register(const char *name, xbt_main_func_t code, int num_processes)
 {
   SIMIX_function_register(name, code);
 
-  s_smpi_mpi_instance_t* instance =
-      (s_smpi_mpi_instance_t*)xbt_malloc(sizeof(s_smpi_mpi_instance_t));
+  s_smpi_mpi_instance_t* instance = (s_smpi_mpi_instance_t*)xbt_malloc(sizeof(s_smpi_mpi_instance_t));
 
   instance->name = name;
   instance->size = num_processes;
@@ -48,31 +46,31 @@ void SMPI_app_instance_register(const char *name, xbt_main_func_t code, int num_
 
   process_count+=num_processes;
 
-  if(!smpi_instances){
+  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){
 
-  if(!smpi_instances){//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;
   }
 
-  s_smpi_mpi_instance_t* instance = static_cast<s_smpi_mpi_instance_t*>(xbt_dict_get_or_null(smpi_instances, instance_id));
+  s_smpi_mpi_instance_t* instance =
+     static_cast<s_smpi_mpi_instance_t*>(xbt_dict_get_or_null(smpi_instances, instance_id));
   xbt_assert(instance, "Error, unknown instance %s", instance_id);
 
   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;
@@ -83,9 +81,9 @@ void smpi_deployment_register_process(const char* instance_id, int rank, int ind
 }
 
 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);