X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/78f2b1a0a46589cd083afd39fb84a90c4c043288..001a723e0c10af5facba4f0bb5de625bc3da00e1:/src/simix/smx_process_private.h diff --git a/src/simix/smx_process_private.h b/src/simix/smx_process_private.h index bf93b7fe76..8803cd71a2 100644 --- a/src/simix/smx_process_private.h +++ b/src/simix/smx_process_private.h @@ -7,6 +7,8 @@ #ifndef _SIMIX_PROCESS_PRIVATE_H #define _SIMIX_PROCESS_PRIVATE_H +#include + #include #include "simgrid/simix.h" @@ -17,8 +19,12 @@ typedef struct s_smx_process_exit_fun { void *arg; } s_smx_process_exit_fun_t, *smx_process_exit_fun_t; -typedef struct s_smx_process_arg { - char *name; +namespace simgrid { +namespace simix { + +class ProcessArg { +public: + std::string name; xbt_main_func_t code; void *data; const char *hostname; @@ -27,10 +33,7 @@ typedef struct s_smx_process_arg { double kill_time; xbt_dict_t properties; unsigned auto_restart:1; -} s_smx_process_arg_t, *smx_process_arg_t; - -namespace simgrid { -namespace simix { +}; class Process { public: @@ -72,6 +75,8 @@ public: } } +typedef simgrid::simix::ProcessArg *smx_process_arg_t; + typedef simgrid::simix::Process* smx_process_t; SG_BEGIN_DECL() @@ -90,7 +95,6 @@ XBT_PRIVATE smx_process_t SIMIX_process_create( XBT_PRIVATE void SIMIX_process_runall(void); 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 smx_process_t SIMIX_process_create_from_wrapper(smx_process_arg_t args); 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);