model-checker : factorization of set_pair_reached and reached functions if search_cyc...

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

diff --git a/src/simix/smx_smurf_private.h b/src/simix/smx_smurf_private.h
index 13233a7..6e83587 100644 (file)
--- a/src/simix/smx_smurf_private.h
+++ b/src/simix/smx_smurf_private.h
@@ -45,6 +45,9 @@ SIMCALL_ENUM_ELEMENT(SIMCALL_PROCESS_GET_NAME),\
 SIMCALL_ENUM_ELEMENT(SIMCALL_PROCESS_IS_SUSPENDED),\
 SIMCALL_ENUM_ELEMENT(SIMCALL_PROCESS_GET_PROPERTIES),\
 SIMCALL_ENUM_ELEMENT(SIMCALL_PROCESS_SLEEP),\
+SIMCALL_ENUM_ELEMENT(SIMCALL_PROCESS_ON_EXIT),\
+SIMCALL_ENUM_ELEMENT(SIMCALL_PROCESS_AUTO_RESTART_SET),\
+SIMCALL_ENUM_ELEMENT(SIMCALL_PROCESS_RESTART),\
 SIMCALL_ENUM_ELEMENT(SIMCALL_RDV_CREATE),\
 SIMCALL_ENUM_ELEMENT(SIMCALL_RDV_DESTROY),\
 SIMCALL_ENUM_ELEMENT(SIMCALL_RDV_GEY_BY_NAME),\
@@ -227,6 +230,7 @@ typedef struct s_smx_simcall {
       int argc;
       char **argv;
       xbt_dict_t properties;
+      int auto_restart;
     } process_create;
 
     struct {
@@ -289,6 +293,22 @@ typedef struct s_smx_simcall {
       e_smx_state_t result;
     } process_sleep;
 
+    struct {
+      smx_process_t process;
+      int_f_pvoid_t fun;
+      void *data;
+    } process_on_exit;
+
+    struct {
+      smx_process_t process;
+      int auto_restart;
+    } process_auto_restart;
+
+    struct {
+      smx_process_t process;
+      smx_process_t result;
+    } process_restart;
+
     struct {
       const char *name;
       smx_rdv_t result;
@@ -509,16 +529,14 @@ typedef struct s_smx_simcall {
     } sem_get_capacity;
 
     struct {
-      const char* storage;
       void *ptr;
       size_t size;
       size_t nmemb;
       smx_file_t stream;
-      size_t result;
+      double result;
     } file_read;
 
     struct {
-      const char* storage;
       const void *ptr;
       size_t size;
       size_t nmemb;
@@ -527,20 +545,18 @@ typedef struct s_smx_simcall {
     } file_write;
 
     struct {
-      const char* storage;
+      const char* mount;
       const char* path;
       const char* mode;
       smx_file_t result;
     } file_open;
 
     struct {
-      const char* storage;
       smx_file_t fp;
       int result;
     } file_close;
 
     struct {
-      const char* storage;
       smx_file_t fd;
       s_file_stat_t buf;
       int result;