fix an easy fixme

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

diff --git a/src/simgrid/host.cpp b/src/simgrid/host.cpp
index 7eb97bf..396f4a3 100644 (file)
--- a/src/simgrid/host.cpp
+++ b/src/simgrid/host.cpp
@@ -6,7 +6,6 @@
 
 #include "xbt/dict.h"
 #include "simgrid/host.h"
-#include "surf/surf_routing.h" // SIMIX_HOST_LEVEL and friends FIXME: make private here
 #include "surf/surf.h" // routing_get_network_element_type FIXME:killme
 
 sg_host_t sg_host_by_name(const char *name){
@@ -39,27 +38,31 @@ xbt_dynar_t sg_hosts_as_dynar(void) {
 // ========= Layering madness ==============
 
 int MSG_HOST_LEVEL;
+int SD_HOST_LEVEL;
 int SIMIX_HOST_LEVEL;
 int ROUTING_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"
-#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);
 }
 
 
-void sg_host_init() {
-  SIMIX_HOST_LEVEL = xbt_lib_add_level(host_lib,SIMIX_host_destroy);
+void sg_host_init() { // FIXME: only add the needed levels
   MSG_HOST_LEVEL = xbt_lib_add_level(host_lib, (void_f_pvoid_t) __MSG_host_priv_free);
+  SD_HOST_LEVEL = xbt_lib_add_level(host_lib,__SD_workstation_destroy);
+
+  SIMIX_HOST_LEVEL = xbt_lib_add_level(host_lib,SIMIX_host_destroy);
   SURF_CPU_LEVEL = xbt_lib_add_level(host_lib,surf_cpu_free);
   ROUTING_HOST_LEVEL = xbt_lib_add_level(host_lib,routing_asr_host_free);
 }
@@ -74,9 +77,18 @@ void sg_host_msg_set(sg_host_t host, msg_host_priv_t smx_host) {
 void sg_host_msg_destroy(sg_host_t host) {
          xbt_lib_unset(host_lib,host->key,MSG_HOST_LEVEL,1);
 }
+// ========== SimDag Layer ==============
+SD_workstation_priv_t sg_host_sd(sg_host_t host) {
+       return (SD_workstation_priv_t) xbt_lib_get_level(host, SD_HOST_LEVEL);
+}
+void sg_host_sd_set(sg_host_t host, SD_workstation_priv_t smx_host) {
+         xbt_lib_set(host_lib,host->key,SD_HOST_LEVEL,smx_host);
+}
+void sg_host_sd_destroy(sg_host_t host) {
+         xbt_lib_unset(host_lib,host->key,SD_HOST_LEVEL,1);
+}
 
 // ========== Simix layer =============
-
 smx_host_priv_t sg_host_simix(sg_host_t host){
   return (smx_host_priv_t) xbt_lib_get_level(host, SIMIX_HOST_LEVEL);
 }
@@ -98,10 +110,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) {
@@ -109,14 +121,32 @@ void sg_host_edge_destroy(sg_host_t host, int do_callback) {
 }
 
 
+// =========== 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 constructor 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));
 }
 
-host::~host() {
-       // TODO Auto-generated destructor stub
-}*/
+/** @brief Returns the total energy consumed by the host (in Joules) */
+double sg_host_get_consumed_energy(sg_host_t host) {
+       return surf_host_get_consumed_energy(host);
+}
 
+/** @brief Gets the pstate at which that host currently runs */
+int sg_host_get_pstate(sg_host_t host) {
+       return surf_host_get_pstate(host);
+}