From: mquinson Date: Mon, 13 Jul 2009 15:26:07 +0000 (+0000) Subject: Link properties were killed a while ago, don't test them anymore X-Git-Tag: SVN~1176 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/fdbf52eb242aa7613c48b455bb7fad036258c723?ds=sidebyside Link properties were killed a while ago, don't test them anymore git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@6472 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/examples/simdag/properties/sd_prop.c b/examples/simdag/properties/sd_prop.c index 119500052d..9b7d4244d2 100755 --- a/examples/simdag/properties/sd_prop.c +++ b/examples/simdag/properties/sd_prop.c @@ -12,7 +12,6 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(test, "Property test"); int main(int argc, char **argv) { - int i; const SD_workstation_t *workstations; SD_workstation_t w1; SD_workstation_t w2; @@ -25,9 +24,6 @@ int main(int argc, char **argv) const char *value; char exist[] = "SG_TEST_Hdd"; - const SD_link_t *route; - int route_size; - /* initialisation of SD */ SD_init(&argc, argv); if (argc < 2) { @@ -98,34 +94,6 @@ int main(int argc, char **argv) else INFO2("\tProperty: %s new value: %s", exist, value); - /* NOTE: The link properties can be retrieved only from the SimDag interface */ - route = SD_route_get_list(w1, w2); - route_size = SD_route_get_size(w1, w2); - for (i = 0; i < route_size; i++) { - xbt_dict_cursor_t cursor = NULL; - char *key, *data; - char noexist1[] = "Other"; - props = SD_link_get_properties(route[i]); - - - /* Print the properties of the current link */ - xbt_dict_foreach(props, cursor, key, data) { - INFO3("\tLink %s property: %s has value: %s", - SD_link_get_name(route[i]), key, data); - - /* Try to get a property that does not exist */ - - value = SD_link_get_property_value(route[i], noexist1); - if (value == NULL) - INFO2("\tProperty: %s for link %s is undefined", noexist, - SD_link_get_name(route[i])); - else - INFO3("\tLink %s property: %s has value: %s", - SD_link_get_name(route[i]), noexist, value); - } - - } - SD_exit(); return 0; } diff --git a/examples/simdag/properties/test_prop.tesh b/examples/simdag/properties/test_prop.tesh index 49c6225440..4b795a6e41 100755 --- a/examples/simdag/properties/test_prop.tesh +++ b/examples/simdag/properties/test_prop.tesh @@ -13,10 +13,6 @@ $ $SG_TEST_EXENV properties/sd_prop ${srcdir:=.}/../platforms/prop.xml > [0.000000] [test/INFO] Modify an existing property > [0.000000] [test/INFO] Property: SG_TEST_Hdd old value: 120 > [0.000000] [test/INFO] Property: SG_TEST_Hdd new value: 250 -> [0.000000] [test/INFO] Link l1 property: type has value: Ethernet -> [0.000000] [test/INFO] Property: NoProp for link l1 is undefined -> [0.000000] [test/INFO] Link l2 property: type has value: ethernet -> [0.000000] [test/INFO] Property: NoProp for link l2 is undefined