X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7a1cda7748ca356a3608f8d4eba73a3c1d9c79de..544e6fac3fc91ae81d5daa4481562240c2cb2467:/src/simix/smx_io_private.h

diff --git a/src/simix/smx_io_private.h b/src/simix/smx_io_private.h
index ddb15138fc..c5fd3b8c8d 100644
--- a/src/simix/smx_io_private.h
+++ b/src/simix/smx_io_private.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2010, 2012-2013. The SimGrid Team.
+/* Copyright (c) 2007-2010, 2012-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -7,8 +7,10 @@
 #ifndef _SIMIX_IO_PRIVATE_H
 #define _SIMIX_IO_PRIVATE_H
 
+#include <xbt/base.h>
+
 #include "simgrid/simix.h"
-#include "smx_smurf_private.h"
+#include "popping_private.h"
 
 /** @brief Storage datatype */
 typedef struct s_smx_storage_priv {
@@ -17,64 +19,28 @@ typedef struct s_smx_storage_priv {
 
 
 static inline smx_storage_priv_t SIMIX_storage_priv(smx_storage_t storage){
-  return xbt_lib_get_level(storage, SIMIX_STORAGE_LEVEL);
+  return (smx_storage_priv_t) xbt_lib_get_level(storage, SIMIX_STORAGE_LEVEL);
 }
 
-smx_storage_t SIMIX_storage_create(const char *name, void *storage, void *data);
-void SIMIX_storage_destroy(void *s);
-void* SIMIX_pre_file_get_data(smx_simcall_t simcall,smx_file_t fd);
-void SIMIX_pre_file_set_data(smx_simcall_t simcall, smx_file_t fd, void *data);
-void SIMIX_pre_file_read(smx_simcall_t simcall, smx_file_t fd, sg_size_t size);
-void SIMIX_pre_file_write(smx_simcall_t simcall,smx_file_t fd, sg_size_t size);
-void SIMIX_pre_file_open(smx_simcall_t simcall, const char* mount,
-		         const char* path);
-void SIMIX_pre_file_close(smx_simcall_t simcall, smx_file_t fd);
-int SIMIX_pre_file_unlink(smx_simcall_t simcall, smx_file_t fd);
-void SIMIX_pre_file_ls(smx_simcall_t simcall,
-                       const char* mount, const char* path);
-sg_size_t SIMIX_pre_file_get_size(smx_simcall_t simcall, smx_file_t fd);
-sg_size_t SIMIX_pre_file_tell(smx_simcall_t simcall, smx_file_t fd);
-xbt_dynar_t SIMIX_pre_file_get_info(smx_simcall_t simcall, smx_file_t fd);
-int SIMIX_pre_file_seek(smx_simcall_t simcall, smx_file_t fd, sg_size_t offset, int origin);
-void SIMIX_pre_storage_file_rename(smx_simcall_t simcall,smx_storage_t storage, const char* src, const char* dest);
-
-void* SIMIX_file_get_data(smx_file_t fd);
-void SIMIX_file_set_data(smx_file_t fd, void *data);
-smx_action_t SIMIX_file_read(smx_process_t process, smx_file_t fd, sg_size_t size);
-smx_action_t SIMIX_file_write(smx_process_t process, smx_file_t fd, sg_size_t size);
-smx_action_t SIMIX_file_open(smx_process_t process, const char* storage,
-                             const char* path);
-smx_action_t SIMIX_file_close(smx_process_t process, smx_file_t fd);
-int SIMIX_file_unlink(smx_process_t process, smx_file_t fd);
-smx_action_t SIMIX_file_ls(smx_process_t process, const char *mount,
-                           const char *path);
-sg_size_t SIMIX_file_get_size(smx_process_t process, smx_file_t fd);
-sg_size_t SIMIX_file_tell(smx_process_t process, smx_file_t fd);
-xbt_dynar_t SIMIX_file_get_info(smx_process_t process, smx_file_t fd);
-int SIMIX_file_seek(smx_process_t process, smx_file_t fd, sg_size_t offset, int origin);
-
-void SIMIX_storage_file_rename(smx_process_t process, smx_storage_t storage, const char* src, const char* dest);
-sg_size_t SIMIX_pre_storage_get_free_size(smx_simcall_t simcall,const char* name);
-sg_size_t SIMIX_storage_get_free_size(smx_process_t process,const char* name);
-
-sg_size_t SIMIX_pre_storage_get_used_size(smx_simcall_t simcall,const char* name);
-sg_size_t SIMIX_storage_get_used_size(smx_process_t process,const char* name);
-
-xbt_dict_t SIMIX_storage_get_properties(smx_storage_t storage);
-xbt_dict_t SIMIX_pre_storage_get_properties(smx_simcall_t, smx_storage_t);
-
-void SIMIX_pre_storage_set_data(smx_simcall_t, smx_storage_t, void*);
-void* SIMIX_pre_storage_get_data(smx_simcall_t, smx_storage_t);
-
-xbt_dict_t SIMIX_pre_storage_get_content(smx_simcall_t simcall, smx_storage_t storage);
-xbt_dict_t SIMIX_storage_get_content(smx_storage_t storage);
-
-const char* SIMIX_pre_storage_get_name(smx_simcall_t simcall, smx_storage_t storage);
-
-void SIMIX_post_io(smx_action_t action);
-void SIMIX_io_destroy(smx_action_t action);
-void SIMIX_io_finish(smx_action_t action);
-
-// pre prototypes
+XBT_PRIVATE smx_storage_t SIMIX_storage_create(const char *name, void *storage, void *data);
+XBT_PRIVATE void SIMIX_storage_destroy(void *s);
+XBT_PRIVATE smx_activity_t SIMIX_file_read(smx_file_t fd, sg_size_t size, sg_host_t host);
+XBT_PRIVATE smx_activity_t SIMIX_file_write(smx_file_t fd, sg_size_t size, sg_host_t host);
+XBT_PRIVATE smx_activity_t SIMIX_file_open(const char* fullpath, sg_host_t host);
+XBT_PRIVATE smx_activity_t SIMIX_file_close(smx_file_t fd, sg_host_t host);
+XBT_PRIVATE int SIMIX_file_unlink(smx_file_t fd, sg_host_t host);
+XBT_PRIVATE sg_size_t SIMIX_file_get_size(smx_process_t process, smx_file_t fd);
+XBT_PRIVATE sg_size_t SIMIX_file_tell(smx_process_t process, smx_file_t fd);
+XBT_PRIVATE xbt_dynar_t SIMIX_file_get_info(smx_process_t process, smx_file_t fd);
+XBT_PRIVATE int SIMIX_file_seek(smx_process_t process, smx_file_t fd, sg_offset_t offset, int origin);
+XBT_PRIVATE int SIMIX_file_move(smx_process_t process, smx_file_t fd, const char* fullpath);
+
+XBT_PRIVATE sg_size_t SIMIX_storage_get_free_size(smx_process_t process, smx_storage_t storage);
+XBT_PRIVATE sg_size_t SIMIX_storage_get_used_size(smx_process_t process, smx_storage_t storage);
+
+XBT_PRIVATE xbt_dict_t SIMIX_storage_get_properties(smx_storage_t storage);
+
+XBT_PRIVATE void SIMIX_io_destroy(smx_activity_t synchro);
+XBT_PRIVATE void SIMIX_io_finish(smx_activity_t synchro);
 
 #endif