SimDag Revolution: SD_workstation becomes sg_host

[simgrid.git] / include / simgrid / host.h

diff --git a/include/simgrid/host.h b/include/simgrid/host.h
index d215f17..2e2ee13 100644 (file)
--- a/include/simgrid/host.h
+++ b/include/simgrid/host.h
@@ -15,7 +15,7 @@
 #include <simgrid/forward.h>
 
 #ifdef __cplusplus
-#include <simgrid/Host.hpp>
+#include <simgrid/s4u/host.hpp>
 #endif
 
 SG_BEGIN_DECL()
@@ -37,13 +37,6 @@ XBT_PUBLIC(void) sg_host_user_destroy(sg_host_t host);
 typedef struct s_msg_host_priv *msg_host_priv_t;
 msg_host_priv_t sg_host_msg(sg_host_t host);
 XBT_PUBLIC(void) sg_host_msg_set(sg_host_t host, msg_host_priv_t priv);
-XBT_PUBLIC(void) sg_host_msg_destroy(sg_host_t host);
-
-// ========== SD Layer ==============
-typedef struct SD_workstation *SD_workstation_priv_t;
-SD_workstation_priv_t sg_host_sd(sg_host_t host);
-XBT_PUBLIC(void) sg_host_sd_set(sg_host_t host, SD_workstation_priv_t priv);
-XBT_PUBLIC(void) sg_host_sd_destroy(sg_host_t host);
 
 // ========== Simix layer =============
 typedef struct s_smx_host_priv *smx_host_priv_t;
@@ -51,25 +44,19 @@ XBT_PUBLIC(smx_host_priv_t) sg_host_simix(sg_host_t host);
 XBT_PUBLIC(void) sg_host_simix_set(sg_host_t host, smx_host_priv_t priv);
 XBT_PUBLIC(void) sg_host_simix_destroy(sg_host_t host);
 
-// ========== RoutingEdge ============
-XBT_PUBLIC(routing_edge_t) sg_host_edge(sg_host_t host);
-XBT_PUBLIC(void) sg_host_edge_set(sg_host_t host, routing_edge_t edge);
-XBT_PUBLIC(void) sg_host_edge_destroy(sg_host_t host, int do_callback);
-
-
 // Module initializer. Won't survive the conversion to C++. Hopefully.
 XBT_PUBLIC(void) sg_host_init(void);
 
 // =========== user-level functions ===============
-XBT_PUBLIC(double) sg_host_get_speed(sg_host_t host);
 XBT_PUBLIC(double) sg_host_get_available_speed(sg_host_t host);
-XBT_PUBLIC(int) sg_host_get_core(sg_host_t host);
-XBT_PUBLIC(int) sg_host_get_state(sg_host_t host);
+XBT_PUBLIC(int) sg_host_is_on(sg_host_t host);
 
 XBT_PUBLIC(int) sg_host_get_nb_pstates(sg_host_t host);
 XBT_PUBLIC(int) sg_host_get_pstate(sg_host_t host);
-XBT_PUBLIC(double) sg_host_get_consumed_energy(sg_host_t host);
-
+XBT_PUBLIC(void) sg_host_set_pstate(sg_host_t host,int pstate);
+XBT_PUBLIC(xbt_dict_t) sg_host_get_properties(sg_host_t host);
+XBT_PUBLIC(const char *) sg_host_get_property_value(sg_host_t host,
+                                                     const char *name);
 SG_END_DECL()
 
 #endif /* SIMGRID_HOST_H_ */