-/* Copyright (c) 2004-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-2020. 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. */
#ifndef SIMGRID_KERNEL_RESOURCE_MODEL_HPP
#define SIMGRID_KERNEL_RESOURCE_MODEL_HPP
+#include <memory>
#include <simgrid/kernel/resource/Action.hpp>
namespace simgrid {
};
explicit Model(Model::UpdateAlgo algo);
+ Model(const Model&) = delete;
+ Model& operator=(const Model&) = delete;
virtual ~Model();
+ bool is_update_lazy() { return update_algorithm_ == UpdateAlgo::LAZY; }
+
/** @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_; }
+ XBT_ATTRIB_DEPRECATED_v329("Please use is_update_lazy()") UpdateAlgo get_update_algorithm() const
+ {
+ return update_algorithm_;
+ }
/** @brief Get Action heap */
ActionHeap& get_action_heap() { return action_heap_; }
* @param now The current time of the simulation
* @return The delta of time till the next action will finish
*/
- virtual double next_occuring_event(double now);
- virtual double next_occuring_event_lazy(double now);
- virtual double next_occuring_event_full(double now);
+ virtual double next_occurring_event(double now);
+ virtual double next_occurring_event_lazy(double now);
+ virtual double next_occurring_event_full(double now);
+
+ XBT_ATTRIB_DEPRECATED_v329("Please use next_occurring_event()") virtual double next_occuring_event(double now) final
+ {
+ return next_occurring_event(now);
+ }
+ XBT_ATTRIB_DEPRECATED_v329("Please use next_occurring_event_lazy()") virtual double next_occuring_event_lazy(
+ double now) final
+ {
+ return next_occurring_event_lazy(now);
+ }
+ XBT_ATTRIB_DEPRECATED_v329("Please use next_occurring_event_full()") virtual double next_occuring_event_full(
+ double now) final
+ {
+ return next_occurring_event_full(now);
+ }
private:
Action* extract_action(Action::StateSet* list);
/** @brief Returns whether this model have an idempotent share_resource()
*
- * The only model that is not is NS3: computing the next timestamp moves the model up to that point,
+ * The only model that is not is ns-3: computing the next timestamp moves the model up to that point,
* so we need to call it only when the next timestamp of other sources is computed.
*/
- virtual bool next_occuring_event_is_idempotent() { return true; }
+ virtual bool next_occurring_event_is_idempotent() { return true; }
+
+ XBT_ATTRIB_DEPRECATED_v329(
+ "Please use next_occurring_event_is_idempotent()") virtual bool next_occuring_event_is_idempotent() final
+ {
+ return next_occurring_event_is_idempotent();
+ }
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_;
};
} // namespace kernel
} // namespace simgrid
-/** \ingroup SURF_models
- * \brief List of initialized models
+/** @ingroup SURF_models
+ * @brief List of initialized models
*/
XBT_PUBLIC_DATA std::vector<simgrid::kernel::resource::Model*> all_existing_models;