X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/15142e98775405b23e3059da088d4aeecb906b78..b9d8ff0f5f0819d9103795c70ed49534d695f8ba:/src/simix/smurf_private.h

diff --git a/src/simix/smurf_private.h b/src/simix/smurf_private.h
index 7c2dd90ce2..b8431a410b 100644
--- a/src/simix/smurf_private.h
+++ b/src/simix/smurf_private.h
@@ -83,7 +83,8 @@ SIMIX_REQ_ENUM_ELEMENT(REQ_SEM_RELEASE),\
 SIMIX_REQ_ENUM_ELEMENT(REQ_SEM_WOULD_BLOCK),\
 SIMIX_REQ_ENUM_ELEMENT(REQ_SEM_ACQUIRE),\
 SIMIX_REQ_ENUM_ELEMENT(REQ_SEM_ACQUIRE_TIMEOUT),\
-SIMIX_REQ_ENUM_ELEMENT(REQ_SEM_GET_CAPACITY)
+SIMIX_REQ_ENUM_ELEMENT(REQ_SEM_GET_CAPACITY),\
+SIMIX_REQ_ENUM_ELEMENT(REQ_FILE_READ)
 
 /* REQ_COMM_IS_LATENCY_BOUNDED and REQ_SET_CATEGORY make things complicated
  * because they are not always present */
@@ -119,7 +120,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;
 
@@ -233,8 +233,7 @@ typedef struct s_smx_req {
 
     struct {
       smx_process_t process;
-      const char *source;
-      const char *dest;
+      smx_host_t dest;
     } process_change_host;
 
     struct {
@@ -327,6 +326,7 @@ typedef struct s_smx_req {
       void *src_buff;
       size_t src_buff_size;
       int (*match_fun)(void *, void *);
+      void (*clean_fun)(void *);
       void *data;
       int detached;
       smx_action_t result;
@@ -501,16 +501,16 @@ typedef struct s_smx_req {
       smx_sem_t sem;
       int result;
     } sem_get_capacity;
+
+    struct {
+      char* name;;
+    } file_read;
   };
 } s_smx_req_t, *smx_req_t;
 
 /******************************** 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);