X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ovsdb%2Ffile.c;h=605e9cba32f3a2d5e2ae308776b51cac1a674150;hb=280c6e99fd5fcdaff5af6990f0c346d113d90cde;hp=846f55668e5f61bb7dad7ebeb1663cb1ceb7a227;hpb=5136ce492c414f377f7be9ae32b259abb9f76580;p=sliver-openvswitch.git

diff --git a/ovsdb/file.c b/ovsdb/file.c
index 846f55668..605e9cba3 100644
--- a/ovsdb/file.c
+++ b/ovsdb/file.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2010 Nicira Networks
+/* Copyright (c) 2009, 2010, 2011 Nicira Networks
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@
 #include "util.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(ovsdb_file)
+VLOG_DEFINE_THIS_MODULE(ovsdb_file);
 
 /* Minimum number of milliseconds between database compactions. */
 #define COMPACT_MIN_MSEC        (10 * 60 * 1000) /* 10 minutes. */
@@ -121,24 +121,16 @@ ovsdb_file_open_as_schema(const char *file_name,
 }
 
 static struct ovsdb_error *
-ovsdb_file_open__(const char *file_name,
-                  const struct ovsdb_schema *alternate_schema,
-                  bool read_only, struct ovsdb **dbp,
-                  struct ovsdb_file **filep)
+ovsdb_file_open_log(const char *file_name, enum ovsdb_log_open_mode open_mode,
+                    struct ovsdb_log **logp, struct ovsdb_schema **schemap)
 {
-    enum ovsdb_log_open_mode open_mode;
-    long long int oldest_commit;
-    unsigned int n_transactions;
     struct ovsdb_schema *schema = NULL;
-    struct ovsdb_error *error;
     struct ovsdb_log *log = NULL;
-    struct json *json;
-    struct ovsdb *db = NULL;
+    struct ovsdb_error *error;
+    struct json *json = NULL;
 
-    /* In read-only mode there is no ovsdb_file so 'filep' must be null. */
-    assert(!(read_only && filep));
+    assert(logp || schemap);
 
-    open_mode = read_only ? OVSDB_LOG_READ_ONLY : OVSDB_LOG_READ_WRITE;
     error = ovsdb_log_open(file_name, open_mode, -1, &log);
     if (error) {
         goto error;
@@ -153,12 +145,9 @@ ovsdb_file_open__(const char *file_name,
         goto error;
     }
 
-    if (alternate_schema) {
-        schema = ovsdb_schema_clone(alternate_schema);
-    } else {
+    if (schemap) {
         error = ovsdb_schema_from_json(json, &schema);
         if (error) {
-            json_destroy(json);
             error = ovsdb_wrap_error(error,
                                      "failed to parse \"%s\" as ovsdb schema",
                                      file_name);
@@ -167,8 +156,54 @@ ovsdb_file_open__(const char *file_name,
     }
     json_destroy(json);
 
-    db = ovsdb_create(schema);
-    schema = NULL;
+    if (logp) {
+        *logp = log;
+    } else {
+        ovsdb_log_close(log);
+    }
+    if (schemap) {
+        *schemap = schema;
+    }
+    return NULL;
+
+error:
+    ovsdb_log_close(log);
+    json_destroy(json);
+    if (logp) {
+        *logp = NULL;
+    }
+    if (schemap) {
+        *schemap = NULL;
+    }
+    return error;
+}
+
+static struct ovsdb_error *
+ovsdb_file_open__(const char *file_name,
+                  const struct ovsdb_schema *alternate_schema,
+                  bool read_only, struct ovsdb **dbp,
+                  struct ovsdb_file **filep)
+{
+    enum ovsdb_log_open_mode open_mode;
+    long long int oldest_commit;
+    unsigned int n_transactions;
+    struct ovsdb_schema *schema = NULL;
+    struct ovsdb_error *error;
+    struct ovsdb_log *log;
+    struct json *json;
+    struct ovsdb *db = NULL;
+
+    /* In read-only mode there is no ovsdb_file so 'filep' must be null. */
+    assert(!(read_only && filep));
+
+    open_mode = read_only ? OVSDB_LOG_READ_ONLY : OVSDB_LOG_READ_WRITE;
+    error = ovsdb_file_open_log(file_name, open_mode, &log,
+                                alternate_schema ? NULL : &schema);
+    if (error) {
+        goto error;
+    }
+
+    db = ovsdb_create(schema ? schema : ovsdb_schema_clone(alternate_schema));
 
     oldest_commit = LLONG_MAX;
     n_transactions = 0;
@@ -180,6 +215,7 @@ ovsdb_file_open__(const char *file_name,
                                          &date, &txn);
         json_destroy(json);
         if (error) {
+            ovsdb_log_unread(log);
             break;
         }
 
@@ -188,14 +224,18 @@ ovsdb_file_open__(const char *file_name,
             oldest_commit = date;
         }
 
-        ovsdb_txn_commit(txn, false);
+        error = ovsdb_txn_commit(txn, false);
+        if (error) {
+            ovsdb_log_unread(log);
+            break;
+        }
     }
     if (error) {
         /* Log error but otherwise ignore it.  Probably the database just got
          * truncated due to power failure etc. and we should use its current
          * contents. */
         char *msg = ovsdb_error_to_string(error);
-        VLOG_WARN("%s", msg);
+        VLOG_ERR("%s", msg);
         free(msg);
 
         ovsdb_error_destroy(error);
@@ -225,7 +265,6 @@ error:
         *filep = NULL;
     }
     ovsdb_destroy(db);
-    ovsdb_schema_destroy(schema);
     ovsdb_log_close(log);
     return error;
 }
@@ -370,9 +409,7 @@ ovsdb_file_txn_from_json(struct ovsdb *db, const struct json *json,
         if (!table) {
             if (!strcmp(table_name, "_date")
                 && node_json->type == JSON_INTEGER) {
-                if (date) {
-                    *date = json_integer(node_json);
-                }
+                *date = json_integer(node_json);
                 continue;
             } else if (!strcmp(table_name, "_comment") || converting) {
                 continue;
@@ -427,7 +464,7 @@ ovsdb_file_save_copy__(const char *file_name, int locking,
         const struct ovsdb_table *table = node->data;
         const struct ovsdb_row *row;
 
-        HMAP_FOR_EACH (row, struct ovsdb_row, hmap_node, &table->rows) {
+        HMAP_FOR_EACH (row, hmap_node, &table->rows) {
             ovsdb_file_txn_add_row(&ftxn, NULL, row, NULL);
         }
     }
@@ -460,6 +497,17 @@ ovsdb_file_save_copy(const char *file_name, int locking,
 {
     return ovsdb_file_save_copy__(file_name, locking, comment, db, NULL);
 }
+
+/* Opens database 'file_name', reads its schema, and closes it.  On success,
+ * stores the schema into '*schemap' and returns NULL; the caller then owns the
+ * schema.  On failure, returns an ovsdb_error (which the caller must destroy)
+ * and sets '*dbp' to NULL. */
+struct ovsdb_error *
+ovsdb_file_read_schema(const char *file_name, struct ovsdb_schema **schemap)
+{
+    assert(schemap != NULL);
+    return ovsdb_file_open_log(file_name, OVSDB_LOG_READ_ONLY, NULL, schemap);
+}
 
 /* Replica implementation. */