X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3e7df91d516d83faa66d82b6eb9c78cc400b1411..d9e664e60bd7fab62db0f1d838efd1d7bfd4d367:/src/msg/msg_io.c diff --git a/src/msg/msg_io.c b/src/msg/msg_io.c index af33f20018..9612fb7e8c 100644 --- a/src/msg/msg_io.c +++ b/src/msg/msg_io.c @@ -11,7 +11,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_io, msg, "Logging specific to MSG (io)"); /** @addtogroup msg_file_management - * \htmlonly \endhtmlonly + * \htmlonly \endhtmlonly * (#msg_file_t) and the functions for managing it. * * \see #msg_file_t @@ -113,7 +113,6 @@ msg_file_t MSG_file_open(const char* mount, const char* fullname, void* data) 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; } @@ -181,9 +180,44 @@ xbt_dict_t MSG_file_ls(const char *mount, const char *path) /********************************* Storage **************************************/ +/** @addtogroup msg_storage_management + * \htmlonly \endhtmlonly + * (#msg_storage_t) and the functions for managing it. + * + */ + + +/* TODO: PV: to comment */ +msg_storage_t __MSG_storage_create(smx_storage_t storage) +{ + const char *name = SIMIX_storage_get_name(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); +} + +/* + * \brief Destroys a storage (internal call only) + */ +void __MSG_storage_destroy(msg_storage_priv_t storage) { + + free(storage); +} + /** \ingroup msg_storage_management - * \brief Return the free space size of a storage element - * \param the storage name (#char*) + * + * \brief Returns the name of the #msg_storage_t. + * + * 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 Returns the free space size of a storage element + * \param name the name of a storage * \return the free space size of the storage element (as a size_t) */ size_t MSG_storage_get_free_size(const char* name){ @@ -191,8 +225,8 @@ size_t MSG_storage_get_free_size(const char* name){ } /** \ingroup msg_storage_management - * \brief Return the used space size of a storage element - * \param the storage name (#char*) + * \brief Returns the used space size of a storage element + * \param name the name of a storage * \return the used space size of the storage element (as a size_t) */ size_t MSG_storage_get_used_size(const char* name){ @@ -207,35 +241,85 @@ 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)"); + return (simcall_storage_get_properties(storage)); +} - xbt_die( "Not implemented yet"); - return xbt_dict_new(); - //return (simcall_host_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_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 + * */ 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; + xbt_lib_cursor_t cursor; + char *key; + void **data; + xbt_dynar_t res = xbt_dynar_new(sizeof(msg_storage_t),NULL); - hosts = MSG_hosts_as_dynar(); - xbt_dynar_foreach(hosts, i, host){ - xbt_dynar_push(storages,xbt_lib_get_level((void *)host, SURF_STORAGE_LEVEL)); + xbt_lib_foreach(storage_lib, cursor, key, data) { + if(routing_get_network_element_type(key) == MSG_STORAGE_LEVEL) { + xbt_dictelm_t elm = xbt_dict_cursor_get_elm(cursor); + xbt_dynar_push(res, &elm); + } } - return storages; + + return res; +} + +/** \ingroup msg_storage_management + * + * \brief Set the user data of a #msg_storage_t. + * This functions checks whether some data has already been associated to \a storage + or not and attach \a data to \a storage if it is possible. + */ +msg_error_t MSG_storage_set_data(msg_storage_t storage, void *data) +{ + SIMIX_storage_set_data(storage,data); + + return MSG_OK; +} + +/** \ingroup msg_host_management + * + * \brief Returns the user data of a #msg_storage_t. + * + * 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)); }