aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/core/ext/lb_policy/grpclb/grpclb.c10
-rw-r--r--src/core/ext/transport/chttp2/transport/incoming_metadata.c6
-rw-r--r--src/core/lib/channel/compress_filter.c4
-rw-r--r--src/core/lib/channel/http_client_filter.c18
-rw-r--r--src/core/lib/channel/http_server_filter.c6
-rw-r--r--src/core/lib/security/transport/client_auth_filter.c2
-rw-r--r--src/core/lib/surface/call.c7
-rw-r--r--src/core/lib/surface/call_details.c8
-rw-r--r--src/core/lib/surface/channel.c1
-rw-r--r--src/core/lib/transport/metadata_batch.c36
-rw-r--r--src/core/lib/transport/metadata_batch.h20
11 files changed, 66 insertions, 52 deletions
diff --git a/src/core/ext/lb_policy/grpclb/grpclb.c b/src/core/ext/lb_policy/grpclb/grpclb.c
index 3cdd96e7ae..ded457f64a 100644
--- a/src/core/ext/lb_policy/grpclb/grpclb.c
+++ b/src/core/ext/lb_policy/grpclb/grpclb.c
@@ -136,12 +136,12 @@ int grpc_lb_glb_trace = 0;
/* add lb_token of selected subchannel (address) to the call's initial
* metadata */
static grpc_error *initial_metadata_add_lb_token(
- grpc_metadata_batch *initial_metadata,
+ grpc_exec_ctx *exec_ctx, grpc_metadata_batch *initial_metadata,
grpc_linked_mdelem *lb_token_mdelem_storage, grpc_mdelem lb_token) {
GPR_ASSERT(lb_token_mdelem_storage != NULL);
GPR_ASSERT(!GRPC_MDISNULL(lb_token));
- return grpc_metadata_batch_add_tail(initial_metadata, lb_token_mdelem_storage,
- lb_token);
+ return grpc_metadata_batch_add_tail(exec_ctx, initial_metadata,
+ lb_token_mdelem_storage, lb_token);
}
typedef struct wrapped_rr_closure_arg {
@@ -189,7 +189,7 @@ static void wrapped_rr_closure(grpc_exec_ctx *exec_ctx, void *arg,
* available */
if (*wc_arg->target != NULL) {
if (!GRPC_MDISNULL(wc_arg->lb_token)) {
- initial_metadata_add_lb_token(wc_arg->initial_metadata,
+ initial_metadata_add_lb_token(exec_ctx, wc_arg->initial_metadata,
wc_arg->lb_token_mdelem_storage,
GRPC_MDELEM_REF(wc_arg->lb_token));
} else {
@@ -568,7 +568,7 @@ static bool pick_from_internal_rr_locked(
GRPC_LB_POLICY_UNREF(exec_ctx, wc_arg->rr_policy, "glb_pick_sync");
/* add the load reporting initial metadata */
- initial_metadata_add_lb_token(pick_args->initial_metadata,
+ initial_metadata_add_lb_token(exec_ctx, pick_args->initial_metadata,
pick_args->lb_token_mdelem_storage,
GRPC_MDELEM_REF(wc_arg->lb_token));
diff --git a/src/core/ext/transport/chttp2/transport/incoming_metadata.c b/src/core/ext/transport/chttp2/transport/incoming_metadata.c
index 4e4e41734a..c91b019aa0 100644
--- a/src/core/ext/transport/chttp2/transport/incoming_metadata.c
+++ b/src/core/ext/transport/chttp2/transport/incoming_metadata.c
@@ -96,9 +96,9 @@ void grpc_chttp2_incoming_metadata_buffer_publish(
size_t i;
for (i = 0; i < buffer->count; i++) {
/* TODO(ctiller): do something better here */
- if (!GRPC_LOG_IF_ERROR(
- "grpc_chttp2_incoming_metadata_buffer_publish",
- grpc_metadata_batch_link_tail(batch, &buffer->elems[i]))) {
+ if (!GRPC_LOG_IF_ERROR("grpc_chttp2_incoming_metadata_buffer_publish",
+ grpc_metadata_batch_link_tail(
+ exec_ctx, batch, &buffer->elems[i]))) {
GRPC_MDELEM_UNREF(exec_ctx, buffer->elems[i].md);
}
}
diff --git a/src/core/lib/channel/compress_filter.c b/src/core/lib/channel/compress_filter.c
index 62075ed613..c860d60d88 100644
--- a/src/core/lib/channel/compress_filter.c
+++ b/src/core/lib/channel/compress_filter.c
@@ -146,14 +146,14 @@ static grpc_error *process_send_initial_metadata(
/* hint compression algorithm */
error = grpc_metadata_batch_add_tail(
- initial_metadata, &calld->compression_algorithm_storage,
+ exec_ctx, initial_metadata, &calld->compression_algorithm_storage,
grpc_compression_encoding_mdelem(calld->compression_algorithm));
if (error != GRPC_ERROR_NONE) return error;
/* convey supported compression algorithms */
error = grpc_metadata_batch_add_tail(
- initial_metadata, &calld->accept_encoding_storage,
+ exec_ctx, initial_metadata, &calld->accept_encoding_storage,
GRPC_MDELEM_ACCEPT_ENCODING_FOR_ALGORITHMS(
channeld->supported_compression_algorithms));
diff --git a/src/core/lib/channel/http_client_filter.c b/src/core/lib/channel/http_client_filter.c
index c2ee0a0047..49a2a980e0 100644
--- a/src/core/lib/channel/http_client_filter.c
+++ b/src/core/lib/channel/http_client_filter.c
@@ -298,8 +298,9 @@ static grpc_error *hc_mutate_op(grpc_exec_ctx *exec_ctx,
exec_ctx, GRPC_MDSTR_GRPC_PAYLOAD_BIN,
grpc_slice_from_copied_buffer((const char *)calld->payload_bytes,
op->send_message->length));
- error = grpc_metadata_batch_add_tail(op->send_initial_metadata,
- &calld->payload_bin, payload_bin);
+ error =
+ grpc_metadata_batch_add_tail(exec_ctx, op->send_initial_metadata,
+ &calld->payload_bin, payload_bin);
if (error != GRPC_ERROR_NONE) return error;
calld->on_complete = op->on_complete;
op->on_complete = &calld->hc_on_complete;
@@ -323,21 +324,22 @@ static grpc_error *hc_mutate_op(grpc_exec_ctx *exec_ctx,
/* Send : prefixed headers, which have to be before any application
layer headers. */
- error = grpc_metadata_batch_add_head(op->send_initial_metadata,
+ error = grpc_metadata_batch_add_head(exec_ctx, op->send_initial_metadata,
&calld->method, method);
if (error != GRPC_ERROR_NONE) return error;
- error = grpc_metadata_batch_add_head(
- op->send_initial_metadata, &calld->scheme, channeld->static_scheme);
+ error =
+ grpc_metadata_batch_add_head(exec_ctx, op->send_initial_metadata,
+ &calld->scheme, channeld->static_scheme);
if (error != GRPC_ERROR_NONE) return error;
- error = grpc_metadata_batch_add_tail(op->send_initial_metadata,
+ error = grpc_metadata_batch_add_tail(exec_ctx, op->send_initial_metadata,
&calld->te_trailers,
GRPC_MDELEM_TE_TRAILERS);
if (error != GRPC_ERROR_NONE) return error;
error = grpc_metadata_batch_add_tail(
- op->send_initial_metadata, &calld->content_type,
+ exec_ctx, op->send_initial_metadata, &calld->content_type,
GRPC_MDELEM_CONTENT_TYPE_APPLICATION_SLASH_GRPC);
if (error != GRPC_ERROR_NONE) return error;
- error = grpc_metadata_batch_add_tail(op->send_initial_metadata,
+ error = grpc_metadata_batch_add_tail(exec_ctx, op->send_initial_metadata,
&calld->user_agent,
GRPC_MDELEM_REF(channeld->user_agent));
if (error != GRPC_ERROR_NONE) return error;
diff --git a/src/core/lib/channel/http_server_filter.c b/src/core/lib/channel/http_server_filter.c
index da105d06fd..3f992977c0 100644
--- a/src/core/lib/channel/http_server_filter.c
+++ b/src/core/lib/channel/http_server_filter.c
@@ -279,11 +279,11 @@ static void hs_mutate_op(grpc_exec_ctx *exec_ctx, grpc_call_element *elem,
grpc_error *error = GRPC_ERROR_NONE;
static const char *error_name = "Failed sending initial metadata";
add_error(error_name, &error, grpc_metadata_batch_add_head(
- op->send_initial_metadata, &calld->status,
- GRPC_MDELEM_STATUS_200));
+ exec_ctx, op->send_initial_metadata,
+ &calld->status, GRPC_MDELEM_STATUS_200));
add_error(error_name, &error,
grpc_metadata_batch_add_tail(
- op->send_initial_metadata, &calld->content_type,
+ exec_ctx, op->send_initial_metadata, &calld->content_type,
GRPC_MDELEM_CONTENT_TYPE_APPLICATION_SLASH_GRPC));
add_error(error_name, &error,
server_filter_outgoing_metadata(exec_ctx, elem,
diff --git a/src/core/lib/security/transport/client_auth_filter.c b/src/core/lib/security/transport/client_auth_filter.c
index b20e88851a..cf7de49345 100644
--- a/src/core/lib/security/transport/client_auth_filter.c
+++ b/src/core/lib/security/transport/client_auth_filter.c
@@ -136,7 +136,7 @@ static void on_credentials_metadata(grpc_exec_ctx *exec_ctx, void *user_data,
} else {
add_error(&error,
grpc_metadata_batch_add_tail(
- mdb, &calld->md_links[i],
+ exec_ctx, mdb, &calld->md_links[i],
grpc_mdelem_from_slices(
exec_ctx, grpc_slice_ref_internal(md_elems[i].key),
grpc_slice_ref_internal(md_elems[i].value))));
diff --git a/src/core/lib/surface/call.c b/src/core/lib/surface/call.c
index 1425913f5a..63b0683df5 100644
--- a/src/core/lib/surface/call.c
+++ b/src/core/lib/surface/call.c
@@ -796,14 +796,15 @@ static int prepare_application_metadata(
for (i = 0; i < call->send_extra_metadata_count; i++) {
GRPC_LOG_IF_ERROR("prepare_application_metadata",
grpc_metadata_batch_link_tail(
- batch, &call->send_extra_metadata[i]));
+ exec_ctx, batch, &call->send_extra_metadata[i]));
}
}
}
for (i = 0; i < total_count; i++) {
grpc_metadata *md = get_md_elem(metadata, additional_metadata, i, count);
- GRPC_LOG_IF_ERROR("prepare_application_metadata",
- grpc_metadata_batch_link_tail(batch, linked_from_md(md)));
+ GRPC_LOG_IF_ERROR(
+ "prepare_application_metadata",
+ grpc_metadata_batch_link_tail(exec_ctx, batch, linked_from_md(md)));
}
call->send_extra_metadata_count = 0;
diff --git a/src/core/lib/surface/call_details.c b/src/core/lib/surface/call_details.c
index 51e84c2945..d0f88e1969 100644
--- a/src/core/lib/surface/call_details.c
+++ b/src/core/lib/surface/call_details.c
@@ -36,6 +36,8 @@
#include <string.h>
+#include "src/core/lib/iomgr/exec_ctx.h"
+#include "src/core/lib/slice/slice_internal.h"
#include "src/core/lib/surface/api_trace.h"
void grpc_call_details_init(grpc_call_details* cd) {
@@ -47,6 +49,8 @@ void grpc_call_details_init(grpc_call_details* cd) {
void grpc_call_details_destroy(grpc_call_details* cd) {
GRPC_API_TRACE("grpc_call_details_destroy(cd=%p)", 1, (cd));
- grpc_slice_unref_internal(exec_ctx, cd->method);
- grpc_slice_unref_internal(exec_ctx, cd->host);
+ grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
+ grpc_slice_unref_internal(&exec_ctx, cd->method);
+ grpc_slice_unref_internal(&exec_ctx, cd->host);
+ grpc_exec_ctx_finish(&exec_ctx);
}
diff --git a/src/core/lib/surface/channel.c b/src/core/lib/surface/channel.c
index 1a25748977..429dbad7c7 100644
--- a/src/core/lib/surface/channel.c
+++ b/src/core/lib/surface/channel.c
@@ -43,6 +43,7 @@
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/iomgr/iomgr.h"
+#include "src/core/lib/slice/slice_internal.h"
#include "src/core/lib/support/string.h"
#include "src/core/lib/surface/api_trace.h"
#include "src/core/lib/surface/call.h"
diff --git a/src/core/lib/transport/metadata_batch.c b/src/core/lib/transport/metadata_batch.c
index c11c797d39..95b71d33d7 100644
--- a/src/core/lib/transport/metadata_batch.c
+++ b/src/core/lib/transport/metadata_batch.c
@@ -40,6 +40,7 @@
#include <grpc/support/log.h>
#include "src/core/lib/profiling/timers.h"
+#include "src/core/lib/slice/slice_internal.h"
#include "src/core/lib/slice/slice_string_helpers.h"
static void assert_valid_list(grpc_mdelem_list *list) {
@@ -65,7 +66,8 @@ static void assert_valid_list(grpc_mdelem_list *list) {
#endif /* NDEBUG */
}
-static void assert_valid_callouts(grpc_metadata_batch *batch) {
+static void assert_valid_callouts(grpc_exec_ctx *exec_ctx,
+ grpc_metadata_batch *batch) {
#ifndef NDEBUG
for (grpc_linked_mdelem *l = batch->list.head; l != NULL; l = l->next) {
grpc_slice key_interned = grpc_slice_intern(GRPC_MDKEY(l->md));
@@ -138,12 +140,13 @@ static void maybe_unlink_callout(grpc_metadata_batch *batch,
batch->idx.array[idx] = NULL;
}
-grpc_error *grpc_metadata_batch_add_head(grpc_metadata_batch *batch,
+grpc_error *grpc_metadata_batch_add_head(grpc_exec_ctx *exec_ctx,
+ grpc_metadata_batch *batch,
grpc_linked_mdelem *storage,
grpc_mdelem elem_to_add) {
GPR_ASSERT(!GRPC_MDISNULL(elem_to_add));
storage->md = elem_to_add;
- return grpc_metadata_batch_link_head(batch, storage);
+ return grpc_metadata_batch_link_head(exec_ctx, batch, storage);
}
static void link_head(grpc_mdelem_list *list, grpc_linked_mdelem *storage) {
@@ -161,25 +164,27 @@ static void link_head(grpc_mdelem_list *list, grpc_linked_mdelem *storage) {
assert_valid_list(list);
}
-grpc_error *grpc_metadata_batch_link_head(grpc_metadata_batch *batch,
+grpc_error *grpc_metadata_batch_link_head(grpc_exec_ctx *exec_ctx,
+ grpc_metadata_batch *batch,
grpc_linked_mdelem *storage) {
- assert_valid_callouts(batch);
+ assert_valid_callouts(exec_ctx, batch);
grpc_error *err = maybe_link_callout(batch, storage);
if (err != GRPC_ERROR_NONE) {
- assert_valid_callouts(batch);
+ assert_valid_callouts(exec_ctx, batch);
return err;
}
link_head(&batch->list, storage);
- assert_valid_callouts(batch);
+ assert_valid_callouts(exec_ctx, batch);
return GRPC_ERROR_NONE;
}
-grpc_error *grpc_metadata_batch_add_tail(grpc_metadata_batch *batch,
+grpc_error *grpc_metadata_batch_add_tail(grpc_exec_ctx *exec_ctx,
+ grpc_metadata_batch *batch,
grpc_linked_mdelem *storage,
grpc_mdelem elem_to_add) {
GPR_ASSERT(!GRPC_MDISNULL(elem_to_add));
storage->md = elem_to_add;
- return grpc_metadata_batch_link_tail(batch, storage);
+ return grpc_metadata_batch_link_tail(exec_ctx, batch, storage);
}
static void link_tail(grpc_mdelem_list *list, grpc_linked_mdelem *storage) {
@@ -198,16 +203,17 @@ static void link_tail(grpc_mdelem_list *list, grpc_linked_mdelem *storage) {
assert_valid_list(list);
}
-grpc_error *grpc_metadata_batch_link_tail(grpc_metadata_batch *batch,
+grpc_error *grpc_metadata_batch_link_tail(grpc_exec_ctx *exec_ctx,
+ grpc_metadata_batch *batch,
grpc_linked_mdelem *storage) {
- assert_valid_callouts(batch);
+ assert_valid_callouts(exec_ctx, batch);
grpc_error *err = maybe_link_callout(batch, storage);
if (err != GRPC_ERROR_NONE) {
- assert_valid_callouts(batch);
+ assert_valid_callouts(exec_ctx, batch);
return err;
}
link_tail(&batch->list, storage);
- assert_valid_callouts(batch);
+ assert_valid_callouts(exec_ctx, batch);
return GRPC_ERROR_NONE;
}
@@ -231,11 +237,11 @@ static void unlink_storage(grpc_mdelem_list *list,
void grpc_metadata_batch_remove(grpc_exec_ctx *exec_ctx,
grpc_metadata_batch *batch,
grpc_linked_mdelem *storage) {
- assert_valid_callouts(batch);
+ assert_valid_callouts(exec_ctx, batch);
maybe_unlink_callout(batch, storage);
unlink_storage(&batch->list, storage);
GRPC_MDELEM_UNREF(exec_ctx, storage->md);
- assert_valid_callouts(batch);
+ assert_valid_callouts(exec_ctx, batch);
}
void grpc_metadata_batch_set_value(grpc_exec_ctx *exec_ctx,
diff --git a/src/core/lib/transport/metadata_batch.h b/src/core/lib/transport/metadata_batch.h
index 894a927d3e..5471539e82 100644
--- a/src/core/lib/transport/metadata_batch.h
+++ b/src/core/lib/transport/metadata_batch.h
@@ -100,17 +100,17 @@ void grpc_metadata_batch_set_value(grpc_exec_ctx *exec_ctx,
\a storage is owned by the caller and must survive for the
lifetime of batch. This usually means it should be around
for the lifetime of the call. */
-grpc_error *grpc_metadata_batch_link_head(grpc_metadata_batch *batch,
- grpc_linked_mdelem *storage)
- GRPC_MUST_USE_RESULT;
+grpc_error *grpc_metadata_batch_link_head(
+ grpc_exec_ctx *exec_ctx, grpc_metadata_batch *batch,
+ grpc_linked_mdelem *storage) GRPC_MUST_USE_RESULT;
/** Add \a storage to the end of \a batch. storage->md is
assumed to be valid.
\a storage is owned by the caller and must survive for the
lifetime of batch. This usually means it should be around
for the lifetime of the call. */
-grpc_error *grpc_metadata_batch_link_tail(grpc_metadata_batch *batch,
- grpc_linked_mdelem *storage)
- GRPC_MUST_USE_RESULT;
+grpc_error *grpc_metadata_batch_link_tail(
+ grpc_exec_ctx *exec_ctx, grpc_metadata_batch *batch,
+ grpc_linked_mdelem *storage) GRPC_MUST_USE_RESULT;
/** Add \a elem_to_add as the first element in \a batch, using
\a storage as backing storage for the linked list element.
@@ -119,8 +119,8 @@ grpc_error *grpc_metadata_batch_link_tail(grpc_metadata_batch *batch,
for the lifetime of the call.
Takes ownership of \a elem_to_add */
grpc_error *grpc_metadata_batch_add_head(
- grpc_metadata_batch *batch, grpc_linked_mdelem *storage,
- grpc_mdelem elem_to_add) GRPC_MUST_USE_RESULT;
+ grpc_exec_ctx *exec_ctx, grpc_metadata_batch *batch,
+ grpc_linked_mdelem *storage, grpc_mdelem elem_to_add) GRPC_MUST_USE_RESULT;
/** Add \a elem_to_add as the last element in \a batch, using
\a storage as backing storage for the linked list element.
\a storage is owned by the caller and must survive for the
@@ -128,8 +128,8 @@ grpc_error *grpc_metadata_batch_add_head(
for the lifetime of the call.
Takes ownership of \a elem_to_add */
grpc_error *grpc_metadata_batch_add_tail(
- grpc_metadata_batch *batch, grpc_linked_mdelem *storage,
- grpc_mdelem elem_to_add) GRPC_MUST_USE_RESULT;
+ grpc_exec_ctx *exec_ctx, grpc_metadata_batch *batch,
+ grpc_linked_mdelem *storage, grpc_mdelem elem_to_add) GRPC_MUST_USE_RESULT;
grpc_error *grpc_attach_md_to_error(grpc_error *src, grpc_mdelem md);
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-29 18:56:33 +0000