Add V_cluster_availability_file and V_cluster_state_file to struct for cluster.

[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..a374e02 100644 (file)
--- a/src/include/surf/surfxml_parse_values.h
+++ b/src/include/surf/surfxml_parse_values.h
@@ -1,9 +1,8 @@
-/*
- * 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_


@@ -39,15 +38,17 @@ typedef struct s_cluster {
        char* V_cluster_prefix;
        char* V_cluster_suffix;
        char* V_cluster_radical;
        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;

+       char* V_cluster_availability_file;
+       char* V_cluster_state_file;

 } s_cluster_t;
 
 typedef struct s_router *router_t;
 } s_cluster_t;
 
 typedef struct s_router *router_t;


@@ -56,8 +57,8 @@ typedef struct s_router {
        char* V_router_coord;
 } s_router_t;
 
        char* V_router_coord;
 } s_router_t;
 

-typedef struct s_host *host_t;
-typedef struct s_host {
+typedef struct s_hostSG *hostSG_t;
+typedef struct s_hostSG {

        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


@@ -66,9 +67,9 @@ typedef struct s_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;
+} s_hostSG_t;

 
 

-extern host_t struct_host;
+extern hostSG_t struct_host;

 extern router_t struct_router;
 extern cluster_t struct_cluster;
 extern peer_t struct_peer;
 extern router_t struct_router;
 extern cluster_t struct_cluster;
 extern peer_t struct_peer;