sg_platf_cluster_cb_list = xbt_dynar_new(sizeof(sg_platf_cluster_cb_t), NULL);
sg_platf_cabinet_cb_list = xbt_dynar_new(sizeof(sg_platf_cabinet_cb_t), NULL);
sg_platf_postparse_cb_list = xbt_dynar_new(sizeof(sg_platf_link_cb_t),NULL);
- sg_platf_AS_begin_cb_list = xbt_dynar_new(sizeof(sg_platf_AS_begin_cb_t),NULL);
- sg_platf_AS_end_cb_list = xbt_dynar_new(sizeof(void_f_void_t),NULL);
+ sg_platf_AS_begin_cb_list = xbt_dynar_new(sizeof(sg_platf_AS_cb_t),NULL);
+ sg_platf_AS_end_cb_list = xbt_dynar_new(sizeof(sg_platf_AS_cb_t),NULL);
sg_platf_prop_cb_list = xbt_dynar_new(sizeof(sg_platf_prop_cb_t),NULL);
sg_platf_route_cb_list = xbt_dynar_new(sizeof(sg_platf_route_cb_t), NULL);
- sg_platf_ASroute_cb_list = xbt_dynar_new(sizeof(sg_platf_ASroute_cb_t), NULL);
- sg_platf_bypassRoute_cb_list = xbt_dynar_new(sizeof(sg_platf_bypassRoute_cb_t), NULL);
- sg_platf_bypassASroute_cb_list = xbt_dynar_new(sizeof(sg_platf_bypassASroute_cb_t), NULL);
+ sg_platf_ASroute_cb_list = xbt_dynar_new(sizeof(sg_platf_route_cb_t), NULL);
+ sg_platf_bypassRoute_cb_list = xbt_dynar_new(sizeof(sg_platf_route_cb_t), NULL);
+ sg_platf_bypassASroute_cb_list = xbt_dynar_new(sizeof(sg_platf_route_cb_t), NULL);
sg_platf_trace_cb_list = xbt_dynar_new(sizeof(sg_platf_trace_cb_t), NULL);
sg_platf_trace_connect_cb_list = xbt_dynar_new(sizeof(sg_platf_trace_connect_cb_t), NULL);
xbt_dynar_foreach(sg_platf_route_cb_list, iterator, fun) {
fun(route);
}
-}void sg_platf_new_ASroute(sg_platf_ASroute_cbarg_t ASroute) {
+}void sg_platf_new_ASroute(sg_platf_route_cbarg_t ASroute) {
unsigned int iterator;
- sg_platf_ASroute_cb_t fun;
+ sg_platf_route_cb_t fun;
xbt_dynar_foreach(sg_platf_ASroute_cb_list, iterator, fun) {
fun(ASroute);
}
}
-void sg_platf_new_bypassRoute(sg_platf_bypassRoute_cbarg_t bypassRoute) {
+void sg_platf_new_bypassRoute(sg_platf_route_cbarg_t bypassRoute) {
unsigned int iterator;
- sg_platf_bypassRoute_cb_t fun;
+ sg_platf_route_cb_t fun;
xbt_dynar_foreach(sg_platf_bypassRoute_cb_list, iterator, fun) {
fun(bypassRoute);
}
-}void sg_platf_new_bypassASroute(sg_platf_bypassASroute_cbarg_t bypassASroute) {
+}void sg_platf_new_bypassASroute(sg_platf_route_cbarg_t bypassASroute) {
unsigned int iterator;
- sg_platf_bypassASroute_cb_t fun;
+ sg_platf_route_cb_t fun;
xbt_dynar_foreach(sg_platf_bypassASroute_cb_list, iterator, fun) {
fun(bypassASroute);
}
void sg_platf_route_begin (sg_platf_route_cbarg_t route){
route->link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
}
-void sg_platf_ASroute_begin (sg_platf_ASroute_cbarg_t ASroute){
+void sg_platf_ASroute_begin (sg_platf_route_cbarg_t ASroute){
ASroute->link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
}
void sg_platf_route_end (sg_platf_route_cbarg_t route){
sg_platf_new_route(route);
}
-void sg_platf_ASroute_end (sg_platf_ASroute_cbarg_t ASroute){
+void sg_platf_ASroute_end (sg_platf_route_cbarg_t ASroute){
sg_platf_new_ASroute(ASroute);
}
char *link_name = xbt_strdup(link_id);
xbt_dynar_push(route->link_list, &link_name);
}
-void sg_platf_ASroute_add_link (const char* link_id, sg_platf_ASroute_cbarg_t ASroute){
+void sg_platf_ASroute_add_link (const char* link_id, sg_platf_route_cbarg_t ASroute){
char *link_name = xbt_strdup(link_id);
xbt_dynar_push(ASroute->link_list, &link_name);
}
static int surf_parse_models_setup_already_called = 0;
-void sg_platf_new_AS_begin(const char *id, int routing) {
+void sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) {
unsigned int iterator;
- sg_platf_AS_begin_cb_t fun;
+ sg_platf_AS_cb_t fun;
if (!surf_parse_models_setup_already_called && !xbt_dynar_is_empty(sg_platf_AS_begin_cb_list)) {
/* Initialize the surf models. That must be done after we got all config, and before we need the models.
}
xbt_dynar_foreach(sg_platf_AS_begin_cb_list, iterator, fun) {
- fun(id, routing);
+ fun(AS);
}
}
void sg_platf_postparse_add_cb(void_f_void_t fct) {
xbt_dynar_push(sg_platf_postparse_cb_list, &fct);
}
-void sg_platf_AS_begin_add_cb(sg_platf_AS_begin_cb_t fct) {
+void sg_platf_AS_begin_add_cb(sg_platf_AS_cb_t fct) {
xbt_dynar_push(sg_platf_AS_begin_cb_list, &fct);
}
-void sg_platf_AS_end_add_cb(void_f_void_t fct) {
+void sg_platf_AS_end_add_cb(sg_platf_AS_cb_t fct) {
xbt_dynar_push(sg_platf_AS_end_cb_list, &fct);
}
void sg_platf_storage_add_cb(sg_platf_storage_cb_t fct) {
void sg_platf_route_add_cb(sg_platf_route_cb_t fct) {
xbt_dynar_push(sg_platf_route_cb_list, &fct);
}
-void sg_platf_ASroute_add_cb(sg_platf_ASroute_cb_t fct) {
+void sg_platf_ASroute_add_cb(sg_platf_route_cb_t fct) {
xbt_dynar_push(sg_platf_ASroute_cb_list, &fct);
}
-void sg_platf_bypassRoute_add_cb(sg_platf_bypassRoute_cb_t fct) {
+void sg_platf_bypassRoute_add_cb(sg_platf_route_cb_t fct) {
xbt_dynar_push(sg_platf_bypassRoute_cb_list, &fct);
}
-void sg_platf_bypassASroute_add_cb(sg_platf_bypassASroute_cb_t fct) {
+void sg_platf_bypassASroute_add_cb(sg_platf_route_cb_t fct) {
xbt_dynar_push(sg_platf_bypassASroute_cb_list, &fct);
}
void sg_platf_prop_add_cb(sg_platf_prop_cb_t fct) {