diff options
| author |  David Garcia Quintas <dgq@google.com> | 2016-03-15 17:10:45 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2016-03-15 17:10:45 -0700 |
| commit | cd21266b5feccbc8a1c143bc499c8ca5d6bb01b5 (patch) | |
| tree | a0ca7a89f8bbae7e1f681a22bd85432966d89e62 /include | |
| parent | aca123316b321eaa03f98b8c25cbf6e25298a8e3 (diff) | |
| parent | 66e3b02d8a970f978c7907903f04094f802c7b44 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into codegen_lib
Diffstat (limited to 'include')
| -rw-r--r-- | include/grpc++/impl/codegen/completion_queue.h | 1 | ||||
| -rw-r--r-- | include/grpc++/impl/codegen/server_context.h | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/grpc++/impl/codegen/completion_queue.h b/include/grpc++/impl/codegen/completion_queue.h index fdea88e6e3..42ec287e65 100644 --- a/include/grpc++/impl/codegen/completion_queue.h +++ b/include/grpc++/impl/codegen/completion_queue.h @@ -204,6 +204,7 @@ class CompletionQueue : private GrpcLibraryCodegen { } /// Performs a single polling pluck on \a tag. + /// \warning Must not be mixed with calls to \a Next. void TryPluck(CompletionQueueTag* tag) { auto deadline = gpr_time_0(GPR_CLOCK_REALTIME); auto ev = g_core_codegen_interface->grpc_completion_queue_pluck( diff --git a/include/grpc++/impl/codegen/server_context.h b/include/grpc++/impl/codegen/server_context.h index ad08b8210d..91ebe574b1 100644 --- a/include/grpc++/impl/codegen/server_context.h +++ b/include/grpc++/impl/codegen/server_context.h @@ -103,6 +103,9 @@ class ServerContext { void AddInitialMetadata(const grpc::string& key, const grpc::string& value); void AddTrailingMetadata(const grpc::string& key, const grpc::string& value); + // IsCancelled is always safe to call when using sync API + // When using async API, it is only safe to call IsCancelled after + // the AsyncNotifyWhenDone tag has been delivered bool IsCancelled() const; // Cancel the Call from the server. This is a best-effort API and depending on |