X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e16e02338a20ee10478d01659df54ed60dea1101..f7416c885321b8233e9ac6da5450f97468e94dac:/src/surf/network_constant.cpp diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp index d13d0bc962..0b7e322a34 100644 --- a/src/surf/network_constant.cpp +++ b/src/surf/network_constant.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2013-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. */ @@ -30,7 +30,6 @@ NetworkConstantModel::NetworkConstantModel() : NetworkModel(Model::UpdateAlgo::F LinkImpl* NetworkConstantModel::create_link(const std::string& name, const std::vector& /*bandwidth*/, double /*latency*/, 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')", name.c_str()); @@ -72,17 +71,18 @@ void NetworkConstantModel::update_actions_state(double /*now*/, double delta) 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)