X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1bfdc9a38c22af6a9becf133be154a2fa2bc6589..4078fd06852ccf32fff89e3c7a8774fe41727240:/src/msg/msg_io.c diff --git a/src/msg/msg_io.c b/src/msg/msg_io.c index d5e169091b..5ddba3db34 100644 --- a/src/msg/msg_io.c +++ b/src/msg/msg_io.c @@ -187,13 +187,15 @@ sg_size_t MSG_file_write(msg_file_t fd, sg_size_t size) */ msg_file_t MSG_file_open(const char* fullpath, void* data) { + char name[2048]; msg_file_priv_t priv = xbt_new(s_msg_file_priv_t, 1); priv->data = data; priv->fullpath = xbt_strdup(fullpath); priv->simdata = xbt_new0(s_simdata_file_t,1); priv->simdata->smx_file = simcall_file_open(fullpath, MSG_host_self()); - xbt_lib_set(file_lib, fullpath, MSG_FILE_LEVEL, priv); - msg_file_t fd = (msg_file_t) xbt_lib_get_elm_or_null(file_lib, fullpath); + sprintf(name, "%s:%s",MSG_host_get_name(MSG_host_self()),fullpath); + xbt_lib_set(file_lib, name, MSG_FILE_LEVEL, priv); + msg_file_t fd = (msg_file_t) xbt_lib_get_elm_or_null(file_lib, name); __MSG_file_get_info(fd); return fd; @@ -216,9 +218,11 @@ void __MSG_file_priv_free(msg_file_priv_t priv) */ int MSG_file_close(msg_file_t fd) { + char name[2048]; msg_file_priv_t priv = MSG_file_priv(fd); int res = simcall_file_close(priv->simdata->smx_file, MSG_host_self()); - xbt_lib_unset(file_lib, priv->fullpath, MSG_FILE_LEVEL, 1); + sprintf(name, "%s:%s",MSG_host_get_name(MSG_host_self()),priv->fullpath); + xbt_lib_unset(file_lib, name, MSG_FILE_LEVEL, 1); return res; } @@ -550,6 +554,12 @@ xbt_dict_t MSG_storage_get_content(msg_storage_t storage) return SIMIX_storage_get_content(storage); } +/** \ingroup msg_storage_management + * + * \brief Returns the size of a #msg_storage_t. + * \param storage a storage + * \return The size of the storage + */ sg_size_t MSG_storage_get_size(msg_storage_t storage) { return SIMIX_storage_get_size(storage);