X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a2444896cc5969f2b9150b035f9ea0744e74789d..9fef6711973925db4d95836b9d20062ca9129c6b:/src/surf/network_constant.cpp diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp index 62f97f3f0a..1872ae1912 100644 --- a/src/surf/network_constant.cpp +++ b/src/surf/network_constant.cpp @@ -18,8 +18,6 @@ void surf_network_model_init_Constant() xbt_dynar_push(all_existing_models, &surf_network_model); routing_model_create(NULL); - - simgrid::surf::on_link.connect(netlink_parse_init); } namespace simgrid { @@ -64,7 +62,7 @@ namespace simgrid { action->latency_ = 0.0; } } - action->updateRemains(action->getCost() * delta / action->m_latInit); + action->updateRemains(action->getCost() * delta / action->initialLatency_); if (action->getMaxDuration() != NO_MAX_DURATION) action->updateMaxDuration(delta); @@ -92,31 +90,13 @@ namespace simgrid { **********/ NetworkConstantAction::NetworkConstantAction(NetworkConstantModel *model_, double size, double latency) : NetworkAction(model_, size, false) - , m_latInit(latency) + , initialLatency_(latency) { latency_ = latency; if (latency_ <= 0.0) { stateSet_ = getModel()->getDoneActionSet(); stateSet_->push_back(*this); } - variable_ = NULL; }; - - int NetworkConstantAction::unref() - { - refcount_--; - if (!refcount_) { - if (action_hook.is_linked()) - stateSet_->erase(stateSet_->iterator_to(*this)); - delete this; - return 1; - } - return 0; - } - - void NetworkConstantAction::cancel() - { - } - } }