X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ovsdb%2Fovsdb.h;h=e976d3be06080b8f40c3ca13439efb8ba5011ba8;hb=777af88d50b8271a8cc8f0a79d17022944481506;hp=0d15ef2db2488c8dd8146b4bfb8f0621f8eb74ad;hpb=da897f41cd795e325ec5ce773a70a819100bd26e;p=sliver-openvswitch.git diff --git a/ovsdb/ovsdb.h b/ovsdb/ovsdb.h index 0d15ef2db..e976d3be0 100644 --- a/ovsdb/ovsdb.h +++ b/ovsdb/ovsdb.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2009, 2010, 2011 Nicira Networks +/* 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 *);