-/* Copyright (c) 2004 - 2013. The SimGrid Team.
+/* Copyright (c) 2004-2013. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
"Logging specific to MSG (io)");
/** @addtogroup msg_file_management
- * \htmlonly <!-- DOXYGEN_NAVBAR_LABEL="Files" --> \endhtmlonly
+ * \htmlonly <!-- DOXYGEN_NAVBAR_LABEL="Files" --> \endhtmlonly
* (#msg_file_t) and the functions for managing it.
*
* \see #msg_file_t
fd->info->storage_type = xbt_dynar_pop_as(info, char *);
fd->info->storageId = xbt_dynar_pop_as(info, char *);
fd->info->mount_point = xbt_dynar_pop_as(info, char *);
- fd->info->size = xbt_dynar_pop_as(info, size_t);
+ fd->info->size = xbt_dynar_pop_as(info, sg_storage_size_t);
xbt_dynar_free_container(&info);
}
* \param fd is a the file descriptor
* \return the number of bytes successfully read
*/
-size_t MSG_file_read(size_t size, msg_file_t fd)
+sg_storage_size_t MSG_file_read(sg_storage_size_t size, msg_file_t fd)
{
return simcall_file_read(size, fd->simdata->smx_file);
}
* \param fd is a the file descriptor
* \return the number of bytes successfully write
*/
-size_t MSG_file_write(size_t size, msg_file_t fd)
+sg_storage_size_t MSG_file_write(sg_storage_size_t size, msg_file_t fd)
{
return simcall_file_write(size, fd->simdata->smx_file);
}
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->info = xbt_new0(s_msg_file_info_t,1);
file->simdata->smx_file = simcall_file_open(mount, fullname);
SIMIX_file_set_data(file->simdata->smx_file, data);
return file;
* \brief Return the size of a file
*
* \param fd is the file descriptor (#msg_file_t)
- * \return the size of the file (as a size_t)
+ * \return the size of the file (as a sg_storage_size_t)
*/
-
-size_t MSG_file_get_size(msg_file_t fd){
+sg_storage_size_t MSG_file_get_size(msg_file_t fd){
return simcall_file_get_size(fd->simdata->smx_file);
}
/********************************* Storage **************************************/
/** @addtogroup msg_storage_management
- * \htmlonly <!-- DOXYGEN_NAVBAR_LABEL="Storages" --> \endhtmlonly
+ * \htmlonly <!-- DOXYGEN_NAVBAR_LABEL="Storages" --> \endhtmlonly
* (#msg_storage_t) and the functions for managing it.
*
*/
msg_storage_t __MSG_storage_create(smx_storage_t storage)
{
const char *name = SIMIX_storage_get_name(storage);
- xbt_lib_set(storage_lib,name,MSG_HOST_LEVEL,storage);
+ msg_storage_priv_t storage_private = xbt_new0(s_msg_storage_priv_t, 1);
+ xbt_lib_set(storage_lib,name,MSG_STORAGE_LEVEL,storage_private);
return xbt_lib_get_elm_or_null(storage_lib, name);
}
* This functions checks whether a storage is a valid pointer or not and return its name.
*/
const char *MSG_storage_get_name(msg_storage_t storage) {
+ xbt_assert((storage != NULL), "Invalid parameters");
return SIMIX_storage_get_name(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_host_t MSG_get_storage_by_name(const char *name)
-{
- return (msg_storage_t) xbt_lib_get_elm_or_null(storage_lib,name);
-}
-
/** \ingroup msg_storage_management
* \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)
+ * \param name the name of a storage
+ * \return the free space size of the storage element (as a sg_storage_size_t)
*/
-size_t MSG_storage_get_free_size(const char* name){
+sg_storage_size_t MSG_storage_get_free_size(const char* name){
return simcall_storage_get_free_size(name);
}
/** \ingroup msg_storage_management
* \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)
+ * \param name the name of a storage
+ * \return the used space size of the storage element (as a sg_storage_size_t)
*/
-size_t MSG_storage_get_used_size(const char* name){
+sg_storage_size_t MSG_storage_get_used_size(const char* name){
return simcall_storage_get_used_size(name);
}
return (simcall_storage_get_properties(storage));
}
+/** \ingroup msg_storage_management
+ * \brief Change the value of a given storage property
+ *
+ * \param storage a storage
+ * \param name a property name
+ * \param value what to change the property to
+ * \param free_ctn the freeing function to use to kill the value on need
+ */
+void MSG_storage_set_property_value(msg_storage_t storage, const char *name, char *value,void_f_pvoid_t free_ctn) {
+ xbt_dict_set(MSG_storage_get_properties(storage), name, value,free_ctn);
+}
+
/** \ingroup msg_storage_management
* \brief Finds a msg_storage_t using its name.
- * \param name the name of a storage.
+ * \param name the name of a storage
* \return the corresponding storage
*/
msg_storage_t MSG_storage_get_by_name(const char *name)
return MSG_OK;
}
-
-
/** \ingroup msg_host_management
*
- * \brief Return the user data of a #msg_storage_t.
+ * \brief Returns the user data of a #msg_storage_t.
*
- * This functions checks whether \a storage is a valid pointer or not and return
+ * This functions checks whether \a storage is a valid pointer or not and returns
the user data associated to \a storage if it is possible.
*/
void *MSG_storage_get_data(msg_storage_t storage)
return SIMIX_storage_get_data(storage);
}
-
-
-
-
-
-
-
-
+/** \ingroup msg_storage_management
+ *
+ * \brief Returns the content (file list) of a #msg_storage_t.
+ * \param storage a storage
+ * \return The content of this storage element as a dict (full path file => size)
+ */
+xbt_dict_t MSG_storage_get_content(msg_storage_t storage)
+{
+ return SIMIX_storage_get_content(storage);
+ //return (simcall_storage_get_properties(storage));
+}
