initialize the trace flags in S4U too

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

diff --git a/src/s4u/s4u_engine.cpp b/src/s4u/s4u_engine.cpp
index 3e2e284..4f3b106 100644 (file)
--- a/src/s4u/s4u_engine.cpp
+++ b/src/s4u/s4u_engine.cpp
@@ -5,39 +5,101 @@
 /* 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 "instr/instr_interface.h"
 #include "simgrid/simix.h"
 #include "mc/mc.h"
+#include "simgrid/s4u/As.hpp"
 #include "simgrid/s4u/engine.hpp"
+#include "simgrid/s4u/Mailbox.hpp"
+#include "simgrid/s4u/storage.hpp"
+
+#include "surf/surf.h"               // routing_platf. FIXME:KILLME. SOON
+#include "src/surf/surf_routing.hpp" // routing_platf. FIXME:KILLME. SOON
 
 XBT_LOG_NEW_CATEGORY(s4u,"Log channels of the S4U (Simgrid for you) interface");
-using namespace simgrid;
 
-double s4u::Engine::getClock() {
-  return SIMIX_get_clock();
-}
+namespace simgrid {
+namespace s4u {
+
+Engine *Engine::instance_ = nullptr; /* That singleton is awful, but I don't see no other solution right now. */
+
+
+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;
 
-s4u::Engine::Engine(int *argc, char **argv) {
+  TRACE_global_init(argc, argv);
   SIMIX_global_init(argc, argv);
 }
 
-void s4u::Engine::loadPlatform(const char *platf) {
+Engine *Engine::instance() {
+  if (s4u::Engine::instance_ == nullptr)
+    new Engine(0,nullptr);
+  return s4u::Engine::instance_;
+}
+
+void Engine::shutdown() {
+  delete s4u::Engine::instance_;
+  s4u::Engine::instance_ = nullptr;
+  delete s4u::Storage::storages_;
+}
+
+double Engine::getClock()
+{
+  return SIMIX_get_clock();
+}
+
+void Engine::loadPlatform(const char *platf)
+{
   SIMIX_create_environment(platf);
 }
 
-void s4u::Engine::register_function(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::register_default(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::As *Engine::rootAs()
+{
+  return routing_platf->root_; // FIXME: get the root into the Engine directly (and kill the platf)
+}
+
+static s4u::As *asByNameRecursive(s4u::As *current, const char *name)
+{
+  if(!strcmp(current->name(), name))
+    return current;
+
+  xbt_dict_cursor_t cursor = nullptr;
+  char *key;
+  AS_t elem;
+  xbt_dict_foreach(current->children(), cursor, key, elem) {
+    simgrid::s4u::As *tmp = asByNameRecursive(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);
+}
+
+}
+}