-/* Copyright (c) 2018-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2018-2020. 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. */
#include "src/kernel/activity/IoImpl.hpp"
#include "xbt/log.h"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_io, s4u_activity, "S4U asynchronous IOs");
-
namespace simgrid {
namespace s4u {
kernel::actor::simcall([this] {
if (storage_) {
(*boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_))
- .set_name(name_)
+ .set_name(get_name())
.set_storage(storage_->get_impl())
.set_size(size_)
.set_type(type_)
.start();
} else {
(*boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_))
- .set_name(name_)
+ .set_name(get_name())
.set_disk(disk_->get_impl())
.set_size(size_)
.set_type(type_)
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;
+ simcall_io_wait(pimpl_, timeout);
+ state_ = State::FINISHED;
+ return this;
}
bool Io::test()
if (state_ == State::INITED)
this->start();
- THROW_UNIMPLEMENTED;
+ if (simcall_io_test(pimpl_)) {
+ state_ = State::FINISHED;
+ return true;
+ }
- // return false
+ return false;
}
/** @brief Returns the amount of flops that remain to be done */
[this]() { return boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->get_performed_ioops(); });
}
-void intrusive_ptr_release(simgrid::s4u::Io* i)
-{
- if (i->refcount_.fetch_sub(1, std::memory_order_release) == 1) {
- std::atomic_thread_fence(std::memory_order_acquire);
- delete i;
- }
-}
-
-void intrusive_ptr_add_ref(simgrid::s4u::Io* i)
-{
- i->refcount_.fetch_add(1, std::memory_order_relaxed);
-}
} // namespace s4u
} // namespace simgrid