X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7444a715278a4bad33c0200162286c50f03bcaef..6042678d235eeddfa0b7120c17c7fb4362881a88:/src/simix/ActorImpl.hpp

diff --git a/src/simix/ActorImpl.hpp b/src/simix/ActorImpl.hpp
index f80b0e6215..16dca7c427 100644
--- a/src/simix/ActorImpl.hpp
+++ b/src/simix/ActorImpl.hpp
@@ -57,12 +57,11 @@ public:
   aid_t pid  = 0;
   aid_t ppid = -1;
   simgrid::xbt::string name;
-  const simgrid::xbt::string& getName() const { return name; }
-  const char* getCname() const { return name.c_str(); }
+  const simgrid::xbt::string& get_name() const { return name; }
+  const char* get_cname() const { return name.c_str(); }
   s4u::Host* host       = nullptr; /* the host on which the process is running */
   smx_context_t context = nullptr; /* the context (uctx/raw/thread) that executes the user function */
 
-  // TODO, pack them
   std::exception_ptr exception;
   bool finished     = false;
   bool blocked      = false;
@@ -71,7 +70,7 @@ public:
 
   smx_activity_t waiting_synchro = nullptr; /* the current blocking synchro if any */
   std::list<smx_activity_t> comms;          /* the current non-blocking communication synchros */
-  s_smx_simcall_t simcall;
+  s_smx_simcall simcall;
   void* userdata = nullptr;                      /* kept for compatibility, it should be replaced with moddata */
   std::vector<s_smx_process_exit_fun_t> on_exit; /* list of functions executed when the process dies */
 
@@ -129,7 +128,6 @@ typedef boost::intrusive::list<ActorImpl, boost::intrusive::member_hook<ActorImp
                                                                         &ActorImpl::smx_synchro_hook>>
     SynchroList;
 
-XBT_PUBLIC void set_maestro(std::function<void()> code);
 XBT_PUBLIC void create_maestro(std::function<void()> code);
 }
 } // namespace kernel
@@ -137,8 +135,6 @@ XBT_PUBLIC void create_maestro(std::function<void()> code);
 
 typedef simgrid::kernel::actor::ActorImpl* smx_actor_t;
 
-extern "C" {
-
 XBT_PRIVATE smx_actor_t SIMIX_process_create(const char* name, std::function<void()> code, void* data, sg_host_t host,
                                              std::map<std::string, std::string>* properties,
                                              smx_actor_t parent_process);
@@ -154,7 +150,6 @@ XBT_PRIVATE void SIMIX_process_change_host(smx_actor_t process, sg_host_t dest);
 XBT_PRIVATE void SIMIX_process_auto_restart_set(smx_actor_t process, int auto_restart);
 
 extern void (*SMPI_switch_data_segment)(simgrid::s4u::ActorPtr actor);
-}
 
 XBT_PRIVATE void SIMIX_process_sleep_destroy(smx_activity_t synchro);
 XBT_PRIVATE smx_activity_t SIMIX_process_join(smx_actor_t issuer, smx_actor_t process, double timeout);