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
Make smx_file_t, surf_file_t and msg_file_t
[simgrid.git]
/
src
/
surf
/
surf_routing_private.h
diff --git
a/src/surf/surf_routing_private.h
b/src/surf/surf_routing_private.h
index
6f2fd75
..
7a1e3dc
100644
(file)
--- a/
src/surf/surf_routing_private.h
+++ b/
src/surf/surf_routing_private.h
@@
-29,8
+29,8
@@
void model_none_finalize(AS_t as);
AS_t model_generic_create_sized(size_t childsize);
void model_generic_finalize(AS_t as);
AS_t model_generic_create_sized(size_t childsize);
void model_generic_finalize(AS_t as);
-
void generic_parse_PU(AS_t rc, const char *name
);
-
void generic_parse_AS(AS_t rc, const char *name
);
+
int generic_parse_PU(AS_t rc, network_element_t elm
);
+
int generic_parse_AS(AS_t rc, network_element_t elm
);
void generic_parse_bypassroute(AS_t rc, const char *src, const char *dst,
route_t e_route);
void generic_parse_bypassroute(AS_t rc, const char *src, const char *dst,
route_t e_route);
@@
-39,8
+39,8
@@
void generic_parse_bypassroute(AS_t rc, const char *src, const char *dst,
xbt_dynar_t generic_get_onelink_routes(AS_t rc);
route_t generic_get_bypassroute(AS_t rc,
xbt_dynar_t generic_get_onelink_routes(AS_t rc);
route_t generic_get_bypassroute(AS_t rc,
-
const char *
src,
-
const char *
dst);
+
network_element_t
src,
+
network_element_t
dst);
/* ************************************************************************** */
/* ****************** GENERIC AUX FUNCTIONS (declarations) ****************** */
/* ************************************************************************** */
/* ****************** GENERIC AUX FUNCTIONS (declarations) ****************** */
@@
-55,8
+55,8
@@
AS_t
generic_autonomous_system_exist(AS_t rc, char *element);
AS_t
generic_processing_units_exist(AS_t rc, char *element);
generic_autonomous_system_exist(AS_t rc, char *element);
AS_t
generic_processing_units_exist(AS_t rc, char *element);
-void generic_src_dst_check(AS_t rc,
const char *
src,
-
const char *
dst);
+void generic_src_dst_check(AS_t rc,
network_element_t
src,
+
network_element_t
dst);
/* ************************************************************************** */
/* ************************************************************************** */
@@
-75,7
+75,6
@@
AS_t model_rulebased_create(void); /* create structures for rulebased routi
AS_t model_cluster_create(void); /* create structures for cluster routing model */
/* Pass info from the cluster parser to the cluster routing */
AS_t model_cluster_create(void); /* create structures for cluster routing model */
/* Pass info from the cluster parser to the cluster routing */
-void surf_routing_cluster_add_link(const char* host_id,surf_parsing_link_up_down_t info);
void surf_routing_cluster_add_backbone(AS_t as, void* bb);
/* ************************************************** */
void surf_routing_cluster_add_backbone(AS_t as, void* bb);
/* ************************************************** */