X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e1973b337aa4a275d58f5f934f899291612b698a..8af8a1a1a07bf54b28a5fc112ac1ee7875b5c250:/src/msg/msg_io.c

diff --git a/src/msg/msg_io.c b/src/msg/msg_io.c
index 798e7e2174..c2da672c75 100644
--- a/src/msg/msg_io.c
+++ b/src/msg/msg_io.c
@@ -20,29 +20,43 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_io, msg,
 /********************************* File **************************************/
 
 /** \ingroup msg_file_management
- * \brief Read elements of a file
+ * \brief Display information related to a file descriptor
+ *
+ * \param fd is a the file descriptor
+ */
+
+void MSG_file_dump (msg_file_t fd){
+   THROW_UNIMPLEMENTED;
+  /* Update the cached information first */
+//  fd->info = __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\t Storage Id: '%s'"
+//      "\n\t\t Content Type: '%s'", fd->fullname, fd->info->size, NULL,NULL,NULL);
+//      fd->info->mount_point, fd->info->storageId, fd->info->content_type);
+}
+
+/** \ingroup msg_file_management
+ * \brief Read a file
  *
- * \param ptr buffer to where the data is copied
  * \param size of the file to read
  * \param fd is a the file descriptor
- * \return the number of items successfully read
+ * \return the number of bytes successfully read
  */
-size_t MSG_file_read(void* ptr, size_t size, msg_file_t fd)
+size_t MSG_file_read(size_t size, msg_file_t fd)
 {
-  return simcall_file_read(ptr, size, fd->simdata->smx_file);
+  return simcall_file_read(size, fd->simdata->smx_file);
 }
 
 /** \ingroup msg_file_management
- * \brief Write elements into a file
+ * \brief Write into a file
  *
- * \param ptr buffer from where the data is copied
  * \param size of the file to write
  * \param fd is a the file descriptor
- * \return the number of items successfully write
+ * \return the number of bytes successfully write
  */
-size_t MSG_file_write(const void* ptr, size_t size, msg_file_t fd)
+size_t MSG_file_write(size_t size, msg_file_t fd)
 {
-  return simcall_file_write(ptr, size, fd->simdata->smx_file);
+  return simcall_file_write(size, fd->simdata->smx_file);
 }
 
 /** \ingroup msg_file_management
@@ -53,12 +67,12 @@ size_t MSG_file_write(const void* ptr, size_t size, msg_file_t fd)
  *
  * \return An #msg_file_t associated to the file
  */
-msg_file_t MSG_file_open(const char* mount, const char* path)
+msg_file_t MSG_file_open(const char* mount, const char* fullname)
 {
   msg_file_t file = xbt_new(s_msg_file_t,1);
-  file->name = xbt_strdup(path);
+  file->fullname = xbt_strdup(fullname);
   file->simdata = xbt_new0(s_simdata_file_t,1);
-  file->simdata->smx_file = simcall_file_open(mount, path);
+  file->simdata->smx_file = simcall_file_open(mount, fullname);
   return file;
 }
 
@@ -71,7 +85,7 @@ msg_file_t MSG_file_open(const char* mount, const char* path)
 int MSG_file_close(msg_file_t fd)
 {
   int res = simcall_file_close(fd->simdata->smx_file);
-  free(fd->name);
+  free(fd->fullname);
   xbt_free(fd->simdata);
   xbt_free(fd);
   return res;
@@ -122,3 +136,14 @@ xbt_dict_t MSG_file_ls(const char *mount, const char *path)
 
   return simcall_file_ls(mount, path);
 }
+
+/** \ingroup msg_storage_management
+ * \brief Return the free space size of a storage element
+ *
+ * \param sd is the storage descriptor (#msg_storage_t)
+ * \return the free space size of the storage element (as a size_t)
+ */
+
+size_t MSG_storage_get_free_size(msg_storage_t sd){
+  return simcall_storage_get_free_size(sd->simdata->smx_storage);
+}