Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git] / src / include / surf / surfxml_parse_values.h
index bbd97c7..0092095 100644 (file)
@@ -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 {
-       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 {
-       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;
-       const char* router_id;
-       int sharing_policy;
-       int bb_sharing_policy;
-       const char* availability_trace; //FIXME: convert to tmgr
-       const char* state_trace;
-} 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_ */