Storage API

[simgrid.git] / src / msg / msg_io.c

diff --git a/src/msg/msg_io.c b/src/msg/msg_io.c
index 7bdabdf..1c1fdd6 100644 (file)
--- a/src/msg/msg_io.c
+++ b/src/msg/msg_io.c
@@ -28,6 +28,33 @@ void __MSG_file_get_info(msg_file_t fd){
 
   xbt_dynar_free_container(&info);
 }
+
+/** \ingroup msg_file_management
+ *
+ * \brief Set the user data of a #msg_file_t.
+ *
+ * This functions checks whether some data has already been associated to \a file
+   or not and attach \a data to \a file if it is possible.
+ */
+msg_error_t MSG_file_set_data(msg_file_t fd, void *data)
+{
+  SIMIX_file_set_data(fd->simdata->smx_file,data);
+
+  return MSG_OK;
+}
+
+/** \ingroup msg_file_management
+ *
+ * \brief Return the user data of a #msg_file_t.
+ *
+ * This functions checks whether \a file is a valid pointer or not and return
+   the user data associated to \a file if it is possible.
+ */
+void *MSG_file_get_data(msg_file_t fd)
+{
+  return SIMIX_file_get_data(fd->simdata->smx_file);
+}
+
 /** \ingroup msg_file_management
  * \brief Display information related to a file descriptor
  *
@@ -74,16 +101,18 @@ size_t MSG_file_write(size_t size, msg_file_t fd)
  *
  * \param mount is the mount point where find the file is located
  * \param fullname is the file location on the storage
+ * \param data user data to attach to the file
  *
  * \return An #msg_file_t associated to the file
  */
-msg_file_t MSG_file_open(const char* mount, const char* fullname)
+msg_file_t MSG_file_open(const char* mount, const char* fullname, void* data)
 {
   msg_file_t file = xbt_new(s_msg_file_t,1);
   file->fullname = xbt_strdup(fullname);
   file->simdata = xbt_new0(s_simdata_file_t,1);
   file->info = xbt_new0(s_file_info_t,1);
   file->simdata->smx_file = simcall_file_open(mount, fullname);
+  SIMIX_file_set_data(file->simdata->smx_file, data);
   return file;
 }
 
@@ -151,8 +180,14 @@ xbt_dict_t MSG_file_ls(const char *mount, const char *path)
 
 /********************************* Storage **************************************/
 
+/** @addtogroup msg_storage_management
+ *     \htmlonly <!-- DOXYGEN_NAVBAR_LABEL="Storages" --> \endhtmlonly
+ * (#msg_storage_t) and the functions for managing it.
+ *
+ */
+
 /** \ingroup msg_storage_management
- * \brief Return the free space size of a storage element
+ * \brief Returns the free space size of a storage element
  * \param the storage name (#char*)
  * \return the free space size of the storage element (as a size_t)
  */
@@ -161,7 +196,7 @@ size_t MSG_storage_get_free_size(const char* name){
 }
 
 /** \ingroup msg_storage_management
- * \brief Return the used space size of a storage element
+ * \brief Returns the used space size of a storage element
  * \param the storage name (#char*)
  * \return the used space size of the storage element (as a size_t)
  */
@@ -177,10 +212,7 @@ size_t MSG_storage_get_used_size(const char* name){
 xbt_dict_t MSG_storage_get_properties(msg_storage_t storage)
 {
   xbt_assert((storage != NULL), "Invalid parameters (storage is NULL)");
-
-  xbt_die( "Not implemented yet");
-  return xbt_dict_new();
-  //return (simcall_host_get_properties(storage));
+  return (simcall_storage_get_properties(storage->simdata->smx_storage));
 }
 
 /** \ingroup msg_storage_management
@@ -190,23 +222,35 @@ xbt_dict_t MSG_storage_get_properties(msg_storage_t storage)
  */
 msg_storage_t MSG_storage_get_by_name(const char *name)
 {
-  return (msg_storage_t) xbt_lib_get_elm_or_null(host_lib,name);
+  return (msg_storage_t) xbt_lib_get_elm_or_null(storage_lib,name);
 }
 
 /** \ingroup msg_storage_management
- * \brief Return a dynar containing all the storages declared at a given point of time
+ * \brief Returns a dynar containing all the storage elements declared at a given point of time
+ *
+ *
+ *
+ * @TODO implement a new msg_storage_t structure that hides members (use xbt_dict)
  */
 xbt_dynar_t MSG_storages_as_dynar(void) {
+
   xbt_lib_cursor_t cursor;
   char *key;
   void **data;
   xbt_dynar_t res = xbt_dynar_new(sizeof(msg_storage_t),NULL);
-
-  xbt_lib_foreach(host_lib, cursor, key, data) {
-    if(routing_get_network_element_type(key) == SURF_NETWORK_ELEMENT_HOST) {
+  msg_storage_t storage;
+  xbt_lib_foreach(storage_lib, cursor, key, data) {
+    if(routing_get_network_element_type(key) == ROUTING_STORAGE_LEVEL) {
       xbt_dictelm_t elm = xbt_dict_cursor_get_elm(cursor);
-      xbt_dynar_push(res, &elm);
+      storage = xbt_new(s_msg_storage_t, 1);
+      storage->name = elm->key;
+      storage->simdata = xbt_new0(s_simdata_storage_t,1);
+      smx_storage_t simix_storage = xbt_lib_get_or_null(storage_lib, elm->key, SURF_STORAGE_LEVEL);
+      storage->simdata->smx_storage = simix_storage;
+      storage->data = NULL;
+      xbt_dynar_push(res, &storage);
     }
   }
+
   return res;
 }