X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f72e3ef2896f8dbb89dd641508f99817a1438756..3e7df91d516d83faa66d82b6eb9c78cc400b1411:/src/msg/msg_io.c

diff --git a/src/msg/msg_io.c b/src/msg/msg_io.c
index 898582daa3..af33f20018 100644
--- 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
  *
@@ -73,17 +100,20 @@ size_t MSG_file_write(size_t size, msg_file_t fd)
  * \brief Opens the file whose name is the string pointed to by path
  *
  * \param mount is the mount point where find the file is located
- * \param path is the file location on the storage
+ * \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;
 }
 
@@ -149,6 +179,8 @@ xbt_dict_t MSG_file_ls(const char *mount, const char *path)
   return simcall_file_ls(mount, path);
 }
 
+/********************************* Storage **************************************/
+
 /** \ingroup msg_storage_management
  * \brief Return the free space size of a storage element
  * \param the storage name (#char*)
@@ -166,3 +198,44 @@ size_t MSG_storage_get_free_size(const char* name){
 size_t MSG_storage_get_used_size(const char* name){
   return simcall_storage_get_used_size(name);
 }
+
+/** \ingroup msg_storage_management
+ * \brief Returns a xbt_dict_t consisting of the list of properties assigned to this storage
+ * \param storage a storage
+ * \return a dict containing the properties
+ */
+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));
+}
+
+/** \ingroup msg_storage_management
+ * \brief Finds a msg_storage_t using its name.
+ * \param name the name of a storage.
+ * \return the corresponding 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);
+}
+
+/** \ingroup msg_storage_management
+ * \brief Return a dynar containing all the storages declared at a given point of time
+ */
+xbt_dynar_t MSG_storages_as_dynar(void) {
+
+  xbt_dynar_t storages = xbt_dynar_new(sizeof(msg_host_t), NULL);
+  xbt_dynar_t hosts;
+  msg_host_t host;
+  unsigned int i;
+
+  hosts = MSG_hosts_as_dynar();
+  xbt_dynar_foreach(hosts, i, host){
+	xbt_dynar_push(storages,xbt_lib_get_level((void *)host, SURF_STORAGE_LEVEL));
+  }
+  return storages;
+}