Transfers things from smx_network to Mailboxes

[simgrid.git] / src / smpi / include / smpi_actor.hpp

diff --git a/src/smpi/include/smpi_actor.hpp b/src/smpi/include/smpi_actor.hpp
index bf6371c..b8d1fcc 100644 (file)
--- a/src/smpi/include/smpi_actor.hpp
+++ b/src/smpi/include/smpi_actor.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2009-2019. 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. */
@@ -17,8 +17,6 @@ namespace smpi {
 class ActorExt {
 private:
   double simulated_ = 0 /* Used to time with simulated_start/elapsed */;
-  int* argc_        = nullptr;
-  char*** argv_     = nullptr;
   simgrid::s4u::MailboxPtr mailbox_;
   simgrid::s4u::MailboxPtr mailbox_small_;
   xbt_mutex_t mailboxes_mutex_;
@@ -43,7 +41,7 @@ private:
 public:
   explicit ActorExt(simgrid::s4u::ActorPtr actor, simgrid::s4u::Barrier* barrier);
   ~ActorExt();
-  void set_data(int* argc, char*** argv);
+  void set_data(const char* instance_id);
   void finalize();
   int finalized();
   int initializing();
@@ -54,8 +52,8 @@ public:
   smpi_trace_call_location_t* call_location();
   void set_privatized_region(smpi_privatization_region_t region);
   smpi_privatization_region_t privatized_region();
-  smx_mailbox_t mailbox();
-  smx_mailbox_t mailbox_small();
+  s4u::MailboxPtr mailbox() { return mailbox_; }
+  s4u::MailboxPtr mailbox_small() { return mailbox_small_; }
   xbt_mutex_t mailboxes_mutex();
 #if HAVE_PAPI
   int papi_event_set();
@@ -70,7 +68,7 @@ public:
   void set_comm_intra(MPI_Comm comm);
   void set_sampling(int s);
   int sampling();
-  static void init(int* argc, char*** argv);
+  static void init();
   simgrid::s4u::ActorPtr get_actor();
   int get_optind();
   void set_optind(int optind);