netdev-dpdk: fix mbuf leaks

[cascardo/ovs.git] / ovsdb / row.h

diff --git a/ovsdb/row.h b/ovsdb/row.h
index 6c249a1..62820d5 100644 (file)
--- a/ovsdb/row.h
+++ b/ovsdb/row.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2010 Nicira Networks
+/* Copyright (c) 2009, 2010, 2011, 2012 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,20 +36,20 @@ struct ovsdb_column_set;
  * ovsdb_weak_ref" structures are created for them.
  */
 struct ovsdb_weak_ref {
-    struct list src_node;       /* In src->src_refs list. */
-    struct list dst_node;       /* In destination row's dst_refs list. */
+    struct ovs_list src_node;   /* In src->src_refs list. */
+    struct ovs_list dst_node;   /* In destination row's dst_refs list. */
     struct ovsdb_row *src;      /* Source row. */
 };
 
 /* A row in a database table. */
 struct ovsdb_row {
-    struct ovsdb_table *table;     /* Table to which this belongs. */
     struct hmap_node hmap_node;    /* Element in ovsdb_table's 'rows' hmap. */
+    struct ovsdb_table *table;     /* Table to which this belongs. */
     struct ovsdb_txn_row *txn_row; /* Transaction that row is in, if any. */
 
     /* Weak references. */
-    struct list src_refs;       /* Weak references from this row. */
-    struct list dst_refs;       /* Weak references to this row. */
+    struct ovs_list src_refs;   /* Weak references from this row. */
+    struct ovs_list dst_refs;   /* Weak references to this row. */
 
     /* Number of strong refs to this row from other rows, in this table or
      * other tables, through 'uuid' columns that have a 'refTable' constraint
@@ -58,7 +58,13 @@ struct ovsdb_row {
      * commit. */
     size_t n_refs;
 
+    /* One datum for each column (shash_count(&table->schema->columns)
+     * elements). */
     struct ovsdb_datum fields[];
+
+    /* Followed by table->schema->n_indexes "struct hmap_node"s.  In rows that
+     * have have been committed as part of the database, the hmap_node with
+     * index 'i' is contained in hmap table->indexes[i].  */
 };
 
 struct ovsdb_row *ovsdb_row_create(const struct ovsdb_table *);
@@ -76,12 +82,13 @@ int ovsdb_row_compare_columns_3way(const struct ovsdb_row *,
                                    const struct ovsdb_column_set *);
 void ovsdb_row_update_columns(struct ovsdb_row *, const struct ovsdb_row *,
                               const struct ovsdb_column_set *);
-
+void ovsdb_row_columns_to_string(const struct ovsdb_row *,
+                                 const struct ovsdb_column_set *, struct ds *);
 struct ovsdb_error *ovsdb_row_from_json(struct ovsdb_row *,
                                         const struct json *,
                                         struct ovsdb_symbol_table *,
                                         struct ovsdb_column_set *included)
-    WARN_UNUSED_RESULT;
+    OVS_WARN_UNUSED_RESULT;
 struct json *ovsdb_row_to_json(const struct ovsdb_row *,
                                const struct ovsdb_column_set *include);