rename some types for consistency

[simgrid.git] / include / simgrid / platf.h

diff --git a/include/simgrid/platf.h b/include/simgrid/platf.h
index a10f884..8b09800 100644 (file)
--- a/include/simgrid/platf.h
+++ b/include/simgrid/platf.h
@@ -9,9 +9,13 @@
 #ifndef SG_PLATF_H
 #define SG_PLATF_H
 
-#include <xbt.h>                /* our toolbox */
+#include <xbt.h>
 
 typedef struct tmgr_trace *tmgr_trace_t; /**< Opaque structure defining an availability trace */
+XBT_PUBLIC(tmgr_trace_t) tmgr_trace_new(const char *filename);
+XBT_PUBLIC(tmgr_trace_t) tmgr_trace_new_from_string(const char *id,
+                                                    const char *input,
+                                                    double periodicity);
 
 /** Defines whether a given resource is working or not */
 typedef enum {
@@ -19,6 +23,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
@@ -43,23 +52,34 @@ typedef struct {
 } 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 {
-  const 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;
 
+typedef struct s_sg_platf_peer_cbarg *sg_platf_peer_cbarg_t;
+typedef struct s_sg_platf_peer_cbarg {
+  const char* id;
+  double power;
+  double bw_in;
+  double bw_out;
+  double lat;
+  const char* coord;
+  tmgr_trace_t availability_trace;
+  tmgr_trace_t state_trace;
+} s_sg_platf_peer_cbarg_t;
+
 
 XBT_PUBLIC(void) sg_platf_open(void);  // Start a new platform
 XBT_PUBLIC(void) sg_platf_close(void); // Finish the creation of the platform
@@ -70,6 +90,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_peer(sg_platf_peer_cbarg_t peer);       // Add a peer   to the currently described AS
 
 
 #endif                          /* SG_PLATF_H */