Merge branch 'master' of github.com:google/grpc into win32

4 files changed, 8 insertions, 8 deletions

diff --git a/src/core/debug/trace.c b/src/core/debug/trace.c
index cdbe168fc8..92acbe924d 100644
--- a/src/core/debug/trace.c
+++ b/src/core/debug/trace.c
@@ -40,7 +40,7 @@
 #include "src/core/support/env.h"
 
 #if GRPC_ENABLE_TRACING
-gpr_uint32 grpc_trace_bits;
+gpr_uint32 grpc_trace_bits = 0;
 
 static void add(const char *beg, const char *end, char ***ss, size_t *ns) {
   size_t n = *ns;
diff --git a/src/core/iomgr/pollset_multipoller_with_poll_posix.c b/src/core/iomgr/pollset_multipoller_with_poll_posix.c
index fbacad1e99..7570ff18c5 100644
--- a/src/core/iomgr/pollset_multipoller_with_poll_posix.c
+++ b/src/core/iomgr/pollset_multipoller_with_poll_posix.c
@@ -183,10 +183,10 @@ static int multipoll_with_poll_pollset_maybe_work(
       grpc_pollset_kick_consume(&pollset->kick_state);
     }
     for (i = 1; i < np; i++) {
-      if (h->pfds[i].revents & POLLIN) {
+      if (h->pfds[i].revents & (POLLIN | POLLHUP | POLLERR)) {
         grpc_fd_become_readable(h->watchers[i].fd, allow_synchronous_callback);
       }
-      if (h->pfds[i].revents & POLLOUT) {
+      if (h->pfds[i].revents & (POLLOUT | POLLHUP | POLLERR)) {
         grpc_fd_become_writable(h->watchers[i].fd, allow_synchronous_callback);
       }
     }
diff --git a/src/core/iomgr/pollset_posix.c b/src/core/iomgr/pollset_posix.c
index 05b78adeb6..87e7aa85ee 100644
--- a/src/core/iomgr/pollset_posix.c
+++ b/src/core/iomgr/pollset_posix.c
@@ -63,9 +63,9 @@ static void backup_poller(void *p) {
   gpr_mu_lock(&g_backup_pollset.mu);
   while (g_shutdown_backup_poller == 0) {
     gpr_timespec next_poll = gpr_time_add(last_poll, delta);
-    grpc_pollset_work(&g_backup_pollset, next_poll);
+    grpc_pollset_work(&g_backup_pollset, gpr_time_add(gpr_now(), gpr_time_from_seconds(1)));
     gpr_mu_unlock(&g_backup_pollset.mu);
-    gpr_sleep_until(next_poll);
+    /*gpr_sleep_until(next_poll);*/
     gpr_mu_lock(&g_backup_pollset.mu);
     last_poll = next_poll;
   }
@@ -277,10 +277,10 @@ static int unary_poll_pollset_maybe_work(grpc_pollset *pollset,
     if (pfd[0].revents & POLLIN) {
       grpc_pollset_kick_consume(&pollset->kick_state);
     }
-    if (pfd[1].revents & POLLIN) {
+    if (pfd[1].revents & (POLLIN | POLLHUP | POLLERR)) {
       grpc_fd_become_readable(fd, allow_synchronous_callback);
     }
-    if (pfd[1].revents & POLLOUT) {
+    if (pfd[1].revents & (POLLOUT | POLLHUP | POLLERR)) {
       grpc_fd_become_writable(fd, allow_synchronous_callback);
     }
   }
diff --git a/src/core/iomgr/resolve_address_posix.c b/src/core/iomgr/resolve_address_posix.c
index 41a690d869..f172ba9e21 100644
--- a/src/core/iomgr/resolve_address_posix.c
+++ b/src/core/iomgr/resolve_address_posix.c
@@ -133,7 +133,7 @@ grpc_resolved_addresses *grpc_blocking_resolve_address(
     un = (struct sockaddr_un *)addrs->addrs->addr;
     un->sun_family = AF_UNIX;
     strcpy(un->sun_path, name + 5);
-    addrs->addrs->len = strlen(un->sun_path) + sizeof(un->sun_family);
+    addrs->addrs->len = strlen(un->sun_path) + sizeof(un->sun_family) + 1;
     return addrs;
   }