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
cosmetics (codefactor+coding style)
[simgrid.git]
/
src
/
kernel
/
activity
/
IoImpl.cpp
diff --git
a/src/kernel/activity/IoImpl.cpp
b/src/kernel/activity/IoImpl.cpp
index
6022c2d
..
783616f
100644
(file)
--- a/
src/kernel/activity/IoImpl.cpp
+++ b/
src/kernel/activity/IoImpl.cpp
@@
-7,6
+7,7
@@
#include "simgrid/Exception.hpp"
#include "simgrid/kernel/resource/Action.hpp"
#include "simgrid/s4u/Host.hpp"
#include "simgrid/Exception.hpp"
#include "simgrid/kernel/resource/Action.hpp"
#include "simgrid/s4u/Host.hpp"
+#include "src/kernel/resource/DiskImpl.hpp"
#include "src/mc/mc_replay.hpp"
#include "src/simix/smx_private.hpp"
#include "src/surf/StorageImpl.hpp"
#include "src/mc/mc_replay.hpp"
#include "src/simix/smx_private.hpp"
#include "src/surf/StorageImpl.hpp"
@@
-21,10
+22,10
@@
void simcall_HANDLER_io_wait(smx_simcall_t simcall, simgrid::kernel::activity::I
synchro->register_simcall(simcall);
if (MC_is_active() || MC_record_replay_is_active())
synchro->register_simcall(simcall);
if (MC_is_active() || MC_record_replay_is_active())
- synchro->state_ =
SIMIX_
DONE;
+ synchro->state_ =
simgrid::kernel::activity::State::
DONE;
/* If the synchro is already finished then perform the error handling */
/* If the synchro is already finished then perform the error handling */
- if (synchro->state_ !=
SIMIX_
RUNNING)
+ if (synchro->state_ !=
simgrid::kernel::activity::State::
RUNNING)
synchro->finish();
}
synchro->finish();
}
@@
-44,6
+45,12
@@
IoImpl& IoImpl::set_size(sg_size_t size)
return *this;
}
return *this;
}
+IoImpl& IoImpl::set_disk(resource::DiskImpl* disk)
+{
+ disk_ = disk;
+ return *this;
+}
+
IoImpl& IoImpl::set_storage(resource::StorageImpl* storage)
{
storage_ = storage;
IoImpl& IoImpl::set_storage(resource::StorageImpl* storage)
{
storage_ = storage;
@@
-52,8
+59,11
@@
IoImpl& IoImpl::set_storage(resource::StorageImpl* storage)
IoImpl* IoImpl::start()
{
IoImpl* IoImpl::start()
{
- state_ = SIMIX_RUNNING;
- surf_action_ = storage_->io_start(size_, type_);
+ state_ = State::RUNNING;
+ if (storage_)
+ surf_action_ = storage_->io_start(size_, type_);
+ else
+ surf_action_ = disk_->io_start(size_, type_);
surf_action_->set_activity(this);
XBT_DEBUG("Create IO synchro %p %s", this, get_cname());
surf_action_->set_activity(this);
XBT_DEBUG("Create IO synchro %p %s", this, get_cname());
@@
-66,12
+76,12
@@
void IoImpl::post()
{
performed_ioops_ = surf_action_->get_cost();
if (surf_action_->get_state() == resource::Action::State::FAILED) {
{
performed_ioops_ = surf_action_->get_cost();
if (surf_action_->get_state() == resource::Action::State::FAILED) {
- if (
storage_ && not storage_->is_on(
))
- state_ = S
IMIX_
FAILED;
+ if (
(storage_ && not storage_->is_on()) || (disk_ && not disk_->is_on()
))
+ state_ = S
tate::
FAILED;
else
else
- state_ = S
IMIX_
CANCELED;
+ state_ = S
tate::
CANCELED;
} else if (surf_action_->get_state() == resource::Action::State::FINISHED) {
} else if (surf_action_->get_state() == resource::Action::State::FINISHED) {
- state_ = S
IMIX_
DONE;
+ state_ = S
tate::
DONE;
}
on_completion(*this);
}
on_completion(*this);
@@
-85,15
+95,15
@@
void IoImpl::finish()
smx_simcall_t simcall = simcalls_.front();
simcalls_.pop_front();
switch (state_) {
smx_simcall_t simcall = simcalls_.front();
simcalls_.pop_front();
switch (state_) {
- case S
IMIX_
DONE:
+ case S
tate::
DONE:
/* do nothing, synchro done */
break;
/* do nothing, synchro done */
break;
- case S
IMIX_
FAILED:
+ case S
tate::
FAILED:
simcall->issuer_->context_->iwannadie = true;
simcall->issuer_->exception_ =
std::make_exception_ptr(StorageFailureException(XBT_THROW_POINT, "Storage failed"));
break;
simcall->issuer_->context_->iwannadie = true;
simcall->issuer_->exception_ =
std::make_exception_ptr(StorageFailureException(XBT_THROW_POINT, "Storage failed"));
break;
- case S
IMIX_
CANCELED:
+ case S
tate::
CANCELED:
simcall->issuer_->exception_ = std::make_exception_ptr(CancelException(XBT_THROW_POINT, "I/O Canceled"));
break;
default:
simcall->issuer_->exception_ = std::make_exception_ptr(CancelException(XBT_THROW_POINT, "I/O Canceled"));
break;
default: