diff options
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/codegen/core/gen_static_metadata.py | 215 | ||||
| -rw-r--r-- | tools/doxygen/Doxyfile.c++ | 1 | ||||
| -rw-r--r-- | tools/doxygen/Doxyfile.c++.internal | 1 | ||||
| -rw-r--r-- | tools/doxygen/Doxyfile.core.internal | 15 | ||||
| -rw-r--r-- | tools/run_tests/generated/configs.json | 72 | ||||
| -rw-r--r-- | tools/run_tests/generated/sources_and_headers.json | 60 | ||||
| -rw-r--r-- | tools/run_tests/generated/tests.json | 146 |
7 files changed, 228 insertions, 282 deletions
diff --git a/tools/codegen/core/gen_static_metadata.py b/tools/codegen/core/gen_static_metadata.py index 0374cf75a1..cf3762dbb8 100755 --- a/tools/codegen/core/gen_static_metadata.py +++ b/tools/codegen/core/gen_static_metadata.py @@ -31,12 +31,8 @@ import hashlib import itertools -import collections import os import sys -import subprocess -import re -import perfection # configuration: a list of either strings or 2-tuples of strings # a single string represents a static grpc_mdstr @@ -44,8 +40,6 @@ import perfection # also be created) CONFIG = [ - # metadata strings - 'host', 'grpc-timeout', 'grpc-internal-encoding-request', 'grpc-payload-bin', @@ -54,19 +48,12 @@ CONFIG = [ 'grpc-accept-encoding', 'user-agent', ':authority', + 'host', 'grpc-message', 'grpc-status', 'grpc-tracing-bin', 'grpc-stats-bin', '', - # channel arg keys - 'grpc.wait_for_ready', - 'grpc.timeout', - 'grpc.max_request_message_bytes', - 'grpc.max_response_message_bytes', - # well known method names - '/grpc.lb.v1.LoadBalancer/BalanceLoad', - # metadata elements ('grpc-status', '0'), ('grpc-status', '1'), ('grpc-status', '2'), @@ -143,26 +130,6 @@ CONFIG = [ ('www-authenticate', ''), ] -METADATA_BATCH_CALLOUTS = [ - ':path', - ':method', - ':status', - ':authority', - ':scheme', - 'te', - 'grpc-message', - 'grpc-status', - 'grpc-payload-bin', - 'grpc-encoding', - 'grpc-accept-encoding', - 'content-type', - 'grpc-internal-encoding-request', - 'user-agent', - 'host', - 'lb-token', - 'lb-cost-bin', -] - COMPRESSION_ALGORITHMS = [ 'identity', 'deflate', @@ -170,7 +137,7 @@ COMPRESSION_ALGORITHMS = [ ] # utility: mangle the name of a config -def mangle(elem, name=None): +def mangle(elem): xl = { '-': '_', ':': '', @@ -195,14 +162,10 @@ def mangle(elem, name=None): r += put if r[-1] == '_': r = r[:-1] return r - def n(default, name=name): - if name is None: return 'grpc_%s_' % default - if name == '': return '' - return 'grpc_%s_' % name if isinstance(elem, tuple): - return '%s%s_%s' % (n('mdelem'), m0(elem[0]), m0(elem[1])) + return 'grpc_mdelem_%s_%s' % (m0(elem[0]), m0(elem[1])) else: - return '%s%s' % (n('mdstr'), m0(elem)) + return 'grpc_mdstr_%s' % (m0(elem)) # utility: generate some hash value for a string def fake_hash(elem): @@ -218,37 +181,28 @@ def put_banner(files, banner): print >>f # build a list of all the strings we need -all_strs = list() -all_elems = list() +all_strs = set() +all_elems = set() static_userdata = {} -# put metadata batch callouts first, to make the check of if a static metadata -# string is a callout trivial -for elem in METADATA_BATCH_CALLOUTS: - if elem not in all_strs: - all_strs.append(elem) for elem in CONFIG: if isinstance(elem, tuple): - if elem[0] not in all_strs: - all_strs.append(elem[0]) - if elem[1] not in all_strs: - all_strs.append(elem[1]) - if elem not in all_elems: - all_elems.append(elem) + all_strs.add(elem[0]) + all_strs.add(elem[1]) + all_elems.add(elem) else: - if elem not in all_strs: - all_strs.append(elem) + all_strs.add(elem) compression_elems = [] for mask in range(1, 1<<len(COMPRESSION_ALGORITHMS)): val = ','.join(COMPRESSION_ALGORITHMS[alg] for alg in range(0, len(COMPRESSION_ALGORITHMS)) if (1 << alg) & mask) elem = ('grpc-accept-encoding', val) - if val not in all_strs: - all_strs.append(val) - if elem not in all_elems: - all_elems.append(elem) + all_strs.add(val) + all_elems.add(elem) compression_elems.append(elem) static_userdata[elem] = 1 + (mask | 1) +all_strs = sorted(list(all_strs), key=mangle) +all_elems = sorted(list(all_elems), key=mangle) # output configuration args = sys.argv[1:] @@ -325,52 +279,15 @@ print >>H print >>C, '#include "src/core/lib/transport/static_metadata.h"' print >>C -print >>C, '#include "src/core/lib/slice/slice_internal.h"' -print >>C - -str_ofs = 0 -id2strofs = {} -for i, elem in enumerate(all_strs): - id2strofs[i] = str_ofs - str_ofs += len(elem); -def slice_def(i): - return '{.refcount = &grpc_static_metadata_refcounts[%d], .data.refcounted = {g_bytes+%d, %d}}' % (i, id2strofs[i], len(all_strs[i])) - -# validate configuration -for elem in METADATA_BATCH_CALLOUTS: - assert elem in all_strs print >>H, '#define GRPC_STATIC_MDSTR_COUNT %d' % len(all_strs) -print >>H, 'extern const grpc_slice grpc_static_slice_table[GRPC_STATIC_MDSTR_COUNT];' +print >>H, 'extern grpc_mdstr grpc_static_mdstr_table[GRPC_STATIC_MDSTR_COUNT];' for i, elem in enumerate(all_strs): print >>H, '/* "%s" */' % elem - print >>H, '#define %s (grpc_static_slice_table[%d])' % (mangle(elem).upper(), i) -print >>H -print >>C, 'static uint8_t g_bytes[] = {%s};' % (','.join('%d' % ord(c) for c in ''.join(all_strs))) -print >>C -print >>C, 'static void static_ref(void *unused) {}' -print >>C, 'static void static_unref(grpc_exec_ctx *exec_ctx, void *unused) {}' -print >>C, 'static const grpc_slice_refcount_vtable static_sub_vtable = {static_ref, static_unref, grpc_slice_default_eq_impl, grpc_slice_default_hash_impl};'; -print >>H, 'extern const grpc_slice_refcount_vtable grpc_static_metadata_vtable;'; -print >>C, 'const grpc_slice_refcount_vtable grpc_static_metadata_vtable = {static_ref, static_unref, grpc_static_slice_eq, grpc_static_slice_hash};'; -print >>C, 'static grpc_slice_refcount static_sub_refcnt = {&static_sub_vtable, &static_sub_refcnt};'; -print >>H, 'extern grpc_slice_refcount grpc_static_metadata_refcounts[GRPC_STATIC_MDSTR_COUNT];' -print >>C, 'grpc_slice_refcount grpc_static_metadata_refcounts[GRPC_STATIC_MDSTR_COUNT] = {' -for i, elem in enumerate(all_strs): - print >>C, ' {&grpc_static_metadata_vtable, &static_sub_refcnt},' -print >>C, '};' -print >>C -print >>H, '#define GRPC_IS_STATIC_METADATA_STRING(slice) \\' -print >>H, ' ((slice).refcount != NULL && (slice).refcount->vtable == &grpc_static_metadata_vtable)' + print >>H, '#define %s (&grpc_static_mdstr_table[%d])' % (mangle(elem).upper(), i) print >>H -print >>C, 'const grpc_slice grpc_static_slice_table[GRPC_STATIC_MDSTR_COUNT] = {' -for i, elem in enumerate(all_strs): - print >>C, slice_def(i) + ',' -print >>C, '};' +print >>C, 'grpc_mdstr grpc_static_mdstr_table[GRPC_STATIC_MDSTR_COUNT];' print >>C -print >>H, '#define GRPC_STATIC_METADATA_INDEX(static_slice) \\' -print >>H, ' ((int)((static_slice).refcount - grpc_static_metadata_refcounts))' -print >>H print >>D, '# hpack fuzzing dictionary' for i, elem in enumerate(all_strs): @@ -380,12 +297,13 @@ for i, elem in enumerate(all_elems): [len(elem[1])] + [ord(c) for c in elem[1]])) print >>H, '#define GRPC_STATIC_MDELEM_COUNT %d' % len(all_elems) -print >>H, 'extern grpc_mdelem_data grpc_static_mdelem_table[GRPC_STATIC_MDELEM_COUNT];' +print >>H, 'extern grpc_mdelem grpc_static_mdelem_table[GRPC_STATIC_MDELEM_COUNT];' print >>H, 'extern uintptr_t grpc_static_mdelem_user_data[GRPC_STATIC_MDELEM_COUNT];' for i, elem in enumerate(all_elems): print >>H, '/* "%s": "%s" */' % elem - print >>H, '#define %s (GRPC_MAKE_MDELEM(&grpc_static_mdelem_table[%d], GRPC_MDELEM_STORAGE_STATIC))' % (mangle(elem).upper(), i) + print >>H, '#define %s (&grpc_static_mdelem_table[%d])' % (mangle(elem).upper(), i) print >>H +print >>C, 'grpc_mdelem grpc_static_mdelem_table[GRPC_STATIC_MDELEM_COUNT];' print >>C, 'uintptr_t grpc_static_mdelem_user_data[GRPC_STATIC_MDELEM_COUNT] = {' print >>C, ' %s' % ','.join('%d' % static_userdata.get(elem, 0) for elem in all_elems) print >>C, '};' @@ -401,92 +319,17 @@ def md_idx(m): if m == m2: return i -def offset_trials(mink): - yield 0 - for i in range(1, 100): - for mul in [-1, 1]: - yield mul * i - -def perfect_hash(keys, name): - p = perfection.hash_parameters(keys) - def f(i, p=p): - i += p.offset - x = i % p.t - y = i / p.t - return x + p.r[y] - return { - 'PHASHRANGE': p.t - 1 + max(p.r), - 'PHASHNKEYS': len(p.slots), - 'pyfunc': f, - 'code': """ -static const int8_t %(name)s_r[] = {%(r)s}; -static uint32_t %(name)s_phash(uint32_t i) { - i %(offset_sign)s= %(offset)d; - uint32_t x = i %% %(t)d; - uint32_t y = i / %(t)d; - uint32_t h = x; - if (y < GPR_ARRAY_SIZE(%(name)s_r)) { - uint32_t delta = (uint32_t)%(name)s_r[y]; - h += delta; - } - return h; -} - """ % { - 'name': name, - 'r': ','.join('%d' % (r if r is not None else 0) for r in p.r), - 't': p.t, - 'offset': abs(p.offset), - 'offset_sign': '+' if p.offset > 0 else '-' - } - } - - -elem_keys = [str_idx(elem[0]) * len(all_strs) + str_idx(elem[1]) for elem in all_elems] -elem_hash = perfect_hash(elem_keys, "elems") -print >>C, elem_hash['code'] - -keys = [0] * int(elem_hash['PHASHRANGE']) -idxs = [255] * int(elem_hash['PHASHNKEYS']) -for i, k in enumerate(elem_keys): - h = elem_hash['pyfunc'](k) - assert keys[h] == 0 - keys[h] = k - idxs[h] = i -print >>C, 'static const uint16_t elem_keys[] = {%s};' % ','.join('%d' % k for k in keys) -print >>C, 'static const uint8_t elem_idxs[] = {%s};' % ','.join('%d' % i for i in idxs) -print >>C - -print >>H, 'grpc_mdelem grpc_static_mdelem_for_static_strings(int a, int b);' -print >>C, 'grpc_mdelem grpc_static_mdelem_for_static_strings(int a, int b) {' -print >>C, ' if (a == -1 || b == -1) return GRPC_MDNULL;' -print >>C, ' uint32_t k = (uint32_t)(a * %d + b);' % len(all_strs) -print >>C, ' uint32_t h = elems_phash(k);' -print >>C, ' return elem_keys[h] == k ? GRPC_MAKE_MDELEM(&grpc_static_mdelem_table[elem_idxs[h]], GRPC_MDELEM_STORAGE_STATIC) : GRPC_MDNULL;' -print >>C, '}' +print >>H, 'extern const uint8_t grpc_static_metadata_elem_indices[GRPC_STATIC_MDELEM_COUNT*2];' +print >>C, 'const uint8_t grpc_static_metadata_elem_indices[GRPC_STATIC_MDELEM_COUNT*2] = {' +print >>C, ','.join('%d' % str_idx(x) for x in itertools.chain.from_iterable([a,b] for a, b in all_elems)) +print >>C, '};' print >>C -print >>C, 'grpc_mdelem_data grpc_static_mdelem_table[GRPC_STATIC_MDELEM_COUNT] = {' -for a, b in all_elems: - print >>C, '{%s,%s},' % (slice_def(str_idx(a)), slice_def(str_idx(b))) +print >>H, 'extern const char *const grpc_static_metadata_strings[GRPC_STATIC_MDSTR_COUNT];' +print >>C, 'const char *const grpc_static_metadata_strings[GRPC_STATIC_MDSTR_COUNT] = {' +print >>C, '%s' % ',\n'.join(' "%s"' % s for s in all_strs) print >>C, '};' - -print >>H, 'typedef enum {' -for elem in METADATA_BATCH_CALLOUTS: - print >>H, ' %s,' % mangle(elem, 'batch').upper() -print >>H, ' GRPC_BATCH_CALLOUTS_COUNT' -print >>H, '} grpc_metadata_batch_callouts_index;' -print >>H -print >>H, 'typedef union {' -print >>H, ' struct grpc_linked_mdelem *array[GRPC_BATCH_CALLOUTS_COUNT];' -print >>H, ' struct {' -for elem in METADATA_BATCH_CALLOUTS: - print >>H, ' struct grpc_linked_mdelem *%s;' % mangle(elem, '').lower() -print >>H, ' } named;' -print >>H, '} grpc_metadata_batch_callouts;' -print >>H -print >>H, '#define GRPC_BATCH_INDEX_OF(slice) \\' -print >>H, ' (GRPC_IS_STATIC_METADATA_STRING((slice)) ? (grpc_metadata_batch_callouts_index)GPR_CLAMP(GRPC_STATIC_METADATA_INDEX((slice)), 0, GRPC_BATCH_CALLOUTS_COUNT) : GRPC_BATCH_CALLOUTS_COUNT)' -print >>H +print >>C print >>H, 'extern const uint8_t grpc_static_accept_encoding_metadata[%d];' % (1 << len(COMPRESSION_ALGORITHMS)) print >>C, 'const uint8_t grpc_static_accept_encoding_metadata[%d] = {' % (1 << len(COMPRESSION_ALGORITHMS)) @@ -494,7 +337,7 @@ print >>C, '0,%s' % ','.join('%d' % md_idx(elem) for elem in compression_elems) print >>C, '};' print >>C -print >>H, '#define GRPC_MDELEM_ACCEPT_ENCODING_FOR_ALGORITHMS(algs) (GRPC_MAKE_MDELEM(&grpc_static_mdelem_table[grpc_static_accept_encoding_metadata[(algs)]], GRPC_MDELEM_STORAGE_STATIC))' +print >>H, '#define GRPC_MDELEM_ACCEPT_ENCODING_FOR_ALGORITHMS(algs) (&grpc_static_mdelem_table[grpc_static_accept_encoding_metadata[(algs)]])' print >>H, '#endif /* GRPC_CORE_LIB_TRANSPORT_STATIC_METADATA_H */' diff --git a/tools/doxygen/Doxyfile.c++ b/tools/doxygen/Doxyfile.c++ index 128a409df4..af844d661b 100644 --- a/tools/doxygen/Doxyfile.c++ +++ b/tools/doxygen/Doxyfile.c++ @@ -822,7 +822,6 @@ include/grpc++/impl/codegen/serialization_traits.h \ include/grpc++/impl/codegen/server_context.h \ include/grpc++/impl/codegen/server_interface.h \ include/grpc++/impl/codegen/service_type.h \ -include/grpc++/impl/codegen/slice.h \ include/grpc++/impl/codegen/status.h \ include/grpc++/impl/codegen/status_code_enum.h \ include/grpc++/impl/codegen/status_helper.h \ diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index 5bd4323f3a..2b2d8a3fe1 100644 --- a/tools/doxygen/Doxyfile.c++.internal +++ b/tools/doxygen/Doxyfile.c++.internal @@ -823,7 +823,6 @@ include/grpc++/impl/codegen/serialization_traits.h \ include/grpc++/impl/codegen/server_context.h \ include/grpc++/impl/codegen/server_interface.h \ include/grpc++/impl/codegen/service_type.h \ -include/grpc++/impl/codegen/slice.h \ include/grpc++/impl/codegen/status.h \ include/grpc++/impl/codegen/status_code_enum.h \ include/grpc++/impl/codegen/status_helper.h \ diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index 9fa2916ca9..ffe83a2ddb 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -981,12 +981,15 @@ src/core/ext/transport/chttp2/transport/hpack_parser.c \ src/core/ext/transport/chttp2/transport/hpack_parser.h \ src/core/ext/transport/chttp2/transport/hpack_table.c \ src/core/ext/transport/chttp2/transport/hpack_table.h \ +src/core/ext/transport/chttp2/transport/http2_errors.h \ src/core/ext/transport/chttp2/transport/huffsyms.c \ src/core/ext/transport/chttp2/transport/huffsyms.h \ src/core/ext/transport/chttp2/transport/incoming_metadata.c \ src/core/ext/transport/chttp2/transport/incoming_metadata.h \ src/core/ext/transport/chttp2/transport/internal.h \ src/core/ext/transport/chttp2/transport/parsing.c \ +src/core/ext/transport/chttp2/transport/status_conversion.c \ +src/core/ext/transport/chttp2/transport/status_conversion.h \ src/core/ext/transport/chttp2/transport/stream_lists.c \ src/core/ext/transport/chttp2/transport/stream_map.c \ src/core/ext/transport/chttp2/transport/stream_map.h \ @@ -1046,7 +1049,6 @@ src/core/lib/iomgr/endpoint_pair_uv.c \ src/core/lib/iomgr/endpoint_pair_windows.c \ src/core/lib/iomgr/error.c \ src/core/lib/iomgr/error.h \ -src/core/lib/iomgr/error_internal.h \ src/core/lib/iomgr/ev_epoll_linux.c \ src/core/lib/iomgr/ev_epoll_linux.h \ src/core/lib/iomgr/ev_poll_posix.c \ @@ -1202,9 +1204,6 @@ src/core/lib/slice/percent_encoding.c \ src/core/lib/slice/percent_encoding.h \ src/core/lib/slice/slice.c \ src/core/lib/slice/slice_buffer.c \ -src/core/lib/slice/slice_hash_table.c \ -src/core/lib/slice/slice_hash_table.h \ -src/core/lib/slice/slice_intern.c \ src/core/lib/slice/slice_internal.h \ src/core/lib/slice/slice_string_helpers.c \ src/core/lib/slice/slice_string_helpers.h \ @@ -1292,16 +1291,14 @@ src/core/lib/surface/metadata_array.c \ src/core/lib/surface/server.c \ src/core/lib/surface/server.h \ src/core/lib/surface/validate_metadata.c \ -src/core/lib/surface/validate_metadata.h \ src/core/lib/surface/version.c \ src/core/lib/transport/README.md \ src/core/lib/transport/byte_stream.c \ src/core/lib/transport/byte_stream.h \ src/core/lib/transport/connectivity_state.c \ src/core/lib/transport/connectivity_state.h \ -src/core/lib/transport/error_utils.c \ -src/core/lib/transport/error_utils.h \ -src/core/lib/transport/http2_errors.h \ +src/core/lib/transport/mdstr_hash_table.c \ +src/core/lib/transport/mdstr_hash_table.h \ src/core/lib/transport/metadata.c \ src/core/lib/transport/metadata.h \ src/core/lib/transport/metadata_batch.c \ @@ -1312,8 +1309,6 @@ src/core/lib/transport/service_config.c \ src/core/lib/transport/service_config.h \ src/core/lib/transport/static_metadata.c \ src/core/lib/transport/static_metadata.h \ -src/core/lib/transport/status_conversion.c \ -src/core/lib/transport/status_conversion.h \ src/core/lib/transport/timeout_encoding.c \ src/core/lib/transport/timeout_encoding.h \ src/core/lib/transport/transport.c \ diff --git a/tools/run_tests/generated/configs.json b/tools/run_tests/generated/configs.json index f2c110766b..b0839ef026 100644 --- a/tools/run_tests/generated/configs.json +++ b/tools/run_tests/generated/configs.json @@ -3,6 +3,37 @@ "config": "opt" }, { + "config": "asan-trace-cmp", + "environ": { + "ASAN_OPTIONS": "detect_leaks=1:color=always", + "LSAN_OPTIONS": "suppressions=tools/lsan_suppressions.txt:report_objects=1" + }, + "timeout_multiplier": 3 + }, + { + "config": "dbg" + }, + { + "config": "easan", + "environ": { + "ASAN_OPTIONS": "detect_leaks=1:color=always", + "LSAN_OPTIONS": "suppressions=tools/lsan_suppressions.txt:report_objects=1" + }, + "timeout_multiplier": 3 + }, + { + "config": "asan", + "environ": { + "ASAN_OPTIONS": "detect_leaks=1:color=always", + "LSAN_OPTIONS": "suppressions=tools/lsan_suppressions.txt:report_objects=1" + }, + "timeout_multiplier": 3 + }, + { + "config": "msan", + "timeout_multiplier": 4 + }, + { "config": "basicprof" }, { @@ -21,21 +52,27 @@ "timeout_multiplier": 3 }, { - "config": "asan-trace-cmp", + "config": "edbg" + }, + { + "config": "ubsan", "environ": { - "ASAN_OPTIONS": "detect_leaks=1:color=always", - "LSAN_OPTIONS": "suppressions=tools/lsan_suppressions.txt:report_objects=1" + "UBSAN_OPTIONS": "halt_on_error=1:print_stacktrace=1" }, - "timeout_multiplier": 3 + "timeout_multiplier": 1.5 }, { - "config": "dbg" + "config": "tsan", + "environ": { + "TSAN_OPTIONS": "suppressions=tools/tsan_suppressions.txt:halt_on_error=1:second_deadlock_stack=1" + }, + "timeout_multiplier": 5 }, { "config": "stapprof" }, { - "config": "gcov" + "config": "mutrace" }, { "config": "memcheck", @@ -47,32 +84,13 @@ ] }, { - "config": "asan", - "environ": { - "ASAN_OPTIONS": "detect_leaks=1:color=always", - "LSAN_OPTIONS": "suppressions=tools/lsan_suppressions.txt:report_objects=1" - }, - "timeout_multiplier": 3 - }, - { - "config": "tsan", + "config": "etsan", "environ": { "TSAN_OPTIONS": "suppressions=tools/tsan_suppressions.txt:halt_on_error=1:second_deadlock_stack=1" }, "timeout_multiplier": 5 }, { - "config": "ubsan", - "environ": { - "UBSAN_OPTIONS": "halt_on_error=1:print_stacktrace=1" - }, - "timeout_multiplier": 1.5 - }, - { - "config": "msan", - "timeout_multiplier": 4 - }, - { - "config": "mutrace" + "config": "gcov" } ] diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json index e392a42949..9bc82486d2 100644 --- a/tools/run_tests/generated/sources_and_headers.json +++ b/tools/run_tests/generated/sources_and_headers.json @@ -227,6 +227,23 @@ "headers": [], "is_filegroup": false, "language": "c", + "name": "chttp2_status_conversion_test", + "src": [ + "test/core/transport/chttp2/status_conversion_test.c" + ], + "third_party": false, + "type": "target" + }, + { + "deps": [ + "gpr", + "gpr_test_util", + "grpc", + "grpc_test_util" + ], + "headers": [], + "is_filegroup": false, + "language": "c", "name": "chttp2_stream_map_test", "src": [ "test/core/transport/chttp2/stream_map_test.c" @@ -1993,23 +2010,6 @@ "headers": [], "is_filegroup": false, "language": "c", - "name": "status_conversion_test", - "src": [ - "test/core/transport/status_conversion_test.c" - ], - "third_party": false, - "type": "target" - }, - { - "deps": [ - "gpr", - "gpr_test_util", - "grpc", - "grpc_test_util" - ], - "headers": [], - "is_filegroup": false, - "language": "c", "name": "tcp_client_posix_test", "src": [ "test/core/iomgr/tcp_client_posix_test.c" @@ -7011,7 +7011,6 @@ "src/core/lib/iomgr/endpoint.h", "src/core/lib/iomgr/endpoint_pair.h", "src/core/lib/iomgr/error.h", - "src/core/lib/iomgr/error_internal.h", "src/core/lib/iomgr/ev_epoll_linux.h", "src/core/lib/iomgr/ev_poll_posix.h", "src/core/lib/iomgr/ev_posix.h", @@ -7064,7 +7063,6 @@ "src/core/lib/json/json_reader.h", "src/core/lib/json/json_writer.h", "src/core/lib/slice/percent_encoding.h", - "src/core/lib/slice/slice_hash_table.h", "src/core/lib/slice/slice_internal.h", "src/core/lib/slice/slice_string_helpers.h", "src/core/lib/surface/api_trace.h", @@ -7078,17 +7076,14 @@ "src/core/lib/surface/init.h", "src/core/lib/surface/lame_client.h", "src/core/lib/surface/server.h", - "src/core/lib/surface/validate_metadata.h", "src/core/lib/transport/byte_stream.h", "src/core/lib/transport/connectivity_state.h", - "src/core/lib/transport/error_utils.h", - "src/core/lib/transport/http2_errors.h", + "src/core/lib/transport/mdstr_hash_table.h", "src/core/lib/transport/metadata.h", "src/core/lib/transport/metadata_batch.h", "src/core/lib/transport/pid_controller.h", "src/core/lib/transport/service_config.h", "src/core/lib/transport/static_metadata.h", - "src/core/lib/transport/status_conversion.h", "src/core/lib/transport/timeout_encoding.h", "src/core/lib/transport/transport.h", "src/core/lib/transport/transport_impl.h" @@ -7155,7 +7150,6 @@ "src/core/lib/iomgr/endpoint_pair_windows.c", "src/core/lib/iomgr/error.c", "src/core/lib/iomgr/error.h", - "src/core/lib/iomgr/error_internal.h", "src/core/lib/iomgr/ev_epoll_linux.c", "src/core/lib/iomgr/ev_epoll_linux.h", "src/core/lib/iomgr/ev_poll_posix.c", @@ -7267,9 +7261,6 @@ "src/core/lib/slice/percent_encoding.h", "src/core/lib/slice/slice.c", "src/core/lib/slice/slice_buffer.c", - "src/core/lib/slice/slice_hash_table.c", - "src/core/lib/slice/slice_hash_table.h", - "src/core/lib/slice/slice_intern.c", "src/core/lib/slice/slice_internal.h", "src/core/lib/slice/slice_string_helpers.c", "src/core/lib/slice/slice_string_helpers.h", @@ -7301,15 +7292,13 @@ "src/core/lib/surface/server.c", "src/core/lib/surface/server.h", "src/core/lib/surface/validate_metadata.c", - "src/core/lib/surface/validate_metadata.h", "src/core/lib/surface/version.c", "src/core/lib/transport/byte_stream.c", "src/core/lib/transport/byte_stream.h", "src/core/lib/transport/connectivity_state.c", "src/core/lib/transport/connectivity_state.h", - "src/core/lib/transport/error_utils.c", - "src/core/lib/transport/error_utils.h", - "src/core/lib/transport/http2_errors.h", + "src/core/lib/transport/mdstr_hash_table.c", + "src/core/lib/transport/mdstr_hash_table.h", "src/core/lib/transport/metadata.c", "src/core/lib/transport/metadata.h", "src/core/lib/transport/metadata_batch.c", @@ -7320,8 +7309,6 @@ "src/core/lib/transport/service_config.h", "src/core/lib/transport/static_metadata.c", "src/core/lib/transport/static_metadata.h", - "src/core/lib/transport/status_conversion.c", - "src/core/lib/transport/status_conversion.h", "src/core/lib/transport/timeout_encoding.c", "src/core/lib/transport/timeout_encoding.h", "src/core/lib/transport/transport.c", @@ -7691,9 +7678,11 @@ "src/core/ext/transport/chttp2/transport/hpack_encoder.h", "src/core/ext/transport/chttp2/transport/hpack_parser.h", "src/core/ext/transport/chttp2/transport/hpack_table.h", + "src/core/ext/transport/chttp2/transport/http2_errors.h", "src/core/ext/transport/chttp2/transport/huffsyms.h", "src/core/ext/transport/chttp2/transport/incoming_metadata.h", "src/core/ext/transport/chttp2/transport/internal.h", + "src/core/ext/transport/chttp2/transport/status_conversion.h", "src/core/ext/transport/chttp2/transport/stream_map.h", "src/core/ext/transport/chttp2/transport/varint.h" ], @@ -7727,12 +7716,15 @@ "src/core/ext/transport/chttp2/transport/hpack_parser.h", "src/core/ext/transport/chttp2/transport/hpack_table.c", "src/core/ext/transport/chttp2/transport/hpack_table.h", + "src/core/ext/transport/chttp2/transport/http2_errors.h", "src/core/ext/transport/chttp2/transport/huffsyms.c", "src/core/ext/transport/chttp2/transport/huffsyms.h", "src/core/ext/transport/chttp2/transport/incoming_metadata.c", "src/core/ext/transport/chttp2/transport/incoming_metadata.h", "src/core/ext/transport/chttp2/transport/internal.h", "src/core/ext/transport/chttp2/transport/parsing.c", + "src/core/ext/transport/chttp2/transport/status_conversion.c", + "src/core/ext/transport/chttp2/transport/status_conversion.h", "src/core/ext/transport/chttp2/transport/stream_lists.c", "src/core/ext/transport/chttp2/transport/stream_map.c", "src/core/ext/transport/chttp2/transport/stream_map.h", @@ -8101,7 +8093,6 @@ "include/grpc++/impl/codegen/server_context.h", "include/grpc++/impl/codegen/server_interface.h", "include/grpc++/impl/codegen/service_type.h", - "include/grpc++/impl/codegen/slice.h", "include/grpc++/impl/codegen/status.h", "include/grpc++/impl/codegen/status_code_enum.h", "include/grpc++/impl/codegen/status_helper.h", @@ -8135,7 +8126,6 @@ "include/grpc++/impl/codegen/server_context.h", "include/grpc++/impl/codegen/server_interface.h", "include/grpc++/impl/codegen/service_type.h", - "include/grpc++/impl/codegen/slice.h", "include/grpc++/impl/codegen/status.h", "include/grpc++/impl/codegen/status_code_enum.h", "include/grpc++/impl/codegen/status_helper.h", diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json index c5a308a4c5..2c7b0a6c82 100644 --- a/tools/run_tests/generated/tests.json +++ b/tools/run_tests/generated/tests.json @@ -281,6 +281,28 @@ "flaky": false, "gtest": false, "language": "c", + "name": "chttp2_status_conversion_test", + "platforms": [ + "linux", + "mac", + "posix", + "windows" + ] + }, + { + "args": [], + "ci_platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "cpu_cost": 1.0, + "exclude_configs": [], + "exclude_iomgrs": [], + "flaky": false, + "gtest": false, + "language": "c", "name": "chttp2_stream_map_test", "platforms": [ "linux", @@ -2016,28 +2038,6 @@ "ci_platforms": [ "linux", "mac", - "posix", - "windows" - ], - "cpu_cost": 1.0, - "exclude_configs": [], - "exclude_iomgrs": [], - "flaky": false, - "gtest": false, - "language": "c", - "name": "status_conversion_test", - "platforms": [ - "linux", - "mac", - "posix", - "windows" - ] - }, - { - "args": [], - "ci_platforms": [ - "linux", - "mac", "posix" ], "cpu_cost": 0.5, @@ -39139,6 +39139,9 @@ "asan-trace-cmp", "basicprof", "dbg", + "easan", + "edbg", + "etsan", "gcov", "helgrind", "memcheck", @@ -39173,6 +39176,9 @@ "asan-trace-cmp", "basicprof", "dbg", + "easan", + "edbg", + "etsan", "gcov", "helgrind", "memcheck", @@ -39207,6 +39213,9 @@ "asan-trace-cmp", "basicprof", "dbg", + "easan", + "edbg", + "etsan", "gcov", "helgrind", "memcheck", @@ -39241,6 +39250,9 @@ "asan-trace-cmp", "basicprof", "dbg", + "easan", + "edbg", + "etsan", "gcov", "helgrind", "memcheck", @@ -39275,6 +39287,9 @@ "asan-trace-cmp", "basicprof", "dbg", + "easan", + "edbg", + "etsan", "gcov", "helgrind", "memcheck", @@ -39309,6 +39324,9 @@ "asan-trace-cmp", "basicprof", "dbg", + "easan", + "edbg", + "etsan", "gcov", "helgrind", "memcheck", @@ -39343,6 +39361,9 @@ "asan-trace-cmp", "basicprof", "dbg", + "easan", + "edbg", + "etsan", "gcov", "helgrind", "memcheck", @@ -39377,6 +39398,9 @@ "asan-trace-cmp", "basicprof", "dbg", + "easan", + "edbg", + "etsan", "gcov", "helgrind", "memcheck", @@ -39411,6 +39435,9 @@ "asan-trace-cmp", "basicprof", "dbg", + "easan", + "edbg", + "etsan", "gcov", "helgrind", "memcheck", @@ -39445,6 +39472,9 @@ "asan-trace-cmp", "basicprof", "dbg", + "easan", + "edbg", + "etsan", "gcov", "helgrind", "memcheck", @@ -39479,6 +39509,9 @@ "asan-trace-cmp", "basicprof", "dbg", + "easan", + "edbg", + "etsan", "gcov", "helgrind", "memcheck", @@ -39513,6 +39546,9 @@ "asan-trace-cmp", "basicprof", "dbg", + "easan", + "edbg", + "etsan", "gcov", "helgrind", "memcheck", @@ -39547,6 +39583,9 @@ "asan-trace-cmp", "basicprof", "dbg", + "easan", + "edbg", + "etsan", "gcov", "helgrind", "memcheck", @@ -39581,6 +39620,9 @@ "asan-trace-cmp", "basicprof", "dbg", + "easan", + "edbg", + "etsan", "gcov", "helgrind", "memcheck", @@ -39615,6 +39657,9 @@ "asan-trace-cmp", "basicprof", "dbg", + "easan", + "edbg", + "etsan", "gcov", "helgrind", "memcheck", @@ -39649,6 +39694,9 @@ "asan-trace-cmp", "basicprof", "dbg", + "easan", + "edbg", + "etsan", "gcov", "helgrind", "memcheck", @@ -39683,6 +39731,9 @@ "asan-trace-cmp", "basicprof", "dbg", + "easan", + "edbg", + "etsan", "gcov", "helgrind", "memcheck", @@ -39717,6 +39768,9 @@ "asan-trace-cmp", "basicprof", "dbg", + "easan", + "edbg", + "etsan", "gcov", "helgrind", "memcheck", @@ -39751,6 +39805,9 @@ "asan-trace-cmp", "basicprof", "dbg", + "easan", + "edbg", + "etsan", "gcov", "helgrind", "memcheck", @@ -39785,6 +39842,9 @@ "asan-trace-cmp", "basicprof", "dbg", + "easan", + "edbg", + "etsan", "gcov", "helgrind", "memcheck", @@ -39819,6 +39879,9 @@ "asan-trace-cmp", "basicprof", "dbg", + "easan", + "edbg", + "etsan", "gcov", "helgrind", "memcheck", @@ -39853,6 +39916,9 @@ "asan-trace-cmp", "basicprof", "dbg", + "easan", + "edbg", + "etsan", "gcov", "helgrind", "memcheck", @@ -39887,6 +39953,9 @@ "asan-trace-cmp", "basicprof", "dbg", + "easan", + "edbg", + "etsan", "gcov", "helgrind", "memcheck", @@ -39921,6 +39990,9 @@ "asan-trace-cmp", "basicprof", "dbg", + "easan", + "edbg", + "etsan", "gcov", "helgrind", "memcheck", @@ -39955,6 +40027,9 @@ "asan-trace-cmp", "basicprof", "dbg", + "easan", + "edbg", + "etsan", "gcov", "helgrind", "memcheck", @@ -39989,6 +40064,9 @@ "asan-trace-cmp", "basicprof", "dbg", + "easan", + "edbg", + "etsan", "gcov", "helgrind", "memcheck", @@ -40023,6 +40101,9 @@ "asan-trace-cmp", "basicprof", "dbg", + "easan", + "edbg", + "etsan", "gcov", "helgrind", "memcheck", @@ -40057,6 +40138,9 @@ "asan-trace-cmp", "basicprof", "dbg", + "easan", + "edbg", + "etsan", "gcov", "helgrind", "memcheck", @@ -40091,6 +40175,9 @@ "asan-trace-cmp", "basicprof", "dbg", + "easan", + "edbg", + "etsan", "gcov", "helgrind", "memcheck", @@ -40125,6 +40212,9 @@ "asan-trace-cmp", "basicprof", "dbg", + "easan", + "edbg", + "etsan", "gcov", "helgrind", "memcheck", @@ -40159,6 +40249,9 @@ "asan-trace-cmp", "basicprof", "dbg", + "easan", + "edbg", + "etsan", "gcov", "helgrind", "memcheck", @@ -40193,6 +40286,9 @@ "asan-trace-cmp", "basicprof", "dbg", + "easan", + "edbg", + "etsan", "gcov", "helgrind", "memcheck", @@ -40227,6 +40323,9 @@ "asan-trace-cmp", "basicprof", "dbg", + "easan", + "edbg", + "etsan", "gcov", "helgrind", "memcheck", @@ -40261,6 +40360,9 @@ "asan-trace-cmp", "basicprof", "dbg", + "easan", + "edbg", + "etsan", "gcov", "helgrind", "memcheck", |