diff options
| author |  Julien Boeuf <jboeuf@google.com> | 2016-06-04 18:03:42 -0700 |
|---|---|---|
| committer | Julien Boeuf <jboeuf@google.com> | 2016-06-04 18:03:42 -0700 |
| commit | bfc7ed66286a77ed4dca0ec1feb23912b2ec1f02 (patch) | |
| tree | d731e555910b79b4694b311b1faed78783f688b8 /src/core/lib/surface/completion_queue.h | |
| parent | c49464de3ed6108956561128b006c78777bd6db7 (diff) | |
| parent | 845a0567e344d2d85ece37471e63199c045c2249 (diff) | |
Merge branch 'master' into fix_3803
Diffstat (limited to 'src/core/lib/surface/completion_queue.h')
| -rw-r--r-- | src/core/lib/surface/completion_queue.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/core/lib/surface/completion_queue.h b/src/core/lib/surface/completion_queue.h index eef82cf014..3d0dd13c53 100644 --- a/src/core/lib/surface/completion_queue.h +++ b/src/core/lib/surface/completion_queue.h @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -81,7 +81,10 @@ void grpc_cq_end_op(grpc_exec_ctx *exec_ctx, grpc_completion_queue *cc, void *done_arg, grpc_cq_completion *storage); grpc_pollset *grpc_cq_pollset(grpc_completion_queue *cc); +grpc_completion_queue *grpc_cq_from_pollset(grpc_pollset *ps); +void grpc_cq_mark_non_listening_server_cq(grpc_completion_queue *cc); +bool grpc_cq_is_non_listening_server_cq(grpc_completion_queue *cc); void grpc_cq_mark_server_cq(grpc_completion_queue *cc); int grpc_cq_is_server_cq(grpc_completion_queue *cc); |