consistency between Action::ActionLmmList and Action::ActionList

[simgrid.git] / src / surf / surf_interface.hpp

diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp
index 6722a2d..6f6cdce 100644 (file)
--- a/src/surf/surf_interface.hpp
+++ b/src/surf/surf_interface.hpp
@@ -96,10 +96,16 @@ typedef boost::heap::pairing_heap<heap_element_type, boost::heap::constant_time_
  */
 XBT_PUBLIC_CLASS Action {
 public:
-  boost::intrusive::list_member_hook<> 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, boost::intrusive::list_member_hook<>, &Action::modifiedSetHook_>
+      ActionLmmOptions;
+  typedef boost::intrusive::list<Action, ActionLmmOptions> ActionLmmList;
+
+  boost::intrusive::list_member_hook<> stateSetHook_;
+  typedef boost::intrusive::member_hook<Action, boost::intrusive::list_member_hook<>, &Action::stateSetHook_>
+      ActionOptions;
   typedef boost::intrusive::list<Action, ActionOptions> ActionList;
 
   enum class State {
@@ -138,7 +144,6 @@ public:
    */
   Action(simgrid::surf::Model * model, double cost, bool failed, kernel::lmm::Variable* var);
 
-  /** @brief Destructor */
   virtual ~Action();
 
   /**
@@ -252,7 +257,7 @@ private:
   double lastUpdate_                                  = 0;
   double lastValue_                                   = 0;
   kernel::lmm::Variable* variable_                    = nullptr;
-  Action::Type hat_                                   = Action::Type::NOTSET;
+  Action::Type type_                                  = Action::Type::NOTSET;
   boost::optional<heap_type::handle_type> heapHandle_ = boost::none;
 
 public:
@@ -267,18 +272,15 @@ public:
   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<Action, ActionLmmOptions> ActionLmmList;
-typedef ActionLmmList* ActionLmmListPtr;
+typedef Action::ActionLmmList ActionLmmList;
+typedef Action::ActionLmmList* ActionLmmListPtr;
 
 /*********
  * Model *
@@ -373,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, kernel::lmm::Constraint* 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) */
-  kernel::lmm::Constraint* constraint() const;
-
-protected:
-  const kernel::lmm::Constraint* constraint_ = nullptr;
-};
-
-}
-}
-
-namespace std {
-template <> class hash<simgrid::surf::Resource> {
-public:
-  std::size_t operator()(const simgrid::surf::Resource& r) const { return (std::size_t)xbt_str_hash(r.getCname()); }
-};
-}
 
 #endif /* SURF_MODEL_H_ */