diff options
| author |  Mark D. Roth <roth@google.com> | 2017-01-26 12:08:11 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-01-26 12:08:11 -0800 |
| commit | 4ffcb2058df96c1fa0a319cd3e5d4aa9358e5bae (patch) | |
| tree | d7d7b7263992250585ca5084daf2ce1bb0705838 /test/core/memory_usage | |
| parent | 890ccaedca87eb8f5c85889ce68d71f7b771d6f5 (diff) | |
| parent | db74844fb6331370b1804d0034025fe27e8098ce (diff) | |
Merge pull request #9465 from markdroth/core_api_change
Move parameters for all grpc_op types into their own sub-structs.
Diffstat (limited to 'test/core/memory_usage')
| -rw-r--r-- | test/core/memory_usage/client.c | 8 | ||||
| -rw-r--r-- | test/core/memory_usage/server.c | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/test/core/memory_usage/client.c b/test/core/memory_usage/client.c index f4432bf572..827a39540d 100644 --- a/test/core/memory_usage/client.c +++ b/test/core/memory_usage/client.c @@ -82,7 +82,8 @@ static void init_ping_pong_request(int call_idx) { op->flags = GRPC_INITIAL_METADATA_WAIT_FOR_READY; op++; op->op = GRPC_OP_RECV_INITIAL_METADATA; - op->data.recv_initial_metadata = &calls[call_idx].initial_metadata_recv; + op->data.recv_initial_metadata.recv_initial_metadata = + &calls[call_idx].initial_metadata_recv; op++; calls[call_idx].call = grpc_channel_create_call( @@ -139,10 +140,11 @@ static struct grpc_memory_counters send_snapshot_request( op->op = GRPC_OP_SEND_CLOSE_FROM_CLIENT; op++; op->op = GRPC_OP_RECV_INITIAL_METADATA; - op->data.recv_initial_metadata = &calls[call_idx].initial_metadata_recv; + op->data.recv_initial_metadata.recv_initial_metadata = + &calls[call_idx].initial_metadata_recv; op++; op->op = GRPC_OP_RECV_MESSAGE; - op->data.recv_message = &response_payload_recv; + op->data.recv_message.recv_message = &response_payload_recv; op++; op->op = GRPC_OP_RECV_STATUS_ON_CLIENT; op->data.recv_status_on_client.trailing_metadata = diff --git a/test/core/memory_usage/server.c b/test/core/memory_usage/server.c index c0710930b0..cd7f2aabdd 100644 --- a/test/core/memory_usage/server.c +++ b/test/core/memory_usage/server.c @@ -129,13 +129,13 @@ static void send_snapshot(void *tag, struct grpc_memory_counters *snapshot) { op->data.send_initial_metadata.count = 0; op++; op->op = GRPC_OP_RECV_MESSAGE; - op->data.recv_message = &terminal_buffer; + op->data.recv_message.recv_message = &terminal_buffer; op++; op->op = GRPC_OP_SEND_MESSAGE; if (payload_buffer == NULL) { gpr_log(GPR_INFO, "NULL payload buffer !!!"); } - op->data.send_message = payload_buffer; + op->data.send_message.send_message = payload_buffer; op++; op->op = GRPC_OP_SEND_STATUS_FROM_SERVER; op->data.send_status_from_server.status = GRPC_STATUS_OK; |