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
Merge branch 'torus'
[simgrid.git]
/
include
/
simgrid
/
platf.h
diff --git
a/include/simgrid/platf.h
b/include/simgrid/platf.h
index
20bb10f
..
d894607
100644
(file)
--- a/
include/simgrid/platf.h
+++ b/
include/simgrid/platf.h
@@
-18,7
+18,8
@@
typedef struct RoutingEdge *sg_routing_edge_t;
XBT_PUBLIC(sg_routing_edge_t) sg_routing_edge_by_name_or_null(const char *name);
XBT_PUBLIC(sg_routing_edge_t) sg_routing_edge_by_name_or_null(const char *name);
-/** Defines whether a given resource is working or not */
+/** @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 */
typedef enum {
SURF_RESOURCE_ON = 1, /**< Up & ready */
SURF_RESOURCE_OFF = 0 /**< Down & broken */
@@
-43,6
+44,11
@@
typedef enum {
SURF_PROCESS_ON_FAILURE_RESTART = 0
} e_surf_process_on_failure_t;
SURF_PROCESS_ON_FAILURE_RESTART = 0
} e_surf_process_on_failure_t;
+typedef enum {
+ SURF_CLUSTER_FLAT = 1,
+ SURF_CLUSTER_TORUS = 0
+} e_surf_cluster_topology_t;
+
typedef struct tmgr_trace *tmgr_trace_t; /**< Opaque structure defining an availability trace */
typedef struct tmgr_trace *tmgr_trace_t; /**< Opaque structure defining an availability trace */
@@
-201,6
+207,8
@@
typedef struct s_sg_platf_cluster_cbarg {
double loopback_bw;
double loopback_lat;
double limiter_link;
double loopback_bw;
double loopback_lat;
double limiter_link;
+ e_surf_cluster_topology_t topology;
+ const char* topo_parameters;
xbt_dict_t properties;
const char* router_id;
e_surf_link_sharing_policy_t sharing_policy;
xbt_dict_t properties;
const char* router_id;
e_surf_link_sharing_policy_t sharing_policy;