X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1ee944880f9f0d58499e4eaf2ee486d77a6bb0ae..be27c3513d2b7d273749db733659600b10dc0a54:/include/simgrid/host.h

diff --git a/include/simgrid/host.h b/include/simgrid/host.h
index f3fa3a661b..2c3ab3892e 100644
--- a/include/simgrid/host.h
+++ b/include/simgrid/host.h
@@ -7,24 +7,31 @@
 #ifndef SIMGRID_HOST_H_
 #define SIMGRID_HOST_H_
 
+#include <stddef.h>
+
 #include <xbt/dict.h>
 #include <xbt/dynar.h>
+
+#include <simgrid/forward.h>
+
+#ifdef __cplusplus
+#include <simgrid/Host.hpp>
+#endif
+
 SG_BEGIN_DECL()
 
-typedef xbt_dictelm_t sg_host_t;
+XBT_PUBLIC(size_t) sg_host_count();
+XBT_PUBLIC(size_t) sg_host_extension_create(void(*deleter)(void*));
+XBT_PUBLIC(void*) sg_host_extension_get(sg_host_t host, size_t rank);
 XBT_PUBLIC(sg_host_t) sg_host_by_name(const char *name);
 XBT_PUBLIC(sg_host_t) sg_host_by_name_or_create(const char *name);
-static XBT_INLINE char *sg_host_get_name(sg_host_t host){
-	return host->key;
-}
+XBT_PUBLIC(const char*) sg_host_get_name(sg_host_t host);
 XBT_PUBLIC(xbt_dynar_t) sg_hosts_as_dynar(void);
 
-#ifdef __cplusplus
-#define DEFINE_EXTERNAL_CLASS(klass) class klass;
-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;
@@ -44,33 +51,18 @@ 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);
 
-// ========== SURF CPU ============
-DEFINE_EXTERNAL_CLASS(Cpu);
-typedef Cpu *surf_cpu_t;
-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_destroy(sg_host_t host);
-
-// ========== RoutingEdge ============
-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_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(void) sg_host_set_pstate(sg_host_t host,int pstate);
 XBT_PUBLIC(double) sg_host_get_consumed_energy(sg_host_t host);
 
-
 SG_END_DECL()
 
 #endif /* SIMGRID_HOST_H_ */