Assert that there is no memory leak (help scan-build).

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

diff --git a/src/s4u/s4u_Engine.cpp b/src/s4u/s4u_Engine.cpp
index ccdce47..aa28e1a 100644 (file)
--- a/src/s4u/s4u_Engine.cpp
+++ b/src/s4u/s4u_Engine.cpp
@@ -14,15 +14,17 @@
 #include "simgrid/s4u/NetZone.hpp"
 #include "simgrid/s4u/Storage.hpp"
 #include "simgrid/simix.h"
-#include "src/simix/smx_private.hpp" // For access to simix_global->process_list
 #include "src/instr/instr_private.hpp"
 #include "src/kernel/EngineImpl.hpp"
+#include "src/simix/smx_private.hpp" // For access to simix_global->process_list
 #include "src/surf/network_interface.hpp"
 #include "surf/surf.hpp" // routing_platf. FIXME:KILLME. SOON
+#include <simgrid/Exception.hpp>
 
 #include <string>
 
 XBT_LOG_NEW_CATEGORY(s4u, "Log channels of the S4U (Simgrid for you) interface");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_engine, s4u, "Logging specific to S4U (engine)");
 
 namespace simgrid {
 namespace s4u {
@@ -53,10 +55,11 @@ Engine::~Engine()
 /** @brief Retrieve the engine singleton */
 Engine* Engine::get_instance()
 {
-  if (s4u::Engine::instance_ == nullptr)
-    return new Engine(0, nullptr);
-  else
-    return s4u::Engine::instance_;
+  if (s4u::Engine::instance_ == nullptr) {
+    auto e = new Engine(0, nullptr);
+    xbt_assert(s4u::Engine::instance_ == e);
+  }
+  return s4u::Engine::instance_;
 }
 
 void Engine::shutdown()
@@ -70,9 +73,29 @@ double Engine::get_clock()
   return SIMIX_get_clock();
 }
 
+/**
+ * @brief A platform loader.
+ *
+ * Creates a new platform, including hosts, links, and the routing_table.
+ * @param platf a filename of the XML description of a platform. This file follows this DTD :
+ *
+ *     @include src/surf/xml/simgrid.dtd
+ *
+ * Here is a small example of such a platform
+ *
+ *     @include examples/platforms/small_platform.xml
+ */
 void Engine::load_platform(std::string platf)
 {
-  SIMIX_create_environment(platf);
+  double start = xbt_os_time();
+  try {
+    parse_platform_file(platf);
+  } catch (xbt_ex& e) {
+    xbt_die("Error while loading %s: %s", platf.c_str(), e.what());
+  }
+
+  double end = xbt_os_time();
+  XBT_DEBUG("PARSE TIME: %g", (end - start));
 }
 
 void Engine::register_function(std::string name, int (*code)(int, char**))