X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a4f850af455f783fefb0a719eef15d4d9dba2852..07eb08dd092e89871ab3ed9fcf41ad0219598e3b:/src/surf/surf_interface.hpp

diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp
index 507c7ce916..9c0859b2e0 100644
--- a/src/surf/surf_interface.hpp
+++ b/src/surf/surf_interface.hpp
@@ -71,26 +71,8 @@ XBT_PUBLIC(double) surf_get_clock();
  */
 XBT_PUBLIC_DATA(std::vector<sg_host_t>) host_that_restart;
 
-namespace simgrid {
-namespace surf {
-
-extern XBT_PRIVATE simgrid::xbt::signal<void()> surfExitCallbacks;
-}
-}
-
 int XBT_PRIVATE __surf_is_absolute_file_path(const char *file_path);
 
-/***********
- * Classes *
- ***********/
-
-enum heap_action_type{
-  LATENCY = 100,
-  MAX_DURATION,
-  NORMAL,
-  NOTSET
-};
-
 /**********
  * Action *
  **********/
@@ -129,6 +111,14 @@ public:
     not_in_the_system /**< Not in the system anymore. Why did you ask ? */
   };
 
+  enum class SuspendStates {
+    not_suspended = 0, /**< Action currently not suspended **/
+    suspended,
+    sleeping
+  };
+
+  enum class Type { LATENCY = 100, MAX_DURATION, NORMAL, NOTSET };
+
   /**
    * @brief Action constructor
    *
@@ -146,7 +136,7 @@ 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();
@@ -261,26 +251,26 @@ private:
   /* LMM */
   double lastUpdate_                                  = 0;
   double lastValue_                                   = 0;
-  lmm_variable_t variable_                            = nullptr;
-  enum heap_action_type hat_                          = NOTSET;
+  kernel::lmm::Variable* variable_                    = nullptr;
+  Action::Type hat_                                   = Action::Type::NOTSET;
   boost::optional<heap_type::handle_type> heapHandle_ = boost::none;
 
 public:
   virtual void updateRemainingLazy(double now) { THROW_IMPOSSIBLE; };
-  void heapInsert(heap_type& heap, double key, enum heap_action_type hat);
+  void heapInsert(heap_type & heap, double key, Action::Type hat);
   void heapRemove(heap_type& heap);
-  void heapUpdate(heap_type& heap, double key, enum heap_action_type hat);
+  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; }
-  enum heap_action_type getHat() const { return hat_; }
+  Action::Type getHat() const { return hat_; }
   bool is_linked() const { return action_lmm_hook.is_linked(); }
 protected:
-  int suspended_ = 0;
+  Action::SuspendStates suspended_ = Action::SuspendStates::not_suspended;
 };
 
 typedef Action::ActionList ActionList;
@@ -393,7 +383,8 @@ struct s_surf_metric_t {
 };
 
 namespace simgrid {
-namespace surf {
+namespace kernel {
+namespace model {
 
 /** @ingroup SURF_interface
  * @brief SURF resource interface class
@@ -408,12 +399,12 @@ public:
    * @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);
+  Resource(surf::Model * model, const std::string& name, lmm::Constraint* constraint);
 
   virtual ~Resource();
 
   /** @brief Get the Model of the current Resource */
-  Model* model() const;
+  surf::Model* model() const;
 
   /** @brief Get the name of the current Resource */
   const std::string& getName() const;
@@ -447,24 +438,27 @@ public:
 
 private:
   std::string name_;
-  Model *model_;
+  surf::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;
+  kernel::lmm::Constraint* constraint() const;
 
 protected:
-  const lmm_constraint_t constraint_ = nullptr;
+  const kernel::lmm::Constraint* constraint_ = nullptr;
 };
-
+} // namespace model
 }
 }
 
 namespace std {
-template <> class hash<simgrid::surf::Resource> {
+template <> class hash<simgrid::kernel::model::Resource> {
 public:
-  std::size_t operator()(const simgrid::surf::Resource& r) const { return (std::size_t)xbt_str_hash(r.getCname()); }
+  std::size_t operator()(const simgrid::kernel::model::Resource& r) const
+  {
+    return (std::size_t)xbt_str_hash(r.getCname());
+  }
 };
 }