mir/openvswitch
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-10-15 14:17:18 +00:00
Code Issues Releases Wiki Activity

ovsdb-data: Rename 'used' to 'created' in struct ovsdb_symbol.

Browse Source 
The name 'created' better reflects the actual meaning of this member: in
both ovsdb and ovs-vsctl, it is true if a row has been created with the
symbol's UUID and false otherwise.
This commit is contained in:
Ben Pfaff
2011-02-28 12:43:15 -08:00
parent 71abd20a17
commit e9387de4a2
4 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/ovsdb-data.c
View File

@@ -1825,14 +1825,14 @@ ovsdb_symbol_table_get(const struct ovsdb_symbol_table *symtab,
struct ovsdb_symbol *
ovsdb_symbol_table_put(struct ovsdb_symbol_table *symtab, const char *name,
const struct uuid *uuid, bool used)
const struct uuid *uuid, bool created)
{
struct ovsdb_symbol *symbol;
assert(!ovsdb_symbol_table_get(symtab, name));
symbol = xmalloc(sizeof *symbol);
symbol->uuid = *uuid;
symbol->used = used;
symbol->created = created;
shash_add(&symtab->sh, name, symbol);
return symbol;
}
@@ -1854,13 +1854,13 @@ ovsdb_symbol_table_insert(struct ovsdb_symbol_table *symtab,
}
const char *
ovsdb_symbol_table_find_unused(const struct ovsdb_symbol_table *symtab)
ovsdb_symbol_table_find_uncreated(const struct ovsdb_symbol_table *symtab)
{
struct shash_node *node;
SHASH_FOR_EACH (node, &symtab->sh) {
struct ovsdb_symbol *symbol = node->data;
if (!symbol->used) {
if (!symbol->created) {
return node->name;
}
}

5
lib/ovsdb-data.h
View File

@@ -231,7 +231,7 @@ ovsdb_datum_conforms_to_type(const struct ovsdb_datum *datum,
struct ovsdb_symbol {
struct uuid uuid; /* The UUID that the symbol represents. */
bool used; /* Already used as row UUID? */
bool created; /* Already used to create row? */
};
struct ovsdb_symbol_table *ovsdb_symbol_table_create(void);
@@ -243,7 +243,8 @@ struct ovsdb_symbol *ovsdb_symbol_table_put(struct ovsdb_symbol_table *,
const struct uuid *, bool used);
struct ovsdb_symbol *ovsdb_symbol_table_insert(struct ovsdb_symbol_table *,
const char *name);
const char *ovsdb_symbol_table_find_unused(const struct ovsdb_symbol_table *);
const char *ovsdb_symbol_table_find_uncreated(
const struct ovsdb_symbol_table *);
/* Tokenization
*

4
ovsdb/execution.c
View File

@@ -292,13 +292,13 @@ ovsdb_execute_insert(struct ovsdb_execution *x, struct ovsdb_parser *parser,
struct ovsdb_symbol *symbol;
symbol = ovsdb_symbol_table_insert(x->symtab, json_string(uuid_name));
if (symbol->used) {
if (symbol->created) {
return ovsdb_syntax_error(uuid_name, "duplicate uuid-name",
"This \"uuid-name\" appeared on an "
"earlier \"insert\" operation.");
}
row_uuid = symbol->uuid;
symbol->used = true;
symbol->created = true;
} else {
uuid_generate(&row_uuid);
}

12
utilities/ovs-vsctl.c
View File

@@ -2365,11 +2365,11 @@ create_symbol(struct ovsdb_symbol_table *symtab, const char *id, bool *newp)
}
symbol = ovsdb_symbol_table_insert(symtab, id);
if (symbol->used) {
if (symbol->created) {
vsctl_fatal("row id \"%s\" may only be specified on one --id option",
id);
}
symbol->used = true;
symbol->created = true;
return &symbol->uuid;
}
@@ -3354,7 +3354,7 @@ do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands,
const struct ovsrec_open_vswitch *ovs;
enum ovsdb_idl_txn_status status;
struct ovsdb_symbol_table *symtab;
const char *unused;
const char *uncreated;
struct vsctl_command *c;
int64_t next_cfg = 0;
char *error = NULL;
@@ -3395,10 +3395,10 @@ do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands,
}
}
unused = ovsdb_symbol_table_find_unused(symtab);
if (unused) {
uncreated = ovsdb_symbol_table_find_uncreated(symtab);
if (uncreated) {
vsctl_fatal("row id \"%s\" is referenced but never created (e.g. "
"with \"-- --id=%s create ...\")", unused, unused);
"with \"-- --id=%s create ...\")", uncreated, uncreated);
}
status = ovsdb_idl_txn_commit_block(txn);