#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
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. */
{
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::hostCount()
+{
+ return host_list.size();
+}
+/** @brief Fills the passed list with all hosts found in the platform */
+void Engine::hostList(std::vector<Host*>* list)
+{
+ for (auto kv : host_list)
+ list->push_back(kv.second);
+}
void Engine::run() {
if (MC_is_active()) {
if(!strcmp(current->name(), name))
return current;
- xbt_dict_cursor_t cursor = nullptr;
- char *key;
- NetZone_t elem;
- xbt_dict_foreach(current->children(), cursor, key, elem) {
+ for (auto elem : *(current->children())) {
simgrid::s4u::NetZone* tmp = netzoneByNameRecursive(elem, name);
- if (tmp != nullptr )
- return tmp;
+ if (tmp != nullptr) {
+ return tmp;
+ }
}
return nullptr;
}
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)
+/** @brief Retrieve the netpoint of the given name (or nullptr if not found) */
+simgrid::kernel::routing::NetPoint* Engine::netpointByNameOrNull(const char* name)
+{
+ if (pimpl->netpoints_.find(name) == pimpl->netpoints_.end())
+ return nullptr;
+ return pimpl->netpoints_.at(name);
+}
+/** @brief Fill the provided vector with all existing netpoints */
+void Engine::netpointList(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)
{
- return static_cast<simgrid::kernel::routing::NetCard*>(xbt_dict_get_or_null(netcards_dict, name));
+ simgrid::simix::kernelImmediate([this, point] {
+ pimpl->netpoints_.erase(point->name());
+ delete point;
+ });
}
}
}