MC: isend/irecv are not blocking

[simgrid.git] / src / s4u / s4u_Disk.cpp

diff --git a/src/s4u/s4u_Disk.cpp b/src/s4u/s4u_Disk.cpp
index 7ad08c3a0ba8d809026e11c4055c4d990ca297de..b95164d7c1ae42e824ea8f9a3fad2d6dc3a25e4a 100644 (file)
--- a/src/s4u/s4u_Disk.cpp
+++ b/src/s4u/s4u_Disk.cpp
@@ -1,13 +1,12 @@
-/* Copyright (c) 2019-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2019-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/Disk.hpp"
-#include "simgrid/s4u/Engine.hpp"
-#include "simgrid/s4u/Host.hpp"
-#include "simgrid/s4u/Io.hpp"
-#include "simgrid/simix.hpp"
+#include <simgrid/s4u/Disk.hpp>
+#include <simgrid/s4u/Io.hpp>
+#include <simgrid/simix.hpp>
+
 #include "src/kernel/resource/DiskImpl.hpp"
 
 namespace simgrid {
@@ -127,6 +126,15 @@ sg_size_t Disk::read(sg_size_t size) const
   return IoPtr(io_init(size, Io::OpType::READ))->vetoable_start()->wait()->get_performed_ioops();
 }
 
+sg_size_t Disk::read(sg_size_t size, double priority) const
+{
+  return IoPtr(io_init(size, Io::OpType::READ))
+      ->set_priority(priority)
+      ->vetoable_start()
+      ->wait()
+      ->get_performed_ioops();
+}
+
 IoPtr Disk::write_async(sg_size_t size) const
 {
   return IoPtr(io_init(size, Io::OpType::WRITE)->vetoable_start());
@@ -137,6 +145,15 @@ sg_size_t Disk::write(sg_size_t size) const
   return IoPtr(io_init(size, Io::OpType::WRITE))->vetoable_start()->wait()->get_performed_ioops();
 }
 
+sg_size_t Disk::write(sg_size_t size, double priority) const
+{
+  return IoPtr(io_init(size, Io::OpType::WRITE))
+      ->set_priority(priority)
+      ->vetoable_start()
+      ->wait()
+      ->get_performed_ioops();
+}
+
 Disk* Disk::set_sharing_policy(Disk::Operation op, Disk::SharingPolicy policy, const NonLinearResourceCb& cb)
 {
   kernel::actor::simcall([this, op, policy, &cb] { pimpl_->set_sharing_policy(op, policy, cb); });
@@ -157,7 +174,7 @@ Disk* Disk::set_factor_cb(const std::function<IoFactorCb>& cb)
 Disk* Disk::seal()
 {
   kernel::actor::simcall([this]{ pimpl_->seal(); });
-  Disk::on_creation(*this);
+  Disk::on_creation(*this); // notify the signal
   return this;
 }
 } // namespace s4u
@@ -196,7 +213,7 @@ sg_size_t sg_disk_write(const_sg_disk_t disk, sg_size_t size)
 
 void* sg_disk_get_data(const_sg_disk_t disk)
 {
-  return disk->get_data();
+  return disk->get_data<void>();
 }
 
 void sg_disk_set_data(sg_disk_t disk, void* data)