inline two more getter simcalls: host_get_core and host_get_state

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

diff --git a/src/simgrid/host.cpp b/src/simgrid/host.cpp
index af11f63..14ef0cd 100644 (file)
--- a/src/simgrid/host.cpp
+++ b/src/simgrid/host.cpp
@@ -45,17 +45,17 @@ 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<CpuPtr>(r);
+  delete static_cast<Cpu*>(r);
 }
 static XBT_INLINE void routing_asr_host_free(void *p) {
-  delete static_cast<RoutingEdgePtr>(p);
+  delete static_cast<RoutingEdge*>(p);
 }
 
 
@@ -111,10 +111,10 @@ void sg_host_surfcpu_destroy(sg_host_t host) {
        xbt_lib_unset(host_lib,host->key,SURF_CPU_LEVEL,1);
 }
 // ========== RoutingEdge ============
-RoutingEdgePtr sg_host_edge(sg_host_t host) {
-       return (RoutingEdgePtr) xbt_lib_get_level(host, ROUTING_HOST_LEVEL);
+RoutingEdge *sg_host_edge(sg_host_t host) {
+       return (RoutingEdge*) xbt_lib_get_level(host, ROUTING_HOST_LEVEL);
 }
-void sg_host_edge_set(sg_host_t host, RoutingEdgePtr edge) {
+void sg_host_edge_set(sg_host_t host, RoutingEdge *edge) {
        xbt_lib_set(host_lib, host->key, ROUTING_HOST_LEVEL, edge);
 }
 void sg_host_edge_destroy(sg_host_t host, int do_callback) {
@@ -122,14 +122,22 @@ 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);
+}
+/** @brief Returns the number of core of the processor. */
+int sg_host_get_core(sg_host_t host) {
+       return surf_host_get_core(host);
+}
+/** @brief Returns the state of a host.
+ *  @return 1 if the host is active or 0 if it has crashed.
+ */
+int sg_host_get_state(sg_host_t host) {
+  return surf_host_get_state(surf_host_resource_priv(host));
+}