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 branch 'mainstream'
[sliver-openvswitch.git]
/
ovsdb
/
ovsdb-idlc.in
diff --git
a/ovsdb/ovsdb-idlc.in
b/ovsdb/ovsdb-idlc.in
index
6d49dd6
..
d680f7c
100755
(executable)
--- a/
ovsdb/ovsdb-idlc.in
+++ b/
ovsdb/ovsdb-idlc.in
@@
-166,6
+166,8
@@
struct %(s)s *%(s)s_insert(struct ovsdb_idl_txn *);
print "\nextern struct ovsdb_idl_class %sidl_class;" % prefix
print "\nvoid %sinit(void);" % prefix
print "\nextern struct ovsdb_idl_class %sidl_class;" % prefix
print "\nvoid %sinit(void);" % prefix
+
+ print "\nconst char * %sget_db_version(void);" % prefix
print "\n#endif /* %(prefix)sIDL_HEADER */" % {'prefix': prefix.upper()}
def printEnum(members):
print "\n#endif /* %(prefix)sIDL_HEADER */" % {'prefix': prefix.upper()}
def printEnum(members):
@@
-187,6
+189,7
@@
def printCIDLSource(schemaFile):
#include <config.h>
#include %s
#include <limits.h>
#include <config.h>
#include %s
#include <limits.h>
+#include "ovs-thread.h"
#include "ovsdb-data.h"
#include "ovsdb-error.h"
#include "util.h"
#include "ovsdb-data.h"
#include "ovsdb-error.h"
#include "util.h"
@@
-643,6
+646,7
@@
void
if (inited) {
return;
}
if (inited) {
return;
}
+ assert_single_threaded();
inited = true;
""" % prefix
for tableName, table in sorted(schema.tables.iteritems()):
inited = true;
""" % prefix
for tableName, table in sorted(schema.tables.iteritems()):
@@
-650,6
+654,16
@@
void
print " %s_columns_init();" % structName
print "}"
print " %s_columns_init();" % structName
print "}"
+ print """
+/* Return the schema version. The caller must not free the returned value. */
+const char *
+%sget_db_version(void)
+{
+ return "%s";
+}
+""" % (prefix, schema.version)
+
+
def ovsdb_escape(string):
def escape(match):
def ovsdb_escape(string):
def escape(match):