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'",
- priv->fullname, priv->size, priv->mount_point,
+ priv->fullpath, priv->size, priv->mount_point,
priv->storageId, priv->storage_type,
priv->content_type);
}
* \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->fullname = xbt_strdup(fullname);
+ priv->fullpath = xbt_strdup(fullpath);
priv->simdata = xbt_new0(s_simdata_file_t,1);
- priv->simdata->smx_file = simcall_file_open(mount, fullname);
- xbt_lib_set(file_lib, fullname, MSG_FILE_LEVEL, priv);
- return (msg_file_t) xbt_lib_get_elm_or_null(file_lib, fullname);
+ 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);
}
/**
{
msg_file_priv_t priv = MSG_file_priv(fd);
int res = simcall_file_close(priv->simdata->smx_file);
- xbt_lib_unset(file_lib, priv->fullname, MSG_FILE_LEVEL, 1);
+ xbt_lib_unset(file_lib, priv->fullpath, MSG_FILE_LEVEL, 1);
return res;
}
* \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 <cstdio> exclusively to be used as
+ * one of the following constants defined in \<stdio.h\> 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)
*
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->fullname;
+ 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 **************************************/
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);
}
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;
}
*/
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;
}
*/
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
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;
+}