normalize some type names

[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 782c2d8..0decdd5 100644 (file)
--- a/src/include/surf/surfxml_parse_values.h
+++ b/src/include/surf/surfxml_parse_values.h
@@ -1,15 +1,14 @@
-/*
- * surfxml_parse_values.h
- *
- *  Created on: 24 oct. 2011
- *      Author: navarrop
- */
+/* Copyright (c) 2011. 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. */

 
 #ifndef SURFXML_PARSE_VALUES_H_
 #define SURFXML_PARSE_VALUES_H_
 
 
 #ifndef SURFXML_PARSE_VALUES_H_
 #define SURFXML_PARSE_VALUES_H_
 

-typedef struct s_peer *peer_t;
-typedef struct s_peer {
+typedef struct s_surf_parsing_peer_arg *surf_parsing_peer_arg_t;
+typedef struct s_surf_parsing_peer_arg {

        char* V_peer_id;
        char* V_peer_power;
        char* V_peer_bw_in;
        char* V_peer_id;
        char* V_peer_power;
        char* V_peer_bw_in;


@@ -18,10 +17,10 @@ typedef struct s_peer {
        char* V_peer_coord;
        char* V_peer_availability_trace;
        char* V_peer_state_trace;
        char* V_peer_coord;
        char* V_peer_availability_trace;
        char* V_peer_state_trace;

-} s_peer_t;
+} s_surf_parsing_peer_arg_t;

 
 

-typedef struct s_link *link_t;
-typedef struct s_link {
+typedef struct s_surf_parsing_link_arg *surf_parsing_link_arg_t;
+typedef struct s_surf_parsing_link_arg {

        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;


@@ -31,33 +30,35 @@ typedef struct s_link {
        tmgr_trace_t V_link_state_file;
        int V_link_sharing_policy;
        int V_policy_initial_link;
        tmgr_trace_t V_link_state_file;
        int V_link_sharing_policy;
        int V_policy_initial_link;

-} s_link_t;
+} s_surf_parsing_link_arg_t;

 
 

-typedef struct s_cluster *cluster_t;
-typedef struct s_cluster {
+typedef struct s_surf_parsing_cluster_arg *surf_parsing_cluster_arg_t;
+typedef struct s_surf_parsing_cluster_arg {

        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;

-       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;
+       double S_cluster_power;
+       int S_cluster_core;
+       double S_cluster_bw;
+       double S_cluster_lat;
+       double S_cluster_bb_bw;
+       double S_cluster_bb_lat;

        char* S_cluster_router_id;
        int V_cluster_sharing_policy;
        int V_cluster_bb_sharing_policy;
        char* S_cluster_router_id;
        int V_cluster_sharing_policy;
        int V_cluster_bb_sharing_policy;

-} s_cluster_t;
+       char* V_cluster_availability_file;
+       char* V_cluster_state_file;
+} s_surf_parsing_cluster_arg_t;

 
 

-typedef struct s_router *router_t;
-typedef struct s_router {
+typedef struct s_surf_parsing_router_arg *surf_parsing_router_arg_t;
+typedef struct s_surf_parsing_router_arg {

        char* V_router_id;
        char* V_router_coord;
        char* V_router_id;
        char* V_router_coord;

-} s_router_t;
+} s_surf_parsing_router_arg_t;

 
 

-typedef struct s_host *host_t;
-typedef struct s_host {
+typedef struct s_surf_parsing_host_arg *surf_parsing_host_arg_t;
+typedef struct s_surf_parsing_host_arg {

        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


@@ -65,13 +66,17 @@ typedef struct s_host {
        tmgr_trace_t V_host_power_trace;                                                                        //availability file
        e_surf_resource_state_t V_host_state_initial;                                           //state
        tmgr_trace_t V_host_state_trace;                                                                        //state file
        tmgr_trace_t V_host_power_trace;                                                                        //availability file
        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;
+       const char* V_host_coord;
+} s_surf_parsing_host_arg_t;
+
+extern surf_parsing_host_arg_t struct_host;
+extern surf_parsing_router_arg_t struct_router;
+extern surf_parsing_cluster_arg_t struct_cluster;
+extern surf_parsing_peer_arg_t struct_peer;
+extern surf_parsing_link_arg_t struct_lnk;
+
+void STag_surfxml_host_cluster(void);
+void STag_surfxml_link_cluster(void);

 
 

-extern host_t struct_host;
-extern router_t struct_router;
-extern cluster_t struct_cluster;
-extern peer_t struct_peer;
-extern link_t struct_lnk;

 
 #endif /* SURFXML_PARSE_VALUES_H_ */
 
 #endif /* SURFXML_PARSE_VALUES_H_ */