static void routing_full_parse_Scluster(void);/*cluster bypass*/
+static void parse_Sconfig(void);/*config Tag*/
+
/* this lines are only for replace use like index in the model table */
typedef enum {
SURF_MODEL_FULL=0,
/* *************** GENERIC BUSINESS METHODS (declarations) ****************** */
static xbt_dynar_t generic_get_onelink_routes (routing_component_t rc);
-static int generic_is_router (const char *name);
static route_extended_t generic_get_bypassroute(routing_component_t rc, const char* src, const char* dst);
/* ************************************************************************** */
* \brief Add a "host" to the network element list
*/
static void parse_S_host(char* host_id) {
- if( current_routing->hierarchy == SURF_ROUTING_NULL ) current_routing->hierarchy = SURF_ROUTING_BASE;
+ network_element_info_t info = NULL;
+ if( current_routing->hierarchy == SURF_ROUTING_NULL ) current_routing->hierarchy = SURF_ROUTING_BASE;
xbt_assert1(!xbt_dict_get_or_null(global_routing->where_network_elements,host_id),
"Reading a host, processing unit \"%s\" already exist",host_id);
xbt_assert1(current_routing->set_processing_unit,
"no defined method \"set_processing_unit\" in \"%s\"",current_routing->name);
(*(current_routing->set_processing_unit))(current_routing,host_id);
- xbt_dict_set(global_routing->where_network_elements,host_id,(void*)current_routing,NULL);
+ info = xbt_new0(s_network_element_info_t,1);
+ info->rc_component=current_routing;
+ info->rc_type=SURF_NETWORK_ELEMENT_HOST;
+ xbt_dict_set(global_routing->where_network_elements,host_id,(void*)info,NULL);
}
/*
* \brief Add a "router" to the network element list
*/
static void parse_S_router(void) {
+ network_element_info_t info = NULL;
+
if( current_routing->hierarchy == SURF_ROUTING_NULL ) current_routing->hierarchy = SURF_ROUTING_BASE;
xbt_assert1(!xbt_dict_get_or_null(global_routing->where_network_elements,A_surfxml_router_id),
"Reading a router, processing unit \"%s\" already exist",A_surfxml_router_id);
xbt_assert1(current_routing->set_processing_unit,
"no defined method \"set_processing_unit\" in \"%s\"",current_routing->name);
(*(current_routing->set_processing_unit))(current_routing,A_surfxml_router_id);
- xbt_dict_set(global_routing->where_network_elements,A_surfxml_router_id,(void*)current_routing,NULL);
+ info = xbt_new0(s_network_element_info_t,1);
+ info->rc_component=current_routing;
+ info->rc_type=SURF_NETWORK_ELEMENT_ROUTER;
+ xbt_dict_set(global_routing->where_network_elements,A_surfxml_router_id,(void*)info,NULL);
#ifdef HAVE_TRACING
TRACE_surf_host_declaration (A_surfxml_router_id, 0);
#endif
new_routing->routing_father = NULL;
global_routing->root = new_routing;
- } else if( current_routing != NULL && global_routing->root != NULL ) {
+ } else if( current_routing != NULL && global_routing->root != NULL ) {
xbt_assert1(!xbt_dict_get_or_null(current_routing->routing_sons,AS_id),
"The AS \"%s\" already exist",AS_id);
if( current_routing == NULL ) {
THROW1(arg_error,0,"Close AS(%s), that never open",AS_id);
} else {
+ network_element_info_t info = NULL;
xbt_assert1(!xbt_dict_get_or_null(global_routing->where_network_elements,current_routing->name),
"The AS \"%s\" already exist",current_routing->name);
- xbt_dict_set(global_routing->where_network_elements,current_routing->name,current_routing->routing_father,NULL);
+ info = xbt_new0(s_network_element_info_t,1);
+ info->rc_component=current_routing->routing_father;
+ info->rc_type=SURF_NETWORK_ELEMENT_AS;
+ xbt_dict_set(global_routing->where_network_elements,current_routing->name,info,NULL);
(*(current_routing->routing->unload))();
(*(current_routing->routing->end))();
current_routing = current_routing->routing_father;
routing_component_t* father = NULL;
/* (1) find the as where the src and dst are located */
- src_as = xbt_dict_get_or_null(global_routing->where_network_elements,src);
- dst_as = xbt_dict_get_or_null(global_routing->where_network_elements,dst);
+ src_as = ((network_element_info_t)xbt_dict_get_or_null(global_routing->where_network_elements,src))->rc_component;
+ dst_as = ((network_element_info_t)xbt_dict_get_or_null(global_routing->where_network_elements,dst))->rc_component;
xbt_assert2(src_as&&dst_as, "Ask for route \"from\"(%s) or \"to\"(%s) no found",src,dst);
/* (2) find the path to the root routing component */
xbt_dict_cursor_t cursor=NULL;
routing_component_t rc_child;
xbt_dict_foreach(rc->routing_sons, cursor, key, rc_child) {
- xbt_dynar_t onelink_child = recursive_get_onelink_routes (rc_child);//->get_onelink_routes (rc_child);
+ xbt_dynar_t onelink_child = recursive_get_onelink_routes (rc_child);
if (onelink_child){
xbt_dynar_foreach(onelink_child, cpt, link) {
xbt_dynar_push(ret,&link);
return recursive_get_onelink_routes (global_routing->root);
}
-static int is_router(const char *name)
+static e_surf_network_element_type_t get_network_element_type(const char *name)
{
- xbt_die("global \"is_router\" function not implemented yet");
+ network_element_info_t rc=NULL;
+ rc = xbt_dict_get(global_routing->where_network_elements,name);
+ return rc->rc_type;
}
/**
global_routing->root = NULL;
global_routing->get_route = get_route;
global_routing->get_onelink_routes = get_onelink_routes;
- global_routing->is_router = is_router;
+ global_routing->get_network_element_type = get_network_element_type;
global_routing->finalize = finalize;
global_routing->loopback = loopback;
global_routing->size_of_link = size_of_links;
surfxml_add_callback(STag_surfxml_cluster_cb_list, &routing_full_parse_Scluster);
+ surfxml_add_callback(STag_surfxml_config_cb_list, &parse_Sconfig);
}
/* ************************************************************************** */
return ret;
}
-static int full_is_router(const char *name)
-{
- xbt_die("\"full_is_router\" function not implemented yet");
-}
-
static route_extended_t full_get_route(routing_component_t rc, const char* src,const char* dst) {
xbt_assert1(rc&&src&&dst, "Invalid params for \"get_route\" function at AS \"%s\"",rc->name);
new_component->generic_routing.set_bypassroute = generic_set_bypassroute;
new_component->generic_routing.get_route = full_get_route;
new_component->generic_routing.get_onelink_routes = full_get_onelink_routes;
- new_component->generic_routing.is_router = full_is_router;
new_component->generic_routing.get_bypass_route = generic_get_bypassroute;
new_component->generic_routing.finalize = full_finalize;
new_component->to_index = xbt_dict_new();
return ret;
}
-static int floyd_is_router(const char *name)
-{
- xbt_die("\"floyd_is_router\" function not implemented yet");
-}
-
static route_extended_t floyd_get_route(routing_component_t rc, const char* src,const char* dst) {
xbt_assert1(rc&&src&&dst, "Invalid params for \"get_route\" function at AS \"%s\"",rc->name);
new_component->generic_routing.set_bypassroute = generic_set_bypassroute;
new_component->generic_routing.get_route = floyd_get_route;
new_component->generic_routing.get_onelink_routes = floyd_get_onelink_routes;
- new_component->generic_routing.is_router = floyd_is_router;
new_component->generic_routing.get_bypass_route = generic_get_bypassroute;
new_component->generic_routing.finalize = floyd_finalize;
new_component->to_index = xbt_dict_new();
xbt_die("\"dijkstra_get_onelink_routes\" function not implemented yet");
}
-static int dijkstra_is_router(const char *name)
-{
- xbt_die("\"dijkstra_is_router\" function not implemented yet");
-}
-
static route_extended_t dijkstra_get_route(routing_component_t rc, const char* src,const char* dst) {
xbt_assert1(rc&&src&&dst, "Invalid params for \"get_route\" function at AS \"%s\"",rc->name);
new_component->generic_routing.set_bypassroute = generic_set_bypassroute;
new_component->generic_routing.get_route = dijkstra_get_route;
new_component->generic_routing.get_onelink_routes = dijkstra_get_onelink_routes;
- new_component->generic_routing.is_router = dijkstra_is_router;
new_component->generic_routing.get_bypass_route = generic_get_bypassroute;
new_component->generic_routing.finalize = dijkstra_finalize;
new_component->cached = cached;
xbt_die("\"rulebased_get_onelink_routes\" function not implemented yet");
}
-static int rulebased_is_router(const char *name)
-{
- xbt_die("\"rulebased_is_router\" function not implemented yet");
-}
-
/* Business methods */
static route_extended_t rulebased_get_route(routing_component_t rc, const char* src,const char* dst) {
xbt_assert1(rc&&src&&dst, "Invalid params for \"get_route\" function at AS \"%s\"",rc->name);
new_component->generic_routing.set_ASroute = model_rulebased_set_ASroute;
new_component->generic_routing.set_bypassroute = model_rulebased_set_bypassroute;
new_component->generic_routing.get_onelink_routes = rulebased_get_onelink_routes;
- new_component->generic_routing.is_router = rulebased_is_router;
new_component->generic_routing.get_route = rulebased_get_route;
new_component->generic_routing.get_bypass_route = NULL; //rulebased_get_bypass_route;
new_component->generic_routing.finalize = rulebased_finalize;
static xbt_dynar_t none_get_onelink_routes(routing_component_t rc){
return NULL;
}
-static int none_is_router(const char *name){
- return -1;
-}
static route_extended_t none_get_route(routing_component_t rc, const char* src,const char* dst){
return NULL;
}
new_component->generic_routing.set_bypassroute = NULL;
new_component->generic_routing.get_route = none_get_route;
new_component->generic_routing.get_onelink_routes = none_get_onelink_routes;
- new_component->generic_routing.is_router = none_is_router;
new_component->generic_routing.get_bypass_route = none_get_bypass_route;
new_component->generic_routing.finalize = none_finalize;
return new_component;
xbt_die("\"generic_get_onelink_routes\" not implemented yet");
}
-static int generic_is_router (const char *name)
-{
- xbt_die("\"generic_is_router\" not implemented yet");
-}
-
static route_extended_t generic_get_bypassroute(routing_component_t rc, const char* src, const char* dst) {
model_type_t modeltype = rc->routing;
xbt_dict_t dict_bypassRoutes;
routing_component_t* current_dst = NULL;
/* (1) find the as where the src and dst are located */
- src_as = xbt_dict_get_or_null(global_routing->where_network_elements,src);
- dst_as = xbt_dict_get_or_null(global_routing->where_network_elements,dst);
+ src_as = ((network_element_info_t)xbt_dict_get_or_null(global_routing->where_network_elements,src))->rc_component;
+ dst_as = ((network_element_info_t)xbt_dict_get_or_null(global_routing->where_network_elements,dst))->rc_component;
xbt_assert2(src_as&&dst_as, "Ask for route \"from\"(%s) or \"to\"(%s) no found",src,dst);
/* (2) find the path to the root routing component */
routing_component_t element_as, result, elem;
xbt_dict_cursor_t cursor = NULL;
char *key;
- element_as = xbt_dict_get_or_null(global_routing->where_network_elements,element);
+ element_as = ((network_element_info_t)xbt_dict_get_or_null(global_routing->where_network_elements,element))->rc_component;
result = ((routing_component_t)-1);
if(element_as!=rc)
result = generic_as_exist(rc,element_as);
static routing_component_t generic_processing_units_exist(routing_component_t rc, char* element) {
routing_component_t element_as;
- element_as = xbt_dict_get_or_null(global_routing->where_network_elements,element);
+ element_as = ((network_element_info_t)xbt_dict_get_or_null(global_routing->where_network_elements,element))->rc_component;
if(element_as==rc) return element_as;
return generic_as_exist(rc,element_as);
}
static void generic_src_dst_check(routing_component_t rc, const char* src, const char* dst) {
- routing_component_t src_as = xbt_dict_get_or_null(global_routing->where_network_elements,src);
- routing_component_t dst_as = xbt_dict_get_or_null(global_routing->where_network_elements,dst);
+ routing_component_t src_as = ((network_element_info_t)xbt_dict_get_or_null(global_routing->where_network_elements,src))->rc_component;
+ routing_component_t dst_as = ((network_element_info_t)xbt_dict_get_or_null(global_routing->where_network_elements,dst))->rc_component;
xbt_assert3(src_as != NULL && dst_as != NULL,
"Ask for route \"from\"(%s) or \"to\"(%s) no found at AS \"%s\"",src,dst,rc->name);
"The routing component of src and dst is not the same as the network elements belong (%s==%s)",rc->name,dst_as->name);
}
+static void parse_Sconfig(void)
+{
+ //TODO
+ DEBUG0("WARNING tag config not yet implemented.");
+}
+
static void routing_full_parse_Scluster(void)
{
static int AX_ptr = 0;
SURFXML_BUFFER_SET(host_availability_file, "");
A_surfxml_host_state = A_surfxml_host_state_ON;
SURFXML_BUFFER_SET(host_state_file, "");
- SURFXML_BUFFER_SET(host_interference_send, "1.0");
- SURFXML_BUFFER_SET(host_interference_recv, "1.0");
- SURFXML_BUFFER_SET(host_interference_send_recv, "1.0");
- SURFXML_BUFFER_SET(host_max_outgoing_rate, "-1.0");
SURFXML_START_TAG(host);
SURFXML_END_TAG(host);
SURFXML_BUFFER_SET(host_availability_file, "");
A_surfxml_host_state = A_surfxml_host_state_ON;
SURFXML_BUFFER_SET(host_state_file, "");
- SURFXML_BUFFER_SET(host_interference_send, "1.0");
- SURFXML_BUFFER_SET(host_interference_recv, "1.0");
- SURFXML_BUFFER_SET(host_interference_send_recv, "1.0");
- SURFXML_BUFFER_SET(host_max_outgoing_rate, "-1.0");
SURFXML_START_TAG(host);
SURFXML_END_TAG(host);