X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7feae70bb1a3019393031dcf0bb64daeaa19f4ef..32e70034e357fcad920962e4ed35fcbf8dd59283:/include/simgrid/host.h

diff --git a/include/simgrid/host.h b/include/simgrid/host.h
index a005912916..c6fb94364b 100644
--- a/include/simgrid/host.h
+++ b/include/simgrid/host.h
@@ -25,6 +25,10 @@ class Cpu;
 #else
 #define DEFINE_EXTERNAL_CLASS(klass) typedef struct klass klass;
 #endif
+// ========== User Data ==============
+XBT_PUBLIC(void*) sg_host_user(sg_host_t host);
+XBT_PUBLIC(void) sg_host_user_set(sg_host_t host, void* userdata);
+XBT_PUBLIC(void) sg_host_user_destroy(sg_host_t host);
 
 // ========== MSG Layer ==============
 typedef struct s_msg_host_priv *msg_host_priv_t;
@@ -32,6 +36,12 @@ 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;
 XBT_PUBLIC(smx_host_priv_t) sg_host_simix(sg_host_t host);
@@ -41,21 +51,32 @@ XBT_PUBLIC(void) sg_host_simix_destroy(sg_host_t host);
 // ========== SURF CPU ============
 DEFINE_EXTERNAL_CLASS(Cpu);
 typedef Cpu *surf_cpu_t;
-typedef Cpu *CpuPtr;
 XBT_PUBLIC(surf_cpu_t) sg_host_surfcpu(sg_host_t host);
 XBT_PUBLIC(void) sg_host_surfcpu_set(sg_host_t host, surf_cpu_t cpu);
+XBT_PUBLIC(void) sg_host_surfcpu_register(sg_host_t host, surf_cpu_t cpu);
 XBT_PUBLIC(void) sg_host_surfcpu_destroy(sg_host_t host);
 
 // ========== RoutingEdge ============
-typedef struct RoutingEdge *RoutingEdgePtr;
-XBT_PUBLIC(RoutingEdgePtr) sg_host_edge(sg_host_t host);
-XBT_PUBLIC(void) sg_host_edge_set(sg_host_t host, RoutingEdgePtr edge);
+DEFINE_EXTERNAL_CLASS(RoutingEdge);
+XBT_PUBLIC(RoutingEdge*) sg_host_edge(sg_host_t host);
+XBT_PUBLIC(void) sg_host_edge_set(sg_host_t host, RoutingEdge* 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_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);
+
+
 SG_END_DECL()
 
 #endif /* SIMGRID_HOST_H_ */