X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/15badc71ce964f6dae6428c9a4c0198fad5d4936..b3ca3a517af21780e88cc89869b16927d1fea68a:/src/simix/smx_io_private.h

diff --git a/src/simix/smx_io_private.h b/src/simix/smx_io_private.h
index c4f1d6528e..1cc843d10c 100644
--- a/src/simix/smx_io_private.h
+++ b/src/simix/smx_io_private.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2007-2010, 2012-2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -8,36 +8,40 @@
 #define _SIMIX_IO_PRIVATE_H
 
 #include "simgrid/simix.h"
-#include "smx_smurf_private.h"
-
-void SIMIX_pre_file_read(smx_simcall_t simcall, void *ptr, size_t size,
-		         smx_file_t fd);
-void SIMIX_pre_file_write(smx_simcall_t simcall, const void *ptr, size_t size,
-		          smx_file_t fd);
-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);
-size_t SIMIX_pre_file_get_size(smx_simcall_t simcall, smx_file_t fd);
-
-smx_action_t SIMIX_file_read(smx_process_t process, void* ptr, size_t size,
-                             smx_file_t fd);
-smx_action_t SIMIX_file_write(smx_process_t process, const void* ptr,
-                              size_t size, smx_file_t fd);
-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);
-size_t SIMIX_file_get_size(smx_process_t process, smx_file_t fd);
-
-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
+#include "popping_private.h"
+
+/** @brief Storage datatype */
+typedef struct s_smx_storage_priv {
+  void *data;              /**< @brief user data */
+} s_smx_storage_priv_t;
+
+
+static inline smx_storage_priv_t SIMIX_storage_priv(smx_storage_t storage){
+  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);
+smx_synchro_t SIMIX_file_read(smx_file_t fd, sg_size_t size, smx_host_t host);
+smx_synchro_t SIMIX_file_write(smx_file_t fd, sg_size_t size, smx_host_t host);
+smx_synchro_t SIMIX_file_open(const char* fullpath, smx_host_t host);
+smx_synchro_t SIMIX_file_close(smx_file_t fd, smx_host_t host);
+int SIMIX_file_unlink(smx_file_t fd, smx_host_t host);
+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_offset_t offset, int origin);
+int SIMIX_file_move(smx_process_t process, smx_file_t fd, const char* fullpath);
+
+sg_size_t SIMIX_storage_get_free_size(smx_process_t process, smx_storage_t storage);
+sg_size_t SIMIX_storage_get_used_size(smx_process_t process, smx_storage_t storage);
+
+xbt_dict_t SIMIX_storage_get_properties(smx_storage_t storage);
+
+xbt_dict_t SIMIX_storage_get_content(smx_storage_t storage);
+
+void SIMIX_post_io(smx_synchro_t synchro);
+void SIMIX_io_destroy(smx_synchro_t synchro);
+void SIMIX_io_finish(smx_synchro_t synchro);
 
 #endif