#include <simgrid/forward.h>
#include <stdexcept>
#include <string>
+#include <string_view>
#include <vector>
#include <xbt/Extendable.hpp>
#include <xbt/asserts.h>
bool has_no_successor() const { return successors_.empty(); }
const std::set<ActivityPtr>& get_dependencies() const { return dependencies_; }
const std::vector<ActivityPtr>& get_successors() const { return successors_; }
- virtual void fire_this_completion() const = 0;
protected:
Activity() = default;
{
if(this == a)
throw std::invalid_argument("Cannot be its own successor");
- auto p = std::find_if(successors_.begin(), successors_.end(), [a](ActivityPtr const& i){ return i.get() == a.get(); });
- if (p != successors_.end())
+
+ if (std::any_of(begin(successors_), end(successors_), [a](ActivityPtr const& i) { return i.get() == a.get(); }))
throw std::invalid_argument("Dependency already exists");
successors_.push_back(a);
if(this == a)
throw std::invalid_argument("Cannot ask to remove itself from successors list");
- auto p = std::find_if(successors_.begin(), successors_.end(), [a](ActivityPtr const& i){ return i.get() == a.get(); });
- if (p != successors_.end()){
- successors_.erase(p);
- a->dependencies_.erase({this});
- } else
+ auto p =
+ std::find_if(successors_.begin(), successors_.end(), [a](ActivityPtr const& i) { return i.get() == a.get(); });
+ if (p == successors_.end())
throw std::invalid_argument("Dependency does not exist. Can not be removed.");
+
+ successors_.erase(p);
+ a->dependencies_.erase({this});
}
static std::set<Activity*>* vetoed_activities_;
* It is forbidden to change the amount of work once the Activity is started */
Activity* set_remaining(double remains);
-private:
- static xbt::signal<void(Activity&)> on_veto;
- static xbt::signal<void(Activity const&)> on_suspend;
- static xbt::signal<void(Activity const&)> on_resume;
+ virtual void fire_on_completion() const = 0;
+ virtual void fire_on_veto() const = 0;
+ virtual void fire_on_suspend() const = 0;
+ virtual void fire_on_resume() const = 0;
public:
- /*! Add a callback fired each time that the activity fails to start because of a veto (e.g., unsolved dependency or no
- * resource assigned) */
- static void on_veto_cb(const std::function<void(Activity&)>& cb) { on_veto.connect(cb); }
- /*! Add a callback fired when the activity is suspended */
- static void on_suspend_cb(const std::function<void(Activity const&)>& cb)
- {
- on_suspend.connect(cb);
- }
- /*! Add a callback fired when the activity is resumed after being suspended */
- static void on_resume_cb(const std::function<void(Activity const&)>& cb)
- {
- on_resume.connect(cb);
- }
-
- XBT_ATTRIB_DEPRECATED_v334("Please use on_suspend_cb() instead") static void on_suspended_cb(
- const std::function<void(Activity const&)>& cb)
- {
- on_suspend.connect(cb);
- }
- XBT_ATTRIB_DEPRECATED_v334("Please use on_resume_cb() instead") static void on_resumed_cb(
- const std::function<void(Activity const&)>& cb)
- {
- on_resume.connect(cb);
- }
-
XBT_ATTRIB_DEPRECATED_v334("All start() are vetoable now. Please use start() ") void vetoable_start()
{
start();
} else {
if (vetoed_activities_ != nullptr)
vetoed_activities_->insert(this);
- on_veto(*this);
+ fire_on_veto();
}
}
// released by the on_completion() callbacks.
ActivityPtr keepalive(this);
state_ = state;
- fire_this_completion();
+ fire_on_completion();
if (state == State::FINISHED)
release_dependencies();
}
std::string name_ = "unnamed";
std::string tracing_category_ = "";
-public:
+protected:
inline static xbt::signal<void(AnyActivity const&)> on_completion;
+ inline static xbt::signal<void(AnyActivity&)> on_veto;
+ inline static xbt::signal<void(AnyActivity const&)> on_suspend;
+ inline static xbt::signal<void(AnyActivity const&)> on_resume;
+
+public:
/*! Add a callback fired when the activity completes (either normally, cancelled or failed) */
static void on_completion_cb(const std::function<void(AnyActivity const&)>& cb) { on_completion.connect(cb); }
+ /*! Add a callback fired each time that the activity fails to start because of a veto (e.g., unsolved dependency or no
+ * resource assigned) */
+ static void on_veto_cb(const std::function<void(AnyActivity&)>& cb) { on_veto.connect(cb); }
+ /*! Add a callback fired when the activity is suspended */
+ static void on_suspend_cb(const std::function<void(AnyActivity const&)>& cb) { on_suspend.connect(cb); }
+ /*! Add a callback fired when the activity is resumed after being suspended */
+ static void on_resume_cb(const std::function<void(AnyActivity const&)>& cb) { on_resume.connect(cb); }
+
+ XBT_ATTRIB_DEPRECATED_v337("Please use on_suspend_cb() instead") static void on_suspended_cb(
+ const std::function<void(Activity const&)>& cb) { on_suspend.connect(cb); }
+ XBT_ATTRIB_DEPRECATED_v337("Please use on_resume_cb() instead") static void on_resumed_cb(
+ const std::function<void(Activity const&)>& cb) { on_resume.connect(cb); }
+
AnyActivity* add_successor(ActivityPtr a)
{
Activity::remove_successor(a);
return static_cast<AnyActivity*>(this);
}
- AnyActivity* set_name(const std::string& name)
+ AnyActivity* set_name(std::string_view name)
{
name_ = name;
return static_cast<AnyActivity*>(this);
const std::string& get_name() const override { return name_; }
const char* get_cname() const override { return name_.c_str(); }
- AnyActivity* set_tracing_category(const std::string& category)
+ AnyActivity* set_tracing_category(std::string_view category)
{
xbt_assert(get_state() == State::INITED || get_state() == State::STARTING,
"Cannot change the tracing category of an activity after its start");
