merge conflicts

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

diff --git a/src/simix/smurf_private.h b/src/simix/smurf_private.h
index 8df9b4c..40ad900 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),\
@@ -115,7 +119,6 @@ SIMIX_REQ_LIST
  * \brief Represents a SIMIX request.
  */
 typedef struct s_smx_req {
-  s_xbt_swag_hookup_t reqtable_hookup;
   e_smx_req_t call;
   smx_process_t issuer;
 
@@ -225,8 +228,11 @@ typedef struct s_smx_req {
 
     struct {
       smx_process_t process;
-      const char *source;
-      const char *dest;
+    } process_cleanup;
+
+    struct {
+      smx_process_t process;
+      smx_host_t dest;
     } process_change_host;
 
     struct {
@@ -301,6 +307,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 +335,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;
 
@@ -478,11 +504,7 @@ typedef struct s_smx_req {
 
 /******************************** General *************************************/
 
-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_push(smx_process_t self);
 void SIMIX_request_answer(smx_req_t);
 void SIMIX_request_pre(smx_req_t, int);
 void SIMIX_request_post(smx_action_t);