add getProperties to Actor

Netzone is public, include it from s4u.hpp

diff --git a/include/simgrid/s4u.hpp b/include/simgrid/s4u.hpp
index e1dfeda7e0ed0e9bfa2f6f5796103de35e8c7181..1b82b8c7811c04d8baecbabe26fa8291e4482719 100644 (file)
--- a/include/simgrid/s4u.hpp
+++ b/include/simgrid/s4u.hpp
@@ -13,6 +13,7 @@
 #include <simgrid/s4u/Host.hpp>
 #include <simgrid/s4u/Link.hpp>
 #include <simgrid/s4u/Mailbox.hpp>
+#include <simgrid/s4u/NetZone.hpp>
 
 #include <simgrid/s4u/Comm.hpp>
 #include <simgrid/s4u/ConditionVariable.hpp>

diff --git a/include/simgrid/s4u/Actor.hpp b/include/simgrid/s4u/Actor.hpp
index bca444cce0f8052192fd40a7b91f3534d460a79d..d22640c269b690b7b8ae53c197acbb72d7373752 100644 (file)
--- a/include/simgrid/s4u/Actor.hpp
+++ b/include/simgrid/s4u/Actor.hpp
@@ -269,6 +269,7 @@ public:
   simix::ActorImpl* getImpl();
 
   /** Retrieve the property value (or nullptr if not set) */
+  std::map<std::string, std::string>* getProperties();
   const char* getProperty(const char* key);
   void setProperty(const char* key, const char* value);
   Actor* restart();

diff --git a/src/s4u/s4u_actor.cpp b/src/s4u/s4u_actor.cpp
index 02b8a9ae512b3a32c08382e615924e5247d6dbca..ddb8fac0cf985a47d7537811f4cb87655f91397c 100644 (file)
--- a/src/s4u/s4u_actor.cpp
+++ b/src/s4u/s4u_actor.cpp
@@ -173,6 +173,11 @@ void Actor::killAll(int resetPid)
   simcall_process_killall(resetPid);
 }
 
+std::map<std::string, std::string>* Actor::getProperties()
+{
+  return simgrid::simix::kernelImmediate([this] { return this->pimpl_->getProperties(); });
+}
+
 /** Retrieve the property value (or nullptr if not set) */
 const char* Actor::getProperty(const char* key)
 {