diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-06-07 13:00:14 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-06-07 13:00:14 -0700 |
| commit | c97065da86ea140a86815575ce0f22d1ef45d576 (patch) | |
| tree | 83686125dd2f3eaf055f5bb7e977222f22d14dfd /src/core/lib/transport/transport.c | |
| parent | 2888bd58b00b30429470652b05bc2076785e8a99 (diff) | |
| parent | d30d4e279c4a63effaa6e912fc00bd4ad96054c7 (diff) | |
Merge github.com:grpc/grpc into error
Diffstat (limited to 'src/core/lib/transport/transport.c')
| -rw-r--r-- | src/core/lib/transport/transport.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/core/lib/transport/transport.c b/src/core/lib/transport/transport.c index ec6833e323..1105494a85 100644 --- a/src/core/lib/transport/transport.c +++ b/src/core/lib/transport/transport.c @@ -125,10 +125,19 @@ void grpc_transport_perform_op(grpc_exec_ctx *exec_ctx, transport->vtable->perform_op(exec_ctx, transport, op); } -void grpc_transport_set_pollset(grpc_exec_ctx *exec_ctx, - grpc_transport *transport, grpc_stream *stream, - grpc_pollset *pollset) { - transport->vtable->set_pollset(exec_ctx, transport, stream, pollset); +void grpc_transport_set_pops(grpc_exec_ctx *exec_ctx, grpc_transport *transport, + grpc_stream *stream, + grpc_polling_entity *pollent) { + grpc_pollset *pollset; + grpc_pollset_set *pollset_set; + if ((pollset = grpc_polling_entity_pollset(pollent)) != NULL) { + transport->vtable->set_pollset(exec_ctx, transport, stream, pollset); + } else if ((pollset_set = grpc_polling_entity_pollset_set(pollent)) != NULL) { + transport->vtable->set_pollset_set(exec_ctx, transport, stream, + pollset_set); + } else { + abort(); + } } void grpc_transport_destroy_stream(grpc_exec_ctx *exec_ctx, |