X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9ca3fd4750612349590e3489edbf1f6d40fa73be..2b758af21612aa227b3a64876def8954e022dbd6:/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 bd2f1ab0bb..4940df931b 100644
--- a/src/include/surf/surfxml_parse_values.h
+++ b/src/include/surf/surfxml_parse_values.h
@@ -7,35 +7,24 @@
 #ifndef SURFXML_PARSE_VALUES_H_
 #define SURFXML_PARSE_VALUES_H_
 
-typedef struct s_surf_parsing_peer_arg *surf_parsing_peer_arg_t;
-typedef struct s_surf_parsing_peer_arg {
-	char* id; //FIXME: convert to const char
-	char* power;//FIXME: convert to double
-	char* bw_in;
-	char* bw_out;
-	char* lat;
-	char* coord;
-	char* availability_trace;
-	char* state_trace;
-} s_surf_parsing_peer_arg_t;
 
 typedef struct s_surf_parsing_cluster_arg *surf_parsing_cluster_arg_t;
 typedef struct s_surf_parsing_cluster_arg {
-	char* id;
-	char* prefix;
-	char* suffix;
-	char* radical;
+	const char* id;
+	const char* prefix;
+	const char* suffix;
+	const char* radical;
 	double power;
 	int core_amount;
 	double bw;
 	double lat;
 	double bb_bw;
 	double bb_lat;
-	char* router_id;
-	int sharing_policy;
-	int bb_sharing_policy;
-	char* availability_trace;
-	char* state_trace;
+	const char* router_id;
+	int sharing_policy; // FIXME: convert to e_surf_link_sharing_policy_t
+	int bb_sharing_policy; // FIXME: convert to e_surf_link_sharing_policy_t
+	const char* availability_trace; //don't convert to tmgr_trace_t since there is a trace per host and some rewriting is needed
+	const char* state_trace;
 } s_surf_parsing_cluster_arg_t;
 
 typedef struct s_surf_parsing_link_up_down *surf_parsing_link_up_down_t;
@@ -46,6 +35,5 @@ typedef struct s_surf_parsing_link_up_down {
 
 
 extern surf_parsing_cluster_arg_t struct_cluster;
-extern surf_parsing_peer_arg_t struct_peer;
 
 #endif /* SURFXML_PARSE_VALUES_H_ */