#include "simgrid/simix.h"
#include "src/kernel/EngineImpl.hpp"
#include "src/kernel/routing/NetZoneImpl.hpp"
+#include "src/kernel/routing/NetCard.hpp"
+
#include "src/surf/network_interface.hpp"
-#include "src/surf/surf_routing.hpp" // routing_platf. FIXME:KILLME. SOON
#include "surf/surf.h" // routing_platf. FIXME:KILLME. SOON
XBT_LOG_NEW_CATEGORY(s4u,"Log channels of the S4U (Simgrid for you) interface");
}
}
-s4u::NetZone* Engine::rootAs()
+s4u::NetZone* Engine::netRoot()
{
- return pimpl->rootAs_;
+ return pimpl->netRoot_;
}
-static s4u::NetZone* asByNameRecursive(s4u::NetZone* current, const char* name)
+static s4u::NetZone* netzoneByNameRecursive(s4u::NetZone* current, const char* name)
{
if(!strcmp(current->name(), name))
return current;
char *key;
NetZone_t elem;
xbt_dict_foreach(current->children(), cursor, key, elem) {
- simgrid::s4u::NetZone* 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) */
-NetZone* Engine::asByNameOrNull(const char* name)
+/** @brief Retrieve the NetZone of the given name (or nullptr if not found) */
+NetZone* Engine::netzoneByNameOrNull(const char* name)
{
- return asByNameRecursive(rootAs(),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)
+{
+ if (pimpl->netcards_.find(name) == pimpl->netcards_.end())
+ return nullptr;
+ return pimpl->netcards_.at(name);
+}
+/** @brief Fill the provided vector with all existing netcards */
+void Engine::netcardList(std::vector<simgrid::kernel::routing::NetCard*>* list)
+{
+ for (auto kv: pimpl->netcards_)
+ list->push_back(kv.second);
+}
+/** @brief Register a new netcard to the system */
+void Engine::netcardRegister(simgrid::kernel::routing::NetCard* card)
+{
+// simgrid::simix::kernelImmediate([&]{ FIXME: this segfaults in set_thread
+ pimpl->netcards_[card->name()] = card;
+// });
+}
+/** @brief Unregister a given netcard */
+void Engine::netcardUnregister(simgrid::kernel::routing::NetCard* card)
+{
+ simgrid::simix::kernelImmediate([&]{
+ pimpl->netcards_.erase(card->name());
+ });
+}
}
}