X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fovsdb-data.h;h=0638fa1bcdb98ca1174e20ac1db7d6349d47d7b9;hb=def90f6204f7cab8a23f5352c2be26b7cf8586f5;hp=6ee5f9ac06b894fd03f7f83774bfc741ad82e911;hpb=c7239c2f29ac9b288a48bff7458f8709ee4f7b4b;p=openvswitch diff --git a/lib/ovsdb-data.h b/lib/ovsdb-data.h index 6ee5f9ac..0638fa1b 100644 --- a/lib/ovsdb-data.h +++ b/lib/ovsdb-data.h @@ -20,6 +20,7 @@ #include "compiler.h" #include "ovsdb-types.h" +struct ds; struct ovsdb_symbol_table; /* One value of an atomic type (given by enum ovs_atomic_type). */ @@ -72,21 +73,32 @@ struct ovsdb_error *ovsdb_atom_from_json(union ovsdb_atom *, WARN_UNUSED_RESULT; struct json *ovsdb_atom_to_json(const union ovsdb_atom *, enum ovsdb_atomic_type); + +char *ovsdb_atom_from_string(union ovsdb_atom *, enum ovsdb_atomic_type, + const char *) + WARN_UNUSED_RESULT; +void ovsdb_atom_to_string(const union ovsdb_atom *, enum ovsdb_atomic_type, + struct ds *); /* An instance of an OVSDB type (given by struct ovsdb_type). * - * 'n' is constrained by the ovsdb_type's 'n_min' and 'n_max'. + * - The 'keys' must be unique and in sorted order. Most functions that modify + * an ovsdb_datum maintain these invariants. Functions that don't maintain + * the invariants have names that end in "_unsafe". Use ovsdb_datum_sort() + * to check and restore these invariants. * - * If 'n' is nonzero, then 'keys' points to an array of 'n' atoms of the type - * specified by the ovsdb_type's 'key_type'. (Otherwise, 'keys' should be - * null.) + * - 'n' is constrained by the ovsdb_type's 'n_min' and 'n_max'. * - * If 'n' is nonzero and the ovsdb_type's 'value_type' is not OVSDB_TYPE_VOID, - * then 'values' points to an array of 'n' atoms of the type specified by the - * 'value_type'. (Otherwise, 'values' should be null.) + * If 'n' is nonzero, then 'keys' points to an array of 'n' atoms of the type + * specified by the ovsdb_type's 'key_type'. (Otherwise, 'keys' should be + * null.) * - * Thus, for 'n' > 0, 'keys' will always be nonnull and 'values' will be - * nonnull only for "map" types. + * If 'n' is nonzero and the ovsdb_type's 'value_type' is not + * OVSDB_TYPE_VOID, then 'values' points to an array of 'n' atoms of the type + * specified by the 'value_type'. (Otherwise, 'values' should be null.) + * + * Thus, for 'n' > 0, 'keys' will always be nonnull and 'values' will be + * nonnull only for "map" types. */ struct ovsdb_datum { unsigned int n; /* Number of 'keys' and 'values'. */ @@ -94,6 +106,8 @@ struct ovsdb_datum { union ovsdb_atom *values; /* Each of the ovsdb_type's 'value_type'. */ }; +/* Basics. */ +void ovsdb_datum_init_empty(struct ovsdb_datum *); void ovsdb_datum_init_default(struct ovsdb_datum *, const struct ovsdb_type *); bool ovsdb_datum_is_default(const struct ovsdb_datum *, const struct ovsdb_type *); @@ -101,9 +115,12 @@ void ovsdb_datum_clone(struct ovsdb_datum *, const struct ovsdb_datum *, const struct ovsdb_type *); void ovsdb_datum_destroy(struct ovsdb_datum *, const struct ovsdb_type *); void ovsdb_datum_swap(struct ovsdb_datum *, struct ovsdb_datum *); + +/* Checking and maintaining invariants. */ struct ovsdb_error *ovsdb_datum_sort(struct ovsdb_datum *, const struct ovsdb_type *); +/* Type conversion. */ struct ovsdb_error *ovsdb_datum_from_json(struct ovsdb_datum *, const struct ovsdb_type *, const struct json *, @@ -112,6 +129,13 @@ struct ovsdb_error *ovsdb_datum_from_json(struct ovsdb_datum *, struct json *ovsdb_datum_to_json(const struct ovsdb_datum *, const struct ovsdb_type *); +char *ovsdb_datum_from_string(struct ovsdb_datum *, + const struct ovsdb_type *, const char *) + WARN_UNUSED_RESULT; +void ovsdb_datum_to_string(const struct ovsdb_datum *, + const struct ovsdb_type *, struct ds *); + +/* Comparison. */ uint32_t ovsdb_datum_hash(const struct ovsdb_datum *, const struct ovsdb_type *, uint32_t basis); int ovsdb_datum_compare_3way(const struct ovsdb_datum *, @@ -120,21 +144,42 @@ int ovsdb_datum_compare_3way(const struct ovsdb_datum *, bool ovsdb_datum_equals(const struct ovsdb_datum *, const struct ovsdb_datum *, const struct ovsdb_type *); + +/* Search. */ +unsigned int ovsdb_datum_find_key(const struct ovsdb_datum *, + const union ovsdb_atom *key, + enum ovsdb_atomic_type key_type); +unsigned int ovsdb_datum_find_key_value(const struct ovsdb_datum *, + const union ovsdb_atom *key, + enum ovsdb_atomic_type key_type, + const union ovsdb_atom *value, + enum ovsdb_atomic_type value_type); + +/* Set operations. */ bool ovsdb_datum_includes_all(const struct ovsdb_datum *, const struct ovsdb_datum *, const struct ovsdb_type *); bool ovsdb_datum_excludes_all(const struct ovsdb_datum *, const struct ovsdb_datum *, const struct ovsdb_type *); - void ovsdb_datum_union(struct ovsdb_datum *, const struct ovsdb_datum *, - const struct ovsdb_type *); + const struct ovsdb_type *, + bool replace); void ovsdb_datum_subtract(struct ovsdb_datum *a, const struct ovsdb_type *a_type, const struct ovsdb_datum *b, const struct ovsdb_type *b_type); +/* Raw operations that may not maintain the invariants. */ +void ovsdb_datum_remove_unsafe(struct ovsdb_datum *, size_t idx, + const struct ovsdb_type *); +void ovsdb_datum_add_unsafe(struct ovsdb_datum *, + const union ovsdb_atom *key, + const union ovsdb_atom *value, + const struct ovsdb_type *); + +/* Type checking. */ static inline bool ovsdb_datum_conforms_to_type(const struct ovsdb_datum *datum, const struct ovsdb_type *type) @@ -156,5 +201,12 @@ struct ovsdb_symbol *ovsdb_symbol_table_get(const struct ovsdb_symbol_table *, const char *name); void ovsdb_symbol_table_put(struct ovsdb_symbol_table *, const char *name, const struct uuid *, bool used); + +/* Tokenization + * + * Used by ovsdb_atom_from_string() and ovsdb_datum_from_string(). */ + +char *ovsdb_token_parse(const char **, char **outp) WARN_UNUSED_RESULT; +bool ovsdb_token_is_delim(unsigned char); #endif /* ovsdb-data.h */