git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #1 from spil-jasper/master
[sliver-openvswitch.git]
/
ovsdb
/
ovsdb.h
diff --git
a/ovsdb/ovsdb.h
b/ovsdb/ovsdb.h
index
ea7a9c2
..
e976d3b
100644
(file)
--- 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.
*
* 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 ovsdb_log;
struct ovsdb_session;
struct ovsdb_txn;
+struct simap;
struct uuid;
/* Database schema. */
struct uuid;
/* Database schema. */
@@
-66,9
+67,7
@@
struct ovsdb {
struct ovsdb *ovsdb_create(struct ovsdb_schema *);
void ovsdb_destroy(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 *);
struct ovsdb_table *ovsdb_get_table(const struct ovsdb *, const char *);