Make smx_file_t, surf_file_t and msg_file_t

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

diff --git a/src/simix/smx_smurf_private.h b/src/simix/smx_smurf_private.h
index 026252c..07385e9 100644 (file)
--- a/src/simix/smx_smurf_private.h
+++ b/src/simix/smx_smurf_private.h
@@ -508,33 +508,38 @@ typedef struct s_smx_simcall {
     } sem_get_capacity;
 
     struct {
+      const char* storage;
       void *ptr;
       size_t size;
       size_t nmemb;
-      smx_file_t* stream;
+      smx_file_t stream;
       size_t result;
     } file_read;
 
     struct {
+      const char* storage;
       const void *ptr;
       size_t size;
       size_t nmemb;
-      smx_file_t* stream;
+      smx_file_t stream;
       size_t result;
     } file_write;
 
     struct {
+      const char* storage;
       const char* path;
       const char* mode;
-      smx_file_t* result;
+      smx_file_t result;
     } file_open;
 
     struct {
-      smx_file_t* fp;
+      const char* storage;
+      smx_file_t fp;
       int result;
     } file_close;
 
     struct {
+      const char* storage;
       int fd;
       //Next should be struct stat* buf
       void* buf;
@@ -550,7 +555,7 @@ void SIMIX_simcall_push(smx_process_t self);
 void SIMIX_simcall_answer(smx_simcall_t);
 void SIMIX_simcall_pre(smx_simcall_t, int);
 void SIMIX_simcall_post(smx_action_t);
-XBT_INLINE smx_simcall_t SIMIX_simcall_mine(void);
+smx_simcall_t SIMIX_simcall_mine(void);
 const char *SIMIX_simcall_name(e_smx_simcall_t kind);
 
 #endif