X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fe304706848f0a64477d4687b3ea97d5b9a0c35c..ca82f90e6d610b6bb3b038cd9ee48d378cc8a909:/src/s4u/s4u_Link.cpp diff --git a/src/s4u/s4u_Link.cpp b/src/s4u/s4u_Link.cpp index 866436c721..742f0628e3 100644 --- a/src/s4u/s4u_Link.cpp +++ b/src/s4u/s4u_Link.cpp @@ -13,8 +13,6 @@ #include "src/surf/network_interface.hpp" #include "xbt/log.h" -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_link, s4u, "Logging specific to the S4U links"); - namespace simgrid { namespace s4u { @@ -71,11 +69,11 @@ double Link::get_usage() void Link::turn_on() { - simgrid::simix::simcall([this]() { this->pimpl_->turn_on(); }); + simgrid::kernel::actor::simcall([this]() { this->pimpl_->turn_on(); }); } void Link::turn_off() { - simgrid::simix::simcall([this]() { this->pimpl_->turn_off(); }); + simgrid::kernel::actor::simcall([this]() { this->pimpl_->turn_off(); }); } bool Link::is_on() const @@ -83,26 +81,17 @@ bool Link::is_on() const return this->pimpl_->is_on(); } -void* Link::get_data() -{ - return this->pimpl_->get_data(); -} -void Link::set_data(void* d) -{ - simgrid::simix::simcall([this, d]() { this->pimpl_->set_data(d); }); -} - void Link::set_state_profile(kernel::profile::Profile* profile) { - simgrid::simix::simcall([this, profile]() { this->pimpl_->set_state_profile(profile); }); + simgrid::kernel::actor::simcall([this, profile]() { this->pimpl_->set_state_profile(profile); }); } void Link::set_bandwidth_profile(kernel::profile::Profile* profile) { - simgrid::simix::simcall([this, profile]() { this->pimpl_->set_bandwidth_profile(profile); }); + simgrid::kernel::actor::simcall([this, profile]() { this->pimpl_->set_bandwidth_profile(profile); }); } void Link::set_latency_profile(kernel::profile::Profile* trace) { - simgrid::simix::simcall([this, trace]() { this->pimpl_->set_latency_profile(trace); }); + simgrid::kernel::actor::simcall([this, trace]() { this->pimpl_->set_latency_profile(trace); }); } const char* Link::get_property(const std::string& key) const @@ -111,7 +100,7 @@ const char* Link::get_property(const std::string& key) const } void Link::set_property(const std::string& key, const std::string& value) { - simgrid::simix::simcall([this, &key, &value] { this->pimpl_->set_property(key, value); }); + simgrid::kernel::actor::simcall([this, &key, &value] { this->pimpl_->set_property(key, value); }); } } // namespace s4u } // namespace simgrid