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
Use kernelImmediate for simcalls execution_{,parallel_}start.
[simgrid.git]
/
src
/
simix
/
smx_io.cpp
diff --git
a/src/simix/smx_io.cpp
b/src/simix/smx_io.cpp
index
1b31af0
..
e5a998c
100644
(file)
--- a/
src/simix/smx_io.cpp
+++ b/
src/simix/smx_io.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2007-201
7
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-201
8
. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
@@
-9,59
+9,47
@@
#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 "smx_private.hpp"
+#include "src/simix/smx_io_private.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 "src/surf/surf_interface.hpp"
#include "src/surf/surf_interface.hpp"
-#include "s
mx_private.h
"
+#include "s
urf/surf.hpp
"
#include "src/kernel/activity/SynchroIo.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_io, simix, "Logging specific to SIMIX (io)");
#include "src/kernel/activity/SynchroIo.hpp"
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, sg_host_t host)
+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, host
);
+ 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, sg_host_t host
)
+smx_activity_t SIMIX_
storage_read(surf_storage_t st, sg_size_t size
)
{
{
- /* check if the host is active */
- if (host->isOff())
- THROWF(host_error, 0, "Host %s failed, you cannot call this function", host->getCname());
-
simgrid::kernel::activity::IoImpl* synchro = new simgrid::kernel::activity::IoImpl();
simgrid::kernel::activity::IoImpl* synchro = new simgrid::kernel::activity::IoImpl();
- synchro->host = host;
- synchro->surf_io = host->pimpl_->read(file, 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, sg_host_t host)
+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, host
);
+ 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, sg_host_t host
)
+smx_activity_t SIMIX_
storage_write(surf_storage_t st, sg_size_t size
)
{
{
- if (host->isOff())
- THROWF(host_error, 0, "Host %s failed, you cannot call this function", host->getCname());
-
simgrid::kernel::activity::IoImpl* synchro = new simgrid::kernel::activity::IoImpl();
simgrid::kernel::activity::IoImpl* synchro = new simgrid::kernel::activity::IoImpl();
- synchro->host = host;
- synchro->surf_io = host->pimpl_->write(file, size);
- synchro->surf_io->setData(synchro);
+ synchro->surf_io = st->write(size);
+ synchro->surf_io->set_data(synchro);
XBT_DEBUG("Create io synchro %p", synchro);
return synchro;
XBT_DEBUG("Create io synchro %p", synchro);
return synchro;
@@
-77,7
+65,7
@@
void SIMIX_io_destroy(smx_activity_t synchro)
void SIMIX_io_finish(smx_activity_t synchro)
{
void SIMIX_io_finish(smx_activity_t synchro)
{
- for (smx_simcall_t simcall : synchro->simcalls) {
+ for (smx_simcall_t
const&
simcall : synchro->simcalls) {
switch (synchro->state) {
case SIMIX_DONE:
/* do nothing, synchro done */
switch (synchro->state) {
case SIMIX_DONE:
/* do nothing, synchro done */