[SGpp] make SURF_CPU_LEVEL private

[simgrid.git] / src / simgrid / host.cpp

diff --git a/src/simgrid/host.cpp b/src/simgrid/host.cpp
index 03a034f..564aea9 100644 (file)
--- a/src/simgrid/host.cpp
+++ b/src/simgrid/host.cpp
@@ -8,14 +8,29 @@
 #include "simgrid/host.h"
 #include "surf/surf_routing.h" // SIMIX_HOST_LEVEL and friends FIXME: make private here
 
+sg_host_t sg_host_by_name(const char *name){
+  return xbt_lib_get_elm_or_null(host_lib, name);
+}
+
+// ========= Layering madness ==============
+
 int SIMIX_HOST_LEVEL;
 int MSG_HOST_LEVEL;
+int SURF_CPU_LEVEL;
 
 #include "simix/smx_host_private.h" // SIMIX_host_destroy. FIXME: killme
 #include "msg/msg_private.h" // MSG_host_priv_free. FIXME: killme
+#include "surf/cpu_interface.hpp"
+
+static XBT_INLINE void surf_cpu_free(void *r) {
+  delete static_cast<CpuPtr>(r);
+}
+
+
 void sg_host_init() {
   SIMIX_HOST_LEVEL = xbt_lib_add_level(host_lib,SIMIX_host_destroy);
   MSG_HOST_LEVEL = xbt_lib_add_level(host_lib, (void_f_pvoid_t) __MSG_host_priv_free);
+  SURF_CPU_LEVEL = xbt_lib_add_level(host_lib,surf_cpu_free);
 }
 
 
@@ -36,11 +51,23 @@ smx_host_priv_t sg_host_simix(sg_host_t host){
   return (smx_host_priv_t) xbt_lib_get_level(host, SIMIX_HOST_LEVEL);
 }
 void sg_host_simix_set(sg_host_t host, smx_host_priv_t smx_host) {
-         xbt_lib_set(host_lib,host->key,SIMIX_HOST_LEVEL,smx_host);
+       xbt_lib_set(host_lib,host->key,SIMIX_HOST_LEVEL,smx_host);
 }
 void sg_host_simix_destroy(sg_host_t host) {
-         xbt_lib_unset(host_lib,host->key,SIMIX_HOST_LEVEL,1);
+       xbt_lib_unset(host_lib,host->key,SIMIX_HOST_LEVEL,1);
+}
+
+// ========== SURF CPU ============
+surf_cpu_t sg_host_surfcpu(sg_host_t host) {
+       return (surf_cpu_t) xbt_lib_get_level(host, SURF_CPU_LEVEL);
 }
+void sg_host_surfcpu_set(sg_host_t host, surf_cpu_t cpu) {
+       xbt_lib_set(host_lib, host->key, SURF_CPU_LEVEL, cpu);
+}
+void sg_host_surfcpu_destroy(sg_host_t host) {
+       xbt_lib_unset(host_lib,host->key,SURF_CPU_LEVEL,1);
+}
+
 
 
 /*