X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7d25326366e9764913af94b28b4d343ddf4c239d..4a2a591f2a153d202731c3d2e2a6739a3775ee0a:/src/msg/msg_io.c?ds=sidebyside diff --git a/src/msg/msg_io.c b/src/msg/msg_io.c index 8d9fa637fe..69a18e21da 100644 --- a/src/msg/msg_io.c +++ b/src/msg/msg_io.c @@ -1,4 +1,4 @@ -/* 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 @@ -6,6 +6,7 @@ #include "msg_private.h" #include "xbt/log.h" +#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_io, msg, "Logging specific to MSG (io)"); @@ -24,7 +25,7 @@ void __MSG_file_get_info(msg_file_t fd){ 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); } @@ -65,11 +66,16 @@ void MSG_file_dump (msg_file_t fd){ // THROW_UNIMPLEMENTED; /* Update the cached information first */ __MSG_file_get_info(fd); - XBT_INFO("File Descriptor information:\n\t\tFull name: '%s'" - "\n\t\tSize: %zu\n\t\tMount point: '%s'\n\t\tStorage Id: '%s'" - "\n\t\tStorage Type: '%s'\n\t\tContent Type: '%s'", - fd->fullname, fd->info->size, fd->info->mount_point, fd->info->storageId, - fd->info->storage_type, fd->info->content_type); + XBT_INFO("File Descriptor information:\n" + "\t\tFull name: '%s'\n" + "\t\tSize: %" PRIu64 "\n" + "\t\tMount point: '%s'\n" + "\t\tStorage Id: '%s'\n" + "\t\tStorage Type: '%s'\n" + "\t\tContent Type: '%s'", + fd->fullname, fd->info->size, fd->info->mount_point, + fd->info->storageId, fd->info->storage_type, + fd->info->content_type); } /** \ingroup msg_file_management @@ -79,7 +85,7 @@ void MSG_file_dump (msg_file_t fd){ * \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); } @@ -91,7 +97,7 @@ size_t MSG_file_read(size_t size, msg_file_t fd) * \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); } @@ -110,7 +116,7 @@ msg_file_t MSG_file_open(const char* mount, const char* fullname, void* data) 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; @@ -147,10 +153,9 @@ int MSG_file_unlink(msg_file_t fd) * \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); } @@ -191,7 +196,8 @@ xbt_dict_t MSG_file_ls(const char *mount, const char *path) 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); } @@ -210,24 +216,25 @@ void __MSG_storage_destroy(msg_storage_priv_t storage) { * 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) + * \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 name the name of a storage - * \return the used space size of the storage element (as a size_t) + * \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); } @@ -242,6 +249,18 @@ xbt_dict_t MSG_storage_get_properties(msg_storage_t storage) 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 @@ -290,7 +309,7 @@ msg_error_t MSG_storage_set_data(msg_storage_t storage, void *data) * * \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) @@ -298,3 +317,14 @@ 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)); +}