some more cleanups for tomorrow marked as FIXME for now -- good night

[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 bbd97c7..4940df9 100644 (file)
--- a/src/include/surf/surfxml_parse_values.h
+++ b/src/include/surf/surfxml_parse_values.h
@@ -7,17 +7,6 @@
 #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 {
-       const char* id;
-       double power;
-       double bw_in;
-       double bw_out;
-       double lat;
-       const char* coord;
-       tmgr_trace_t availability_trace;
-       tmgr_trace_t 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 {
@@ -32,9 +21,9 @@ typedef struct s_surf_parsing_cluster_arg {
        double bb_bw;
        double bb_lat;
        const char* router_id;
-       int sharing_policy;
-       int bb_sharing_policy;
-       const char* availability_trace; //FIXME: convert to tmgr
+       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;
 
@@ -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_ */