X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Ftest-classifier.c;h=e7cf734a25b84c065bd9a11269eb26f31b96f009;hb=7525e578b697c4c3d274736c98f1efd0be43dc09;hp=70af7ed05475d11164bc08909a26b2ba566781c7;hpb=b5d97350cdb4559fbce80057574e66daa1ac68df;p=openvswitch diff --git a/tests/test-classifier.c b/tests/test-classifier.c index 70af7ed0..e7cf734a 100644 --- a/tests/test-classifier.c +++ b/tests/test-classifier.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010 Nicira Networks. + * Copyright (c) 2009, 2010, 2011, 2012 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,29 +32,31 @@ #include "byte-order.h" #include "command-line.h" #include "flow.h" +#include "ofp-util.h" #include "packets.h" +#include "unaligned.h" #undef NDEBUG #include /* Fields in a rule. */ -#define CLS_FIELDS \ - /* struct flow all-caps */ \ - /* wildcard bit(s) member name name */ \ - /* ----------------- ----------- -------- */ \ - CLS_FIELD(NXFW_TUN_ID, tun_id, TUN_ID) \ - CLS_FIELD(OFPFW_NW_SRC_MASK, nw_src, NW_SRC) \ - CLS_FIELD(OFPFW_NW_DST_MASK, nw_dst, NW_DST) \ - CLS_FIELD(OFPFW_IN_PORT, in_port, IN_PORT) \ - CLS_FIELD(OFPFW_DL_VLAN, dl_vlan, DL_VLAN) \ - CLS_FIELD(OFPFW_DL_TYPE, dl_type, DL_TYPE) \ - CLS_FIELD(OFPFW_TP_SRC, tp_src, TP_SRC) \ - CLS_FIELD(OFPFW_TP_DST, tp_dst, TP_DST) \ - CLS_FIELD(OFPFW_DL_SRC, dl_src, DL_SRC) \ - CLS_FIELD(OFPFW_DL_DST, dl_dst, DL_DST) \ - CLS_FIELD(OFPFW_NW_PROTO, nw_proto, NW_PROTO) \ - CLS_FIELD(OFPFW_DL_VLAN_PCP, dl_vlan_pcp, DL_VLAN_PCP) \ - CLS_FIELD(OFPFW_NW_TOS, nw_tos, NW_TOS) +#define CLS_FIELDS \ + /* struct flow all-caps */ \ + /* FWW_* bit(s) member name name */ \ + /* -------------------------- ----------- -------- */ \ + CLS_FIELD(0, tun_id, TUN_ID) \ + CLS_FIELD(0, metadata, METADATA) \ + CLS_FIELD(0, nw_src, NW_SRC) \ + CLS_FIELD(0, nw_dst, NW_DST) \ + CLS_FIELD(FWW_IN_PORT, in_port, IN_PORT) \ + CLS_FIELD(0, vlan_tci, VLAN_TCI) \ + CLS_FIELD(FWW_DL_TYPE, dl_type, DL_TYPE) \ + CLS_FIELD(0, tp_src, TP_SRC) \ + CLS_FIELD(0, tp_dst, TP_DST) \ + CLS_FIELD(0, dl_src, DL_SRC) \ + CLS_FIELD(0, dl_dst, DL_DST) \ + CLS_FIELD(FWW_NW_PROTO, nw_proto, NW_PROTO) \ + CLS_FIELD(FWW_NW_DSCP, nw_tos, NW_DSCP) /* Field indexes. * @@ -70,7 +72,7 @@ enum { struct cls_field { int ofs; /* Offset in struct flow. */ int len; /* Length in bytes. */ - uint32_t wildcards; /* OFPFW_* bit or bits for this field. */ + flow_wildcards_t wildcards; /* FWW_* bit or bits for this field. */ const char *name; /* Name (for debugging). */ }; @@ -123,19 +125,6 @@ tcls_destroy(struct tcls *tcls) } } -static int -tcls_count_exact(const struct tcls *tcls) -{ - int n_exact; - size_t i; - - n_exact = 0; - for (i = 0; i < tcls->n_rules; i++) { - n_exact += tcls->rules[i]->cls_rule.wc.wildcards == 0; - } - return n_exact; -} - static bool tcls_is_empty(const struct tcls *tcls) { @@ -147,14 +136,12 @@ tcls_insert(struct tcls *tcls, const struct test_rule *rule) { size_t i; - assert(rule->cls_rule.wc.wildcards || rule->cls_rule.priority == UINT_MAX); + assert(!flow_wildcards_is_exact(&rule->cls_rule.wc) + || rule->cls_rule.priority == UINT_MAX); for (i = 0; i < tcls->n_rules; i++) { const struct cls_rule *pos = &tcls->rules[i]->cls_rule; - if (pos->priority == rule->cls_rule.priority - && pos->wc.wildcards == rule->cls_rule.wc.wildcards - && flow_equal(&pos->flow, &rule->cls_rule.flow)) { - /* Exact match. - * XXX flow_equal should ignore wildcarded fields */ + if (cls_rule_equal(pos, &rule->cls_rule)) { + /* Exact match. */ free(tcls->rules[i]); tcls->rules[i] = xmemdup(rule, sizeof *rule); return tcls->rules[i]; @@ -194,14 +181,6 @@ tcls_remove(struct tcls *cls, const struct test_rule *rule) NOT_REACHED(); } -static uint32_t -read_uint32(const void *p) -{ - uint32_t x; - memcpy(&x, p, sizeof x); - return x; -} - static bool match(const struct cls_rule *wild, const struct flow *fixed) { @@ -209,41 +188,56 @@ match(const struct cls_rule *wild, const struct flow *fixed) for (f_idx = 0; f_idx < CLS_N_FIELDS; f_idx++) { const struct cls_field *f = &cls_fields[f_idx]; - void *wild_field = (char *) &wild->flow + f->ofs; - void *fixed_field = (char *) fixed + f->ofs; - - if ((wild->wc.wildcards & f->wildcards) == f->wildcards || - !memcmp(wild_field, fixed_field, f->len)) { - /* Definite match. */ - continue; + bool eq; + + if (f->wildcards) { + void *wild_field = (char *) &wild->flow + f->ofs; + void *fixed_field = (char *) fixed + f->ofs; + eq = ((wild->wc.wildcards & f->wildcards) == f->wildcards + || !memcmp(wild_field, fixed_field, f->len)); + } else if (f_idx == CLS_F_IDX_NW_SRC) { + eq = !((fixed->nw_src ^ wild->flow.nw_src) & wild->wc.nw_src_mask); + } else if (f_idx == CLS_F_IDX_NW_DST) { + eq = !((fixed->nw_dst ^ wild->flow.nw_dst) & wild->wc.nw_dst_mask); + } else if (f_idx == CLS_F_IDX_TP_SRC) { + eq = !((fixed->tp_src ^ wild->flow.tp_src) & wild->wc.tp_src_mask); + } else if (f_idx == CLS_F_IDX_TP_DST) { + eq = !((fixed->tp_dst ^ wild->flow.tp_dst) & wild->wc.tp_dst_mask); + } else if (f_idx == CLS_F_IDX_DL_SRC) { + eq = eth_addr_equal_except(fixed->dl_src, wild->flow.dl_src, + wild->wc.dl_src_mask); + } else if (f_idx == CLS_F_IDX_DL_DST) { + eq = eth_addr_equal_except(fixed->dl_dst, wild->flow.dl_dst, + wild->wc.dl_dst_mask); + } else if (f_idx == CLS_F_IDX_VLAN_TCI) { + eq = !((fixed->vlan_tci ^ wild->flow.vlan_tci) + & wild->wc.vlan_tci_mask); + } else if (f_idx == CLS_F_IDX_TUN_ID) { + eq = !((fixed->tun_id ^ wild->flow.tun_id) & wild->wc.tun_id_mask); + } else if (f_idx == CLS_F_IDX_METADATA) { + eq = !((fixed->metadata ^ wild->flow.metadata) + & wild->wc.metadata_mask); + } else if (f_idx == CLS_F_IDX_NW_DSCP) { + eq = !((fixed->nw_tos ^ wild->flow.nw_tos) & IP_DSCP_MASK); + } else { + NOT_REACHED(); } - if (wild->wc.wildcards & f->wildcards) { - uint32_t test = read_uint32(wild_field); - uint32_t ip = read_uint32(fixed_field); - int shift = (f_idx == CLS_F_IDX_NW_SRC - ? OFPFW_NW_SRC_SHIFT : OFPFW_NW_DST_SHIFT); - uint32_t mask = flow_nw_bits_to_mask(wild->wc.wildcards, shift); - if (!((test ^ ip) & mask)) { - continue; - } + if (!eq) { + return false; } - - return false; } return true; } static struct cls_rule * -tcls_lookup(const struct tcls *cls, const struct flow *flow, int include) +tcls_lookup(const struct tcls *cls, const struct flow *flow) { size_t i; for (i = 0; i < cls->n_rules; i++) { struct test_rule *pos = cls->rules[i]; - uint32_t wildcards = pos->cls_rule.wc.wildcards; - if (include & (wildcards ? CLS_INC_WILD : CLS_INC_EXACT) - && match(&pos->cls_rule, flow)) { + if (match(&pos->cls_rule, flow)) { return &pos->cls_rule; } } @@ -251,17 +245,13 @@ tcls_lookup(const struct tcls *cls, const struct flow *flow, int include) } static void -tcls_delete_matches(struct tcls *cls, - const struct cls_rule *target, - int include) +tcls_delete_matches(struct tcls *cls, const struct cls_rule *target) { size_t i; for (i = 0; i < cls->n_rules; ) { struct test_rule *pos = cls->rules[i]; - uint32_t wildcards = pos->cls_rule.wc.wildcards; - if (include & (wildcards ? CLS_INC_WILD : CLS_INC_EXACT) - && !flow_wildcards_has_extra(&pos->cls_rule.wc, &target->wc) + if (!flow_wildcards_has_extra(&pos->cls_rule.wc, &target->wc) && match(target, &pos->cls_rule.flow)) { tcls_remove(cls, pos); } else { @@ -270,26 +260,29 @@ tcls_delete_matches(struct tcls *cls, } } -static uint32_t nw_src_values[] = { CONSTANT_HTONL(0xc0a80001), +static ovs_be32 nw_src_values[] = { CONSTANT_HTONL(0xc0a80001), CONSTANT_HTONL(0xc0a04455) }; -static uint32_t nw_dst_values[] = { CONSTANT_HTONL(0xc0a80002), +static ovs_be32 nw_dst_values[] = { CONSTANT_HTONL(0xc0a80002), CONSTANT_HTONL(0xc0a04455) }; -static uint32_t tun_id_values[] = { 0, 0xffff0000 }; -static uint16_t in_port_values[] = { CONSTANT_HTONS(1), - CONSTANT_HTONS(OFPP_LOCAL) }; -static uint16_t dl_vlan_values[] = { CONSTANT_HTONS(101), CONSTANT_HTONS(0) }; -static uint8_t dl_vlan_pcp_values[] = { 7, 0 }; -static uint16_t dl_type_values[] +static ovs_be64 tun_id_values[] = { + 0, + CONSTANT_HTONLL(UINT64_C(0xfedcba9876543210)) }; +static ovs_be64 metadata_values[] = { + 0, + CONSTANT_HTONLL(UINT64_C(0xfedcba9876543210)) }; +static uint16_t in_port_values[] = { 1, OFPP_LOCAL }; +static ovs_be16 vlan_tci_values[] = { CONSTANT_HTONS(101), CONSTANT_HTONS(0) }; +static ovs_be16 dl_type_values[] = { CONSTANT_HTONS(ETH_TYPE_IP), CONSTANT_HTONS(ETH_TYPE_ARP) }; -static uint16_t tp_src_values[] = { CONSTANT_HTONS(49362), +static ovs_be16 tp_src_values[] = { CONSTANT_HTONS(49362), CONSTANT_HTONS(80) }; -static uint16_t tp_dst_values[] = { CONSTANT_HTONS(6667), CONSTANT_HTONS(22) }; +static ovs_be16 tp_dst_values[] = { CONSTANT_HTONS(6667), CONSTANT_HTONS(22) }; static uint8_t dl_src_values[][6] = { { 0x00, 0x02, 0xe3, 0x0f, 0x80, 0xa4 }, { 0x5e, 0x33, 0x7f, 0x5f, 0x1e, 0x99 } }; static uint8_t dl_dst_values[][6] = { { 0x4a, 0x27, 0x71, 0xae, 0x64, 0xc1 }, { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff } }; -static uint8_t nw_proto_values[] = { IP_TYPE_TCP, IP_TYPE_ICMP }; -static uint8_t nw_tos_values[] = { 49, 0 }; +static uint8_t nw_proto_values[] = { IPPROTO_TCP, IPPROTO_ICMP }; +static uint8_t nw_dscp_values[] = { 48, 0 }; static void *values[CLS_N_FIELDS][2]; @@ -299,14 +292,14 @@ init_values(void) values[CLS_F_IDX_TUN_ID][0] = &tun_id_values[0]; values[CLS_F_IDX_TUN_ID][1] = &tun_id_values[1]; + values[CLS_F_IDX_METADATA][0] = &metadata_values[0]; + values[CLS_F_IDX_METADATA][1] = &metadata_values[1]; + values[CLS_F_IDX_IN_PORT][0] = &in_port_values[0]; values[CLS_F_IDX_IN_PORT][1] = &in_port_values[1]; - values[CLS_F_IDX_DL_VLAN][0] = &dl_vlan_values[0]; - values[CLS_F_IDX_DL_VLAN][1] = &dl_vlan_values[1]; - - values[CLS_F_IDX_DL_VLAN_PCP][0] = &dl_vlan_pcp_values[0]; - values[CLS_F_IDX_DL_VLAN_PCP][1] = &dl_vlan_pcp_values[1]; + values[CLS_F_IDX_VLAN_TCI][0] = &vlan_tci_values[0]; + values[CLS_F_IDX_VLAN_TCI][1] = &vlan_tci_values[1]; values[CLS_F_IDX_DL_SRC][0] = dl_src_values[0]; values[CLS_F_IDX_DL_SRC][1] = dl_src_values[1]; @@ -326,8 +319,8 @@ init_values(void) values[CLS_F_IDX_NW_PROTO][0] = &nw_proto_values[0]; values[CLS_F_IDX_NW_PROTO][1] = &nw_proto_values[1]; - values[CLS_F_IDX_NW_TOS][0] = &nw_tos_values[0]; - values[CLS_F_IDX_NW_TOS][1] = &nw_tos_values[1]; + values[CLS_F_IDX_NW_DSCP][0] = &nw_dscp_values[0]; + values[CLS_F_IDX_NW_DSCP][1] = &nw_dscp_values[1]; values[CLS_F_IDX_TP_SRC][0] = &tp_src_values[0]; values[CLS_F_IDX_TP_SRC][1] = &tp_src_values[1]; @@ -339,30 +332,29 @@ init_values(void) #define N_NW_SRC_VALUES ARRAY_SIZE(nw_src_values) #define N_NW_DST_VALUES ARRAY_SIZE(nw_dst_values) #define N_TUN_ID_VALUES ARRAY_SIZE(tun_id_values) +#define N_METADATA_VALUES ARRAY_SIZE(metadata_values) #define N_IN_PORT_VALUES ARRAY_SIZE(in_port_values) -#define N_DL_VLAN_VALUES ARRAY_SIZE(dl_vlan_values) -#define N_DL_VLAN_PCP_VALUES ARRAY_SIZE(dl_vlan_pcp_values) +#define N_VLAN_TCI_VALUES ARRAY_SIZE(vlan_tci_values) #define N_DL_TYPE_VALUES ARRAY_SIZE(dl_type_values) #define N_TP_SRC_VALUES ARRAY_SIZE(tp_src_values) #define N_TP_DST_VALUES ARRAY_SIZE(tp_dst_values) #define N_DL_SRC_VALUES ARRAY_SIZE(dl_src_values) #define N_DL_DST_VALUES ARRAY_SIZE(dl_dst_values) #define N_NW_PROTO_VALUES ARRAY_SIZE(nw_proto_values) -#define N_NW_TOS_VALUES ARRAY_SIZE(nw_tos_values) +#define N_NW_DSCP_VALUES ARRAY_SIZE(nw_dscp_values) #define N_FLOW_VALUES (N_NW_SRC_VALUES * \ N_NW_DST_VALUES * \ N_TUN_ID_VALUES * \ N_IN_PORT_VALUES * \ - N_DL_VLAN_VALUES * \ - N_DL_VLAN_PCP_VALUES * \ + N_VLAN_TCI_VALUES * \ N_DL_TYPE_VALUES * \ N_TP_SRC_VALUES * \ N_TP_DST_VALUES * \ N_DL_SRC_VALUES * \ N_DL_DST_VALUES * \ N_NW_PROTO_VALUES * \ - N_NW_TOS_VALUES) + N_NW_DSCP_VALUES) static unsigned int get_value(unsigned int *x, unsigned n_values) @@ -379,21 +371,18 @@ compare_classifiers(struct classifier *cls, struct tcls *tcls) unsigned int i; assert(classifier_count(cls) == tcls->n_rules); - assert(classifier_count_exact(cls) == tcls_count_exact(tcls)); for (i = 0; i < confidence; i++) { struct cls_rule *cr0, *cr1; struct flow flow; unsigned int x; - int include; x = rand () % N_FLOW_VALUES; flow.nw_src = nw_src_values[get_value(&x, N_NW_SRC_VALUES)]; flow.nw_dst = nw_dst_values[get_value(&x, N_NW_DST_VALUES)]; flow.tun_id = tun_id_values[get_value(&x, N_TUN_ID_VALUES)]; + flow.metadata = metadata_values[get_value(&x, N_METADATA_VALUES)]; flow.in_port = in_port_values[get_value(&x, N_IN_PORT_VALUES)]; - flow.dl_vlan = dl_vlan_values[get_value(&x, N_DL_VLAN_VALUES)]; - flow.dl_vlan_pcp = dl_vlan_pcp_values[get_value(&x, - N_DL_VLAN_PCP_VALUES)]; + flow.vlan_tci = vlan_tci_values[get_value(&x, N_VLAN_TCI_VALUES)]; flow.dl_type = dl_type_values[get_value(&x, N_DL_TYPE_VALUES)]; flow.tp_src = tp_src_values[get_value(&x, N_TP_SRC_VALUES)]; flow.tp_dst = tp_dst_values[get_value(&x, N_TP_DST_VALUES)]; @@ -402,38 +391,32 @@ compare_classifiers(struct classifier *cls, struct tcls *tcls) memcpy(flow.dl_dst, dl_dst_values[get_value(&x, N_DL_DST_VALUES)], ETH_ADDR_LEN); flow.nw_proto = nw_proto_values[get_value(&x, N_NW_PROTO_VALUES)]; - flow.nw_tos = nw_tos_values[get_value(&x, N_NW_TOS_VALUES)]; - - for (include = 1; include <= 3; include++) { - cr0 = classifier_lookup(cls, &flow, include); - cr1 = tcls_lookup(tcls, &flow, include); - assert((cr0 == NULL) == (cr1 == NULL)); - if (cr0 != NULL) { - const struct test_rule *tr0 = test_rule_from_cls_rule(cr0); - const struct test_rule *tr1 = test_rule_from_cls_rule(cr1); - - assert(flow_equal(&cr0->flow, &cr1->flow)); - assert(cr0->wc.wildcards == cr1->wc.wildcards); - assert(cr0->priority == cr1->priority); - /* Skip nw_src_mask and nw_dst_mask, because they are derived - * members whose values are used only for optimization. */ - assert(tr0->aux == tr1->aux); - } + flow.nw_tos = nw_dscp_values[get_value(&x, N_NW_DSCP_VALUES)]; + + cr0 = classifier_lookup(cls, &flow); + cr1 = tcls_lookup(tcls, &flow); + assert((cr0 == NULL) == (cr1 == NULL)); + if (cr0 != NULL) { + const struct test_rule *tr0 = test_rule_from_cls_rule(cr0); + const struct test_rule *tr1 = test_rule_from_cls_rule(cr1); + + assert(cls_rule_equal(cr0, cr1)); + assert(tr0->aux == tr1->aux); } } } -static void -free_rule(struct cls_rule *cls_rule, void *cls) -{ - classifier_remove(cls, cls_rule); - free(test_rule_from_cls_rule(cls_rule)); -} - static void destroy_classifier(struct classifier *cls) { - classifier_for_each(cls, CLS_INC_ALL, free_rule, cls); + struct test_rule *rule, *next_rule; + struct cls_cursor cursor; + + 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); + } classifier_destroy(cls); } @@ -442,9 +425,12 @@ check_tables(const struct classifier *cls, int n_tables, int n_rules, int n_dups) { const struct cls_table *table; + struct test_rule *test_rule; + struct cls_cursor cursor; int found_tables = 0; int found_rules = 0; int found_dups = 0; + int found_rules2 = 0; HMAP_FOR_EACH (table, hmap_node, &cls->tables) { const struct cls_rule *head; @@ -471,6 +457,12 @@ check_tables(const struct classifier *cls, assert(n_tables == -1 || n_tables == hmap_count(&cls->tables)); assert(n_rules == -1 || found_rules == n_rules); assert(n_dups == -1 || found_dups == n_dups); + + cls_cursor_init(&cursor, cls, NULL); + CLS_CURSOR_FOR_EACH (test_rule, cls_rule, &cursor) { + found_rules2++; + } + assert(found_rules == found_rules2); } static struct test_rule * @@ -478,24 +470,39 @@ make_rule(int wc_fields, unsigned int priority, int value_pat) { const struct cls_field *f; struct test_rule *rule; - uint32_t wildcards; - struct flow flow; - wildcards = 0; - memset(&flow, 0, sizeof flow); + rule = xzalloc(sizeof *rule); + cls_rule_init_catchall(&rule->cls_rule, wc_fields ? priority : UINT_MAX); for (f = &cls_fields[0]; f < &cls_fields[CLS_N_FIELDS]; f++) { int f_idx = f - cls_fields; - if (wc_fields & (1u << f_idx)) { - wildcards |= f->wildcards; + int value_idx = (value_pat & (1u << f_idx)) != 0; + memcpy((char *) &rule->cls_rule.flow + f->ofs, + values[f_idx][value_idx], f->len); + + if (f->wildcards) { + rule->cls_rule.wc.wildcards &= ~f->wildcards; + } else if (f_idx == CLS_F_IDX_NW_SRC) { + rule->cls_rule.wc.nw_src_mask = htonl(UINT32_MAX); + } else if (f_idx == CLS_F_IDX_NW_DST) { + rule->cls_rule.wc.nw_dst_mask = htonl(UINT32_MAX); + } else if (f_idx == CLS_F_IDX_TP_SRC) { + rule->cls_rule.wc.tp_src_mask = htons(UINT16_MAX); + } else if (f_idx == CLS_F_IDX_TP_DST) { + rule->cls_rule.wc.tp_dst_mask = htons(UINT16_MAX); + } else if (f_idx == CLS_F_IDX_DL_SRC) { + memset(rule->cls_rule.wc.dl_src_mask, 0xff, ETH_ADDR_LEN); + } else if (f_idx == CLS_F_IDX_DL_DST) { + memset(rule->cls_rule.wc.dl_dst_mask, 0xff, ETH_ADDR_LEN); + } else if (f_idx == CLS_F_IDX_VLAN_TCI) { + rule->cls_rule.wc.vlan_tci_mask = htons(UINT16_MAX); + } else if (f_idx == CLS_F_IDX_TUN_ID) { + rule->cls_rule.wc.tun_id_mask = htonll(UINT64_MAX); + } else if (f_idx == CLS_F_IDX_METADATA) { + rule->cls_rule.wc.metadata_mask = htonll(UINT64_MAX); } else { - int value_idx = (value_pat & (1u << f_idx)) != 0; - memcpy((char *) &flow + f->ofs, values[f_idx][value_idx], f->len); + NOT_REACHED(); } } - - rule = xzalloc(sizeof *rule); - cls_rule_from_flow(&flow, wildcards, !wildcards ? UINT_MAX : priority, - &rule->cls_rule); return rule; } @@ -551,7 +558,7 @@ test_single_rule(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) tcls_init(&tcls); tcls_rule = tcls_insert(&tcls, rule); - assert(!classifier_insert(&cls, &rule->cls_rule)); + classifier_insert(&cls, &rule->cls_rule); check_tables(&cls, 1, 1, 0); compare_classifiers(&cls, &tcls); @@ -587,7 +594,7 @@ test_rule_replacement(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) classifier_init(&cls); tcls_init(&tcls); tcls_insert(&tcls, rule1); - assert(!classifier_insert(&cls, &rule1->cls_rule)); + classifier_insert(&cls, &rule1->cls_rule); check_tables(&cls, 1, 1, 0); compare_classifiers(&cls, &tcls); tcls_destroy(&tcls); @@ -595,7 +602,7 @@ test_rule_replacement(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) tcls_init(&tcls); tcls_insert(&tcls, rule2); assert(test_rule_from_cls_rule( - classifier_insert(&cls, &rule2->cls_rule)) == rule1); + classifier_replace(&cls, &rule2->cls_rule)) == rule1); free(rule1); check_tables(&cls, 1, 1, 0); compare_classifiers(&cls, &tcls); @@ -706,7 +713,7 @@ test_many_rules_in_one_list (int argc OVS_UNUSED, char *argv[] OVS_UNUSED) tcls_rules[j] = tcls_insert(&tcls, rules[j]); displaced_rule = test_rule_from_cls_rule( - classifier_insert(&cls, &rules[j]->cls_rule)); + classifier_replace(&cls, &rules[j]->cls_rule)); if (pri_rules[pris[j]] >= 0) { int k = pri_rules[pris[j]]; assert(displaced_rule != NULL); @@ -806,7 +813,7 @@ test_many_rules_in_one_table(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) rules[i] = make_rule(wcf, priority, value_pats[i]); tcls_rules[i] = tcls_insert(&tcls, rules[i]); - assert(!classifier_insert(&cls, &rules[i]->cls_rule)); + classifier_insert(&cls, &rules[i]->cls_rule); check_tables(&cls, 1, i + 1, 0); compare_classifiers(&cls, &tcls); @@ -864,23 +871,28 @@ test_many_rules_in_n_tables(int n_tables) int value_pat = rand() & ((1u << CLS_N_FIELDS) - 1); rule = make_rule(wcf, priority, value_pat); tcls_insert(&tcls, rule); - assert(!classifier_insert(&cls, &rule->cls_rule)); + classifier_insert(&cls, &rule->cls_rule); check_tables(&cls, -1, i + 1, -1); compare_classifiers(&cls, &tcls); } while (!classifier_is_empty(&cls)) { - struct test_rule *rule = xmemdup(tcls.rules[rand() % tcls.n_rules], - sizeof(struct test_rule)); - int include = rand() % 2 ? CLS_INC_WILD : CLS_INC_EXACT; - include |= (rule->cls_rule.wc.wildcards - ? CLS_INC_WILD : CLS_INC_EXACT); - classifier_for_each_match(&cls, &rule->cls_rule, include, - free_rule, &cls); - tcls_delete_matches(&tcls, &rule->cls_rule, include); + struct test_rule *rule, *next_rule; + struct test_rule *target; + struct cls_cursor cursor; + + target = xmemdup(tcls.rules[rand() % tcls.n_rules], + sizeof(struct test_rule)); + + cls_cursor_init(&cursor, &cls, &target->cls_rule); + CLS_CURSOR_FOR_EACH_SAFE (rule, next_rule, cls_rule, &cursor) { + classifier_remove(&cls, &rule->cls_rule); + free(rule); + } + tcls_delete_matches(&tcls, &target->cls_rule); compare_classifiers(&cls, &tcls); check_tables(&cls, -1, -1, -1); - free(rule); + free(target); } destroy_classifier(&cls);