X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9c92907fc7a130fd6abc60b98791daa320742ba2..c1ced69678f2c9b86032a7a6460993ca96da265a:/src/simix/ActorImpl.hpp

diff --git a/src/simix/ActorImpl.hpp b/src/simix/ActorImpl.hpp
index 213cd6b47d..4bb1dcf03c 100644
--- a/src/simix/ActorImpl.hpp
+++ b/src/simix/ActorImpl.hpp
@@ -6,18 +6,10 @@
 #ifndef _SIMIX_ACTORIMPL_H
 #define _SIMIX_ACTORIMPL_H
 
-#include <atomic>
-#include <functional>
-#include <string>
-
-#include <xbt/base.h>
-#include <xbt/string.hpp>
-
-#include <simgrid/simix.hpp>
-#include <simgrid/s4u/Actor.hpp>
-
-#include "simgrid/simix.h"
-#include "popping_private.h"
+#include "simgrid/s4u/Actor.hpp"
+#include "src/simix/popping_private.h"
+#include "xbt/fifo.h"
+#include "xbt/swag.h"
 
 typedef struct s_smx_process_exit_fun {
   int_f_pvoid_pvoid_t fun;
@@ -32,7 +24,7 @@ public:
   std::string name;
   std::function<void()> code;
   void *data            = nullptr;
-  const char *hostname  = nullptr;
+  sg_host_t host        = nullptr;
   double kill_time      = 0.0;
   xbt_dict_t properties = nullptr;
   bool auto_restart     = false;
@@ -51,6 +43,7 @@ public:
   unsigned long pid  = 0;
   unsigned long ppid = 0;
   simgrid::xbt::string name;
+  const char* cname() { return name.c_str(); }
   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 */
 
@@ -62,7 +55,7 @@ public:
   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 */
+  smx_activity_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;
@@ -102,45 +95,45 @@ private:
 
 typedef simgrid::simix::ProcessArg *smx_process_arg_t;
 
-typedef simgrid::simix::ActorImpl* smx_process_t;
+typedef simgrid::simix::ActorImpl* smx_actor_t;
 
 SG_BEGIN_DECL()
 
-XBT_PRIVATE smx_process_t SIMIX_process_create(
+XBT_PRIVATE smx_actor_t SIMIX_process_create(
                           const char *name,
                           std::function<void()> code,
                           void *data,
-                          const char *hostname,
+                          sg_host_t host,
                           double kill_time,
                           xbt_dict_t properties,
                           int auto_restart,
-                          smx_process_t parent_process);
+                          smx_actor_t parent_process);
 
 XBT_PRIVATE void SIMIX_process_runall();
-XBT_PRIVATE void SIMIX_process_kill(smx_process_t process, smx_process_t issuer);
-XBT_PRIVATE void SIMIX_process_killall(smx_process_t issuer, int reset_pid);
-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_kill(smx_actor_t process, smx_actor_t issuer);
+XBT_PRIVATE void SIMIX_process_killall(smx_actor_t issuer, int reset_pid);
+XBT_PRIVATE void SIMIX_process_stop(smx_actor_t arg);
+XBT_PRIVATE void SIMIX_process_cleanup(smx_actor_t arg);
 XBT_PRIVATE void SIMIX_process_empty_trash();
-XBT_PRIVATE void SIMIX_process_yield(smx_process_t self);
+XBT_PRIVATE void SIMIX_process_yield(smx_actor_t self);
 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 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 void* SIMIX_process_get_data(smx_process_t process);
-XBT_PRIVATE void SIMIX_process_set_data(smx_process_t process, void *data);
-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);
-XBT_PRIVATE smx_synchro_t SIMIX_process_join(smx_process_t issuer, smx_process_t process, double timeout);
-XBT_PRIVATE smx_synchro_t SIMIX_process_sleep(smx_process_t process, double duration);
-
-XBT_PRIVATE void SIMIX_process_sleep_destroy(smx_synchro_t synchro);
-XBT_PRIVATE void SIMIX_process_auto_restart_set(smx_process_t process, int auto_restart);
-XBT_PRIVATE smx_process_t SIMIX_process_restart(smx_process_t process, smx_process_t issuer);
-
-void SIMIX_segment_index_set(smx_process_t process, int segment_index);
+XBT_PRIVATE void SIMIX_process_change_host(smx_actor_t process, sg_host_t dest);
+XBT_PRIVATE smx_activity_t SIMIX_process_suspend(smx_actor_t process, smx_actor_t issuer);
+XBT_PRIVATE void SIMIX_process_resume(smx_actor_t process);
+XBT_PRIVATE int SIMIX_process_get_PID(smx_actor_t self);
+XBT_PRIVATE void* SIMIX_process_get_data(smx_actor_t process);
+XBT_PRIVATE void SIMIX_process_set_data(smx_actor_t process, void *data);
+XBT_PRIVATE smx_actor_t SIMIX_process_get_by_name(const char* name);
+XBT_PRIVATE int SIMIX_process_is_suspended(smx_actor_t process);
+XBT_PRIVATE xbt_dict_t SIMIX_process_get_properties(smx_actor_t process);
+XBT_PRIVATE smx_activity_t SIMIX_process_join(smx_actor_t issuer, smx_actor_t process, double timeout);
+XBT_PRIVATE smx_activity_t SIMIX_process_sleep(smx_actor_t process, double duration);
+
+XBT_PRIVATE void SIMIX_process_sleep_destroy(smx_activity_t synchro);
+XBT_PRIVATE void SIMIX_process_auto_restart_set(smx_actor_t process, int auto_restart);
+XBT_PRIVATE smx_actor_t SIMIX_process_restart(smx_actor_t process, smx_actor_t issuer);
+
+void SIMIX_segment_index_set(smx_actor_t process, int segment_index);
 extern void (*SMPI_switch_data_segment)(int dest);
 
 SG_END_DECL()