summaryrefslogtreecommitdiff
path: root/ovsdb/server.c
diff options
context:
space:
mode:
authorBen Warren <ben@skyportsystems.com>2016-03-25 14:10:22 -0700
committerBen Pfaff <blp@ovn.org>2016-03-30 13:04:32 -0700
commit417e7e66e1217ab984ebb058fb3b469e77e216fc (patch)
tree664ef5b9af86bfdaa212dec9dd3162746a3df890 /ovsdb/server.c
parentb19bab5b207da94c2f71b8df25fcfe47ee778a29 (diff)
downloadopenvswitch-417e7e66e1217ab984ebb058fb3b469e77e216fc.tar.gz
list: Rename all functions in list.h with ovs_ prefix.
This attempts to prevent namespace collisions with other list libraries Signed-off-by: Ben Warren <ben@skyportsystems.com> Signed-off-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'ovsdb/server.c')
-rw-r--r--ovsdb/server.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/ovsdb/server.c b/ovsdb/server.c
index 82f55cb19..eca915150 100644
--- a/ovsdb/server.c
+++ b/ovsdb/server.c
@@ -25,7 +25,7 @@ void
ovsdb_session_init(struct ovsdb_session *session, struct ovsdb_server *server)
{
session->server = server;
- list_init(&session->completions);
+ ovs_list_init(&session->completions);
hmap_init(&session->waiters);
}
@@ -60,7 +60,7 @@ ovsdb_session_get_lock_waiter(const struct ovsdb_session *session,
struct ovsdb_lock_waiter *
ovsdb_lock_get_owner(const struct ovsdb_lock *lock)
{
- return CONTAINER_OF(list_front(&lock->waiters),
+ return CONTAINER_OF(ovs_list_front(&lock->waiters),
struct ovsdb_lock_waiter, lock_node);
}
@@ -77,10 +77,10 @@ ovsdb_lock_waiter_remove(struct ovsdb_lock_waiter *waiter)
{
struct ovsdb_lock *lock = waiter->lock;
- list_remove(&waiter->lock_node);
+ ovs_list_remove(&waiter->lock_node);
waiter->lock = NULL;
- if (list_is_empty(&lock->waiters)) {
+ if (ovs_list_is_empty(&lock->waiters)) {
hmap_remove(&lock->server->locks, &lock->hmap_node);
free(lock->name);
free(lock);
@@ -169,7 +169,7 @@ ovsdb_server_create_lock__(struct ovsdb_server *server, const char *lock_name,
lock->server = server;
lock->name = xstrdup(lock_name);
hmap_insert(&server->locks, &lock->hmap_node, hash);
- list_init(&lock->waiters);
+ ovs_list_init(&lock->waiters);
return lock;
}
@@ -197,7 +197,7 @@ ovsdb_server_lock(struct ovsdb_server *server,
struct ovsdb_lock *lock;
lock = ovsdb_server_create_lock__(server, lock_name, hash);
- victim = (mode == OVSDB_LOCK_STEAL && !list_is_empty(&lock->waiters)
+ victim = (mode == OVSDB_LOCK_STEAL && !ovs_list_is_empty(&lock->waiters)
? ovsdb_lock_get_owner(lock)
: NULL);
@@ -206,9 +206,9 @@ ovsdb_server_lock(struct ovsdb_server *server,
waiter->lock_name = xstrdup(lock_name);
waiter->lock = lock;
if (mode == OVSDB_LOCK_STEAL) {
- list_push_front(&lock->waiters, &waiter->lock_node);
+ ovs_list_push_front(&lock->waiters, &waiter->lock_node);
} else {
- list_push_back(&lock->waiters, &waiter->lock_node);
+ ovs_list_push_back(&lock->waiters, &waiter->lock_node);
}
waiter->session = session;
hmap_insert(&waiter->session->waiters, &waiter->session_node, hash);