X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9856e530871afa8c75fda68ab7cbc718e9ba7e95..60ffc444f2d5601980847857024a2719ddfefd68:/include/simgrid/s4u/Activity.hpp diff --git a/include/simgrid/s4u/Activity.hpp b/include/simgrid/s4u/Activity.hpp index efba3e2e47..d1d8ab4e1f 100644 --- a/include/simgrid/s4u/Activity.hpp +++ b/include/simgrid/s4u/Activity.hpp @@ -140,12 +140,12 @@ public: * This function is optional: you can call wait() even if you didn't call start() */ virtual Activity* start() = 0; - /** Blocks the current actor until the activity is terminated */ /** Tests whether the given activity is terminated yet. */ virtual bool test(); /*! take a vector s4u::ActivityPtr and return the rank of the first finished one (or -1 if none is done). */ static ssize_t test_any(const std::vector& activities); + /** Blocks the current actor until the activity is terminated */ Activity* wait() { return wait_for(-1.0); } /** Blocks the current actor until the activity is terminated, or until the timeout is elapsed\n * Raises: timeout exception.*/ @@ -237,7 +237,6 @@ public: } AnyActivity* set_name(const std::string& name) { - xbt_assert(get_state() == State::INITED, "Cannot change the name of an activity after its start"); name_ = name; return static_cast(this); }