diff options
| author | Mark Michelson <mmichelson@digium.com> | 2016-01-20 14:19:02 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-01-20 14:19:02 -0600 |
| commit | e66021d2ca5e00c60db682ac9091f44781666455 (patch) | |
| tree | 7b32d5a2956c7fc95a8bbec4410c7b037076a5d0 /main/taskprocessor.c | |
| parent | 8adb8e3e1addb12f4228dba5025569b1770c57ec (diff) | |
| parent | c9f7269b2eab5e575ea1a85ee8a7883a568a92ac (diff) | |
Merge "taskprocessor.c: Increase CLI "core ping taskprocessor" timeout."
Diffstat (limited to 'main/taskprocessor.c')
| -rw-r--r-- | main/taskprocessor.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/main/taskprocessor.c b/main/taskprocessor.c index 49022d34e..5b8ff08f1 100644 --- a/main/taskprocessor.c +++ b/main/taskprocessor.c @@ -395,9 +395,18 @@ static char *cli_tps_ping(struct ast_cli_entry *e, int cmd, struct ast_cli_args return CLI_SUCCESS; } ast_cli(a->fd, "\npinging %s ...", name); - when = ast_tvadd((begin = ast_tvnow()), ast_samp2tv(1000, 1000)); + + /* + * Wait up to 5 seconds for a ping reply. + * + * On a very busy system it could take awhile to get a + * ping response from some taskprocessors. + */ + begin = ast_tvnow(); + when = ast_tvadd(begin, ast_samp2tv(5000, 1000)); ts.tv_sec = when.tv_sec; ts.tv_nsec = when.tv_usec * 1000; + ast_mutex_lock(&cli_ping_cond_lock); if (ast_taskprocessor_push(tps, tps_ping_handler, 0) < 0) { ast_mutex_unlock(&cli_ping_cond_lock); @@ -407,6 +416,7 @@ static char *cli_tps_ping(struct ast_cli_entry *e, int cmd, struct ast_cli_args } ast_cond_timedwait(&cli_ping_cond, &cli_ping_cond_lock, &ts); ast_mutex_unlock(&cli_ping_cond_lock); + end = ast_tvnow(); delta = ast_tvsub(end, begin); ast_cli(a->fd, "\n\t%24s ping time: %.1ld.%.6ld sec\n\n", name, (long)delta.tv_sec, (long int)delta.tv_usec); |