Kill two getter simcalls, and replace them by (almost) direct calls to surf

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

diff --git a/src/simgrid/host.cpp b/src/simgrid/host.cpp
index 63655a9..36a9598 100644 (file)
--- a/src/simgrid/host.cpp
+++ b/src/simgrid/host.cpp
@@ -45,11 +45,11 @@ int ROUTING_HOST_LEVEL;
 int SURF_CPU_LEVEL;
 
 
-#include "msg/msg_private.h" // MSG_host_priv_free. FIXME: killme
-#include "simdag/private.h" // __SD_workstation_destroy. FIXME: killme
-#include "simix/smx_host_private.h" // SIMIX_host_destroy. FIXME: killme
-#include "surf/cpu_interface.hpp"
-#include "surf/surf_routing.hpp"
+#include "src/msg/msg_private.h" // MSG_host_priv_free. FIXME: killme
+#include "src/simdag/private.h" // __SD_workstation_destroy. FIXME: killme
+#include "src/simix/smx_host_private.h" // SIMIX_host_destroy. FIXME: killme
+#include "src/surf/cpu_interface.hpp"
+#include "src/surf/surf_routing.hpp"
 
 static XBT_INLINE void surf_cpu_free(void *r) {
   delete static_cast<Cpu*>(r);
@@ -122,14 +122,12 @@ void sg_host_edge_destroy(sg_host_t host, int do_callback) {
 }
 
 
-
-/*
-host::host() {
-       // TODO Auto-generated constructor stub
-
+// =========== user-level functions ===============
+// ================================================
+double sg_host_get_speed(sg_host_t host){
+  return surf_host_get_speed(host, 1.0);
 }
 
-host::~host() {
-       // TODO Auto-generated destructor stub
-}*/
-
+double sg_host_get_available_speed(sg_host_t host){
+  return surf_host_get_available_speed(host);
+}