Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

clang-format

Browse Source
pull/12789/head
Craig Tiller 7 years ago
parent 8232492cce
commit b653dff0bd
1 changed files with 26 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 45
      src/core/lib/iomgr/ev_epollex_linux.cc

45
src/core/lib/iomgr/ev_epollex_linux.cc
Unescape View File

@ -545,9 +545,13 @@ static void pollset_global_shutdown(void) {
static void pollset_maybe_finish_shutdown(grpc_exec_ctx *exec_ctx, static void pollset_maybe_finish_shutdown(grpc_exec_ctx *exec_ctx,
grpc_pollset *pollset) { grpc_pollset *pollset) {
if (GRPC_TRACER_ON(grpc_polling_trace)) { if (GRPC_TRACER_ON(grpc_polling_trace)) {
gpr_log(GPR_DEBUG, "PS:%p (pollable:%p) maybe_finish_shutdown sc=%p (target:!NULL) rw=%p (target:NULL) cpsc=%d (target:0)", pollset, pollset->active_pollable, pollset->shutdown_closure, pollset->root_worker, pollset->containing_pollset_set_count); gpr_log(GPR_DEBUG,
} "PS:%p (pollable:%p) maybe_finish_shutdown sc=%p (target:!NULL) "
"rw=%p (target:NULL) cpsc=%d (target:0)",
pollset, pollset->active_pollable, pollset->shutdown_closure,
pollset->root_worker, pollset->containing_pollset_set_count);
}
if (pollset->shutdown_closure != NULL && pollset->root_worker == NULL && if (pollset->shutdown_closure != NULL && pollset->root_worker == NULL &&
pollset->containing_pollset_set_count == 0) { pollset->containing_pollset_set_count == 0) {
GRPC_CLOSURE_SCHED(exec_ctx, pollset->shutdown_closure, GRPC_ERROR_NONE); GRPC_CLOSURE_SCHED(exec_ctx, pollset->shutdown_closure, GRPC_ERROR_NONE);
@ -1127,7 +1131,7 @@ static void pollset_set_unref(grpc_exec_ctx *exec_ctx, grpc_pollset_set *pss) {
gpr_mu_destroy(&pss->mu); gpr_mu_destroy(&pss->mu);
for (size_t i = 0; i < pss->pollset_count; i++) { for (size_t i = 0; i < pss->pollset_count; i++) {
gpr_mu_lock(&pss->pollsets[i]->mu); gpr_mu_lock(&pss->pollsets[i]->mu);
if (0==--pss->pollsets[i]->containing_pollset_set_count) { if (0 == --pss->pollsets[i]->containing_pollset_set_count) {
pollset_maybe_finish_shutdown(exec_ctx, pss->pollsets[i]); pollset_maybe_finish_shutdown(exec_ctx, pss->pollsets[i]);
} }
gpr_mu_unlock(&pss->pollsets[i]->mu); gpr_mu_unlock(&pss->pollsets[i]->mu);
@ -1149,7 +1153,8 @@ static void pollset_set_add_fd(grpc_exec_ctx *exec_ctx, grpc_pollset_set *pss,
static const char *err_desc = "pollset_set_add_fd"; static const char *err_desc = "pollset_set_add_fd";
pss = pss_lock_adam(pss); pss = pss_lock_adam(pss);
for (size_t i = 0; i < pss->pollset_count; i++) { for (size_t i = 0; i < pss->pollset_count; i++) {
append_error(&error, pollable_add_fd(pss->pollsets[i]->active_pollable, fd), err_desc); append_error(&error, pollable_add_fd(pss->pollsets[i]->active_pollable, fd),
err_desc);
} }
if (pss->fd_count == pss->fd_capacity) { if (pss->fd_count == pss->fd_capacity) {
pss->fd_capacity = GPR_MAX(pss->fd_capacity * 2, 8); pss->fd_capacity = GPR_MAX(pss->fd_capacity * 2, 8);
@ -1212,10 +1217,10 @@ static void pollset_set_del_pollset(grpc_exec_ctx *exec_ctx,
// add all fds to pollables, and output a new array of unorphaned out_fds // add all fds to pollables, and output a new array of unorphaned out_fds
// assumes pollsets are multipollable // assumes pollsets are multipollable
static grpc_error *add_fds_to_pollsets(grpc_exec_ctx *exec_ctx, grpc_fd **fds, static grpc_error *add_fds_to_pollsets(grpc_exec_ctx *exec_ctx, grpc_fd **fds,
size_t fd_count, grpc_pollset **pollsets, size_t fd_count, grpc_pollset **pollsets,
size_t pollset_count, size_t pollset_count,
const char *err_desc, grpc_fd **out_fds, const char *err_desc, grpc_fd **out_fds,
size_t *out_fd_count) { size_t *out_fd_count) {
grpc_error *error = GRPC_ERROR_NONE; grpc_error *error = GRPC_ERROR_NONE;
for (size_t i = 0; i < fd_count; i++) { for (size_t i = 0; i < fd_count; i++) {
gpr_mu_lock(&fds[i]->orphan_mu); gpr_mu_lock(&fds[i]->orphan_mu);
@ -1224,7 +1229,9 @@ static grpc_error *add_fds_to_pollsets(grpc_exec_ctx *exec_ctx, grpc_fd **fds,
UNREF_BY(exec_ctx, fds[i], 2, "pollset_set"); UNREF_BY(exec_ctx, fds[i], 2, "pollset_set");
} else { } else {
for (size_t j = 0; j < pollset_count; j++) { for (size_t j = 0; j < pollset_count; j++) {
append_error(&error, pollable_add_fd(pollsets[j]->active_pollable, fds[i]), err_desc); append_error(&error,
pollable_add_fd(pollsets[j]->active_pollable, fds[i]),
err_desc);
} }
gpr_mu_unlock(&fds[i]->orphan_mu); gpr_mu_unlock(&fds[i]->orphan_mu);
out_fds[(*out_fd_count)++] = fds[i]; out_fds[(*out_fd_count)++] = fds[i];
@ -1253,9 +1260,9 @@ static void pollset_set_add_pollset(grpc_exec_ctx *exec_ctx,
pss = pss_lock_adam(pss); pss = pss_lock_adam(pss);
size_t initial_fd_count = pss->fd_count; size_t initial_fd_count = pss->fd_count;
pss->fd_count = 0; pss->fd_count = 0;
append_error(&error, add_fds_to_pollsets(exec_ctx, pss->fds, append_error(&error,
initial_fd_count, &ps, 1, add_fds_to_pollsets(exec_ctx, pss->fds, initial_fd_count, &ps, 1,
err_desc, pss->fds, &pss->fd_count), err_desc, pss->fds, &pss->fd_count),
err_desc); err_desc);
if (pss->pollset_count == pss->pollset_capacity) { if (pss->pollset_count == pss->pollset_capacity) {
pss->pollset_capacity = GPR_MAX(pss->pollset_capacity * 2, 8); pss->pollset_capacity = GPR_MAX(pss->pollset_capacity * 2, 8);
@ -1264,7 +1271,7 @@ static void pollset_set_add_pollset(grpc_exec_ctx *exec_ctx,
} }
pss->pollsets[pss->pollset_count++] = ps; pss->pollsets[pss->pollset_count++] = ps;
gpr_mu_unlock(&pss->mu); gpr_mu_unlock(&pss->mu);
POLLABLE_UNREF(pollable_obj, "pollset_set"); POLLABLE_UNREF(pollable_obj, "pollset_set");
GRPC_LOG_IF_ERROR(err_desc, error); GRPC_LOG_IF_ERROR(err_desc, error);
} }
@ -1317,13 +1324,13 @@ static void pollset_set_add_pollset_set(grpc_exec_ctx *exec_ctx,
} }
size_t initial_a_fd_count = a->fd_count; size_t initial_a_fd_count = a->fd_count;
a->fd_count = 0; a->fd_count = 0;
append_error(&error, add_fds_to_pollsets( append_error(&error, add_fds_to_pollsets(exec_ctx, a->fds, initial_a_fd_count,
exec_ctx, a->fds, initial_a_fd_count, b->pollsets, b->pollsets, b->pollset_count,
b->pollset_count, "merge_a2b", a->fds, &a->fd_count), "merge_a2b", a->fds, &a->fd_count),
err_desc); err_desc);
append_error(&error, add_fds_to_pollsets(exec_ctx, b->fds, b->fd_count, append_error(&error, add_fds_to_pollsets(exec_ctx, b->fds, b->fd_count,
a->pollsets, a->pollset_count, a->pollsets, a->pollset_count,
"merge_b2a", a->fds, &a->fd_count), "merge_b2a", a->fds, &a->fd_count),
err_desc); err_desc);
if (a->pollset_capacity < a->pollset_count + b->pollset_count) { if (a->pollset_capacity < a->pollset_count + b->pollset_count) {
a->pollset_capacity = a->pollset_capacity =

Write Preview
Loading…
Cancel
Save