diff options
author | Ben Pfaff <blp@nicira.com> | 2011-03-25 13:20:35 -0700 |
---|---|---|
committer | Ben Pfaff <blp@nicira.com> | 2011-03-31 16:42:01 -0700 |
commit | 53d046612df6c88ad8b02c8e99bbfb6e45fe2326 (patch) | |
tree | 7f9eb154c9cd0a5533ce886482a1f98f862137cc /lib/ovsdb-parser.c | |
parent | 19993ef3caac9964c2bef6e31fc8699c4f4b53c8 (diff) |
ovsdb-parser: Use sset instead of svec for detecting unused members.
Should be slightly cheaper than sorting a list (O(n) vs. O(n lg n)).
Diffstat (limited to 'lib/ovsdb-parser.c')
-rw-r--r-- | lib/ovsdb-parser.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/lib/ovsdb-parser.c b/lib/ovsdb-parser.c index 2a4c3d99..e1832a99 100644 --- a/lib/ovsdb-parser.c +++ b/lib/ovsdb-parser.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2009 Nicira Networks +/* Copyright (c) 2009, 2011 Nicira Networks * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,7 +32,7 @@ ovsdb_parser_init(struct ovsdb_parser *parser, const struct json *json, parser->name = xvasprintf(name, args); va_end(args); - svec_init(&parser->used); + sset_init(&parser->used); parser->error = NULL; parser->json = (json && json->type == JSON_OBJECT ? json : NULL); @@ -85,7 +85,7 @@ ovsdb_parser_member(struct ovsdb_parser *parser, const char *name, || (types & OP_ID && value->type == JSON_STRING && ovsdb_parser_is_id(value->u.string))) { - svec_add(&parser->used, name); + sset_add(&parser->used, name); return value; } else { ovsdb_parser_raise_error(parser, "Type mismatch for member '%s'.", @@ -133,14 +133,12 @@ ovsdb_parser_finish(struct ovsdb_parser *parser) const struct shash *object = json_object(parser->json); size_t n_unused; - /* XXX this method of detecting unused members can be made cheaper */ - svec_sort_unique(&parser->used); - n_unused = shash_count(object) - parser->used.n; + n_unused = shash_count(object) - sset_count(&parser->used); if (n_unused) { struct shash_node *node; SHASH_FOR_EACH (node, object) { - if (!svec_contains(&parser->used, node->name)) { + if (!sset_contains(&parser->used, node->name)) { if (n_unused > 1) { ovsdb_parser_raise_error( parser, @@ -160,7 +158,7 @@ ovsdb_parser_finish(struct ovsdb_parser *parser) } free(parser->name); - svec_destroy(&parser->used); + sset_destroy(&parser->used); return parser->error; } |