From 0d4836d2c5de2cef30015d3f62a9cca511daacda Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Tue, 30 Jun 2015 15:15:43 -0700
Subject: [PATCH] Remove the ability to specify a string on cancel: it was
broken and unused; will restore later
---
src/core/transport/metadata.c | 2 +-
src/core/transport/transport.c | 4 ++--
src/core/transport/transport.h | 1 -
src/core/transport/transport_op_string.c | 5 -----
4 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/src/core/transport/metadata.c b/src/core/transport/metadata.c
index e75b449e12..c80d67823f 100644
--- a/src/core/transport/metadata.c
+++ b/src/core/transport/metadata.c
@@ -120,7 +120,7 @@ static void unlock(grpc_mdctx *ctx) {
if (ctx->refs == 0) {
/* uncomment if you're having trouble diagnosing an mdelem leak to make
things clearer (slows down destruction a lot, however) */
- /* gc_mdtab(ctx); */
+ gc_mdtab(ctx);
if (ctx->mdtab_count && ctx->mdtab_count == ctx->mdtab_free) {
discard_metadata(ctx);
}
diff --git a/src/core/transport/transport.c b/src/core/transport/transport.c
index 2f85a8557d..39d7b701f2 100644
--- a/src/core/transport/transport.c
+++ b/src/core/transport/transport.c
@@ -112,8 +112,8 @@ void grpc_transport_op_add_cancellation(grpc_transport_op *op,
grpc_mdstr *message) {
if (op->cancel_with_status == GRPC_STATUS_OK) {
op->cancel_with_status = status;
- op->cancel_message = message;
- } else if (message) {
+ }
+ if (message) {
grpc_mdstr_unref(message);
}
}
diff --git a/src/core/transport/transport.h b/src/core/transport/transport.h
index 0a5b31a60a..a2c41c47af 100644
--- a/src/core/transport/transport.h
+++ b/src/core/transport/transport.h
@@ -77,7 +77,6 @@ typedef struct grpc_transport_op {
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;
diff --git a/src/core/transport/transport_op_string.c b/src/core/transport/transport_op_string.c
index 5c4edb006a..a408b75790 100644
--- a/src/core/transport/transport_op_string.c
+++ b/src/core/transport/transport_op_string.c
@@ -144,11 +144,6 @@ char *grpc_transport_op_string(grpc_transport_op *op) {
first = 0;
gpr_asprintf(&tmp, "CANCEL:%d", op->cancel_with_status);
gpr_strvec_add(&b, tmp);
- if (op->cancel_message) {
- gpr_asprintf(&tmp, ";msg='%s'",
- grpc_mdstr_as_c_string(op->cancel_message));
- gpr_strvec_add(&b, tmp);
- }
}
out = gpr_strvec_flatten(&b, NULL);
--
GitLab