commit dc62772582522e849129897fe822390049d467ff
author Craig Tiller <ctiller@google.com> Tue May 26 15:27:02 2015 -0700
committer Craig Tiller <ctiller@google.com> Tue May 26 15:27:02 2015 -0700
tree 178819583fe766ac86fb69e87a3cfcbeeab76a26
parent 56618b98e71ca45378f83816c3be08c32490996a

Cleanup

src/core/surface/server.c

diff --git a/src/core/surface/server.c b/src/core/surface/server.c
index 2802671..0019b8d 100644
--- a/src/core/surface/server.c
+++ b/src/core/surface/server.c
@@ -371,6 +371,19 @@
   grpc_call_destroy(grpc_call_from_top_element(elem));
 }
 
+static void maybe_finish_shutdown(grpc_server *server) {
+  size_t i, j;
+  if (server->shutdown && server->lists[ALL_CALLS] == NULL) {
+    for (j = 0; j < server->cq_count; j++) {
+      grpc_cq_end_silent_op(server->cqs[j]);
+      for (i = 0; i < server->num_shutdown_tags; i++) {
+        grpc_cq_end_op(server->cqs[j], server->shutdown_tags[i],
+                       NULL, 1);
+      }
+    }
+  }
+}
+
 static grpc_mdelem *server_filter(void *user_data, grpc_mdelem *md) {
   grpc_call_element *elem = user_data;
   channel_data *chand = elem->channel_data;
@@ -430,6 +443,8 @@
         calld->state = ZOMBIED;
         grpc_iomgr_add_callback(kill_zombie, elem);
       }
+      call_list_remove(calld, ALL_CALLS);
+      maybe_finish_shutdown(chand->server);
       gpr_mu_unlock(&chand->server->mu);
       break;
   }
@@ -526,21 +541,13 @@
 static void destroy_call_elem(grpc_call_element *elem) {
   channel_data *chand = elem->channel_data;
   call_data *calld = elem->call_data;
-  size_t i, j;
+  size_t i;
 
   gpr_mu_lock(&chand->server->mu);
   for (i = 0; i < CALL_LIST_COUNT; i++) {
     call_list_remove(elem->call_data, i);
   }
-  if (chand->server->shutdown && chand->server->lists[ALL_CALLS] == NULL) {
-    for (j = 0; j < chand->server->cq_count; j++) {
-      grpc_cq_end_silent_op(chand->server->cqs[j]);
-      for (i = 0; i < chand->server->num_shutdown_tags; i++) {
-        grpc_cq_end_op(chand->server->cqs[j], chand->server->shutdown_tags[i],
-                       NULL, 1);
-      }
-    }
-  }
+  maybe_finish_shutdown(chand->server);
   gpr_mu_unlock(&chand->server->mu);
 
   if (calld->host) {
@@ -801,7 +808,7 @@
   channel_data **channels;
   channel_data *c;
   size_t nchannels;
-  size_t i, j;
+  size_t i;
   grpc_channel_op op;
   grpc_channel_element *elem;
   registered_method *rm;
@@ -861,14 +868,7 @@
   }
 
   server->shutdown = 1;
-  if (server->lists[ALL_CALLS] == NULL) {
-    for (j = 0; j < server->cq_count; j++) {
-      grpc_cq_end_silent_op(server->cqs[j]);
-      for (i = 0; i < server->num_shutdown_tags; i++) {
-        grpc_cq_end_op(server->cqs[j], server->shutdown_tags[i], NULL, 1);
-      }
-    }
-  }
+  maybe_finish_shutdown(server);
   gpr_mu_unlock(&server->mu);
 
   for (i = 0; i < nchannels; i++) {