X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/504a11c1ce9879b4bf07ed7ad4e29278b1b8fecc..d236809e6149a03ef3e53599458f51c98f79f94d:/src/s4u/s4u_Io.cpp

diff --git a/src/s4u/s4u_Io.cpp b/src/s4u/s4u_Io.cpp
index e77c117486..77856e763c 100644
--- a/src/s4u/s4u_Io.cpp
+++ b/src/s4u/s4u_Io.cpp
@@ -1,73 +1,117 @@
-/* Copyright (c) 2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2018-2022. 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 "simgrid/s4u/Io.hpp"
-#include "simgrid/s4u/Storage.hpp"
-#include "src/kernel/activity/IoImpl.hpp"
-#include "src/simix/smx_io_private.hpp"
-#include "xbt/log.h"
+#include <simgrid/s4u/Disk.hpp>
+#include <simgrid/s4u/Io.hpp>
+#include <xbt/log.h>
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_io, s4u_activity, "S4U asynchronous IOs");
+#include "src/kernel/activity/IoImpl.hpp"
+#include "src/kernel/actor/ActorImpl.hpp"
+#include "src/kernel/actor/SimcallObserver.hpp"
 
 namespace simgrid {
 namespace s4u {
+xbt::signal<void(Io const&)> Io::on_start;
 
-Activity* Io::start()
+Io::Io(kernel::activity::IoImplPtr pimpl)
 {
-  Activity::set_remaining(size_);
-  pimpl_ = simix::simcall([this] {
-    return boost::static_pointer_cast<kernel::activity::IoImpl>(SIMIX_io_start(name_, size_, storage_, type_));
-  });
+  pimpl_ = pimpl;
+}
+
+IoPtr Io::init()
+{
+  auto pimpl = kernel::activity::IoImplPtr(new kernel::activity::IoImpl());
+  return IoPtr(static_cast<Io*>(pimpl->get_iface()));
+}
+
+Io* Io::start()
+{
+  kernel::actor::simcall(
+      [this] { (*boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)).set_name(get_name()).start(); });
+
+  if (suspended_)
+    pimpl_->suspend();
+
   state_ = State::STARTED;
+  on_start(*this);
+  return this;
+}
+
+ssize_t Io::wait_any_for(const std::vector<IoPtr>& ios, double timeout)
+{
+  std::vector<ActivityPtr> activities;
+  for (const auto& io : ios)
+    activities.push_back(boost::dynamic_pointer_cast<Activity>(io));
+  return Activity::wait_any_for(activities, timeout);
+}
+
+IoPtr Io::set_disk(const_sg_disk_t disk)
+{
+  xbt_assert(state_ == State::INITED || state_ == State::STARTING, "Cannot set disk once the Io is started");
+
+  kernel::actor::simcall(
+      [this, disk] { boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->set_disk(disk->get_impl()); });
+
+  // Setting the disk may allow to start the activity, let's try
+  if (state_ == State::STARTING)
+    vetoable_start();
+
+ return this;
+}
+
+IoPtr Io::set_priority(double priority)
+{
+  xbt_assert(state_ == State::INITED || state_ == State::STARTING,
+             "Cannot change the priority of an io after its start");
+  kernel::actor::simcall([this, priority] {
+    boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->set_sharing_penalty(1. / priority);
+  });
   return this;
 }
 
-Activity* Io::cancel()
+IoPtr Io::set_size(sg_size_t size)
 {
-  simgrid::simix::simcall([this] { dynamic_cast<kernel::activity::IoImpl*>(pimpl_.get())->cancel(); });
-  state_ = State::CANCELED;
+  xbt_assert(state_ == State::INITED || state_ == State::STARTING, "Cannot set size once the Io is started");
+  kernel::actor::simcall(
+      [this, size] { boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->set_size(size); });
+  Activity::set_remaining(size);
   return this;
 }
 
-Activity* Io::wait()
+IoPtr Io::set_op_type(OpType type)
 {
-  simcall_io_wait(pimpl_);
-  state_ = State::FINISHED;
+  xbt_assert(state_ == State::INITED || state_ == State::STARTING, "Cannot set size once the Io is started");
+  kernel::actor::simcall(
+      [this, type] { boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->set_type(type); });
   return this;
 }
 
-Activity* Io::wait(double timeout)
+IoPtr Io::update_priority(double priority)
 {
-  THROW_UNIMPLEMENTED;
+  kernel::actor::simcall([this, priority] {
+    boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->update_sharing_penalty(1. / priority);
+  });
   return this;
 }
 
 /** @brief Returns the amount of flops that remain to be done */
-double Io::get_remaining()
+double Io::get_remaining() const
 {
-  return simgrid::simix::simcall(
+  return kernel::actor::simcall(
       [this]() { return boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->get_remaining(); });
 }
 
-sg_size_t Io::get_performed_ioops()
+sg_size_t Io::get_performed_ioops() const
 {
-  return simgrid::simix::simcall(
-      [this]() { return boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->get_performed_ioops(); });
+  return boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->get_performed_ioops();
 }
 
-void intrusive_ptr_release(simgrid::s4u::Io* i)
+bool Io::is_assigned() const
 {
-  if (i->refcount_.fetch_sub(1, std::memory_order_release) == 1) {
-    std::atomic_thread_fence(std::memory_order_acquire);
-    delete i;
-  }
+  return boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->get_disk() != nullptr;
 }
 
-void intrusive_ptr_add_ref(simgrid::s4u::Io* i)
-{
-  i->refcount_.fetch_add(1, std::memory_order_relaxed);
-}
 } // namespace s4u
 } // namespace simgrid