commit e70fc3d1da0945765a9300d2a41317ef0f88b6ce
author Craig Tiller <ctiller@google.com> Fri Apr 28 16:08:47 2017 -0700
committer Craig Tiller <ctiller@google.com> Fri Apr 28 16:08:47 2017 -0700
tree a0187e91caabad49aaa494d4d195039fb193a55b
parent f4b0fcaa8e046d5ee00dd896c9e674fb249792b2
parent 7cb2698abdd599adc67389d7da56d84d29d6a1e5

Merge branch 'epoll1+hierarchical-turnstile' of github.com:ctiller/grpc into epoll1+hierarchical-turnstile

include/grpc++/server_builder.h

diff --git a/include/grpc++/server_builder.h b/include/grpc++/server_builder.h
index 7ac2334..d9de832 100644
--- a/include/grpc++/server_builder.h
+++ b/include/grpc++/server_builder.h
@@ -195,7 +195,7 @@
 
   struct SyncServerSettings {
     SyncServerSettings()
-        : num_cqs(1), min_pollers(1), max_pollers(2), cq_timeout_msec(10000) {}
+        : num_cqs(GPR_MAX(1,gpr_cpu_num_cores())), min_pollers(1), max_pollers(2), cq_timeout_msec(10000) {}
 
     // Number of server completion queues to create to listen to incoming RPCs.
     int num_cqs;

src/core/lib/iomgr/ev_epoll1_linux.c

diff --git a/src/core/lib/iomgr/ev_epoll1_linux.c b/src/core/lib/iomgr/ev_epoll1_linux.c
index 612cdc4..843efa9 100644
--- a/src/core/lib/iomgr/ev_epoll1_linux.c
+++ b/src/core/lib/iomgr/ev_epoll1_linux.c
@@ -448,7 +448,7 @@
   pollset_maybe_finish_shutdown(exec_ctx, pollset);
 }
 
-#define MAX_EPOLL_EVENTS 100
+#define MAX_EPOLL_EVENTS 10
 
 static int poll_deadline_to_millis_timeout(gpr_timespec deadline,
                                            gpr_timespec now) {