Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
SIMIX_process_yield becomes ActorImpl::yield
[simgrid.git] / src / simix / ActorImpl.hpp
index 6bb14de..404278f 100644 (file)
@@ -31,7 +31,7 @@ public:
   void set_auto_restart(bool autorestart) { auto_restart_ = autorestart; }
   void set_kill_time(double kill_time);
   boost::intrusive::list_member_hook<> host_process_list_hook; /* simgrid::simix::Host::process_list */
-  boost::intrusive::list_member_hook<> smx_destroy_list_hook;  /* simix_global->process_to_destroy */
+  boost::intrusive::list_member_hook<> smx_destroy_list_hook;  /* simix_global->actors_to_destroy */
   boost::intrusive::list_member_hook<> smx_synchro_hook;       /* {mutex,cond,sem}->sleeping */
 
   aid_t pid_  = 0;
@@ -42,7 +42,7 @@ public:
   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 */
 
-  std::exception_ptr exception;
+  std::exception_ptr exception_;
   bool finished_    = false;
   bool blocked_     = false;
   bool suspended_   = false;
@@ -62,22 +62,22 @@ private:
   std::atomic_int_fast32_t refcount_{0};
 
 public:
-  friend void intrusive_ptr_add_ref(ActorImpl* process)
+  friend void intrusive_ptr_add_ref(ActorImpl* actor)
   {
     // std::memory_order_relaxed ought to be enough here instead of std::memory_order_seq_cst
     // But then, we have a threading issue when an actor commits a suicide:
     //  it seems that in this case, the worker thread kills the last occurrence of the actor
     //  while usually, the maestro does so. FIXME: we should change how actors suicide
-    process->refcount_.fetch_add(1, std::memory_order_seq_cst);
+    actor->refcount_.fetch_add(1, std::memory_order_seq_cst);
   }
-  friend void intrusive_ptr_release(ActorImpl* process)
+  friend void intrusive_ptr_release(ActorImpl* actor)
   {
     // inspired from http://www.boost.org/doc/libs/1_55_0/doc/html/atomic/usage_examples.html
-    if (process->refcount_.fetch_sub(1, std::memory_order_release) == 1) {
+    if (actor->refcount_.fetch_sub(1, std::memory_order_release) == 1) {
       // Make sure that any changes done on other threads before their acquire are committed before our delete
       // http://stackoverflow.com/questions/27751025/why-is-an-acquire-barrier-needed-before-deleting-the-data-in-an-atomically-refer
       std::atomic_thread_fence(std::memory_order_acquire);
-      delete process;
+      delete actor;
     }
   }
 
@@ -92,17 +92,26 @@ public:
 private:
   bool daemon_ = false;
 public:
+  static ActorImplPtr create(std::string name, simix::ActorCode code, void* data, s4u::Host* host,
+                             std::unordered_map<std::string, std::string>* properties, smx_actor_t parent_actor);
+  void exit();
+  void kill(smx_actor_t actor);
+  void kill_all();
+
+  void yield();
   void daemonize();
   bool is_daemon() { return daemon_; } /** Whether this actor has been daemonized */
   bool is_suspended() { return suspended_; }
   simgrid::s4u::Actor* restart();
   smx_activity_t suspend(ActorImpl* issuer);
   void resume();
+  smx_activity_t join(smx_actor_t actor, double timeout);
   smx_activity_t sleep(double duration);
   void set_user_data(void* data) { userdata_ = data; }
   void* get_user_data() { return userdata_; }
   /** Ask the actor to throw an exception right away */
   void throw_exception(std::exception_ptr e);
+  void set_host(sg_host_t dest);
 };
 
 class ProcessArg {
@@ -154,21 +163,10 @@ XBT_PUBLIC void create_maestro(std::function<void()> code);
 
 typedef simgrid::kernel::actor::ActorImpl* smx_actor_t;
 
-XBT_PRIVATE smx_actor_t SIMIX_process_create(std::string name, std::function<void()> code, void* data, sg_host_t host,
-                                             std::unordered_map<std::string, std::string>* properties,
-                                             smx_actor_t parent_process);
-
-XBT_PRIVATE void SIMIX_process_runall();
-XBT_PRIVATE void SIMIX_process_kill(smx_actor_t process, smx_actor_t issuer);
-XBT_PRIVATE void SIMIX_process_killall(smx_actor_t issuer);
 XBT_PRIVATE void SIMIX_process_cleanup(smx_actor_t arg);
-XBT_PRIVATE void SIMIX_process_empty_trash();
-XBT_PRIVATE void SIMIX_process_yield(smx_actor_t self);
-XBT_PRIVATE void SIMIX_process_change_host(smx_actor_t process, sg_host_t dest);
 
 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);
 
 #endif