X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3fc3df9c2436f1d43646969194d96f73ea3d4915..a827700e9c5f30942eb18fa38a0d0ebb84c4406d:/src/msg/msg_io.cpp diff --git a/src/msg/msg_io.cpp b/src/msg/msg_io.cpp index 2552c9888e..cb3b97d284 100644 --- a/src/msg/msg_io.cpp +++ b/src/msg/msg_io.cpp @@ -9,6 +9,8 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_io, msg, "Logging specific to MSG (io)"); +SG_BEGIN_DECL() + /** @addtogroup msg_file * (#msg_file_t) and the functions for managing it. * @@ -441,12 +443,14 @@ void __MSG_file_destroy(msg_file_priv_t file) { msg_storage_t __MSG_storage_create(smx_storage_t storage) { - const char *name = SIMIX_storage_get_name(storage); - const char *host = SIMIX_storage_get_host(storage); msg_storage_priv_t storage_private = xbt_new0(s_msg_storage_priv_t, 1); - storage_private->hostname = host; - xbt_lib_set(storage_lib,name,MSG_STORAGE_LEVEL,storage_private); - return xbt_lib_get_elm_or_null(storage_lib, name); + + storage_private->name = SIMIX_storage_get_name(storage); + storage_private->hostname = SIMIX_storage_get_host(storage); + storage_private->size = SIMIX_storage_get_size(storage); + + xbt_lib_set(storage_lib, storage_private->name, MSG_STORAGE_LEVEL, storage_private); + return xbt_lib_get_elm_or_null(storage_lib, storage_private->name); } /** @@ -464,7 +468,8 @@ void __MSG_storage_destroy(msg_storage_priv_t storage) { */ const char *MSG_storage_get_name(msg_storage_t storage) { xbt_assert((storage != nullptr), "Invalid parameters"); - return SIMIX_storage_get_name(storage); + msg_storage_priv_t priv = MSG_storage_priv(storage); + return priv->name; } /** \ingroup msg_storage_management @@ -592,7 +597,8 @@ xbt_dict_t MSG_storage_get_content(msg_storage_t storage) */ sg_size_t MSG_storage_get_size(msg_storage_t storage) { - return SIMIX_storage_get_size(storage); + msg_storage_priv_t priv = MSG_storage_priv(storage); + return priv->size; } /** \ingroup msg_storage_management @@ -606,3 +612,5 @@ const char *MSG_storage_get_host(msg_storage_t storage) { msg_storage_priv_t priv = MSG_storage_priv(storage); return priv->hostname; } + +SG_END_DECL()