X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0753f73209089c7573361567dfe25851dab20a70..5d4bf7d1cd502bc979d98e35067872186f2a0a21:/src/surf/network_constant.cpp diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp index 4581f26aec..7dc5c255f7 100644 --- a/src/surf/network_constant.cpp +++ b/src/surf/network_constant.cpp @@ -16,18 +16,18 @@ void surf_network_model_init_Constant() xbt_assert(surf_network_model == nullptr); surf_network_model = new simgrid::surf::NetworkConstantModel(); all_existing_models->push_back(surf_network_model); - - routing_model_create(nullptr); } namespace simgrid { namespace surf { - Link* NetworkConstantModel::createLink(const char *name, double bw, double lat, e_surf_link_sharing_policy_t policy, - xbt_dict_t properties) { - - 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); - return nullptr; + LinkImpl* NetworkConstantModel::createLink(const char* name, double bw, double lat, + e_surf_link_sharing_policy_t policy) + { + + 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); + return nullptr; } double NetworkConstantModel::nextOccuringEvent(double /*now*/) @@ -78,7 +78,7 @@ namespace simgrid { { NetworkConstantAction *action = new NetworkConstantAction(this, size, sg_latency_factor); - Link::onCommunicate(action, src, dst); + LinkImpl::onCommunicate(action, src, dst); return action; } @@ -91,12 +91,11 @@ namespace simgrid { { latency_ = latency; if (latency_ <= 0.0) { - stateSet_ = getModel()->getDoneActionSet(); + stateSet_ = model_->getDoneActionSet(); stateSet_->push_back(*this); } }; - NetworkConstantAction::~NetworkConstantAction() {} - + NetworkConstantAction::~NetworkConstantAction() = default; } }