Cleanup
diff --git a/src/core/transport/chttp2/internal.h b/src/core/transport/chttp2/internal.h
index 9be1f2f..386f2dd 100644
--- a/src/core/transport/chttp2/internal.h
+++ b/src/core/transport/chttp2/internal.h
@@ -155,7 +155,7 @@
/* Outstanding ping request data */
typedef struct grpc_chttp2_outstanding_ping {
gpr_uint8 id[8];
- grpc_iomgr_closure *on_recv;
+ grpc_closure *on_recv;
struct grpc_chttp2_outstanding_ping *next;
struct grpc_chttp2_outstanding_ping *prev;
} grpc_chttp2_outstanding_ping;
@@ -164,7 +164,7 @@
/** data to write next write */
gpr_slice_buffer qbuf;
/** queued callbacks */
- grpc_iomgr_call_list run_at_unlock;
+ grpc_call_list run_at_unlock;
/** window available for us to send to peer */
gpr_int64 outgoing_window;
@@ -214,7 +214,7 @@
/** is this a client? */
gpr_uint8 is_client;
/** callback for when writing is done */
- grpc_iomgr_closure done_cb;
+ grpc_closure done_cb;
} grpc_chttp2_transport_writing;
struct grpc_chttp2_transport_parsing {
@@ -332,9 +332,9 @@
grpc_chttp2_stream_map new_stream_map;
/** closure to execute writing */
- grpc_iomgr_closure writing_action;
+ grpc_closure writing_action;
/** closure to finish reading from the endpoint */
- grpc_iomgr_closure recv_data;
+ grpc_closure recv_data;
/** incoming read bytes */
gpr_slice_buffer read_buffer;
@@ -359,8 +359,8 @@
/** HTTP2 stream id for this stream, or zero if one has not been assigned */
gpr_uint32 id;
- grpc_iomgr_closure *send_done_closure;
- grpc_iomgr_closure *recv_done_closure;
+ grpc_closure *send_done_closure;
+ grpc_closure *recv_done_closure;
/** window available for us to send to peer */
gpr_int64 outgoing_window;
diff --git a/src/core/transport/chttp2/writing.c b/src/core/transport/chttp2/writing.c
index 1da3f85..db6715b 100644
--- a/src/core/transport/chttp2/writing.c
+++ b/src/core/transport/chttp2/writing.c
@@ -238,8 +238,8 @@
stream_global->outgoing_sopb->nops == 0) {
GPR_ASSERT(stream_global->write_state != GRPC_WRITE_STATE_QUEUED_CLOSE);
stream_global->outgoing_sopb = NULL;
- grpc_iomgr_call_list_add(&transport_global->run_at_unlock,
- stream_global->send_done_closure, 1);
+ grpc_call_list_add(&transport_global->run_at_unlock,
+ stream_global->send_done_closure, 1);
}
}
stream_global->writing_now = 0;
diff --git a/src/core/transport/chttp2_transport.c b/src/core/transport/chttp2_transport.c
index 50d5a3e..bc056ac 100644
--- a/src/core/transport/chttp2_transport.c
+++ b/src/core/transport/chttp2_transport.c
@@ -250,15 +250,15 @@
gpr_slice_buffer_init(&t->writing.outbuf);
grpc_chttp2_hpack_compressor_init(&t->writing.hpack_compressor, mdctx);
- grpc_iomgr_closure_init(&t->writing_action, writing_action, t);
+ grpc_closure_init(&t->writing_action, writing_action, t);
gpr_slice_buffer_init(&t->parsing.qbuf);
grpc_chttp2_goaway_parser_init(&t->parsing.goaway_parser);
grpc_chttp2_hpack_parser_init(&t->parsing.hpack_parser, t->metadata_context);
- grpc_iomgr_closure_init(&t->writing.done_cb, grpc_chttp2_terminate_writing,
- &t->writing);
- grpc_iomgr_closure_init(&t->recv_data, recv_data, t);
+ grpc_closure_init(&t->writing.done_cb, grpc_chttp2_terminate_writing,
+ &t->writing);
+ grpc_closure_init(&t->recv_data, recv_data, t);
gpr_slice_buffer_init(&t->read_buffer);
if (is_client) {
@@ -499,20 +499,20 @@
static void lock(grpc_chttp2_transport *t) { gpr_mu_lock(&t->mu); }
static void unlock(grpc_chttp2_transport *t) {
- grpc_iomgr_call_list run = GRPC_IOMGR_CALL_LIST_INIT;
+ grpc_call_list run = GRPC_CALL_LIST_INIT;
unlock_check_read_write_state(t);
if (!t->writing_active && !t->closed &&
grpc_chttp2_unlocking_check_writes(&t->global, &t->writing)) {
t->writing_active = 1;
REF_TRANSPORT(t, "writing");
- grpc_iomgr_call_list_add(&t->global.run_at_unlock, &t->writing_action, 1);
+ grpc_call_list_add(&t->global.run_at_unlock, &t->writing_action, 1);
prevent_endpoint_shutdown(t);
}
- GPR_SWAP(grpc_iomgr_call_list, run, t->global.run_at_unlock);
+ GPR_SWAP(grpc_call_list, run, t->global.run_at_unlock);
gpr_mu_unlock(&t->mu);
- grpc_iomgr_call_list_run(run);
+ grpc_call_list_run(run);
}
/*
@@ -664,8 +664,8 @@
}
} else {
grpc_sopb_reset(op->send_ops);
- grpc_iomgr_call_list_add(&transport_global->run_at_unlock,
- stream_global->send_done_closure, 0);
+ grpc_call_list_add(&transport_global->run_at_unlock,
+ stream_global->send_done_closure, 0);
}
}
@@ -703,8 +703,7 @@
op->bind_pollset);
}
- grpc_iomgr_call_list_add(&transport_global->run_at_unlock, op->on_consumed,
- 1);
+ grpc_call_list_add(&transport_global->run_at_unlock, op->on_consumed, 1);
}
static void perform_stream_op(grpc_transport *gt, grpc_stream *gs,
@@ -717,8 +716,7 @@
unlock(t);
}
-static void send_ping_locked(grpc_chttp2_transport *t,
- grpc_iomgr_closure *on_recv) {
+static void send_ping_locked(grpc_chttp2_transport *t, grpc_closure *on_recv) {
grpc_chttp2_outstanding_ping *p = gpr_malloc(sizeof(*p));
p->next = &t->global.pings;
p->prev = p->next->prev;
@@ -741,7 +739,7 @@
lock(t);
- grpc_iomgr_call_list_add(&t->global.run_at_unlock, op->on_consumed, 1);
+ grpc_call_list_add(&t->global.run_at_unlock, op->on_consumed, 1);
if (op->on_connectivity_state_change) {
grpc_connectivity_state_notify_on_state_change(
@@ -868,8 +866,8 @@
if (stream_global->outgoing_sopb != NULL) {
grpc_sopb_reset(stream_global->outgoing_sopb);
stream_global->outgoing_sopb = NULL;
- grpc_iomgr_call_list_add(&transport_global->run_at_unlock,
- stream_global->send_done_closure, 1);
+ grpc_call_list_add(&transport_global->run_at_unlock,
+ stream_global->send_done_closure, 1);
}
stream_global->read_closed = 1;
if (!stream_global->published_cancelled) {
@@ -919,8 +917,8 @@
&stream_global->outstanding_metadata);
grpc_sopb_swap(stream_global->publish_sopb, &stream_global->incoming_sopb);
stream_global->published_state = *stream_global->publish_state = state;
- grpc_iomgr_call_list_add(&transport_global->run_at_unlock,
- stream_global->recv_done_closure, 1);
+ grpc_call_list_add(&transport_global->run_at_unlock,
+ stream_global->recv_done_closure, 1);
stream_global->recv_done_closure = NULL;
stream_global->publish_sopb = NULL;
stream_global->publish_state = NULL;
diff --git a/src/core/transport/connectivity_state.c b/src/core/transport/connectivity_state.c
index b605da9..8b2e1b9 100644
--- a/src/core/transport/connectivity_state.c
+++ b/src/core/transport/connectivity_state.c
@@ -91,7 +91,7 @@
int grpc_connectivity_state_notify_on_state_change(
grpc_connectivity_state_tracker *tracker, grpc_connectivity_state *current,
- grpc_iomgr_closure *notify, grpc_iomgr_call_list *call_list) {
+ grpc_closure *notify, grpc_call_list *call_list) {
if (grpc_connectivity_state_trace) {
gpr_log(GPR_DEBUG, "CONWATCH: %s: from %s [cur=%s] notify=%p",
tracker->name, grpc_connectivity_state_name(*current),
@@ -99,7 +99,7 @@
}
if (tracker->current_state != *current) {
*current = tracker->current_state;
- grpc_iomgr_call_list_add(call_list, notify, 1);
+ grpc_call_list_add(call_list, notify, 1);
} else {
grpc_connectivity_state_watcher *w = gpr_malloc(sizeof(*w));
w->current = current;
@@ -113,7 +113,7 @@
void grpc_connectivity_state_set(grpc_connectivity_state_tracker *tracker,
grpc_connectivity_state state,
const char *reason,
- grpc_iomgr_call_list *call_list) {
+ grpc_call_list *call_list) {
grpc_connectivity_state_watcher *w;
if (grpc_connectivity_state_trace) {
gpr_log(GPR_DEBUG, "SET: %s: %s --> %s [%s]", tracker->name,
@@ -128,7 +128,7 @@
while ((w = tracker->watchers) != NULL) {
*w->current = tracker->current_state;
tracker->watchers = w->next;
- grpc_iomgr_call_list_add(call_list, w->notify, 1);
+ grpc_call_list_add(call_list, w->notify, 1);
gpr_free(w);
}
}
diff --git a/src/core/transport/connectivity_state.h b/src/core/transport/connectivity_state.h
index 49c2815..a29c655 100644
--- a/src/core/transport/connectivity_state.h
+++ b/src/core/transport/connectivity_state.h
@@ -42,7 +42,7 @@
/** we keep watchers in a linked list */
struct grpc_connectivity_state_watcher *next;
/** closure to notify on change */
- grpc_iomgr_closure *notify;
+ grpc_closure *notify;
/** the current state as believed by the watcher */
grpc_connectivity_state *current;
} grpc_connectivity_state_watcher;
@@ -67,8 +67,7 @@
* external lock */
void grpc_connectivity_state_set(grpc_connectivity_state_tracker *tracker,
grpc_connectivity_state state,
- const char *reason,
- grpc_iomgr_call_list *call_list);
+ const char *reason, grpc_call_list *call_list);
grpc_connectivity_state grpc_connectivity_state_check(
grpc_connectivity_state_tracker *tracker);
@@ -76,6 +75,6 @@
/** Return 1 if the channel should start connecting, 0 otherwise */
int grpc_connectivity_state_notify_on_state_change(
grpc_connectivity_state_tracker *tracker, grpc_connectivity_state *current,
- grpc_iomgr_closure *notify, grpc_iomgr_call_list *call_list);
+ grpc_closure *notify, grpc_call_list *call_list);
#endif /* GRPC_INTERNAL_CORE_TRANSPORT_CONNECTIVITY_STATE_H */
diff --git a/src/core/transport/transport.c b/src/core/transport/transport.c
index c0d92cf..3f6b93c 100644
--- a/src/core/transport/transport.c
+++ b/src/core/transport/transport.c
@@ -101,8 +101,8 @@
typedef struct {
gpr_slice message;
- grpc_iomgr_closure *then_call;
- grpc_iomgr_closure closure;
+ grpc_closure *then_call;
+ grpc_closure closure;
} close_message_data;
static void free_message(void *p, int iomgr_success) {
@@ -130,7 +130,7 @@
cmd = gpr_malloc(sizeof(*cmd));
cmd->message = *optional_message;
cmd->then_call = op->on_consumed;
- grpc_iomgr_closure_init(&cmd->closure, free_message, cmd);
+ grpc_closure_init(&cmd->closure, free_message, cmd);
op->on_consumed = &cmd->closure;
op->optional_close_message = &cmd->message;
}
diff --git a/src/core/transport/transport.h b/src/core/transport/transport.h
index 6e1ec2f..271891d 100644
--- a/src/core/transport/transport.h
+++ b/src/core/transport/transport.h
@@ -64,11 +64,11 @@
/* Transport stream op: a set of operations to perform on a transport
against a single stream */
typedef struct grpc_transport_stream_op {
- grpc_iomgr_closure *on_consumed;
+ grpc_closure *on_consumed;
grpc_stream_op_buffer *send_ops;
int is_last_send;
- grpc_iomgr_closure *on_done_send;
+ grpc_closure *on_done_send;
grpc_stream_op_buffer *recv_ops;
grpc_stream_state *recv_state;
@@ -76,7 +76,7 @@
These bytes will be eventually used to replenish per-stream flow control
windows. */
size_t max_recv_bytes;
- grpc_iomgr_closure *on_done_recv;
+ grpc_closure *on_done_recv;
grpc_pollset *bind_pollset;
@@ -95,9 +95,9 @@
/** Transport op: a set of operations to perform on a transport as a whole */
typedef struct grpc_transport_op {
/** called when processing of this op is done */
- grpc_iomgr_closure *on_consumed;
+ grpc_closure *on_consumed;
/** connectivity monitoring */
- grpc_iomgr_closure *on_connectivity_state_change;
+ grpc_closure *on_connectivity_state_change;
grpc_connectivity_state *connectivity_state;
/** should the transport be disconnected */
int disconnect;
@@ -118,7 +118,7 @@
/** add this transport to a pollset_set */
grpc_pollset_set *bind_pollset_set;
/** send a ping, call this back if not NULL */
- grpc_iomgr_closure *send_ping;
+ grpc_closure *send_ping;
} grpc_transport_op;
/* Returns the amount of memory required to store a grpc_stream for this
@@ -181,7 +181,7 @@
/* Send a ping on a transport
Calls cb with user data when a response is received. */
-void grpc_transport_ping(grpc_transport *transport, grpc_iomgr_closure *cb);
+void grpc_transport_ping(grpc_transport *transport, grpc_closure *cb);
/* Advise peer of pending connection termination. */
void grpc_transport_goaway(grpc_transport *transport, grpc_status_code status,