<p>Kevin Harwell <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/15172">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Kevin Harwell: Looks good to me, approved; Approved for Submit
Benjamin Keith Ford: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">app_queue: Fix deadlock between update and show queues<br><br>Operations that update queues when shared_lastcall is set lock the<br>queue in question, then have to lock the queues container to find the<br>other queues with the same member. On the other hand, __queues_show<br>(which is called by both the CLI and AMI) does the reverse. It locks<br>the queues container, then iterates over the queues locking each in<br>turn to display them. This creates a deadlock.<br><br>* Moved queue print logic from __queues_show to a separate function<br> that can be called for a single queue.<br><br>* Updated __queues_show so it doesn't need to lock or traverse<br> the queues container to show a single queue.<br><br>* Updated __queues_show to snap a copy of the queues container and iterate<br> over that instead of locking the queues container and iterating over<br> it while locked. This prevents us from having to hold both the<br> container lock and the queue locks at the same time. This also<br> allows us to sort the queue entries.<br><br>ASTERISK-29155<br><br>Change-Id: I78d4dc36728c2d7bc187b97d82673fc77f2bcf41<br>---<br>M apps/app_queue.c<br>1 file changed, 136 insertions(+), 109 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/apps/app_queue.c b/apps/app_queue.c</span><br><span>index 076b651..0a03350 100644</span><br><span>--- a/apps/app_queue.c</span><br><span>+++ b/apps/app_queue.c</span><br><span>@@ -9642,6 +9642,105 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*! \brief Print a single queue to AMI or the CLI */</span><br><span style="color: hsl(120, 100%, 40%);">+static void print_queue(struct mansession *s, int fd, struct call_queue *q)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ float sl;</span><br><span style="color: hsl(120, 100%, 40%);">+ float sl2;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ao2_iterator mem_iter;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ast_str *out = ast_str_alloca(512);</span><br><span style="color: hsl(120, 100%, 40%);">+ time_t now = time(NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_str_set(&out, 0, "%s has %d calls (max ", q->name, q->count);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (q->maxlen) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_str_append(&out, 0, "%d", q->maxlen);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_str_append(&out, 0, "unlimited");</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ sl = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ sl2 = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (q->callscompleted > 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ sl = 100 * ((float) q->callscompletedinsl / (float) q->callscompleted);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (q->callscompleted + q->callsabandoned > 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ sl2 =100 * (((float)q->callsabandonedinsl + (float)q->callscompletedinsl) / ((float)q->callsabandoned + (float)q->callscompleted));</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_str_append(&out, 0, ") in '%s' strategy (%ds holdtime, %ds talktime), W:%d, C:%d, A:%d, SL:%2.1f%%, SL2:%2.1f%% within %ds",</span><br><span style="color: hsl(120, 100%, 40%);">+ int2strat(q->strategy), q->holdtime, q->talktime, q->weight, q->callscompleted, q->callsabandoned, sl, sl2, q->servicelevel);</span><br><span style="color: hsl(120, 100%, 40%);">+ do_print(s, fd, ast_str_buffer(out));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!ao2_container_count(q->members)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ do_print(s, fd, " No Members");</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct member *mem;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ do_print(s, fd, " Members: ");</span><br><span style="color: hsl(120, 100%, 40%);">+ mem_iter = ao2_iterator_init(q->members, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ while ((mem = ao2_iterator_next(&mem_iter))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_str_set(&out, 0, " %s", mem->membername);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (strcasecmp(mem->membername, mem->interface)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_str_append(&out, 0, " (%s", mem->interface);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!ast_strlen_zero(mem->state_interface)</span><br><span style="color: hsl(120, 100%, 40%);">+ && strcmp(mem->state_interface, mem->interface)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_str_append(&out, 0, " from %s", mem->state_interface);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_str_append(&out, 0, ")");</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mem->penalty) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_str_append(&out, 0, " with penalty %d", mem->penalty);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_str_append(&out, 0, " (ringinuse %s)", mem->ringinuse ? "enabled" : "disabled");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_str_append(&out, 0, "%s%s%s%s%s%s%s%s%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ mem->dynamic ? ast_term_color(COLOR_CYAN, COLOR_BLACK) : "", mem->dynamic ? " (dynamic)" : "", ast_term_reset(),</span><br><span style="color: hsl(120, 100%, 40%);">+ mem->realtime ? ast_term_color(COLOR_MAGENTA, COLOR_BLACK) : "", mem->realtime ? " (realtime)" : "", ast_term_reset(),</span><br><span style="color: hsl(120, 100%, 40%);">+ mem->starttime ? ast_term_color(COLOR_BROWN, COLOR_BLACK) : "", mem->starttime ? " (in call)" : "", ast_term_reset());</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mem->paused) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_str_append(&out, 0, " %s(paused%s%s was %ld secs ago)%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_term_color(COLOR_BROWN, COLOR_BLACK),</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_strlen_zero(mem->reason_paused) ? "" : ":",</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_strlen_zero(mem->reason_paused) ? "" : mem->reason_paused,</span><br><span style="color: hsl(120, 100%, 40%);">+ (long) (now - mem->lastpause),</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_term_reset());</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_str_append(&out, 0, " (%s%s%s)",</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_term_color(</span><br><span style="color: hsl(120, 100%, 40%);">+ mem->status == AST_DEVICE_UNAVAILABLE || mem->status == AST_DEVICE_UNKNOWN ?</span><br><span style="color: hsl(120, 100%, 40%);">+ COLOR_RED : COLOR_GREEN, COLOR_BLACK),</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_devstate2str(mem->status), ast_term_reset());</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mem->calls) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_str_append(&out, 0, " has taken %d calls (last was %ld secs ago)",</span><br><span style="color: hsl(120, 100%, 40%);">+ mem->calls, (long) (now - mem->lastcall));</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_str_append(&out, 0, " has taken no calls yet");</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ do_print(s, fd, ast_str_buffer(out));</span><br><span style="color: hsl(120, 100%, 40%);">+ ao2_ref(mem, -1);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ ao2_iterator_destroy(&mem_iter);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!q->head) {</span><br><span style="color: hsl(120, 100%, 40%);">+ do_print(s, fd, " No Callers");</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct queue_ent *qe;</span><br><span style="color: hsl(120, 100%, 40%);">+ int pos = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ do_print(s, fd, " Callers: ");</span><br><span style="color: hsl(120, 100%, 40%);">+ for (qe = q->head; qe; qe = qe->next) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_str_set(&out, 0, " %d. %s (wait: %ld:%2.2ld, prio: %d)",</span><br><span style="color: hsl(120, 100%, 40%);">+ pos++, ast_channel_name(qe->chan), (long) (now - qe->start) / 60,</span><br><span style="color: hsl(120, 100%, 40%);">+ (long) (now - qe->start) % 60, qe->prio);</span><br><span style="color: hsl(120, 100%, 40%);">+ do_print(s, fd, ast_str_buffer(out));</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ do_print(s, fd, ""); /* blank line between entries */</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+AO2_STRING_FIELD_SORT_FN(call_queue, name);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*!</span><br><span> * \brief Show queue(s) status and statistics</span><br><span> *</span><br><span>@@ -9652,10 +9751,10 @@</span><br><span> {</span><br><span> struct call_queue *q;</span><br><span> struct ast_str *out = ast_str_alloca(512);</span><br><span style="color: hsl(0, 100%, 40%);">- int found = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- time_t now = time(NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ao2_container *sorted_queues;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct ao2_iterator queue_iter;</span><br><span style="color: hsl(0, 100%, 40%);">- struct ao2_iterator mem_iter;</span><br><span style="color: hsl(120, 100%, 40%);">+ int found = 0;</span><br><span> </span><br><span> if (argc != 2 && argc != 3) {</span><br><span> return CLI_SHOWUSAGE;</span><br><span>@@ -9663,9 +9762,18 @@</span><br><span> </span><br><span> if (argc == 3) { /* specific queue */</span><br><span> if ((q = find_load_queue_rt_friendly(argv[2]))) {</span><br><span style="color: hsl(0, 100%, 40%);">- queue_t_unref(q, "Done with temporary pointer");</span><br><span style="color: hsl(120, 100%, 40%);">+ ao2_lock(q);</span><br><span style="color: hsl(120, 100%, 40%);">+ print_queue(s, fd, q);</span><br><span style="color: hsl(120, 100%, 40%);">+ ao2_unlock(q);</span><br><span style="color: hsl(120, 100%, 40%);">+ queue_unref(q);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_str_set(&out, 0, "No such queue: %s.", argv[2]);</span><br><span style="color: hsl(120, 100%, 40%);">+ do_print(s, fd, ast_str_buffer(out));</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (ast_check_realtime("queues")) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return CLI_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ast_check_realtime("queues")) {</span><br><span> /* This block is to find any queues which are defined in realtime but</span><br><span> * which have not yet been added to the in-core container</span><br><span> */</span><br><span>@@ -9682,21 +9790,34 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ao2_lock(queues);</span><br><span style="color: hsl(0, 100%, 40%);">- queue_iter = ao2_iterator_init(queues, AO2_ITERATOR_DONTLOCK);</span><br><span style="color: hsl(120, 100%, 40%);">+ /*</span><br><span style="color: hsl(120, 100%, 40%);">+ * Snapping a copy of the container prevents having to lock both the queues container</span><br><span style="color: hsl(120, 100%, 40%);">+ * and the queue itself at the same time. It also allows us to sort the entries.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+ sorted_queues = ao2_container_alloc_rbtree(AO2_ALLOC_OPT_LOCK_NOLOCK, 0, call_queue_sort_fn, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!sorted_queues) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return CLI_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ao2_container_dup(sorted_queues, queues, 0)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ao2_ref(sorted_queues, -1);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CLI_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /*</span><br><span style="color: hsl(120, 100%, 40%);">+ * No need to lock the container since it's temporary and static.</span><br><span style="color: hsl(120, 100%, 40%);">+ * We also unlink the entries as we use them so the container is</span><br><span style="color: hsl(120, 100%, 40%);">+ * empty when the iterator finishes. We can then just unref the container.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+ queue_iter = ao2_iterator_init(sorted_queues, AO2_ITERATOR_DONTLOCK | AO2_ITERATOR_UNLINK);</span><br><span> while ((q = ao2_t_iterator_next(&queue_iter, "Iterate through queues"))) {</span><br><span style="color: hsl(0, 100%, 40%);">- float sl;</span><br><span style="color: hsl(0, 100%, 40%);">- float sl2;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> struct call_queue *realtime_queue = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> ao2_lock(q);</span><br><span> /* This check is to make sure we don't print information for realtime</span><br><span> * queues which have been deleted from realtime but which have not yet</span><br><span> * been deleted from the in-core container. Only do this if we're not</span><br><span> * looking for a specific queue.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">- if (argc < 3 && q->realtime) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (q->realtime) {</span><br><span> realtime_queue = find_load_queue_rt_friendly(q->name);</span><br><span> if (!realtime_queue) {</span><br><span> ao2_unlock(q);</span><br><span>@@ -9706,110 +9827,16 @@</span><br><span> queue_t_unref(realtime_queue, "Queue is already in memory");</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (argc == 3 && strcasecmp(q->name, argv[2])) {</span><br><span style="color: hsl(0, 100%, 40%);">- ao2_unlock(q);</span><br><span style="color: hsl(0, 100%, 40%);">- queue_t_unref(q, "Done with iterator");</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> found = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ print_queue(s, fd, q);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ast_str_set(&out, 0, "%s has %d calls (max ", q->name, q->count);</span><br><span style="color: hsl(0, 100%, 40%);">- if (q->maxlen) {</span><br><span style="color: hsl(0, 100%, 40%);">- ast_str_append(&out, 0, "%d", q->maxlen);</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- ast_str_append(&out, 0, "unlimited");</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- sl = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- sl2 = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- if (q->callscompleted > 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- sl = 100 * ((float) q->callscompletedinsl / (float) q->callscompleted);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (q->callscompleted + q->callsabandoned > 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- sl2 =100 * (((float)q->callsabandonedinsl + (float)q->callscompletedinsl) / ((float)q->callsabandoned + (float)q->callscompleted));</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ast_str_append(&out, 0, ") in '%s' strategy (%ds holdtime, %ds talktime), W:%d, C:%d, A:%d, SL:%2.1f%%, SL2:%2.1f%% within %ds",</span><br><span style="color: hsl(0, 100%, 40%);">- int2strat(q->strategy), q->holdtime, q->talktime, q->weight, q->callscompleted, q->callsabandoned, sl, sl2, q->servicelevel);</span><br><span style="color: hsl(0, 100%, 40%);">- do_print(s, fd, ast_str_buffer(out));</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ao2_container_count(q->members)) {</span><br><span style="color: hsl(0, 100%, 40%);">- do_print(s, fd, " No Members");</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- struct member *mem;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- do_print(s, fd, " Members: ");</span><br><span style="color: hsl(0, 100%, 40%);">- mem_iter = ao2_iterator_init(q->members, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- while ((mem = ao2_iterator_next(&mem_iter))) {</span><br><span style="color: hsl(0, 100%, 40%);">- ast_str_set(&out, 0, " %s", mem->membername);</span><br><span style="color: hsl(0, 100%, 40%);">- if (strcasecmp(mem->membername, mem->interface)) {</span><br><span style="color: hsl(0, 100%, 40%);">- ast_str_append(&out, 0, " (%s", mem->interface);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ast_strlen_zero(mem->state_interface)</span><br><span style="color: hsl(0, 100%, 40%);">- && strcmp(mem->state_interface, mem->interface)) {</span><br><span style="color: hsl(0, 100%, 40%);">- ast_str_append(&out, 0, " from %s", mem->state_interface);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- ast_str_append(&out, 0, ")");</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (mem->penalty) {</span><br><span style="color: hsl(0, 100%, 40%);">- ast_str_append(&out, 0, " with penalty %d", mem->penalty);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ast_str_append(&out, 0, " (ringinuse %s)", mem->ringinuse ? "enabled" : "disabled");</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ast_str_append(&out, 0, "%s%s%s%s%s%s%s%s%s",</span><br><span style="color: hsl(0, 100%, 40%);">- mem->dynamic ? ast_term_color(COLOR_CYAN, COLOR_BLACK) : "", mem->dynamic ? " (dynamic)" : "", ast_term_reset(),</span><br><span style="color: hsl(0, 100%, 40%);">- mem->realtime ? ast_term_color(COLOR_MAGENTA, COLOR_BLACK) : "", mem->realtime ? " (realtime)" : "", ast_term_reset(),</span><br><span style="color: hsl(0, 100%, 40%);">- mem->starttime ? ast_term_color(COLOR_BROWN, COLOR_BLACK) : "", mem->starttime ? " (in call)" : "", ast_term_reset());</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (mem->paused) {</span><br><span style="color: hsl(0, 100%, 40%);">- ast_str_append(&out, 0, " %s(paused%s%s was %ld secs ago)%s",</span><br><span style="color: hsl(0, 100%, 40%);">- ast_term_color(COLOR_BROWN, COLOR_BLACK),</span><br><span style="color: hsl(0, 100%, 40%);">- ast_strlen_zero(mem->reason_paused) ? "" : ":",</span><br><span style="color: hsl(0, 100%, 40%);">- ast_strlen_zero(mem->reason_paused) ? "" : mem->reason_paused,</span><br><span style="color: hsl(0, 100%, 40%);">- (long) (now - mem->lastpause),</span><br><span style="color: hsl(0, 100%, 40%);">- ast_term_reset());</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ast_str_append(&out, 0, " (%s%s%s)",</span><br><span style="color: hsl(0, 100%, 40%);">- ast_term_color(</span><br><span style="color: hsl(0, 100%, 40%);">- mem->status == AST_DEVICE_UNAVAILABLE || mem->status == AST_DEVICE_UNKNOWN ?</span><br><span style="color: hsl(0, 100%, 40%);">- COLOR_RED : COLOR_GREEN, COLOR_BLACK),</span><br><span style="color: hsl(0, 100%, 40%);">- ast_devstate2str(mem->status), ast_term_reset());</span><br><span style="color: hsl(0, 100%, 40%);">- if (mem->calls) {</span><br><span style="color: hsl(0, 100%, 40%);">- ast_str_append(&out, 0, " has taken %d calls (last was %ld secs ago)",</span><br><span style="color: hsl(0, 100%, 40%);">- mem->calls, (long) (now - mem->lastcall));</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- ast_str_append(&out, 0, " has taken no calls yet");</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- do_print(s, fd, ast_str_buffer(out));</span><br><span style="color: hsl(0, 100%, 40%);">- ao2_ref(mem, -1);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- ao2_iterator_destroy(&mem_iter);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (!q->head) {</span><br><span style="color: hsl(0, 100%, 40%);">- do_print(s, fd, " No Callers");</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- struct queue_ent *qe;</span><br><span style="color: hsl(0, 100%, 40%);">- int pos = 1;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- do_print(s, fd, " Callers: ");</span><br><span style="color: hsl(0, 100%, 40%);">- for (qe = q->head; qe; qe = qe->next) {</span><br><span style="color: hsl(0, 100%, 40%);">- ast_str_set(&out, 0, " %d. %s (wait: %ld:%2.2ld, prio: %d)",</span><br><span style="color: hsl(0, 100%, 40%);">- pos++, ast_channel_name(qe->chan), (long) (now - qe->start) / 60,</span><br><span style="color: hsl(0, 100%, 40%);">- (long) (now - qe->start) % 60, qe->prio);</span><br><span style="color: hsl(0, 100%, 40%);">- do_print(s, fd, ast_str_buffer(out));</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- do_print(s, fd, ""); /* blank line between entries */</span><br><span> ao2_unlock(q);</span><br><span> queue_t_unref(q, "Done with iterator"); /* Unref the iterator's reference */</span><br><span> }</span><br><span> ao2_iterator_destroy(&queue_iter);</span><br><span style="color: hsl(0, 100%, 40%);">- ao2_unlock(queues);</span><br><span style="color: hsl(120, 100%, 40%);">+ ao2_ref(sorted_queues, -1);</span><br><span> if (!found) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (argc == 3) {</span><br><span style="color: hsl(0, 100%, 40%);">- ast_str_set(&out, 0, "No such queue: %s.", argv[2]);</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- ast_str_set(&out, 0, "No queues.");</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_str_set(&out, 0, "No queues.");</span><br><span> do_print(s, fd, ast_str_buffer(out));</span><br><span> }</span><br><span> return CLI_SUCCESS;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/15172">change 15172</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/15172"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 16 </div>
<div style="display:none"> Gerrit-Change-Id: I78d4dc36728c2d7bc187b97d82673fc77f2bcf41 </div>
<div style="display:none"> Gerrit-Change-Number: 15172 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Benjamin Keith Ford <bford@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: Kevin Harwell <kharwell@digium.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>