-/* 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
#include "msg_private.h"
#include "xbt/log.h"
+#include <inttypes.h>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_io, msg,
"Logging specific to MSG (io)");
/********************************* 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);
}
// 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
* \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
* \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
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;
*/
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);
}
return simcall_file_ls(mount, path);
}
+/*
+ * 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
+ * mounted disk or between mounted disks.
+ *
+ */
+msg_error_t MSG_file_move (msg_file_t fd, msg_host_t dest, char* mount, char* fullname)
+{
+ THROW_UNIMPLEMENTED;
+ return MSG_OK;
+}
+
+/*
+ * Set the file position indicator in the msg_file_t by adding offset bytes
+ * to the position specified by whence (either SEEK_SET, SEEK_CUR, or SEEK_END).
+ */
+msg_error_t MSG_file_seek (msg_file_t fd, sg_storage_size_t offset, int whence)
+{
+ THROW_UNIMPLEMENTED;
+ return MSG_OK;
+}
+
+/*
+ * Rename the file in the contents of its associated storage.
+ */
+msg_error_t MSG_file_rename (msg_file_t fd, const char* new_name)
+{
+ simcall_file_rename(fd->simdata->smx_file, new_name);
+ return MSG_OK;
+}
+
/********************************* Storage **************************************/
/** @addtogroup msg_storage_management
*
*/
-
-/* TODO: PV: to comment */
msg_storage_t __MSG_storage_create(smx_storage_t storage)
{
const char *name = SIMIX_storage_get_name(storage);
- xbt_lib_set(storage_lib,name,MSG_HOST_LEVEL,storage);
+ msg_storage_priv_t storage_private = xbt_new0(s_msg_storage_priv_t, 1);
+ xbt_lib_set(storage_lib,name,MSG_STORAGE_LEVEL,storage_private);
return xbt_lib_get_elm_or_null(storage_lib, name);
}
* This functions checks whether a storage is a valid pointer or not and return its name.
*/
const char *MSG_storage_get_name(msg_storage_t storage) {
+ xbt_assert((storage != NULL), "Invalid parameters");
return SIMIX_storage_get_name(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);
}
*
* \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){
+xbt_dict_t MSG_storage_get_content(msg_storage_t storage)
+{
+ return SIMIX_storage_get_content(storage);
+}
- return SIMIX_storage_get_content(storage);
+sg_storage_size_t MSG_storage_get_size(msg_storage_t storage)
+{
+ return SIMIX_storage_get_size(storage);
}
+
