commit 33825118df7157219cec15382beb006d3462ad96
author Craig Tiller <ctiller@google.com> Fri Sep 18 07:44:19 2015 -0700
committer Craig Tiller <ctiller@google.com> Fri Sep 18 07:44:19 2015 -0700
tree 649a40da98f56a875ed6558e474dd6c61ce2c7be
parent 000cd8f9f7346defc79fe6aa877af11b42ab5f1e

Cleanup

src/core/surface/channel_connectivity.c

diff --git a/src/core/surface/channel_connectivity.c b/src/core/surface/channel_connectivity.c
index ef47a28..4d0cf1e 100644
--- a/src/core/surface/channel_connectivity.c
+++ b/src/core/surface/channel_connectivity.c
@@ -45,7 +45,7 @@
   /* forward through to the underlying client channel */
   grpc_channel_element *client_channel_elem =
       grpc_channel_stack_last_element(grpc_channel_get_channel_stack(channel));
-  grpc_iomgr_call_list call_list = GRPC_IOMGR_CALL_LIST_INIT;
+  grpc_call_list call_list = GRPC_CALL_LIST_INIT;
   grpc_connectivity_state state;
   if (client_channel_elem->filter != &grpc_client_channel_filter) {
     gpr_log(GPR_ERROR,
@@ -56,7 +56,7 @@
   }
   state = grpc_client_channel_check_connectivity_state(
       client_channel_elem, try_to_connect, &call_list);
-  grpc_iomgr_call_list_run(call_list);
+  grpc_call_list_run(call_list);
   return state;
 }
 
@@ -71,7 +71,7 @@
   gpr_mu mu;
   callback_phase phase;
   int success;
-  grpc_iomgr_closure on_complete;
+  grpc_closure on_complete;
   grpc_alarm alarm;
   grpc_connectivity_state state;
   grpc_completion_queue *cq;
@@ -158,13 +158,13 @@
     gpr_timespec deadline, grpc_completion_queue *cq, void *tag) {
   grpc_channel_element *client_channel_elem =
       grpc_channel_stack_last_element(grpc_channel_get_channel_stack(channel));
-  grpc_iomgr_call_list call_list = GRPC_IOMGR_CALL_LIST_INIT;
+  grpc_call_list call_list = GRPC_CALL_LIST_INIT;
   state_watcher *w = gpr_malloc(sizeof(*w));
 
   grpc_cq_begin_op(cq);
 
   gpr_mu_init(&w->mu);
-  grpc_iomgr_closure_init(&w->on_complete, watch_complete, w);
+  grpc_closure_init(&w->on_complete, watch_complete, w);
   w->phase = WAITING;
   w->state = last_observed_state;
   w->success = 0;
@@ -181,7 +181,7 @@
             "grpc_channel_watch_connectivity_state called on something that is "
             "not a client channel, but '%s'",
             client_channel_elem->filter->name);
-    grpc_iomgr_call_list_add(&call_list, &w->on_complete, 1);
+    grpc_call_list_add(&call_list, &w->on_complete, 1);
   } else {
     GRPC_CHANNEL_INTERNAL_REF(channel, "watch_connectivity");
     grpc_client_channel_add_interested_party(client_channel_elem,
@@ -190,5 +190,5 @@
                                                  &w->on_complete, &call_list);
   }
 
-  grpc_iomgr_call_list_run(call_list);
+  grpc_call_list_run(call_list);
 }