diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-01-20 22:43:32 -0800 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-01-20 22:43:32 -0800 |
| commit | 8379a06f8dddbe99b9f99163111255794eff07b5 (patch) | |
| tree | 4273119573ade442f3cf43671aab8e24b28ee7a1 /test/core/fling | |
| parent | 18d4a86982178ff7bbec345a9772184c713cda35 (diff) | |
| parent | 5d19e96f63ebeae7572e2495cfe9f628f74dffc2 (diff) | |
Merge branch 'new_invoke_api' of github.com:google/grpc into update-api
Conflicts:
src/cpp/client/channel.cc
src/cpp/stream/stream_context.cc
src/cpp/stream/stream_context.h
src/php/ext/grpc/call.c
test/core/end2end/tests/max_concurrent_streams.c
Diffstat (limited to 'test/core/fling')
| -rw-r--r-- | test/core/fling/client.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/test/core/fling/client.c b/test/core/fling/client.c index 7e93860dc3..7eb195811b 100644 --- a/test/core/fling/client.c +++ b/test/core/fling/client.c @@ -55,9 +55,8 @@ static void init_ping_pong_request(void) {} static void step_ping_pong_request(void) { call = grpc_channel_create_call(channel, "/Reflector/reflectUnary", "localhost", gpr_inf_future); - GPR_ASSERT(grpc_call_start_invoke(call, cq, (void *)1, (void *)1, (void *)1, - GRPC_WRITE_BUFFER_HINT) == GRPC_CALL_OK); - grpc_event_finish(grpc_completion_queue_next(cq, gpr_inf_future)); + GPR_ASSERT(grpc_call_invoke(call, cq, (void *)1, (void *)1, + GRPC_WRITE_BUFFER_HINT) == GRPC_CALL_OK); GPR_ASSERT(grpc_call_start_write(call, the_buffer, (void *)1, GRPC_WRITE_BUFFER_HINT) == GRPC_CALL_OK); grpc_event_finish(grpc_completion_queue_next(cq, gpr_inf_future)); @@ -66,7 +65,6 @@ static void step_ping_pong_request(void) { grpc_event_finish(grpc_completion_queue_next(cq, gpr_inf_future)); grpc_event_finish(grpc_completion_queue_next(cq, gpr_inf_future)); grpc_event_finish(grpc_completion_queue_next(cq, gpr_inf_future)); - grpc_event_finish(grpc_completion_queue_next(cq, gpr_inf_future)); grpc_call_destroy(call); call = NULL; } @@ -74,9 +72,8 @@ static void step_ping_pong_request(void) { static void init_ping_pong_stream(void) { call = grpc_channel_create_call(channel, "/Reflector/reflectStream", "localhost", gpr_inf_future); - GPR_ASSERT(grpc_call_start_invoke(call, cq, (void *)1, (void *)1, (void *)1, - 0) == GRPC_CALL_OK); - grpc_event_finish(grpc_completion_queue_next(cq, gpr_inf_future)); + GPR_ASSERT(grpc_call_invoke(call, cq, (void *)1, (void *)1, 0) == + GRPC_CALL_OK); grpc_event_finish(grpc_completion_queue_next(cq, gpr_inf_future)); } |