X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=ovsdb%2Ftable.c;h=2f693501b6336e7da305eec3f8c1a1584ccd0ec4;hb=5059eff3bdd5a8ddd5b9d0559b3d36f2b2ad2a7a;hp=3f35b86e5c316667586c726b82dc1f62b4c25d3b;hpb=5f55c39b21e69025045437ffbd3bb98fe6ce2e89;p=openvswitch diff --git a/ovsdb/table.c b/ovsdb/table.c index 3f35b86e..2f693501 100644 --- a/ovsdb/table.c +++ b/ovsdb/table.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2009, 2010 Nicira Networks +/* Copyright (c) 2009, 2010, 2011 Nicira Networks * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,6 +18,7 @@ #include "table.h" #include +#include #include "json.h" #include "column.h" @@ -35,7 +36,8 @@ add_column(struct ovsdb_table_schema *ts, struct ovsdb_column *column) } struct ovsdb_table_schema * -ovsdb_table_schema_create(const char *name, bool mutable) +ovsdb_table_schema_create(const char *name, bool mutable, + unsigned int max_rows, bool is_root) { struct ovsdb_column *uuid, *version; struct ovsdb_table_schema *ts; @@ -44,6 +46,8 @@ ovsdb_table_schema_create(const char *name, bool mutable) ts->name = xstrdup(name); ts->mutable = mutable; shash_init(&ts->columns); + ts->max_rows = max_rows; + ts->is_root = is_root; uuid = ovsdb_column_create("_uuid", false, true, &ovsdb_type_uuid); add_column(ts, uuid); @@ -62,7 +66,8 @@ ovsdb_table_schema_clone(const struct ovsdb_table_schema *old) struct ovsdb_table_schema *new; struct shash_node *node; - new = ovsdb_table_schema_create(old->name, old->mutable); + new = ovsdb_table_schema_create(old->name, old->mutable, + old->max_rows, old->is_root); SHASH_FOR_EACH (node, &old->columns) { const struct ovsdb_column *column = node->data; @@ -94,10 +99,11 @@ ovsdb_table_schema_from_json(const struct json *json, const char *name, struct ovsdb_table_schema **tsp) { struct ovsdb_table_schema *ts; - const struct json *columns, *mutable; + const struct json *columns, *mutable, *max_rows, *is_root; struct shash_node *node; struct ovsdb_parser parser; struct ovsdb_error *error; + long long int n_max_rows; *tsp = NULL; @@ -105,18 +111,33 @@ ovsdb_table_schema_from_json(const struct json *json, const char *name, columns = ovsdb_parser_member(&parser, "columns", OP_OBJECT); mutable = ovsdb_parser_member(&parser, "mutable", OP_TRUE | OP_FALSE | OP_OPTIONAL); + max_rows = ovsdb_parser_member(&parser, "maxRows", + OP_INTEGER | OP_OPTIONAL); + is_root = ovsdb_parser_member(&parser, "isRoot", OP_BOOLEAN | OP_OPTIONAL); error = ovsdb_parser_finish(&parser); if (error) { return error; } + if (max_rows) { + if (json_integer(max_rows) <= 0) { + return ovsdb_syntax_error(json, NULL, + "maxRows must be at least 1"); + } + n_max_rows = max_rows->u.integer; + } else { + n_max_rows = UINT_MAX; + } + if (shash_is_empty(json_object(columns))) { return ovsdb_syntax_error(json, NULL, "table must have at least one column"); } ts = ovsdb_table_schema_create(name, - mutable ? json_boolean(mutable) : true); + mutable ? json_boolean(mutable) : true, + MIN(n_max_rows, UINT_MAX), + is_root ? json_boolean(is_root) : false); SHASH_FOR_EACH (node, json_object(columns)) { struct ovsdb_column *column; @@ -139,8 +160,19 @@ ovsdb_table_schema_from_json(const struct json *json, const char *name, return 0; } +/* Returns table schema 'ts' serialized into JSON. + * + * The "isRoot" member is included in the JSON only if its value would differ + * from 'default_is_root'. Ordinarily 'default_is_root' should be false, + * because ordinarily a table would be not be part of the root set if its + * "isRoot" member is omitted. However, garbage collection was not orginally + * included in OVSDB, so in older schemas that do not include any "isRoot" + * members, every table is implicitly part of the root set. To serialize such + * a schema in a way that can be read by older OVSDB tools, specify + * 'default_is_root' as true. */ struct json * -ovsdb_table_schema_to_json(const struct ovsdb_table_schema *ts) +ovsdb_table_schema_to_json(const struct ovsdb_table_schema *ts, + bool default_is_root) { struct json *json, *columns; struct shash_node *node; @@ -149,6 +181,9 @@ ovsdb_table_schema_to_json(const struct ovsdb_table_schema *ts) if (!ts->mutable) { json_object_put(json, "mutable", json_boolean_create(false)); } + if (default_is_root != ts->is_root) { + json_object_put(json, "isRoot", json_boolean_create(ts->is_root)); + } columns = json_object_create(); @@ -160,6 +195,9 @@ ovsdb_table_schema_to_json(const struct ovsdb_table_schema *ts) } } json_object_put(json, "columns", columns); + if (ts->max_rows != UINT_MAX) { + json_object_put(json, "maxRows", json_integer_create(ts->max_rows)); + } return json; } @@ -190,8 +228,7 @@ ovsdb_table_destroy(struct ovsdb_table *table) if (table) { struct ovsdb_row *row, *next; - HMAP_FOR_EACH_SAFE (row, next, struct ovsdb_row, hmap_node, - &table->rows) { + HMAP_FOR_EACH_SAFE (row, next, hmap_node, &table->rows) { ovsdb_row_destroy(row); } hmap_destroy(&table->rows); @@ -206,8 +243,7 @@ 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, uuid_hash(uuid), - &table->rows) { + HMAP_FOR_EACH_WITH_HASH (row, hmap_node, uuid_hash(uuid), &table->rows) { if (uuid_equals(ovsdb_row_get_uuid(row), uuid)) { return row; }