From 9d6cbe222cc0b4ab0e0c8bf0800772df72d8838b Mon Sep 17 00:00:00 2001
From: Paul Belanger <paul.belanger@polybeacon.com>
Date: Wed, 19 Jan 2011 17:15:40 +0000
Subject: [PATCH] Merged revisions 302462 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r302462 | pabelanger | 2011-01-19 12:09:35 -0500 (Wed, 19 Jan 2011) | 9 lines
Merged revisions 302461 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
........
r302461 | pabelanger | 2011-01-19 12:08:01 -0500 (Wed, 19 Jan 2011) | 2 lines
Handle 'Resource temporarily unavailable' error more gracefully.
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@302463 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
res/res_timing_timerfd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/res/res_timing_timerfd.c b/res/res_timing_timerfd.c
index 438603b556..ae5d2b411e 100644
--- a/res/res_timing_timerfd.c
+++ b/res/res_timing_timerfd.c
@@ -165,7 +165,7 @@ static void timerfd_timer_ack(int handle, unsigned int quantity)
do {
read_result = read(handle, &expirations, sizeof(expirations));
if (read_result == -1) {
- if (errno == EINTR) {
+ if (errno == EINTR || errno == EAGAIN) {
continue;
} else {
ast_log(LOG_ERROR, "Read error: %s\n", strerror(errno));
--
GitLab