From: mquinson Date: Wed, 14 Oct 2009 19:13:53 +0000 (+0000) Subject: Start to fix the tag (see ChangeLog) X-Git-Tag: SVN~941 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/168c9a11b4654465024e2a43f620244f978f6a24?ds=sidebyside Start to fix the tag (see ChangeLog) git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@6773 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/ChangeLog b/ChangeLog index 391b915d35..754a758c03 100644 --- a/ChangeLog +++ b/ChangeLog @@ -89,6 +89,13 @@ SimGrid (3.3.4) unstable; urgency=low * Fix a major regression from 3.2 where the timeout provided to MSG_task_put_with_timeout() was used as absolute time before which the comm should be done. + * Start to fix the tag. + - Internal links should be good now (beside of the loopback, which + use the private link instead) + - paths to the external world is still rather broken + - the tag is just broken. Actually that's brain-dead. + We need sth like + to make it less stupid * Fix a source-level compatibility glitch from 3.2: after defining MSG_USE_DEPRECATED, you can use the old name MSG_task_put_with_time_out() for MSG_task_put_with_timeout() diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index 1287105f2c..84a21f6fa8 100644 --- a/src/surf/surf_routing.c +++ b/src/surf/surf_routing.c @@ -167,7 +167,7 @@ static void routing_full_parse_Scluster(void) surfxml_bufferstack_push(1); - /* Make set */ + /* Make set a set to parse the prefix/suffix/radical into a neat list of names */ DEBUG4("Make ", cluster_id,cluster_prefix,cluster_suffix,cluster_radical); SURFXML_BUFFER_SET(set_id, cluster_id); @@ -178,29 +178,26 @@ static void routing_full_parse_Scluster(void) SURFXML_START_TAG(set); SURFXML_END_TAG(set); - /* Make foreach */ - DEBUG1("Make ",cluster_id); - SURFXML_BUFFER_SET(foreach_set_id, cluster_id); - - SURFXML_START_TAG(foreach); - - /* Make host for the foreach */ - routing_full_parse_change_cpu_data("$1", cluster_power, "1.0", "", ""); - A_surfxml_host_state = A_surfxml_host_state_ON; + xbt_dynar_t names = xbt_dict_get(set_list,cluster_id); - SURFXML_START_TAG(host); - SURFXML_END_TAG(host); + unsigned int it1,it2; + char *name1,*name2; + xbt_dynar_foreach(names,it1,name1) { + /* create the host */ + routing_full_parse_change_cpu_data(name1, cluster_power, "1.0", "", ""); + A_surfxml_host_state = A_surfxml_host_state_ON; - /* Make link for the foreach */ - routing_full_parse_change_link_data("$1", cluster_bw, "", cluster_lat, "", ""); - A_surfxml_link_state = A_surfxml_link_state_ON; - A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED; + SURFXML_START_TAG(host); + SURFXML_END_TAG(host); - SURFXML_START_TAG(link); - SURFXML_END_TAG(link); + /* Here comes the link */ + routing_full_parse_change_link_data(name1, cluster_bw, "", cluster_lat, "", ""); + A_surfxml_link_state = A_surfxml_link_state_ON; + A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED; - DEBUG0("Make "); - SURFXML_END_TAG(foreach); + SURFXML_START_TAG(link); + SURFXML_END_TAG(link); + } /* Make backbone link */ backbone_name = bprintf("%s_bb", cluster_id); @@ -212,11 +209,53 @@ static void routing_full_parse_Scluster(void) SURFXML_START_TAG(link); SURFXML_END_TAG(link); + /* And now the internal routes */ + xbt_dynar_foreach(names,it1,name1) { + xbt_dynar_foreach(names,it2,name2) { + if (strcmp(name1,name2)) { + A_surfxml_route_action = A_surfxml_route_action_POSTPEND; + SURFXML_BUFFER_SET(route_src,name1); + SURFXML_BUFFER_SET(route_dst,name2); + SURFXML_START_TAG(route); { + /* FIXME: name1 link is added by error about 20 lines below, so don't add it here + SURFXML_BUFFER_SET(link_c_ctn_id, name1); + SURFXML_START_TAG(link_c_ctn); + SURFXML_END_TAG(link_c_ctn); + */ + SURFXML_BUFFER_SET(link_c_ctn_id, backbone_name); + SURFXML_START_TAG(link_c_ctn); + SURFXML_END_TAG(link_c_ctn); + + SURFXML_BUFFER_SET(link_c_ctn_id, name2); + SURFXML_START_TAG(link_c_ctn); + SURFXML_END_TAG(link_c_ctn); + + } SURFXML_END_TAG(route); + } + } + } + /* Make route multi with the outside world, i.e. cluster->$* */ + + /* FIXME + * This also adds an elements to the routes within the cluster, + * and I guess it's wrong, but since this element is commented out in the above + * code creating the internal routes, we're good. + * To fix it, I'd say that we need a way to understand "$*-${cluster_id}" as "whole world, but the guys in that cluster" + * But for that, we need to install a real expression parser for src/dst attributes + * + * FIXME + * This also adds a dumb element (the private link) in place of the loopback. Then, since + * the loopback is added only if no link to self already exist, this fails. + * That's really dumb. + * + * FIXME + * It seems to me that it does not add the backbone to the path to outside world... + */ SURFXML_BUFFER_SET(route_c_multi_src, cluster_id); SURFXML_BUFFER_SET(route_c_multi_dst, "$*"); A_surfxml_route_c_multi_symmetric = A_surfxml_route_c_multi_symmetric_NO; - A_surfxml_route_c_multi_action = A_surfxml_route_c_multi_action_OVERRIDE; + A_surfxml_route_c_multi_action = A_surfxml_route_c_multi_action_PREPEND; SURFXML_START_TAG(route_c_multi); @@ -227,21 +266,6 @@ static void routing_full_parse_Scluster(void) SURFXML_END_TAG(route_c_multi); - /* Make route multi between cluster hosts, i.e. cluster->cluster */ - SURFXML_BUFFER_SET(route_c_multi_src, cluster_id); - SURFXML_BUFFER_SET(route_c_multi_dst, cluster_id); - A_surfxml_route_c_multi_action = A_surfxml_route_c_multi_action_POSTPEND; - A_surfxml_route_c_multi_symmetric = A_surfxml_route_c_multi_symmetric_NO; - - SURFXML_START_TAG(route_c_multi); - - SURFXML_BUFFER_SET(link_c_ctn_id, backbone_name); - - SURFXML_START_TAG(link_c_ctn); - SURFXML_END_TAG(link_c_ctn); - - SURFXML_END_TAG(route_c_multi); - free(backbone_name); /* Restore buff */ diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c index c4ba3d4288..cbb596611a 100644 --- a/src/surf/surfxml_parse.c +++ b/src/surf/surfxml_parse.c @@ -832,6 +832,7 @@ static void parse_route_elem(void) val = xbt_strdup(A_surfxml_link_c_ctn_id); xbt_dynar_push(route_link_list, &val); + //INFO2("Push %s (size now:%ld)",val,xbt_dynar_length(route_link_list)); } static void parse_Stag_route_multi(void) @@ -858,7 +859,11 @@ void manage_route(xbt_dict_t routing_table, const char *route_name, /* get already existing list if it exists */ links = xbt_dict_get_or_null(routing_table, route_name); - DEBUG1("ROUTE: %s", route_name); + DEBUG3("ROUTE: %s (action:%s; len:%ld)", route_name, + (action==A_surfxml_route_action_OVERRIDE?"override":( + action==A_surfxml_route_action_PREPEND?"prepend":"postpend")), + (links?xbt_dynar_length(links):0)); + if (links != NULL) { switch (action) { case A_surfxml_route_action_PREPEND: /* add existing links at the end; route_link_list + links */ @@ -878,6 +883,8 @@ void manage_route(xbt_dict_t routing_table, const char *route_name, xbt_dynar_free(&links); break; default: + xbt_die(bprintf("While dealing with routes of %s, got action=%d. Please report this bug.", + route_name,action)); break; } }