projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovsdb: Correctly implement conditions that include multiple clauses.
[openvswitch]
/
lib
/
ovsdb-data.h
diff --git
a/lib/ovsdb-data.h
b/lib/ovsdb-data.h
index ced303397804ff20fad75c15e971f12cccdb21d5..181df3b126890490a8b61dc9dc64dcce9b7bd0a0 100644
(file)
--- a/
lib/ovsdb-data.h
+++ b/
lib/ovsdb-data.h
@@
-19,10
+19,10
@@
#include <stdlib.h>
#include "compiler.h"
#include "ovsdb-types.h"
#include <stdlib.h>
#include "compiler.h"
#include "ovsdb-types.h"
+#include "shash.h"
struct ds;
struct ovsdb_symbol_table;
struct ds;
struct ovsdb_symbol_table;
-struct shash;
/* One value of an atomic type (given by enum ovs_atomic_type). */
union ovsdb_atom {
/* One value of an atomic type (given by enum ovs_atomic_type). */
union ovsdb_atom {
@@
-229,9
+229,15
@@
ovsdb_datum_conforms_to_type(const struct ovsdb_datum *datum,
/* A table mapping from names to data items. Currently the data items are
* always UUIDs; perhaps this will be expanded in the future. */
/* A table mapping from names to data items. Currently the data items are
* always UUIDs; perhaps this will be expanded in the future. */
+struct ovsdb_symbol_table {
+ struct shash sh; /* Maps from name to struct ovsdb_symbol *. */
+};
+
struct ovsdb_symbol {
struct uuid uuid; /* The UUID that the symbol represents. */
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? */
+ bool strong_ref; /* Parsed a strong reference to this row? */
+ bool weak_ref; /* Parsed a weak reference to this row? */
};
struct ovsdb_symbol_table *ovsdb_symbol_table_create(void);
};
struct ovsdb_symbol_table *ovsdb_symbol_table_create(void);
@@
-243,7
+249,6
@@
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 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 *);
\f
/* Tokenization
*
\f
/* Tokenization
*