X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=lib%2Fovsdb-data.h;h=278954079df4707317e54a3c231ad45d2f49dfe4;hb=5d10476a12dd3df756e15c9bcae0061bef787379;hp=a5c49f974e48df6d2e4cbd722fc42f70c3f48106;hpb=5f55c39b21e69025045437ffbd3bb98fe6ce2e89;p=cascardo%2Fovs.git diff --git a/lib/ovsdb-data.h b/lib/ovsdb-data.h index a5c49f974..278954079 100644 --- a/lib/ovsdb-data.h +++ b/lib/ovsdb-data.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2009, 2010 Nicira Networks +/* Copyright (c) 2009, 2010, 2011, 2012, 2015 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,9 +19,11 @@ #include #include "compiler.h" #include "ovsdb-types.h" +#include "shash.h" struct ds; struct ovsdb_symbol_table; +struct smap; /* One value of an atomic type (given by enum ovs_atomic_type). */ union ovsdb_atom { @@ -33,17 +35,28 @@ union ovsdb_atom { }; void ovsdb_atom_init_default(union ovsdb_atom *, enum ovsdb_atomic_type); +const union ovsdb_atom *ovsdb_atom_default(enum ovsdb_atomic_type); bool ovsdb_atom_is_default(const union ovsdb_atom *, enum ovsdb_atomic_type); void ovsdb_atom_clone(union ovsdb_atom *, const union ovsdb_atom *, enum ovsdb_atomic_type); void ovsdb_atom_swap(union ovsdb_atom *, union ovsdb_atom *); +/* Returns false if ovsdb_atom_destroy() is a no-op when it is applied to an + * initialized atom of the given 'type', true if ovsdb_atom_destroy() actually + * does something. + * + * This can be used to avoid calling ovsdb_atom_destroy() for each element in + * an array of homogeneous atoms. (It's not worthwhile for a single atom.) */ static inline bool ovsdb_atom_needs_destruction(enum ovsdb_atomic_type type) { return type == OVSDB_TYPE_STRING; } +/* Frees the contents of 'atom', which must have the specified 'type'. + * + * This does not actually call free(atom). If necessary, the caller must be + * responsible for that. */ static inline void ovsdb_atom_destroy(union ovsdb_atom *atom, enum ovsdb_atomic_type type) { @@ -59,6 +72,8 @@ int ovsdb_atom_compare_3way(const union ovsdb_atom *, const union ovsdb_atom *, enum ovsdb_atomic_type); +/* Returns true if 'a' and 'b', which are both of type 'type', has the same + * contents, false if their contents differ. */ static inline bool ovsdb_atom_equals(const union ovsdb_atom *a, const union ovsdb_atom *b, enum ovsdb_atomic_type type) @@ -70,19 +85,22 @@ struct ovsdb_error *ovsdb_atom_from_json(union ovsdb_atom *, const struct ovsdb_base_type *, const struct json *, struct ovsdb_symbol_table *) - WARN_UNUSED_RESULT; + OVS_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 *, - const struct ovsdb_base_type *, const char *) - WARN_UNUSED_RESULT; + const struct ovsdb_base_type *, const char *, + struct ovsdb_symbol_table *) + OVS_WARN_UNUSED_RESULT; void ovsdb_atom_to_string(const union ovsdb_atom *, enum ovsdb_atomic_type, struct ds *); +void ovsdb_atom_to_bare(const union ovsdb_atom *, enum ovsdb_atomic_type, + struct ds *); struct ovsdb_error *ovsdb_atom_check_constraints( const union ovsdb_atom *, const struct ovsdb_base_type *) - WARN_UNUSED_RESULT; + OVS_WARN_UNUSED_RESULT; /* An instance of an OVSDB type (given by struct ovsdb_type). * @@ -115,6 +133,7 @@ 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 *); +const struct ovsdb_datum *ovsdb_datum_default(const struct ovsdb_type *); 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 *); @@ -123,29 +142,43 @@ void ovsdb_datum_swap(struct ovsdb_datum *, struct ovsdb_datum *); /* Checking and maintaining invariants. */ struct ovsdb_error *ovsdb_datum_sort(struct ovsdb_datum *, enum ovsdb_atomic_type key_type) - WARN_UNUSED_RESULT; + OVS_WARN_UNUSED_RESULT; void ovsdb_datum_sort_assert(struct ovsdb_datum *, enum ovsdb_atomic_type key_type); +size_t ovsdb_datum_sort_unique(struct ovsdb_datum *, + enum ovsdb_atomic_type key_type, + enum ovsdb_atomic_type value_type); + struct ovsdb_error *ovsdb_datum_check_constraints( const struct ovsdb_datum *, const struct ovsdb_type *) - WARN_UNUSED_RESULT; + OVS_WARN_UNUSED_RESULT; /* Type conversion. */ struct ovsdb_error *ovsdb_datum_from_json(struct ovsdb_datum *, const struct ovsdb_type *, const struct json *, struct ovsdb_symbol_table *) - WARN_UNUSED_RESULT; + OVS_WARN_UNUSED_RESULT; +struct ovsdb_error *ovsdb_transient_datum_from_json( + struct ovsdb_datum *, + const struct ovsdb_type *, + const struct json *) + OVS_WARN_UNUSED_RESULT; 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; + const struct ovsdb_type *, const char *, + struct ovsdb_symbol_table *) + OVS_WARN_UNUSED_RESULT; void ovsdb_datum_to_string(const struct ovsdb_datum *, const struct ovsdb_type *, struct ds *); +void ovsdb_datum_to_bare(const struct ovsdb_datum *, + const struct ovsdb_type *, struct ds *); + +void ovsdb_datum_from_smap(struct ovsdb_datum *, struct smap *); /* Comparison. */ uint32_t ovsdb_datum_hash(const struct ovsdb_datum *, @@ -183,6 +216,18 @@ void ovsdb_datum_subtract(struct ovsdb_datum *a, const struct ovsdb_datum *b, const struct ovsdb_type *b_type); +/* Generate and apply diffs */ +void ovsdb_datum_diff(struct ovsdb_datum *diff, + const struct ovsdb_datum *old, + const struct ovsdb_datum *new, + const struct ovsdb_type *type); + +struct ovsdb_error *ovsdb_datum_apply_diff(struct ovsdb_datum *new, + const struct ovsdb_datum *old, + const struct ovsdb_datum *diff, + const struct ovsdb_type *type) +OVS_WARN_UNUSED_RESULT; + /* Raw operations that may not maintain the invariants. */ void ovsdb_datum_remove_unsafe(struct ovsdb_datum *, size_t idx, const struct ovsdb_type *); @@ -202,9 +247,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. */ +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. */ - 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); @@ -221,7 +272,7 @@ struct ovsdb_symbol *ovsdb_symbol_table_insert(struct ovsdb_symbol_table *, * * Used by ovsdb_atom_from_string() and ovsdb_datum_from_string(). */ -char *ovsdb_token_parse(const char **, char **outp) WARN_UNUSED_RESULT; +char *ovsdb_token_parse(const char **, char **outp) OVS_WARN_UNUSED_RESULT; bool ovsdb_token_is_delim(unsigned char); #endif /* ovsdb-data.h */