X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/571ed94e23c9aefbd5f81f1a800eb5f1dddd8ae9..00b0567fd44a84090c503f39b3fcf3be7b593f20:/src/s4u/s4u_engine.cpp

diff --git a/src/s4u/s4u_engine.cpp b/src/s4u/s4u_engine.cpp
index ce3cc47f76..0fc822e288 100644
--- a/src/s4u/s4u_engine.cpp
+++ b/src/s4u/s4u_engine.cpp
@@ -5,51 +5,144 @@
 /* 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 "simgrid/simix.h"
+#include "instr/instr_interface.h"
 #include "mc/mc.h"
+#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 "src/kernel/EngineImpl.hpp"
+#include "src/kernel/routing/NetPoint.hpp"
+#include "src/kernel/routing/NetZoneImpl.hpp"
+#include "src/surf/network_interface.hpp"
+#include "surf/surf.h"               // routing_platf. FIXME:KILLME. SOON
 
 XBT_LOG_NEW_CATEGORY(s4u,"Log channels of the S4U (Simgrid for you) interface");
-using namespace simgrid;
 
-s4u::Engine *s4u::Engine::instance_ = nullptr; /* That singleton is awful, but I don't see no other solution right now. */
+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. */
 
 
-s4u::Engine::Engine(int *argc, char **argv) {
+Engine::Engine(int *argc, char **argv) {
   xbt_assert(s4u::Engine::instance_ == nullptr, "It is currently forbidden to create more than one instance of s4u::Engine");
   s4u::Engine::instance_ = this;
+  pimpl                  = new kernel::EngineImpl();
 
+  TRACE_global_init(argc, argv);
   SIMIX_global_init(argc, argv);
 }
 
-s4u::Engine *s4u::Engine::instance() {
+Engine::~Engine()
+{
+  delete pimpl;
+}
+
+Engine *Engine::instance() {
   if (s4u::Engine::instance_ == nullptr)
     new Engine(0,nullptr);
   return s4u::Engine::instance_;
 }
 
-double s4u::Engine::getClock() {
+void Engine::shutdown() {
+  delete s4u::Engine::instance_;
+  s4u::Engine::instance_ = nullptr;
+  delete s4u::Storage::storages_;
+}
+
+double Engine::getClock()
+{
   return SIMIX_get_clock();
 }
 
-void s4u::Engine::loadPlatform(const char *platf) {
+void Engine::loadPlatform(const char *platf)
+{
   SIMIX_create_environment(platf);
 }
 
-void s4u::Engine::registerFunction(const char*name, int (*code)(int,char**)) {
+void Engine::registerFunction(const char*name, int (*code)(int,char**))
+{
   SIMIX_function_register(name,code);
 }
-void s4u::Engine::registerDefault(int (*code)(int,char**)) {
+void Engine::registerDefault(int (*code)(int,char**))
+{
   SIMIX_function_register_default(code);
 }
-void s4u::Engine::loadDeployment(const char *deploy) {
+void Engine::loadDeployment(const char *deploy)
+{
   SIMIX_launch_application(deploy);
 }
 
-void s4u::Engine::run() {
+void Engine::run() {
   if (MC_is_active()) {
     MC_run();
   } else {
     SIMIX_run();
   }
 }
+
+s4u::NetZone* Engine::netRoot()
+{
+  return pimpl->netRoot_;
+}
+
+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;
+  NetZone_t elem;
+  xbt_dict_foreach(current->children(), cursor, key, elem) {
+    simgrid::s4u::NetZone* tmp = netzoneByNameRecursive(elem, name);
+    if (tmp != nullptr) {
+      xbt_dict_cursor_free(&cursor);
+      return tmp;
+    }
+  }
+  return nullptr;
+}
+
+/** @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 netpoint of the given name (or nullptr if not found) */
+simgrid::kernel::routing::NetPoint* Engine::netpointByNameOrNull(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 netpoints */
+void Engine::netpointList(std::vector<simgrid::kernel::routing::NetPoint*>* list)
+{
+  for (auto kv : pimpl->netpoints_)
+    list->push_back(kv.second);
+}
+/** @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->netpoints_[point->name()] = point;
+//  });
+}
+/** @brief Unregister a given netpoint */
+void Engine::netpointUnregister(simgrid::kernel::routing::NetPoint* point)
+{
+  simgrid::simix::kernelImmediate([this, point] {
+    pimpl->netpoints_.erase(point->name());
+    delete point;
+  });
+}
+}
+}