mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-22 01:51:26 +00:00
Code Issues Releases Wiki Activity

ovsdb: Slightly simplify ovsdb_table_get_row(), ovsdb_table_put_row().

Browse Source 
There is no value in saving a call to uuid_hash() in ovsdb_table_put_row(),
because uuid_hash() is a trivial inline function, so integrate
ovsdb_table_get_row__() into ovsdb_table_get_row() and simplify
ovsdb_table_put_row().
This commit is contained in:
Ben Pfaff 2010-02-04 12:20:11 -08:00
parent 71c93bd4cc
commit 629cd2f17f
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ovsdb/table.c
View File

@ -192,13 +192,12 @@ ovsdb_table_destroy(struct ovsdb_table *table)
}
}
static const struct ovsdb_row *
ovsdb_table_get_row__(const struct ovsdb_table *table, const struct uuid *uuid,
size_t hash)
const struct ovsdb_row *
ovsdb_table_get_row(const struct ovsdb_table *table, const struct uuid *uuid)
{
struct ovsdb_row *row;
HMAP_FOR_EACH_WITH_HASH (row, struct ovsdb_row, hmap_node, hash,
HMAP_FOR_EACH_WITH_HASH (row, struct ovsdb_row, hmap_node, uuid_hash(uuid),
&table->rows) {
if (uuid_equals(ovsdb_row_get_uuid(row), uuid)) {
return row;
@ -208,22 +207,14 @@ ovsdb_table_get_row__(const struct ovsdb_table *table, const struct uuid *uuid,
return NULL;
}
const struct ovsdb_row *
ovsdb_table_get_row(const struct ovsdb_table *table, const struct uuid *uuid)
{
return ovsdb_table_get_row__(table, uuid, uuid_hash(uuid));
}
/* This is probably not the function you want. Use ovsdb_txn_row_modify()
* instead. */
bool
ovsdb_table_put_row(struct ovsdb_table *table, struct ovsdb_row *row)
{
const struct uuid *uuid = ovsdb_row_get_uuid(row);
size_t hash = uuid_hash(uuid);
if (!ovsdb_table_get_row__(table, uuid, hash)) {
hmap_insert(&table->rows, &row->hmap_node, hash);
if (!ovsdb_table_get_row(table, uuid)) {
hmap_insert(&table->rows, &row->hmap_node, uuid_hash(uuid));
return true;
} else {
return false;