Remove SIMIX requests that get src and dst buffers and their sizes

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

diff --git a/src/simix/smurf_private.h b/src/simix/smurf_private.h
index 0a0bcd8..8df9b4c 100644 (file)
--- a/src/simix/smurf_private.h
+++ b/src/simix/smurf_private.h
@@ -60,10 +60,6 @@ SIMIX_REQ_ENUM_ELEMENT(REQ_COMM_GET_REMAINS),\
 SIMIX_REQ_ENUM_ELEMENT(REQ_COMM_GET_STATE),\
 SIMIX_REQ_ENUM_ELEMENT(REQ_COMM_GET_SRC_DATA),\
 SIMIX_REQ_ENUM_ELEMENT(REQ_COMM_GET_DST_DATA),\
-SIMIX_REQ_ENUM_ELEMENT(REQ_COMM_GET_SRC_BUFF),\
-SIMIX_REQ_ENUM_ELEMENT(REQ_COMM_GET_DST_BUFF),\
-SIMIX_REQ_ENUM_ELEMENT(REQ_COMM_GET_SRC_BUFF_SIZE),\
-SIMIX_REQ_ENUM_ELEMENT(REQ_COMM_GET_DST_BUFF_SIZE),\
 SIMIX_REQ_ENUM_ELEMENT(REQ_COMM_GET_SRC_PROC),\
 SIMIX_REQ_ENUM_ELEMENT(REQ_COMM_GET_DST_PROC),\
 SIMIX_REQ_ENUM_ELEMENT(REQ_MUTEX_INIT),\
@@ -119,7 +115,7 @@ SIMIX_REQ_LIST
  * \brief Represents a SIMIX request.
  */
 typedef struct s_smx_req {
-  s_xbt_swag_hookup_t state_hookup;
+  s_xbt_swag_hookup_t reqtable_hookup;
   e_smx_req_t call;
   smx_process_t issuer;
 
@@ -169,6 +165,7 @@ typedef struct s_smx_req {
       const char* name;
       smx_host_t host;
       double computation_amount;
+      double priority;
       smx_action_t result;
     } host_execute;
 
@@ -208,9 +205,11 @@ typedef struct s_smx_req {
 
     struct {
       smx_action_t execution;
+      e_smx_state_t result;
     } host_execution_wait;
 
     struct {
+      smx_process_t *process;
       const char *name;
       xbt_main_func_t code;
       void *data;
@@ -218,7 +217,6 @@ typedef struct s_smx_req {
       int argc;
       char **argv;
       xbt_dict_t properties;
-      smx_process_t result;
     } process_create;
 
     struct {
@@ -311,6 +309,7 @@ typedef struct s_smx_req {
       size_t src_buff_size;
       int (*match_fun)(void *, void *);
       void *data;
+      int detached;
       smx_action_t result;
     } comm_isend;
 
@@ -371,26 +370,6 @@ typedef struct s_smx_req {
       void *result;
     } comm_get_dst_data;
 
-    struct {
-      smx_action_t comm;
-      void *result;
-    } comm_get_src_buff;
-
-    struct {
-      smx_action_t comm;
-      void *result;
-    } comm_get_dst_buff;
-
-    struct {
-      smx_action_t comm;
-      size_t result;
-    } comm_get_src_buff_size;
-
-    struct {
-      smx_action_t comm;
-      size_t result;
-    } comm_get_dst_buff_size;
-
     struct {
       smx_action_t comm;
       smx_process_t result;
@@ -501,6 +480,7 @@ typedef struct s_smx_req {
 
 void SIMIX_request_init(void);
 void SIMIX_request_destroy(void);
+xbt_swag_t SIMIX_request_get_reqlist(int thread_pid);
 void SIMIX_request_push(void);
 smx_req_t SIMIX_request_pop(void);
 void SIMIX_request_answer(smx_req_t);