Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / 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 ae8eeb104a27fd50a0bda73c442fa85cf81d2487..00920956175ae01a77e7ac1adc24c87c1a468bb7 100644 (file)
--- a/src/include/surf/surfxml_parse_values.h
+++ b/src/include/surf/surfxml_parse_values.h
@@ -7,45 +7,11 @@
 #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* V_peer_id;
-       char* V_peer_power;
-       char* V_peer_bw_in;
-       char* V_peer_bw_out;
-       char* V_peer_lat;
-       char* V_peer_coord;
-       char* V_peer_availability_trace;
-       char* V_peer_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* V_cluster_id;
-       char* V_cluster_prefix;
-       char* V_cluster_suffix;
-       char* V_cluster_radical;
-       double S_cluster_power;
-       int S_cluster_core;
-       double S_cluster_bw;
-       double S_cluster_lat;
-       double S_cluster_bb_bw;
-       double S_cluster_bb_lat;
-       char* S_cluster_router_id;
-       int V_cluster_sharing_policy;
-       int V_cluster_bb_sharing_policy;
-       char* V_cluster_availability_file;
-       char* V_cluster_state_file;
-} s_surf_parsing_cluster_arg_t;
 
 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;
+  void* link_up;
+  void* link_down;
 } s_surf_parsing_link_up_down_t;
 
-
-extern surf_parsing_cluster_arg_t struct_cluster;
-extern surf_parsing_peer_arg_t struct_peer;
-
 #endif /* SURFXML_PARSE_VALUES_H_ */