X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8ccebd8729f00d1125f343c9dce5b093f40f8cc7..ff3ef77d2ef796e7e5e8c384672f3057997cec4b:/src/surf/network_interface.cpp diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp index 2e3bc1ec0f..7391e1d8c4 100644 --- a/src/surf/network_interface.cpp +++ b/src/surf/network_interface.cpp @@ -145,7 +145,7 @@ void LinkImpl::destroy() { if (not currentlyDestroying_) { currentlyDestroying_ = true; - s4u::Link::onDestruction(this->piface_); + s4u::Link::on_destruction(this->piface_); delete this; } } @@ -174,23 +174,23 @@ void LinkImpl::turn_on() { if (is_off()) { Resource::turn_on(); - s4u::Link::onStateChange(this->piface_); + s4u::Link::on_state_change(this->piface_); } } void LinkImpl::turn_off() { if (is_on()) { Resource::turn_off(); - s4u::Link::onStateChange(this->piface_); + s4u::Link::on_state_change(this->piface_); } } void LinkImpl::on_bandwidth_change() { if (TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) - instr::Container::byName(get_cname()) - ->getVariable("bandwidth") - ->setEvent(surf_get_clock(), sg_bandwidth_factor * bandwidth_.scale * bandwidth_.peak); + instr::Container::by_name(get_cname()) + ->get_variable("bandwidth") + ->set_event(surf_get_clock(), sg_bandwidth_factor * bandwidth_.scale * bandwidth_.peak); s4u::Link::on_bandwidth_change(this->piface_); } @@ -216,8 +216,10 @@ void LinkImpl::setLatencyTrace(tmgr_trace_t trace) void NetworkAction::set_state(Action::State state) { + Action::State previous = get_state(); Action::set_state(state); - s4u::Link::onCommunicationStateChange(this); + if (previous != state) // Trigger only if the state changed + s4u::Link::on_communication_state_change(this); } /** @brief returns a list of all Links that this action is using */