From ec579b68aeb60031097a0473811856512b2a2888 Mon Sep 17 00:00:00 2001 From: tilghman Date: Thu, 10 Jun 2010 08:15:45 +0000 Subject: [PATCH] Merged revisions 269635 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r269635 | tilghman | 2010-06-10 02:52:34 -0500 (Thu, 10 Jun 2010) | 9 lines Ensure restartable system calls can restart (BSD signal semantics). This eliminates the annoying on the console. (closes issue #17477) Reported by: jvandal Patches: 20100610__issue17477.diff.txt uploaded by tilghman (license 14) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@269636 f38db490-d61c-443f-a65b-d21fe96a405b --- main/asterisk.c | 4 ++++ main/logger.c | 1 + utils/extconf.c | 1 + 3 files changed, 6 insertions(+) diff --git a/main/asterisk.c b/main/asterisk.c index 1e13729c1..66967f515 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -981,6 +981,7 @@ static void _null_sig_handler(int sig) static struct sigaction null_sig_handler = { .sa_handler = _null_sig_handler, + .sa_flags = SA_RESTART, }; static struct sigaction ignore_sig_handler = { @@ -1458,6 +1459,7 @@ static void _urg_handler(int num) static struct sigaction urg_handler = { .sa_handler = _urg_handler, + .sa_flags = SA_RESTART, }; static void _hup_handler(int num) @@ -1477,6 +1479,7 @@ static void _hup_handler(int num) static struct sigaction hup_handler = { .sa_handler = _hup_handler, + .sa_flags = SA_RESTART, }; static void _child_handler(int sig) @@ -1495,6 +1498,7 @@ static void _child_handler(int sig) static struct sigaction child_handler = { .sa_handler = _child_handler, + .sa_flags = SA_RESTART, }; /*! \brief Set maximum open files */ diff --git a/main/logger.c b/main/logger.c index fa57a0563..53b7bb3df 100644 --- a/main/logger.c +++ b/main/logger.c @@ -764,6 +764,7 @@ static void _handle_SIGXFSZ(int sig) static struct sigaction handle_SIGXFSZ = { .sa_handler = _handle_SIGXFSZ, + .sa_flags = SA_RESTART, }; static void ast_log_vsyslog(struct logmsg *msg) diff --git a/utils/extconf.c b/utils/extconf.c index 992126728..22df962e7 100644 --- a/utils/extconf.c +++ b/utils/extconf.c @@ -1269,6 +1269,7 @@ static void _null_sig_handler(int sig) static struct sigaction null_sig_handler = { .sa_handler = _null_sig_handler, + .sa_flags = SA_RESTART, }; void ast_replace_sigchld(void);