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
fix tracing tests
[simgrid.git]
/
src
/
msg
/
msg_io.cpp
diff --git
a/src/msg/msg_io.cpp
b/src/msg/msg_io.cpp
index
2c0b61b
..
1913d3b
100644
(file)
--- a/
src/msg/msg_io.cpp
+++ b/
src/msg/msg_io.cpp
@@
-93,7
+93,7
@@
sg_size_t MSG_file_read(msg_file_t fd, sg_size_t size)
/* Find the host where the file is physically located and read it */
msg_storage_t storage_src = simgrid::s4u::Storage::byName(fd->storageId);
msg_host_t attached_host = storage_src->getHost();
/* Find the host where the file is physically located and read it */
msg_storage_t storage_src = simgrid::s4u::Storage::byName(fd->storageId);
msg_host_t attached_host = storage_src->getHost();
- read_size = fd->read(size); // TODO re-add attached_host
;
+ read_size = fd->read(size); // TODO re-add attached_host
if (strcmp(attached_host->getCname(), MSG_host_self()->getCname())) {
/* the file is hosted on a remote host, initiate a communication between src and dest hosts for data transfer */
if (strcmp(attached_host->getCname(), MSG_host_self()->getCname())) {
/* the file is hosted on a remote host, initiate a communication between src and dest hosts for data transfer */
@@
-158,7
+158,7
@@
sg_size_t MSG_file_write(msg_file_t fd, sg_size_t size)
}
/* Write file on local or remote host */
// sg_size_t offset = fd->tell();
}
/* Write file on local or remote host */
// sg_size_t offset = fd->tell();
- sg_size_t write_size = fd->write(size); // TODO readd attached_host
;
+ sg_size_t write_size = fd->write(size); // TODO readd attached_host
return write_size;
}
return write_size;
}
@@
-200,10
+200,7
@@
int MSG_file_close(msg_file_t fd)
*/
msg_error_t MSG_file_unlink(msg_file_t fd)
{
*/
msg_error_t MSG_file_unlink(msg_file_t fd)
{
- /* Find the host where the file is physically located (remote or local)*/
- msg_storage_t storage_src = simgrid::s4u::Storage::byName(fd->storageId);
- msg_host_t attached_host = storage_src->getHost();
- fd->unlink(attached_host);
+ fd->unlink();
delete fd;
return MSG_OK;
}
delete fd;
return MSG_OK;
}
@@
-326,7
+323,7
@@
msg_error_t MSG_file_rcopy (msg_file_t file, msg_host_t host, const char* fullpa
/* Create file on remote host, write it and close it */
msg_file_t fd = new simgrid::s4u::File(fullpath, dst_host, nullptr);
/* Create file on remote host, write it and close it */
msg_file_t fd = new simgrid::s4u::File(fullpath, dst_host, nullptr);
- fd->write(read_size
, dst_host
);
+ fd->write(read_size);
delete fd;
return MSG_OK;
}
delete fd;
return MSG_OK;
}