From 6d18c4fcb23666f8ccdb91df9c9b6ab32e7df65f Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Fri, 19 Apr 2019 11:18:43 +0200
Subject: [PATCH] Use default destructor for resource::Model.

---
 include/simgrid/kernel/resource/Model.hpp | 29 ++++++++++++-----------
 src/kernel/resource/Model.cpp             | 16 +++++--------
 2 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/include/simgrid/kernel/resource/Model.hpp b/include/simgrid/kernel/resource/Model.hpp
index 49918bb978..91da47c174 100644
--- a/include/simgrid/kernel/resource/Model.hpp
+++ b/include/simgrid/kernel/resource/Model.hpp
@@ -6,6 +6,7 @@
 #ifndef SIMGRID_KERNEL_RESOURCE_MODEL_HPP
 #define SIMGRID_KERNEL_RESOURCE_MODEL_HPP
 
+#include <memory>
 #include <simgrid/kernel/resource/Action.hpp>
 
 namespace simgrid {
@@ -31,31 +32,31 @@ public:
   Model(const Model&) = delete;
   Model& operator=(const Model&) = delete;
 
-  virtual ~Model();
+  virtual ~Model() = default;
 
   /** @brief Get the set of [actions](@ref Action) in *inited* state */
-  Action::StateSet* get_inited_action_set() const { return inited_action_set_; }
+  Action::StateSet* get_inited_action_set() { return &inited_action_set_; }
 
   /** @brief Get the set of [actions](@ref Action) in *started* state */
-  Action::StateSet* get_started_action_set() const { return started_action_set_; }
+  Action::StateSet* get_started_action_set() { return &started_action_set_; }
 
   /** @brief Get the set of [actions](@ref Action) in *failed* state */
-  Action::StateSet* get_failed_action_set() const { return failed_action_set_; }
+  Action::StateSet* get_failed_action_set() { return &failed_action_set_; }
 
   /** @brief Get the set of [actions](@ref Action) in *finished* state */
-  Action::StateSet* get_finished_action_set() const { return finished_action_set_; }
+  Action::StateSet* get_finished_action_set() { return &finished_action_set_; }
 
   /** @brief Get the set of [actions](@ref Action) in *ignored* state */
-  Action::StateSet* get_ignored_action_set() const { return ignored_action_set_; }
+  Action::StateSet* get_ignored_action_set() { return &ignored_action_set_; }
 
   /** @brief Get the set of modified [actions](@ref Action) */
   Action::ModifiedSet* get_modified_set() const;
 
   /** @brief Get the maxmin system of the current Model */
-  lmm::System* get_maxmin_system() const { return maxmin_system_; }
+  lmm::System* get_maxmin_system() const { return maxmin_system_.get(); }
 
   /** @brief Set the maxmin system of the current Model */
-  void set_maxmin_system(lmm::System* system) { maxmin_system_ = system; }
+  void set_maxmin_system(lmm::System* system);
 
   /** @brief Get the update algorithm of the current Model */
   UpdateAlgo get_update_algorithm() const { return update_algorithm_; }
@@ -98,13 +99,13 @@ public:
   virtual bool next_occuring_event_is_idempotent() { return true; }
 
 private:
-  lmm::System* maxmin_system_           = nullptr;
+  std::unique_ptr<lmm::System> maxmin_system_;
   const UpdateAlgo update_algorithm_;
-  Action::StateSet* inited_action_set_  = new Action::StateSet(); /**< Created not started */
-  Action::StateSet* started_action_set_  = new Action::StateSet(); /**< Started not done */
-  Action::StateSet* failed_action_set_  = new Action::StateSet(); /**< Done with failure */
-  Action::StateSet* finished_action_set_ = new Action::StateSet(); /**< Done successful */
-  Action::StateSet* ignored_action_set_  = new Action::StateSet(); /**< not considered (failure detectors?) */
+  Action::StateSet inited_action_set_;   /**< Created not started */
+  Action::StateSet started_action_set_;  /**< Started not done */
+  Action::StateSet failed_action_set_;   /**< Done with failure */
+  Action::StateSet finished_action_set_; /**< Done successful */
+  Action::StateSet ignored_action_set_;  /**< not considered (failure detectors?) */
 
   ActionHeap action_heap_;
 };
diff --git a/src/kernel/resource/Model.cpp b/src/kernel/resource/Model.cpp
index 1e8998c727..c0f2721e88 100644
--- a/src/kernel/resource/Model.cpp
+++ b/src/kernel/resource/Model.cpp
@@ -14,19 +14,15 @@ namespace resource {
 
 Model::Model(Model::UpdateAlgo algo) : update_algorithm_(algo) {}
 
-Model::~Model()
+Action::ModifiedSet* Model::get_modified_set() const
 {
-  delete inited_action_set_;
-  delete started_action_set_;
-  delete failed_action_set_;
-  delete finished_action_set_;
-  delete ignored_action_set_;
-  delete maxmin_system_;
+  return maxmin_system_->modified_set_;
 }
 
-Action::ModifiedSet* Model::get_modified_set() const
+void Model::set_maxmin_system(lmm::System* system)
 {
-  return maxmin_system_->modified_set_;
+  maxmin_system_.release(); // ugly...
+  maxmin_system_.reset(system);
 }
 
 double Model::next_occuring_event(double now)
@@ -51,7 +47,7 @@ double Model::next_occuring_event_lazy(double now)
     maxmin_system_->modified_set_->pop_front();
     bool max_duration_flag = false;
 
-    if (action->get_state_set() != started_action_set_)
+    if (action->get_state_set() != &started_action_set_)
       continue;
 
     /* bogus priority, skip it */
-- 
2.20.1