projects
/
cascardo
/
ovs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
command-line: add ovs_cmdl_ prefix
[cascardo/ovs.git]
/
ovsdb
/
server.h
diff --git
a/ovsdb/server.h
b/ovsdb/server.h
index
17e4222
..
82c733f
100644
(file)
--- a/
ovsdb/server.h
+++ b/
ovsdb/server.h
@@
-1,4
+1,4
@@
-/* Copyright (c) 2011, 2012 Nicira
Networks
+/* Copyright (c) 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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-18,17
+18,21
@@
#include "hmap.h"
#include "list.h"
#include "hmap.h"
#include "list.h"
+#include "shash.h"
+
+struct ovsdb;
+struct ovsdb_server;
/* Abstract representation of an OVSDB client connection, not tied to any
* particular network protocol. Protocol implementations
* (e.g. jsonrpc-server.c) embed this in a larger data structure. */
struct ovsdb_session {
/* Abstract representation of an OVSDB client connection, not tied to any
* particular network protocol. Protocol implementations
* (e.g. jsonrpc-server.c) embed this in a larger data structure. */
struct ovsdb_session {
- struct ovsdb
*db
;
- struct
list completions;
/* Completed triggers. */
+ struct ovsdb
_server *server
;
+ struct
ovs_list completions;
/* Completed triggers. */
struct hmap waiters; /* "ovsdb_lock_waiter *"s by lock name. */
};
struct hmap waiters; /* "ovsdb_lock_waiter *"s by lock name. */
};
-void ovsdb_session_init(struct ovsdb_session *, struct ovsdb *);
+void ovsdb_session_init(struct ovsdb_session *, struct ovsdb
_server
*);
void ovsdb_session_destroy(struct ovsdb_session *);
struct ovsdb_lock_waiter *ovsdb_session_get_lock_waiter(
void ovsdb_session_destroy(struct ovsdb_session *);
struct ovsdb_lock_waiter *ovsdb_session_get_lock_waiter(
@@
-42,7
+46,7
@@
struct ovsdb_lock {
struct hmap_node hmap_node; /* In ovsdb_server's "locks" hmap. */
struct ovsdb_server *server; /* The containing server. */
char *name; /* Unique name. */
struct hmap_node hmap_node; /* In ovsdb_server's "locks" hmap. */
struct ovsdb_server *server; /* The containing server. */
char *name; /* Unique name. */
- struct
list waiters;
/* Contains "struct ovsdb_lock_waiter"s. */
+ struct
ovs_list waiters;
/* Contains "struct ovsdb_lock_waiter"s. */
};
struct ovsdb_lock_waiter *ovsdb_lock_get_owner(const struct ovsdb_lock *);
};
struct ovsdb_lock_waiter *ovsdb_lock_get_owner(const struct ovsdb_lock *);
@@
-62,7
+66,7
@@
struct ovsdb_lock_waiter {
char *lock_name;
struct ovsdb_session *session;
char *lock_name;
struct ovsdb_session *session;
- struct
list lock_node;
/* In ->lock->waiters's list. */
+ struct
ovs_list lock_node;
/* In ->lock->waiters's list. */
};
struct ovsdb_session *ovsdb_lock_waiter_remove(struct ovsdb_lock_waiter *);
};
struct ovsdb_session *ovsdb_lock_waiter_remove(struct ovsdb_lock_waiter *);
@@
-73,11
+77,13
@@
bool ovsdb_lock_waiter_is_owner(const struct ovsdb_lock_waiter *);
* network protocol. Protocol implementations (e.g. jsonrpc-server.c) embed
* this in a larger data structure. */
struct ovsdb_server {
* network protocol. Protocol implementations (e.g. jsonrpc-server.c) embed
* this in a larger data structure. */
struct ovsdb_server {
- struct
ovsdb *db;
+ struct
shash dbs; /* Maps from a db name to a "struct ovsdb *". */
struct hmap locks; /* Contains "struct ovsdb_lock"s indexed by name. */
};
struct hmap locks; /* Contains "struct ovsdb_lock"s indexed by name. */
};
-void ovsdb_server_init(struct ovsdb_server *, struct ovsdb *);
+void ovsdb_server_init(struct ovsdb_server *);
+bool ovsdb_server_add_db(struct ovsdb_server *, struct ovsdb *);
+bool ovsdb_server_remove_db(struct ovsdb_server *, struct ovsdb *);
void ovsdb_server_destroy(struct ovsdb_server *);
struct ovsdb_lock_waiter *ovsdb_server_lock(struct ovsdb_server *,
void ovsdb_server_destroy(struct ovsdb_server *);
struct ovsdb_lock_waiter *ovsdb_server_lock(struct ovsdb_server *,