X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/546888e0918a3cda4cd2ffb5786f67dda3883a81..0f158caa007d462601953bcd766fc0abb19a2949:/src/simix/smx_process_private.h

diff --git a/src/simix/smx_process_private.h b/src/simix/smx_process_private.h
index da6cf695fd..2fbbc14c2e 100644
--- 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"
 
@@ -29,46 +32,70 @@ class ProcessArg {
 public:
   std::string name;
   std::function<void()> code;
-  void *data = nullptr;
-  const char *hostname = nullptr;
-  double kill_time = 0.0;
-  xbt_dict_t properties  = nullptr;
-  bool auto_restart = false;
+  void *data            = nullptr;
+  const char *hostname  = nullptr;
+  double kill_time      = 0.0;
+  xbt_dict_t properties = nullptr;
+  bool auto_restart     = false;
 };
 
 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 */
-  s_xbt_swag_hookup_t synchro_hookup = { nullptr, nullptr };   /* {mutex,cond,sem}->sleeping */
+  s_xbt_swag_hookup_t process_hookup   = { nullptr, nullptr }; /* simix_global->process_list */
+  s_xbt_swag_hookup_t synchro_hookup   = { nullptr, nullptr }; /* {mutex,cond,sem}->sleeping */
   s_xbt_swag_hookup_t host_proc_hookup = { nullptr, nullptr }; /* smx_host->process_lis */
-  s_xbt_swag_hookup_t destroy_hookup = { nullptr, nullptr };   /* simix_global->process_to_destroy */
+  s_xbt_swag_hookup_t destroy_hookup   = { nullptr, nullptr }; /* simix_global->process_to_destroy */
 
-  unsigned long pid = 0;
+  unsigned long pid  = 0;
   unsigned long ppid = 0;
   simgrid::xbt::string name;
-  sg_host_t host = nullptr;     /* the host on which the process is running */
+  sg_host_t 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 */
-  xbt_running_ctx_t *running_ctx = nullptr;
 
   // TODO, pack them
-  bool doexception = false;
-  bool blocked = false;
-  bool suspended = false;
+  std::exception_ptr exception;
+  bool finished     = false;
+  bool blocked      = false;
+  bool suspended    = false;
   bool auto_restart = false;
 
-  sg_host_t new_host = nullptr;     /* if not null, the host on which the process must migrate to */
-  smx_synchro_t waiting_synchro = nullptr;  /* the current blocking synchro if any */
-  xbt_fifo_t comms = nullptr;       /* the current non-blocking communication synchros */
-  xbt_dict_t properties = nullptr;
+  sg_host_t new_host            = nullptr; /* if not null, the host on which the process must migrate to */
+  smx_synchro_t waiting_synchro = nullptr; /* the current blocking synchro if any */
+  xbt_fifo_t comms              = nullptr; /* the current non-blocking communication synchros */
+  xbt_dict_t properties         = nullptr;
   s_smx_simcall_t simcall;
-  void *data = nullptr;    /* kept for compatibility, it should be replaced with moddata */
+  void *data          = nullptr; /* kept for compatibility, it should be replaced with moddata */
   xbt_dynar_t on_exit = nullptr; /* list of functions executed when the process dies */
 
   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*/
+  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_;
 };
 
 }
@@ -97,18 +124,13 @@ XBT_PRIVATE void SIMIX_process_stop(smx_process_t arg);
 XBT_PRIVATE void SIMIX_process_cleanup(smx_process_t arg);
 XBT_PRIVATE void SIMIX_process_empty_trash(void);
 XBT_PRIVATE void SIMIX_process_yield(smx_process_t self);
-XBT_PRIVATE xbt_running_ctx_t *SIMIX_process_get_running_context(void);
 XBT_PRIVATE void SIMIX_process_exception_terminate(xbt_ex_t * e);
-XBT_PRIVATE void SIMIX_process_change_host(smx_process_t process,
-             sg_host_t dest);
+XBT_PRIVATE void SIMIX_process_change_host(smx_process_t process, sg_host_t dest);
 XBT_PRIVATE smx_synchro_t SIMIX_process_suspend(smx_process_t process, smx_process_t issuer);
 XBT_PRIVATE void SIMIX_process_resume(smx_process_t process, smx_process_t issuer);
 XBT_PRIVATE int SIMIX_process_get_PID(smx_process_t self);
-XBT_PRIVATE int SIMIX_process_get_PPID(smx_process_t self);
 XBT_PRIVATE void* SIMIX_process_get_data(smx_process_t process);
 XBT_PRIVATE void SIMIX_process_set_data(smx_process_t process, void *data);
-XBT_PRIVATE sg_host_t SIMIX_process_get_host(smx_process_t process);
-XBT_PRIVATE const char* SIMIX_process_get_name(smx_process_t process);
 XBT_PRIVATE smx_process_t SIMIX_process_get_by_name(const char* name);
 XBT_PRIVATE int SIMIX_process_is_suspended(smx_process_t process);
 XBT_PRIVATE xbt_dict_t SIMIX_process_get_properties(smx_process_t process);