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
finish snake_casing resource::Action
[simgrid.git]
/
src
/
simix
/
smx_io.cpp
diff --git
a/src/simix/smx_io.cpp
b/src/simix/smx_io.cpp
index
90c7f88
..
b0363e9
100644
(file)
--- a/
src/simix/smx_io.cpp
+++ b/
src/simix/smx_io.cpp
@@
-9,10
+9,9
@@
#include "simgrid/s4u/Host.hpp"
#include "simgrid/s4u/Storage.hpp"
#include "simgrid/s4u/Host.hpp"
#include "simgrid/s4u/Storage.hpp"
-#include "src/surf/FileImpl.hpp"
#include "src/surf/HostImpl.hpp"
#include "src/surf/StorageImpl.hpp"
#include "src/surf/HostImpl.hpp"
#include "src/surf/StorageImpl.hpp"
-#include "surf/surf.h"
+#include "surf/surf.h
pp
"
#include "smx_private.hpp"
#include "src/surf/surf_interface.hpp"
#include "smx_private.hpp"
#include "src/surf/surf_interface.hpp"
@@
-21,38
+20,36
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_io, simix, "Logging specific to SIMIX (io)");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_io, simix, "Logging specific to SIMIX (io)");
-//SIMIX FILE READ
-void simcall_HANDLER_file_read(smx_simcall_t simcall, surf_file_t fd, sg_size_t size)
+void simcall_HANDLER_storage_read(smx_simcall_t simcall, surf_storage_t st, sg_size_t size)
{
{
- smx_activity_t synchro = SIMIX_
file_read(fd
, size);
+ smx_activity_t synchro = SIMIX_
storage_read(st
, size);
synchro->simcalls.push_back(simcall);
simcall->issuer->waiting_synchro = synchro;
}
synchro->simcalls.push_back(simcall);
simcall->issuer->waiting_synchro = synchro;
}
-smx_activity_t SIMIX_
file_read(surf_file_t file
, sg_size_t size)
+smx_activity_t SIMIX_
storage_read(surf_storage_t st
, sg_size_t size)
{
simgrid::kernel::activity::IoImpl* synchro = new simgrid::kernel::activity::IoImpl();
{
simgrid::kernel::activity::IoImpl* synchro = new simgrid::kernel::activity::IoImpl();
- synchro->surf_io =
file
->read(size);
+ synchro->surf_io =
st
->read(size);
- synchro->surf_io->set
D
ata(synchro);
+ synchro->surf_io->set
_d
ata(synchro);
XBT_DEBUG("Create io synchro %p", synchro);
return synchro;
}
XBT_DEBUG("Create io synchro %p", synchro);
return synchro;
}
-//SIMIX FILE WRITE
-void simcall_HANDLER_file_write(smx_simcall_t simcall, surf_file_t fd, sg_size_t size)
+void simcall_HANDLER_storage_write(smx_simcall_t simcall, surf_storage_t st, sg_size_t size)
{
{
- smx_activity_t synchro = SIMIX_
file_write(fd
, size);
+ smx_activity_t synchro = SIMIX_
storage_write(st
, size);
synchro->simcalls.push_back(simcall);
simcall->issuer->waiting_synchro = synchro;
}
synchro->simcalls.push_back(simcall);
simcall->issuer->waiting_synchro = synchro;
}
-smx_activity_t SIMIX_
file_write(surf_file_t file
, sg_size_t size)
+smx_activity_t SIMIX_
storage_write(surf_storage_t st
, sg_size_t size)
{
simgrid::kernel::activity::IoImpl* synchro = new simgrid::kernel::activity::IoImpl();
{
simgrid::kernel::activity::IoImpl* synchro = new simgrid::kernel::activity::IoImpl();
- synchro->surf_io =
file
->write(size);
- synchro->surf_io->set
D
ata(synchro);
+ synchro->surf_io =
st
->write(size);
+ synchro->surf_io->set
_d
ata(synchro);
XBT_DEBUG("Create io synchro %p", synchro);
return synchro;
XBT_DEBUG("Create io synchro %p", synchro);
return synchro;