diff options
| author | Joshua Colp <jcolp@digium.com> | 2015-11-12 10:56:09 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2015-11-12 10:56:09 -0600 |
| commit | 6879ce7fba6de293c538c80a4eb273396c0e4d9c (patch) | |
| tree | a4ffb2b6b8b309a2086f57c2d9e6359beaf0e474 /main | |
| parent | 1d4f813a072996da6fb91ba424e34ca76678ab5b (diff) | |
| parent | 264c74aa22aca7dffdf054ca1512a3638f3fc6dc (diff) | |
Merge "res_pjsip: Deny requests when threadpool queue is backed up."
Diffstat (limited to 'main')
| -rw-r--r-- | main/taskprocessor.c | 9 | ||||
| -rw-r--r-- | main/threadpool.c | 5 |
2 files changed, 8 insertions, 6 deletions
diff --git a/main/taskprocessor.c b/main/taskprocessor.c index 0719deec2..91125ad2a 100644 --- a/main/taskprocessor.c +++ b/main/taskprocessor.c @@ -130,9 +130,6 @@ static int tps_ping_handler(void *datap); /*! \brief Remove the front task off the taskprocessor queue */ static struct tps_task *tps_taskprocessor_pop(struct ast_taskprocessor *tps); -/*! \brief Return the size of the taskprocessor queue */ -static int tps_taskprocessor_depth(struct ast_taskprocessor *tps); - static char *cli_tps_ping(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a); static char *cli_tps_report(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a); @@ -508,7 +505,7 @@ static struct tps_task *tps_taskprocessor_pop(struct ast_taskprocessor *tps) return task; } -static int tps_taskprocessor_depth(struct ast_taskprocessor *tps) +long ast_taskprocessor_size(struct ast_taskprocessor *tps) { return (tps) ? tps->tps_queue_size : -1; } @@ -765,7 +762,7 @@ int ast_taskprocessor_execute(struct ast_taskprocessor *tps) { struct ast_taskprocessor_local local; struct tps_task *t; - int size; + long size; ao2_lock(tps); t = tps_taskprocessor_pop(tps); @@ -797,7 +794,7 @@ int ast_taskprocessor_execute(struct ast_taskprocessor *tps) * after we pop an empty stack. */ tps->executing = 0; - size = tps_taskprocessor_depth(tps); + size = ast_taskprocessor_size(tps); /* If we executed a task, bump the stats */ if (tps->stats) { tps->stats->_tasks_processed_count++; diff --git a/main/threadpool.c b/main/threadpool.c index 46de9b7f8..60e1e9a3b 100644 --- a/main/threadpool.c +++ b/main/threadpool.c @@ -1397,3 +1397,8 @@ struct ast_taskprocessor *ast_threadpool_serializer(const char *name, struct ast { return ast_threadpool_serializer_group(name, pool, NULL); } + +long ast_threadpool_queue_size(struct ast_threadpool *pool) +{ + return ast_taskprocessor_size(pool->tps); +} |