X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5b3677b425b9cc6949c1573d59ac772540cbf4b2..73662a7c0b0d1e462f2b99322183295be3a24a5a:/src/msg/msg_io.c diff --git a/src/msg/msg_io.c b/src/msg/msg_io.c index 003705605f..ec54dd9a59 100644 --- a/src/msg/msg_io.c +++ b/src/msg/msg_io.c @@ -19,15 +19,17 @@ 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); + + msg_file_priv_t priv = MSG_file_priv(fd); + xbt_dynar_t info = simcall_file_get_info(priv->simdata->smx_file); sg_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 *); + priv->content_type = xbt_dynar_pop_as(info, char *); + priv->storage_type = xbt_dynar_pop_as(info, char *); + priv->storageId = xbt_dynar_pop_as(info, char *); + priv->mount_point = xbt_dynar_pop_as(info, char *); psize = xbt_dynar_pop_as(info, sg_size_t*); - fd->info->size = *psize; + priv->size = *psize; xbt_free(psize); xbt_dynar_free_container(&info); } @@ -41,8 +43,8 @@ void __MSG_file_get_info(msg_file_t fd){ */ msg_error_t MSG_file_set_data(msg_file_t fd, void *data) { - SIMIX_file_set_data(fd->simdata->smx_file,data); - + msg_file_priv_t priv = MSG_file_priv(fd); + priv->data = data; return MSG_OK; } @@ -55,7 +57,8 @@ msg_error_t MSG_file_set_data(msg_file_t fd, void *data) */ void *MSG_file_get_data(msg_file_t fd) { - return SIMIX_file_get_data(fd->simdata->smx_file); + msg_file_priv_t priv = MSG_file_priv(fd); + return priv->data; } /** \ingroup msg_file_management @@ -65,19 +68,20 @@ void *MSG_file_get_data(msg_file_t fd) */ void MSG_file_dump (msg_file_t fd){ -// THROW_UNIMPLEMENTED; /* Update the cached information first */ __MSG_file_get_info(fd); + + msg_file_priv_t priv = MSG_file_priv(fd); XBT_INFO("File Descriptor information:\n" - "\t\tFull name: '%s'\n" + "\t\tFull path: '%s'\n" "\t\tSize: %llu\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); + priv->fullpath, priv->size, priv->mount_point, + priv->storageId, priv->storage_type, + priv->content_type); } /** \ingroup msg_file_management @@ -89,7 +93,8 @@ void MSG_file_dump (msg_file_t fd){ */ sg_size_t MSG_file_read(msg_file_t fd, sg_size_t size) { - return simcall_file_read(fd->simdata->smx_file, size); + msg_file_priv_t priv = MSG_file_priv(fd); + return simcall_file_read(priv->simdata->smx_file, size); } /** \ingroup msg_file_management @@ -101,27 +106,37 @@ sg_size_t MSG_file_read(msg_file_t fd, sg_size_t size) */ sg_size_t MSG_file_write(msg_file_t fd, sg_size_t size) { - return simcall_file_write(fd->simdata->smx_file, size); + msg_file_priv_t priv = MSG_file_priv(fd); + return simcall_file_write(priv->simdata->smx_file, size); } /** \ingroup msg_file_management * \brief Opens the file whose name is the string pointed to by path * * \param mount is the mount point where find the file is located - * \param fullname is the file location on the storage + * \param fullpath is the file location on the storage * \param data user data to attach to the file * * \return An #msg_file_t associated to the file */ -msg_file_t MSG_file_open(const char* mount, const char* fullname, void* data) +msg_file_t MSG_file_open(const char* fullpath, void* data) +{ + 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); + xbt_lib_set(file_lib, fullpath, MSG_FILE_LEVEL, priv); + return (msg_file_t) xbt_lib_get_elm_or_null(file_lib, fullpath); +} + +/** + * \brief Frees private data of a file (internal call only) + */ +void __MSG_file_priv_free(msg_file_priv_t priv) { - 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_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; + xbt_free(&priv->simdata->smx_file); + free(priv); } /** \ingroup msg_file_management @@ -132,11 +147,9 @@ msg_file_t MSG_file_open(const char* mount, const char* fullname, void* data) */ int MSG_file_close(msg_file_t fd) { - int res = simcall_file_close(fd->simdata->smx_file); - free(fd->fullname); - xbt_free(fd->simdata); - xbt_free(fd->info); - xbt_free(fd); + msg_file_priv_t priv = MSG_file_priv(fd); + int res = simcall_file_close(priv->simdata->smx_file); + xbt_lib_unset(file_lib, priv->fullpath, MSG_FILE_LEVEL, 1); return res; } @@ -148,11 +161,8 @@ int MSG_file_close(msg_file_t fd) */ int MSG_file_unlink(msg_file_t fd) { - int res = simcall_file_unlink(fd->simdata->smx_file); - free(fd->fullname); - xbt_free(fd->simdata); - xbt_free(fd->info); - xbt_free(fd); + msg_file_priv_t priv = MSG_file_priv(fd); + int res = simcall_file_unlink(priv->simdata->smx_file); return res; } @@ -163,7 +173,8 @@ int MSG_file_unlink(msg_file_t fd) * \return the size of the file (as a #sg_size_t) */ sg_size_t MSG_file_get_size(msg_file_t fd){ - return simcall_file_get_size(fd->simdata->smx_file); + msg_file_priv_t priv = MSG_file_priv(fd); + return simcall_file_get_size(priv->simdata->smx_file); } /** \ingroup msg_file_management @@ -190,7 +201,7 @@ xbt_dict_t MSG_file_ls(const char *mount, const char *path) return simcall_file_ls(mount, path); } -/* +/** * \ingroup msg_file_management * \brief Set the file position indicator in the msg_file_t by adding offset bytes * to the position specified by origin (either SEEK_SET, SEEK_CUR, or SEEK_END). @@ -198,7 +209,7 @@ xbt_dict_t MSG_file_ls(const char *mount, const char *path) * \param fd : file object that identifies the stream * \param offset : number of bytes to offset from origin * \param origin : Position used as reference for the offset. It is specified by - * one of the following constants defined in exclusively to be used as + * one of the following constants defined in \ exclusively to be used as * arguments for this function (SEEK_SET = beginning of file, SEEK_CUR = current * position of the file pointer, SEEK_END = end of file) * @@ -208,11 +219,11 @@ xbt_dict_t MSG_file_ls(const char *mount, const char *path) */ msg_error_t MSG_file_seek(msg_file_t fd, sg_size_t offset, int origin) { - //THROW_UNIMPLEMENTED; - return simcall_file_seek(fd->simdata->smx_file, offset, origin); + msg_file_priv_t priv = MSG_file_priv(fd); + return simcall_file_seek(priv->simdata->smx_file, offset, origin); } -/* +/** * \ingroup msg_file_management * \brief Returns the current value of the position indicator of the file * @@ -222,10 +233,25 @@ msg_error_t MSG_file_seek(msg_file_t fd, sg_size_t offset, int origin) */ sg_size_t MSG_file_tell(msg_file_t fd) { - return simcall_file_tell(fd->simdata->smx_file); + msg_file_priv_t priv = MSG_file_priv(fd); + return simcall_file_tell(priv->simdata->smx_file); +} + +const char *MSG_file_get_name(msg_file_t fd) { + xbt_assert((fd != NULL), "Invalid parameters"); + msg_file_priv_t priv = MSG_file_priv(fd); + return priv->fullpath; } +/* + * \brief Destroys a file (internal call only) + */ +void __MSG_file_destroy(msg_file_priv_t file) { + xbt_free(file->fullpath); + xbt_free(file->simdata); + xbt_free(file); +} /********************************* Storage **************************************/ /** @addtogroup msg_storage_management @@ -237,7 +263,9 @@ sg_size_t MSG_file_tell(msg_file_t fd) 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->host = host; xbt_lib_set(storage_lib,name,MSG_STORAGE_LEVEL,storage_private); return xbt_lib_get_elm_or_null(storage_lib, name); } @@ -246,10 +274,10 @@ msg_storage_t __MSG_storage_create(smx_storage_t storage) * \brief Destroys a storage (internal call only) */ void __MSG_storage_destroy(msg_storage_priv_t storage) { - free(storage); } + /** \ingroup msg_storage_management * * \brief Returns the name of the #msg_storage_t. @@ -324,12 +352,11 @@ xbt_dynar_t MSG_storages_as_dynar(void) { xbt_dynar_t res = xbt_dynar_new(sizeof(msg_storage_t),NULL); xbt_lib_foreach(storage_lib, cursor, key, data) { - if(routing_get_network_element_type(key) == MSG_STORAGE_LEVEL) { + if(xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), MSG_STORAGE_LEVEL) != NULL) { xbt_dictelm_t elm = xbt_dict_cursor_get_elm(cursor); xbt_dynar_push(res, &elm); } } - return res; } @@ -341,8 +368,8 @@ xbt_dynar_t MSG_storages_as_dynar(void) { */ msg_error_t MSG_storage_set_data(msg_storage_t storage, void *data) { - SIMIX_storage_set_data(storage,data); - + msg_storage_priv_t priv = MSG_storage_priv(storage); + priv->data = data; return MSG_OK; } @@ -355,7 +382,9 @@ msg_error_t MSG_storage_set_data(msg_storage_t storage, void *data) */ void *MSG_storage_get_data(msg_storage_t storage) { - return SIMIX_storage_get_data(storage); + xbt_assert((storage != NULL), "Invalid parameters"); + msg_storage_priv_t priv = MSG_storage_priv(storage); + return priv->data; } /** \ingroup msg_storage_management @@ -374,7 +403,7 @@ sg_size_t MSG_storage_get_size(msg_storage_t storage) return SIMIX_storage_get_size(storage); } -/* +/** * \ingroup msg_storage_management * * \brief Rename the file in the contents of its associated storage. @@ -385,7 +414,7 @@ msg_error_t MSG_storage_file_rename(msg_storage_t storage, const char* src, con return MSG_OK; } -/* +/** * \ingroup msg_storage_management * \brief Move a file to another location. Depending on the values of dest, dest, mount, * and fullname, this move can be local or remote and, within a host, on the same @@ -397,3 +426,15 @@ msg_error_t MSG_storage_file_move (msg_file_t fd, msg_host_t dest, char* mount, THROW_UNIMPLEMENTED; return MSG_OK; } + +/** \ingroup msg_storage_management + * + * \brief Returns the host name the storage is attached to + * + * This functions checks whether a storage is a valid pointer or not and return its name. + */ +const char *MSG_storage_get_host(msg_storage_t storage) { + xbt_assert((storage != NULL), "Invalid parameters"); + msg_storage_priv_t priv = MSG_storage_priv(storage); + return priv->host; +}