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
less void*, new type: surf_host_t
[simgrid.git]
/
src
/
surf
/
surf_routing.cpp
diff --git
a/src/surf/surf_routing.cpp
b/src/surf/surf_routing.cpp
index
32e238a
..
de408ff
100644
(file)
--- a/
src/surf/surf_routing.cpp
+++ b/
src/surf/surf_routing.cpp
@@
-19,13
+19,13
@@
/**
* @ingroup SURF_build_api
/**
* @ingroup SURF_build_api
- * @brief A library containing all known
workstation
s
+ * @brief A library containing all known
host
s
*/
xbt_lib_t host_lib;
int ROUTING_HOST_LEVEL; //Routing level
int SURF_CPU_LEVEL; //Surf cpu level
*/
xbt_lib_t host_lib;
int ROUTING_HOST_LEVEL; //Routing level
int SURF_CPU_LEVEL; //Surf cpu level
-int SURF_
WKS_LEVEL; //Surf workstation
level
+int SURF_
HOST_LEVEL; //Surf host
level
int SIMIX_HOST_LEVEL; //Simix host level
int SIMIX_STORAGE_LEVEL; //Simix storage level
int MSG_HOST_LEVEL; //Msg host level
int SIMIX_HOST_LEVEL; //Simix host level
int SIMIX_STORAGE_LEVEL; //Simix storage level
int MSG_HOST_LEVEL; //Msg host level
@@
-55,7
+55,7
@@
static xbt_dict_t random_value = NULL;
/** @brief Retrieve a routing edge from its name
*
/** @brief Retrieve a routing edge from its name
*
- * Routing edges are either
CPU/workstation
and routers, whatever
+ * Routing edges are either
host
and routers, whatever
*/
RoutingEdgePtr sg_routing_edge_by_name_or_null(const char *name) {
RoutingEdgePtr net_elm = (RoutingEdgePtr) xbt_lib_get_or_null(host_lib, name, ROUTING_HOST_LEVEL);
*/
RoutingEdgePtr sg_routing_edge_by_name_or_null(const char *name) {
RoutingEdgePtr net_elm = (RoutingEdgePtr) xbt_lib_get_or_null(host_lib, name, ROUTING_HOST_LEVEL);
@@
-902,8
+902,6
@@
static void routing_parse_cluster(sg_platf_cluster_cbarg_t cluster)
xbt_dict_foreach(cluster->properties,cursor,key,data) {
xbt_dict_set(host.properties, key, xbt_strdup(data),free);
}
xbt_dict_foreach(cluster->properties,cursor,key,data) {
xbt_dict_set(host.properties, key, xbt_strdup(data),free);
}
- } else {
- XBT_INFO("Null properties for %s: %p",host_id,cluster->properties);
}
if (cluster->availability_trace && strcmp(cluster->availability_trace, "")) {
xbt_dict_set(patterns, "radical", bprintf("%d", i), NULL);
}
if (cluster->availability_trace && strcmp(cluster->availability_trace, "")) {
xbt_dict_set(patterns, "radical", bprintf("%d", i), NULL);
@@
-1309,9
+1307,7
@@
void routing_register_callbacks()
sg_platf_trace_add_cb(routing_parse_trace);
sg_platf_trace_connect_add_cb(routing_parse_trace_connect);
sg_platf_trace_add_cb(routing_parse_trace);
sg_platf_trace_connect_add_cb(routing_parse_trace_connect);
-#ifdef HAVE_TRACING
instr_routing_define_callbacks();
instr_routing_define_callbacks();
-#endif
}
/**
}
/**
@@
-1407,4
+1403,3
@@
xbt_dynar_t surf_AS_get_hosts(AsPtr as) {
void surf_AS_get_graph(AS_t as, xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) {
as->getGraph(graph, nodes, edges);
}
void surf_AS_get_graph(AS_t as, xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) {
as->getGraph(graph, nodes, edges);
}
-