X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9128f281ad37d5a65acb4780ad35765b622671d0..ed1e833154dee7dd68eb7bcae79d33592936201a:/include/simgrid/s4u/Activity.hpp diff --git a/include/simgrid/s4u/Activity.hpp b/include/simgrid/s4u/Activity.hpp index e379e4d11b..75e5d98b85 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. */ @@ -8,10 +8,14 @@ #include "xbt/asserts.h" #include +#include #include #include +#include #include +XBT_LOG_EXTERNAL_CATEGORY(s4u_activity); + namespace simgrid { namespace s4u { @@ -19,43 +23,54 @@ 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; - friend XBT_PUBLIC void intrusive_ptr_release(Comm * c); - friend XBT_PUBLIC void intrusive_ptr_add_ref(Comm * c); - friend Exec; friend ExecSeq; friend ExecPar; - friend XBT_PUBLIC void intrusive_ptr_release(Exec * e); - friend XBT_PUBLIC void intrusive_ptr_add_ref(Exec * e); - friend Io; - friend XBT_PUBLIC void intrusive_ptr_release(Io* i); - friend XBT_PUBLIC void intrusive_ptr_add_ref(Io* i); protected: Activity() = default; virtual ~Activity() = default; + void release_dependencies() + { + while (not successors_.empty()) { + ActivityPtr b = successors_.back(); + XBT_CDEBUG(s4u_activity, "Remove a dependency from '%s' on '%s'", get_cname(), b->get_cname()); + b->dependencies_.erase(this); + if (b->dependencies_.empty()) { + b->vetoable_start(); + } + successors_.pop_back(); + } + } + + void add_successor(ActivityPtr a) + { + successors_.push_back(a); + a->dependencies_.insert({this}); + } + public: + kernel::activity::ActivityImpl* get_impl() { return pimpl_.get(); } + void vetoable_start() + { + state_ = State::STARTING; + if (dependencies_.empty()) { + XBT_CDEBUG(s4u_activity, "All dependencies are solved, let's start '%s'", get_cname()); + start(); + } + } + #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. * @@ -75,45 +90,54 @@ 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; + virtual const char* get_cname() = 0; + virtual const std::string& get_name() = 0; /** Get the remaining amount of work that this Activity entails. When it's 0, it's done. */ virtual double get_remaining(); - /** Set the [remaining] amount of work that this Activity will entail * * 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 */ - + /** Returns the internal implementation of this Activity */ kernel::activity::ActivityImpl* get_impl() const { return pimpl_.get(); } +#ifndef DOXYGEN + friend void intrusive_ptr_release(Activity* 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(Activity* a) { a->refcount_.fetch_add(1, std::memory_order_relaxed); } +#endif + private: kernel::activity::ActivityImplPtr pimpl_ = nullptr; Activity::State state_ = Activity::State::INITED; double remains_ = 0; + std::vector successors_; + std::set dependencies_; + std::atomic_int_fast32_t refcount_{0}; }; 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}; public: -#ifndef DOXYGEN - friend XBT_PUBLIC void intrusive_ptr_release(AnyActivity* a) + AnyActivity* add_successor(ActivityPtr a) { - if (a->refcount_.fetch_sub(1, std::memory_order_release) == 1) { - std::atomic_thread_fence(std::memory_order_acquire); - delete a; - } + Activity::add_successor(a); + return static_cast(this); } - friend XBT_PUBLIC void intrusive_ptr_add_ref(AnyActivity* a) { a->refcount_.fetch_add(1, std::memory_order_relaxed); } -#endif + AnyActivity* set_name(const std::string& name) { xbt_assert(get_state() == State::INITED, "Cannot change the name of an activity after its start"); @@ -138,6 +162,14 @@ public: } void* get_user_data() { return user_data_; } +#ifndef DOXYGEN + /* The refcounting is done in the ancestor class, Activity, but we want each of the classes benefiting of the CRTP + * (Exec, Comm, etc) to have smart pointers too, so we define these methods here, that forward the ptr_release and + * add_ref to the Activity class. Hopefully, the "inline" helps to not hinder the perf here. + */ + friend void inline intrusive_ptr_release(AnyActivity* a) { intrusive_ptr_release(static_cast(a)); } + friend void inline intrusive_ptr_add_ref(AnyActivity* a) { intrusive_ptr_add_ref(static_cast(a)); } +#endif }; } // namespace s4u