#include <simgrid/s4u/Engine.hpp>
#include <simgrid/s4u/NetZone.hpp>
#include <simgrid/simix.hpp>
+#include <xbt/functional.hpp>
#include <map>
+#include <set>
#include <string>
#include <unordered_map>
std::unordered_map<std::string, routing::NetPoint*> netpoints_;
std::unordered_map<std::string, actor::ActorCodeFactory> registered_functions; // Maps function names to actor code
actor::ActorCodeFactory default_function; // Function to use as a fallback when the provided name matches nothing
- std::vector<std::unique_ptr<simgrid::kernel::resource::Model>> models_;
- std::unordered_map<simgrid::kernel::resource::Model::Type, std::vector<simgrid::kernel::resource::Model*>>
- models_by_type_;
+ std::vector<resource::Model*> models_;
+ std::unordered_map<std::string, std::shared_ptr<resource::Model>> models_prio_;
+ routing::NetZoneImpl* netzone_root_ = nullptr;
+ std::set<kernel::actor::ActorImpl*> daemons_;
+
+ std::vector<xbt::Task<void()>> tasks;
+ std::vector<xbt::Task<void()>> tasksTemp;
friend s4u::Engine;
/**
* @brief Add a model to engine list
*
- * @param type Model type (network, disk, etc)
* @param model Pointer to model
- * @param is_default Is this the default model for this type of resource in this exp
- */
- void add_model(simgrid::kernel::resource::Model::Type type, std::unique_ptr<simgrid::kernel::resource::Model> model,
- bool is_default = false);
- /**
- * @brief Add a model (specific for ptask)
- *
- * Ptask is special. The CPU and NETWORK models need to be in the managed
- * resources by surf_solve (model_by_type) but cannot be in the list of
- * all models (old all_existing_models global variable)
- *
- * This methods does this job while we cannot handle ptask as the remaining models
+ * @param list List of dependencies for this model
*/
- void add_model_ptask(simgrid::kernel::resource::Model::Type type, simgrid::kernel::resource::Model* model,
- bool is_default);
- /** @brief Get current default model for a resource type */
- simgrid::kernel::resource::Model* get_default_model(simgrid::kernel::resource::Model::Type type);
+ void add_model(std::shared_ptr<simgrid::kernel::resource::Model> model,
+ const std::vector<resource::Model*>& dep_models = {});
- /** @brief Get list of models created for a resource type */
- const std::vector<simgrid::kernel::resource::Model*>& get_model_list(simgrid::kernel::resource::Model::Type type)
- {
- return models_by_type_[type];
- }
/** @brief Get list of all models managed by this engine */
- const std::vector<std::unique_ptr<simgrid::kernel::resource::Model>>& get_all_models() { return models_; }
+ const std::vector<resource::Model*>& get_all_models() const { return models_; }
- routing::NetZoneImpl* netzone_root_ = nullptr;
static EngineImpl* get_instance() { return simgrid::s4u::Engine::get_instance()->pimpl; }
actor::ActorCodeFactory get_function(const std::string& name)
{
else
return res->second;
}
+ void add_daemon(actor::ActorImpl* d) { daemons_.insert(d); }
+ void rm_daemon(actor::ActorImpl* d);
+
+ bool execute_tasks();
+ void add_task(xbt::Task<void()>&& t) { tasks.push_back(std::move(t)); }
+ void wake_all_waiting_actors() const;
+ void display_all_actor_status() const;
+
+ /** @brief Run the main simulation loop. */
+ void run();
};
} // namespace kernel