A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
the name field of a msg_file_t is actually a full name (including path),
[simgrid.git]
/
src
/
msg
/
msg_io.c
diff --git
a/src/msg/msg_io.c
b/src/msg/msg_io.c
index
798e7e2
..
e6cade0
100644
(file)
--- a/
src/msg/msg_io.c
+++ b/
src/msg/msg_io.c
@@
-20,29
+20,27
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_io, msg,
/********************************* File **************************************/
/** \ingroup msg_file_management
/********************************* File **************************************/
/** \ingroup msg_file_management
- * \brief Read
elements of
a file
+ * \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
* \param size of the file to read
* \param fd is a the file descriptor
- * \return the number of
item
s successfully read
+ * \return the number of
byte
s 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
}
/** \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
* \param size of the file to write
* \param fd is a the file descriptor
- * \return the number of
item
s successfully write
+ * \return the number of
byte
s 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
}
/** \ingroup msg_file_management
@@
-53,12
+51,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
*/
*
* \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);
{
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 = 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;
}
return file;
}
@@
-71,7
+69,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);
int MSG_file_close(msg_file_t fd)
{
int res = simcall_file_close(fd->simdata->smx_file);
- free(fd->name);
+ free(fd->
full
name);
xbt_free(fd->simdata);
xbt_free(fd);
return res;
xbt_free(fd->simdata);
xbt_free(fd);
return res;