X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/09dc22d76dcaa090778d6a9a5dfce073b1ba3ae4..7981fe568ccfcc3c517bd73ac146d2b59fa85ea2:/src/smpi/internals/smpi_process.cpp

diff --git a/src/smpi/internals/smpi_process.cpp b/src/smpi/internals/smpi_process.cpp
index 36f01638bb..1d677e5eef 100644
--- a/src/smpi/internals/smpi_process.cpp
+++ b/src/smpi/internals/smpi_process.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2009-2018. 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. */
@@ -12,7 +12,6 @@
 #include "src/mc/mc_replay.hpp"
 #include "src/msg/msg_private.hpp"
 #include "src/simix/smx_private.hpp"
-#include <sstream>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_process, smpi, "Logging specific to SMPI (kernel)");
 
@@ -25,16 +24,11 @@ using simgrid::s4u::ActorPtr;
 Process::Process(ActorPtr actor, msg_bar_t finalization_barrier)
     : finalization_barrier_(finalization_barrier), process_(actor)
 {
-  std::stringstream mailboxname;
-  std::stringstream mailboxname_small;
-
-  mailboxname           << std::string("SMPI-")  << process_->getPid();
-  mailboxname_small     << std::string("small-") << process_->getPid();
-  mailbox_              = simgrid::s4u::Mailbox::byName(mailboxname.str());
-  mailbox_small_        = simgrid::s4u::Mailbox::byName(mailboxname_small.str());
-  mailboxes_mutex_      = xbt_mutex_init();
-  timer_                = xbt_os_timer_new();
-  state_                = SMPI_UNINITIALIZED;
+  mailbox_         = simgrid::s4u::Mailbox::byName("SMPI-" + std::to_string(process_->getPid()));
+  mailbox_small_   = simgrid::s4u::Mailbox::byName("small-" + std::to_string(process_->getPid()));
+  mailboxes_mutex_ = xbt_mutex_init();
+  timer_           = xbt_os_timer_new();
+  state_           = SMPI_UNINITIALIZED;
   if (MC_is_active())
     MC_ignore_heap(timer_, xbt_os_timer_size());
 
@@ -58,6 +52,10 @@ Process::Process(ActorPtr actor, msg_bar_t finalization_barrier)
 
 Process::~Process()
 {
+  if (comm_self_ != MPI_COMM_NULL)
+    simgrid::smpi::Comm::destroy(comm_self_);
+  if (comm_intra_ != MPI_COMM_NULL)
+    simgrid::smpi::Comm::destroy(comm_intra_);
   xbt_os_timer_free(timer_);
   xbt_mutex_destroy(mailboxes_mutex_);
 }
@@ -83,7 +81,7 @@ void Process::set_data(int* argc, char*** argv)
   argv_ = argv;
   // set the process attached to the mailbox
   mailbox_small_->setReceiver(process_);
-  XBT_DEBUG("<%lu> New process in the game: %p", process_->getPid(), process_.get());
+  XBT_DEBUG("<%lu> SMPI process has been initialized: %p", process_->getPid(), process_.get());
 }
 
 /** @brief Prepares the current process for termination. */
@@ -189,7 +187,7 @@ int Process::papi_event_set()
   return papi_event_set_;
 }
 
-papi_counter_t& smpi_process_papi_counters()
+papi_counter_t& Process::papi_counters()
 {
   return papi_counter_data_;
 }
@@ -244,14 +242,6 @@ msg_bar_t Process::finalization_barrier(){
   return finalization_barrier_;
 }
 
-int Process::return_value(){
-  return return_value_;
-}
-
-void Process::set_return_value(int val){
-  return_value_=val;
-}
-
 void Process::init(int *argc, char ***argv){
 
   if (smpi_process_count() == 0) {
@@ -282,9 +272,9 @@ void Process::init(int *argc, char ***argv){
 
     process->set_data(argc, argv);
   }
-  xbt_assert(smpi_process(),
-      "smpi_process() returned nullptr. You probably gave a nullptr parameter to MPI_Init. "
-      "Although it's required by MPI-2, this is currently not supported by SMPI.");
+  xbt_assert(smpi_process(), "smpi_process() returned nullptr. You probably gave a nullptr parameter to MPI_Init. "
+                             "Although it's required by MPI-2, this is currently not supported by SMPI. "
+                             "Please use MPI_Init(&argc, &argv) as usual instead.");
 }
 
 }