Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

fix a race condition that caused asterisk to log a *ton* of warnings on mac

Browse Source 
osx about poll returning an error because the polled file descriptor was bad.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@36751 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.2
Russell Bryant 20 years ago
parent 99b3637d6a
commit 1cf6171b0c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File

5
asterisk.c
Unescape View File

@ -592,6 +592,7 @@ static void *listener(void *unused)
fds[0].fd = ast_socket; fds[0].fd = ast_socket;
fds[0].events= POLLIN; fds[0].events= POLLIN;
s = poll(fds, 1, -1); s = poll(fds, 1, -1);
pthread_testcancel();
if (s < 0) { if (s < 0) {
if (errno != EINTR) if (errno != EINTR)
ast_log(LOG_WARNING, "poll returned error: %s\n", strerror(errno)); 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); 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"); 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) { if (ast_socket > -1) {
pthread_cancel(lthread);
close(ast_socket); close(ast_socket);
ast_socket = -1; ast_socket = -1;
unlink(ast_config_AST_SOCKET);
} }
if (ast_consock > -1) if (ast_consock > -1)
close(ast_consock); close(ast_consock);
if (ast_socket > -1)
unlink((char *)ast_config_AST_SOCKET);
if (!option_remote) unlink((char *)ast_config_AST_PID); if (!option_remote) unlink((char *)ast_config_AST_PID);
printf(term_quit()); printf(term_quit());
if (restart) { if (restart) {

Write Preview
Loading…
Cancel
Save