rename actor.hpp to Actor.hpp

[simgrid.git] / src / simix / smx_process_private.h

diff --git a/src/simix/smx_process_private.h b/src/simix/smx_process_private.h
index 0a81e9a..c067fa8 100644 (file)
--- a/src/simix/smx_process_private.h
+++ b/src/simix/smx_process_private.h
@@ -7,6 +7,7 @@
 #ifndef _SIMIX_PROCESS_PRIVATE_H
 #define _SIMIX_PROCESS_PRIVATE_H
 
+#include <atomic>
 #include <functional>
 #include <string>
 
@@ -14,6 +15,8 @@
 #include <xbt/string.hpp>
 
 #include <simgrid/simix.hpp>
+#include <simgrid/s4u/Actor.hpp>
+
 #include "simgrid/simix.h"
 #include "popping_private.h"
 
@@ -38,6 +41,7 @@ public:
 
 class Process {
 public:
+  Process() : actor_(this) {}
 
   // TODO, replace with boost intrusive container hooks
   s_xbt_swag_hookup_t process_hookup   = { nullptr, nullptr };   /* simix_global->process_list */
@@ -53,6 +57,7 @@ public:
 
   // TODO, pack them
   std::exception_ptr exception;
+  bool finished     = false;
   bool blocked      = false;
   bool suspended    = false;
   bool auto_restart = false;
@@ -68,6 +73,29 @@ public:
   std::function<void()> code;
   smx_timer_t kill_timer = nullptr;
   int segment_index      = 0;    /*Reference to an SMPI process' data segment. Default value is -1 if not in SMPI context*/
+
+  friend void intrusive_ptr_add_ref(Process* process)
+  {
+    // Atomic operation! Do not split in two instructions!
+    auto previous = (process->refcount_)++;
+    xbt_assert(previous != 0);
+    (void) previous;
+  }
+  friend void intrusive_ptr_release(Process* process)
+  {
+    // Atomic operation! Do not split in two instructions!
+    auto count = --(process->refcount_);
+    if (count == 0)
+      delete process;
+  }
+
+  ~Process();
+
+  simgrid::s4u::Actor& actor() { return actor_; }
+
+private:
+  std::atomic_int_fast32_t refcount_ { 1 };
+  simgrid::s4u::Actor actor_;
 };
 
 }