[SMPI] Alignment cosmetics

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

diff --git a/src/smpi/smpi_deployment.cpp b/src/smpi/smpi_deployment.cpp
index d841df1..fb7375a 100644 (file)
--- a/src/smpi/smpi_deployment.cpp
+++ b/src/smpi/smpi_deployment.cpp
@@ -1,14 +1,15 @@
-/* Copyright (c) 2004-2014. The SimGrid Team.
+/* Copyright (c) 2004-2017. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * 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 "src/smpi/SmpiHost.hpp"
 #include "xbt/dict.h"
+#include "xbt/log.h"
+#include "xbt/sysdep.h"
 
 static xbt_dict_t smpi_instances = nullptr;
 extern int process_count;
@@ -20,7 +21,7 @@ typedef struct s_smpi_mpi_instance{
   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
@@ -37,12 +38,25 @@ void SMPI_app_instance_register(const char *name, xbt_main_func_t code, int num_
 
   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;
-  instance->present_processes = 0;
-  instance->index = process_count;
-  instance->comm_world = MPI_COMM_NULL;
-  instance->finalization_barrier=xbt_barrier_init(num_processes);
+  static int already_called = 0;
+  if (!already_called) {
+    already_called = 1;
+    xbt_dynar_t hosts = MSG_hosts_as_dynar();
+    unsigned int cursor;
+    void* h;
+    xbt_dynar_foreach(hosts, cursor, h) {
+      simgrid::s4u::Host* host = static_cast<simgrid::s4u::Host*>(h);
+      host->extension_set(new simgrid::smpi::SmpiHost(host));
+    }
+    xbt_dynar_free(&hosts);
+  }
+
+  instance->name                 = name;
+  instance->size                 = num_processes;
+  instance->present_processes    = 0;
+  instance->index                = process_count;
+  instance->comm_world           = MPI_COMM_NULL;
+  instance->finalization_barrier = MSG_barrier_init(num_processes);
 
   process_count+=num_processes;
 
@@ -50,17 +64,16 @@ void SMPI_app_instance_register(const char *name, xbt_main_func_t code, int num_
     smpi_instances = xbt_dict_new_homogeneous(xbt_free_f);
   }
 
+
   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)
+{
 
   if(smpi_instances==nullptr){//no instance registered, we probably used smpirun.
     index_to_process_data[index]=index;
-    *bar = nullptr;
-    *comm = nullptr;
     return;
   }
 
@@ -69,15 +82,35 @@ void smpi_deployment_register_process(const char* instance_id, int rank, int ind
   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, nullptr);
+    MPI_Group group = new  simgrid::smpi::Group(instance->size);
+    instance->comm_world = new  simgrid::smpi::Comm(group, nullptr);
   }
   instance->present_processes++;
   index_to_process_data[index]=instance->index+rank;
-  smpi_group_set_mapping(smpi_comm_group(instance->comm_world), index, rank);
-  *bar = instance->finalization_barrier;
-  *comm = &instance->comm_world;
-  return;
+  instance->comm_world->group()->set_mapping(index, rank);
+}
+
+//get the index of the process in the process_data array
+MPI_Comm* smpi_deployment_comm_world(const char* instance_id)
+{
+  if(smpi_instances==nullptr){//no instance registered, we probably used smpirun.
+    return nullptr;
+  }
+  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);
+  return &instance->comm_world;
+}
+
+msg_bar_t smpi_deployment_finalization_barrier(const char* instance_id)
+{
+  if(smpi_instances==nullptr){//no instance registered, we probably used smpirun.
+    return nullptr;
+  }
+  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);
+  return instance->finalization_barrier;
 }
 
 void smpi_deployment_cleanup_instances(){
@@ -86,9 +119,9 @@ void smpi_deployment_cleanup_instances(){
   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);
+      delete instance->comm_world->group();
+    delete instance->comm_world;
+    MSG_barrier_destroy(instance->finalization_barrier);
   }
   xbt_dict_free(&smpi_instances);
 }