X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cf108868b4eeed4d0d9d343bc68557d7814e18c0..91b3883142b769ef1fc0b7d460f78d2ae526bca2:/include/simgrid/host.h

diff --git a/include/simgrid/host.h b/include/simgrid/host.h
index b73a25da42..1c418b2a82 100644
--- a/include/simgrid/host.h
+++ b/include/simgrid/host.h
@@ -14,56 +14,41 @@
 
 #include <simgrid/forward.h>
 
-#ifdef __cplusplus
-#include <simgrid/s4u/host.hpp>
-#endif
-
 SG_BEGIN_DECL()
 
+XBT_PUBLIC(void) sg_host_exit();
+
 XBT_PUBLIC(size_t) sg_host_count();
-XBT_PUBLIC(sg_host_t *) sg_host_list(void);
+XBT_PUBLIC(sg_host_t *) sg_host_list();
 
 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);
 XBT_PUBLIC(const char*) sg_host_get_name(sg_host_t host);
-XBT_PUBLIC(xbt_dynar_t) sg_hosts_as_dynar(void);
+XBT_PUBLIC(xbt_dynar_t) sg_hosts_as_dynar();
 
 // ========== 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;
-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);
-
-// ========== 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);
-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);
-
-// Module initializer. Won't survive the conversion to C++. Hopefully.
-XBT_PUBLIC(void) sg_host_init(void);
-
 // ========= storage related functions ============
 XBT_PUBLIC(xbt_dict_t) sg_host_get_mounted_storage_list(sg_host_t host);
 XBT_PUBLIC(xbt_dynar_t) sg_host_get_attached_storage_list(sg_host_t host);
 // =========== user-level functions ===============
 XBT_PUBLIC(double) sg_host_speed(sg_host_t host);
 XBT_PUBLIC(double) sg_host_get_available_speed(sg_host_t host);
-XBT_PUBLIC(int) sg_host_core_count(sg_host_t host);
-XBT_PUBLIC(int) sg_host_is_on(sg_host_t host);
 
+XBT_PUBLIC(sg_host_t) sg_host_self();
+XBT_PUBLIC(const char*) sg_host_self_get_name();
 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(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);
+XBT_PUBLIC(const char*) sg_host_get_property_value(sg_host_t host, const char* name);
+XBT_PUBLIC(void) sg_host_route(sg_host_t from, sg_host_t to, xbt_dynar_t links);
+XBT_PUBLIC(double) sg_host_route_latency(sg_host_t from, sg_host_t to);
+XBT_PUBLIC(double) sg_host_route_bandwidth(sg_host_t from, sg_host_t to);
 XBT_PUBLIC(void) sg_host_dump(sg_host_t ws);
 SG_END_DECL()