Merge branch 'master' of github.com:simgrid/simgrid

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

diff --git a/src/s4u/s4u_engine.cpp b/src/s4u/s4u_engine.cpp
index da624f5..e061713 100644 (file)
--- a/src/s4u/s4u_engine.cpp
+++ b/src/s4u/s4u_engine.cpp
@@ -1,27 +1,31 @@
 /* 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 "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/Engine.hpp"
+#include "simgrid/s4u/Host.hpp"
 #include "simgrid/s4u/Mailbox.hpp"
-#include "simgrid/s4u/storage.hpp"
+#include "simgrid/s4u/NetZone.hpp"
+#include "simgrid/s4u/Storage.hpp"
 #include "simgrid/simix.h"
 #include "src/kernel/EngineImpl.hpp"
-
-#include "surf/surf.h"               // routing_platf. FIXME:KILLME. SOON
-#include "src/surf/surf_routing.hpp" // routing_platf. FIXME:KILLME. SOON
+#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");
 
 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. */
 
@@ -31,16 +35,18 @@ Engine::Engine(int *argc, char **argv) {
   s4u::Engine::instance_ = this;
   pimpl                  = new kernel::EngineImpl();
 
-  TRACE_global_init(argc, argv);
+  TRACE_global_init();
   SIMIX_global_init(argc, argv);
 }
 
 Engine::~Engine()
 {
   delete pimpl;
+  s4u::Engine::instance_ = nullptr;
 }
 
-Engine *Engine::instance() {
+Engine* Engine::getInstance()
+{
   if (s4u::Engine::instance_ == nullptr)
     new Engine(0,nullptr);
   return s4u::Engine::instance_;
@@ -48,8 +54,6 @@ Engine *Engine::instance() {
 
 void Engine::shutdown() {
   delete s4u::Engine::instance_;
-  s4u::Engine::instance_ = nullptr;
-  delete s4u::Storage::storages_;
 }
 
 double Engine::getClock()
@@ -74,6 +78,19 @@ 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 Engine::run() {
   if (MC_is_active()) {
@@ -83,32 +100,69 @@ void Engine::run() {
   }
 }
 
-s4u::As *Engine::rootAs()
+s4u::NetZone* Engine::getNetRoot()
 {
-  return routing_platf->root_; // FIXME: get the root into the Engine directly (and kill the platf)
-  // return pimpl->rootAs_;
+  return pimpl->netRoot_;
 }
 
-static s4u::As *asByNameRecursive(s4u::As *current, const char *name)
+static s4u::NetZone* netzoneByNameRecursive(s4u::NetZone* current, const char* name)
 {
-  if(!strcmp(current->name(), name))
+  if (not strcmp(current->getCname(), 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;
+  for (auto elem : *(current->getChildren())) {
+    simgrid::s4u::NetZone* tmp = netzoneByNameRecursive(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);
+/** @brief Retrieve the NetZone of the given name (or nullptr if not found) */
+NetZone* Engine::getNetzoneByNameOrNull(const char* name)
+{
+  return netzoneByNameRecursive(getNetRoot(), name);
 }
 
+/** @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