projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vswitchd: Create all interfaces at the same time.
[openvswitch]
/
ovsdb
/
jsonrpc-server.c
diff --git
a/ovsdb/jsonrpc-server.c
b/ovsdb/jsonrpc-server.c
index bc717e469a72153b615dce7f0e851d0439b68f2f..d58f9dc1734a20766805ef10e6ca2b8b88610b72 100644
(file)
--- a/
ovsdb/jsonrpc-server.c
+++ b/
ovsdb/jsonrpc-server.c
@@
-34,10
+34,10
@@
#include "timeval.h"
#include "transaction.h"
#include "trigger.h"
#include "timeval.h"
#include "transaction.h"
#include "trigger.h"
-
-#define THIS_MODULE VLM_ovsdb_jsonrpc_server
#include "vlog.h"
#include "vlog.h"
+VLOG_DEFINE_THIS_MODULE(ovsdb_jsonrpc_server)
+
struct ovsdb_jsonrpc_remote;
struct ovsdb_jsonrpc_session;
struct ovsdb_jsonrpc_remote;
struct ovsdb_jsonrpc_session;
@@
-323,8
+323,7
@@
ovsdb_jsonrpc_session_run_all(struct ovsdb_jsonrpc_remote *remote)
{
struct ovsdb_jsonrpc_session *s, *next;
{
struct ovsdb_jsonrpc_session *s, *next;
- LIST_FOR_EACH_SAFE (s, next, struct ovsdb_jsonrpc_session, node,
- &remote->sessions) {
+ LIST_FOR_EACH_SAFE (s, next, node, &remote->sessions) {
int error = ovsdb_jsonrpc_session_run(s);
if (error) {
ovsdb_jsonrpc_session_close(s);
int error = ovsdb_jsonrpc_session_run(s);
if (error) {
ovsdb_jsonrpc_session_close(s);
@@
-346,7
+345,7
@@
ovsdb_jsonrpc_session_wait_all(struct ovsdb_jsonrpc_remote *remote)
{
struct ovsdb_jsonrpc_session *s;
{
struct ovsdb_jsonrpc_session *s;
- LIST_FOR_EACH (s,
struct ovsdb_jsonrpc_session,
node, &remote->sessions) {
+ LIST_FOR_EACH (s, node, &remote->sessions) {
ovsdb_jsonrpc_session_wait(s);
}
}
ovsdb_jsonrpc_session_wait(s);
}
}
@@
-356,8
+355,7
@@
ovsdb_jsonrpc_session_close_all(struct ovsdb_jsonrpc_remote *remote)
{
struct ovsdb_jsonrpc_session *s, *next;
{
struct ovsdb_jsonrpc_session *s, *next;
- LIST_FOR_EACH_SAFE (s, next, struct ovsdb_jsonrpc_session, node,
- &remote->sessions) {
+ LIST_FOR_EACH_SAFE (s, next, node, &remote->sessions) {
ovsdb_jsonrpc_session_close(s);
}
}
ovsdb_jsonrpc_session_close(s);
}
}
@@
-369,8
+367,7
@@
ovsdb_jsonrpc_session_reconnect_all(struct ovsdb_jsonrpc_remote *remote)
{
struct ovsdb_jsonrpc_session *s, *next;
{
struct ovsdb_jsonrpc_session *s, *next;
- LIST_FOR_EACH_SAFE (s, next, struct ovsdb_jsonrpc_session, node,
- &remote->sessions) {
+ LIST_FOR_EACH_SAFE (s, next, node, &remote->sessions) {
jsonrpc_session_force_reconnect(s->js);
if (!jsonrpc_session_is_alive(s->js)) {
ovsdb_jsonrpc_session_close(s);
jsonrpc_session_force_reconnect(s->js);
if (!jsonrpc_session_is_alive(s->js)) {
ovsdb_jsonrpc_session_close(s);
@@
-554,8
+551,7
@@
ovsdb_jsonrpc_trigger_find(struct ovsdb_jsonrpc_session *s,
{
struct ovsdb_jsonrpc_trigger *t;
{
struct ovsdb_jsonrpc_trigger *t;
- HMAP_FOR_EACH_WITH_HASH (t, struct ovsdb_jsonrpc_trigger, hmap_node, hash,
- &s->triggers) {
+ HMAP_FOR_EACH_WITH_HASH (t, hmap_node, hash, &s->triggers) {
if (json_equal(t->id, id)) {
return t;
}
if (json_equal(t->id, id)) {
return t;
}
@@
-593,8
+589,7
@@
static void
ovsdb_jsonrpc_trigger_complete_all(struct ovsdb_jsonrpc_session *s)
{
struct ovsdb_jsonrpc_trigger *t, *next;
ovsdb_jsonrpc_trigger_complete_all(struct ovsdb_jsonrpc_session *s)
{
struct ovsdb_jsonrpc_trigger *t, *next;
- HMAP_FOR_EACH_SAFE (t, next, struct ovsdb_jsonrpc_trigger, hmap_node,
- &s->triggers) {
+ HMAP_FOR_EACH_SAFE (t, next, hmap_node, &s->triggers) {
ovsdb_jsonrpc_trigger_complete(t);
}
}
ovsdb_jsonrpc_trigger_complete(t);
}
}
@@
-671,8
+666,7
@@
ovsdb_jsonrpc_monitor_find(struct ovsdb_jsonrpc_session *s,
{
struct ovsdb_jsonrpc_monitor *m;
{
struct ovsdb_jsonrpc_monitor *m;
- HMAP_FOR_EACH_WITH_HASH (m, struct ovsdb_jsonrpc_monitor, node,
- json_hash(monitor_id, 0), &s->monitors) {
+ HMAP_FOR_EACH_WITH_HASH (m, node, json_hash(monitor_id, 0), &s->monitors) {
if (json_equal(m->monitor_id, monitor_id)) {
return m;
}
if (json_equal(m->monitor_id, monitor_id)) {
return m;
}
@@
-919,8
+913,7
@@
ovsdb_jsonrpc_monitor_remove_all(struct ovsdb_jsonrpc_session *s)
{
struct ovsdb_jsonrpc_monitor *m, *next;
{
struct ovsdb_jsonrpc_monitor *m, *next;
- HMAP_FOR_EACH_SAFE (m, next,
- struct ovsdb_jsonrpc_monitor, node, &s->monitors) {
+ HMAP_FOR_EACH_SAFE (m, next, node, &s->monitors) {
ovsdb_remove_replica(s->remote->server->db, &m->replica);
}
}
ovsdb_remove_replica(s->remote->server->db, &m->replica);
}
}
@@
-1097,8
+1090,7
@@
ovsdb_jsonrpc_monitor_get_initial(const struct ovsdb_jsonrpc_monitor *m)
if (mt->select & OJMS_INITIAL) {
struct ovsdb_row *row;
if (mt->select & OJMS_INITIAL) {
struct ovsdb_row *row;
- HMAP_FOR_EACH (row, struct ovsdb_row, hmap_node,
- &mt->table->rows) {
+ HMAP_FOR_EACH (row, hmap_node, &mt->table->rows) {
ovsdb_jsonrpc_monitor_change_cb(NULL, row, NULL, &aux);
}
}
ovsdb_jsonrpc_monitor_change_cb(NULL, row, NULL, &aux);
}
}