#include "src/surf/host_clm03.hpp"
#include "simgrid/kernel/routing/NetPoint.hpp"
+#include "simgrid/kernel/routing/NetZoneImpl.hpp"
+#include "simgrid/s4u/Engine.hpp"
#include "simgrid/sg_config.hpp"
+#include "src/kernel/EngineImpl.hpp"
#include "surf/surf.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(res_host);
void surf_host_model_init_current_default()
{
- surf_host_model = new simgrid::surf::HostCLM03Model();
+ auto host_model = std::make_shared<simgrid::surf::HostCLM03Model>("Host_CLM03");
simgrid::config::set_default<bool>("network/crosstraffic", true);
+ simgrid::kernel::EngineImpl::get_instance()->add_model(host_model);
+ simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_host_model(host_model);
surf_cpu_model_init_Cas01();
surf_network_model_init_LegrandVelho();
}
void surf_host_model_init_compound()
{
- xbt_assert(surf_cpu_model_pm, "No CPU model defined yet!");
- /* FIXME[donassolo]: this smells bad, but works
- * (the constructor saves its pointer in all_existing_models and models_by_type :O).
- * We need a manager for these models */
- new simgrid::surf::HostCLM03Model();
+ auto host_model = std::make_shared<simgrid::surf::HostCLM03Model>("Host_CLM03");
+ simgrid::kernel::EngineImpl::get_instance()->add_model(host_model);
+ simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_host_model(host_model);
}
namespace simgrid {
namespace surf {
-HostCLM03Model::HostCLM03Model()
-{
- all_existing_models.push_back(this);
- models_by_type[simgrid::kernel::resource::Model::Type::HOST].push_back(this);
-}
-
double HostCLM03Model::next_occurring_event(double now)
{
/* nothing specific to be done here
- * surf_solve already calls all the models next_occuring_event properly */
+ * surf_solve already calls all the models next_occurring_event properly */
return -1.0;
}
/* FIXME[donassolo]: getting the network_model from the origin host
* Soon we need to change this function to first get the routes and later
* create the respective surf actions */
- auto* net_model = host_list[0]->get_netpoint()->get_englobing_zone()->get_network_model();
+ auto net_model = host_list[0]->get_netpoint()->get_englobing_zone()->get_network_model();
if ((host_list.size() == 1) && (has_cost(bytes_amount, 0) <= 0) && (has_cost(flops_amount, 0) > 0)) {
action = host_list[0]->pimpl_cpu->execution_start(flops_amount[0]);
} else if ((host_list.size() == 1) && (has_cost(flops_amount, 0) <= 0)) {