#define QUEUE_EVENT_VARIABLES 3
struct call_queue {
- ast_mutex_t lock;
char name[80]; /*!< Name */
char moh[80]; /*!< Music On Hold class to be used */
char announce[80]; /*!< Announcement to play when call is answered */
static AST_LIST_HEAD_STATIC(queues, call_queue);
static int set_member_paused(const char *queuename, const char *interface, int paused);
-
static void queue_transfer_fixup(void *data, struct ast_channel *old_chan, struct ast_channel *new_chan);
+static void free_members(struct call_queue *q, int all);
static void rr_dep_warning(void)
{
return -1;
}
+/*!
+ * \brief removes a call_queue from the list of call_queues
+ */
+static void remove_queue(struct call_queue *q)
+{
+ AST_LIST_LOCK(&queues);
+ if (AST_LIST_REMOVE(&queues, q, list)) {
+ ao2_ref(q, -1);
+ }
+ AST_LIST_UNLOCK(&queues);
+}
+
+static void destroy_queue(void *obj)
+{
+ struct call_queue *q = obj;
+ if (q->members) {
+ free_members(q, 1);
+ ao2_ref(q->members, -1);
+ }
+}
+
/*! \brief Insert the 'new' entry after the 'prev' entry of queue 'q' */
static inline void insert_entry(struct call_queue *q, struct queue_ent *prev, struct queue_ent *new, int *pos)
{
q->head = new;
}
new->next = cur;
+
+ /* every queue_ent must have a reference to it's parent call_queue, this
+ * reference does not go away until the end of the queue_ent's life, meaning
+ * that even when the queue_ent leaves the call_queue this ref must remain. */
+ ao2_ref(q, +1);
new->parent = q;
new->pos = ++(*pos);
new->opos = *pos;
struct ao2_iterator mem_iter;
enum queue_member_status result = QUEUE_NO_MEMBERS;
- ast_mutex_lock(&q->lock);
+ ao2_lock(q);
mem_iter = ao2_iterator_init(q->members, 0);
while ((member = ao2_iterator_next(&mem_iter))) {
if (max_penalty && (member->penalty > max_penalty)) {
ao2_ref(member, -1);
break;
default:
- ast_mutex_unlock(&q->lock);
+ ao2_unlock(q);
ao2_ref(member, -1);
return QUEUE_NORMAL;
}
}
ao2_iterator_destroy(&mem_iter);
- ast_mutex_unlock(&q->lock);
+ ao2_unlock(q);
return result;
}
AST_LIST_LOCK(&queues);
AST_LIST_TRAVERSE(&queues, q, list) {
- ast_mutex_lock(&q->lock);
+ ao2_lock(q);
mem_iter = ao2_iterator_init(q->members, 0);
while ((cur = ao2_iterator_next(&mem_iter))) {
char *slash_pos;
ao2_ref(cur, -1);
}
ao2_iterator_destroy(&mem_iter);
- ast_mutex_unlock(&q->lock);
+ ao2_unlock(q);
}
AST_LIST_UNLOCK(&queues);
{
struct call_queue *q;
- if ((q = ast_calloc(1, sizeof(*q)))) {
- ast_mutex_init(&q->lock);
+ if ((q = ao2_alloc(sizeof(*q), destroy_queue))) {
ast_copy_string(q->name, queuename, sizeof(q->name));
}
return q;
AST_LIST_LOCK(&queues);
AST_LIST_TRAVERSE(&queues, q, list) {
- ast_mutex_lock(&q->lock);
+ ao2_lock(q);
mem_iter = ao2_iterator_init(q->members, 0);
while ((mem = ao2_iterator_next(&mem_iter))) {
if (!strcasecmp(mem->state_interface, interface)) {
ao2_ref(mem, -1);
}
ao2_iterator_destroy(&mem_iter);
- ast_mutex_unlock(&q->lock);
+ ao2_unlock(q);
if (ret)
break;
}
ao2_iterator_destroy(&mem_iter);
}
-static void destroy_queue(struct call_queue *q)
-{
- free_members(q, 1);
- ast_mutex_destroy(&q->lock);
- ao2_ref(q->members, -1);
- free(q);
-}
-
/*!\brief Reload a single queue via realtime.
\return Return the queue, or NULL if it doesn't exist.
\note Should be called with the global qlock locked. */
/* Static queues override realtime. */
if (q) {
- ast_mutex_lock(&q->lock);
+ ao2_lock(q);
if (!q->realtime) {
if (q->dead) {
- ast_mutex_unlock(&q->lock);
+ ao2_unlock(q);
return NULL;
} else {
ast_log(LOG_WARNING, "Static queue '%s' already exists. Not loading from realtime\n", q->name);
- ast_mutex_unlock(&q->lock);
+ ao2_unlock(q);
return q;
}
}
/* Delete if unused (else will be deleted when last caller leaves). */
if (!q->count) {
/* Delete. */
- AST_LIST_REMOVE(&queues, q, list);
- ast_mutex_unlock(&q->lock);
- destroy_queue(q);
+ ao2_unlock(q);
+ remove_queue(q);
} else
- ast_mutex_unlock(&q->lock);
+ ao2_unlock(q);
}
return NULL;
}
if (!q) {
if (!(q = alloc_queue(queuename)))
return NULL;
- ast_mutex_lock(&q->lock);
+ ao2_lock(q);
clear_queue(q);
q->realtime = 1;
AST_LIST_INSERT_HEAD(&queues, q, list);
while ((m = ao2_iterator_next(&mem_iter))) {
if (m->dead) {
ao2_unlink(q->members, m);
- ast_mutex_unlock(&q->lock);
+ ao2_unlock(q);
remove_from_interfaces(m->state_interface);
- ast_mutex_lock(&q->lock);
+ ao2_lock(q);
q->membercount--;
}
ao2_ref(m, -1);
}
ao2_iterator_destroy(&mem_iter);
- ast_mutex_unlock(&q->lock);
+ ao2_unlock(q);
return q;
}
return;
}
- ast_mutex_lock(&q->lock);
+ ao2_lock(q);
/* Temporarily set realtime members dead so we can detect deleted ones.*/
mem_iter = ao2_iterator_init(q->members, 0);
while ((m = ao2_iterator_next(&mem_iter))) {
if (m->dead) {
ao2_unlink(q->members, m);
- ast_mutex_unlock(&q->lock);
+ ao2_unlock(q);
remove_from_interfaces(m->state_interface);
- ast_mutex_lock(&q->lock);
+ ao2_lock(q);
q->membercount--;
}
ao2_ref(m, -1);
}
ao2_iterator_destroy(&mem_iter);
- ast_mutex_unlock(&q->lock);
+ ao2_unlock(q);
ast_config_destroy(member_config);
}
return res;
AST_LIST_LOCK(&queues);
- ast_mutex_lock(&q->lock);
+ ao2_lock(q);
/* This is our one */
stat = get_member_status(q, qe->max_penalty);
if (option_debug)
ast_log(LOG_DEBUG, "Queue '%s' Join, Channel '%s', Position '%d'\n", q->name, qe->chan->name, qe->pos );
}
- ast_mutex_unlock(&q->lock);
+ ao2_unlock(q);
AST_LIST_UNLOCK(&queues);
return res;
/* Thanks to SRT for this contribution */
/* 2^2 (4) is the filter coefficient; a higher exponent would give old entries more weight */
- ast_mutex_lock(&qe->parent->lock);
+ ao2_lock(qe->parent);
oldvalue = qe->parent->holdtime;
qe->parent->holdtime = (((oldvalue << 2) - oldvalue) + newholdtime) >> 2;
- ast_mutex_unlock(&qe->parent->lock);
+ ao2_unlock(qe->parent);
}
if (!(q = qe->parent))
return;
- ast_mutex_lock(&q->lock);
+ ao2_lock(q);
prev = NULL;
for (cur = q->head; cur; cur = cur->next) {
prev = cur;
}
}
- ast_mutex_unlock(&q->lock);
+ ao2_unlock(q);
if (q->dead && !q->count) {
/* It's dead and nobody is in it, so kill it */
- AST_LIST_LOCK(&queues);
- AST_LIST_REMOVE(&queues, q, list);
- AST_LIST_UNLOCK(&queues);
- destroy_queue(q);
+ remove_queue(q);
}
}
AST_LIST_TRAVERSE(&queues, q, list) {
if (q == rq) /* don't check myself, could deadlock */
continue;
- ast_mutex_lock(&q->lock);
+ ao2_lock(q);
if (q->count && q->members) {
if ((mem = ao2_find(q->members, member, OBJ_POINTER))) {
ast_log(LOG_DEBUG, "Found matching member %s in queue '%s'\n", mem->interface, q->name);
ao2_ref(mem, -1);
}
}
- ast_mutex_unlock(&q->lock);
+ ao2_unlock(q);
if (found)
break;
}
update_status(tmp->member->state_interface, ast_device_state(tmp->member->state_interface));
- ast_mutex_lock(&qe->parent->lock);
+ ao2_lock(qe->parent);
qe->parent->rrpos++;
- ast_mutex_unlock(&qe->parent->lock);
+ ao2_unlock(&qe->parent);
(*busies)++;
return 0;
static void record_abandoned(struct queue_ent *qe)
{
- ast_mutex_lock(&qe->parent->lock);
+ ao2_lock(qe->parent);
manager_event(EVENT_FLAG_AGENT, "QueueCallerAbandon",
"Queue: %s\r\n"
"Uniqueid: %s\r\n"
qe->parent->name, qe->chan->uniqueid, qe->pos, qe->opos, (int)(time(NULL) - qe->start));
qe->parent->callsabandoned++;
- ast_mutex_unlock(&qe->parent->lock);
+ ao2_unlock(&qe->parent);
}
/*! \brief RNA == Ring No Answer. Common code that is executed when we try a queue member and they don't answer. */
int avl;
int idx = 0;
/* This needs a lock. How many members are available to be served? */
- ast_mutex_lock(&qe->parent->lock);
+ ao2_lock(qe->parent);
avl = num_available_members(qe->parent);
ch = ch->next;
}
- ast_mutex_unlock(&qe->parent->lock);
+ ao2_unlock(qe->parent);
/* If the queue entry is within avl [the number of available members] calls from the top ... */
if (ch && idx < avl) {
static int update_queue(struct call_queue *q, struct member *member, int callcompletedinsl)
{
- ast_mutex_lock(&q->lock);
+ ao2_lock(q);
time(&member->lastcall);
member->calls++;
q->callscompleted++;
if (callcompletedinsl)
q->callscompletedinsl++;
- ast_mutex_unlock(&q->lock);
+ ao2_unlock(q);
return 0;
}
/* Hold the lock while we setup the outgoing calls */
if (use_weight)
AST_LIST_LOCK(&queues);
- ast_mutex_lock(&qe->parent->lock);
+ ao2_lock(qe->parent);
if (option_debug)
ast_log(LOG_DEBUG, "%s is trying to call a queue member.\n",
qe->chan->name);
if (!tmp) {
ao2_iterator_destroy(&memi);
ao2_ref(cur, -1);
- ast_mutex_unlock(&qe->parent->lock);
+ ao2_unlock(qe->parent);
if (use_weight)
AST_LIST_UNLOCK(&queues);
goto out;
if (!(datastore = ast_channel_datastore_alloc(&dialed_interface_info, NULL))) {
ao2_iterator_destroy(&memi);
ao2_ref(cur, -1);
- ast_mutex_unlock(&qe->parent->lock);
+ ao2_unlock(qe->parent);
if (use_weight)
AST_LIST_UNLOCK(&queues);
free(tmp);
if (!(dialed_interfaces = ast_calloc(1, sizeof(*dialed_interfaces)))) {
ao2_iterator_destroy(&memi);
ao2_ref(cur, -1);
- ast_mutex_unlock(&qe->parent->lock);
+ ao2_unlock(qe->parent);
if (use_weight)
AST_LIST_UNLOCK(&queues);
free(tmp);
if (!(di = ast_calloc(1, sizeof(*di) + strlen(cur->interface)))) {
ao2_iterator_destroy(&memi);
ao2_ref(cur, -1);
- ast_mutex_unlock(&qe->parent->lock);
+ ao2_unlock(qe->parent);
if (use_weight)
AST_LIST_UNLOCK(&queues);
free(tmp);
else
to = (qe->parent->timeout) ? qe->parent->timeout * 1000 : -1;
++qe->pending;
- ast_mutex_unlock(&qe->parent->lock);
+ ao2_unlock(qe->parent);
ring_one(qe, outgoing, &numbusies);
if (use_weight)
AST_LIST_UNLOCK(&queues);
ast_channel_datastore_free(datastore);
}
ast_channel_unlock(qe->chan);
- ast_mutex_lock(&qe->parent->lock);
+ ao2_lock(qe->parent);
if (qe->parent->strategy == QUEUE_STRATEGY_RRMEMORY) {
store_next(qe, outgoing);
}
- ast_mutex_unlock(&qe->parent->lock);
+ ao2_unlock(qe->parent);
peer = lpeer ? lpeer->chan : NULL;
if (!peer) {
qe->pending = 0;
/* Update parameters for the queue */
time(&now);
recalc_holdtime(qe, (now - qe->start));
- ast_mutex_lock(&qe->parent->lock);
+ ao2_lock(qe->parent);
callcompletedinsl = ((now - qe->start) <= qe->parent->servicelevel);
- ast_mutex_unlock(&qe->parent->lock);
+ ao2_unlock(qe->parent);
member = lpeer->member;
/* Increment the refcount for this member, since we're going to be using it for awhile in here. */
ao2_ref(member, 1);
AST_LIST_LOCK(&queues);
AST_LIST_TRAVERSE(&queues, q, list) {
- ast_mutex_lock(&q->lock);
+ ao2_lock(q);
if (strcmp(q->name, queuename)) {
- ast_mutex_unlock(&q->lock);
+ ao2_unlock(q);
continue;
}
if (!mem->dynamic) {
res = RES_NOT_DYNAMIC;
ao2_ref(mem, -1);
- ast_mutex_unlock(&q->lock);
+ ao2_unlock(q);
break;
}
q->membercount--;
} else {
res = RES_EXISTS;
}
- ast_mutex_unlock(&q->lock);
+ ao2_unlock(q);
break;
}
AST_LIST_LOCK(&queues);
- ast_mutex_lock(&q->lock);
+ ao2_lock(q);
if ((old_member = interface_exists(q, interface)) == NULL) {
if ((new_member = create_queue_member(interface, membername, penalty, paused, state_interface))) {
add_to_interfaces(new_member->state_interface);
ao2_ref(old_member, -1);
res = RES_EXISTS;
}
- ast_mutex_unlock(&q->lock);
+ ao2_unlock(q);
AST_LIST_UNLOCK(&queues);
return res;
AST_LIST_LOCK(&queues);
AST_LIST_TRAVERSE(&queues, q, list) {
- ast_mutex_lock(&q->lock);
+ ao2_lock(q);
if (ast_strlen_zero(queuename) || !strcasecmp(q->name, queuename)) {
if ((mem = interface_exists(q, interface))) {
found++;
ao2_ref(mem, -1);
}
}
- ast_mutex_unlock(&q->lock);
+ ao2_unlock(q);
}
AST_LIST_UNLOCK(&queues);
queue_name = entry->key + strlen(pm_family) + 2;
AST_LIST_TRAVERSE(&queues, cur_queue, list) {
- ast_mutex_lock(&cur_queue->lock);
+ ao2_lock(cur_queue);
if (!strcmp(queue_name, cur_queue->name))
break;
- ast_mutex_unlock(&cur_queue->lock);
+ ao2_unlock(cur_queue);
}
if (!cur_queue)
ast_db_del(pm_family, queue_name);
continue;
} else
- ast_mutex_unlock(&cur_queue->lock);
+ ao2_unlock(cur_queue);
if (ast_db_get(pm_family, queue_name, queue_data, PM_MAX_LEN))
continue;
AST_APP_ARG(agi);
);
/* Our queue entry */
- struct queue_ent qe;
+ struct queue_ent qe = { 0 };
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "Queue requires an argument: queuename[|options[|URL[|announceoverride[|timeout[|agi]]]]]\n");
lu = ast_module_user_add(chan);
/* Setup our queue entry */
- memset(&qe, 0, sizeof(qe));
qe.start = time(NULL);
/* set the expire time based on the supplied timeout; */
set_queue_result(chan, reason);
res = 0;
}
+ if (qe.parent) {
+ /* every queue_ent is given a reference to it's parent call_queue when it joins the queue.
+ * This ref must be taken away right before the queue_ent is destroyed. In this case
+ * the queue_ent is about to be returned on the stack */
+ ao2_ref(qe.parent, -1);
+ }
ast_module_user_remove(lu);
return res;
lu = ast_module_user_add(chan);
if ((q = load_realtime_queue(data))) {
- ast_mutex_lock(&q->lock);
+ ao2_lock(q);
mem_iter = ao2_iterator_init(q->members, 0);
while ((m = ao2_iterator_next(&mem_iter))) {
/* Count the agents who are logged in and presently answering calls */
ao2_ref(m, -1);
}
ao2_iterator_destroy(&mem_iter);
- ast_mutex_unlock(&q->lock);
+ ao2_unlock(q);
} else
ast_log(LOG_WARNING, "queue %s was not found\n", data);
AST_LIST_LOCK(&queues);
AST_LIST_TRAVERSE(&queues, q, list) {
if (!strcasecmp(q->name, data)) {
- ast_mutex_lock(&q->lock);
+ ao2_lock(q);
break;
}
}
if (q) {
count = q->count;
- ast_mutex_unlock(&q->lock);
+ ao2_unlock(q);
} else if ((var = ast_load_realtime("queues", "name", data, NULL))) {
/* if the queue is realtime but was not found in memory, this
* means that the queue had been deleted from memory since it was
AST_LIST_LOCK(&queues);
AST_LIST_TRAVERSE(&queues, q, list) {
if (!strcasecmp(q->name, data)) {
- ast_mutex_lock(&q->lock);
+ ao2_lock(q);
break;
}
}
ao2_ref(m, -1);
}
ao2_iterator_destroy(&mem_iter);
- ast_mutex_unlock(&q->lock);
+ ao2_unlock(q);
} else
ast_log(LOG_WARNING, "queue %s was not found\n", data);
new = 0;
if (q) {
if (!new)
- ast_mutex_lock(&q->lock);
+ ao2_lock(q);
/* Check if a queue with this name already exists */
if (q->found) {
ast_log(LOG_WARNING, "Queue '%s' already defined! Skipping!\n", cat);
if (!new)
- ast_mutex_unlock(&q->lock);
+ ao2_unlock(q);
continue;
}
/* Re-initialize the queue, and clear statistics */
if (new) {
AST_LIST_INSERT_HEAD(&queues, q, list);
} else
- ast_mutex_unlock(&q->lock);
+ ao2_unlock(q);
}
}
}
AST_LIST_TRAVERSE_SAFE_BEGIN(&queues, q, list) {
if (q->dead) {
AST_LIST_REMOVE_CURRENT(&queues, list);
- if (!q->count)
- destroy_queue(q);
- else
- ast_log(LOG_DEBUG, "XXX Leaking a little memory :( XXX\n");
+ ao2_ref(q, -1);
} else {
- ast_mutex_lock(&q->lock);
+ ao2_lock(q);
mem_iter = ao2_iterator_init(q->members, 0);
while ((cur = ao2_iterator_next(&mem_iter))) {
if (cur->dynamic)
ao2_ref(cur, -1);
}
ao2_iterator_destroy(&mem_iter);
- ast_mutex_unlock(&q->lock);
+ ao2_unlock(q);
}
}
AST_LIST_TRAVERSE_SAFE_END;
return RESULT_SUCCESS;
}
AST_LIST_TRAVERSE(&queues, q, list) {
- ast_mutex_lock(&q->lock);
+ ao2_lock(q);
if (queue_show) {
if (strcasecmp(q->name, argv[2]) != 0) {
- ast_mutex_unlock(&q->lock);
+ ao2_unlock(q);
if (!AST_LIST_NEXT(q, list)) {
ast_cli(fd, "No such queue: %s.%s",argv[2], term);
break;
astman_append(s, "%s", term);
else
ast_cli(fd, "%s", term);
- ast_mutex_unlock(&q->lock);
+ ao2_unlock(q);
if (queue_show)
break;
}
snprintf(idText, sizeof(idText), "ActionID: %s\r\n", id);
AST_LIST_TRAVERSE(&queues, q, list) {
- ast_mutex_lock(&q->lock);
+ ao2_lock(q);
/* List queue properties */
if (ast_strlen_zero(queuefilter) || !strcmp(q->name, queuefilter)) {
(long) (now - qe->start), idText);
}
}
- ast_mutex_unlock(&q->lock);
+ ao2_unlock(q);
}
astman_append(s,
/* here is the case for 3, <member> */
if (!AST_LIST_EMPTY(&queues)) { /* XXX unnecessary ? the traverse does that for us */
AST_LIST_TRAVERSE(&queues, q, list) {
- ast_mutex_lock(&q->lock);
+ ao2_lock(q);
mem_iter = ao2_iterator_init(q->members, 0);
while ((m = ao2_iterator_next(&mem_iter))) {
if (++which > state) {
char *tmp;
ao2_iterator_destroy(&mem_iter);
- ast_mutex_unlock(&q->lock);
+ ao2_unlock(q);
tmp = ast_strdup(m->interface);
ao2_ref(m, -1);
return tmp;
ao2_ref(m, -1);
}
ao2_iterator_destroy(&mem_iter);
- ast_mutex_unlock(&q->lock);
+ ao2_unlock(q);
}
}
projects / thirdparty / asterisk.git / commitdiff
