more vetoable_start

diff --git a/src/s4u/s4u_Actor.cpp b/src/s4u/s4u_Actor.cpp
index 46eff09..8fdb474 100644 (file)
--- 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<s4u::Host*>& hosts, const std::vector<double>& flops_amounts,

diff --git a/src/s4u/s4u_Comm.cpp b/src/s4u/s4u_Comm.cpp
index 3c216b4..edec580 100644 (file)
--- 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 10b19e4..2cc158a 100644 (file)
--- 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 13b6b95..f2549c6 100644 (file)
--- 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