X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/48780ea212ce1d605fee3ec56f4a4f77ff6f941c..257fa70ab80653b27b12b27cadf82468f29f62e9:/src/surf/surf_interface.hpp diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp index 34599d2ccc..6f6cdce401 100644 --- a/src/surf/surf_interface.hpp +++ b/src/surf/surf_interface.hpp @@ -71,13 +71,6 @@ XBT_PUBLIC(double) surf_get_clock(); */ XBT_PUBLIC_DATA(std::vector) host_that_restart; -namespace simgrid { -namespace surf { - -extern XBT_PRIVATE simgrid::xbt::signal surfExitCallbacks; -} -} - int XBT_PRIVATE __surf_is_absolute_file_path(const char *file_path); /********** @@ -103,10 +96,16 @@ typedef boost::heap::pairing_heap action_hook; - boost::intrusive::list_member_hook<> action_lmm_hook; - typedef boost::intrusive::member_hook< - Action, boost::intrusive::list_member_hook<>, &Action::action_hook> ActionOptions; + boost::intrusive::list_member_hook<> modifiedSetHook_; /* Used by the lazy update to list the actions to track */ + bool isLinkedModifiedSet() const { return modifiedSetHook_.is_linked(); } + + typedef boost::intrusive::member_hook, &Action::modifiedSetHook_> + ActionLmmOptions; + typedef boost::intrusive::list ActionLmmList; + + boost::intrusive::list_member_hook<> stateSetHook_; + typedef boost::intrusive::member_hook, &Action::stateSetHook_> + ActionOptions; typedef boost::intrusive::list ActionList; enum class State { @@ -143,9 +142,8 @@ public: * @param failed If the action is impossible (e.g.: execute something on a switched off host) * @param var The lmm variable associated to this Action if it is part of a LMM component */ - Action(simgrid::surf::Model* model, double cost, bool failed, lmm_variable_t var); + Action(simgrid::surf::Model * model, double cost, bool failed, kernel::lmm::Variable* var); - /** @brief Destructor */ virtual ~Action(); /** @@ -258,8 +256,8 @@ private: /* LMM */ double lastUpdate_ = 0; double lastValue_ = 0; - lmm_variable_t variable_ = nullptr; - Action::Type hat_ = Action::Type::NOTSET; + kernel::lmm::Variable* variable_ = nullptr; + Action::Type type_ = Action::Type::NOTSET; boost::optional heapHandle_ = boost::none; public: @@ -268,24 +266,21 @@ public: void heapRemove(heap_type& heap); void heapUpdate(heap_type & heap, double key, Action::Type hat); void clearHeapHandle() { heapHandle_ = boost::none; } - lmm_variable_t getVariable() const { return variable_; } - void setVariable(lmm_variable_t var) { variable_ = var; } + kernel::lmm::Variable* getVariable() const { return variable_; } + void setVariable(kernel::lmm::Variable * var) { variable_ = var; } double getLastUpdate() const { return lastUpdate_; } void refreshLastUpdate() {lastUpdate_ = surf_get_clock();} double getLastValue() const { return lastValue_; } void setLastValue(double val) { lastValue_ = val; } - Action::Type getHat() const { return hat_; } - bool is_linked() const { return action_lmm_hook.is_linked(); } + Action::Type getType() const { return type_; } + protected: Action::SuspendStates suspended_ = Action::SuspendStates::not_suspended; }; typedef Action::ActionList ActionList; - -typedef boost::intrusive::member_hook< - Action, boost::intrusive::list_member_hook<>, &Action::action_lmm_hook> ActionLmmOptions; -typedef boost::intrusive::list ActionLmmList; -typedef ActionLmmList* ActionLmmListPtr; +typedef Action::ActionLmmList ActionLmmList; +typedef Action::ActionLmmList* ActionLmmListPtr; /********* * Model * @@ -380,89 +375,5 @@ private: * Resource * ************/ -/** @ingroup SURF_interface - * @brief Resource which have a metric handled by a maxmin system - */ -struct s_surf_metric_t { - double peak; /**< The peak of the metric, ie its max value */ - double scale; /**< Current availability of the metric according to the traces, in [0,1] */ - tmgr_trace_event_t event; /**< The associated trace event associated to the metric */ -}; - -namespace simgrid { -namespace surf { - -/** @ingroup SURF_interface - * @brief SURF resource interface class - * @details This is the ancestor class of every resources in SimGrid, such as links, CPU or storage - */ -XBT_PUBLIC_CLASS Resource { -public: - /** - * @brief Constructor of LMM Resources - * - * @param model Model associated to this Resource - * @param name The name of the Resource - * @param constraint The lmm constraint associated to this Resource if it is part of a LMM component - */ - Resource(Model * model, const std::string& name, lmm_constraint_t constraint); - - virtual ~Resource(); - - /** @brief Get the Model of the current Resource */ - Model* model() const; - - /** @brief Get the name of the current Resource */ - const std::string& getName() const; - /** @brief Get the name of the current Resource */ - const char* getCname() const; - - bool operator==(const Resource &other) const; - - /** - * @brief Apply an event of external load event to that resource - * - * @param event What happened - * @param value [TODO] - */ - virtual void apply_event(tmgr_trace_event_t event, double value) = 0; - - /** @brief Check if the current Resource is used (if it currently serves an action) */ - virtual bool isUsed()=0; - - /** @brief returns the current load (in flops per second, byte per second or similar) */ - virtual double getLoad(); - - /** @brief Check if the current Resource is active */ - virtual bool isOn() const; - /** @brief Check if the current Resource is shut down */ - virtual bool isOff() const; - /** @brief Turn on the current Resource */ - virtual void turnOn(); - /** @brief Turn off the current Resource */ - virtual void turnOff(); - -private: - std::string name_; - Model *model_; - bool isOn_ = true; - -public: /* LMM */ - /** @brief Get the lmm constraint associated to this Resource if it is part of a LMM component (or null if none) */ - lmm_constraint_t constraint() const; - -protected: - const lmm_constraint_t constraint_ = nullptr; -}; - -} -} - -namespace std { -template <> class hash { -public: - std::size_t operator()(const simgrid::surf::Resource& r) const { return (std::size_t)xbt_str_hash(r.getCname()); } -}; -} #endif /* SURF_MODEL_H_ */