X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bd2cf2d478d8e130e47a9b2943af0269b8da910a..f5b15e157009dbaef93d579aaf5f093864fc7cc7:/include/simgrid/platf.h

diff --git a/include/simgrid/platf.h b/include/simgrid/platf.h
index 69f1f66e63..c9c0ede461 100644
--- a/include/simgrid/platf.h
+++ b/include/simgrid/platf.h
@@ -19,6 +19,11 @@ typedef enum {
   SURF_RESOURCE_OFF = 0                   /**< Down & broken     */
 } e_surf_resource_state_t;
 
+typedef enum {
+  SURF_LINK_FULLDUPLEX = 2,
+  SURF_LINK_SHARED = 1,
+  SURF_LINK_FATPIPE = 0
+} e_surf_link_sharing_policy_t;
 
 /*
  * Platform creation functions. Instead of passing 123 arguments to the creation functions
@@ -31,32 +36,31 @@ typedef enum {
  */
 
 typedef struct {
-  char* V_host_id;                          //id
-  double V_host_power_peak;                     //power
-  int V_host_core;                          //core
-  double V_host_power_scale;                      //availability
-  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
-  const char* V_host_coord;
+  const char* id;
+  double power_peak;
+  int core_amount;
+  double power_scale;
+  tmgr_trace_t power_trace;
+  e_surf_resource_state_t initial_state;
+  tmgr_trace_t state_trace;
+  const char* coord;
   xbt_dict_t properties;
 } s_sg_platf_host_cbarg_t, *sg_platf_host_cbarg_t;
 
 typedef struct {
-  const char* V_router_id;
-  const char* V_router_coord;
+  const char* id;
+  const char* coord;
 } s_sg_platf_router_cbarg_t, *sg_platf_router_cbarg_t;
 
 typedef struct {
-  char* V_link_id;
-  double V_link_bandwidth;
-  tmgr_trace_t V_link_bandwidth_file;
-  double V_link_latency;
-  tmgr_trace_t V_link_latency_file;
-  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;
+  const char* id;
+  double bandwidth;
+  tmgr_trace_t bandwidth_trace;
+  double latency;
+  tmgr_trace_t latency_trace;
+  e_surf_resource_state_t state;
+  tmgr_trace_t state_trace;
+  e_surf_link_sharing_policy_t policy;
   xbt_dict_t properties;
 } s_sg_platf_link_cbarg_t, *sg_platf_link_cbarg_t;
 
@@ -69,7 +73,7 @@ XBT_PUBLIC(void) sg_platf_new_AS_close(void);                            // That
 
 XBT_PUBLIC(void) sg_platf_new_host  (sg_platf_host_cbarg_t   host);   // Add an host  to the currently described AS
 XBT_PUBLIC(void) sg_platf_new_router(sg_platf_router_cbarg_t router); // Add a router to the currently described AS
-XBT_PUBLIC(void) sg_platf_new_link(sg_platf_link_cbarg_t link);       // Add a link   to the currently described AS
+XBT_PUBLIC(void) sg_platf_new_link  (sg_platf_link_cbarg_t link);     // Add a link   to the currently described AS
 
 
 #endif                          /* SG_PLATF_H */