aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core
diff options
context:
space:
mode:
authorGravatar Craig Tiller <craig.tiller@gmail.com>2015-09-29 08:37:32 -0700
committerGravatar Craig Tiller <craig.tiller@gmail.com>2015-09-29 08:37:32 -0700
commitc3e577805d7538d1d5e1f2610387744651b0507f (patch)
treecbe7d769db1a210774334033ebcf24382dbe0c87 /src/core
parent114bda10906a602907fd9e469b9583a9e219fa47 (diff)
Properly initialize variables, destroy variables in usage order
Diffstat (limited to 'src/core')
-rw-r--r--src/core/iomgr/pollset_windows.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/iomgr/pollset_windows.c b/src/core/iomgr/pollset_windows.c
index cb0aad0e33..acdef9796c 100644
--- a/src/core/iomgr/pollset_windows.c
+++ b/src/core/iomgr/pollset_windows.c
@@ -137,6 +137,8 @@ void grpc_pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset,
int added_worker = 0;
worker->links[GRPC_POLLSET_WORKER_LINK_POLLSET].next =
worker->links[GRPC_POLLSET_WORKER_LINK_POLLSET].prev =
+ worker->links[GRPC_POLLSET_WORKER_LINK_GLOBAL].next =
+ worker->links[GRPC_POLLSET_WORKER_LINK_GLOBAL].prev =
NULL;
gpr_cv_init(&worker->cv);
if (grpc_alarm_check(exec_ctx, now, &deadline)) {
@@ -182,11 +184,11 @@ done:
grpc_exec_ctx_flush(exec_ctx);
gpr_mu_lock(&pollset->mu);
}
- gpr_cv_destroy(&worker->cv);
if (added_worker) {
remove_worker(worker, GRPC_POLLSET_WORKER_LINK_GLOBAL);
remove_worker(worker, GRPC_POLLSET_WORKER_LINK_POLLSET);
}
+ gpr_cv_destroy(&worker->cv);
}
void grpc_pollset_kick(grpc_pollset *p, grpc_pollset_worker *specific_worker) {