From 15120cbae733cd144328bd4610dc6091ae6b7bd8 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Thu, 4 Feb 2021 13:42:09 +0100 Subject: [PATCH] more vetoable_start --- src/s4u/s4u_Actor.cpp | 2 +- src/s4u/s4u_Comm.cpp | 2 +- src/s4u/s4u_Disk.cpp | 8 ++++---- src/s4u/s4u_Host.cpp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/s4u/s4u_Actor.cpp b/src/s4u/s4u_Actor.cpp index 46eff09594..8fdb474ed3 100644 --- a/src/s4u/s4u_Actor.cpp +++ b/src/s4u/s4u_Actor.cpp @@ -355,7 +355,7 @@ void execute(double flops) void execute(double flops, double priority) { - exec_init(flops)->set_priority(priority)->start()->wait(); + exec_init(flops)->set_priority(priority)->vetoable_start()->wait(); } void parallel_execute(const std::vector& hosts, const std::vector& flops_amounts, diff --git a/src/s4u/s4u_Comm.cpp b/src/s4u/s4u_Comm.cpp index 3c216b40e9..edec580386 100644 --- a/src/s4u/s4u_Comm.cpp +++ b/src/s4u/s4u_Comm.cpp @@ -196,7 +196,7 @@ Comm* Comm::wait_for(double timeout) case State::INITED: case State::STARTING: // It's not started yet. Do it in one simcall if it's a regular communication if (from_ != nullptr || to_ != nullptr) { - return start()->wait_for(timeout); // In the case of host2host comm, do it in two simcalls + return vetoable_start()->wait_for(timeout); // In the case of host2host comm, do it in two simcalls } else if (src_buff_ != nullptr) { on_start(*this, true /*is_sender*/); simcall_comm_send(sender_, mailbox_->get_impl(), remains_, rate_, src_buff_, src_buff_size_, match_fun_, diff --git a/src/s4u/s4u_Disk.cpp b/src/s4u/s4u_Disk.cpp index 10b19e4674..2cc158a33e 100644 --- a/src/s4u/s4u_Disk.cpp +++ b/src/s4u/s4u_Disk.cpp @@ -57,22 +57,22 @@ IoPtr Disk::io_init(sg_size_t size, Io::OpType type) IoPtr Disk::read_async(sg_size_t size) { - return IoPtr(io_init(size, Io::OpType::READ))->start(); + return IoPtr(io_init(size, Io::OpType::READ))->vetoable_start(); } sg_size_t Disk::read(sg_size_t size) { - return IoPtr(io_init(size, Io::OpType::READ))->start()->wait()->get_performed_ioops(); + return IoPtr(io_init(size, Io::OpType::READ))->vetoable_start()->wait()->get_performed_ioops(); } IoPtr Disk::write_async(sg_size_t size) { - return IoPtr(io_init(size, Io::OpType::WRITE)->start()); + return IoPtr(io_init(size, Io::OpType::WRITE)->vetoable_start()); } sg_size_t Disk::write(sg_size_t size) { - return IoPtr(io_init(size, Io::OpType::WRITE))->start()->wait()->get_performed_ioops(); + return IoPtr(io_init(size, Io::OpType::WRITE))->vetoable_start()->wait()->get_performed_ioops(); } } // namespace s4u diff --git a/src/s4u/s4u_Host.cpp b/src/s4u/s4u_Host.cpp index 13b6b95296..f2549c6033 100644 --- a/src/s4u/s4u_Host.cpp +++ b/src/s4u/s4u_Host.cpp @@ -291,7 +291,7 @@ void Host::execute(double flops) const void Host::execute(double flops, double priority) const { - this_actor::exec_init(flops)->set_priority(1 / priority)->start()->wait(); + this_actor::exec_init(flops)->set_priority(1 / priority)->vetoable_start()->wait(); } } // namespace s4u -- 2.20.1