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 73b3b7c..4f3b106 100644 (file)
--- a/src/s4u/s4u_engine.cpp
+++ b/src/s4u/s4u_engine.cpp
@@ -5,63 +5,69 @@
 /* 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/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;
 
-s4u::Engine *s4u::Engine::instance_ = nullptr; /* That singleton is awful, but I don't see no other solution right now. */
+namespace simgrid {
+namespace s4u {
 
+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;
 
+  TRACE_global_init(argc, argv);
   SIMIX_global_init(argc, argv);
 }
 
-s4u::Engine *s4u::Engine::instance() {
+Engine *Engine::instance() {
   if (s4u::Engine::instance_ == nullptr)
     new Engine(0,nullptr);
   return s4u::Engine::instance_;
 }
 
-void s4u::Engine::shutdown() {
+void Engine::shutdown() {
   delete s4u::Engine::instance_;
   s4u::Engine::instance_ = nullptr;
-  delete s4u::Mailbox::mailboxes;
   delete s4u::Storage::storages_;
 }
 
-double s4u::Engine::getClock()
+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 {
@@ -69,10 +75,7 @@ void s4u::Engine::run() {
   }
 }
 
-#include "surf/surf.h"               // routing_platf. FIXME:KILLME. SOON
-#include "src/surf/surf_routing.hpp" // routing_platf. FIXME:KILLME. SOON
-
-s4u::As *s4u::Engine::rootAs()
+s4u::As *Engine::rootAs()
 {
   return routing_platf->root_; // FIXME: get the root into the Engine directly (and kill the platf)
 }
@@ -92,8 +95,11 @@ static s4u::As *asByNameRecursive(s4u::As *current, const char *name)
   }
   return nullptr;
 }
+
 /** @brief Retrieve the AS of the given name (or nullptr if not found) */
-s4u::As *s4u::Engine::asByNameOrNull(const char *name) {
+As *Engine::asByNameOrNull(const char *name) {
   return asByNameRecursive(rootAs(),name);
 }
 
+}
+}