Starting simix mecanism for io.

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

diff --git a/src/simix/smurf_private.h b/src/simix/smurf_private.h
index 97cbbd8..b8431a4 100644 (file)
--- a/src/simix/smurf_private.h
+++ b/src/simix/smurf_private.h
@@ -32,6 +32,7 @@ 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),\
@@ -82,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 */
@@ -118,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;
 
@@ -232,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 {
@@ -326,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;
@@ -500,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);