X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1d5dde64a8201a55007ccc0bcc4f267facff8d30..85662e22397c029bf1c4271a45aa3eca71e37a15:/src/s4u/s4u_engine.cpp

diff --git a/src/s4u/s4u_engine.cpp b/src/s4u/s4u_engine.cpp
index 1516008afc..49844d197b 100644
--- a/src/s4u/s4u_engine.cpp
+++ b/src/s4u/s4u_engine.cpp
@@ -7,18 +7,16 @@
 
 #include "instr/instr_interface.h"
 #include "mc/mc.h"
-#include "simgrid/s4u/As.hpp"
 #include "simgrid/s4u/Mailbox.hpp"
+#include "simgrid/s4u/NetZone.hpp"
 #include "simgrid/s4u/engine.hpp"
 #include "simgrid/s4u/host.hpp"
 #include "simgrid/s4u/storage.hpp"
 #include "simgrid/simix.h"
-#include "simgrid/simix.h"
 #include "src/kernel/EngineImpl.hpp"
-#include "src/kernel/routing/AsImpl.hpp"
-
+#include "src/kernel/routing/NetPoint.hpp"
+#include "src/kernel/routing/NetZoneImpl.hpp"
 #include "src/surf/network_interface.hpp"
-#include "src/surf/surf_routing.hpp" // routing_platf. FIXME:KILLME. SOON
 #include "surf/surf.h"               // routing_platf. FIXME:KILLME. SOON
 
 XBT_LOG_NEW_CATEGORY(s4u,"Log channels of the S4U (Simgrid for you) interface");
@@ -86,32 +84,60 @@ void Engine::run() {
   }
 }
 
-s4u::As *Engine::rootAs()
+s4u::NetZone* Engine::netRoot()
 {
-  return routing_platf->root_; // FIXME: get the root into the Engine directly (and kill the platf)
-  // return pimpl->rootAs_;
+  return pimpl->netRoot_;
 }
 
-static s4u::As *asByNameRecursive(s4u::As *current, const char *name)
+static s4u::NetZone* netzoneByNameRecursive(s4u::NetZone* current, const char* name)
 {
   if(!strcmp(current->name(), name))
     return current;
 
   xbt_dict_cursor_t cursor = nullptr;
   char *key;
-  AS_t elem;
+  NetZone_t elem;
   xbt_dict_foreach(current->children(), cursor, key, elem) {
-    simgrid::s4u::As *tmp = asByNameRecursive(elem, name);
+    simgrid::s4u::NetZone* tmp = netzoneByNameRecursive(elem, name);
     if (tmp != nullptr )
         return tmp;
   }
   return nullptr;
 }
 
-/** @brief Retrieve the AS of the given name (or nullptr if not found) */
-As *Engine::asByNameOrNull(const char *name) {
-  return asByNameRecursive(rootAs(),name);
+/** @brief Retrieve the NetZone of the given name (or nullptr if not found) */
+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::NetPoint* Engine::netcardByNameOrNull(const char* name)
+{
+  if (pimpl->netpoints_.find(name) == pimpl->netpoints_.end())
+    return nullptr;
+  return pimpl->netpoints_.at(name);
+}
+/** @brief Fill the provided vector with all existing netcards */
+void Engine::netcardList(std::vector<simgrid::kernel::routing::NetPoint*>* list)
+{
+  for (auto kv : pimpl->netpoints_)
+    list->push_back(kv.second);
+}
+/** @brief Register a new netcard to the system */
+void Engine::netcardRegister(simgrid::kernel::routing::NetPoint* card)
+{
+//  simgrid::simix::kernelImmediate([&]{ FIXME: this segfaults in set_thread
+pimpl->netpoints_[card->name()] = card;
+//  });
+}
+/** @brief Unregister a given netcard */
+void Engine::netcardUnregister(simgrid::kernel::routing::NetPoint* card)
+{
+  simgrid::simix::kernelImmediate([&] {
+    pimpl->netpoints_.erase(card->name());
+    delete card;
+  });
+}
 }
 }