sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "taskprocessor.c: Fix CLI "core show taskprocessors" output format."

This commit is contained in:
Joshua Colp 2016-01-12 13:18:58 -06:00 committed by Gerrit Code Review
parent e89d2691e9 84c245d38c
commit 7e418b1ab5
1 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
main/taskprocessor.c
View File

@ -421,7 +421,9 @@ static char *cli_tps_report(struct ast_cli_entry *e, int cmd, struct ast_cli_arg
unsigned long maxqsize; unsigned long maxqsize;
unsigned long processed; unsigned long processed;
struct ast_taskprocessor *p; struct ast_taskprocessor *p;
struct ao2_iterator i; struct ao2_iterator iter;
#define FMT_HEADERS "%-45s %10s %10s %10s\n"
#define FMT_FIELDS "%-45s %10lu %10lu %10lu\n"
switch (cmd) { switch (cmd) {
case CLI_INIT: case CLI_INIT:
@ -437,19 +439,25 @@ static char *cli_tps_report(struct ast_cli_entry *e, int cmd, struct ast_cli_arg
if (a->argc != e->args) if (a->argc != e->args)
return CLI_SHOWUSAGE; return CLI_SHOWUSAGE;
ast_cli(a->fd, "\n\t+----- Processor -----+--- Processed ---+- In Queue -+- Max Depth -+"); ast_cli(a->fd, "\n" FMT_HEADERS, "Processor", "Processed", "In Queue", "Max Depth");
i = ao2_iterator_init(tps_singletons, 0); tcount = 0;
while ((p = ao2_iterator_next(&i))) { iter = ao2_iterator_init(tps_singletons, 0);
while ((p = ao2_iterator_next(&iter))) {
ast_copy_string(name, p->name, sizeof(name)); ast_copy_string(name, p->name, sizeof(name));
qsize = p->tps_queue_size; qsize = p->tps_queue_size;
maxqsize = p->stats->max_qsize; if (p->stats) {
processed = p->stats->_tasks_processed_count; maxqsize = p->stats->max_qsize;
ast_cli(a->fd, "\n%24s %17lu %12lu %12lu", name, processed, qsize, maxqsize); processed = p->stats->_tasks_processed_count;
} else {
maxqsize = 0;
processed = 0;
}
ast_cli(a->fd, FMT_FIELDS, name, processed, qsize, maxqsize);
ast_taskprocessor_unreference(p); ast_taskprocessor_unreference(p);
++tcount;
} }
ao2_iterator_destroy(&i); ao2_iterator_destroy(&iter);
tcount = ao2_container_count(tps_singletons); ast_cli(a->fd, "\n%d taskprocessors\n\n", tcount);
ast_cli(a->fd, "\n\t+---------------------+-----------------+------------+-------------+\n\t%d taskprocessors\n\n", tcount);
return CLI_SUCCESS; return CLI_SUCCESS;
} }
@ -794,11 +802,14 @@ int ast_taskprocessor_execute(struct ast_taskprocessor *tps)
*/ */
tps->executing = 0; tps->executing = 0;
size = ast_taskprocessor_size(tps); size = ast_taskprocessor_size(tps);
/* If we executed a task, bump the stats */
/* Update the stats */
if (tps->stats) { if (tps->stats) {
tps->stats->_tasks_processed_count++; ++tps->stats->_tasks_processed_count;
if (size > tps->stats->max_qsize) {
tps->stats->max_qsize = size; /* Include the task we just executed as part of the queue size. */
if (size >= tps->stats->max_qsize) {
tps->stats->max_qsize = size + 1;
} }
} }
ao2_unlock(tps); ao2_unlock(tps);