/********************************* 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, sg_storage_size_t);
-
+ psize = xbt_dynar_pop_as(info, sg_storage_size_t*);
+ fd->info->size = *psize;
+ xbt_free(psize);
xbt_dynar_free_container(&info);
}
* \param fd is a the file descriptor
* \return the number of bytes successfully read
*/
-sg_storage_size_t MSG_file_read(sg_storage_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
* \param fd is a the file descriptor
* \return the number of bytes successfully write
*/
-sg_storage_size_t MSG_file_write(sg_storage_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
*/
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
xbt_dict_t MSG_storage_get_content(msg_storage_t storage)
{
return SIMIX_storage_get_content(storage);
- //return (simcall_storage_get_properties(storage));
+}
+
+sg_storage_size_t MSG_storage_get_size(msg_storage_t storage)
+{
+ return SIMIX_storage_get_size(storage);
}