X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/15b64b5edc827167522ab08cf9efd17cf1b69830..f5b15e157009dbaef93d579aaf5f093864fc7cc7:/src/include/surf/surfxml_parse_values.h

diff --git a/src/include/surf/surfxml_parse_values.h b/src/include/surf/surfxml_parse_values.h
index 673c8109b3..ae8eeb104a 100644
--- a/src/include/surf/surfxml_parse_values.h
+++ b/src/include/surf/surfxml_parse_values.h
@@ -7,8 +7,8 @@
 #ifndef SURFXML_PARSE_VALUES_H_
 #define SURFXML_PARSE_VALUES_H_
 
-typedef struct s_peer *peer_t;
-typedef struct s_peer {
+typedef struct s_surf_parsing_peer_arg *surf_parsing_peer_arg_t;
+typedef struct s_surf_parsing_peer_arg {
 	char* V_peer_id;
 	char* V_peer_power;
 	char* V_peer_bw_in;
@@ -17,23 +17,10 @@ typedef struct s_peer {
 	char* V_peer_coord;
 	char* V_peer_availability_trace;
 	char* V_peer_state_trace;
-} s_peer_t;
+} s_surf_parsing_peer_arg_t;
 
-typedef struct s_link *link_t;
-typedef struct s_link {
-	char* V_link_id;
-	double V_link_bandwidth;
-	tmgr_trace_t V_link_bandwidth_file;
-	double V_link_latency;
-	tmgr_trace_t V_link_latency_file;
-	e_surf_resource_state_t V_link_state;
-	tmgr_trace_t V_link_state_file;
-	int V_link_sharing_policy;
-	int V_policy_initial_link;
-} s_link_t;
-
-typedef struct s_cluster *cluster_t;
-typedef struct s_cluster {
+typedef struct s_surf_parsing_cluster_arg *surf_parsing_cluster_arg_t;
+typedef struct s_surf_parsing_cluster_arg {
 	char* V_cluster_id;
 	char* V_cluster_prefix;
 	char* V_cluster_suffix;
@@ -49,34 +36,16 @@ typedef struct s_cluster {
 	int V_cluster_bb_sharing_policy;
 	char* V_cluster_availability_file;
 	char* V_cluster_state_file;
-} s_cluster_t;
-
-typedef struct s_router *router_t;
-typedef struct s_router {
-	char* V_router_id;
-	char* V_router_coord;
-} s_router_t;
-
-typedef struct s_hostSG *hostSG_t;
-typedef struct s_hostSG {
-	char* V_host_id;													//id
-	double V_host_power_peak;											//power
-	int V_host_core;													//core
-	double V_host_power_scale;											//availability
-	tmgr_trace_t V_host_power_trace;									//availability file
-	e_surf_resource_state_t V_host_state_initial;						//state
-	tmgr_trace_t V_host_state_trace;									//state file
-	const char* V_host_coord;
-} s_hostSG_t;
+} s_surf_parsing_cluster_arg_t;
 
-extern hostSG_t struct_host;
-extern router_t struct_router;
-extern cluster_t struct_cluster;
-extern peer_t struct_peer;
-extern link_t struct_lnk;
+typedef struct s_surf_parsing_link_up_down *surf_parsing_link_up_down_t;
+typedef struct s_surf_parsing_link_up_down {
+	void* link_up;
+	void* link_down;
+} s_surf_parsing_link_up_down_t;
 
-void STag_surfxml_host_cluster(void);
-void STag_surfxml_link_cluster(void);
 
+extern surf_parsing_cluster_arg_t struct_cluster;
+extern surf_parsing_peer_arg_t struct_peer;
 
 #endif /* SURFXML_PARSE_VALUES_H_ */