X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8bc85164acb335cf909052b966b2ee4932e06cd7..7672ae43c2b49a7dcdc0976cc89a05cc87ae534c:/src/kernel/activity/ActivityImpl.hpp?ds=sidebyside diff --git a/src/kernel/activity/ActivityImpl.hpp b/src/kernel/activity/ActivityImpl.hpp index 28c5c843f8..a4993f90b5 100644 --- a/src/kernel/activity/ActivityImpl.hpp +++ b/src/kernel/activity/ActivityImpl.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2022. 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. */ @@ -6,59 +6,73 @@ #ifndef SIMGRID_KERNEL_ACTIVITY_ACTIVITYIMPL_HPP #define SIMGRID_KERNEL_ACTIVITY_ACTIVITYIMPL_HPP -#include -#include - -#include #include "simgrid/forward.h" +#include "simgrid/kernel/resource/Action.hpp" +#include "simgrid/simix.hpp" +#include "src/kernel/actor/Simcall.hpp" +#include "xbt/utility.hpp" #include -#include -#include - -namespace simgrid { -namespace kernel { -namespace activity { -enum class State { - WAITING = 0, - READY, - RUNNING, - DONE, - CANCELED, - FAILED, - SRC_HOST_FAILURE, - DST_HOST_FAILURE, - TIMEOUT, - SRC_TIMEOUT, - DST_TIMEOUT, - LINK_FAILURE -}; +#include +#include +#include + +namespace simgrid::kernel::activity { + +XBT_DECLARE_ENUM_CLASS(State, WAITING, READY, RUNNING, DONE, CANCELED, FAILED, SRC_HOST_FAILURE, DST_HOST_FAILURE, + TIMEOUT, SRC_TIMEOUT, DST_TIMEOUT, LINK_FAILURE); -class XBT_PUBLIC ActivityImpl { +class XBT_PUBLIC ActivityImpl : public kernel::actor::ObjectAccessSimcallItem { std::atomic_int_fast32_t refcount_{0}; - std::string name_ = ""; + std::string name_ = ""; + actor::ActorImpl* actor_ = nullptr; + State state_ = State::WAITING; /* State of the activity */ + double start_time_ = -1.0; + double finish_time_ = -1.0; + std::vector hosts_; public: virtual ~ActivityImpl(); ActivityImpl() = default; - State state_ = State::WAITING; /* State of the activity */ - std::list simcalls_; /* List of simcalls waiting for this activity */ + std::list simcalls_; /* List of simcalls waiting for this activity */ + s4u::Activity* piface_ = nullptr; resource::Action* surf_action_ = nullptr; protected: - void inline set_name(const std::string& name) + void inline set_name(std::string_view name) { // This is to keep name_ private while allowing ActivityImpl_T to set it and then return a Ptr to qualified // child type name_ = name; } + void set_start_time(double start_time) { start_time_ = start_time; } + void clear_hosts() { hosts_.clear(); } + void add_host(s4u::Host* host) { hosts_.push_back(host); } + void set_hosts(const std::vector& hosts) { hosts_ = hosts; } public: const std::string& get_name() const { return name_; } const char* get_cname() const { return name_.c_str(); } - bool test(); - void wait_for(actor::ActorImpl* issuer, double timeout); + void set_actor(actor::ActorImpl* actor) { actor_ = actor; } + actor::ActorImpl* get_actor() const { return actor_; } + + void set_iface(s4u::Activity* iface) { piface_ = iface; } + s4u::Activity* get_iface() { return piface_; } + + void set_state(State state) { state_ = state; } + const State& get_state() const { return state_; } + const char* get_state_str() const; + + double get_start_time() const { return start_time_; } + void set_finish_time(double finish_time) { finish_time_ = finish_time; } + double get_finish_time() const { return finish_time_; } + + virtual bool test(actor::ActorImpl* issuer); + static ssize_t test_any(actor::ActorImpl* issuer, const std::vector& activities); + + virtual void wait_for(actor::ActorImpl* issuer, double timeout); + static void wait_any_for(actor::ActorImpl* issuer, const std::vector& activities, double timeout); virtual ActivityImpl& set_timeout(double) { THROW_UNIMPLEMENTED; } virtual void suspend(); @@ -67,35 +81,38 @@ public: virtual void post() = 0; // Called by the main loop when the activity is marked as terminated or failed by its model. // Setups the status, clean things up, and call finish() + virtual void set_exception(actor::ActorImpl* issuer) = 0; // Raising exceptions and stuff virtual void finish() = 0; // Unlock all simcalls blocked on that activity, either because it was marked as done by // the model or because it terminated without waiting for the model - virtual void register_simcall(smx_simcall_t simcall); + s4u::Host* get_host() const { return hosts_.front(); } + const std::vector& get_hosts() const { return hosts_; }; + + void register_simcall(actor::Simcall* simcall); + void unregister_simcall(actor::Simcall* simcall); + void handle_activity_waitany(actor::Simcall* simcall); void clean_action(); virtual double get_remaining() const; // Support for the boost::intrusive_ptr datatype friend XBT_PUBLIC void intrusive_ptr_add_ref(ActivityImpl* activity); friend XBT_PUBLIC void intrusive_ptr_release(ActivityImpl* activity); - - static xbt::signal on_suspended; - static xbt::signal on_resumed; + int get_refcount() const { return static_cast(refcount_); } // For debugging purpose }; /* This class exists to allow chained setters as in exec->set_name()->set_priority()->set_blah() * The difficulty is that set_name() must return a qualified child class, not the generic ancestor * But the getter is still in the ancestor to be usable on generic activities with no downcast */ template class ActivityImpl_T : public ActivityImpl { -private: std::string tracing_category_ = ""; public: - AnyActivityImpl& set_name(const std::string& name) /* Hides the function in the ancestor class */ + AnyActivityImpl& set_name(std::string_view name) /* Hides the function in the ancestor class */ { ActivityImpl::set_name(name); return static_cast(*this); } - AnyActivityImpl& set_tracing_category(const std::string& category) + AnyActivityImpl& set_tracing_category(std::string_view category) { tracing_category_ = category; return static_cast(*this); @@ -103,8 +120,6 @@ public: const std::string& get_tracing_category() const { return tracing_category_; } }; -} // namespace activity -} // namespace kernel -} // namespace simgrid +} // namespace simgrid::kernel::activity #endif /* SIMGRID_KERNEL_ACTIVITY_ACTIVITYIMPL_HPP */