kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 90348 via svnmerge from

Browse Source 
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
This commit is contained in:
Russell Bryant
2007-11-30 19:34:47 +00:00
parent 45f98e5419
commit fac7480820
6 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/app_queue.c
View File

@@ -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);