X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4d648ebbbe5705878080b9cbf1ca61497323c592..242530a43236d91a6522c6f3768776aca9f04508:/include/simgrid/s4u/Activity.hpp diff --git a/include/simgrid/s4u/Activity.hpp b/include/simgrid/s4u/Activity.hpp index 085c853c97..0680700c84 100644 --- a/include/simgrid/s4u/Activity.hpp +++ b/include/simgrid/s4u/Activity.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2020. 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. */ @@ -7,9 +7,15 @@ #define SIMGRID_S4U_ACTIVITY_HPP #include "xbt/asserts.h" +#include +#include #include +#include +#include #include +XBT_LOG_EXTERNAL_CATEGORY(s4u_activity); + namespace simgrid { namespace s4u { @@ -17,16 +23,6 @@ namespace s4u { * * This class is the ancestor of every activities that an actor can undertake. * That is, activities are all the things that do take time to the actor in the simulated world. - * - * They are somewhat linked but not identical to simgrid::kernel::resource::Action, - * that are stuff occurring on a resource: - * - * - A sequential execution activity encompasses 2 actions: one for the exec itself, - * and a time-limited sleep used as timeout detector. - * - A point-to-point communication activity encompasses 3 actions: one for the comm itself - * (which spans on all links of the path), and one infinite sleep used as failure detector - * on both sender and receiver hosts. - * - Synchronization activities may possibly be connected to no action. */ class XBT_PUBLIC Activity { friend Comm; @@ -46,14 +42,13 @@ class XBT_PUBLIC Activity { protected: Activity() = default; virtual ~Activity() = default; - public: #ifndef DOXYGEN Activity(Activity const&) = delete; Activity& operator=(Activity const&) = delete; #endif - enum class State { INITED = 0, STARTED, CANCELED, ERRORED, FINISHED }; + enum class State { INITED = 0, STARTING, STARTED, CANCELED, ERRORED, FINISHED }; /** Starts a previously created activity. * @@ -73,6 +68,7 @@ public: virtual Activity* cancel() = 0; /** Retrieve the current state of the activity */ Activity::State get_state() { return state_; } + void set_state(Activity::State state) { state_ = state; } /** Tests whether the given activity is terminated yet. This is a pure function. */ virtual bool test() = 0; @@ -84,19 +80,8 @@ public: * It is forbidden to change the amount of work once the Activity is started */ Activity* set_remaining(double remains); - /** Put some user data onto the Activity */ - - kernel::activity::ActivityImplPtr get_impl() { return pimpl_; } - -#ifndef DOXYGEN - XBT_ATTRIB_DEPRECATED_v324("Please use Activity::wait_for()") virtual void wait(double timeout) = 0; - XBT_ATTRIB_DEPRECATED_v323("Please use Activity::get_state()") Activity::State getState() { return state_; } - XBT_ATTRIB_DEPRECATED_v323("Please use Activity::get_remaining()") double getRemains() { return get_remaining(); } - XBT_ATTRIB_DEPRECATED_v323("Please use Activity::set_remaining()") Activity* setRemains(double remains) - { - return set_remaining(remains); - } -#endif + /** Returns the internal implementation of this Activity */ + kernel::activity::ActivityImpl* get_impl() const { return pimpl_.get(); } private: kernel::activity::ActivityImplPtr pimpl_ = nullptr; @@ -106,11 +91,63 @@ private: template class Activity_T : public Activity { private: - std::string name_ = ""; + std::string name_ = "unnamed"; std::string tracing_category_ = ""; void* user_data_ = nullptr; + std::atomic_int_fast32_t refcount_{0}; + std::vector successors_; + std::set dependencies_; public: +#ifndef DOXYGEN + friend void intrusive_ptr_release(AnyActivity* a) + { + if (a->refcount_.fetch_sub(1, std::memory_order_release) == 1) { + std::atomic_thread_fence(std::memory_order_acquire); + delete a; + } + } + friend void intrusive_ptr_add_ref(AnyActivity* a) { a->refcount_.fetch_add(1, std::memory_order_relaxed); } +#endif + + void add_successor(Activity* a) + { + successors_.push_back(a); + static_cast(a)->add_dependency_on(static_cast(this)); + } + void remove_successor() { successors_.pop_back(); } + Activity* get_successor() { return successors_.back(); } + bool has_successors() { return not successors_.empty(); } + + void add_dependency_on(Activity* a) { dependencies_.insert({a}); } + void remove_dependency_on(Activity* a) { dependencies_.erase(a); } + bool has_dependencies() { return not dependencies_.empty(); } + void release_dependencies() + { + while (has_successors()) { + AnyActivity* b = static_cast(get_successor()); + XBT_CDEBUG(s4u_activity, "Remove a dependency from '%s' on '%s'", static_cast(this)->get_cname(), + b->get_cname()); + b->remove_dependency_on(static_cast(this)); + if (not b->has_dependencies()) { + b->vetoable_start(); + } + remove_successor(); + } + } + + AnyActivity* vetoable_start() + { + set_state(State::STARTING); + if (has_dependencies()) + return static_cast(this); + set_state(State::STARTED); + XBT_CDEBUG(s4u_activity, "All dependencies are solved, let's start '%s'", + static_cast(this)->get_cname()); + static_cast(this)->start(); + return static_cast(this); + } + AnyActivity* set_name(const std::string& name) { xbt_assert(get_state() == State::INITED, "Cannot change the name of an activity after its start"); @@ -135,11 +172,6 @@ public: } void* get_user_data() { return user_data_; } - XBT_ATTRIB_DEPRECATED_v323("Please use Activity::set_user_data()") AnyActivity* setUserData(void* data) - { - return set_user_data(data); - } - XBT_ATTRIB_DEPRECATED_v323("Please use Activity::get_user_data()") void* getUserData() { return user_data_; } }; } // namespace s4u