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
rename routing_component to as, since that's just an AS at the end of the day
[simgrid.git]
/
src
/
surf
/
surf_routing_rulebased.c
diff --git
a/src/surf/surf_routing_rulebased.c
b/src/surf/surf_routing_rulebased.c
index
aee6a7d
..
2e5a948
100644
(file)
--- a/
src/surf/surf_routing_rulebased.c
+++ b/
src/surf/surf_routing_rulebased.c
@@
-8,7
+8,7
@@
/* Global vars */
extern routing_global_t global_routing;
/* Global vars */
extern routing_global_t global_routing;
-extern
routing_component
_t current_routing;
+extern
AS
_t current_routing;
extern routing_model_description_t current_routing_model;
extern xbt_dynar_t link_list;
extern routing_model_description_t current_routing_model;
extern xbt_dynar_t link_list;
@@
-17,7
+17,7
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_rulebased, surf, "Routing part of sur
/* Routing model structure */
typedef struct {
/* Routing model structure */
typedef struct {
- s_
routing_component
_t generic_routing;
+ s_
as
_t generic_routing;
xbt_dict_t dict_processing_units;
xbt_dict_t dict_autonomous_systems;
xbt_dynar_t list_route;
xbt_dict_t dict_processing_units;
xbt_dict_t dict_autonomous_systems;
xbt_dynar_t list_route;
@@
-67,7
+67,7
@@
static void rule_route_extended_free(void *e)
/* Parse routing model functions */
/* Parse routing model functions */
-static void model_rulebased_parse_PU(
routing_component
_t rc,
+static void model_rulebased_parse_PU(
AS
_t rc,
const char *name)
{
routing_component_rulebased_t routing =
const char *name)
{
routing_component_rulebased_t routing =
@@
-75,7
+75,7
@@
static void model_rulebased_parse_PU(routing_component_t rc,
xbt_dict_set(routing->dict_processing_units, name, (void *) (-1), NULL);
}
xbt_dict_set(routing->dict_processing_units, name, (void *) (-1), NULL);
}
-static void model_rulebased_parse_AS(
routing_component
_t rc,
+static void model_rulebased_parse_AS(
AS
_t rc,
const char *name)
{
routing_component_rulebased_t routing =
const char *name)
{
routing_component_rulebased_t routing =
@@
-84,7
+84,7
@@
static void model_rulebased_parse_AS(routing_component_t rc,
NULL);
}
NULL);
}
-static void model_rulebased_parse_route(
routing_component
_t rc,
+static void model_rulebased_parse_route(
AS
_t rc,
const char *src, const char *dst,
route_extended_t route)
{
const char *src, const char *dst,
route_extended_t route)
{
@@
-112,7
+112,7
@@
static void model_rulebased_parse_route(routing_component_t rc,
xbt_free(route);
}
xbt_free(route);
}
-static void model_rulebased_parse_ASroute(
routing_component
_t rc,
+static void model_rulebased_parse_ASroute(
AS
_t rc,
const char *src, const char *dst,
route_extended_t route)
{
const char *src, const char *dst,
route_extended_t route)
{
@@
-147,7
+147,7
@@
static void model_rulebased_parse_ASroute(routing_component_t rc,
xbt_free(route);
}
xbt_free(route);
}
-static void model_rulebased_parse_bypassroute(
routing_component
_t rc,
+static void model_rulebased_parse_bypassroute(
AS
_t rc,
const char *src,
const char *dst,
route_extended_t e_route)
const char *src,
const char *dst,
route_extended_t e_route)
@@
-213,10
+213,10
@@
static char *remplace(char *value, const char **src_list, int src_size,
return memcpy(res, result, i_res);
}
return memcpy(res, result, i_res);
}
-static route_extended_t rulebased_get_route(
routing_component
_t rc,
+static route_extended_t rulebased_get_route(
AS
_t rc,
const char *src,
const char *dst);
const char *src,
const char *dst);
-static xbt_dynar_t rulebased_get_onelink_routes(
routing_component
_t rc)
+static xbt_dynar_t rulebased_get_onelink_routes(
AS
_t rc)
{
xbt_dynar_t ret = xbt_dynar_new (sizeof(onelink_t), xbt_free);
{
xbt_dynar_t ret = xbt_dynar_new (sizeof(onelink_t), xbt_free);
@@
-267,7
+267,7
@@
static xbt_dynar_t rulebased_get_onelink_routes(routing_component_t rc)
}
/* Business methods */
}
/* Business methods */
-static route_extended_t rulebased_get_route(
routing_component
_t rc,
+static route_extended_t rulebased_get_route(
AS
_t rc,
const char *src,
const char *dst)
{
const char *src,
const char *dst)
{
@@
-372,14
+372,14
@@
static route_extended_t rulebased_get_route(routing_component_t rc,
return new_e_route;
}
return new_e_route;
}
-static route_extended_t rulebased_get_bypass_route(
routing_component
_t rc,
+static route_extended_t rulebased_get_bypass_route(
AS
_t rc,
const char *src,
const char *dst)
{
return NULL;
}
const char *src,
const char *dst)
{
return NULL;
}
-static void rulebased_finalize(
routing_component
_t rc)
+static void rulebased_finalize(
AS
_t rc)
{
routing_component_rulebased_t routing =
(routing_component_rulebased_t) rc;
{
routing_component_rulebased_t routing =
(routing_component_rulebased_t) rc;
@@
-394,7
+394,7
@@
static void rulebased_finalize(routing_component_t rc)
}
/* Creation routing model functions */
}
/* Creation routing model functions */
-
routing_component
_t model_rulebased_create(void) {
+
AS
_t model_rulebased_create(void) {
routing_component_rulebased_t new_component = (routing_component_rulebased_t)
routmod_generic_create(sizeof(s_routing_component_rulebased_t));
routing_component_rulebased_t new_component = (routing_component_rulebased_t)
routmod_generic_create(sizeof(s_routing_component_rulebased_t));
@@
-416,5
+416,5
@@
routing_component_t model_rulebased_create(void) {
xbt_dynar_new(sizeof(rule_route_extended_t),
&rule_route_extended_free);
xbt_dynar_new(sizeof(rule_route_extended_t),
&rule_route_extended_free);
- return (
routing_component
_t) new_component;
+ return (
AS
_t) new_component;
}
}