From 01c23e1330e93416df34eb6c4ee55022b4cec64c Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Wed, 12 Feb 2020 23:16:37 +0100 Subject: [PATCH 1/1] Allow to call test() on canceled activities. --- src/s4u/s4u_Activity.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/s4u/s4u_Activity.cpp b/src/s4u/s4u_Activity.cpp index 1560c50178..f1a24ae50d 100644 --- a/src/s4u/s4u_Activity.cpp +++ b/src/s4u/s4u_Activity.cpp @@ -25,9 +25,9 @@ void Activity::wait_until(double time_limit) bool Activity::test() { xbt_assert(state_ == State::INITED || state_ == State::STARTED || state_ == State::STARTING || - state_ == State::FINISHED); + state_ == State::CANCELED || state_ == State::FINISHED); - if (state_ == State::FINISHED) + if (state_ == State::CANCELED || state_ == State::FINISHED) return true; if (state_ == State::INITED || state_ == State::STARTING) -- 2.20.1