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 bd2f1ab..3d6db8b 100644 (file)
@@ -1,51 +1,17 @@
-/* Copyright (c) 2011. The SimGrid Team.
+/* Copyright (c) 2011-2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
 * under the terms of the license (GNU LGPL) which comes with this package. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #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;
-       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;
-} 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_ */