diff options
| author |  David Garcia Quintas <dgq@google.com> | 2015-07-01 14:52:44 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2015-07-01 14:52:44 -0700 |
| commit | 8a187099ec8accf4f4b9c1bcea0a71d023f6389b (patch) | |
| tree | ae197d56afaf80aff6a1cb6dba715dba665572bf /src/core/transport/transport.h | |
| parent | d7d9ce27c523798384051246e18e3f00b29dd8c9 (diff) | |
| parent | f8c63562c1388262c5588e381c05cb0c02e5b406 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into decompression
# Conflicts:
# Makefile
# gRPC.podspec
# src/core/surface/call.c
# src/core/transport/chttp2/frame_data.c
# tools/doxygen/Doxyfile.core.internal
# vsprojects/Grpc.mak
Diffstat (limited to 'src/core/transport/transport.h')
| -rw-r--r-- | src/core/transport/transport.h | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/core/transport/transport.h b/src/core/transport/transport.h index 7f60fdc037..a2c41c47af 100644 --- a/src/core/transport/transport.h +++ b/src/core/transport/transport.h @@ -64,23 +64,19 @@ typedef enum grpc_stream_state { /* Transport op: a set of operations to perform on a transport */ typedef struct grpc_transport_op { - void (*on_consumed)(void *user_data, int success); - void *on_consumed_user_data; + grpc_iomgr_closure *on_consumed; grpc_stream_op_buffer *send_ops; int is_last_send; - void (*on_done_send)(void *user_data, int success); - void *send_user_data; + grpc_iomgr_closure *on_done_send; grpc_stream_op_buffer *recv_ops; grpc_stream_state *recv_state; - void (*on_done_recv)(void *user_data, int success); - void *recv_user_data; + grpc_iomgr_closure *on_done_recv; grpc_pollset *bind_pollset; grpc_status_code cancel_with_status; - grpc_mdstr *cancel_message; /* Indexes correspond to grpc_context_index enum values */ grpc_call_context_element *context; @@ -167,11 +163,8 @@ void grpc_transport_perform_op(grpc_transport *transport, grpc_stream *stream, /* Send a ping on a transport - Calls cb with user data when a response is received. - cb *MAY* be called with arbitrary transport level locks held. It is not safe - to call into the transport during cb. */ -void grpc_transport_ping(grpc_transport *transport, void (*cb)(void *user_data), - void *user_data); + Calls cb with user data when a response is received. */ +void grpc_transport_ping(grpc_transport *transport, grpc_iomgr_closure *cb); /* Advise peer of pending connection termination. */ void grpc_transport_goaway(grpc_transport *transport, grpc_status_code status, |