X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3962a9c26474fb94222c01ccb6f1dc38d8d6cb54..e342f6395a0c18edfd89f6fc4540adf3c829e5e6:/src/msg/msg_io.c diff --git a/src/msg/msg_io.c b/src/msg/msg_io.c index 4a140f94ac..08601f3f74 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)"); @@ -20,12 +21,15 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_io, msg, /********************************* File **************************************/ void __MSG_file_get_info(msg_file_t fd){ xbt_dynar_t info = simcall_file_get_info(fd->simdata->smx_file); + sg_storage_size_t *psize; + fd->info->content_type = xbt_dynar_pop_as(info, char *); 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); - + psize = xbt_dynar_pop_as(info, sg_storage_size_t*); + fd->info->size = *psize; + xbt_free(psize); xbt_dynar_free_container(&info); } @@ -65,11 +69,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,9 +88,9 @@ 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(msg_file_t fd, sg_storage_size_t size) { - return simcall_file_read(size, fd->simdata->smx_file); + return simcall_file_read(fd->simdata->smx_file, size); } /** \ingroup msg_file_management @@ -91,9 +100,9 @@ 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(msg_file_t fd, sg_storage_size_t size) { - return simcall_file_write(size, fd->simdata->smx_file); + return simcall_file_write(fd->simdata->smx_file, size); } /** \ingroup msg_file_management @@ -110,7 +119,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; @@ -140,17 +149,21 @@ int MSG_file_close(msg_file_t fd) */ int MSG_file_unlink(msg_file_t fd) { - return simcall_file_unlink(fd->simdata->smx_file); + int res = simcall_file_unlink(fd->simdata->smx_file); + free(fd->fullname); + xbt_free(fd->simdata); + xbt_free(fd->info); + xbt_free(fd); + return res; } /** \ingroup msg_file_management * \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); } @@ -218,18 +231,18 @@ const char *MSG_storage_get_name(msg_storage_t 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); } @@ -263,7 +276,7 @@ void MSG_storage_set_property_value(msg_storage_t storage, const char *name, cha */ msg_storage_t MSG_storage_get_by_name(const char *name) { - return (msg_storage_t) xbt_lib_get_or_null(storage_lib,name, MSG_STORAGE_LEVEL); + return (msg_storage_t) xbt_lib_get_elm_or_null(storage_lib,name); } /** \ingroup msg_storage_management @@ -316,8 +329,10 @@ void *MSG_storage_get_data(msg_storage_t storage) * * \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 SIMIX_storage_get_content(storage); + //return (simcall_storage_get_properties(storage)); }