Simplify TryPluck

include/grpc++/completion_queue.h

@@ -114,7 +114,7 @@ class CompletionQueue {
   bool Pluck(CompletionQueueTag *tag);
 
   // Does a single polling pluck on tag
-  void TryPluck(CompletionQueueTag *tag, bool forever);
+  void TryPluck(CompletionQueueTag *tag);
 
   grpc_completion_queue *cq_;  // owned
 };

src/cpp/common/completion_queue.cc

@@ -77,22 +77,18 @@ bool CompletionQueue::Next(void** tag, bool* ok) {
 bool CompletionQueue::Pluck(CompletionQueueTag* tag) {
   std::unique_ptr<grpc_event, EventDeleter> ev;
 
-  for (;;) {
+  ev.reset(grpc_completion_queue_pluck(cq_, tag, gpr_inf_future));
-    ev.reset(grpc_completion_queue_pluck(cq_, tag, gpr_inf_future));
+  bool ok = ev->data.op_complete == GRPC_OP_OK;
-    bool ok = ev->data.op_complete == GRPC_OP_OK;
+  void* ignored = tag;
-    void* ignored = tag;
+  GPR_ASSERT(tag->FinalizeResult(&ignored, &ok));
-    if (tag->FinalizeResult(&ignored, &ok)) {
+  GPR_ASSERT(ignored == tag);
-      GPR_ASSERT(ignored == tag);
+  return ok;
-      return ok;
-    }
-  }
 }
 
-void CompletionQueue::TryPluck(CompletionQueueTag* tag, bool forever) {
+void CompletionQueue::TryPluck(CompletionQueueTag* tag) {
   std::unique_ptr<grpc_event, EventDeleter> ev;
 
-  ev.reset(grpc_completion_queue_pluck(
+  ev.reset(grpc_completion_queue_pluck(cq_, tag, gpr_inf_past));
-      cq_, tag, forever ? gpr_inf_future : gpr_inf_past));
   if (!ev) return;
   bool ok = ev->data.op_complete == GRPC_OP_OK;
   void* ignored = tag;

src/cpp/server/server_context.cc

@@ -71,7 +71,7 @@ void ServerContext::CompletionOp::Unref() {
 }
 
 bool ServerContext::CompletionOp::CheckCancelled(CompletionQueue* cq) {
-  cq->TryPluck(this, false);
+  cq->TryPluck(this);
   std::lock_guard<std::mutex> g(mu_);
   return finalized_ ? cancelled_ : false;
 }