}
fprintf(stderr,"Routing model %s not found. Existing models:\n",wanted);
for (cpt=0;models[cpt].name;cpt++)
- if (!strcmp(wanted,models[cpt].name))
- fprintf(stderr," %s: %s\n",models[cpt].name,models[cpt].desc);
- exit(1);
+ fprintf(stderr," %s: %s\n",models[cpt].name,models[cpt].desc);
+ xbt_die("Invalid model.");
}
/* ************************************************************************** */
*val = HOST2ROUTER(used_routing->router_count++);
xbt_dict_set(used_routing->host_id,A_surfxml_router_id,val,xbt_free);
#ifdef HAVE_TRACING
- TRACE_surf_host_define_id (A_surfxml_host_id, *val);
- TRACE_surf_host_declaration (A_surfxml_host_id, 0);
+ TRACE_surf_host_define_id (A_surfxml_router_id, *val);
+ TRACE_surf_host_declaration (A_surfxml_router_id, 0);
#endif
}
* FIXME : better to add to the routing model instead !!
*
*/
-void routing_set_route(char *source_id,char *destination_id,xbt_dynar_t links_id,int action)
+void routing_add_route(char *source_id,char *destination_id,xbt_dynar_t links_id,int action)
{
char * link_id;
char * name;
manage_route(route_table, name, route_action, 0);
free(name);
}
+
}
void routing_add_host(char* host_id)
DEBUG2("Seen host %s (#%d)",host_id,used_routing->host_count);
*val = used_routing->host_count++;
xbt_dict_set(used_routing->host_id,host_id,val,xbt_free);
- #ifdef HAVE_TRACING
- TRACE_surf_host_define_id (host_id, *val);
- #endif
+}
+
+void routing_set_routes()
+{
+ routing_full_parse_end();
}