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

diff --git a/src/s4u/s4u_Io.cpp b/src/s4u/s4u_Io.cpp
index 733b481658..77856e763c 100644
--- a/src/s4u/s4u_Io.cpp
+++ b/src/s4u/s4u_Io.cpp
@@ -1,35 +1,29 @@
-/* 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 {
 xbt::signal<void(Io const&)> Io::on_start;
-xbt::signal<void(Io const&)> Io::on_completion;
 
 Io::Io(kernel::activity::IoImplPtr pimpl)
 {
   pimpl_ = pimpl;
 }
 
-void Io::complete(Activity::State state)
-{
-  Activity::complete(state);
-  on_completion(*this);
-}
-
 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()
@@ -45,6 +39,14 @@ Io* Io::start()
   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");
@@ -59,6 +61,16 @@ 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([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");
@@ -76,6 +88,14 @@ IoPtr Io::set_op_type(OpType type)
   return this;
 }
 
+IoPtr Io::update_priority(double priority)
+{
+  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() const
 {