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

diff --git a/src/simix/smx_io.c b/src/simix/smx_io.c
index eee26b21f5..25c87cf078 100644
--- a/src/simix/smx_io.c
+++ b/src/simix/smx_io.c
@@ -120,16 +120,14 @@ smx_action_t SIMIX_file_write(smx_process_t process, smx_file_t fd, sg_size_t si
 }
 
 //SIMIX FILE OPEN
-void SIMIX_pre_file_open(smx_simcall_t simcall, const char* mount,
-                         const char* path)
+void SIMIX_pre_file_open(smx_simcall_t simcall, const char* fullpath)
 {
-  smx_action_t action = SIMIX_file_open(simcall->issuer, mount, path);
+  smx_action_t action = SIMIX_file_open(simcall->issuer, fullpath);
   xbt_fifo_push(action->simcalls, simcall);
   simcall->issuer->waiting_action = action;
 }
 
-smx_action_t SIMIX_file_open(smx_process_t process ,const char* mount,
-                             const char* path)
+smx_action_t SIMIX_file_open(smx_process_t process, const char* fullpath)
 {
   smx_action_t action;
   smx_host_t host = process->smx_host;
@@ -148,7 +146,7 @@ smx_action_t SIMIX_file_open(smx_process_t process ,const char* mount,
 #endif
 
   action->io.host = host;
-  action->io.surf_io = surf_workstation_open(host, mount, path);
+  action->io.surf_io = surf_workstation_open(host, fullpath);
 
   surf_action_set_data(action->io.surf_io, action);
   XBT_DEBUG("Create io action %p", action);
@@ -292,14 +290,15 @@ int SIMIX_file_seek(smx_process_t process, smx_file_t fd, sg_size_t offset, int
   return  surf_workstation_file_seek(host, fd->surf_file, offset, origin);
 }
 
-void SIMIX_pre_storage_file_rename(smx_simcall_t simcall, smx_storage_t storage, const char* src, const char* dest)
+int SIMIX_pre_file_move(smx_simcall_t simcall, smx_file_t file, const char* fullpath)
 {
-  return SIMIX_storage_file_rename(simcall->issuer, storage, src, dest);
+  return SIMIX_file_move(simcall->issuer, file, fullpath);
 }
 
-void SIMIX_storage_file_rename(smx_process_t process, smx_storage_t storage, const char* src, const char* dest)
+int SIMIX_file_move(smx_process_t process, smx_file_t file, const char* fullpath)
 {
-  return  surf_storage_rename(storage, src, dest);
+  smx_host_t host = process->smx_host;
+  return  surf_workstation_file_move(host, file->surf_file, fullpath);
 }
 
 sg_size_t SIMIX_pre_storage_get_free_size(smx_simcall_t simcall, const char* name)