diff options
author | Russell Bryant <russell@russellbryant.com> | 2007-11-30 19:34:47 +0000 |
---|---|---|
committer | Russell Bryant <russell@russellbryant.com> | 2007-11-30 19:34:47 +0000 |
commit | fac74808203c697677a87d34ccc409a3fe203a95 (patch) | |
tree | 7a9b4cd5fcd7c6762668e03902ccc2b5f07e8343 /apps/app_queue.c | |
parent | 45f98e541997648441c9c33175ddb7ef48f96ab2 (diff) |
Merged revisions 90348 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r90348 | russell | 2007-11-30 13:26:04 -0600 (Fri, 30 Nov 2007) | 8 lines
Change the behavior of ao2_link(). Previously, in inherited a reference.
Now, it automatically increases the reference count to reflect the reference
that is now held by the container.
This was done to be more consistent with ao2_unlink(), which automatically
releases the reference held by the container. It also makes it so it is
no longer possible for a pointer to be invalid after ao2_link() returns.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@90351 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_queue.c')
-rw-r--r-- | apps/app_queue.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c index 907fdaddd..d78420e12 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -1165,6 +1165,8 @@ static void rt_handle_member_record(struct call_queue *q, char *interface, const m->realtime = 1; add_to_interfaces(interface); ao2_link(q->members, m); + ao2_ref(m, -1); + m = NULL; q->membercount++; } } else { @@ -1284,7 +1286,6 @@ static struct call_queue *find_queue_by_name_rt(const char *queuename, struct as q->realtime = 1; init_queue(q); /* Ensure defaults for all parameters not set explicitly. */ ao2_link(queues, q); - queue_ref(q); } memset(tmpbuf, 0, sizeof(tmpbuf)); @@ -3373,6 +3374,8 @@ static int add_to_queue(const char *queuename, const char *interface, const char if ((new_member = create_queue_member(interface, membername, penalty, paused))) { new_member->dynamic = 1; ao2_link(q->members, new_member); + ao2_ref(new_member, -1); + new_member = NULL; q->membercount++; manager_event(EVENT_FLAG_AGENT, "QueueMemberAdded", "Queue: %s\r\n" @@ -4590,6 +4593,8 @@ static int reload_queues(int reload) newm = create_queue_member(interface, membername, penalty, cur ? cur->paused : 0); ao2_link(q->members, newm); + ao2_ref(newm, -1); + newm = NULL; if (cur) ao2_ref(cur, -1); @@ -4619,7 +4624,6 @@ static int reload_queues(int reload) if (new) { ao2_link(queues, q); - queue_ref(q); } else ao2_unlock(q); queue_unref(q); |