Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge pull request #1 from mquinson/master
[simgrid.git] / src / include / surf / surfxml_parse_values.h
index 3b7fa62..3d6db8b 100644 (file)
@@ -1,39 +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_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; //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;
 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;
-
 #endif /* SURFXML_PARSE_VALUES_H_ */