X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9889deb10c0b29c3c5a2ae25ac0c4b9e25e8334e..7d9a2608433e246294b7c4b339371fd4d3530ba6:/src/simix/smx_io.c

diff --git a/src/simix/smx_io.c b/src/simix/smx_io.c
index 0a117206ab..383510b531 100644
--- a/src/simix/smx_io.c
+++ b/src/simix/smx_io.c
@@ -15,13 +15,10 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_io, simix,
 
 
 //SIMIX FILE READ
-void SIMIX_pre_file_read(smx_simcall_t simcall)
+void SIMIX_pre_file_read(smx_simcall_t simcall, void *ptr, size_t size,
+		         size_t nmemb, smx_file_t stream)
 {
-  smx_action_t action = SIMIX_file_read(simcall->issuer,
-      simcall->file_read.ptr,
-      simcall->file_read.size,
-      simcall->file_read.nmemb,
-      simcall->file_read.stream);
+  smx_action_t action = SIMIX_file_read(simcall->issuer, ptr, size, nmemb, stream);
   xbt_fifo_push(action->simcalls, simcall);
   simcall->issuer->waiting_action = action;
 }
@@ -55,13 +52,10 @@ smx_action_t SIMIX_file_read(smx_process_t process, void* ptr, size_t size, size
 }
 
 //SIMIX FILE WRITE
-void SIMIX_pre_file_write(smx_simcall_t simcall)
+void SIMIX_pre_file_write(smx_simcall_t simcall, const void *ptr, size_t size,
+	                  size_t nmemb, smx_file_t stream)
 {
-  smx_action_t action = SIMIX_file_write(simcall->issuer,
-      simcall->file_write.ptr,
-      simcall->file_write.size,
-      simcall->file_write.nmemb,
-      simcall->file_write.stream);
+  smx_action_t action = SIMIX_file_write(simcall->issuer, ptr, size, nmemb, stream);
   xbt_fifo_push(action->simcalls, simcall);
   simcall->issuer->waiting_action = action;
 }
@@ -95,12 +89,10 @@ smx_action_t SIMIX_file_write(smx_process_t process, const void* ptr, size_t siz
 }
 
 //SIMIX FILE OPEN
-void SIMIX_pre_file_open(smx_simcall_t simcall)
+void SIMIX_pre_file_open(smx_simcall_t simcall, const char* mount,
+		         const char* path, const char* mode)
 {
-  smx_action_t action = SIMIX_file_open(simcall->issuer,
-      simcall->file_open.mount,
-      simcall->file_open.path,
-      simcall->file_open.mode);
+  smx_action_t action = SIMIX_file_open(simcall->issuer, mount, path, mode);
   xbt_fifo_push(action->simcalls, simcall);
   simcall->issuer->waiting_action = action;
 }
@@ -134,10 +126,9 @@ smx_action_t SIMIX_file_open(smx_process_t process ,const char* mount, const cha
 }
 
 //SIMIX FILE CLOSE
-void SIMIX_pre_file_close(smx_simcall_t simcall)
+void SIMIX_pre_file_close(smx_simcall_t simcall, smx_file_t fp)
 {
-  smx_action_t action = SIMIX_file_close(simcall->issuer,
-      simcall->file_close.fp);
+  smx_action_t action = SIMIX_file_close(simcall->issuer, fp);
   xbt_fifo_push(action->simcalls, simcall);
   simcall->issuer->waiting_action = action;
 }
@@ -171,11 +162,9 @@ smx_action_t SIMIX_file_close(smx_process_t process, smx_file_t fp)
 }
 
 //SIMIX FILE STAT
-void SIMIX_pre_file_stat(smx_simcall_t simcall)
+void SIMIX_pre_file_stat(smx_simcall_t simcall, smx_file_t fd, s_file_stat_t *buf)
 {
-  smx_action_t action = SIMIX_file_stat(simcall->issuer,
-      simcall->file_stat.fd,
-      simcall->file_stat.buf);
+  smx_action_t action = SIMIX_file_stat(simcall->issuer, fd, *buf);
   xbt_fifo_push(action->simcalls, simcall);
   simcall->issuer->waiting_action = action;
 }
@@ -208,10 +197,9 @@ smx_action_t SIMIX_file_stat(smx_process_t process, smx_file_t fd, s_file_stat_t
 }
 
 //SIMIX FILE UNLINK
-void SIMIX_pre_file_unlink(smx_simcall_t simcall)
+void SIMIX_pre_file_unlink(smx_simcall_t simcall, smx_file_t fd)
 {
-  smx_action_t action = SIMIX_file_unlink(simcall->issuer,
-      simcall->file_unlink.fd);
+  smx_action_t action = SIMIX_file_unlink(simcall->issuer, fd);
   xbt_fifo_push(action->simcalls, simcall);
   simcall->issuer->waiting_action = action;
 }
@@ -244,10 +232,10 @@ smx_action_t SIMIX_file_unlink(smx_process_t process, smx_file_t fd)
 }
 
 //SIMIX FILE LS
-void SIMIX_pre_file_ls(smx_simcall_t simcall)
+void SIMIX_pre_file_ls(smx_simcall_t simcall,
+                       const char* mount, const char* path)
 {
-  smx_action_t action = SIMIX_file_ls(simcall->issuer,
-      simcall->file_ls.mount, simcall->file_ls.path);
+  smx_action_t action = SIMIX_file_ls(simcall->issuer, mount, path);
   xbt_fifo_push(action->simcalls, simcall);
   simcall->issuer->waiting_action = action;
 }
@@ -298,34 +286,35 @@ void SIMIX_post_io(smx_action_t action)
 
   xbt_fifo_foreach(action->simcalls,i,simcall,smx_simcall_t) {
     switch (simcall->call) {
-    case SIMCALL_FILE_OPEN:
-      simcall->file_open.result = xbt_new(s_smx_file_t,1);
-      simcall->file_open.result->surf_file = (action->io.surf_io)->file;
+    case SIMCALL_FILE_OPEN:;
+      smx_file_t tmp = xbt_new(s_smx_file_t,1);
+      tmp->surf_file = (action->io.surf_io)->file;
+      simcall_file_open__set__result(simcall, tmp);
       break;
 
     case SIMCALL_FILE_CLOSE:
-      xbt_free(simcall->file_close.fp);
-      simcall->file_close.result = 0;
+      xbt_free(simcall_file_close__get__fp(simcall));
+      simcall_file_close__set__result(simcall, 0);
       break;
 
     case SIMCALL_FILE_WRITE:
-      simcall->file_write.result = (action->io.surf_io)->cost;
+      simcall_file_write__set__result(simcall, (action->io.surf_io)->cost);
       break;
 
     case SIMCALL_FILE_READ:
-      simcall->file_read.result = (action->io.surf_io)->cost;
+      simcall_file_read__set__result(simcall, (action->io.surf_io)->cost);
       break;
 
     case SIMCALL_FILE_STAT:
-      simcall->file_stat.result = 0;
-      dst = &(simcall->file_stat.buf);
+      simcall_file_stat__set__result(simcall, 0);
+      dst = simcall_file_stat__get__buf(simcall);
       src = &((action->io.surf_io)->stat);
       file_stat_copy(src,dst);
       break;
 
     case SIMCALL_FILE_UNLINK:
-      xbt_free(simcall->file_unlink.fd);
-      simcall->file_unlink.result = 0;
+      xbt_free(simcall_file_unlink__get__fd(simcall));
+      simcall_file_unlink__set__result(simcall, 0);
       break;
 
     case SIMCALL_FILE_LS:
@@ -337,7 +326,7 @@ void SIMIX_post_io(smx_action_t action)
           xbt_dict_set((action->io.surf_io)->ls_dict,key,dst,free_file_stat);
         }
       }
-      simcall->file_ls.result = (action->io.surf_io)->ls_dict;
+      simcall_file_ls__set__result(simcall, (action->io.surf_io)->ls_dict);
       break;
 
     default: