kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-27 14:41:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "test_time: Provide a timeout when waiting."

Browse Source
This commit is contained in:
Joshua Colp
2015-12-28 16:34:32 -06:00
committed by Gerrit Code Review
parent 37f9050f77 a05bb258b1
commit 410c5ee0fc
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
main/stdtime/localtime.c
View File

@@ -796,13 +796,16 @@ static void sstate_free(struct state *p)
void ast_localtime_wakeup_monitor(struct ast_test *info) void ast_localtime_wakeup_monitor(struct ast_test *info)
{ {
struct timeval wait_now = ast_tvnow();
struct timespec wait_time = { .tv_sec = wait_now.tv_sec + 2, .tv_nsec = wait_now.tv_usec * 1000 };
if (inotify_thread != AST_PTHREADT_NULL) { if (inotify_thread != AST_PTHREADT_NULL) {
AST_LIST_LOCK(&zonelist); AST_LIST_LOCK(&zonelist);
#ifdef TEST_FRAMEWORK #ifdef TEST_FRAMEWORK
test = info; test = info;
#endif #endif
pthread_kill(inotify_thread, SIGURG); pthread_kill(inotify_thread, SIGURG);
ast_cond_wait(&initialization, &(&zonelist)->lock); ast_cond_timedwait(&initialization, &(&zonelist)->lock, &wait_time);
#ifdef TEST_FRAMEWORK #ifdef TEST_FRAMEWORK
test = NULL; test = NULL;
#endif #endif