X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/07c319ec54d6fc778ee3cc5e75a747242006723e..36246161381665fecb9a5a074b081d8d712f94e6:/src/simix/smurf_private.h

diff --git a/src/simix/smurf_private.h b/src/simix/smurf_private.h
index 3a31142fc3..7667dc7338 100644
--- a/src/simix/smurf_private.h
+++ b/src/simix/smurf_private.h
@@ -9,6 +9,7 @@
 
 /********************************* Requests ***********************************/
 typedef enum {
+  REQ_NO_REQ, /* Used when there is no ongoing request here */
   REQ_HOST_GET_BY_NAME,
   REQ_HOST_GET_NAME,
   REQ_HOST_GET_PROPERTIES,
@@ -50,9 +51,11 @@ typedef enum {
   REQ_COMM_WAITANY,
   REQ_COMM_WAIT,
   REQ_COMM_TEST,
+  REQ_COMM_TESTANY,
   REQ_COMM_GET_REMAINS,
   REQ_COMM_GET_STATE,
-  REQ_COMM_GET_DATA,
+  REQ_COMM_GET_SRC_DATA,
+  REQ_COMM_GET_DST_DATA,
   REQ_COMM_GET_SRC_BUFF,
   REQ_COMM_GET_DST_BUFF,
   REQ_COMM_GET_SRC_BUFF_SIZE,
@@ -61,6 +64,9 @@ typedef enum {
   REQ_COMM_GET_DST_PROC,
 #ifdef HAVE_LATENCY_BOUND_TRACKING
   REQ_COMM_IS_LATENCY_BOUNDED,
+#endif
+#ifdef HAVE_TRACING
+  REQ_SET_CATEGORY,
 #endif
   REQ_MUTEX_INIT,
   REQ_MUTEX_DESTROY,
@@ -255,7 +261,7 @@ typedef struct s_smx_req {
       const char* name;
       smx_rdv_t result;
     } rdv_get_by_name;
-    
+
     struct {
       smx_rdv_t rdv;
       smx_host_t host;
@@ -266,21 +272,24 @@ typedef struct s_smx_req {
       smx_rdv_t rdv;
       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;
-      smx_action_t result;      
+      smx_action_t result;
     } comm_isend;
 
     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;
 
@@ -291,12 +300,12 @@ typedef struct s_smx_req {
     struct {
       smx_action_t comm;
     } comm_cancel;
- 
+
     struct {
       xbt_dynar_t comms;
       unsigned int result;
     } comm_waitany;
- 
+
     struct {
       smx_action_t comm;
       double timeout;
@@ -307,46 +316,56 @@ typedef struct s_smx_req {
       int result;
     } comm_test;
 
+    struct {
+      xbt_dynar_t comms;
+      int result;
+    } comm_testany;
+
     struct {
       smx_action_t comm;
       double result;
     } comm_get_remains;
- 
+
     struct {
       smx_action_t comm;
       e_smx_state_t result;
     } comm_get_state;
- 
+
     struct {
       smx_action_t comm;
-      void *result;    
-    } comm_get_data;
- 
+      void *result;
+    } comm_get_src_data;
+
+    struct {
+      smx_action_t comm;
+      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;
     } comm_get_src_proc;
-    
+
     struct {
       smx_action_t comm;
       smx_process_t result;
@@ -359,6 +378,13 @@ typedef struct s_smx_req {
     } comm_is_latency_bounded;
 #endif
 
+#ifdef HAVE_TRACING
+    struct {
+      smx_action_t action;
+      const char *category;
+    } set_category;
+#endif
+
     struct {
       smx_mutex_t result;
     } mutex_init;
@@ -445,12 +471,15 @@ typedef struct s_smx_req {
 
 void SIMIX_request_init(void);
 void SIMIX_request_destroy(void);
-void SIMIX_request_push(smx_req_t);
+void SIMIX_request_push(void);
 smx_req_t SIMIX_request_pop(void);
 void SIMIX_request_answer(smx_req_t);
-void SIMIX_request_pre(smx_req_t);
+void SIMIX_request_pre(smx_req_t, int);
 void SIMIX_request_post(smx_action_t);
-int SIMIX_request_isVisible(smx_req_t req);
-int SIMIX_request_isEnabled(smx_req_t req);
+int SIMIX_request_is_visible(smx_req_t req);
+int SIMIX_request_is_enabled(smx_req_t req);
+int SIMIX_request_is_enabled_by_idx(smx_req_t req, unsigned int idx);
+XBT_INLINE smx_req_t SIMIX_req_mine(void);
+
 #endif