ovsdb-server: Refactoring and clean up remote status reporting.

[cascardo/ovs.git] / ovsdb / jsonrpc-server.h

diff --git a/ovsdb/jsonrpc-server.h b/ovsdb/jsonrpc-server.h
index 6c4acd7..7a0bd31 100644 (file)
--- a/ovsdb/jsonrpc-server.h
+++ b/ovsdb/jsonrpc-server.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2010 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.
@@ -16,16 +16,61 @@
 #ifndef OVSDB_JSONRPC_SERVER_H
 #define OVSDB_JSONRPC_SERVER_H 1
 
+#include <stdbool.h>
+#include "openvswitch/types.h"
+
 struct ovsdb;
 struct shash;
+struct simap;
 
-struct ovsdb_jsonrpc_server *ovsdb_jsonrpc_server_create(struct ovsdb *);
+struct ovsdb_jsonrpc_server *ovsdb_jsonrpc_server_create(void);
+bool ovsdb_jsonrpc_server_add_db(struct ovsdb_jsonrpc_server *,
+                                 struct ovsdb *);
+bool ovsdb_jsonrpc_server_remove_db(struct ovsdb_jsonrpc_server *,
+                                     struct ovsdb *);
 void ovsdb_jsonrpc_server_destroy(struct ovsdb_jsonrpc_server *);
 
+/* Options for a remote. */
+struct ovsdb_jsonrpc_options {
+    int max_backoff;            /* Maximum reconnection backoff, in msec. */
+    int probe_interval;         /* Max idle time before probing, in msec. */
+    int dscp;                   /* Dscp value for manager connections */
+};
+struct ovsdb_jsonrpc_options *
+ovsdb_jsonrpc_default_options(const char *target);
+
 void ovsdb_jsonrpc_server_set_remotes(struct ovsdb_jsonrpc_server *,
                                       const struct shash *);
 
+/* Status of a single remote connection. */
+struct ovsdb_jsonrpc_remote_status {
+    const char *state;
+    int last_error;
+    unsigned int sec_since_connect;
+    unsigned int sec_since_disconnect;
+    bool is_connected;
+    char *locks_held;
+    char *locks_waiting;
+    char *locks_lost;
+    int n_connections;
+    ovs_be16 bound_port;
+};
+bool ovsdb_jsonrpc_server_get_remote_status(
+    const struct ovsdb_jsonrpc_server *, const char *target,
+    struct ovsdb_jsonrpc_remote_status *);
+void ovsdb_jsonrpc_server_free_remote_status(
+    struct ovsdb_jsonrpc_remote_status *);
+
+void ovsdb_jsonrpc_server_reconnect(struct ovsdb_jsonrpc_server *);
+
 void ovsdb_jsonrpc_server_run(struct ovsdb_jsonrpc_server *);
 void ovsdb_jsonrpc_server_wait(struct ovsdb_jsonrpc_server *);
 
+void ovsdb_jsonrpc_server_get_memory_usage(const struct ovsdb_jsonrpc_server *,
+                                           struct simap *usage);
+
+struct ovsdb_jsonrpc_monitor;
+void ovsdb_jsonrpc_monitor_destroy(struct ovsdb_jsonrpc_monitor *);
+void ovsdb_jsonrpc_disable_monitor2(void);
+
 #endif /* ovsdb/jsonrpc-server.h */