X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ovsdb%2Fovsdb.h;h=e976d3be06080b8f40c3ca13439efb8ba5011ba8;hb=HEAD;hp=834ff1a994af37ba12757e64b74ad9f5d6ec0f0c;hpb=403e3a25f89ba9f2efb9a8c43e4e585f4af2ac67;p=sliver-openvswitch.git

diff --git a/ovsdb/ovsdb.h b/ovsdb/ovsdb.h
index 834ff1a99..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.
@@ -23,7 +23,9 @@
 
 struct json;
 struct ovsdb_log;
+struct ovsdb_session;
 struct ovsdb_txn;
+struct simap;
 struct uuid;
 
 /* Database schema. */
@@ -65,13 +67,12 @@ 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 json *ovsdb_execute(struct ovsdb *, const struct json *params,
+struct json *ovsdb_execute(struct ovsdb *, const struct ovsdb_session *,
+                           const struct json *params,
                            long long int elapsed_msec,
                            long long int *timeout_msec);