X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Ftest-classifier.c;h=6fad2d27e52a6f01cd7562461d5d11272bc6ab08;hb=627fb667b2604e28fb0b658760e6bd46912ebc08;hp=7555feba94c4630f866b75a0c21f7b9d02d3998a;hpb=13751fd88c4b7464f9453c03659201c10b3b87a0;p=sliver-openvswitch.git diff --git a/tests/test-classifier.c b/tests/test-classifier.c index 7555feba9..6fad2d27e 100644 --- a/tests/test-classifier.c +++ b/tests/test-classifier.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, 2011, 2012, 2013 Nicira, Inc. + * Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,7 +26,6 @@ */ #include -#include "classifier.h" #include #include #include "byte-order.h" @@ -36,10 +35,15 @@ #include "packets.h" #include "random.h" #include "unaligned.h" - +#include "ovstest.h" #undef NDEBUG #include +/* We need access to classifier internal definitions to be able to fully + * test them. The alternative would be to expose them all in the classifier + * API. */ +#include "classifier.c" + /* Fields in a rule. */ #define CLS_FIELDS \ /* struct flow all-caps */ \ @@ -191,7 +195,7 @@ tcls_remove(struct tcls *cls, const struct test_rule *rule) return; } } - NOT_REACHED(); + OVS_NOT_REACHED(); } static bool @@ -245,7 +249,7 @@ match(const struct cls_rule *wild_, const struct flow *fixed) ^ wild.flow.in_port.ofp_port) & wild.wc.masks.in_port.ofp_port); } else { - NOT_REACHED(); + OVS_NOT_REACHED(); } if (!eq) { @@ -449,13 +453,13 @@ destroy_classifier(struct classifier *cls) struct test_rule *rule, *next_rule; struct cls_cursor cursor; - ovs_rwlock_wrlock(&cls->rwlock); + fat_rwlock_wrlock(&cls->rwlock); cls_cursor_init(&cursor, cls, NULL); CLS_CURSOR_FOR_EACH_SAFE (rule, next_rule, cls_rule, &cursor) { classifier_remove(cls, &rule->cls_rule); free_rule(rule); } - ovs_rwlock_unlock(&cls->rwlock); + fat_rwlock_unlock(&cls->rwlock); classifier_destroy(cls); } @@ -471,8 +475,8 @@ check_tables(const struct classifier *cls, int n_tables, int n_rules, int found_dups = 0; int found_rules2 = 0; - HMAP_FOR_EACH (table, hmap_node, &cls->subtables) { - const struct cls_rule *head; + HMAP_FOR_EACH (table, hmap_node, &cls->cls->subtables) { + const struct cls_match *head; unsigned int max_priority = 0; unsigned int max_count = 0; @@ -481,7 +485,7 @@ check_tables(const struct classifier *cls, int n_tables, int n_rules, found_tables++; HMAP_FOR_EACH (head, hmap_node, &table->rules) { unsigned int prev_priority = UINT_MAX; - const struct cls_rule *rule; + const struct cls_match *rule; if (head->priority > max_priority) { max_priority = head->priority; @@ -498,15 +502,16 @@ check_tables(const struct classifier *cls, int n_tables, int n_rules, prev_priority = rule->priority; found_rules++; found_dups++; - assert(classifier_find_rule_exactly(cls, rule) == rule); + assert(classifier_find_rule_exactly(cls, rule->cls_rule) + == rule->cls_rule); } } assert(table->max_priority == max_priority); assert(table->max_count == max_count); } - assert(found_tables == hmap_count(&cls->subtables)); - assert(n_tables == -1 || n_tables == hmap_count(&cls->subtables)); + assert(found_tables == hmap_count(&cls->cls->subtables)); + assert(n_tables == -1 || n_tables == hmap_count(&cls->cls->subtables)); assert(n_rules == -1 || found_rules == n_rules); assert(n_dups == -1 || found_dups == n_dups); @@ -558,7 +563,7 @@ make_rule(int wc_fields, unsigned int priority, int value_pat) } else if (f_idx == CLS_F_IDX_IN_PORT) { match.wc.masks.in_port.ofp_port = u16_to_ofp(UINT16_MAX); } else { - NOT_REACHED(); + OVS_NOT_REACHED(); } } @@ -621,13 +626,13 @@ test_empty(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) struct tcls tcls; classifier_init(&cls, flow_segment_u32s); - ovs_rwlock_wrlock(&cls.rwlock); + fat_rwlock_wrlock(&cls.rwlock); classifier_set_prefix_fields(&cls, trie_fields, ARRAY_SIZE(trie_fields)); tcls_init(&tcls); assert(classifier_is_empty(&cls)); assert(tcls_is_empty(&tcls)); compare_classifiers(&cls, &tcls); - ovs_rwlock_unlock(&cls.rwlock); + fat_rwlock_unlock(&cls.rwlock); classifier_destroy(&cls); tcls_destroy(&tcls); } @@ -654,7 +659,7 @@ test_single_rule(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) hash_bytes(&wc_fields, sizeof wc_fields, 0), 0); classifier_init(&cls, flow_segment_u32s); - ovs_rwlock_wrlock(&cls.rwlock); + fat_rwlock_wrlock(&cls.rwlock); classifier_set_prefix_fields(&cls, trie_fields, ARRAY_SIZE(trie_fields)); tcls_init(&tcls); @@ -671,7 +676,7 @@ test_single_rule(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) compare_classifiers(&cls, &tcls); free_rule(rule); - ovs_rwlock_unlock(&cls.rwlock); + fat_rwlock_unlock(&cls.rwlock); classifier_destroy(&cls); tcls_destroy(&tcls); } @@ -695,7 +700,7 @@ test_rule_replacement(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) rule2->aux += 5; classifier_init(&cls, flow_segment_u32s); - ovs_rwlock_wrlock(&cls.rwlock); + fat_rwlock_wrlock(&cls.rwlock); classifier_set_prefix_fields(&cls, trie_fields, ARRAY_SIZE(trie_fields)); tcls_init(&tcls); @@ -713,7 +718,7 @@ test_rule_replacement(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) check_tables(&cls, 1, 1, 0); compare_classifiers(&cls, &tcls); tcls_destroy(&tcls); - ovs_rwlock_unlock(&cls.rwlock); + fat_rwlock_unlock(&cls.rwlock); destroy_classifier(&cls); } } @@ -809,7 +814,7 @@ test_many_rules_in_one_list (int argc OVS_UNUSED, char *argv[] OVS_UNUSED) } classifier_init(&cls, flow_segment_u32s); - ovs_rwlock_wrlock(&cls.rwlock); + fat_rwlock_wrlock(&cls.rwlock); classifier_set_prefix_fields(&cls, trie_fields, ARRAY_SIZE(trie_fields)); tcls_init(&tcls); @@ -850,13 +855,16 @@ test_many_rules_in_one_list (int argc OVS_UNUSED, char *argv[] OVS_UNUSED) compare_classifiers(&cls, &tcls); } - ovs_rwlock_unlock(&cls.rwlock); - classifier_destroy(&cls); - tcls_destroy(&tcls); - for (i = 0; i < N_RULES; i++) { + if (rules[i]->cls_rule.cls_match) { + classifier_remove(&cls, &rules[i]->cls_rule); + } free_rule(rules[i]); } + + fat_rwlock_unlock(&cls.rwlock); + classifier_destroy(&cls); + tcls_destroy(&tcls); } while (next_permutation(ops, ARRAY_SIZE(ops))); assert(n_permutations == (factorial(N_RULES * 2) >> N_RULES)); } @@ -913,7 +921,7 @@ test_many_rules_in_one_table(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) } while ((1 << count_ones(value_mask)) < N_RULES); classifier_init(&cls, flow_segment_u32s); - ovs_rwlock_wrlock(&cls.rwlock); + fat_rwlock_wrlock(&cls.rwlock); classifier_set_prefix_fields(&cls, trie_fields, ARRAY_SIZE(trie_fields)); tcls_init(&tcls); @@ -942,7 +950,7 @@ test_many_rules_in_one_table(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) compare_classifiers(&cls, &tcls); } - ovs_rwlock_unlock(&cls.rwlock); + fat_rwlock_unlock(&cls.rwlock); classifier_destroy(&cls); tcls_destroy(&tcls); } @@ -977,7 +985,7 @@ test_many_rules_in_n_tables(int n_tables) shuffle(priorities, ARRAY_SIZE(priorities)); classifier_init(&cls, flow_segment_u32s); - ovs_rwlock_wrlock(&cls.rwlock); + fat_rwlock_wrlock(&cls.rwlock); classifier_set_prefix_fields(&cls, trie_fields, ARRAY_SIZE(trie_fields)); tcls_init(&tcls); @@ -1012,7 +1020,7 @@ test_many_rules_in_n_tables(int n_tables) free_rule(target); } - ovs_rwlock_unlock(&cls.rwlock); + fat_rwlock_unlock(&cls.rwlock); destroy_classifier(&cls); tcls_destroy(&tcls); } @@ -1113,7 +1121,7 @@ next_random_flow(struct flow *flow, unsigned int idx) } } } - NOT_REACHED(); + OVS_NOT_REACHED(); } /* 16 randomly chosen flows with N >= 3 nonzero values. */ @@ -1203,7 +1211,8 @@ test_miniflow(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) /* Check that the flow equals its miniflow. */ assert(miniflow_get_vid(&miniflow) == vlan_tci_to_vid(flow.vlan_tci)); for (i = 0; i < FLOW_U32S; i++) { - assert(miniflow_get(&miniflow, i) == flow_u32[i]); + assert(MINIFLOW_GET_TYPE(&miniflow, uint32_t, i * 4) + == flow_u32[i]); } /* Check that the miniflow equals itself. */ @@ -1340,17 +1349,18 @@ static const struct command commands[] = { /* Miniflow and minimask tests. */ {"miniflow", 0, 0, test_miniflow}, - {"minimask_has_extra", 0, 0, test_minimask_has_extra}, - {"minimask_combine", 0, 0, test_minimask_combine}, + {"minimask_has_extra", 0, 0, test_minimask_has_extra}, + {"minimask_combine", 0, 0, test_minimask_combine}, {NULL, 0, 0, NULL}, }; -int -main(int argc, char *argv[]) +static void +test_classifier_main(int argc, char *argv[]) { set_program_name(argv[0]); init_values(); run_command(argc - 1, argv + 1, commands); - return 0; } + +OVSTEST_REGISTER("test-classifier", test_classifier_main);