X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2dacf5b5e81474fb89d8234b907f6f61b623983e..c7cad16a187e10f78f94c63a490f474676702424:/src/s4u/s4u_engine.cpp

diff --git a/src/s4u/s4u_engine.cpp b/src/s4u/s4u_engine.cpp
index dc22416387..e061713a9c 100644
--- a/src/s4u/s4u_engine.cpp
+++ b/src/s4u/s4u_engine.cpp
@@ -1,43 +1,168 @@
 /* s4u::Engine Simulation Engine and global functions. */
 
-/* Copyright (c) 2006-2015. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2006-2017. The SimGrid Team. All rights reserved.          */
 
 /* 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/engine.hpp"
+#include "simgrid/s4u/Engine.hpp"
+#include "simgrid/s4u/Host.hpp"
+#include "simgrid/s4u/Mailbox.hpp"
+#include "simgrid/s4u/NetZone.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;
 
-double s4u::Engine::getClock() {
-	return SIMIX_get_clock();
+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. */
+
+
+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();
+  SIMIX_global_init(argc, argv);
+}
+
+Engine::~Engine()
+{
+  delete pimpl;
+  s4u::Engine::instance_ = nullptr;
+}
+
+Engine* Engine::getInstance()
+{
+  if (s4u::Engine::instance_ == nullptr)
+    new Engine(0,nullptr);
+  return s4u::Engine::instance_;
+}
+
+void Engine::shutdown() {
+  delete s4u::Engine::instance_;
+}
+
+double Engine::getClock()
+{
+  return SIMIX_get_clock();
+}
+
+void Engine::loadPlatform(const char *platf)
+{
+  SIMIX_create_environment(platf);
 }
 
-s4u::Engine::Engine(int *argc, char **argv) {
-	SIMIX_global_init(argc, argv);
+void Engine::registerFunction(const char*name, int (*code)(int,char**))
+{
+  SIMIX_function_register(name,code);
+}
+void Engine::registerDefault(int (*code)(int,char**))
+{
+  SIMIX_function_register_default(code);
+}
+void Engine::loadDeployment(const char *deploy)
+{
+  SIMIX_launch_application(deploy);
+}
+// FIXME: The following duplicates the content of s4u::Host
+extern std::map<std::string, simgrid::s4u::Host*> host_list;
+/** @brief Returns the amount of hosts in the platform */
+size_t Engine::getHostCount()
+{
+  return host_list.size();
+}
+/** @brief Fills the passed list with all hosts found in the platform */
+void Engine::getHostList(std::vector<Host*>* list)
+{
+  for (auto kv : host_list)
+    list->push_back(kv.second);
 }
 
-void s4u::Engine::loadPlatform(const char *platf) {
-	SIMIX_create_environment(platf);
+void Engine::run() {
+  if (MC_is_active()) {
+    MC_run();
+  } else {
+    SIMIX_run();
+  }
 }
 
-void s4u::Engine::register_function(const char*name, int (*code)(int,char**)) {
-	SIMIX_function_register(name,code);
+s4u::NetZone* Engine::getNetRoot()
+{
+  return pimpl->netRoot_;
 }
-void s4u::Engine::register_default(int (*code)(int,char**)) {
-	SIMIX_function_register_default(code);
+
+static s4u::NetZone* netzoneByNameRecursive(s4u::NetZone* current, const char* name)
+{
+  if (not strcmp(current->getCname(), name))
+    return current;
+
+  for (auto elem : *(current->getChildren())) {
+    simgrid::s4u::NetZone* tmp = netzoneByNameRecursive(elem, name);
+    if (tmp != nullptr) {
+      return tmp;
+    }
+  }
+  return nullptr;
 }
-void s4u::Engine::loadDeployment(const char *deploy) {
-	SIMIX_launch_application(deploy);
+
+/** @brief Retrieve the NetZone of the given name (or nullptr if not found) */
+NetZone* Engine::getNetzoneByNameOrNull(const char* name)
+{
+  return netzoneByNameRecursive(getNetRoot(), name);
 }
 
-void s4u::Engine::run() {
-	if (MC_is_active()) {
-		MC_run();
-	} else {
-		SIMIX_run();
-	}
+/** @brief Retrieve the netpoint of the given name (or nullptr if not found) */
+simgrid::kernel::routing::NetPoint* Engine::getNetpointByNameOrNull(const char* name)
+{
+  try {
+    return pimpl->netpoints_.at(name);
+  } catch (std::out_of_range& unfound) {
+    return nullptr;
+  }
+}
+/** @brief Fill the provided vector with all existing netpoints */
+void Engine::getNetpointList(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;
+  });
+}
+
+bool Engine::isInitialized()
+{
+  return Engine::instance_ != nullptr;
+}
+void Engine::setConfig(std::string str)
+{
+  xbt_cfg_set_parse(str.c_str());
+}
 }
+} // namespace