diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-05-01 12:51:24 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-05-01 12:51:24 -0700 |
| commit | a95bacf7dba3d5ffc8968729525a4cd5ff0ff88c (patch) | |
| tree | 77fce06f38f2867869280ed38cfcb22076e29541 | |
| parent | e45a277b56273ae63dca8a0bb65e0337c15f7e37 (diff) | |
clang-format, revert parameter
| -rw-r--r-- | include/grpc++/server_builder.h | 5 | ||||
| -rw-r--r-- | src/core/lib/iomgr/ev_epoll1_linux.c | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/include/grpc++/server_builder.h b/include/grpc++/server_builder.h index d9de83226b..5a8577659a 100644 --- a/include/grpc++/server_builder.h +++ b/include/grpc++/server_builder.h @@ -195,7 +195,10 @@ class ServerBuilder { struct SyncServerSettings { SyncServerSettings() - : num_cqs(GPR_MAX(1,gpr_cpu_num_cores())), 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; diff --git a/src/core/lib/iomgr/ev_epoll1_linux.c b/src/core/lib/iomgr/ev_epoll1_linux.c index 8946d32697..29254e6324 100644 --- a/src/core/lib/iomgr/ev_epoll1_linux.c +++ b/src/core/lib/iomgr/ev_epoll1_linux.c @@ -402,7 +402,7 @@ static void pollset_destroy(grpc_pollset *pollset) { if (!pollset->seen_inactive) { pollset_neighbourhood *neighbourhood = pollset->neighbourhood; gpr_mu_unlock(&pollset->mu); -retry_lock_neighbourhood: + retry_lock_neighbourhood: gpr_mu_lock(&neighbourhood->mu); gpr_mu_lock(&pollset->mu); if (!pollset->seen_inactive) { @@ -462,7 +462,7 @@ static void pollset_shutdown(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, pollset_maybe_finish_shutdown(exec_ctx, pollset); } -#define MAX_EPOLL_EVENTS 10 +#define MAX_EPOLL_EVENTS 100 static int poll_deadline_to_millis_timeout(gpr_timespec deadline, gpr_timespec now) { @@ -652,7 +652,8 @@ static bool check_neighbourhood_for_available_poller( if (!found_worker) { inspect->seen_inactive = true; if (inspect == neighbourhood->active_root) { - neighbourhood->active_root = inspect->next == inspect ? NULL : inspect->next; + neighbourhood->active_root = + inspect->next == inspect ? NULL : inspect->next; } inspect->next->prev = inspect->prev; inspect->prev->next = inspect->next; |