WIP stop using const char* in C++ layers

[simgrid.git] / src / s4u / s4u_link.cpp

diff --git a/src/s4u/s4u_link.cpp b/src/s4u/s4u_link.cpp
index c7fb403..4fd78e8 100644 (file)
--- a/src/s4u/s4u_link.cpp
+++ b/src/s4u/s4u_link.cpp
@@ -1,12 +1,11 @@
-/* Copyright (c) 2013-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2013-2017. The SimGrid Team. All rights reserved.          */
 
 /* 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 <algorithm>
 
-#include "simgrid/s4u/link.hpp"
+#include "simgrid/s4u/Link.hpp"
 #include "simgrid/sg_config.h"
 #include "simgrid/simix.hpp"
 #include "src/surf/network_interface.hpp"
@@ -85,69 +84,78 @@ Link* Link::byName(const char* name)
 }
 const char* Link::name()
 {
-  return pimpl_->getName();
+  return this->pimpl_->cname();
 }
 bool Link::isUsed()
 {
-  return pimpl_->isUsed();
+  return this->pimpl_->isUsed();
 }
 
 double Link::latency()
 {
-  return pimpl_->latency();
+  return this->pimpl_->latency();
 }
 
 double Link::bandwidth()
 {
-  return pimpl_->bandwidth();
+  return this->pimpl_->bandwidth();
 }
 
 int Link::sharingPolicy()
 {
-  return pimpl_->sharingPolicy();
+  return this->pimpl_->sharingPolicy();
 }
 
 void Link::turnOn()
 {
-  simgrid::simix::kernelImmediate([&]() {
+  simgrid::simix::kernelImmediate([this]() {
     this->pimpl_->turnOn();
   });
 }
 void Link::turnOff()
 {
-  simgrid::simix::kernelImmediate([&]() {
+  simgrid::simix::kernelImmediate([this]() {
     this->pimpl_->turnOff();
   });
 }
 
 void* Link::getData()
 {
-  return pimpl_->getData();
+  return this->pimpl_->getData();
 }
 void Link::setData(void* d)
 {
-  simgrid::simix::kernelImmediate([&]() {
+  simgrid::simix::kernelImmediate([this, d]() {
     this->pimpl_->setData(d);
   });
 }
 
 void Link::setStateTrace(tmgr_trace_t trace)
 {
-  simgrid::simix::kernelImmediate([&]() {
+  simgrid::simix::kernelImmediate([this, trace]() {
     this->pimpl_->setStateTrace(trace);
   });
 }
 void Link::setBandwidthTrace(tmgr_trace_t trace)
 {
-  simgrid::simix::kernelImmediate([&]() {
+  simgrid::simix::kernelImmediate([this, trace]() {
     this->pimpl_->setBandwidthTrace(trace);
   });
 }
 void Link::setLatencyTrace(tmgr_trace_t trace)
 {
-  simgrid::simix::kernelImmediate([&]() {
+  simgrid::simix::kernelImmediate([this, trace]() {
     this->pimpl_->setLatencyTrace(trace);
   });
 }
+
+/*************
+ * 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(surf::NetworkAction*, s4u::Host* src, s4u::Host* dst)> Link::onCommunicate;
+simgrid::xbt::signal<void(surf::NetworkAction*)> Link::onCommunicationStateChange;
 }
 }