/* 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 "surf/surf.h" // routing_platf. FIXME:KILLME. SOON
-#include "src/surf/surf_routing.hpp" // routing_platf. FIXME:KILLME. SOON
+#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.hpp" // 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. */
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");
+ TRACE_global_init();
+ SIMIX_global_init(argc, argv);
+
+ pimpl = new kernel::EngineImpl();
s4u::Engine::instance_ = this;
+}
- TRACE_global_init(argc, argv);
- 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_;
+ return new Engine(0, nullptr);
+ else
+ return s4u::Engine::instance_;
}
void Engine::shutdown() {
delete s4u::Engine::instance_;
s4u::Engine::instance_ = nullptr;
- delete s4u::Storage::storages_;
}
double Engine::getClock()
{
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 const& kv : host_list)
+ list->push_back(kv.second);
+}
+/** @brief Returns the amount of links in the platform */
+size_t Engine::getLinkCount()
+{
+ return simgrid::surf::LinkImpl::linksCount();
+}
+/** @brief Fills the passed list with all hosts found in the platform */
+void Engine::getLinkList(std::vector<Link*>* list)
+{
+ simgrid::surf::LinkImpl::linksList(list);
+}
void Engine::run() {
if (MC_is_active()) {
}
}
-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->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 const& 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(std::string name)
+{
+ auto netp = pimpl->netpoints_.find(name);
+ return netp == pimpl->netpoints_.end() ? nullptr : netp->second;
+}
+
+/** @brief Fill the provided vector with all existing netpoints */
+void Engine::getNetpointList(std::vector<simgrid::kernel::routing::NetPoint*>* list)
+{
+ for (auto const& 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->getName()] = point;
+ // });
+}
+/** @brief Unregister a given netpoint */
+void Engine::netpointUnregister(simgrid::kernel::routing::NetPoint* point)
+{
+ simgrid::simix::kernelImmediate([this, point] {
+ pimpl->netpoints_.erase(point->getName());
+ delete point;
+ });
}
+bool Engine::isInitialized()
+{
+ return Engine::instance_ != nullptr;
+}
+void Engine::setConfig(std::string str)
+{
+ xbt_cfg_set_parse(str.c_str());
}
}
+} // namespace
