diff options
author | 2017-05-03 13:06:35 -0700 | |
---|---|---|
committer | 2017-05-03 13:06:35 -0700 | |
commit | 84f75d448e2eb9c76301598cfaf8630603ef4a98 (patch) | |
tree | 150ff5087af2e10cab8565551084a4ce6e433d7e /src/core/ext/filters/http/message_compress/message_compress_filter.c | |
parent | 4d03ffbdc63ada0ff7ef05f036d5b53fc18c0a44 (diff) |
Fix ASAN/TSAN failures
- trace system is now thread safe when run with TSAN
- fix a race in client_auth_filter.c
- allow timer manager to run in single threaded mode for fuzzers
Diffstat (limited to 'src/core/ext/filters/http/message_compress/message_compress_filter.c')
-rw-r--r-- | src/core/ext/filters/http/message_compress/message_compress_filter.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/ext/filters/http/message_compress/message_compress_filter.c b/src/core/ext/filters/http/message_compress/message_compress_filter.c index 1da8cf69cb..5a54a6ed15 100644 --- a/src/core/ext/filters/http/message_compress/message_compress_filter.c +++ b/src/core/ext/filters/http/message_compress/message_compress_filter.c @@ -47,6 +47,7 @@ #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_string_helpers.h" #include "src/core/lib/support/string.h" +#include "src/core/lib/surface/call.h" #include "src/core/lib/transport/static_metadata.h" #define INITIAL_METADATA_UNSEEN 0 @@ -197,7 +198,7 @@ static void finish_send_message(grpc_exec_ctx *exec_ctx, did_compress = grpc_msg_compress(exec_ctx, calld->compression_algorithm, &calld->slices, &tmp); if (did_compress) { - if (grpc_compression_trace) { + if (GRPC_TRACER_ON(grpc_compression_trace)) { char *algo_name; const size_t before_size = calld->slices.length; const size_t after_size = tmp.length; @@ -211,7 +212,7 @@ static void finish_send_message(grpc_exec_ctx *exec_ctx, grpc_slice_buffer_swap(&calld->slices, &tmp); calld->send_flags |= GRPC_WRITE_INTERNAL_COMPRESS; } else { - if (grpc_compression_trace) { + if (GRPC_TRACER_ON(grpc_compression_trace)) { char *algo_name; GPR_ASSERT(grpc_compression_algorithm_name(calld->compression_algorithm, &algo_name)); |