-/* Copyright (c) 2009 Nicira Networks.
+/* Copyright (c) 2009, 2010 Nicira Networks.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
struct ovsdb_idl_column {
char *name;
struct ovsdb_type type;
+ void (*parse)(struct ovsdb_idl_row *, const struct ovsdb_datum *);
+ void (*unparse)(struct ovsdb_idl_row *);
};
struct ovsdb_idl_table_class {
const struct ovsdb_idl_column *columns;
size_t n_columns;
size_t allocation_size;
- void (*parse)(struct ovsdb_idl_row *);
- void (*unparse)(struct ovsdb_idl_row *);
};
struct ovsdb_idl_table {
struct ovsdb_idl_table_class *dst_table,
const struct uuid *dst_uuid);
-struct ovsdb_idl_row *ovsdb_idl_first_row(
- const struct ovsdb_idl *, const struct ovsdb_idl_table_class *);
-
-struct ovsdb_idl_row *ovsdb_idl_next_row(const struct ovsdb_idl_row *);
-
-void ovsdb_idl_txn_write(struct ovsdb_idl_row *,
- const struct ovsdb_idl_column *,
- struct ovsdb_datum *);
void ovsdb_idl_txn_verify(const struct ovsdb_idl_row *,
const struct ovsdb_idl_column *);
void ovsdb_idl_txn_delete(struct ovsdb_idl_row *);
const struct uuid *);
static void ovsdb_idl_row_destroy(struct ovsdb_idl_row *);
+static void ovsdb_idl_row_parse(struct ovsdb_idl_row *);
+static void ovsdb_idl_row_unparse(struct ovsdb_idl_row *);
static void ovsdb_idl_row_clear_old(struct ovsdb_idl_row *);
static void ovsdb_idl_row_clear_new(struct ovsdb_idl_row *);
struct ovsdb_idl_arc *arc, *next_arc;
if (!ovsdb_idl_row_is_orphan(row)) {
- (row->table->class->unparse)(row);
+ ovsdb_idl_row_unparse(row);
ovsdb_idl_row_clear_old(row);
}
hmap_remove(&table->rows, &row->hmap_node);
return !row->old;
}
+static void
+ovsdb_idl_row_parse(struct ovsdb_idl_row *row)
+{
+ const struct ovsdb_idl_table_class *class = row->table->class;
+ size_t i;
+
+ for (i = 0; i < class->n_columns; i++) {
+ const struct ovsdb_idl_column *c = &class->columns[i];
+ (c->parse)(row, &row->old[i]);
+ }
+}
+
+static void
+ovsdb_idl_row_unparse(struct ovsdb_idl_row *row)
+{
+ const struct ovsdb_idl_table_class *class = row->table->class;
+ size_t i;
+
+ for (i = 0; i < class->n_columns; i++) {
+ const struct ovsdb_idl_column *c = &class->columns[i];
+ (c->unparse)(row);
+ }
+}
+
static void
ovsdb_idl_row_clear_old(struct ovsdb_idl_row *row)
{
/* This is trickier than it looks. ovsdb_idl_row_clear_arcs() will destroy
* 'arc', so we need to use the "safe" variant of list traversal. However,
- * calling ref->table->class->parse will add an arc equivalent to 'arc' to
- * row->arcs. That could be a problem for traversal, but it adds it at the
- * beginning of the list to prevent us from stumbling upon it again.
+ * calling an ovsdb_idl_column's 'parse' function will add an arc
+ * equivalent to 'arc' to row->arcs. That could be a problem for
+ * traversal, but it adds it at the beginning of the list to prevent us
+ * from stumbling upon it again.
*
* (If duplicate arcs were possible then we would need to make sure that
* 'next' didn't also point into 'arc''s destination, but we forbid
&row->dst_arcs) {
struct ovsdb_idl_row *ref = arc->src;
- (ref->table->class->unparse)(ref);
+ ovsdb_idl_row_unparse(ref);
ovsdb_idl_row_clear_arcs(ref, destroy_dsts);
- (ref->table->class->parse)(ref);
+ ovsdb_idl_row_parse(ref);
}
}
ovsdb_datum_init_default(&row->old[i], &class->columns[i].type);
}
ovsdb_idl_row_update(row, row_json);
- (class->parse)(row);
+ ovsdb_idl_row_parse(row);
ovsdb_idl_row_reparse_backrefs(row, false);
}
static void
ovsdb_idl_delete_row(struct ovsdb_idl_row *row)
{
- (row->table->class->unparse)(row);
+ ovsdb_idl_row_unparse(row);
ovsdb_idl_row_clear_arcs(row, true);
ovsdb_idl_row_clear_old(row);
if (list_is_empty(&row->dst_arcs)) {
static void
ovsdb_idl_modify_row(struct ovsdb_idl_row *row, const struct json *row_json)
{
- (row->table->class->unparse)(row);
+ ovsdb_idl_row_unparse(row);
ovsdb_idl_row_clear_arcs(row, true);
ovsdb_idl_row_update(row, row_json);
- (row->table->class->parse)(row);
+ ovsdb_idl_row_parse(row);
}
static bool
*
* We only need to test whether the first arc in dst->dst_arcs originates
* at 'src', since we add all of the arcs from a given source in a clump
- * (in a single call to a row's ->parse function) and new arcs are always
+ * (in a single call to ovsdb_idl_row_parse()) and new arcs are always
* added at the front of the dst_arcs list. */
if (list_is_empty(&dst->dst_arcs)) {
return true;
dst_table = ovsdb_idl_table_from_class(idl, dst_table_class);
dst = ovsdb_idl_get_row(dst_table, dst_uuid);
- if (!dst) {
- dst = ovsdb_idl_row_create(dst_table, dst_uuid);
- }
+ if (idl->txn) {
+ /* We're being called from ovsdb_idl_txn_write(). We must not update
+ * any arcs, because the transaction will be backed out at commit or
+ * abort time and we don't want our graph screwed up.
+ *
+ * Just return the destination row, if there is one and it has not been
+ * deleted. */
+ if (dst && (hmap_node_is_null(&dst->txn_node) || dst->new)) {
+ return dst;
+ }
+ return NULL;
+ } else {
+ /* We're being called from some other context. Update the graph. */
+ if (!dst) {
+ dst = ovsdb_idl_row_create(dst_table, dst_uuid);
+ }
- /* Add a new arc, if it wouldn't be a self-arc or a duplicate arc. */
- if (may_add_arc(src, dst)) {
- /* The arc *must* be added at the front of the dst_arcs list. See
- * ovsdb_idl_row_reparse_backrefs() for details. */
- arc = xmalloc(sizeof *arc);
- list_push_front(&src->src_arcs, &arc->src_node);
- list_push_front(&dst->dst_arcs, &arc->dst_node);
- arc->src = src;
- arc->dst = dst;
+ /* Add a new arc, if it wouldn't be a self-arc or a duplicate arc. */
+ if (may_add_arc(src, dst)) {
+ /* The arc *must* be added at the front of the dst_arcs list. See
+ * ovsdb_idl_row_reparse_backrefs() for details. */
+ arc = xmalloc(sizeof *arc);
+ list_push_front(&src->src_arcs, &arc->src_node);
+ list_push_front(&dst->dst_arcs, &arc->dst_node);
+ arc->src = src;
+ arc->dst = dst;
+ }
+
+ return !ovsdb_idl_row_is_orphan(dst) ? dst : NULL;
}
+}
- return !ovsdb_idl_row_is_orphan(dst) ? dst : NULL;
+const struct ovsdb_idl_row *
+ovsdb_idl_get_row_for_uuid(const struct ovsdb_idl *idl,
+ const struct ovsdb_idl_table_class *tc,
+ const struct uuid *uuid)
+{
+ return ovsdb_idl_get_row(ovsdb_idl_table_from_class(idl, tc), uuid);
}
static struct ovsdb_idl_row *
return NULL;
}
-struct ovsdb_idl_row *
+const struct ovsdb_idl_row *
ovsdb_idl_first_row(const struct ovsdb_idl *idl,
const struct ovsdb_idl_table_class *table_class)
{
return next_real_row(table, hmap_first(&table->rows));
}
-struct ovsdb_idl_row *
+const struct ovsdb_idl_row *
ovsdb_idl_next_row(const struct ovsdb_idl_row *row)
{
struct ovsdb_idl_table *table = row->table;
{
struct ovsdb_idl_row *row, *next;
+ /* This must happen early. Otherwise, ovsdb_idl_row_parse() will call an
+ * ovsdb_idl_column's 'parse' function, which will call
+ * ovsdb_idl_get_row_arc(), which will seen that the IDL is in a
+ * transaction and fail to update the graph. */
+ txn->idl->txn = NULL;
+
HMAP_FOR_EACH_SAFE (row, next, struct ovsdb_idl_row, txn_node,
&txn->txn_rows) {
- if (row->old && row->written) {
- (row->table->class->unparse)(row);
- ovsdb_idl_row_clear_arcs(row, false);
- (row->table->class->parse)(row);
+ if (row->old) {
+ if (row->written) {
+ ovsdb_idl_row_unparse(row);
+ ovsdb_idl_row_clear_arcs(row, false);
+ ovsdb_idl_row_parse(row);
+ }
+ } else {
+ hmap_remove(&row->table->rows, &row->hmap_node);
}
ovsdb_idl_row_clear_new(row);
BITMAP_FOR_EACH_1 (idx, class->n_columns, row->written) {
const struct ovsdb_idl_column *column = &class->columns[idx];
- if (!row->old || !ovsdb_datum_equals(&row->old[idx],
- &row->new[idx],
- &column->type)) {
+ if (row->old
+ ? !ovsdb_datum_equals(&row->old[idx], &row->new[idx],
+ &column->type)
+ : !ovsdb_datum_is_default(&row->new[idx], &column->type)) {
json_object_put(row_json, column->name,
substitute_uuids(
ovsdb_datum_to_json(&row->new[idx],
txn->status = TXN_INCOMPLETE;
}
- txn->idl->txn = NULL;
ovsdb_idl_txn_disassemble(txn);
return txn->status;
}
}
void
-ovsdb_idl_txn_write(struct ovsdb_idl_row *row,
+ovsdb_idl_txn_read(const struct ovsdb_idl_row *row,
+ const struct ovsdb_idl_column *column,
+ struct ovsdb_datum *datum)
+{
+ const struct ovsdb_idl_table_class *class = row->table->class;
+ size_t column_idx = column - class->columns;
+
+ assert(row->new != NULL);
+ if (row->written && bitmap_is_set(row->written, column_idx)) {
+ ovsdb_datum_clone(datum, &row->new[column_idx], &column->type);
+ } else if (row->old) {
+ ovsdb_datum_clone(datum, &row->old[column_idx], &column->type);
+ } else {
+ ovsdb_datum_init_default(datum, &column->type);
+ }
+}
+
+void
+ovsdb_idl_txn_write(const struct ovsdb_idl_row *row_,
const struct ovsdb_idl_column *column,
struct ovsdb_datum *datum)
{
+ struct ovsdb_idl_row *row = (struct ovsdb_idl_row *) row_;
const struct ovsdb_idl_table_class *class = row->table->class;
size_t column_idx = column - class->columns;
- assert(row->new);
+ assert(row->new != NULL);
if (hmap_node_is_null(&row->txn_node)) {
hmap_insert(&row->table->idl->txn->txn_rows, &row->txn_node,
uuid_hash(&row->uuid));
bitmap_set1(row->written, column_idx);
}
row->new[column_idx] = *datum;
+ (column->unparse)(row);
+ (column->parse)(row, &row->new[column_idx]);
}
void
const struct ovsdb_idl_table_class *class = row->table->class;
size_t column_idx = column - class->columns;
- assert(row->new);
+ assert(row->new != NULL);
if (!row->old
|| (row->written && bitmap_is_set(row->written, column_idx))) {
return;
void
ovsdb_idl_txn_delete(struct ovsdb_idl_row *row)
{
- assert(row->new);
+ assert(row->new != NULL);
if (!row->old) {
ovsdb_idl_row_clear_new(row);
assert(!row->prereqs);
+ hmap_remove(&row->table->rows, &row->hmap_node);
hmap_remove(&row->table->idl->txn->txn_rows, &row->txn_node);
free(row);
return;
row->table = ovsdb_idl_table_from_class(txn->idl, class);
row->new = xmalloc(class->n_columns * sizeof *row->new);
row->written = bitmap_allocate(class->n_columns);
+ hmap_insert(&row->table->rows, &row->hmap_node, uuid_hash(&row->uuid));
hmap_insert(&txn->txn_rows, &row->txn_node, uuid_hash(&row->uuid));
return row;
}
-/* Copyright (c) 2009 Nicira Networks.
+/* Copyright (c) 2009, 2010 Nicira Networks.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include <stdint.h>
struct json;
+struct ovsdb_datum;
struct ovsdb_idl_class;
+struct ovsdb_idl_column;
+struct ovsdb_idl_table_class;
+struct uuid;
struct ovsdb_idl *ovsdb_idl_create(const char *remote,
const struct ovsdb_idl_class *);
bool ovsdb_idl_has_ever_connected(const struct ovsdb_idl *);
void ovsdb_idl_force_reconnect(struct ovsdb_idl *);
+const struct ovsdb_idl_row *ovsdb_idl_get_row_for_uuid(
+ const struct ovsdb_idl *, const struct ovsdb_idl_table_class *,
+ const struct uuid *);
+const struct ovsdb_idl_row *ovsdb_idl_first_row(
+ const struct ovsdb_idl *, const struct ovsdb_idl_table_class *);
+const struct ovsdb_idl_row *ovsdb_idl_next_row(const struct ovsdb_idl_row *);
+
enum ovsdb_idl_txn_status {
TXN_UNCHANGED, /* Transaction didn't include any changes. */
TXN_INCOMPLETE, /* Commit in progress, please wait. */
int64_t ovsdb_idl_txn_get_increment_new_value(const struct ovsdb_idl_txn *);
void ovsdb_idl_txn_abort(struct ovsdb_idl_txn *);
+void ovsdb_idl_txn_read(const struct ovsdb_idl_row *,
+ const struct ovsdb_idl_column *,
+ struct ovsdb_datum *);
+void ovsdb_idl_txn_write(const struct ovsdb_idl_row *,
+ const struct ovsdb_idl_column *,
+ struct ovsdb_datum *);
+
#endif /* ovsdb-idl.h */
'boolean': 'bool ',
'string': 'char *'}[type]
-def cCopyType(indent, dstVar, dst, src, type, refTable=None):
+def cCopyType(indent, dst, src, type, refTable=None):
args = {'indent': indent,
- 'dstVar': dstVar,
'dst': dst,
'src': src}
if type == 'uuid' and refTable:
- return ("%(indent)s%(dstVar)s = %(src)s;\n" +
- "%(indent)s%(dst)s = %(src)s->header_.uuid;") % args
+ return ("%(indent)s%(dst)s = %(src)s->header_.uuid;") % args
elif type == 'string':
- return "%(indent)s%(dstVar)s = %(dst)s = xstrdup(%(src)s);" % args
+ return "%(indent)s%(dst)s = xstrdup(%(src)s);" % args
else:
- return "%(dstVar)s = %(dst)s = %(src)s;" % args
+ return "%(indent)s%(dst)s = %(src)s;" % args
def typeIsOptionalPointer(type):
return (type.min == 0 and type.max == 1 and not type.value
else:
return ""
+def cInitDefault(var, type, refTable, isOptional):
+ if type == 'uuid' and refTable:
+ return "%s = NULL;" % var
+ elif type == 'string' and not isOptional:
+ return "%s = \"\";" % var
+ else:
+ return {'integer': '%s = 0;',
+ 'real': '%s = 0.0;',
+ 'uuid': 'uuid_zero(&%s);',
+ 'boolean': '%s = false;',
+ 'string': '%s = NULL;'}[type] % var
+
def constify(cType, const):
if (const
and cType.endswith('*') and not cType.endswith('**')
#include <stdint.h>
#include "ovsdb-idl-provider.h"
#include "uuid.h"''' % {'prefix': prefix.upper()}
+
for tableName, table in schema.tables.iteritems():
- print
- print "/* %s table. */" % tableName
structName = "%s%s" % (prefix, tableName.lower())
+
+ print "\f"
+ print "/* %s table. */" % tableName
print "struct %s {" % structName
print "\tstruct ovsdb_idl_row header_;"
for columnName, column in table.columns.iteritems():
print "\n\t/* %s column. */" % columnName
for member in cMembers(prefix, columnName, column, False):
print "\t%(type)s%(name)s;%(comment)s" % member
- print '''\
-};
+ print "};"
+
+ # Column indexes.
+ printEnum(["%s_COL_%s" % (structName.upper(), columnName.upper())
+ for columnName in table.columns]
+ + ["%s_N_COLUMNS" % structName.upper()])
+
+ print
+ for columnName in table.columns:
+ print "#define %(s)s_col_%(c)s (%(s)s_columns[%(S)s_COL_%(C)s])" % {
+ 's': structName,
+ 'S': structName.upper(),
+ 'c': columnName,
+ 'C': columnName.upper()}
+ print "\nextern struct ovsdb_idl_column %s_columns[%s_N_COLUMNS];" % (structName, structName.upper())
+
+ print '''
const struct %(s)s *%(s)s_first(const struct ovsdb_idl *);
const struct %(s)s *%(s)s_next(const struct %(s)s *);
#define %(S)s_FOR_EACH(ROW, IDL) for ((ROW) = %(s)s_first(IDL); (ROW); (ROW) = %(s)s_next(ROW))
in cMembers(prefix, columnName, column, True)]
print '%s);' % ', '.join(args)
+ # Table indexes.
+ printEnum(["%sTABLE_%s" % (prefix.upper(), tableName.upper()) for tableName in schema.tables] + ["%sN_TABLES" % prefix.upper()])
+ print
+ for tableName in schema.tables:
+ print "#define %(p)stable_%(t)s (%(p)stable_classes[%(P)sTABLE_%(T)s])" % {
+ 'p': prefix,
+ 'P': prefix.upper(),
+ 't': tableName.lower(),
+ 'T': tableName.upper()}
+ print "\nextern struct ovsdb_idl_table_class %stable_classes[%sN_TABLES];" % (prefix, prefix.upper())
+
print "\nextern struct ovsdb_idl_class %sidl_class;" % prefix
print "\n#endif /* %(prefix)sIDL_HEADER */" % {'prefix': prefix.upper()}
#include <limits.h>
#include "ovsdb-data.h"''' % schema.idlHeader
- # Table indexes.
- printEnum(["%sTABLE_%s" % (prefix.upper(), tableName.upper()) for tableName in schema.tables] + ["%sN_TABLES" % prefix.upper()])
- print "\nstatic struct ovsdb_idl_table_class %stable_classes[%sN_TABLES];" % (prefix, prefix.upper())
-
# Cast functions.
for tableName, table in schema.tables.iteritems():
structName = "%s%s" % (prefix, tableName.lower())
print '''
static struct %(s)s *
-%(s)s_cast(struct ovsdb_idl_row *row)
+%(s)s_cast(const struct ovsdb_idl_row *row)
{
return row ? CONTAINER_OF(row, struct %(s)s, header_) : NULL;
}\
else:
print "/* %s table. */" % (tableName)
- # Column indexes.
- printEnum(["%s_COL_%s" % (structName.upper(), columnName.upper())
- for columnName in table.columns]
- + ["%s_N_COLUMNS" % structName.upper()])
-
- print "\nstatic struct ovsdb_idl_column %s_columns[];" % structName
-
- # Parse function.
- print '''
+ # Parse functions.
+ for columnName, column in table.columns.iteritems():
+ print '''
static void
-%s_parse(struct ovsdb_idl_row *row_)
+%(s)s_parse_%(c)s(struct ovsdb_idl_row *row_, const struct ovsdb_datum *datum)
{
- struct %s *row = %s_cast(row_);
- const struct ovsdb_datum *datum;
- size_t i UNUSED;
-
- memset(row_ + 1, 0, sizeof *row - sizeof *row_);''' % (structName, structName, structName)
-
+ struct %(s)s *row = %(s)s_cast(row_);''' % {'s': structName,
+ 'c': columnName}
- for columnName, column in table.columns.iteritems():
type = column.type
refKey = type.key == "uuid" and type.keyRefTable
refValue = type.value == "uuid" and type.valueRefTable
- print
- print " datum = &row_->old[%s_COL_%s];" % (structName.upper(), columnName.upper())
if type.value:
keyVar = "row->key_%s" % columnName
valueVar = "row->value_%s" % columnName
keyVar = "row->%s" % columnName
valueVar = None
- if (type.min == 1 and type.max == 1) or typeIsOptionalPointer(type):
+ if ((type.min == 1 and type.max == 1) or
+ typeIsOptionalPointer(type)):
+ print
print " if (datum->n >= 1) {"
if not refKey:
print " %s = datum->keys[0].%s;" % (keyVar, type.key)
print " %s = datum->values[0].%s;" % (valueVar, type.value)
else:
print " %s = %s%s_cast(ovsdb_idl_get_row_arc(row_, &%stable_classes[%sTABLE_%s], &datum->values[0].uuid));" % (valueVar, prefix, type.valueRefTable.lower(), prefix, prefix.upper(), type.valueRefTable.upper())
- if (not typeIsOptionalPointer(type) and
- (type.key == "string" or type.value == "string")):
- print " } else {"
- if type.key == "string":
- print " %s = \"\";" % keyVar
- if type.value == "string":
- print " %s = \"\";" % valueVar
+ print " } else {"
+ print " %s" % cInitDefault(keyVar, type.key, type.keyRefTable, type.min == 0)
+ if valueVar:
+ print " %s" % cInitDefault(valueVar, type.value, type.valueRefTable, type.min == 0)
print " }"
-
else:
if type.max != 'unlimited':
- nMax = "MIN(%d, datum->n)" % type.max
+ print " size_t n = MIN(%d, datum->n);" % type.max
+ nMax = "n"
else:
nMax = "datum->n"
+ print " size_t i;"
+ print
+ print " %s = NULL;" % keyVar
+ if valueVar:
+ print " %s = NULL;" % valueVar
+ print " row->n_%s = 0;" % columnName
print " for (i = 0; i < %s; i++) {" % nMax
refs = []
if refKey:
if refs:
print " }"
print " }"
- print "}"
+ print "}"
- # Unparse function.
- nArrays = 0
+ # Unparse functions.
for columnName, column in table.columns.iteritems():
type = column.type
if (type.min != 1 or type.max != 1) and not typeIsOptionalPointer(type):
- if not nArrays:
- print '''
+ print '''
static void
-%s_unparse(struct ovsdb_idl_row *row_)
+%(s)s_unparse_%(c)s(struct ovsdb_idl_row *row_)
{
- struct %s *row = %s_cast(row_);
-''' % (structName, structName, structName)
+ struct %(s)s *row = %(s)s_cast(row_);
+''' % {'s': structName, 'c': columnName}
if type.value:
keyVar = "row->key_%s" % columnName
valueVar = "row->value_%s" % columnName
print " free(%s);" % keyVar
if valueVar:
print " free(%s);" % valueVar
- nArrays += 1
- if not nArrays:
- print '''
+ print '}'
+ else:
+ print '''
static void
-%s_unparse(struct ovsdb_idl_row *row UNUSED)
-{''' % (structName)
- print "}"
-
+%(s)s_unparse_%(c)s(struct ovsdb_idl_row *row UNUSED)
+{
+ /* Nothing to do. */
+}''' % {'s': structName, 'c': columnName}
+
# First, next functions.
print '''
const struct %(s)s *
else:
if len(members) > 1:
nVar = members[1]['name']
- print '%(s)s_set_%(c)s(const struct %(s)s *row_, %(args)s)' % \
+ print '%(s)s_set_%(c)s(const struct %(s)s *row, %(args)s)' % \
{'s': structName, 'c': columnName,
'args': ', '.join(['%(type)s%(name)s' % m for m in members])}
print "{"
- print " struct %(s)s *row = (struct %(s)s *) row_;" % {'s': structName}
print " struct ovsdb_datum datum;"
if type.min == 1 and type.max == 1:
print
print " datum.n = 1;"
print " datum.keys = xmalloc(sizeof *datum.keys);"
- print cCopyType(" ", "row->%s" % keyVar, "datum.keys[0].%s" % type.key, keyVar, type.key, type.keyRefTable)
+ print cCopyType(" ", "datum.keys[0].%s" % type.key, keyVar, type.key, type.keyRefTable)
if type.value:
print " datum.values = xmalloc(sizeof *datum.values);"
- print cCopyType(" ", "row->%s" % valueVar, "datum.values[0].%s" % type.value, valueVar, type.value, type.valueRefTable)
+ print cCopyType(" ", "datum.values[0].%s" % type.value, valueVar, type.value, type.valueRefTable)
else:
print " datum.values = NULL;"
elif typeIsOptionalPointer(type):
print " if (%s) {" % keyVar
print " datum.n = 1;"
print " datum.keys = xmalloc(sizeof *datum.keys);"
- print cCopyType(" ", "row->%s" % keyVar, "datum.keys[0].%s" % type.key, keyVar, type.key, type.keyRefTable)
+ print cCopyType(" ", "datum.keys[0].%s" % type.key, keyVar, type.key, type.keyRefTable)
print " } else {"
print " datum.n = 0;"
print " datum.keys = NULL;"
- print " row->%s = NULL;" % keyVar
print " }"
print " datum.values = NULL;"
else:
print " size_t i;"
print
- print " free(row->%s);" % keyVar
- print " row->%s = %s ? xmalloc(%s * sizeof *row->%s) : NULL;" % (keyVar, nVar, nVar, keyVar)
- print " row->%s = %s;" % (nVar, nVar)
- if type.value:
- print " free(row->%s);" % valueVar
- print " row->%s = xmalloc(%s * sizeof *row->%s);" % (valueVar, nVar, valueVar)
print " datum.n = %s;" % nVar
print " datum.keys = xmalloc(%s * sizeof *datum.keys);" % nVar
if type.value:
else:
print " datum.values = NULL;"
print " for (i = 0; i < %s; i++) {" % nVar
- print cCopyType(" ", "row->%s[i]" % keyVar, "datum.keys[i].%s" % type.key, "%s[i]" % keyVar, type.key, type.keyRefTable)
+ print cCopyType(" ", "datum.keys[i].%s" % type.key, "%s[i]" % keyVar, type.key, type.keyRefTable)
if type.value:
- print cCopyType(" ", "row->%s[i]" % valueVar, "datum.values[i].%s" % type.value, "%s[i]" % valueVar, type.value, type.valueRefTable)
+ print cCopyType(" ", "datum.values[i].%s" % type.value, "%s[i]" % valueVar, type.value, type.valueRefTable)
print " }"
print " ovsdb_idl_txn_write(&row->header_, &%(s)s_columns[%(S)s_COL_%(C)s], &datum);" \
% {'s': structName,
print "}"
# Table columns.
- print "\nstatic struct ovsdb_idl_column %s_columns[%s_N_COLUMNS] = {" % (
+ print "\nstruct ovsdb_idl_column %s_columns[%s_N_COLUMNS] = {" % (
structName, structName.upper())
for columnName, column in table.columns.iteritems():
type = column.type
max = "UINT_MAX"
else:
max = type.max
- print " {\"%s\", {OVSDB_TYPE_%s, OVSDB_TYPE_%s, %d, %s}}," % (
- columnName, type.key.upper(), valueTypeName,
- type.min, max)
+ print """\
+ {"%(c)s",
+ {OVSDB_TYPE_%(kt)s, OVSDB_TYPE_%(vt)s, %(min)s, %(max)s},
+ %(s)s_parse_%(c)s,
+ %(s)s_unparse_%(c)s},""" % {'c': columnName,
+ 's': structName,
+ 'kt': type.key.upper(),
+ 'vt': valueTypeName,
+ 'min': type.min,
+ 'max': max}
print "};"
# Table classes.
print "\f"
- print "static struct ovsdb_idl_table_class %stable_classes[%sN_TABLES] = {" % (prefix, prefix.upper())
+ print "struct ovsdb_idl_table_class %stable_classes[%sN_TABLES] = {" % (prefix, prefix.upper())
for tableName, table in schema.tables.iteritems():
structName = "%s%s" % (prefix, tableName.lower())
print " {\"%s\"," % tableName
print " %s_columns, ARRAY_SIZE(%s_columns)," % (
structName, structName)
- print " sizeof(struct %s)," % structName
- print " %s_parse," % structName
- print " %s_unparse}," % structName
+ print " sizeof(struct %s)}," % structName
print "};"
# IDL class.
projects / openvswitch / commitdiff