X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fa8e71be179a7a12e74bcc550fa6fe2c54b8446a..6de9090dd8692387ae343c587b26915f9922d7bd:/src/msg/msg_io.c

diff --git a/src/msg/msg_io.c b/src/msg/msg_io.c
index c8b64de2d5..affae9d2f6 100644
--- a/src/msg/msg_io.c
+++ b/src/msg/msg_io.c
@@ -7,11 +7,11 @@
 #include "msg_private.h"
 #include "xbt/log.h"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_io, simix,
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_io, msg,
                                 "Logging specific to MSG (io)");
 
-/** @addtogroup m_file_management
- *     \htmlonly <!-- DOXYGEN_NAVBAR_LABEL="File" --> \endhtmlonly
+/** @addtogroup msg_file_management
+ *     \htmlonly <!-- DOXYGEN_NAVBAR_LABEL="Files" --> \endhtmlonly
  * (#msg_file_t) and the functions for managing it.
  *
  *  \see #msg_file_t
@@ -19,40 +19,38 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_io, simix,
 
 /********************************* File **************************************/
 
-/** \ingroup m_file_management
+/** \ingroup msg_file_management
  * \brief Read elements of a file
  *
- * \param storage is the name where find the stream
  * \param ptr buffer to where the data is copied
  * \param size of each element
  * \param nmemb is the number of elements of data to read
  * \param stream to read
  * \return the number of items successfully read
  */
-size_t MSG_file_read(const char* storage, void* ptr, size_t size, size_t nmemb,  msg_file_t stream)
+size_t MSG_file_read(void* ptr, size_t size, size_t nmemb,  msg_file_t stream)
 {
-  return simcall_file_read(storage, ptr, size, nmemb, stream->simdata->smx_file);
+  return simcall_file_read(ptr, size, nmemb, stream->simdata->smx_file);
 }
 
-/** \ingroup m_file_management
+/** \ingroup msg_file_management
  * \brief Write elements into a file
  *
- * \param storage is the name where find the stream
  * \param ptr buffer from where the data is copied
  * \param size of each element
  * \param nmemb is the number of elements of data to write
  * \param stream to write
  * \return the number of items successfully write
  */
-size_t MSG_file_write(const char* storage, const void* ptr, size_t size, size_t nmemb, msg_file_t stream)
+size_t MSG_file_write(const void* ptr, size_t size, size_t nmemb, msg_file_t stream)
 {
-  return simcall_file_write(storage, ptr, size, nmemb, stream->simdata->smx_file);
+  return simcall_file_write(ptr, size, nmemb, stream->simdata->smx_file);
 }
 
-/** \ingroup m_file_management
+/** \ingroup msg_file_management
  * \brief Opens the file whose name is the string pointed to by path
  *
- * \param storage is the name where find the file to open
+ * \param mount is the mount point where find the file is located
  * \param path is the file location on the storage
  * \param mode points to a string beginning with one of the following sequences (Additional characters may follow these sequences.):
  *      r      Open text file for reading.  The stream is positioned at the beginning of the file.
@@ -66,38 +64,36 @@ size_t MSG_file_write(const char* storage, const void* ptr, size_t size, size_t
  *
  * \return An #msg_file_t associated to the file
  */
-msg_file_t MSG_file_open(const char* storage, const char* path, const char* mode)
+msg_file_t MSG_file_open(const char* mount, const char* path, const char* mode)
 {
   msg_file_t file = xbt_new(s_msg_file_t,1);
   file->name = strdup(path);
   file->simdata = xbt_new0(s_simdata_file_t,1);
-  file->simdata->smx_file = simcall_file_open(storage, path, mode);
+  file->simdata->smx_file = simcall_file_open(mount, path, mode);
   return file;
 }
 
-/** \ingroup m_file_management
+/** \ingroup msg_file_management
  * \brief Close the file
  *
- * \param storage is the name where find the stream
  * \param fp is the file to close
  * \return 0 on success or 1 on error
  */
-int MSG_file_close(const char* storage, msg_file_t fp)
+int MSG_file_close(msg_file_t fp)
 {
-  return simcall_file_close(storage, fp->simdata->smx_file);
+  return simcall_file_close(fp->simdata->smx_file);
 }
 
-/** \ingroup m_file_management
+/** \ingroup msg_file_management
  * \brief Stats the file pointed by fd
  *
- * \param storage is the name where find the stream
  * \param fd is the file descriptor (#msg_file_t)
  * \param buf is the return structure with informations
  * \return 0 on success or 1 on error
  */
-int MSG_file_stat(const char* storage, msg_file_t fd, s_msg_stat_t *buf)
+int MSG_file_stat(msg_file_t fd, s_msg_stat_t *buf)
 {
   int res;
-  res = simcall_file_stat(storage, fd->simdata->smx_file, buf);
+  res = simcall_file_stat(fd->simdata->smx_file, buf);
   return res;
 }