From fb0721a905fd6ab263e4aa81ad19c12ceb8b8d84 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Fri, 24 Aug 2018 16:09:58 +0200 Subject: [PATCH] new function: Activity::wait_until() --- include/simgrid/s4u/Activity.hpp | 4 ++++ src/s4u/s4u_Activity.cpp | 11 +++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/include/simgrid/s4u/Activity.hpp b/include/simgrid/s4u/Activity.hpp index cd68b0a561..9906f0b782 100644 --- a/include/simgrid/s4u/Activity.hpp +++ b/include/simgrid/s4u/Activity.hpp @@ -62,6 +62,10 @@ public: /** Blocks until the activity is terminated, or until the timeout is elapsed * Raises: timeout exception.*/ virtual Activity* wait_for(double timeout) = 0; + /** Blocks until the activity is terminated, or until the time limit is reached + * Raises: timeout exception. */ + void wait_until(double time_limit); + /** Cancel that activity */ virtual Activity* cancel() = 0; /** Retrieve the current state of the activity */ diff --git a/src/s4u/s4u_Activity.cpp b/src/s4u/s4u_Activity.cpp index 9ef1d5f6a1..da7b040ff7 100644 --- a/src/s4u/s4u_Activity.cpp +++ b/src/s4u/s4u_Activity.cpp @@ -1,5 +1,4 @@ -/* Copyright (c) 2006-2018. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2006-2018. 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. */ @@ -8,6 +7,7 @@ #include "xbt/log.h" #include "simgrid/s4u/Activity.hpp" +#include "simgrid/s4u/Engine.hpp" XBT_LOG_EXTERNAL_CATEGORY(s4u); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_activity, s4u, "S4U activities"); @@ -15,6 +15,13 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_activity, s4u, "S4U activities"); namespace simgrid { namespace s4u { +void Activity::wait_until(double time_limit) +{ + double now = Engine::get_clock(); + if (time_limit > now) + wait_for(time_limit - now); +} + double Activity::get_remaining() { return remains_; -- 2.20.1