-/* 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
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);
}
* \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);
}
* \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);
}
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;
* \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);
}
/** \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);
}
*
* \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));
}