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 'simcall_blocking' into 'master'
[simgrid.git]
/
src
/
s4u
/
s4u_Io.cpp
diff --git
a/src/s4u/s4u_Io.cpp
b/src/s4u/s4u_Io.cpp
index
7a89c7b
..
aec4f16
100644
(file)
--- a/
src/s4u/s4u_Io.cpp
+++ b/
src/s4u/s4u_Io.cpp
@@
-1,96
+1,111
@@
-/* Copyright (c) 2018-20
19
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2018-20
21
. 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. */
+#include "simgrid/s4u/Actor.hpp"
+#include "simgrid/s4u/Disk.hpp"
#include "simgrid/s4u/Io.hpp"
#include "simgrid/s4u/Io.hpp"
-#include "simgrid/s4u/Storage.hpp"
#include "src/kernel/activity/IoImpl.hpp"
#include "src/kernel/activity/IoImpl.hpp"
+#include "src/kernel/actor/ActorImpl.hpp"
#include "xbt/log.h"
#include "xbt/log.h"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_io, s4u_activity, "S4U asynchronous IOs");
-
namespace simgrid {
namespace s4u {
namespace simgrid {
namespace s4u {
+xbt::signal<void(Io const&)> Io::on_start;
+xbt::signal<void(Io const&)> Io::on_completion;
-Io::Io(
sg_storage_t storage, sg_size_t size, OpType type) : storage_(storage), size_(size), type_(type
)
+Io::Io()
{
{
- Activity::set_remaining(size_);
pimpl_ = kernel::activity::IoImplPtr(new kernel::activity::IoImpl());
}
pimpl_ = kernel::activity::IoImplPtr(new kernel::activity::IoImpl());
}
+IoPtr Io::init()
+{
+ return IoPtr(new Io());
+}
+
Io* Io::start()
{
Io* Io::start()
{
-
simix
::simcall([this] {
+
kernel::actor
::simcall([this] {
(*boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_))
(*boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_))
-
.set_name(name_
)
-
.set_storage(storage
_->get_impl())
- .set_size(size_)
- .set_type(type_)
- .start();
+
.set_name(get_name()
)
+
.set_disk(disk
_->get_impl())
+
.set_size(size_)
+
.set_type(type_)
+
.start();
});
});
+
+ if (suspended_)
+ pimpl_->suspend();
+
state_ = State::STARTED;
state_ = State::STARTED;
+ on_start(*this);
return this;
}
Io* Io::cancel()
{
return this;
}
Io* Io::cancel()
{
- simgrid::
simix
::simcall([this] { boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->cancel(); });
+ simgrid::
kernel::actor
::simcall([this] { boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->cancel(); });
state_ = State::CANCELED;
state_ = State::CANCELED;
+ on_completion(*this);
return this;
}
Io* Io::wait()
{
return this;
}
Io* Io::wait()
{
- simcall_io_wait(pimpl_);
- state_ = State::FINISHED;
- return this;
+ return this->wait_for(-1);
}
}
-Io* Io::wait_for(double)
+Io* Io::wait_for(double
timeout
)
{
{
- THROW_UNIMPLEMENTED;
-}
+ if (state_ == State::INITED)
+ vetoable_start();
-bool Io::test()
-{
- xbt_assert(state_ == State::INITED || state_ == State::STARTED || state_ == State::FINISHED);
+ kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
+ kernel::actor::simcall_blocking([this, issuer, timeout] { this->get_impl()->wait_for(issuer, timeout); });
+ state_ = State::FINISHED;
+ this->release_dependencies();
- if (state_ == State::FINISHED)
- return true;
+ on_completion(*this);
+ return this;
+}
- if (state_ == State::INITED)
- this->start();
+IoPtr Io::set_disk(sg_disk_t disk)
+{
+ disk_ = disk;
- THROW_UNIMPLEMENTED;
+ // Setting the disk may allow to start the activity, let's try
+ if (state_ == State::STARTING)
+ vetoable_start();
- // return false
+ return this;
}
}
-/** @brief Returns the amount of flops that remain to be done */
-double Io::get_remaining()
+IoPtr Io::set_size(sg_size_t size)
{
{
- return simix::simcall(
- [this]() { return boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->get_remaining(); });
+ size_ = size;
+ Activity::set_remaining(size_);
+ return this;
}
}
-
sg_size_t Io::get_performed_ioops(
)
+
IoPtr Io::set_op_type(OpType type
)
{
{
- return simix::simcall(
-
[this]() { return boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->get_performed_ioops(); })
;
+ type_ = type;
+
return this
;
}
}
-void intrusive_ptr_release(simgrid::s4u::Io* i)
+/** @brief Returns the amount of flops that remain to be done */
+double Io::get_remaining() const
{
{
- if (i->refcount_.fetch_sub(1, std::memory_order_release) == 1) {
- std::atomic_thread_fence(std::memory_order_acquire);
- delete i;
- }
+ return kernel::actor::simcall(
+ [this]() { return boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->get_remaining(); });
}
}
-void intrusive_ptr_add_ref(simgrid::s4u::Io* i)
+sg_size_t Io::get_performed_ioops() const
{
{
-
i->refcount_.fetch_add(1, std::memory_order_relaxed
);
+
return boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->get_performed_ioops(
);
}
}
+
} // namespace s4u
} // namespace simgrid
} // namespace s4u
} // namespace simgrid