From d9962df7a5c38d21b1413ae6ab830d671ae2cb26 Mon Sep 17 00:00:00 2001
From: ctiller <ctiller@google.com>
Date: Wed, 7 Jan 2015 15:31:39 -0800
Subject: [PATCH] Don't log on EINTR. Change on 2015/01/07 by ctiller
<ctiller@google.com> ------------- Created by MOE:
http://code.google.com/p/moe-java MOE_MIGRATED_REVID=83469190
---
src/core/iomgr/pollset_multipoller_with_poll_posix.c | 4 +++-
src/core/iomgr/pollset_posix.c | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/core/iomgr/pollset_multipoller_with_poll_posix.c b/src/core/iomgr/pollset_multipoller_with_poll_posix.c
index 06c7a5a0dd..e482da94f7 100644
--- a/src/core/iomgr/pollset_multipoller_with_poll_posix.c
+++ b/src/core/iomgr/pollset_multipoller_with_poll_posix.c
@@ -166,7 +166,9 @@ static int multipoll_with_poll_pollset_maybe_work(
r = poll(h->pfds, h->pfd_count, timeout);
if (r < 0) {
- gpr_log(GPR_ERROR, "poll() failed: %s", strerror(errno));
+ if (errno != EINTR) {
+ gpr_log(GPR_ERROR, "poll() failed: %s", strerror(errno));
+ }
} else if (r == 0) {
/* do nothing */
} else {
diff --git a/src/core/iomgr/pollset_posix.c b/src/core/iomgr/pollset_posix.c
index ba4031e11f..ff00e06429 100644
--- a/src/core/iomgr/pollset_posix.c
+++ b/src/core/iomgr/pollset_posix.c
@@ -301,7 +301,9 @@ static int unary_poll_pollset_maybe_work(grpc_pollset *pollset,
r = poll(pfd, GPR_ARRAY_SIZE(pfd), timeout);
if (r < 0) {
- gpr_log(GPR_ERROR, "poll() failed: %s", strerror(errno));
+ if (errno != EINTR) {
+ gpr_log(GPR_ERROR, "poll() failed: %s", strerror(errno));
+ }
} else if (r == 0) {
/* do nothing */
} else {
--
GitLab