X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4da1d4781f09b739bcaa2d0bbf0f801023a3e077..55b3e236db71d2245c71ff1ea3cbec120a0e0d8d:/src/s4u/s4u_engine.cpp

diff --git a/src/s4u/s4u_engine.cpp b/src/s4u/s4u_engine.cpp
index 6cff0b1ce6..7c23adc3c0 100644
--- a/src/s4u/s4u_engine.cpp
+++ b/src/s4u/s4u_engine.cpp
@@ -14,10 +14,8 @@
 #include "simgrid/s4u/storage.hpp"
 #include "simgrid/simix.h"
 #include "src/kernel/EngineImpl.hpp"
+#include "src/kernel/routing/NetPoint.hpp"
 #include "src/kernel/routing/NetZoneImpl.hpp"
-#include "src/kernel/routing/NetCard.hpp"
-
-
 #include "src/surf/network_interface.hpp"
 #include "surf/surf.h"               // routing_platf. FIXME:KILLME. SOON
 
@@ -25,6 +23,9 @@ XBT_LOG_NEW_CATEGORY(s4u,"Log channels of the S4U (Simgrid for you) interface");
 
 namespace simgrid {
 namespace s4u {
+xbt::signal<void()> onPlatformCreated;
+xbt::signal<void()> onSimulationEnd;
+xbt::signal<void(double)> onTimeAdvance;
 
 Engine *Engine::instance_ = nullptr; /* That singleton is awful, but I don't see no other solution right now. */
 
@@ -97,12 +98,14 @@ static s4u::NetZone* netzoneByNameRecursive(s4u::NetZone* current, const char* n
     return current;
 
   xbt_dict_cursor_t cursor = nullptr;
-  char *key;
-  NetZone_t elem;
+  char* key;
+  s4u::NetZone* elem;
   xbt_dict_foreach(current->children(), cursor, key, elem) {
     simgrid::s4u::NetZone* tmp = netzoneByNameRecursive(elem, name);
-    if (tmp != nullptr )
-        return tmp;
+    if (tmp != nullptr) {
+      xbt_dict_cursor_free(&cursor);
+      return tmp;
+    }
   }
   return nullptr;
 }
@@ -113,32 +116,32 @@ NetZone* Engine::netzoneByNameOrNull(const char* name)
   return netzoneByNameRecursive(netRoot(), name);
 }
 
-/** @brief Retrieve the netcard of the given name (or nullptr if not found) */
-simgrid::kernel::routing::NetCard* Engine::netcardByNameOrNull(const char* name)
+/** @brief Retrieve the netpoint of the given name (or nullptr if not found) */
+simgrid::kernel::routing::NetPoint* Engine::netpointByNameOrNull(const char* name)
 {
-  if (pimpl->netcards_.find(name) == pimpl->netcards_.end())
+  if (pimpl->netpoints_.find(name) == pimpl->netpoints_.end())
     return nullptr;
-  return pimpl->netcards_.at(name);
+  return pimpl->netpoints_.at(name);
 }
-/** @brief Fill the provided vector with all existing netcards */
-void Engine::netcardList(std::vector<simgrid::kernel::routing::NetCard*>* list)
+/** @brief Fill the provided vector with all existing netpoints */
+void Engine::netpointList(std::vector<simgrid::kernel::routing::NetPoint*>* list)
 {
-  for (auto kv: pimpl->netcards_)
+  for (auto kv : pimpl->netpoints_)
     list->push_back(kv.second);
 }
-/** @brief Register a new netcard to the system */
-void Engine::netcardRegister(simgrid::kernel::routing::NetCard* card)
+/** @brief Register a new netpoint to the system */
+void Engine::netpointRegister(simgrid::kernel::routing::NetPoint* point)
 {
 //  simgrid::simix::kernelImmediate([&]{ FIXME: this segfaults in set_thread
-      pimpl->netcards_[card->name()] = card;
+  pimpl->netpoints_[point->name()] = point;
 //  });
 }
-/** @brief Unregister a given netcard */
-void Engine::netcardUnregister(simgrid::kernel::routing::NetCard* card)
+/** @brief Unregister a given netpoint */
+void Engine::netpointUnregister(simgrid::kernel::routing::NetPoint* point)
 {
-  simgrid::simix::kernelImmediate([&]{
-      pimpl->netcards_.erase(card->name());
-      delete card;
+  simgrid::simix::kernelImmediate([this, point] {
+    pimpl->netpoints_.erase(point->name());
+    delete point;
   });
 }
 }