-/* Copyright (c) 2004-2021. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-2022. 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. */
*/
class XBT_PUBLIC Model {
public:
- /** @brief Possible model types */
- enum class Type {
- HOST, /**< Host models: see surf_host_model_description for more details */
- NETWORK, /**< Network models: see surf_network_model_description for more details */
- CPU_PM, /**< CPU model for physical machines: see surf_cpu_model_description for more details */
- CPU_VM, /**< CPU model for virtual machines: see surf_cpu_model_description for more details */
- DISK, /**< Disk models: see surf_disk_model_description for more details */
- VM /**< VM model */
- };
-
/** @brief Possible update mechanisms */
enum class UpdateAlgo {
FULL, /**< Full update mechanism: the remaining time of every action is recomputed at each step */
gets recomputed anyway. In that case, you'd better not try to be cleaver with lazy and go for
a simple full update. */
};
- Model() = default;
+ explicit Model(const std::string& name);
Model(const Model&) = delete;
Model& operator=(const Model&) = delete;
/** @brief Set the maxmin system of the current Model */
void set_maxmin_system(lmm::System* system);
- /** @brief Get the update algorithm of the current Model */
- 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_; }
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);
*/
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();
- }
+ /** @brief Gets the model name */
+ std::string get_name() const { return name_; }
private:
UpdateAlgo update_algorithm_ = UpdateAlgo::FULL;
Action::StateSet failed_action_set_; /**< Done with failure */
Action::StateSet finished_action_set_; /**< Done successful */
Action::StateSet ignored_action_set_; /**< not considered (failure detectors?) */
+ const std::string name_; /**< Model name */
ActionHeap action_heap_;
};