From a827700e9c5f30942eb18fa38a0d0ebb84c4406d Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Thu, 23 Mar 2017 13:39:36 +0100 Subject: [PATCH] no need to call cimix everytime for that --- include/simgrid/msg.h | 5 +++-- src/msg/msg_io.cpp | 9 +++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h index f0e9ee3983..9e22c1ae8d 100644 --- a/include/simgrid/msg.h +++ b/include/simgrid/msg.h @@ -99,9 +99,10 @@ extern int MSG_STORAGE_LEVEL; typedef xbt_dictelm_t msg_storage_t; struct msg_storage_priv { - const char *hostname; + const char* name; + const char* hostname; sg_size_t size; - void *data; + void* data; }; typedef struct msg_storage_priv s_msg_storage_priv_t; typedef struct msg_storage_priv* msg_storage_priv_t; diff --git a/src/msg/msg_io.cpp b/src/msg/msg_io.cpp index 00f5105b2d..cb3b97d284 100644 --- a/src/msg/msg_io.cpp +++ b/src/msg/msg_io.cpp @@ -443,14 +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); msg_storage_priv_t storage_private = xbt_new0(s_msg_storage_priv_t, 1); + 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,name,MSG_STORAGE_LEVEL,storage_private); - return xbt_lib_get_elm_or_null(storage_lib, name); + 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); } /** @@ -468,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 -- 2.20.1