New callbacks: simgrid::s4u::onSimulationEnd (right after the main simulation loop)

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

diff --git a/src/s4u/s4u_netzone.cpp b/src/s4u/s4u_netzone.cpp
index ed4aa1d..1ab825e 100644 (file)
--- a/src/s4u/s4u_netzone.cpp
+++ b/src/s4u/s4u_netzone.cpp
@@ -7,17 +7,17 @@
 
 #include "simgrid/s4u/NetZone.hpp"
 #include "simgrid/s4u/host.hpp"
-#include "src/kernel/routing/NetCard.hpp"
+#include "simgrid/simix.hpp"
+#include "src/kernel/routing/NetPoint.hpp"
 #include "src/surf/network_interface.hpp" // Link FIXME: move to proper header
-#include "src/surf/surf_routing.hpp"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_netzone, "S4U Networking Zones");
 
 namespace simgrid {
 namespace s4u {
 
-simgrid::xbt::signal<void(bool symmetrical, kernel::routing::NetCard* src, kernel::routing::NetCard* dst,
-                          kernel::routing::NetCard* gw_src, kernel::routing::NetCard* gw_dst,
+simgrid::xbt::signal<void(bool symmetrical, kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst,
+                          kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst,
                           std::vector<Link*>* link_list)>
     NetZone::onRouteCreation;
 
@@ -40,6 +40,24 @@ NetZone::~NetZone()
   xbt_dict_free(&children_);
   xbt_free(name_);
 }
+std::unordered_map<std::string, std::string>* NetZone::properties()
+{
+  return simgrid::simix::kernelImmediate([=] {
+      return &properties_;
+  });
+}
+
+/** Retrieve the property value (or nullptr if not set) */
+const char* NetZone::property(const char* key)
+{
+  return properties_.at(key).c_str();
+}
+void NetZone::setProperty(const char* key, const char* value)
+{
+  simgrid::simix::kernelImmediate([=,&key,&value] {
+    properties_[key] = value;
+  });
+}
 
 xbt_dict_t NetZone::children()
 {
@@ -66,7 +84,7 @@ xbt_dynar_t NetZone::hosts()
   return res;
 }
 
-int NetZone::addComponent(kernel::routing::NetCard* elm)
+int NetZone::addComponent(kernel::routing::NetPoint* elm)
 {
   vertices_.push_back(elm);
   return vertices_.size() - 1; // The rank of the newly created object