aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/surface
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2015-06-25 08:52:40 -0700
committerGravatar Craig Tiller <ctiller@google.com>2015-06-25 08:52:40 -0700
commit6e8c7e87ef5c63d76ee8ef6f5c348d7f517e54d8 (patch)
tree97ab5393011a2ef1370ca5959020a9f53d3bddd9 /src/core/surface
parentd13794332c13737f978b8b4fd56c82ea90c3c2ba (diff)
parent0bf7e48ade52eec336f50dee4c7d22eeb887bb8e (diff)
Merge github.com:grpc/grpc into oops-i-split-it-again
Diffstat (limited to 'src/core/surface')
-rw-r--r--src/core/surface/completion_queue.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/core/surface/completion_queue.c b/src/core/surface/completion_queue.c
index bd0fabf9da..063a23cfb1 100644
--- a/src/core/surface/completion_queue.c
+++ b/src/core/surface/completion_queue.c
@@ -208,6 +208,7 @@ grpc_event grpc_completion_queue_next(grpc_completion_queue *cc,
}
if (cc->shutdown) {
ev = create_shutdown_event();
+ grpc_pollset_kick(&cc->pollset);
break;
}
if (!grpc_pollset_work(&cc->pollset, deadline)) {