Simplify process cleanup calls between SIMIX and MSG

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

diff --git a/src/simix/smurf_private.h b/src/simix/smurf_private.h
index 8df9b4c..7c2dd90 100644 (file)
--- a/src/simix/smurf_private.h
+++ b/src/simix/smurf_private.h
@@ -32,6 +32,8 @@ SIMIX_REQ_ENUM_ELEMENT(REQ_HOST_EXECUTION_SET_PRIORITY),\
 SIMIX_REQ_ENUM_ELEMENT(REQ_HOST_EXECUTION_WAIT),\
 SIMIX_REQ_ENUM_ELEMENT(REQ_PROCESS_CREATE),\
 SIMIX_REQ_ENUM_ELEMENT(REQ_PROCESS_KILL),\
+SIMIX_REQ_ENUM_ELEMENT(REQ_PROCESS_KILLALL),\
+SIMIX_REQ_ENUM_ELEMENT(REQ_PROCESS_CLEANUP),\
 SIMIX_REQ_ENUM_ELEMENT(REQ_PROCESS_CHANGE_HOST),\
 SIMIX_REQ_ENUM_ELEMENT(REQ_PROCESS_SUSPEND),\
 SIMIX_REQ_ENUM_ELEMENT(REQ_PROCESS_RESUME),\
@@ -48,7 +50,9 @@ SIMIX_REQ_ENUM_ELEMENT(REQ_RDV_DESTROY),\
 SIMIX_REQ_ENUM_ELEMENT(REQ_RDV_GEY_BY_NAME),\
 SIMIX_REQ_ENUM_ELEMENT(REQ_RDV_COMM_COUNT_BY_HOST),\
 SIMIX_REQ_ENUM_ELEMENT(REQ_RDV_GET_HEAD),\
+SIMIX_REQ_ENUM_ELEMENT(REQ_COMM_SEND),\
 SIMIX_REQ_ENUM_ELEMENT(REQ_COMM_ISEND),\
+SIMIX_REQ_ENUM_ELEMENT(REQ_COMM_RECV),\
 SIMIX_REQ_ENUM_ELEMENT(REQ_COMM_IRECV),\
 SIMIX_REQ_ENUM_ELEMENT(REQ_COMM_DESTROY),\
 SIMIX_REQ_ENUM_ELEMENT(REQ_COMM_CANCEL),\
@@ -223,6 +227,10 @@ typedef struct s_smx_req {
       smx_process_t process;
     } process_kill;
 
+    struct {
+      smx_process_t process;
+    } process_cleanup;
+
     struct {
       smx_process_t process;
       const char *source;
@@ -301,6 +309,17 @@ typedef struct s_smx_req {
       smx_action_t result;
     } rdv_get_head;
 
+    struct {
+      smx_rdv_t rdv;
+      double task_size;
+      double rate;
+      void *src_buff;
+      size_t src_buff_size;
+      int (*match_fun)(void *, void *);
+      void *data;
+      double timeout;
+    } comm_send;
+
     struct {
       smx_rdv_t rdv;
       double task_size;
@@ -318,7 +337,16 @@ typedef struct s_smx_req {
       void *dst_buff;
       size_t *dst_buff_size;
       int (*match_fun)(void *, void *);
-         void *data;
+      void *data;
+      double timeout;
+    } comm_recv;
+
+    struct {
+      smx_rdv_t rdv;
+      void *dst_buff;
+      size_t *dst_buff_size;
+      int (*match_fun)(void *, void *);
+          void *data;
       smx_action_t result;
     } comm_irecv;