A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[trace_mgr] less void*, (some) more doc
[simgrid.git]
/
include
/
simgrid
/
forward.h
diff --git
a/include/simgrid/forward.h
b/include/simgrid/forward.h
index
434abff
..
ecab7aa
100644
(file)
--- a/
include/simgrid/forward.h
+++ b/
include/simgrid/forward.h
@@
-12,41
+12,46
@@
#ifdef __cplusplus
namespace simgrid {
#ifdef __cplusplus
namespace simgrid {
-class Host;
+ namespace s4u {
+ class Host;
+ }
+ namespace surf {
+ class Resource;
+ class Cpu;
+ class NetCard;
+ class As;
+ class Link;
+ }
+ namespace trace_mgr {
+ class future_evt_set;
+ }
}
}
-namespace simgrid {
-namespace surf {
-
-class Cpu;
-class RoutingEdge;
-class As;
-class Link;
-
-}
-}
-
-typedef simgrid::Host simgrid_Host;
-typedef simgrid::surf::Cpu surf_Cpu;
-typedef simgrid::surf::RoutingEdge surf_RoutingEdge;
+typedef simgrid::s4u::Host simgrid_Host;
typedef simgrid::surf::As surf_As;
typedef simgrid::surf::As surf_As;
+typedef simgrid::surf::Cpu surf_Cpu;
+typedef simgrid::surf::NetCard surf_NetCard;
typedef simgrid::surf::Link Link;
typedef simgrid::surf::Link Link;
+typedef simgrid::surf::Resource surf_Resource;
+typedef simgrid::trace_mgr::future_evt_set sg_future_evt_set;
#else
typedef struct simgrid_Host simgrid_Host;
#else
typedef struct simgrid_Host simgrid_Host;
-typedef struct surf_Cpu surf_Cpu;
-typedef struct surf_RoutingEdge surf_RoutingEdge;
typedef struct surf_As surf_As;
typedef struct surf_As surf_As;
+typedef struct surf_Cpu surf_Cpu;
+typedef struct surf_NetCard surf_NetCard;
+typedef struct surf_Resource surf_Resource;
typedef struct Link Link;
typedef struct Link Link;
-
+typedef struct future_evt_set sg_future_evt_set;
#endif
typedef simgrid_Host* sg_host_t;
#endif
typedef simgrid_Host* sg_host_t;
-typedef surf_Cpu *surf_cpu_t;
-typedef surf_RoutingEdge *routing_edge_t;
-typedef surf_RoutingEdge *sg_routing_edge_t;
typedef surf_As *AS_t;
typedef surf_As *AS_t;
+typedef surf_Cpu *surf_cpu_t;
+typedef surf_NetCard *sg_netcard_t;
+typedef surf_Resource *sg_resource_t;
+typedef sg_future_evt_set *sg_future_evt_set_t;
// Types which are in fact dictelmt:
typedef xbt_dictelm_t sg_storage_t;
// Types which are in fact dictelmt:
typedef xbt_dictelm_t sg_storage_t;
@@
-55,13
+60,6
@@
typedef struct tmgr_trace *tmgr_trace_t; /**< Opaque structure defining an avail
typedef void *sg_routing_link_t; /* FIXME:The actual type is model-dependent so use void* instead*/
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,
typedef enum {
SURF_LINK_FULLDUPLEX = 2,
SURF_LINK_SHARED = 1,
@@
-115,14
+113,14
@@
typedef struct {
int core_amount;
double speed_scale;
tmgr_trace_t speed_trace;
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 { \
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 \
}
NULL, NULL \
}
@@
-147,14
+145,14
@@
typedef struct {
tmgr_trace_t bandwidth_trace;
double latency;
tmgr_trace_t latency_trace;
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 {\
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 \
}
NULL, SURF_LINK_SHARED, NULL \
}
@@
-177,8
+175,8
@@
typedef struct s_sg_platf_route_cbarg {
int symmetrical;
const char *src;
const char *dst;
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;
xbt_dynar_t link_list;
} s_sg_platf_route_cbarg_t;