[SMPI] Move process_data to map<Actor, smpi::Process>

[simgrid.git] / src / smpi / internals / smpi_global.cpp

diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp
index 4ba19ca..fa1605b 100644 (file)
--- a/src/smpi/internals/smpi_global.cpp
+++ b/src/smpi/internals/smpi_global.cpp
@@ -8,6 +8,7 @@
 #include "private.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "simgrid/s4u/Mailbox.hpp"
 #include "private.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "simgrid/s4u/Mailbox.hpp"

+#include "simgrid/s4u/forward.hpp"

 #include "smpi_coll.hpp"
 #include "smpi_comm.hpp"
 #include "smpi_group.hpp"
 #include "smpi_coll.hpp"
 #include "smpi_comm.hpp"
 #include "smpi_group.hpp"


@@ -50,9 +51,11 @@ struct papi_process_data {
 };
 
 #endif
 };
 
 #endif

+using simgrid::s4u::Actor;
+using simgrid::s4u::ActorPtr;

 std::unordered_map<std::string, double> location2speedup;
 
 std::unordered_map<std::string, double> location2speedup;
 

-static std::map</*process_id*/ int, simgrid::smpi::Process*> process_data;
+static std::map</*process_id*/ ActorPtr, simgrid::smpi::Process*> process_data;

 int process_count = 0;
 int smpi_universe_size = 0;
 extern double smpi_total_benched_time;
 int process_count = 0;
 int smpi_universe_size = 0;
 extern double smpi_total_benched_time;


@@ -81,10 +84,10 @@ static simgrid::config::Flag<double> smpi_init_sleep(
 
 void (*smpi_comm_copy_data_callback) (smx_activity_t, void*, size_t) = &smpi_comm_copy_buffer_callback;
 
 
 void (*smpi_comm_copy_data_callback) (smx_activity_t, void*, size_t) = &smpi_comm_copy_buffer_callback;
 

-void smpi_add_process(int smx_process)
+void smpi_add_process(ActorPtr actor)

 {
 {

-  process_data.insert(
-      std::pair<int, simgrid::smpi::Process*>(smx_process, new simgrid::smpi::Process(smx_process, nullptr)));
+  process_data.insert({actor, new simgrid::smpi::Process(actor, nullptr)});
+  // smpi_deployment_register_process("master_mpi", 0, actor);

 }
 
 int smpi_process_count()
 }
 
 int smpi_process_count()


@@ -94,16 +97,16 @@ int smpi_process_count()
 
 simgrid::smpi::Process* smpi_process()
 {
 
 simgrid::smpi::Process* smpi_process()
 {

-  smx_actor_t me = SIMIX_process_self();
+  ActorPtr me = Actor::self();

   if (me == nullptr) // This happens sometimes (eg, when linking against NS3 because it pulls openMPI...)
     return nullptr;
   if (me == nullptr) // This happens sometimes (eg, when linking against NS3 because it pulls openMPI...)
     return nullptr;

-  simgrid::msg::ActorExt* msgExt = static_cast<simgrid::msg::ActorExt*>(me->userdata);
+  simgrid::msg::ActorExt* msgExt = static_cast<simgrid::msg::ActorExt*>(me->getImpl()->userdata);

   return static_cast<simgrid::smpi::Process*>(msgExt->data);
 }
 
   return static_cast<simgrid::smpi::Process*>(msgExt->data);
 }
 

-simgrid::smpi::Process* smpi_process_remote(int index)
+simgrid::smpi::Process* smpi_process_remote(ActorPtr actor)

 {
 {

-  return process_data.at(index);
+  return process_data.at(actor);

 }
 
 MPI_Comm smpi_process_comm_self(){
 }
 
 MPI_Comm smpi_process_comm_self(){


@@ -344,14 +347,6 @@ void smpi_global_init()
     }
   }
 #endif
     }
   }
 #endif

-
-  if (process_count == 0) { // The program has been dispatched but no other
-                            // SMPI instances have been registered. We're using smpirun.
-    SMPI_app_instance_register(smpi_default_instance_name, nullptr,
-                               SIMIX_process_count()); // This call has a side effect on process_count...
-    MPI_COMM_WORLD = *smpi_deployment_comm_world(smpi_default_instance_name);
-  }
-  smpi_universe_size = process_count;

 }
 
 void smpi_global_destroy()
 }
 
 void smpi_global_destroy()


@@ -487,6 +482,9 @@ int smpi_main(const char* executable, int argc, char *argv[])
 
   SMPI_switch_data_segment = &smpi_switch_data_segment;
 
 
   SMPI_switch_data_segment = &smpi_switch_data_segment;
 

+  // TODO This will not be executed in the case where smpi_main is not called,
+  // e.g., not for smpi_msg_masterslave. This should be moved to another location
+  // that is always called -- maybe close to Actor::onCreation?

   simgrid::s4u::Host::onCreation.connect([](simgrid::s4u::Host& host) {
     host.extension_set(new simgrid::smpi::SmpiHost(&host));
   });
   simgrid::s4u::Host::onCreation.connect([](simgrid::s4u::Host& host) {
     host.extension_set(new simgrid::smpi::SmpiHost(&host));
   });


@@ -496,7 +494,6 @@ int smpi_main(const char* executable, int argc, char *argv[])
   SIMIX_comm_set_copy_data_callback(smpi_comm_copy_buffer_callback);
 
   smpi_init_options();
   SIMIX_comm_set_copy_data_callback(smpi_comm_copy_buffer_callback);
 
   smpi_init_options();

-

   if (smpi_privatize_global_variables == SMPI_PRIVATIZE_DLOPEN) {
 
     std::string executable_copy = executable;
   if (smpi_privatize_global_variables == SMPI_PRIVATIZE_DLOPEN) {
 
     std::string executable_copy = executable;


@@ -585,9 +582,13 @@ int smpi_main(const char* executable, int argc, char *argv[])
 
   }
 
 
   }
 

+  SMPI_init();

   SIMIX_launch_application(argv[2]);
   SIMIX_launch_application(argv[2]);

+  SMPI_app_instance_register(smpi_default_instance_name, nullptr,
+                               SIMIX_process_count()); // This call has a side effect on process_count...
+  MPI_COMM_WORLD = *smpi_deployment_comm_world(smpi_default_instance_name);
+  smpi_universe_size = process_count;

 
 

-  SMPI_init();

 
   /* Clean IO before the run */
   fflush(stdout);
 
   /* Clean IO before the run */
   fflush(stdout);


@@ -613,9 +614,10 @@ int smpi_main(const char* executable, int argc, char *argv[])
     }
   }
   int ret   = 0;
     }
   }
   int ret   = 0;

-  for (int i = 0, count = smpi_process_count(); i < count; i++) {
-    if (process_data.at(i)->return_value() != 0) {
-      ret = process_data.at(i)->return_value(); // return first non 0 value
+  for (auto& pair : process_data) {
+    auto& smpi_process = pair.second;
+    if (smpi_process->return_value() != 0) {
+      ret = smpi_process->return_value(); // return first non 0 value

       break;
     }
   }
       break;
     }
   }


@@ -628,6 +630,9 @@ int smpi_main(const char* executable, int argc, char *argv[])
 
 // Called either directly from the user code, or from the code called by smpirun
 void SMPI_init(){
 
 // Called either directly from the user code, or from the code called by smpirun
 void SMPI_init(){

+  simgrid::s4u::Actor::onCreation.connect([](simgrid::s4u::ActorPtr actor) {
+    smpi_add_process(actor);
+  });

   smpi_init_options();
   smpi_global_init();
   smpi_check_options();
   smpi_init_options();
   smpi_global_init();
   smpi_check_options();