X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8ccebd8729f00d1125f343c9dce5b093f40f8cc7..4052b6d9960bd9792127d006c4f359b946cb7baa:/src/s4u/s4u_Link.cpp

diff --git a/src/s4u/s4u_Link.cpp b/src/s4u/s4u_Link.cpp
index b0257ffb76..954969d5f3 100644
--- a/src/s4u/s4u_Link.cpp
+++ b/src/s4u/s4u_Link.cpp
@@ -14,65 +14,16 @@
 
 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);
@@ -119,11 +70,11 @@ double Link::getUsage()
 
 void Link::turnOn()
 {
-  simgrid::simix::kernelImmediate([this]() { this->pimpl_->turn_on(); });
+  simgrid::simix::simcall([this]() { this->pimpl_->turn_on(); });
 }
 void Link::turnOff()
 {
-  simgrid::simix::kernelImmediate([this]() { this->pimpl_->turn_off(); });
+  simgrid::simix::simcall([this]() { this->pimpl_->turn_off(); });
 }
 
 void* Link::getData()
@@ -132,20 +83,20 @@ void* Link::getData()
 }
 void Link::setData(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)
 {
-  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)
 {
-  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)
 {
-  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)
@@ -154,17 +105,58 @@ const char* Link::getProperty(const char* key)
 }
 void Link::setProperty(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_->setProperty(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->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();
+}