[Lua] Renamed host 'power' to 'speed' for hosts

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

diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h
index 2f6279c..5f77905 100644 (file)
--- a/include/simgrid/forward.h
+++ b/include/simgrid/forward.h
@@ -8,43 +8,53 @@
 #define SG_PLATF_TYPES_H
 
 #include <xbt.h>
-#include <simgrid/host.h>
 
 #ifdef __cplusplus
 
-class Cpu;
-class RoutingEdge;
+namespace simgrid {
+  namespace s4u {
+    class Host;
+  }
+  namespace surf {
+    class Cpu;
+    class NetCard;
+    class As;
+    class Link;
+  }
+}
 
-#else
+namespace simgrid {
 
-typedef struct Cpu Cpu;
-typedef struct RoutingEdge RoutingEdge;
+}
 
-#endif
+typedef simgrid::s4u::Host simgrid_Host;
+typedef simgrid::surf::Cpu surf_Cpu;
+typedef simgrid::surf::NetCard surf_NetCard;
+typedef simgrid::surf::As surf_As;
+typedef simgrid::surf::Link Link;
 
-typedef Cpu *surf_cpu_t;
-typedef RoutingEdge *routing_edge_t;
-typedef RoutingEdge *sg_routing_edge_t;
+#else
 
+typedef struct simgrid_Host simgrid_Host;
+typedef struct surf_Cpu surf_Cpu;
+typedef struct surf_NetCard surf_NetCard;
+typedef struct surf_As surf_As;
+typedef struct Link Link;
 
+#endif
 
-// Types which are in fact dictelmt:
+typedef simgrid_Host* sg_host_t;
+typedef surf_Cpu *surf_cpu_t;
+typedef surf_NetCard *sg_netcard_t;
+typedef surf_As *AS_t;
 
-typedef xbt_dictelm_t sg_host_t;
+// Types which are in fact dictelmt:
 typedef xbt_dictelm_t sg_storage_t;
 
-
 typedef struct tmgr_trace *tmgr_trace_t; /**< Opaque structure defining an availability trace */
 
 typedef void *sg_routing_link_t; /* FIXME:The actual type is model-dependent so use void* instead*/
 
-/** @ingroup SURF_interface
-* @brief Defines whether a given resource is working or not */
-typedef enum {
-  SURF_RESOURCE_ON = 1,                   /**< Up & ready        */
-  SURF_RESOURCE_OFF = 0                   /**< Down & broken     */
-} e_surf_resource_state_t;
-
 typedef enum {
   SURF_LINK_FULLDUPLEX = 2,
   SURF_LINK_SHARED = 1,
@@ -98,14 +108,14 @@ typedef struct {
   int core_amount;
   double speed_scale;
   tmgr_trace_t speed_trace;
-  e_surf_resource_state_t initial_state;
+  int initiallyOn;
   tmgr_trace_t state_trace;
   const char* coord;
   xbt_dict_t properties;
 } s_sg_platf_host_cbarg_t, *sg_platf_host_cbarg_t;
 
 #define SG_PLATF_HOST_INITIALIZER { \
-    NULL, 0, 1, 1, 1., NULL, SURF_RESOURCE_ON, NULL, \
+    NULL, 0, 1, 1, 1., NULL, 1/*ON*/, NULL, \
     NULL, NULL \
 }
 
@@ -130,14 +140,14 @@ typedef struct {
   tmgr_trace_t bandwidth_trace;
   double latency;
   tmgr_trace_t latency_trace;
-  e_surf_resource_state_t state;
+  int initiallyOn;
   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;
 
 #define SG_PLATF_LINK_INITIALIZER {\
-  NULL, 0., NULL, 0., NULL, SURF_RESOURCE_ON, \
+  NULL, 0., NULL, 0., NULL, 1/*ON*/, \
   NULL, SURF_LINK_SHARED, NULL \
 }
 
@@ -160,8 +170,8 @@ typedef struct s_sg_platf_route_cbarg {
   int symmetrical;
   const char *src;
   const char *dst;
-  sg_routing_edge_t gw_src;
-  sg_routing_edge_t gw_dst;
+  sg_netcard_t gw_src;
+  sg_netcard_t gw_dst;
   xbt_dynar_t link_list;
 } s_sg_platf_route_cbarg_t;