sync fixes

8 years ago · 144521fc76
parent 8a2984c4b6
commit 144521fc76
2 changed files with 2 additions and 2 deletions
--- a/include/grpc++/server_builder.h
+++ b/include/grpc++/server_builder.h
@ -195,7 +195,7 @@ class ServerBuilder {

  struct SyncServerSettings {
    SyncServerSettings()
-        : num_cqs(1),
+        : num_cqs(gpr_cpu_num_cores()),
          min_pollers(1),
          max_pollers(INT_MAX),
          cq_timeout_msec(1000) {}
--- a/src/core/lib/iomgr/ev_epollex_linux.c
+++ b/src/core/lib/iomgr/ev_epollex_linux.c
@ -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)) {
    worker->initialized_cv = true;
    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,
                      deadline)) {
        return false;