commit 7142d9e2dc53f66f91222dfe1e8813b8c39950b0
author Jan Tattermusch <jtattermusch@google.com> Fri Jul 12 05:56:46 2019 -0400
committer Jan Tattermusch <jtattermusch@google.com> Wed Jul 24 05:45:54 2019 -0400
tree 4bd4b21b0bc92ad0c7be09254dc613491fd9c778
parent b0c9849393da9ec4d4e6e1910f67e94e6a1834b0

dont use shutdownRef count for sync completion queue

src/csharp/Grpc.Core/Internal/CompletionQueueSafeHandle.cs

diff --git a/src/csharp/Grpc.Core/Internal/CompletionQueueSafeHandle.cs b/src/csharp/Grpc.Core/Internal/CompletionQueueSafeHandle.cs
index 28135d7..25540b4 100644
--- a/src/csharp/Grpc.Core/Internal/CompletionQueueSafeHandle.cs
+++ b/src/csharp/Grpc.Core/Internal/CompletionQueueSafeHandle.cs
@@ -29,7 +29,7 @@
     {
         static readonly NativeMethods Native = NativeMethods.Get();
 
-        AtomicCounter shutdownRefcount = new AtomicCounter(1);
+        AtomicCounter shutdownRefcount;
         CompletionRegistry completionRegistry;
 
         private CompletionQueueSafeHandle()
@@ -51,6 +51,7 @@
         {
             var cq = Native.grpcsharp_completion_queue_create_async();
             cq.completionRegistry = completionRegistry;
+            cq.shutdownRefcount = new AtomicCounter(1);
             return cq;
         }
 
@@ -95,7 +96,7 @@
 
         private void DecrementShutdownRefcount()
         {
-            if (shutdownRefcount.Decrement() == 0)
+            if (shutdownRefcount == null || shutdownRefcount.Decrement() == 0)
             {
                 Native.grpcsharp_completion_queue_shutdown(this);
             }
@@ -103,14 +104,20 @@
 
         private void BeginOp()
         {
-            bool success = false;
-            shutdownRefcount.IncrementIfNonzero(ref success);
-            GrpcPreconditions.CheckState(success, "Shutdown has already been called");
+            if (shutdownRefcount != null)
+            {
+                bool success = false;
+                shutdownRefcount.IncrementIfNonzero(ref success);
+                GrpcPreconditions.CheckState(success, "Shutdown has already been called");
+            }
         }
 
         private void EndOp()
         {
-            DecrementShutdownRefcount();
+            if (shutdownRefcount != null)
+            {
+                DecrementShutdownRefcount();
+            }
         }
 
         // Allows declaring BeginOp and EndOp of a completion queue with a using statement.