XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_link, s4u, "Logging specific to the S4U links");
-/*********
- * C API *
- *********/
-
-const char* sg_link_name(sg_link_t link)
-{
- return link->get_cname();
-}
-sg_link_t sg_link_by_name(const char* name)
-{
- return simgrid::s4u::Link::by_name(name);
-}
-
-int sg_link_is_shared(sg_link_t link)
-{
- return (int)link->sharingPolicy();
-}
-double sg_link_bandwidth(sg_link_t link)
-{
- return link->bandwidth();
-}
-double sg_link_latency(sg_link_t link)
-{
- return link->latency();
-}
-void* sg_link_data(sg_link_t link)
-{
- return link->getData();
-}
-void sg_link_data_set(sg_link_t link, void* data)
-{
- link->setData(data);
-}
-int sg_link_count()
-{
- return simgrid::kernel::resource::LinkImpl::linksCount();
-}
-sg_link_t* sg_link_list()
-{
- simgrid::kernel::resource::LinkImpl** list = simgrid::kernel::resource::LinkImpl::linksList();
- sg_link_t* res = (sg_link_t*)list; // Use the same memory area
-
- int size = sg_link_count();
- for (int i = 0; i < size; i++)
- res[i] = &(list[i]->piface_); // Convert each entry into its interface
-
- return res;
-}
-void sg_link_exit()
-{
- simgrid::kernel::resource::LinkImpl::linksExit();
-}
-
-/***********
- * C++ API *
- ***********/
-
namespace simgrid {
namespace s4u {
+
+simgrid::xbt::signal<void(Link&)> Link::on_creation;
+simgrid::xbt::signal<void(Link&)> Link::on_destruction;
+simgrid::xbt::signal<void(Link&)> Link::on_state_change;
+simgrid::xbt::signal<void(Link&)> Link::on_bandwidth_change;
+simgrid::xbt::signal<void(kernel::resource::NetworkAction*, Host* src, Host* dst)> Link::on_communicate;
+simgrid::xbt::signal<void(kernel::resource::NetworkAction*)> Link::on_communication_state_change;
+
Link* Link::by_name(const char* name)
{
kernel::resource::LinkImpl* res = kernel::resource::LinkImpl::byName(name);
{
return get_cname();
}
-bool Link::isUsed()
+bool Link::is_used()
{
return this->pimpl_->is_used();
}
-double Link::latency()
+double Link::get_latency()
{
return this->pimpl_->latency();
}
-double Link::bandwidth()
+double Link::get_bandwidth()
{
return this->pimpl_->bandwidth();
}
-Link::SharingPolicy Link::sharingPolicy()
+Link::SharingPolicy Link::get_sharing_policy()
{
return this->pimpl_->sharingPolicy();
}
-double Link::getUsage()
+double Link::get_usage()
{
return this->pimpl_->get_constraint()->get_usage();
}
-void Link::turnOn()
+void Link::turn_on()
{
- simgrid::simix::kernelImmediate([this]() { this->pimpl_->turn_on(); });
+ simgrid::simix::simcall([this]() { this->pimpl_->turn_on(); });
}
-void Link::turnOff()
+void Link::turn_off()
{
- simgrid::simix::kernelImmediate([this]() { this->pimpl_->turn_off(); });
+ simgrid::simix::simcall([this]() { this->pimpl_->turn_off(); });
}
-void* Link::getData()
+void* Link::get_data()
{
return this->pimpl_->getData();
}
-void Link::setData(void* d)
+void Link::set_data(void* d)
{
- simgrid::simix::kernelImmediate([this, d]() { this->pimpl_->setData(d); });
+ simgrid::simix::simcall([this, d]() { this->pimpl_->setData(d); });
}
-void Link::setStateTrace(tmgr_trace_t trace)
+void Link::set_state_trace(tmgr_trace_t trace)
{
- simgrid::simix::kernelImmediate([this, trace]() { this->pimpl_->setStateTrace(trace); });
+ simgrid::simix::simcall([this, trace]() { this->pimpl_->setStateTrace(trace); });
}
-void Link::setBandwidthTrace(tmgr_trace_t trace)
+void Link::set_bandwidth_trace(tmgr_trace_t trace)
{
- simgrid::simix::kernelImmediate([this, trace]() { this->pimpl_->setBandwidthTrace(trace); });
+ simgrid::simix::simcall([this, trace]() { this->pimpl_->setBandwidthTrace(trace); });
}
-void Link::setLatencyTrace(tmgr_trace_t trace)
+void Link::set_latency_trace(tmgr_trace_t trace)
{
- simgrid::simix::kernelImmediate([this, trace]() { this->pimpl_->setLatencyTrace(trace); });
+ simgrid::simix::simcall([this, trace]() { this->pimpl_->setLatencyTrace(trace); });
}
-const char* Link::getProperty(const char* key)
+const char* Link::get_property(const char* key)
{
- return this->pimpl_->getProperty(key);
+ return this->pimpl_->get_property(key);
}
-void Link::setProperty(std::string key, std::string value)
+void Link::set_property(std::string key, std::string value)
{
- simgrid::simix::kernelImmediate([this, key, value] { this->pimpl_->setProperty(key, value); });
+ simgrid::simix::simcall([this, key, value] { this->pimpl_->set_property(key, value); });
}
-
-/*************
- * Callbacks *
- *************/
-simgrid::xbt::signal<void(s4u::Link&)> Link::onCreation;
-simgrid::xbt::signal<void(s4u::Link&)> Link::onDestruction;
-simgrid::xbt::signal<void(s4u::Link&)> Link::onStateChange;
-simgrid::xbt::signal<void(s4u::Link&)> Link::on_bandwidth_change;
-simgrid::xbt::signal<void(kernel::resource::NetworkAction*, s4u::Host* src, s4u::Host* dst)> Link::onCommunicate;
-simgrid::xbt::signal<void(kernel::resource::NetworkAction*)> Link::onCommunicationStateChange;
} // namespace s4u
} // namespace simgrid
+
+/* **************************** Public C interface *************************** */
+
+const char* sg_link_name(sg_link_t link)
+{
+ return link->get_cname();
+}
+sg_link_t sg_link_by_name(const char* name)
+{
+ return simgrid::s4u::Link::by_name(name);
+}
+
+int sg_link_is_shared(sg_link_t link)
+{
+ return (int)link->get_sharing_policy();
+}
+double sg_link_bandwidth(sg_link_t link)
+{
+ return link->get_bandwidth();
+}
+double sg_link_latency(sg_link_t link)
+{
+ return link->get_latency();
+}
+void* sg_link_data(sg_link_t link)
+{
+ return link->get_data();
+}
+void sg_link_data_set(sg_link_t link, void* data)
+{
+ link->set_data(data);
+}
+int sg_link_count()
+{
+ return simgrid::kernel::resource::LinkImpl::linksCount();
+}
+sg_link_t* sg_link_list()
+{
+ simgrid::kernel::resource::LinkImpl** list = simgrid::kernel::resource::LinkImpl::linksList();
+ sg_link_t* res = (sg_link_t*)list; // Use the same memory area
+
+ int size = sg_link_count();
+ for (int i = 0; i < size; i++)
+ res[i] = &(list[i]->piface_); // Convert each entry into its interface
+
+ return res;
+}
+void sg_link_exit()
+{
+ simgrid::kernel::resource::LinkImpl::linksExit();
+}
