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
try to clean and uniformize Activity Impls
[simgrid.git]
/
src
/
kernel
/
activity
/
IoImpl.cpp
diff --git
a/src/kernel/activity/IoImpl.cpp
b/src/kernel/activity/IoImpl.cpp
index
f8fd4c9
..
e24fe23
100644
(file)
--- a/
src/kernel/activity/IoImpl.cpp
+++ b/
src/kernel/activity/IoImpl.cpp
@@
-37,27
+37,38
@@
namespace simgrid {
namespace kernel {
namespace activity {
namespace kernel {
namespace activity {
-IoImpl
::IoImpl(std::string name, surf::StorageImpl* storage) : ActivityImpl(std::move(name)), storage_(storag
e)
+IoImpl
& IoImpl::set_name(const std::string& nam
e)
{
{
- this->state_ = SIMIX_RUNNING;
+ ActivityImpl::set_name(name);
+ return *this;
+}
- XBT_DEBUG("Create io impl %p", this);
+IoImpl& IoImpl::set_type(s4u::Io::OpType type)
+{
+ type_ = type;
+ return *this;
}
}
-IoImpl
::~IoImpl(
)
+IoImpl
& IoImpl::set_size(sg_size_t size
)
{
{
- if (surf_action_ != nullptr)
- surf_action_->unref();
- XBT_DEBUG("Destroy io %p", this);
+ size_ = size;
+ return *this;
}
}
-IoImpl
* IoImpl::start(sg_size_t size, simgrid::s4u::Io::OpType typ
e)
+IoImpl
& IoImpl::set_storage(resource::StorageImpl* storag
e)
{
{
- surf_action_ = storage_->io_start(size, type);
+ storage_ = storage;
+ return *this;
+}
+
+IoImpl* IoImpl::start()
+{
+ state_ = SIMIX_RUNNING;
+ surf_action_ = storage_->io_start(size_, type_);
surf_action_->set_data(this);
XBT_DEBUG("Create IO synchro %p %s", this, get_cname());
surf_action_->set_data(this);
XBT_DEBUG("Create IO synchro %p %s", this, get_cname());
-
simgrid::kernel::activity::IoImpl::on_start(
this);
+
IoImpl::on_start(*
this);
return this;
}
return this;
}
@@
-79,17
+90,16
@@
void IoImpl::post()
{
performed_ioops_ = surf_action_->get_cost();
switch (surf_action_->get_state()) {
{
performed_ioops_ = surf_action_->get_cost();
switch (surf_action_->get_state()) {
- case
simgrid::kernel::
resource::Action::State::FAILED:
+ case resource::Action::State::FAILED:
state_ = SIMIX_FAILED;
break;
state_ = SIMIX_FAILED;
break;
- case
simgrid::kernel::
resource::Action::State::FINISHED:
+ case resource::Action::State::FINISHED:
state_ = SIMIX_DONE;
break;
default:
THROW_IMPOSSIBLE;
state_ = SIMIX_DONE;
break;
default:
THROW_IMPOSSIBLE;
- break;
}
}
- on_completion(this);
+ on_completion(
*
this);
finish();
}
finish();
}
@@
-124,8
+134,8
@@
void IoImpl::finish()
/*************
* Callbacks *
*************/
/*************
* Callbacks *
*************/
-xbt::signal<void(IoImpl
Ptr
)> IoImpl::on_start;
-xbt::signal<void(IoImpl
Ptr
)> IoImpl::on_completion;
+xbt::signal<void(IoImpl
const&
)> IoImpl::on_start;
+xbt::signal<void(IoImpl
const&
)> IoImpl::on_completion;
} // namespace activity
} // namespace kernel
} // namespace activity
} // namespace kernel