X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e1a5484101efbff9c8d982a0c4650f7953ee7e2f..261e680f278e36ba4efbc0755fb08d00ff3cad83:/src/s4u/s4u_Io.cpp

diff --git a/src/s4u/s4u_Io.cpp b/src/s4u/s4u_Io.cpp
index 8af99e815a..71326434ad 100644
--- a/src/s4u/s4u_Io.cpp
+++ b/src/s4u/s4u_Io.cpp
@@ -1,19 +1,18 @@
-/* Copyright (c) 2018-2021. 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/Actor.hpp"
-#include "simgrid/s4u/Disk.hpp"
-#include "simgrid/s4u/Io.hpp"
+#include <simgrid/s4u/Disk.hpp>
+#include <simgrid/s4u/Io.hpp>
+#include <xbt/log.h>
+
 #include "src/kernel/activity/IoImpl.hpp"
 #include "src/kernel/actor/ActorImpl.hpp"
-#include "xbt/log.h"
+#include "src/kernel/actor/SimcallObserver.hpp"
 
-namespace simgrid {
-namespace s4u {
+namespace simgrid::s4u {
 xbt::signal<void(Io const&)> Io::on_start;
-xbt::signal<void(Io const&)> Io::on_completion;
 
 Io::Io(kernel::activity::IoImplPtr pimpl)
 {
@@ -23,12 +22,12 @@ Io::Io(kernel::activity::IoImplPtr pimpl)
 IoPtr Io::init()
 {
   auto pimpl = kernel::activity::IoImplPtr(new kernel::activity::IoImpl());
-  return IoPtr(pimpl->get_iface());
+  return IoPtr(static_cast<Io*>(pimpl->get_iface()));
 }
 
 Io* Io::start()
 {
-  kernel::actor::simcall(
+  kernel::actor::simcall_answered(
       [this] { (*boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)).set_name(get_name()).start(); });
 
   if (suspended_)
@@ -39,38 +38,19 @@ Io* Io::start()
   return this;
 }
 
-Io* Io::cancel()
-{
-  kernel::actor::simcall([this] { boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->cancel(); });
-  state_ = State::CANCELED;
-  on_completion(*this);
-  return this;
-}
-
-Io* Io::wait()
+ssize_t Io::wait_any_for(const std::vector<IoPtr>& ios, double timeout)
 {
-  return this->wait_for(-1);
-}
-
-Io* Io::wait_for(double timeout)
-{
-  if (state_ == State::INITED)
-    vetoable_start();
-
-  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();
-
-  on_completion(*this);
-  return this;
+  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(
+  kernel::actor::simcall_answered(
       [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
@@ -80,10 +60,20 @@ IoPtr Io::set_disk(const_sg_disk_t disk)
  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_answered([this, priority] {
+    boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->set_sharing_penalty(1. / priority);
+  });
+  return this;
+}
+
 IoPtr Io::set_size(sg_size_t size)
 {
   xbt_assert(state_ == State::INITED || state_ == State::STARTING, "Cannot set size once the Io is started");
-  kernel::actor::simcall(
+  kernel::actor::simcall_answered(
       [this, size] { boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->set_size(size); });
   Activity::set_remaining(size);
   return this;
@@ -92,15 +82,23 @@ IoPtr Io::set_size(sg_size_t size)
 IoPtr Io::set_op_type(OpType type)
 {
   xbt_assert(state_ == State::INITED || state_ == State::STARTING, "Cannot set size once the Io is started");
-  kernel::actor::simcall(
+  kernel::actor::simcall_answered(
       [this, type] { boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->set_type(type); });
   return this;
 }
 
+IoPtr Io::update_priority(double priority)
+{
+  kernel::actor::simcall_answered([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() const
 {
-  return kernel::actor::simcall(
+  return kernel::actor::simcall_answered(
       [this]() { return boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->get_remaining(); });
 }
 
@@ -114,5 +112,4 @@ bool Io::is_assigned() const
   return boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->get_disk() != nullptr;
 }
 
-} // namespace s4u
-} // namespace simgrid
+} // namespace simgrid::s4u