-/* Copyright (c) 2013-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-2021. 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. */
#include "network_constant.hpp"
+#include "simgrid/kernel/routing/NetZoneImpl.hpp"
+#include "simgrid/s4u/Engine.hpp"
+#include "src/kernel/EngineImpl.hpp"
#include "src/surf/surf_interface.hpp"
#include "surf/surf.hpp"
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(res_network);
/*********
* Model *
*********/
void surf_network_model_init_Constant()
{
- xbt_assert(surf_network_model == nullptr);
- surf_network_model = new simgrid::kernel::resource::NetworkConstantModel();
+ auto net_model = std::make_shared<simgrid::kernel::resource::NetworkConstantModel>();
+ simgrid::kernel::EngineImpl::get_instance()->add_model(simgrid::kernel::resource::Model::Type::NETWORK, net_model,
+ true);
+ simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_network_model(net_model);
}
namespace simgrid {
namespace kernel {
namespace resource {
-NetworkConstantModel::NetworkConstantModel() : NetworkModel(Model::UpdateAlgo::FULL)
-{
- all_existing_models.push_back(this);
-}
-
LinkImpl* NetworkConstantModel::create_link(const std::string& name, const std::vector<double>& /*bandwidth*/,
- double /*latency*/, s4u::Link::SharingPolicy)
+ s4u::Link::SharingPolicy)
{
xbt_die("Refusing to create the link %s: there is no link in the Constant network model. "
"Please remove any link from your platform (and switch to routing='None')",
Action* NetworkConstantModel::communicate(s4u::Host* src, s4u::Host* dst, double size, double)
{
- auto* action = new NetworkConstantAction(this, size, sg_latency_factor);
+ auto* action = new NetworkConstantAction(this, *src, *dst, size, sg_latency_factor);
- s4u::Link::on_communicate(*action, src, dst);
+ s4u::Link::on_communicate(*action);
return action;
}
/**********
* Action *
**********/
-NetworkConstantAction::NetworkConstantAction(NetworkConstantModel* model_, double size, double latency)
- : NetworkAction(model_, size, false), initial_latency_(latency)
+NetworkConstantAction::NetworkConstantAction(NetworkConstantModel* model_, s4u::Host& src, s4u::Host& dst, double size,
+ double latency)
+ : NetworkAction(model_, src, dst, size, false), initial_latency_(latency)
{
latency_ = latency;
if (latency_ <= 0.0)