Merge branch 'test_affine' into reuse_affinity

9 years ago · a2e1fe6b83
parent ad0cc9bfae 5f04538411
commit a2e1fe6b83
28 changed files with 82 additions and 2198 deletions
--- a/6
+++ b/6
@ -177,7 +177,6 @@ cc_library(
    "src/core/lib/iomgr/endpoint.h",
    "src/core/lib/iomgr/endpoint_pair.h",
    "src/core/lib/iomgr/error.h",
-    "src/core/lib/iomgr/ev_poll_and_epoll_posix.h",
    "src/core/lib/iomgr/ev_poll_posix.h",
    "src/core/lib/iomgr/ev_posix.h",
    "src/core/lib/iomgr/exec_ctx.h",
@ -324,7 +323,6 @@ cc_library(
    "src/core/lib/iomgr/endpoint_pair_posix.c",
    "src/core/lib/iomgr/endpoint_pair_windows.c",
    "src/core/lib/iomgr/error.c",
-    "src/core/lib/iomgr/ev_poll_and_epoll_posix.c",
    "src/core/lib/iomgr/ev_poll_posix.c",
    "src/core/lib/iomgr/ev_posix.c",
    "src/core/lib/iomgr/exec_ctx.c",
@ -553,7 +551,6 @@ cc_library(
    "src/core/lib/iomgr/endpoint.h",
    "src/core/lib/iomgr/endpoint_pair.h",
    "src/core/lib/iomgr/error.h",
-    "src/core/lib/iomgr/ev_poll_and_epoll_posix.h",
    "src/core/lib/iomgr/ev_poll_posix.h",
    "src/core/lib/iomgr/ev_posix.h",
    "src/core/lib/iomgr/exec_ctx.h",
@ -676,7 +673,6 @@ cc_library(
    "src/core/lib/iomgr/endpoint_pair_posix.c",
    "src/core/lib/iomgr/endpoint_pair_windows.c",
    "src/core/lib/iomgr/error.c",
-    "src/core/lib/iomgr/ev_poll_and_epoll_posix.c",
    "src/core/lib/iomgr/ev_poll_posix.c",
    "src/core/lib/iomgr/ev_posix.c",
    "src/core/lib/iomgr/exec_ctx.c",
@ -1349,7 +1345,6 @@ objc_library(
    "src/core/lib/iomgr/endpoint_pair_posix.c",
    "src/core/lib/iomgr/endpoint_pair_windows.c",
    "src/core/lib/iomgr/error.c",
-    "src/core/lib/iomgr/ev_poll_and_epoll_posix.c",
    "src/core/lib/iomgr/ev_poll_posix.c",
    "src/core/lib/iomgr/ev_posix.c",
    "src/core/lib/iomgr/exec_ctx.c",
@ -1557,7 +1552,6 @@ objc_library(
    "src/core/lib/iomgr/endpoint.h",
    "src/core/lib/iomgr/endpoint_pair.h",
    "src/core/lib/iomgr/error.h",
-    "src/core/lib/iomgr/ev_poll_and_epoll_posix.h",
    "src/core/lib/iomgr/ev_poll_posix.h",
    "src/core/lib/iomgr/ev_posix.h",
    "src/core/lib/iomgr/exec_ctx.h",
--- a/2
+++ b/2
@ -2495,7 +2495,6 @@ LIBGRPC_SRC = \
    src/core/lib/iomgr/endpoint_pair_posix.c \
    src/core/lib/iomgr/endpoint_pair_windows.c \
    src/core/lib/iomgr/error.c \
-    src/core/lib/iomgr/ev_poll_and_epoll_posix.c \
    src/core/lib/iomgr/ev_poll_posix.c \
    src/core/lib/iomgr/ev_posix.c \
    src/core/lib/iomgr/exec_ctx.c \
@ -2853,7 +2852,6 @@ LIBGRPC_UNSECURE_SRC = \
    src/core/lib/iomgr/endpoint_pair_posix.c \
    src/core/lib/iomgr/endpoint_pair_windows.c \
    src/core/lib/iomgr/error.c \
-    src/core/lib/iomgr/ev_poll_and_epoll_posix.c \
    src/core/lib/iomgr/ev_poll_posix.c \
    src/core/lib/iomgr/ev_posix.c \
    src/core/lib/iomgr/exec_ctx.c \
--- a/binding.gyp
+++ b/binding.gyp
@ -581,7 +581,6 @@
        'src/core/lib/iomgr/endpoint_pair_posix.c',
        'src/core/lib/iomgr/endpoint_pair_windows.c',
        'src/core/lib/iomgr/error.c',
-        'src/core/lib/iomgr/ev_poll_and_epoll_posix.c',
        'src/core/lib/iomgr/ev_poll_posix.c',
        'src/core/lib/iomgr/ev_posix.c',
        'src/core/lib/iomgr/exec_ctx.c',
--- a/build.yaml
+++ b/build.yaml
@ -164,7 +164,6 @@ filegroups:
  - src/core/lib/iomgr/endpoint.h
  - src/core/lib/iomgr/endpoint_pair.h
  - src/core/lib/iomgr/error.h
-  - src/core/lib/iomgr/ev_poll_and_epoll_posix.h
  - src/core/lib/iomgr/ev_poll_posix.h
  - src/core/lib/iomgr/ev_posix.h
  - src/core/lib/iomgr/exec_ctx.h
@ -241,7 +240,6 @@ filegroups:
  - src/core/lib/iomgr/endpoint_pair_posix.c
  - src/core/lib/iomgr/endpoint_pair_windows.c
  - src/core/lib/iomgr/error.c
-  - src/core/lib/iomgr/ev_poll_and_epoll_posix.c
  - src/core/lib/iomgr/ev_poll_posix.c
  - src/core/lib/iomgr/ev_posix.c
  - src/core/lib/iomgr/exec_ctx.c
--- a/config.m4
+++ b/config.m4
@ -100,7 +100,6 @@ if test "$PHP_GRPC" != "no"; then
    src/core/lib/iomgr/endpoint_pair_posix.c \
    src/core/lib/iomgr/endpoint_pair_windows.c \
    src/core/lib/iomgr/error.c \
-    src/core/lib/iomgr/ev_poll_and_epoll_posix.c \
    src/core/lib/iomgr/ev_poll_posix.c \
    src/core/lib/iomgr/ev_posix.c \
    src/core/lib/iomgr/exec_ctx.c \
--- a/gRPC.podspec
+++ b/gRPC.podspec
@ -180,7 +180,6 @@ Pod::Spec.new do |s|
                      'src/core/lib/iomgr/endpoint.h',
                      'src/core/lib/iomgr/endpoint_pair.h',
                      'src/core/lib/iomgr/error.h',
-                      'src/core/lib/iomgr/ev_poll_and_epoll_posix.h',
                      'src/core/lib/iomgr/ev_poll_posix.h',
                      'src/core/lib/iomgr/ev_posix.h',
                      'src/core/lib/iomgr/exec_ctx.h',
@ -361,7 +360,6 @@ Pod::Spec.new do |s|
                      'src/core/lib/iomgr/endpoint_pair_posix.c',
                      'src/core/lib/iomgr/endpoint_pair_windows.c',
                      'src/core/lib/iomgr/error.c',
-                      'src/core/lib/iomgr/ev_poll_and_epoll_posix.c',
                      'src/core/lib/iomgr/ev_poll_posix.c',
                      'src/core/lib/iomgr/ev_posix.c',
                      'src/core/lib/iomgr/exec_ctx.c',
@ -552,7 +550,6 @@ Pod::Spec.new do |s|
                              'src/core/lib/iomgr/endpoint.h',
                              'src/core/lib/iomgr/endpoint_pair.h',
                              'src/core/lib/iomgr/error.h',
-                              'src/core/lib/iomgr/ev_poll_and_epoll_posix.h',
                              'src/core/lib/iomgr/ev_poll_posix.h',
                              'src/core/lib/iomgr/ev_posix.h',
                              'src/core/lib/iomgr/exec_ctx.h',
--- a/grpc.gemspec
+++ b/grpc.gemspec
@ -189,7 +189,6 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/iomgr/endpoint.h )
  s.files += %w( src/core/lib/iomgr/endpoint_pair.h )
  s.files += %w( src/core/lib/iomgr/error.h )
-  s.files += %w( src/core/lib/iomgr/ev_poll_and_epoll_posix.h )
  s.files += %w( src/core/lib/iomgr/ev_poll_posix.h )
  s.files += %w( src/core/lib/iomgr/ev_posix.h )
  s.files += %w( src/core/lib/iomgr/exec_ctx.h )
@ -340,7 +339,6 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/iomgr/endpoint_pair_posix.c )
  s.files += %w( src/core/lib/iomgr/endpoint_pair_windows.c )
  s.files += %w( src/core/lib/iomgr/error.c )
-  s.files += %w( src/core/lib/iomgr/ev_poll_and_epoll_posix.c )
  s.files += %w( src/core/lib/iomgr/ev_poll_posix.c )
  s.files += %w( src/core/lib/iomgr/ev_posix.c )
  s.files += %w( src/core/lib/iomgr/exec_ctx.c )
--- a/package.xml
+++ b/package.xml
@ -196,7 +196,6 @@
    <file baseinstalldir="/" name="src/core/lib/iomgr/endpoint.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/endpoint_pair.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/error.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/iomgr/ev_poll_and_epoll_posix.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/ev_poll_posix.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/ev_posix.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/exec_ctx.h" role="src" />
@ -347,7 +346,6 @@
    <file baseinstalldir="/" name="src/core/lib/iomgr/endpoint_pair_posix.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/endpoint_pair_windows.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/error.c" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/iomgr/ev_poll_and_epoll_posix.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/ev_poll_posix.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/ev_posix.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/exec_ctx.c" role="src" />
--- a/src/core/lib/iomgr/ev_poll_and_epoll_posix.c
+++ b/src/core/lib/iomgr/ev_poll_and_epoll_posix.c
--- a/src/core/lib/iomgr/ev_poll_and_epoll_posix.h
+++ b/src/core/lib/iomgr/ev_poll_and_epoll_posix.h
@ -1,41 +0,0 @@
-/*
- *
- * Copyright 2015, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef GRPC_CORE_LIB_IOMGR_EV_POLL_AND_EPOLL_POSIX_H
-#define GRPC_CORE_LIB_IOMGR_EV_POLL_AND_EPOLL_POSIX_H
-
-#include "src/core/lib/iomgr/ev_posix.h"
-
-const grpc_event_engine_vtable *grpc_init_poll_and_epoll_posix(void);
-
-#endif /* GRPC_CORE_LIB_IOMGR_EV_POLL_AND_EPOLL_POSIX_H */
--- a/src/core/lib/iomgr/ev_poll_posix.c
+++ b/src/core/lib/iomgr/ev_poll_posix.c
@ -59,6 +59,8 @@
 * FD declarations
 */

+grpc_wakeup_fd grpc_global_wakeup_fd;
+
 typedef struct grpc_fd_watcher {
  struct grpc_fd_watcher *next;
  struct grpc_fd_watcher *prev;
@ -181,7 +183,6 @@ struct grpc_pollset_worker {
 struct grpc_pollset {
  gpr_mu mu;
  grpc_pollset_worker root_worker;
-  int in_flight_cbs;
  int shutting_down;
  int called_shutdown;
  int kicked_without_pollers;
@ -191,10 +192,6 @@ struct grpc_pollset {
  size_t fd_count;
  size_t fd_capacity;
  grpc_fd **fds;
-  /* fds that have been removed from the pollset explicitly */
-  size_t del_count;
-  size_t del_capacity;
-  grpc_fd **dels;
  /* Local cache of eventfds for workers */
  grpc_cached_wakeup_fd *local_wakeup_cache;
 };
@ -752,7 +749,6 @@ static void pollset_init(grpc_pollset *pollset, gpr_mu **mu) {
  gpr_mu_init(&pollset->mu);
  *mu = &pollset->mu;
  pollset->root_worker.next = pollset->root_worker.prev = &pollset->root_worker;
-  pollset->in_flight_cbs = 0;
  pollset->shutting_down = 0;
  pollset->called_shutdown = 0;
  pollset->kicked_without_pollers = 0;
@ -761,14 +757,10 @@ static void pollset_init(grpc_pollset *pollset, gpr_mu **mu) {
  pollset->kicked_without_pollers = 0;
  pollset->fd_count = 0;
  pollset->fd_capacity = 0;
-  pollset->del_count = 0;
-  pollset->del_capacity = 0;
  pollset->fds = NULL;
-  pollset->dels = NULL;
 }

 static void pollset_destroy(grpc_pollset *pollset) {
-  GPR_ASSERT(pollset->in_flight_cbs == 0);
  GPR_ASSERT(!pollset_has_workers(pollset));
  GPR_ASSERT(pollset->idle_jobs.head == pollset->idle_jobs.tail);
  while (pollset->local_wakeup_cache) {
@ -778,17 +770,14 @@ static void pollset_destroy(grpc_pollset *pollset) {
    pollset->local_wakeup_cache = next;
  }
  gpr_free(pollset->fds);
-  gpr_free(pollset->dels);
  gpr_mu_destroy(&pollset->mu);
 }

 static void pollset_reset(grpc_pollset *pollset) {
  GPR_ASSERT(pollset->shutting_down);
-  GPR_ASSERT(pollset->in_flight_cbs == 0);
  GPR_ASSERT(!pollset_has_workers(pollset));
  GPR_ASSERT(pollset->idle_jobs.head == pollset->idle_jobs.tail);
  GPR_ASSERT(pollset->fd_count == 0);
-  GPR_ASSERT(pollset->del_count == 0);
  pollset->shutting_down = 0;
  pollset->called_shutdown = 0;
  pollset->kicked_without_pollers = 0;
@ -821,11 +810,7 @@ static void finish_shutdown(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset) {
  for (i = 0; i < pollset->fd_count; i++) {
    GRPC_FD_UNREF(pollset->fds[i], "multipoller");
  }
-  for (i = 0; i < pollset->del_count; i++) {
-    GRPC_FD_UNREF(pollset->dels[i], "multipoller_del");
-  }
  pollset->fd_count = 0;
-  pollset->del_count = 0;
  grpc_exec_ctx_push(exec_ctx, pollset->shutdown_done, GRPC_ERROR_NONE, NULL);
 }

@ -877,13 +862,6 @@ static grpc_error *pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset,
    GPR_TIMER_MARK("pollset_work.shutting_down", 0);
    goto done;
  }
-  /* Give do_promote priority so we don't starve it out */
-  if (pollset->in_flight_cbs) {
-    GPR_TIMER_MARK("pollset_work.in_flight_cbs", 0);
-    gpr_mu_unlock(&pollset->mu);
-    locked = 0;
-    goto done;
-  }
  /* Start polling, and keep doing so while we're being asked to
     re-evaluate our pollers (this allows poll() based pollers to
     ensure they don't miss wakeups) */
@ -903,7 +881,7 @@ static grpc_error *pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset,

      int timeout;
      int r;
-      size_t i, j, fd_count;
+      size_t i, fd_count;
      nfds_t pfd_count;
      /* TODO(ctiller): inline some elements to avoid an allocation */
      grpc_fd_watcher *watchers;
@ -923,11 +901,7 @@ static grpc_error *pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset,
      pfds[1].events = POLLIN;
      pfds[1].revents = 0;
      for (i = 0; i < pollset->fd_count; i++) {
-        int remove = fd_is_orphaned(pollset->fds[i]);
-        for (j = 0; !remove && j < pollset->del_count; j++) {
-          if (pollset->fds[i] == pollset->dels[j]) remove = 1;
-        }
-        if (remove) {
+        if (fd_is_orphaned(pollset->fds[i])) {
          GRPC_FD_UNREF(pollset->fds[i], "multipoller");
        } else {
          pollset->fds[fd_count++] = pollset->fds[i];
@ -938,10 +912,6 @@ static grpc_error *pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset,
          pfd_count++;
        }
      }
-      for (j = 0; j < pollset->del_count; j++) {
-        GRPC_FD_UNREF(pollset->dels[j], "multipoller_del");
-      }
-      pollset->del_count = 0;
      pollset->fd_count = fd_count;
      gpr_mu_unlock(&pollset->mu);

@ -1035,7 +1005,7 @@ static grpc_error *pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset,
  if (pollset->shutting_down) {
    if (pollset_has_workers(pollset)) {
      pollset_kick(pollset, NULL);
-    } else if (!pollset->called_shutdown && pollset->in_flight_cbs == 0) {
+    } else if (!pollset->called_shutdown) {
      pollset->called_shutdown = 1;
      gpr_mu_unlock(&pollset->mu);
      finish_shutdown(exec_ctx, pollset);
@ -1066,8 +1036,7 @@ static void pollset_shutdown(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset,
  if (!pollset_has_workers(pollset)) {
    grpc_exec_ctx_enqueue_list(exec_ctx, &pollset->idle_jobs, NULL);
  }
-  if (!pollset->called_shutdown && pollset->in_flight_cbs == 0 &&
-      !pollset_has_workers(pollset)) {
+  if (!pollset->called_shutdown && !pollset_has_workers(pollset)) {
    pollset->called_shutdown = 1;
    finish_shutdown(exec_ctx, pollset);
  }
--- a/src/core/lib/iomgr/ev_posix.c
+++ b/src/core/lib/iomgr/ev_posix.c
@ -44,7 +44,6 @@
 #include <grpc/support/string_util.h>
 #include <grpc/support/useful.h>

-#include "src/core/lib/iomgr/ev_poll_and_epoll_posix.h"
 #include "src/core/lib/iomgr/ev_poll_posix.h"
 #include "src/core/lib/support/env.h"

@ -62,7 +61,7 @@ typedef struct {
 } event_engine_factory;

 static const event_engine_factory g_factories[] = {
-    {"poll", grpc_init_poll_posix}, {"legacy", grpc_init_poll_and_epoll_posix},
+    {"poll", grpc_init_poll_posix},
 };

 static void add(const char *beg, const char *end, char ***ss, size_t *ns) {
--- a/src/core/lib/iomgr/tcp_server_windows.c
+++ b/src/core/lib/iomgr/tcp_server_windows.c
@ -380,9 +380,10 @@ static void on_accept(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) {

  /* The only time we should call our callback, is where we successfully
     managed to accept a connection, and created an endpoint. */
-  if (ep)
-    sp->server->on_accept_cb(exec_ctx, sp->server->on_accept_cb_arg, ep,
+  if (ep) {
+    sp->server->on_accept_cb(exec_ctx, sp->server->on_accept_cb_arg, ep, NULL,
                             &acceptor);
+  }
  /* As we were notified from the IOCP of one and exactly one accept,
     the former socked we created has now either been destroy or assigned
     to the new connection. We need to create a new one for the next
--- a/src/core/lib/surface/server.c
+++ b/src/core/lib/surface/server.c
@ -175,7 +175,7 @@ struct registered_method {
  char *host;
  grpc_server_register_method_payload_handling payload_handling;
  uint32_t flags;
-  /* one request matcher per method per cq */
+  /* one request matcher per method */
  request_matcher request_matcher;
  registered_method *next;
 };
@ -204,7 +204,7 @@ struct grpc_server {
  gpr_mu mu_call;   /* mutex for call-specific state */

  registered_method *registered_methods;
-  /** one request matcher for unregistered methods per cq */
+  /** one request matcher for unregistered methods */
  request_matcher unregistered_request_matcher;
  /** free list of available requested_calls indices */
  gpr_stack_lockfree *request_freelist;
@ -947,16 +947,15 @@ static void register_completion_queue(grpc_server *server,

  grpc_cq_mark_server_cq(cq);

-  /* Non-listening completion queues are not added to server->cqs */
  if (is_non_listening) {
    grpc_cq_mark_non_listening_server_cq(cq);
-  } else {
-    GRPC_CQ_INTERNAL_REF(cq, "server");
-    n = server->cq_count++;
-    server->cqs = gpr_realloc(
-        server->cqs, server->cq_count * sizeof(grpc_completion_queue *));
-    server->cqs[n] = cq;
  }
+
+  GRPC_CQ_INTERNAL_REF(cq, "server");
+  n = server->cq_count++;
+  server->cqs = gpr_realloc(server->cqs,
+                            server->cq_count * sizeof(grpc_completion_queue *));
+  server->cqs[n] = cq;
 }

 void grpc_server_register_completion_queue(grpc_server *server,
@ -1063,9 +1062,12 @@ void grpc_server_start(grpc_server *server) {
  GRPC_API_TRACE("grpc_server_start(server=%p)", 1, (server));

  server->started = true;
+  size_t pollset_count = 0;
  server->pollsets = gpr_malloc(sizeof(grpc_pollset *) * server->cq_count);
  for (i = 0; i < server->cq_count; i++) {
-    server->pollsets[i] = grpc_cq_pollset(server->cqs[i]);
+    if (!grpc_cq_is_non_listening_server_cq(server->cqs[i])) {
+      server->pollsets[pollset_count++] = grpc_cq_pollset(server->cqs[i]);
+    }
  }
  request_matcher_init(&server->unregistered_request_matcher,
                       server->max_requested_calls, server);
@ -1075,7 +1077,7 @@ void grpc_server_start(grpc_server *server) {
  }

  for (l = server->listeners; l; l = l->next) {
-    l->start(&exec_ctx, server, l->arg, server->pollsets, server->cq_count);
+    l->start(&exec_ctx, server, l->arg, server->pollsets, pollset_count);
  }

  grpc_exec_ctx_finish(&exec_ctx);
--- a/src/cpp/server/server.cc
+++ b/src/cpp/server/server.cc
@ -412,7 +412,9 @@ bool Server::Start(ServerCompletionQueue** cqs, size_t num_cqs) {
      sync_methods_->push_back(SyncRequest(unknown_method_.get(), nullptr));
    }
    for (size_t i = 0; i < num_cqs; i++) {
-      new UnimplementedAsyncRequest(this, cqs[i]);
+      if (cqs[i]->IsFrequentlyPolled()) {
+        new UnimplementedAsyncRequest(this, cqs[i]);
+      }
    }
  }
  // Start processing rpcs.
--- a/src/cpp/server/server_builder.cc
+++ b/src/cpp/server/server_builder.cc
@ -100,13 +100,12 @@ void ServerBuilder::AddListeningPort(const grpc::string& addr,

 std::unique_ptr<Server> ServerBuilder::BuildAndStart() {
  std::unique_ptr<ThreadPoolInterface> thread_pool;
-  // Does this server have atleast one sync method
  bool has_sync_methods = false;
  for (auto it = services_.begin(); it != services_.end(); ++it) {
    if ((*it)->service->has_synchronous_methods()) {
-      has_sync_methods = true;
      if (thread_pool == nullptr) {
        thread_pool.reset(CreateDefaultThreadPool());
+        has_sync_methods = true;
        break;
      }
    }
@ -120,6 +119,7 @@ std::unique_ptr<Server> ServerBuilder::BuildAndStart() {
    for (auto plugin = plugins_.begin(); plugin != plugins_.end(); plugin++) {
      if ((*plugin).second->has_sync_methods()) {
        thread_pool.reset(CreateDefaultThreadPool());
+        has_sync_methods = true;
        break;
      }
    }
@ -155,7 +155,7 @@ std::unique_ptr<Server> ServerBuilder::BuildAndStart() {

  if (num_frequently_polled_cqs == 0) {
    gpr_log(GPR_ERROR,
-            "Atleast one of the completion queues must be frequently polled");
+            "At least one of the completion queues must be frequently polled");
    return nullptr;
  }

--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@ -94,7 +94,6 @@ CORE_SOURCE_FILES = [
  'src/core/lib/iomgr/endpoint_pair_posix.c',
  'src/core/lib/iomgr/endpoint_pair_windows.c',
  'src/core/lib/iomgr/error.c',
-  'src/core/lib/iomgr/ev_poll_and_epoll_posix.c',
  'src/core/lib/iomgr/ev_poll_posix.c',
  'src/core/lib/iomgr/ev_posix.c',
  'src/core/lib/iomgr/exec_ctx.c',
--- a/test/cpp/end2end/hybrid_end2end_test.cc
+++ b/test/cpp/end2end/hybrid_end2end_test.cc
@ -207,6 +207,9 @@ class HybridEnd2endTest : public ::testing::Test {
    ServerBuilder builder;
    builder.AddListeningPort(server_address_.str(),
                             grpc::InsecureServerCredentials());
+    // Always add a sync unimplemented service: we rely on having at least one
+    // synchronous method to get a listening cq
+    builder.RegisterService(&unimplemented_service_);
    builder.RegisterService(service1);
    if (service2) {
      builder.RegisterService(service2);
@ -252,6 +255,7 @@ class HybridEnd2endTest : public ::testing::Test {
    EchoRequest send_request;
    EchoResponse recv_response;
    ClientContext cli_ctx;
+    cli_ctx.set_fail_fast(false);
    send_request.set_message("Hello");
    Status recv_status = stub_->Echo(&cli_ctx, send_request, &recv_response);
    EXPECT_EQ(send_request.message(), recv_response.message());
@ -265,6 +269,7 @@ class HybridEnd2endTest : public ::testing::Test {
    EchoRequest send_request;
    EchoResponse recv_response;
    ClientContext cli_ctx;
+    cli_ctx.set_fail_fast(false);
    send_request.set_message("Hello");
    Status recv_status = stub->Echo(&cli_ctx, send_request, &recv_response);
    EXPECT_EQ(send_request.message() + "_dup", recv_response.message());
@ -276,6 +281,7 @@ class HybridEnd2endTest : public ::testing::Test {
    EchoResponse recv_response;
    grpc::string expected_message;
    ClientContext cli_ctx;
+    cli_ctx.set_fail_fast(false);
    send_request.set_message("Hello");
    auto stream = stub_->RequestStream(&cli_ctx, &recv_response);
    for (int i = 0; i < 5; i++) {
@ -292,6 +298,7 @@ class HybridEnd2endTest : public ::testing::Test {
    EchoRequest request;
    EchoResponse response;
    ClientContext context;
+    context.set_fail_fast(false);
    request.set_message("hello");

    auto stream = stub_->ResponseStream(&context, request);
@ -311,6 +318,7 @@ class HybridEnd2endTest : public ::testing::Test {
    EchoRequest request;
    EchoResponse response;
    ClientContext context;
+    context.set_fail_fast(false);
    grpc::string msg("hello");

    auto stream = stub_->BidiStream(&context);
@ -338,6 +346,7 @@ class HybridEnd2endTest : public ::testing::Test {
    EXPECT_TRUE(s.ok());
  }

+  grpc::testing::UnimplementedService::Service unimplemented_service_;
  std::vector<std::unique_ptr<ServerCompletionQueue> > cqs_;
  std::unique_ptr<grpc::testing::EchoTestService::Stub> stub_;
  std::unique_ptr<Server> server_;
--- a/test/cpp/end2end/server_builder_plugin_test.cc
+++ b/test/cpp/end2end/server_builder_plugin_test.cc
@ -189,6 +189,7 @@ class ServerBuilderPluginTest : public ::testing::TestWithParam<bool> {
  void StartServer() {
    grpc::string server_address = "localhost:" + to_string(port_);
    builder_->AddListeningPort(server_address, InsecureServerCredentials());
+    cq_ = builder_->AddCompletionQueue();
    server_ = builder_->BuildAndStart();
    EXPECT_TRUE(builder_->plugins_[PLUGIN_NAME] != nullptr);
  }
@ -206,6 +207,12 @@ class ServerBuilderPluginTest : public ::testing::TestWithParam<bool> {
    EXPECT_TRUE(plugin != nullptr);
    EXPECT_TRUE(plugin->init_server_is_called());
    EXPECT_TRUE(plugin->finish_is_called());
+    server_->Shutdown();
+    void* tag;
+    bool ok;
+    cq_->Shutdown();
+    while (cq_->Next(&tag, &ok))
+      ;
  }

  string to_string(const int number) {
@ -218,6 +225,7 @@ class ServerBuilderPluginTest : public ::testing::TestWithParam<bool> {
  std::shared_ptr<Channel> channel_;
  std::unique_ptr<ServerBuilder> builder_;
  std::unique_ptr<grpc::testing::EchoTestService::Stub> stub_;
+  std::unique_ptr<ServerCompletionQueue> cq_;
  std::unique_ptr<Server> server_;
  TestServiceImpl service_;
  int port_;
--- a/test/cpp/qps/gen_build_yaml.py
+++ b/test/cpp/qps/gen_build_yaml.py
@ -46,6 +46,24 @@ import performance.scenario_config as scenario_config
 def _scenario_json_string(scenario_json):
  return json.dumps(scenario_config.remove_nonproto_fields(scenario_json))

+def threads_of_type(scenario_json, path):
+  d = scenario_json
+  for el in path.split('/'):
+    if el not in d:
+      return 0
+    d = d[el]
+  return d
+
+def guess_cpu(scenario_json):
+  client = threads_of_type(scenario_json, 'client_config/async_client_threads')
+  server = threads_of_type(scenario_json, 'server_config/async_server_threads')
+  # make an arbitrary guess if set to auto-detect
+  # about the size of the jenkins instances we have for unit tests
+  if client == 0: client = 8
+  if server == 0: server = 8
+  return (scenario_json['num_clients'] * client +
+          scenario_json['num_servers'] * server)
+
 print yaml.dump({
  'tests': [
    {
@ -59,7 +77,7 @@ print yaml.dump({
      'language': 'c++',
      'boringssl': True,
      'defaults': 'boringssl',
-      'cpu_cost': 1000.0,
+      'cpu_cost': guess_cpu(scenario_json),
      'exclude_configs': []
    }
    for scenario_json in scenario_config.CXXLanguage().scenarios()
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@ -808,7 +808,6 @@ src/core/lib/iomgr/closure.h \
 src/core/lib/iomgr/endpoint.h \
 src/core/lib/iomgr/endpoint_pair.h \
 src/core/lib/iomgr/error.h \
-src/core/lib/iomgr/ev_poll_and_epoll_posix.h \
 src/core/lib/iomgr/ev_poll_posix.h \
 src/core/lib/iomgr/ev_posix.h \
 src/core/lib/iomgr/exec_ctx.h \
@ -959,7 +958,6 @@ src/core/lib/iomgr/endpoint.c \
 src/core/lib/iomgr/endpoint_pair_posix.c \
 src/core/lib/iomgr/endpoint_pair_windows.c \
 src/core/lib/iomgr/error.c \
-src/core/lib/iomgr/ev_poll_and_epoll_posix.c \
 src/core/lib/iomgr/ev_poll_posix.c \
 src/core/lib/iomgr/ev_posix.c \
 src/core/lib/iomgr/exec_ctx.c \
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@ -157,7 +157,7 @@ class CLanguage(object):
      'windows': ['all'],
      'mac': ['all'],
      'posix': ['all'],
-      'linux': ['poll', 'legacy']
+      'linux': ['poll'],
    }
    for target in binaries:
      polling_strategies = (POLLING_STRATEGIES[self.platform]
--- a/tools/run_tests/sources_and_headers.json
+++ b/tools/run_tests/sources_and_headers.json
@ -5639,7 +5639,6 @@
      "src/core/lib/iomgr/endpoint.h", 
      "src/core/lib/iomgr/endpoint_pair.h", 
      "src/core/lib/iomgr/error.h", 
-      "src/core/lib/iomgr/ev_poll_and_epoll_posix.h", 
      "src/core/lib/iomgr/ev_poll_posix.h", 
      "src/core/lib/iomgr/ev_posix.h", 
      "src/core/lib/iomgr/exec_ctx.h", 
@ -5742,8 +5741,6 @@
      "src/core/lib/iomgr/endpoint_pair_windows.c", 
      "src/core/lib/iomgr/error.c", 
      "src/core/lib/iomgr/error.h", 
-      "src/core/lib/iomgr/ev_poll_and_epoll_posix.c", 
-      "src/core/lib/iomgr/ev_poll_and_epoll_posix.h", 
      "src/core/lib/iomgr/ev_poll_posix.c", 
      "src/core/lib/iomgr/ev_poll_posix.h", 
      "src/core/lib/iomgr/ev_posix.c", 
--- a/tools/run_tests/tests.json
+++ b/tools/run_tests/tests.json
@ -23031,7 +23031,7 @@
      "posix", 
      "windows"
    ], 
-    "cpu_cost": 1000.0, 
+    "cpu_cost": 2, 
    "defaults": "boringssl", 
    "exclude_configs": [], 
    "flaky": false, 
@ -23057,7 +23057,7 @@
      "posix", 
      "windows"
    ], 
-    "cpu_cost": 1000.0, 
+    "cpu_cost": 2, 
    "defaults": "boringssl", 
    "exclude_configs": [], 
    "flaky": false, 
@ -23083,7 +23083,7 @@
      "posix", 
      "windows"
    ], 
-    "cpu_cost": 1000.0, 
+    "cpu_cost": 2, 
    "defaults": "boringssl", 
    "exclude_configs": [], 
    "flaky": false, 
@ -23109,7 +23109,7 @@
      "posix", 
      "windows"
    ], 
-    "cpu_cost": 1000.0, 
+    "cpu_cost": 2, 
    "defaults": "boringssl", 
    "exclude_configs": [], 
    "flaky": false, 
@ -23135,7 +23135,7 @@
      "posix", 
      "windows"
    ], 
-    "cpu_cost": 1000.0, 
+    "cpu_cost": 8, 
    "defaults": "boringssl", 
    "exclude_configs": [], 
    "flaky": false, 
@ -23161,7 +23161,7 @@
      "posix", 
      "windows"
    ], 
-    "cpu_cost": 1000.0, 
+    "cpu_cost": 8, 
    "defaults": "boringssl", 
    "exclude_configs": [], 
    "flaky": false, 
@ -23187,7 +23187,7 @@
      "posix", 
      "windows"
    ], 
-    "cpu_cost": 1000.0, 
+    "cpu_cost": 8, 
    "defaults": "boringssl", 
    "exclude_configs": [], 
    "flaky": false, 
@ -23213,7 +23213,7 @@
      "posix", 
      "windows"
    ], 
-    "cpu_cost": 1000.0, 
+    "cpu_cost": 1, 
    "defaults": "boringssl", 
    "exclude_configs": [], 
    "flaky": false, 
@ -23239,7 +23239,7 @@
      "posix", 
      "windows"
    ], 
-    "cpu_cost": 1000.0, 
+    "cpu_cost": 2, 
    "defaults": "boringssl", 
    "exclude_configs": [], 
    "flaky": false, 
@ -23265,7 +23265,7 @@
      "posix", 
      "windows"
    ], 
-    "cpu_cost": 1000.0, 
+    "cpu_cost": 2, 
    "defaults": "boringssl", 
    "exclude_configs": [], 
    "flaky": false, 
@ -23291,7 +23291,7 @@
      "posix", 
      "windows"
    ], 
-    "cpu_cost": 1000.0, 
+    "cpu_cost": 2, 
    "defaults": "boringssl", 
    "exclude_configs": [], 
    "flaky": false, 
@ -23317,7 +23317,7 @@
      "posix", 
      "windows"
    ], 
-    "cpu_cost": 1000.0, 
+    "cpu_cost": 2, 
    "defaults": "boringssl", 
    "exclude_configs": [], 
    "flaky": false, 
@ -23343,7 +23343,7 @@
      "posix", 
      "windows"
    ], 
-    "cpu_cost": 1000.0, 
+    "cpu_cost": 8, 
    "defaults": "boringssl", 
    "exclude_configs": [], 
    "flaky": false, 
@ -23369,7 +23369,7 @@
      "posix", 
      "windows"
    ], 
-    "cpu_cost": 1000.0, 
+    "cpu_cost": 8, 
    "defaults": "boringssl", 
    "exclude_configs": [], 
    "flaky": false, 
@ -23395,7 +23395,7 @@
      "posix", 
      "windows"
    ], 
-    "cpu_cost": 1000.0, 
+    "cpu_cost": 8, 
    "defaults": "boringssl", 
    "exclude_configs": [], 
    "flaky": false, 
@ -23421,7 +23421,7 @@
      "posix", 
      "windows"
    ], 
-    "cpu_cost": 1000.0, 
+    "cpu_cost": 1, 
    "defaults": "boringssl", 
    "exclude_configs": [], 
    "flaky": false, 
--- a/vsprojects/vcxproj/grpc/grpc.vcxproj
+++ b/vsprojects/vcxproj/grpc/grpc.vcxproj
@ -317,7 +317,6 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\endpoint.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\endpoint_pair.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\error.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_and_epoll_posix.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_posix.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_posix.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\exec_ctx.h" />
@ -489,8 +488,6 @@
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\error.c">
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_and_epoll_posix.c">
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_posix.c">
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_posix.c">
--- a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters
@ -58,9 +58,6 @@
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\error.c">
      <Filter>src\core\lib\iomgr</Filter>
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_and_epoll_posix.c">
-      <Filter>src\core\lib\iomgr</Filter>
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_posix.c">
      <Filter>src\core\lib\iomgr</Filter>
    </ClCompile>
@ -689,9 +686,6 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\error.h">
      <Filter>src\core\lib\iomgr</Filter>
    </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_and_epoll_posix.h">
-      <Filter>src\core\lib\iomgr</Filter>
-    </ClInclude>
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_posix.h">
      <Filter>src\core\lib\iomgr</Filter>
    </ClInclude>
--- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj
+++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj
@ -305,7 +305,6 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\endpoint.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\endpoint_pair.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\error.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_and_epoll_posix.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_posix.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_posix.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\exec_ctx.h" />
@ -454,8 +453,6 @@
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\error.c">
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_and_epoll_posix.c">
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_posix.c">
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_posix.c">
--- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters
@ -61,9 +61,6 @@
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\error.c">
      <Filter>src\core\lib\iomgr</Filter>
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_and_epoll_posix.c">
-      <Filter>src\core\lib\iomgr</Filter>
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_posix.c">
      <Filter>src\core\lib\iomgr</Filter>
    </ClCompile>
@ -584,9 +581,6 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\error.h">
      <Filter>src\core\lib\iomgr</Filter>
    </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_and_epoll_posix.h">
-      <Filter>src\core\lib\iomgr</Filter>
-    </ClInclude>
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_posix.h">
      <Filter>src\core\lib\iomgr</Filter>
    </ClInclude>