* 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/NetZone.hpp"
+#include "simgrid/s4u/engine.hpp"
+#include "simgrid/s4u/host.hpp"
#include "simgrid/s4u/storage.hpp"
+#include "simgrid/simix.h"
+#include "src/kernel/EngineImpl.hpp"
+#include "src/kernel/routing/NetZoneImpl.hpp"
+#include "src/surf/network_interface.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");
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(argc, argv);
SIMIX_global_init(argc, argv);
}
+Engine::~Engine()
+{
+ delete pimpl;
+}
+
Engine *Engine::instance() {
if (s4u::Engine::instance_ == nullptr)
new Engine(0,nullptr);
}
}
-s4u::As *Engine::rootAs()
+s4u::NetZone* Engine::netRoot()
{
- 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))
return current;
xbt_dict_cursor_t cursor = nullptr;
char *key;
- AS_t elem;
+ NetZone_t elem;
xbt_dict_foreach(current->children(), cursor, key, elem) {
- simgrid::s4u::As *tmp = asByNameRecursive(elem, name);
+ 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::netzoneByNameOrNull(const char* name)
+{
+ return netzoneByNameRecursive(netRoot(), name);
}
+/** @brief Retrieve the netcard of the given name (or nullptr if not found) */
+simgrid::kernel::routing::NetCard* Engine::netcardByNameOrNull(const char* name)
+{
+ return static_cast<simgrid::kernel::routing::NetCard*>(xbt_dict_get_or_null(netcards_dict, name));
+}
+void Engine::netcardList(std::vector<simgrid::kernel::routing::NetCard*>* list)
+{
+ xbt_lib_cursor_t cursor = nullptr;
+ char* key;
+ void* data;
+ xbt_dict_foreach (netcards_dict, cursor, key, data) {
+ list->push_back(static_cast<simgrid::kernel::routing::NetCard*>(data));
+ }
+}
}
}