X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/26f60d943e887977ea88e6ef97d7c1dd47acda1c..64aac920c111dafd5b2f10815c817f872f4c4340:/src/simix/smx_io.c

diff --git a/src/simix/smx_io.c b/src/simix/smx_io.c
index 10b39e9207..8cdcf42b75 100644
--- a/src/simix/smx_io.c
+++ b/src/simix/smx_io.c
@@ -50,7 +50,7 @@ void SIMIX_storage_destroy(void *s)
 }
 
 //SIMIX FILE READ
-void SIMIX_pre_file_read(smx_simcall_t simcall, smx_file_t fd, sg_size_t size, smx_host_t host)
+void simcall_HANDLER_file_read(smx_simcall_t simcall, smx_file_t fd, sg_size_t size, smx_host_t host)
 {
   smx_action_t action = SIMIX_file_read(simcall->issuer, fd, size, host);
   xbt_fifo_push(action->simcalls, simcall);
@@ -84,7 +84,7 @@ smx_action_t SIMIX_file_read(smx_process_t process, smx_file_t fd, sg_size_t siz
 }
 
 //SIMIX FILE WRITE
-void SIMIX_pre_file_write(smx_simcall_t simcall, smx_file_t fd, sg_size_t size, smx_host_t host)
+void simcall_HANDLER_file_write(smx_simcall_t simcall, smx_file_t fd, sg_size_t size, smx_host_t host)
 {
   smx_action_t action = SIMIX_file_write(simcall->issuer, fd,  size, host);
   xbt_fifo_push(action->simcalls, simcall);
@@ -118,7 +118,7 @@ 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* fullpath, smx_host_t host)
+void simcall_HANDLER_file_open(smx_simcall_t simcall, const char* fullpath, smx_host_t host)
 {
   smx_action_t action = SIMIX_file_open(simcall->issuer, fullpath, host);
   xbt_fifo_push(action->simcalls, simcall);
@@ -152,7 +152,7 @@ smx_action_t SIMIX_file_open(smx_process_t process, const char* fullpath, smx_ho
 }
 
 //SIMIX FILE CLOSE
-void SIMIX_pre_file_close(smx_simcall_t simcall, smx_file_t fd, smx_host_t host)
+void simcall_HANDLER_file_close(smx_simcall_t simcall, smx_file_t fd, smx_host_t host)
 {
   smx_action_t action = SIMIX_file_close(simcall->issuer, fd, host);
   xbt_fifo_push(action->simcalls, simcall);
@@ -187,28 +187,25 @@ smx_action_t SIMIX_file_close(smx_process_t process, smx_file_t fd, smx_host_t h
 
 
 //SIMIX FILE UNLINK
-int SIMIX_pre_file_unlink(smx_simcall_t simcall, smx_file_t fd)
+int simcall_HANDLER_file_unlink(smx_simcall_t simcall, smx_file_t fd, smx_host_t host)
 {
-  return SIMIX_file_unlink(simcall->issuer, fd);
+  return SIMIX_file_unlink(simcall->issuer, fd, host);
 }
 
-int SIMIX_file_unlink(smx_process_t process, smx_file_t fd)
+int SIMIX_file_unlink(smx_process_t process, smx_file_t fd, smx_host_t host)
 {
-  smx_host_t host = process->smx_host;
   /* check if the host is active */
   if (surf_resource_get_state(surf_workstation_resource_priv(host)) != SURF_RESOURCE_ON) {
     THROWF(host_error, 0, "Host %s failed, you cannot call this function",
            sg_host_name(host));
   }
 
-  if (surf_workstation_unlink(host, fd->surf_file)){
-    xbt_free(fd);
-    return 1;
-  } else
-    return 0;
+  int res = surf_workstation_unlink(host, fd->surf_file);
+  xbt_free(fd);
+  return !!res;
 }
 
-sg_size_t SIMIX_pre_file_get_size(smx_simcall_t simcall, smx_file_t fd)
+sg_size_t simcall_HANDLER_file_get_size(smx_simcall_t simcall, smx_file_t fd)
 {
   return SIMIX_file_get_size(simcall->issuer, fd);
 }
@@ -219,7 +216,7 @@ sg_size_t SIMIX_file_get_size(smx_process_t process, smx_file_t fd)
   return  surf_workstation_get_size(host, fd->surf_file);
 }
 
-sg_size_t SIMIX_pre_file_tell(smx_simcall_t simcall, smx_file_t fd)
+sg_size_t simcall_HANDLER_file_tell(smx_simcall_t simcall, smx_file_t fd)
 {
   return SIMIX_file_tell(simcall->issuer, fd);
 }
@@ -231,7 +228,7 @@ sg_size_t SIMIX_file_tell(smx_process_t process, smx_file_t fd)
 }
 
 
-xbt_dynar_t SIMIX_pre_file_get_info(smx_simcall_t simcall, smx_file_t fd)
+xbt_dynar_t simcall_HANDLER_file_get_info(smx_simcall_t simcall, smx_file_t fd)
 {
   return SIMIX_file_get_info(simcall->issuer, fd);
 }
@@ -242,18 +239,18 @@ xbt_dynar_t SIMIX_file_get_info(smx_process_t process, smx_file_t fd)
   return  surf_workstation_get_info(host, fd->surf_file);
 }
 
-int SIMIX_pre_file_seek(smx_simcall_t simcall, smx_file_t fd, sg_size_t offset, int origin)
+int simcall_HANDLER_file_seek(smx_simcall_t simcall, smx_file_t fd, sg_offset_t offset, int origin)
 {
   return SIMIX_file_seek(simcall->issuer, fd, offset, origin);
 }
 
-int SIMIX_file_seek(smx_process_t process, smx_file_t fd, sg_size_t offset, int origin)
+int SIMIX_file_seek(smx_process_t process, smx_file_t fd, sg_offset_t offset, int origin)
 {
   smx_host_t host = process->smx_host;
   return  surf_workstation_file_seek(host, fd->surf_file, offset, origin);
 }
 
-int SIMIX_pre_file_move(smx_simcall_t simcall, smx_file_t file, const char* fullpath)
+int simcall_HANDLER_file_move(smx_simcall_t simcall, smx_file_t file, const char* fullpath)
 {
   return SIMIX_file_move(simcall->issuer, file, fullpath);
 }
@@ -264,29 +261,32 @@ int SIMIX_file_move(smx_process_t process, smx_file_t file, const char* fullpath
   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)
+sg_size_t SIMIX_storage_get_size(smx_storage_t storage){
+  xbt_assert((storage != NULL), "Invalid parameters (simix storage is NULL)");
+  return surf_storage_get_size(storage);
+}
+
+sg_size_t simcall_HANDLER_storage_get_free_size(smx_simcall_t simcall, smx_storage_t storage)
 {
-  return SIMIX_storage_get_free_size(simcall->issuer, name);
+  return SIMIX_storage_get_free_size(simcall->issuer, storage);
 }
 
-sg_size_t SIMIX_storage_get_free_size(smx_process_t process, const char* name)
+sg_size_t SIMIX_storage_get_free_size(smx_process_t process, smx_storage_t storage)
 {
-  smx_host_t host = process->smx_host;
-  return  surf_workstation_get_free_size(host, name);
+  return  surf_storage_get_free_size(storage);
 }
 
-sg_size_t SIMIX_pre_storage_get_used_size(smx_simcall_t simcall, const char* name)
+sg_size_t simcall_HANDLER_storage_get_used_size(smx_simcall_t simcall, smx_storage_t storage)
 {
-  return SIMIX_storage_get_used_size(simcall->issuer, name);
+  return SIMIX_storage_get_used_size(simcall->issuer, storage);
 }
 
-sg_size_t SIMIX_storage_get_used_size(smx_process_t process, const char* name)
+sg_size_t SIMIX_storage_get_used_size(smx_process_t process, smx_storage_t storage)
 {
-  smx_host_t host = process->smx_host;
-  return  surf_workstation_get_used_size(host, name);
+  return  surf_storage_get_used_size(storage);
 }
 
-xbt_dict_t SIMIX_pre_storage_get_properties(smx_simcall_t simcall, smx_storage_t storage){
+xbt_dict_t simcall_HANDLER_storage_get_properties(smx_simcall_t simcall, smx_storage_t storage){
   return SIMIX_storage_get_properties(storage);
 }
 xbt_dict_t SIMIX_storage_get_properties(smx_storage_t storage){
@@ -294,16 +294,12 @@ xbt_dict_t SIMIX_storage_get_properties(smx_storage_t storage){
   return surf_resource_get_properties(surf_storage_resource_priv(storage));
 }
 
-const char* SIMIX_pre_storage_get_name(smx_simcall_t simcall, smx_storage_t storage){
-   return SIMIX_storage_get_name(storage);
-}
-
 const char* SIMIX_storage_get_name(smx_storage_t storage){
   xbt_assert((storage != NULL), "Invalid parameters");
   return sg_storage_name(storage);
 }
 
-xbt_dict_t SIMIX_pre_storage_get_content(smx_simcall_t simcall, smx_storage_t storage){
+xbt_dict_t simcall_HANDLER_storage_get_content(smx_simcall_t simcall, smx_storage_t storage){
   return SIMIX_storage_get_content(storage);
 }
 
@@ -312,15 +308,6 @@ xbt_dict_t SIMIX_storage_get_content(smx_storage_t storage){
   return surf_storage_get_content(storage);
 }
 
-sg_size_t SIMIX_storage_get_size(smx_storage_t storage){
-  xbt_assert((storage != NULL), "Invalid parameters (simix storage is NULL)");
-  return surf_storage_get_size(storage);
-}
-
-const char* SIMIX_pre_storage_get_host(smx_simcall_t simcall, smx_storage_t storage){
-   return SIMIX_storage_get_host(storage);
-}
-
 const char* SIMIX_storage_get_host(smx_storage_t storage){
   xbt_assert((storage != NULL), "Invalid parameters");
   return surf_storage_get_host(storage);
@@ -330,10 +317,6 @@ void SIMIX_post_io(smx_action_t action)
 {
   xbt_fifo_item_t i;
   smx_simcall_t simcall;
-//  char* key;
-//  xbt_dict_cursor_t cursor = NULL;
-//  s_file_stat_t *dst = NULL;
-//  s_file_stat_t *src = NULL;
 
   xbt_fifo_foreach(action->simcalls,i,simcall,smx_simcall_t) {
     switch (simcall->call) {