X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1de2248fe5139e51eafa74cc7e6aa0cbef0de3b2..cc320f970d3f91bf9483f44340078c0250a4a44b:/src/s4u/s4u_Link.cpp diff --git a/src/s4u/s4u_Link.cpp b/src/s4u/s4u_Link.cpp index 9c6d41a8c9..83919625a3 100644 --- a/src/s4u/s4u_Link.cpp +++ b/src/s4u/s4u_Link.cpp @@ -3,18 +3,16 @@ /* 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 +#include +#include +#include +#include +#include +#include -#include "simgrid/Exception.hpp" -#include "simgrid/s4u/Engine.hpp" -#include "simgrid/s4u/Link.hpp" -#include "simgrid/sg_config.hpp" -#include "simgrid/simix.hpp" #include "src/surf/SplitDuplexLinkImpl.hpp" #include "src/surf/network_interface.hpp" #include "src/surf/network_wifi.hpp" -#include "xbt/log.h" -#include "xbt/parse_units.hpp" namespace simgrid { @@ -26,7 +24,6 @@ xbt::signal Link::on_creation; xbt::signal Link::on_destruction; xbt::signal Link::on_state_change; xbt::signal Link::on_bandwidth_change; -xbt::signal Link::on_communicate; xbt::signal Link::on_communication_state_change; @@ -145,6 +142,7 @@ void Link::turn_off() Link* Link::seal() { kernel::actor::simcall([this]() { this->pimpl_->seal(); }); + s4u::Link::on_creation(*this); // notify the signal return this; } @@ -224,11 +222,6 @@ const char* sg_link_get_name(const_sg_link_t link) return link->get_cname(); } -const char* sg_link_name(const_sg_link_t link) // XBT_ATTRIB_DEPRECATED_v330 -{ - return sg_link_get_name(link); -} - sg_link_t sg_link_by_name(const char* name) { return simgrid::s4u::Link::by_name(name); @@ -249,16 +242,6 @@ void sg_link_set_bandwidth(sg_link_t link, double value) link->set_bandwidth(value); } -double sg_link_bandwidth(const_sg_link_t link) // XBT_ATTRIB_DEPRECATED_v330 -{ - return sg_link_get_bandwidth(link); -} - -void sg_link_bandwidth_set(sg_link_t link, double value) // XBT_ATTRIB_DEPRECATED_v330 -{ - sg_link_set_bandwidth(link, value); -} - double sg_link_get_latency(const_sg_link_t link) { return link->get_latency(); @@ -269,16 +252,6 @@ void sg_link_set_latency(sg_link_t link, double value) link->set_latency(value); } -double sg_link_latency(const_sg_link_t link) // XBT_ATTRIB_DEPRECATED_v330 -{ - return sg_link_get_latency(link); -} - -void sg_link_latency_set(sg_link_t link, double value) // XBT_ATTRIB_DEPRECATED_v330 -{ - sg_link_set_latency(link, value); -} - void* sg_link_get_data(const_sg_link_t link) { return link->get_data(); @@ -289,16 +262,6 @@ void sg_link_set_data(sg_link_t link, void* data) link->set_data(data); } -void* sg_link_data(const_sg_link_t link) // XBT_ATTRIB_DEPRECATED_v330 -{ - return sg_link_get_data(link); -} - -void sg_link_data_set(sg_link_t link, void* data) // XBT_ATTRIB_DEPRECATED_v330 -{ - sg_link_set_data(link, data); -} - size_t sg_link_count() { return simgrid::s4u::Engine::get_instance()->get_link_count();