diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-07-03 05:12:03 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-07-03 05:12:03 +0000 |
| commit | 483605c8399a360cde5d02bc2703b462e80c05c9 (patch) | |
| tree | d8bd2cd4a8260e7ef0ddfb428e1ccf9a3ac565f5 | |
| parent | 60f32b41b9db75c382cc8339aa4e2c713b3b5b2a (diff) | |
fix a race condition that caused asterisk to log a *ton* of warnings on mac
osx about poll returning an error because the polled file descriptor was bad.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@36751 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | asterisk.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/asterisk.c b/asterisk.c index b10dcba10..abb0a4392 100644 --- a/asterisk.c +++ b/asterisk.c @@ -592,6 +592,7 @@ static void *listener(void *unused) fds[0].fd = ast_socket; fds[0].events= POLLIN; s = poll(fds, 1, -1); + pthread_testcancel(); if (s < 0) { if (errno != EINTR) ast_log(LOG_WARNING, "poll returned error: %s\n", strerror(errno)); @@ -905,13 +906,13 @@ static void quit_handler(int num, int nice, int safeshutdown, int restart) ast_log(LOG_DEBUG, "Asterisk ending (%d).\n", num); manager_event(EVENT_FLAG_SYSTEM, "Shutdown", "Shutdown: %s\r\nRestart: %s\r\n", ast_active_channels() ? "Uncleanly" : "Cleanly", restart ? "True" : "False"); if (ast_socket > -1) { + pthread_cancel(lthread); close(ast_socket); ast_socket = -1; + unlink(ast_config_AST_SOCKET); } if (ast_consock > -1) close(ast_consock); - if (ast_socket > -1) - unlink((char *)ast_config_AST_SOCKET); if (!option_remote) unlink((char *)ast_config_AST_PID); printf(term_quit()); if (restart) { |