X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ovsdb%2Fovsdb.h;h=e976d3be06080b8f40c3ca13439efb8ba5011ba8;hb=e379e4d167e31d1cd5f7b86fff091a2e09ff6e45;hp=ea7a9c2df6378d405e054438ef7467b9d6b0e529;hpb=e0edde6fee279cdbbf3c179f5f50adaf0c7c7f1e;p=sliver-openvswitch.git diff --git a/ovsdb/ovsdb.h b/ovsdb/ovsdb.h index ea7a9c2df..e976d3be0 100644 --- a/ovsdb/ovsdb.h +++ b/ovsdb/ovsdb.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2009, 2010, 2011 Nicira, Inc. +/* Copyright (c) 2009, 2010, 2011, 2012, 2013 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,6 +25,7 @@ struct json; struct ovsdb_log; struct ovsdb_session; struct ovsdb_txn; +struct simap; struct uuid; /* Database schema. */ @@ -66,9 +67,7 @@ struct ovsdb { struct ovsdb *ovsdb_create(struct ovsdb_schema *); void ovsdb_destroy(struct ovsdb *); -struct ovsdb_error *ovsdb_from_json(const struct json *, struct ovsdb **) - WARN_UNUSED_RESULT; -struct json *ovsdb_to_json(const struct ovsdb *); +void ovsdb_get_memory_usage(const struct ovsdb *, struct simap *usage); struct ovsdb_table *ovsdb_get_table(const struct ovsdb *, const char *);