X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=ovsdb%2Fovsdb-server.c;h=c9b0fdd951378d661ef9c15fc5e6fe40b9b7fb2c;hb=be6255a8251ae69f8a5d54c5afad9604bf9e907b;hp=1dc9b7def3bbc19538826ba8324e83429bf20f52;hpb=8274ae959ac0b158c3e3206b3810af608fb93785;p=openvswitch diff --git a/ovsdb/ovsdb-server.c b/ovsdb/ovsdb-server.c index 1dc9b7de..c9b0fdd9 100644 --- a/ovsdb/ovsdb-server.c +++ b/ovsdb/ovsdb-server.c @@ -40,7 +40,7 @@ #include "stream-ssl.h" #include "stream.h" #include "stress.h" -#include "svec.h" +#include "sset.h" #include "table.h" #include "timeval.h" #include "transaction.h" @@ -64,15 +64,15 @@ static unixctl_cb_func ovsdb_server_compact; static unixctl_cb_func ovsdb_server_reconnect; static void parse_options(int argc, char *argv[], char **file_namep, - struct shash *remotes, char **unixctl_pathp, + struct sset *remotes, char **unixctl_pathp, char **run_command); static void usage(void) NO_RETURN; static void reconfigure_from_db(struct ovsdb_jsonrpc_server *jsonrpc, - const struct ovsdb *db, struct shash *remotes); + const struct ovsdb *db, struct sset *remotes); static void update_remote_status(const struct ovsdb_jsonrpc_server *jsonrpc, - const struct shash *remotes, + const struct sset *remotes, struct ovsdb *db); int @@ -82,7 +82,7 @@ main(int argc, char *argv[]) char *run_command = NULL; struct unixctl_server *unixctl; struct ovsdb_jsonrpc_server *jsonrpc; - struct shash remotes; + struct sset remotes; struct ovsdb_error *error; struct ovsdb_file *file; struct ovsdb *db; @@ -101,7 +101,6 @@ main(int argc, char *argv[]) parse_options(argc, argv, &file_name, &remotes, &unixctl_path, &run_command); - die_if_already_running(); daemonize_start(); error = ovsdb_file_open(file_name, false, &db, &file); @@ -171,7 +170,7 @@ main(int argc, char *argv[]) } ovsdb_jsonrpc_server_destroy(jsonrpc); ovsdb_destroy(db); - shash_destroy(&remotes); + sset_destroy(&remotes); unixctl_server_destroy(unixctl); if (run_process && process_exited(run_process)) { @@ -242,8 +241,7 @@ parse_db_string_column(const struct ovsdb *db, *tablep = table; } -#if HAVE_OPENSSL -static const char * +static OVS_UNUSED const char * query_db_string(const struct ovsdb *db, const char *name) { if (!name || strncmp(name, "db:", 3)) { @@ -269,7 +267,6 @@ query_db_string(const struct ovsdb *db, const char *name) return NULL; } } -#endif /* HAVE_OPENSSL */ static struct ovsdb_jsonrpc_options * add_remote(struct shash *remotes, const char *target) @@ -471,7 +468,7 @@ update_remote_row(const struct ovsdb_row *row, struct ovsdb_txn *txn, struct ovsdb_row *rw_row; const char *target; const struct ovsdb_jsonrpc_remote_status *status; - char *keys[3], *values[3]; + char *keys[4], *values[4]; size_t n = 0; /* Get the "target" (protocol/host/port) spec. */ @@ -497,8 +494,14 @@ update_remote_row(const struct ovsdb_row *row, struct ovsdb_txn *txn, keys[n] = xstrdup("state"); values[n++] = xstrdup(status->state); - keys[n] = xstrdup("time_in_state"); - values[n++] = xasprintf("%u", status->state_elapsed); + if (status->sec_since_connect != UINT_MAX) { + keys[n] = xstrdup("sec_since_connect"); + values[n++] = xasprintf("%u", status->sec_since_connect); + } + if (status->sec_since_disconnect != UINT_MAX) { + keys[n] = xstrdup("sec_since_disconnect"); + values[n++] = xasprintf("%u", status->sec_since_disconnect); + } if (status->last_error) { keys[n] = xstrdup("last_error"); values[n++] = @@ -547,14 +550,14 @@ update_remote_rows(const struct ovsdb *db, struct ovsdb_txn *txn, static void update_remote_status(const struct ovsdb_jsonrpc_server *jsonrpc, - const struct shash *remotes, struct ovsdb *db) + const struct sset *remotes, struct ovsdb *db) { static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 1); - struct shash_node *remote; struct shash statuses; struct ovsdb_txn *txn; const bool durable_txn = false; struct ovsdb_error *error; + const char *remote; /* Get status of current connections. */ ovsdb_jsonrpc_server_get_remote_status(jsonrpc, &statuses); @@ -562,8 +565,8 @@ update_remote_status(const struct ovsdb_jsonrpc_server *jsonrpc, txn = ovsdb_txn_create(db); /* Iterate over --remote arguments given on command line. */ - SHASH_FOR_EACH (remote, remotes) { - update_remote_rows(db, txn, remote->name, &statuses); + SSET_FOR_EACH (remote, remotes) { + update_remote_rows(db, txn, remote, &statuses); } error = ovsdb_txn_commit(txn, durable_txn); @@ -578,16 +581,14 @@ update_remote_status(const struct ovsdb_jsonrpc_server *jsonrpc, /* Reconfigures ovsdb-server based on information in the database. */ static void reconfigure_from_db(struct ovsdb_jsonrpc_server *jsonrpc, - const struct ovsdb *db, struct shash *remotes) + const struct ovsdb *db, struct sset *remotes) { struct shash resolved_remotes; - struct shash_node *node; + const char *name; /* Configure remotes. */ shash_init(&resolved_remotes); - SHASH_FOR_EACH (node, remotes) { - const char *name = node->name; - + SSET_FOR_EACH (name, remotes) { if (!strncmp(name, "db:", 3)) { query_db_remotes(name, db, &resolved_remotes); } else { @@ -595,7 +596,7 @@ reconfigure_from_db(struct ovsdb_jsonrpc_server *jsonrpc, } } ovsdb_jsonrpc_server_set_remotes(jsonrpc, &resolved_remotes); - shash_destroy(&resolved_remotes); + shash_destroy_free_data(&resolved_remotes); #if HAVE_OPENSSL /* Configure SSL. */ @@ -648,7 +649,7 @@ ovsdb_server_reconnect(struct unixctl_conn *conn, const char *args OVS_UNUSED, static void parse_options(int argc, char *argv[], char **file_namep, - struct shash *remotes, char **unixctl_pathp, + struct sset *remotes, char **unixctl_pathp, char **run_command) { enum { @@ -680,7 +681,7 @@ parse_options(int argc, char *argv[], char **file_namep, }; char *short_options = long_options_to_short_options(long_options); - shash_init(remotes); + sset_init(remotes); for (;;) { int c; @@ -691,7 +692,7 @@ parse_options(int argc, char *argv[], char **file_namep, switch (c) { case OPT_REMOTE: - shash_add_once(remotes, optarg, NULL); + sset_add(remotes, optarg); break; case OPT_UNIXCTL: