Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

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

diff --git a/src/s4u/s4u_host.cpp b/src/s4u/s4u_host.cpp
index e1c5097..5020d7d 100644 (file)
--- a/src/s4u/s4u_host.cpp
+++ b/src/s4u/s4u_host.cpp
@@ -15,14 +15,13 @@
 #include "xbt/log.h"
 #include "src/msg/msg_private.h"
 #include "src/simix/smx_process_private.h"
-#include "src/simix/smx_private.hpp"
+#include "src/simix/smx_private.h"
 #include "src/surf/cpu_interface.hpp"
 #include "simgrid/s4u/host.hpp"
 #include "simgrid/s4u/storage.hpp"
 
 int MSG_HOST_LEVEL;
 int SIMIX_HOST_LEVEL;
-int ROUTING_HOST_LEVEL;
 int USER_HOST_LEVEL;
 
 namespace simgrid {
@@ -44,6 +43,7 @@ Host::Host(const char* name)
 
 Host::~Host() {
   delete pimpl_cpu;
+  delete pimpl_netcard;
   delete mounts;
 }
 
@@ -117,6 +117,18 @@ xbt_dict_t Host::properties() {
   });
 }
 
+/** Retrieve the property value (or NULL if not set) */
+const char*Host::property(const char*key) {
+  simgrid::surf::HostImpl* surf_host = this->extension<simgrid::surf::HostImpl>();
+  return surf_host->getProperty(key);
+}
+void Host::setProperty(const char*key, const char *value){
+  simgrid::simix::kernel([&] {
+    simgrid::surf::HostImpl* surf_host = this->extension<simgrid::surf::HostImpl>();
+    surf_host->setProperty(key,value);
+  });
+}
+
 /** Get the processes attached to the host */
 xbt_swag_t Host::processes()
 {