-/** @addtogroup m_file_management
- * \htmlonly <!-- DOXYGEN_NAVBAR_LABEL="File" --> \endhtmlonly
- * (#m_file_t) and the functions for managing it.
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_io, msg,
+ "Logging specific to MSG (io)");
+
+/** @addtogroup msg_file_management
+ * \htmlonly <!-- DOXYGEN_NAVBAR_LABEL="Files" --> \endhtmlonly
+ * (#msg_file_t) and the functions for managing it.
* \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
*/
* \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, m_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, (m_file_t)stream);
+ return simcall_file_read(ptr, size, nmemb, stream->simdata->smx_file);
* \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
*/
* \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, m_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, (m_file_t)stream);
+ return simcall_file_write(ptr, size, nmemb, stream->simdata->smx_file);
* \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.
* r+ Open for reading and writing. The stream is positioned at the beginning of the file.
* w Truncate file to zero length or create text file for writing. The stream is positioned at the beginning of the file.
* \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.
* r+ Open for reading and writing. The stream is positioned at the beginning of the file.
* w Truncate file to zero length or create text file for writing. The stream is positioned at the beginning of the file.
- * w+ Open for reading and writing. The file is created if it does not exist, otherwise it is truncated. The stream is positioned at the beginā
- * ning of the file.
+ * w+ Open for reading and writing. The file is created if it does not exist, otherwise it is truncated. The stream is positioned at the
+ * beginning of the file.
* a Open for appending (writing at end of file). The file is created if it does not exist. The stream is positioned at the end of the file.
* a+ Open for reading and appending (writing at end of file). The file is created if it does not exist. The initial file position for reading
* is at the beginning of the file, but output is always appended to the end of the file.
*
* a Open for appending (writing at end of file). The file is created if it does not exist. The stream is positioned at the end of the file.
* a+ Open for reading and appending (writing at end of file). The file is created if it does not exist. The initial file position for reading
* is at the beginning of the file, but output is always appended to the end of the file.
*
- return (m_file_t) simcall_file_open(storage, path, 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(mount, path, mode);
+ return file;