Fix MSG_file_rcopy() and MSG_file_rmove()

[simgrid.git] / src / simix / smx_user.c

diff --git a/src/simix/smx_user.c b/src/simix/smx_user.c
index 9b6720e..4248741 100644 (file)
--- a/src/simix/smx_user.c
+++ b/src/simix/smx_user.c
@@ -1316,62 +1316,38 @@ int simcall_sem_get_capacity(smx_sem_t sem)
 
 /**
  * \ingroup simix_file_management
- * \brief Returns the user data associated to a file.
  *
- * \param fd A simix file
- * \return the user data of this file
  */
-void* simcall_file_get_data(smx_file_t fd)
+sg_size_t simcall_file_read(smx_file_t fd, sg_size_t size, smx_host_t host)
 {
-  return simcall_BODY_file_get_data(fd);
+  return simcall_BODY_file_read(fd, size, host);
 }
 
 /**
  * \ingroup simix_file_management
- * \brief Sets the user data associated to a file.
  *
- * \param fd A SIMIX file
- * \param data The user data to set
  */
-void simcall_file_set_data(smx_file_t fd, void *data)
+sg_size_t simcall_file_write(smx_file_t fd, sg_size_t size, smx_host_t host)
 {
-  simcall_BODY_file_set_data(fd, data);
-}
-
-/**
- * \ingroup simix_file_management
- *
- */
-sg_size_t simcall_file_read(smx_file_t fd, sg_size_t size)
-{
-  return simcall_BODY_file_read(fd, size);
-}
-
-/**
- * \ingroup simix_file_management
- *
- */
-sg_size_t simcall_file_write(smx_file_t fd, sg_size_t size)
-{
-  return simcall_BODY_file_write(fd, size);
+  return simcall_BODY_file_write(fd, size, host);
 }
 
 /**
  * \ingroup simix_file_management
  * \brief
  */
-smx_file_t simcall_file_open(const char* mount, const char* path)
+smx_file_t simcall_file_open(const char* fullpath, smx_host_t host)
 {
-  return simcall_BODY_file_open(mount, path);
+  return simcall_BODY_file_open(fullpath, host);
 }
 
 /**
  * \ingroup simix_file_management
  *
  */
-int simcall_file_close(smx_file_t fd)
+int simcall_file_close(smx_file_t fd,  smx_host_t host)
 {
-  return simcall_BODY_file_close(fd);
+  return simcall_BODY_file_close(fd, host);
 }
 
 /**
@@ -1383,14 +1359,6 @@ int simcall_file_unlink(smx_file_t fd)
   return simcall_BODY_file_unlink(fd);
 }
 
-/**
- * \ingroup simix_file_management
- *
- */
-xbt_dict_t simcall_file_ls(const char* mount, const char* path)
-{
-  return simcall_BODY_file_ls(mount, path);
-}
 /**
  * \ingroup simix_file_management
  *
@@ -1426,11 +1394,12 @@ int simcall_file_seek(smx_file_t fd, sg_size_t offset, int origin){
 
 /**
  * \ingroup simix_file_management
+ * \brief Move a file to another location on the *same mount point*.
  *
  */
-void simcall_storage_file_rename(smx_storage_t storage, const char* src,  const char* dest)
+int simcall_file_move(smx_file_t fd, const char* fullpath)
 {
-  return simcall_BODY_storage_file_rename(storage, src, dest);
+  return simcall_BODY_file_move(fd, fullpath);
 }
 
 /**
@@ -1459,9 +1428,20 @@ sg_size_t simcall_storage_get_used_size (const char* name){
  * \param host A SIMIX host
  * \return a dict containing all storages mounted on the host
  */
-xbt_dict_t simcall_host_get_storage_list(smx_host_t host)
+xbt_dict_t simcall_host_get_mounted_storage_list(smx_host_t host)
+{
+  return simcall_BODY_host_get_mounted_storage_list(host);
+}
+
+/**
+ * \ingroup simix_storage_management
+ * \brief Returns the list of storages attached to an host.
+ * \param host A SIMIX host
+ * \return a dict containing all storages attached to the host
+ */
+xbt_dynar_t simcall_host_get_attached_storage_list(smx_host_t host)
 {
-  return simcall_BODY_host_get_storage_list(host);
+  return simcall_BODY_host_get_attached_storage_list(host);
 }
 
 /**