diff options
| author | Jarno Rajahalme <jrajahalme@nicira.com> | 2013-10-29 16:39:52 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2013-10-29 18:41:51 -0700 |
| commit | 0386824614e9739d4b20b8355cfe973d0a3655c7 (patch) | |
| tree | c90564d8be5b6c4aa7dabc7c1cf424fd50f13a6e /tests/test-classifier.c | |
| parent | 00467f7367deade04c4405e1eb2841581700d519 (diff) | |
| download | openvswitch-0386824614e9739d4b20b8355cfe973d0a3655c7.tar.gz | |
classifier: Rename struct cls_table as cls_subtable.
The naming of the classifier table has been a source of confusion,
since each OpenFlow table is implemented as a classifier, which
consists of multiple (sub)tables. This name change hopefully makes
classifier related discussion a bit less confusing.
For consistency, relevant field names as well as the function and
variable names have been renamed in similar fashion.
Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'tests/test-classifier.c')
| -rw-r--r-- | tests/test-classifier.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/test-classifier.c b/tests/test-classifier.c index 1e0455099..3f39f8fae 100644 --- a/tests/test-classifier.c +++ b/tests/test-classifier.c @@ -459,7 +459,7 @@ static void check_tables(const struct classifier *cls, int n_tables, int n_rules, int n_dups) OVS_REQ_RDLOCK(cls->rwlock) { - const struct cls_table *table; + const struct cls_subtable *table; struct test_rule *test_rule; struct cls_cursor cursor; int found_tables = 0; @@ -467,7 +467,7 @@ 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->tables) { + HMAP_FOR_EACH (table, hmap_node, &cls->subtables) { const struct cls_rule *head; unsigned int max_priority = 0; unsigned int max_count = 0; @@ -501,8 +501,8 @@ check_tables(const struct classifier *cls, int n_tables, int n_rules, assert(table->max_count == max_count); } - assert(found_tables == hmap_count(&cls->tables)); - assert(n_tables == -1 || n_tables == hmap_count(&cls->tables)); + assert(found_tables == hmap_count(&cls->subtables)); + assert(n_tables == -1 || n_tables == hmap_count(&cls->subtables)); assert(n_rules == -1 || found_rules == n_rules); assert(n_dups == -1 || found_dups == n_dups); |