Simix: add requests to make isend+wait or irecv+wait in only one call

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

diff --git a/src/simix/smurf_private.h b/src/simix/smurf_private.h
index f7d17fc..c580320 100644 (file)
--- a/src/simix/smurf_private.h
+++ b/src/simix/smurf_private.h
@@ -48,7 +48,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),\
@@ -60,10 +62,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 +117,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;
 
@@ -305,6 +303,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;
@@ -322,7 +331,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;
 
@@ -374,26 +392,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;
@@ -504,6 +502,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);