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
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
simix
/
smx_io.cpp
diff --git
a/src/simix/smx_io.cpp
b/src/simix/smx_io.cpp
index
bdc9166
..
f210733
100644
(file)
--- a/
src/simix/smx_io.cpp
+++ b/
src/simix/smx_io.cpp
@@
-3,20
+3,13
@@
/* 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. */
-#include <xbt/ex.hpp>
-#include <xbt/sysdep.h>
-#include <xbt/log.h>
-
#include "simgrid/s4u/Host.hpp"
#include "simgrid/s4u/Host.hpp"
-#include "simgrid/s4u/Storage.hpp"
+#include "xbt/ex.hpp"
+
#include "smx_private.hpp"
#include "smx_private.hpp"
+#include "src/kernel/activity/IoImpl.hpp"
#include "src/simix/smx_io_private.hpp"
#include "src/simix/smx_io_private.hpp"
-#include "src/surf/HostImpl.hpp"
#include "src/surf/StorageImpl.hpp"
#include "src/surf/StorageImpl.hpp"
-#include "src/surf/surf_interface.hpp"
-#include "surf/surf.hpp"
-
-#include "src/kernel/activity/SynchroIo.hpp"
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)");
@@
-30,9
+23,9
@@
void simcall_HANDLER_storage_read(smx_simcall_t simcall, surf_storage_t st, sg_s
smx_activity_t SIMIX_storage_read(surf_storage_t st, sg_size_t size)
{
simgrid::kernel::activity::IoImpl* synchro = new simgrid::kernel::activity::IoImpl();
smx_activity_t SIMIX_storage_read(surf_storage_t st, sg_size_t size)
{
simgrid::kernel::activity::IoImpl* synchro = new simgrid::kernel::activity::IoImpl();
- synchro->surf_
io
= st->read(size);
+ synchro->surf_
action_
= st->read(size);
- synchro->surf_
io
->set_data(synchro);
+ synchro->surf_
action_
->set_data(synchro);
XBT_DEBUG("Create io synchro %p", synchro);
return synchro;
XBT_DEBUG("Create io synchro %p", synchro);
return synchro;
@@
-48,8
+41,8
@@
void simcall_HANDLER_storage_write(smx_simcall_t simcall, surf_storage_t st, sg_
smx_activity_t SIMIX_storage_write(surf_storage_t st, sg_size_t size)
{
simgrid::kernel::activity::IoImpl* synchro = new simgrid::kernel::activity::IoImpl();
smx_activity_t SIMIX_storage_write(surf_storage_t st, sg_size_t size)
{
simgrid::kernel::activity::IoImpl* synchro = new simgrid::kernel::activity::IoImpl();
- synchro->surf_
io
= st->write(size);
- synchro->surf_
io
->set_data(synchro);
+ synchro->surf_
action_
= st->write(size);
+ synchro->surf_
action_
->set_data(synchro);
XBT_DEBUG("Create io synchro %p", synchro);
return synchro;
XBT_DEBUG("Create io synchro %p", synchro);
return synchro;
@@
-59,8
+52,8
@@
void SIMIX_io_destroy(smx_activity_t synchro)
{
simgrid::kernel::activity::IoImplPtr io = boost::static_pointer_cast<simgrid::kernel::activity::IoImpl>(synchro);
XBT_DEBUG("Destroy synchro %p", synchro.get());
{
simgrid::kernel::activity::IoImplPtr io = boost::static_pointer_cast<simgrid::kernel::activity::IoImpl>(synchro);
XBT_DEBUG("Destroy synchro %p", synchro.get());
- if (io->surf_
io
)
- io->surf_
io
->unref();
+ if (io->surf_
action_
)
+ io->surf_
action_
->unref();
}
void SIMIX_io_finish(smx_activity_t synchro)
}
void SIMIX_io_finish(smx_activity_t synchro)
@@
-80,8
+73,8
@@
void SIMIX_io_finish(smx_activity_t synchro)
xbt_die("Internal error in SIMIX_io_finish: unexpected synchro state %d", static_cast<int>(synchro->state_));
}
xbt_die("Internal error in SIMIX_io_finish: unexpected synchro state %d", static_cast<int>(synchro->state_));
}
- if (simcall->issuer->host
->isO
ff()) {
- simcall->issuer->context->iwannadie = 1;
+ if (simcall->issuer->host
_->is_o
ff()) {
+ simcall->issuer->context
_
->iwannadie = 1;
}
simcall->issuer->waiting_synchro = nullptr;
}
simcall->issuer->waiting_synchro = nullptr;