A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rewrite the way to do the parsing for host,cluster,peer,router and link.
[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
18ac4ac
..
782c2d8
100644
(file)
--- a/
src/include/surf/surfxml_parse_values.h
+++ b/
src/include/surf/surfxml_parse_values.h
@@
-8,18
+8,20
@@
#ifndef SURFXML_PARSE_VALUES_H_
#define SURFXML_PARSE_VALUES_H_
#ifndef SURFXML_PARSE_VALUES_H_
#define SURFXML_PARSE_VALUES_H_
-struct V_peer {
+typedef struct s_peer *peer_t;
+typedef struct s_peer {
char* V_peer_id;
char* V_peer_id;
-
double
V_peer_power;
-
double
V_peer_bw_in;
-
double
V_peer_bw_out;
-
double
V_peer_lat;
+
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_coord;
-
tmgr_trace_t
V_peer_availability_trace;
-
tmgr_trace_t
V_peer_state_trace;
-};
+
char*
V_peer_availability_trace;
+
char*
V_peer_state_trace;
+}
s_peer_t
;
-struct V_link {
+typedef struct s_link *link_t;
+typedef struct s_link {
char* V_link_id;
double V_link_bandwidth;
tmgr_trace_t V_link_bandwidth_file;
char* V_link_id;
double V_link_bandwidth;
tmgr_trace_t V_link_bandwidth_file;
@@
-28,30
+30,34
@@
struct V_link {
e_surf_resource_state_t V_link_state;
tmgr_trace_t V_link_state_file;
int V_link_sharing_policy;
e_surf_resource_state_t V_link_state;
tmgr_trace_t V_link_state_file;
int V_link_sharing_policy;
-};
+ int V_policy_initial_link;
+} s_link_t;
-struct V_cluster {
+typedef struct s_cluster *cluster_t;
+typedef struct s_cluster {
char* V_cluster_id;
char* V_cluster_prefix;
char* V_cluster_suffix;
char* V_cluster_radical;
char* V_cluster_id;
char* V_cluster_prefix;
char* V_cluster_suffix;
char* V_cluster_radical;
-
double V
_cluster_power;
-
int V
_cluster_core;
-
double V
_cluster_bw;
-
double V
_cluster_lat;
-
double V
_cluster_bb_bw;
-
double V
_cluster_bb_lat;
- char
* V
_cluster_router_id;
+
char* S
_cluster_power;
+
char* S
_cluster_core;
+
char* S
_cluster_bw;
+
char* S
_cluster_lat;
+
char* S
_cluster_bb_bw;
+
char* S
_cluster_bb_lat;
+ char
* S
_cluster_router_id;
int V_cluster_sharing_policy;
int V_cluster_bb_sharing_policy;
int V_cluster_sharing_policy;
int V_cluster_bb_sharing_policy;
-};
+}
s_cluster_t
;
-struct V_router {
+typedef struct s_router *router_t;
+typedef struct s_router {
char* V_router_id;
char* V_router_coord;
char* V_router_id;
char* V_router_coord;
-};
+}
s_router_t
;
-struct V_host {
+typedef struct s_host *host_t;
+typedef struct s_host {
char* V_host_id; //id
double V_host_power_peak; //power
int V_host_core; //core
char* V_host_id; //id
double V_host_power_peak; //power
int V_host_core; //core
@@
-60,12
+66,12
@@
struct V_host {
e_surf_resource_state_t V_host_state_initial; //state
tmgr_trace_t V_host_state_trace; //state file
char* V_host_coord;
e_surf_resource_state_t V_host_state_initial; //state
tmgr_trace_t V_host_state_trace; //state file
char* V_host_coord;
-};
+}
s_host_t
;
-
struct V_host s
_host;
-
struct V_router s
_router;
-
struct V_cluster s
_cluster;
-
struct V_peer s
_peer;
-
struct V_link s_li
nk;
+
extern host_t struct
_host;
+
extern router_t struct
_router;
+
extern cluster_t struct
_cluster;
+
extern peer_t struct
_peer;
+
extern link_t struct_l
nk;
#endif /* SURFXML_PARSE_VALUES_H_ */
#endif /* SURFXML_PARSE_VALUES_H_ */