reviewable/pr10712/r1
Craig Tiller 8 years ago
parent 8a2984c4b6
commit 144521fc76
  1. 2
      include/grpc++/server_builder.h
  2. 2
      src/core/lib/iomgr/ev_epollex_linux.c

@ -195,7 +195,7 @@ class ServerBuilder {
struct SyncServerSettings { struct SyncServerSettings {
SyncServerSettings() SyncServerSettings()
: num_cqs(1), : num_cqs(gpr_cpu_num_cores()),
min_pollers(1), min_pollers(1),
max_pollers(INT_MAX), max_pollers(INT_MAX),
cq_timeout_msec(1000) {} cq_timeout_msec(1000) {}

@ -972,7 +972,7 @@ static bool begin_worker(grpc_pollset *pollset, grpc_pollset_worker *worker,
if (!worker_insert(&worker->pollable->root_worker, PWL_POLLABLE, worker)) { if (!worker_insert(&worker->pollable->root_worker, PWL_POLLABLE, worker)) {
worker->initialized_cv = true; worker->initialized_cv = true;
gpr_cv_init(&worker->cv); gpr_cv_init(&worker->cv);
while (pollset->root_worker != worker) { while (worker->pollable->root_worker != worker) {
if (gpr_cv_wait(&worker->cv, &pollset->current_pollable->po.mu, if (gpr_cv_wait(&worker->cv, &pollset->current_pollable->po.mu,
deadline)) { deadline)) {
return false; return false;

Loading…
Cancel
Save