diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-06-25 08:58:23 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-06-25 08:58:23 -0700 |
| commit | 4b62811032b12e988ca320e43b41c3bda7834869 (patch) | |
| tree | 0f132ac81de9c90144e67c011a4169531124d1f9 | |
| parent | b7959a0b362daa951a245632ffa4617df4184a87 (diff) | |
| parent | 0bf7e48ade52eec336f50dee4c7d22eeb887bb8e (diff) | |
Merge github.com:grpc/grpc into tis-but-thy-name
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | build.json | 3 | ||||
| -rw-r--r-- | gRPC.podspec | 430 | ||||
| -rw-r--r-- | include/grpc++/impl/call.h | 1 | ||||
| -rw-r--r-- | src/core/iomgr/pollset_windows.c | 6 | ||||
| -rw-r--r-- | src/core/support/histogram.c | 4 | ||||
| -rw-r--r-- | src/core/surface/completion_queue.c | 1 | ||||
| -rw-r--r-- | src/objective-c/GRPCClient/private/GRPCSecureChannel.m | 2 | ||||
| -rw-r--r-- | templates/gRPC.podspec.template | 42 | ||||
| -rw-r--r-- | templates/tools/doxygen/Doxyfile.include | 2 | ||||
| -rw-r--r-- | test/proto/messages.proto | 27 | ||||
| -rw-r--r-- | test/proto/test.proto | 8 | ||||
| -rw-r--r-- | tools/codegen/core/gen_hpack_tables.c (renamed from src/core/transport/chttp2/gen_hpack_tables.c) | 0 | ||||
| -rw-r--r-- | tools/doxygen/Doxyfile.c++ | 38 | ||||
| -rw-r--r-- | tools/doxygen/Doxyfile.c++.internal | 68 | ||||
| -rw-r--r-- | tools/doxygen/Doxyfile.core | 36 | ||||
| -rw-r--r-- | tools/doxygen/Doxyfile.core.internal | 313 | ||||
| -rw-r--r-- | vsprojects/Grpc.mak | 4 |
19 files changed, 952 insertions, 43 deletions
diff --git a/.travis.yml b/.travis.yml index c626242557..97cf99d71e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,7 @@ script: - if [ ! -z "$USE_GCC" ] ; then export CC=gcc-$USE_GCC ; export CXX=g++-$USE_GCC ; fi - ./tools/run_tests/run_tests.py -l $TEST -t -j $JOBS -c $CONFIG -s 4.0 after_success: - - if [ "$CONFIG" = "gcov" ] ; then coveralls --exclude third_party --exclude gens --exclude test --exclude src/compiler -b. --gcov-options '\-p' ; fi + - if [ "$CONFIG" = "gcov" ] ; then coveralls --exclude third_party --exclude gens --exclude test --exclude tools --exclude src/compiler -b. --gcov-options '\-p' ; fi notifications: email: false webhooks: @@ -5710,7 +5710,7 @@ endif GEN_HPACK_TABLES_SRC = \ - src/core/transport/chttp2/gen_hpack_tables.c \ + tools/codegen/core/gen_hpack_tables.c \ GEN_HPACK_TABLES_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GEN_HPACK_TABLES_SRC)))) ifeq ($(NO_SECURE),true) @@ -5721,14 +5721,14 @@ $(BINDIR)/$(CONFIG)/gen_hpack_tables: openssl_dep_error else -$(BINDIR)/$(CONFIG)/gen_hpack_tables: $(GEN_HPACK_TABLES_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc.a +$(BINDIR)/$(CONFIG)/gen_hpack_tables: $(GEN_HPACK_TABLES_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(E) "[LD] Linking $@" $(Q) mkdir -p `dirname $@` - $(Q) $(LD) $(LDFLAGS) $(GEN_HPACK_TABLES_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/gen_hpack_tables + $(Q) $(LD) $(LDFLAGS) $(GEN_HPACK_TABLES_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/gen_hpack_tables endif -$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/gen_hpack_tables.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc.a +$(OBJDIR)/$(CONFIG)/tools/codegen/core/gen_hpack_tables.o: $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc.a deps_gen_hpack_tables: $(GEN_HPACK_TABLES_OBJS:.o=.dep) ifneq ($(NO_SECURE),true) diff --git a/build.json b/build.json index b9fe01134a..cf333e2158 100644 --- a/build.json +++ b/build.json @@ -973,10 +973,9 @@ "build": "tool", "language": "c", "src": [ - "src/core/transport/chttp2/gen_hpack_tables.c" + "tools/codegen/core/gen_hpack_tables.c" ], "deps": [ - "grpc_test_util", "gpr", "grpc" ] diff --git a/gRPC.podspec b/gRPC.podspec index 8532881e33..6574c1fdc7 100644 --- a/gRPC.podspec +++ b/gRPC.podspec @@ -61,8 +61,434 @@ Pod::Spec.new do |s| # Core cross-platform gRPC library, written in C. s.subspec 'C-Core' do |ss| - ss.source_files = 'src/core/support/env.h', 'src/core/support/file.h', 'src/core/support/murmur_hash.h', 'src/core/support/grpc_string.h', 'src/core/support/string_win32.h', 'src/core/support/thd_internal.h', 'grpc/support/alloc.h', 'grpc/support/atm.h', 'grpc/support/atm_gcc_atomic.h', 'grpc/support/atm_gcc_sync.h', 'grpc/support/atm_win32.h', 'grpc/support/cancellable_platform.h', 'grpc/support/cmdline.h', 'grpc/support/cpu.h', 'grpc/support/histogram.h', 'grpc/support/host_port.h', 'grpc/support/log.h', 'grpc/support/log_win32.h', 'grpc/support/port_platform.h', 'grpc/support/slice.h', 'grpc/support/slice_buffer.h', 'grpc/support/string_util.h', 'grpc/support/subprocess.h', 'grpc/support/sync.h', 'grpc/support/sync_generic.h', 'grpc/support/sync_posix.h', 'grpc/support/sync_win32.h', 'grpc/support/thd.h', 'grpc/support/grpc_time.h', 'grpc/support/tls.h', 'grpc/support/tls_gcc.h', 'grpc/support/tls_msvc.h', 'grpc/support/tls_pthread.h', 'grpc/support/useful.h', 'src/core/support/alloc.c', 'src/core/support/cancellable.c', 'src/core/support/cmdline.c', 'src/core/support/cpu_iphone.c', 'src/core/support/cpu_linux.c', 'src/core/support/cpu_posix.c', 'src/core/support/cpu_windows.c', 'src/core/support/env_linux.c', 'src/core/support/env_posix.c', 'src/core/support/env_win32.c', 'src/core/support/file.c', 'src/core/support/file_posix.c', 'src/core/support/file_win32.c', 'src/core/support/histogram.c', 'src/core/support/host_port.c', 'src/core/support/log.c', 'src/core/support/log_android.c', 'src/core/support/log_linux.c', 'src/core/support/log_posix.c', 'src/core/support/log_win32.c', 'src/core/support/murmur_hash.c', 'src/core/support/slice.c', 'src/core/support/slice_buffer.c', 'src/core/support/string.c', 'src/core/support/string_posix.c', 'src/core/support/string_win32.c', 'src/core/support/subprocess_posix.c', 'src/core/support/sync.c', 'src/core/support/sync_posix.c', 'src/core/support/sync_win32.c', 'src/core/support/thd.c', 'src/core/support/thd_posix.c', 'src/core/support/thd_win32.c', 'src/core/support/time.c', 'src/core/support/time_posix.c', 'src/core/support/time_win32.c', 'src/core/support/tls_pthread.c', 'src/core/httpcli/format_request.h', 'src/core/httpcli/httpcli.h', 'src/core/httpcli/httpcli_security_connector.h', 'src/core/httpcli/parser.h', 'src/core/security/auth_filters.h', 'src/core/security/base64.h', 'src/core/security/credentials.h', 'src/core/security/json_token.h', 'src/core/security/secure_endpoint.h', 'src/core/security/secure_transport_setup.h', 'src/core/security/security_connector.h', 'src/core/security/security_context.h', 'src/core/tsi/fake_transport_security.h', 'src/core/tsi/ssl_transport_security.h', 'src/core/tsi/transport_security.h', 'src/core/tsi/transport_security_interface.h', 'src/core/census/grpc_context.h', 'src/core/channel/census_filter.h', 'src/core/channel/channel_args.h', 'src/core/channel/channel_stack.h', 'src/core/channel/client_channel.h', 'src/core/channel/connected_channel.h', 'src/core/channel/context.h', 'src/core/channel/http_client_filter.h', 'src/core/channel/http_server_filter.h', 'src/core/channel/noop_filter.h', 'src/core/client_config/client_config.h', 'src/core/client_config/lb_policies/pick_first.h', 'src/core/client_config/lb_policy.h', 'src/core/client_config/resolver.h', 'src/core/client_config/resolver_factory.h', 'src/core/client_config/resolver_registry.h', 'src/core/client_config/resolvers/dns_resolver.h', 'src/core/client_config/subchannel.h', 'src/core/client_config/subchannel_factory.h', 'src/core/client_config/uri_parser.h', 'src/core/compression/message_compress.h', 'src/core/debug/trace.h', 'src/core/iomgr/alarm.h', 'src/core/iomgr/alarm_heap.h', 'src/core/iomgr/alarm_internal.h', 'src/core/iomgr/endpoint.h', 'src/core/iomgr/endpoint_pair.h', 'src/core/iomgr/fd_posix.h', 'src/core/iomgr/iocp_windows.h', 'src/core/iomgr/iomgr.h', 'src/core/iomgr/iomgr_internal.h', 'src/core/iomgr/iomgr_posix.h', 'src/core/iomgr/pollset.h', 'src/core/iomgr/pollset_kick_posix.h', 'src/core/iomgr/pollset_posix.h', 'src/core/iomgr/pollset_set.h', 'src/core/iomgr/pollset_set_posix.h', 'src/core/iomgr/pollset_set_windows.h', 'src/core/iomgr/pollset_windows.h', 'src/core/iomgr/resolve_address.h', 'src/core/iomgr/sockaddr.h', 'src/core/iomgr/sockaddr_posix.h', 'src/core/iomgr/sockaddr_utils.h', 'src/core/iomgr/sockaddr_win32.h', 'src/core/iomgr/socket_utils_posix.h', 'src/core/iomgr/socket_windows.h', 'src/core/iomgr/tcp_client.h', 'src/core/iomgr/tcp_posix.h', 'src/core/iomgr/tcp_server.h', 'src/core/iomgr/tcp_windows.h', 'src/core/iomgr/time_averaged_stats.h', 'src/core/iomgr/wakeup_fd_pipe.h', 'src/core/iomgr/wakeup_fd_posix.h', 'src/core/json/json.h', 'src/core/json/json_common.h', 'src/core/json/json_reader.h', 'src/core/json/json_writer.h', 'src/core/profiling/timers.h', 'src/core/profiling/timers_preciseclock.h', 'src/core/surface/byte_buffer_queue.h', 'src/core/surface/call.h', 'src/core/surface/channel.h', 'src/core/surface/client.h', 'src/core/surface/completion_queue.h', 'src/core/surface/event_string.h', 'src/core/surface/init.h', 'src/core/surface/server.h', 'src/core/surface/surface_trace.h', 'src/core/transport/chttp2/alpn.h', 'src/core/transport/chttp2/bin_encoder.h', 'src/core/transport/chttp2/frame.h', 'src/core/transport/chttp2/frame_data.h', 'src/core/transport/chttp2/frame_goaway.h', 'src/core/transport/chttp2/frame_ping.h', 'src/core/transport/chttp2/frame_rst_stream.h', 'src/core/transport/chttp2/frame_settings.h', 'src/core/transport/chttp2/frame_window_update.h', 'src/core/transport/chttp2/hpack_parser.h', 'src/core/transport/chttp2/hpack_table.h', 'src/core/transport/chttp2/http2_errors.h', 'src/core/transport/chttp2/huffsyms.h', 'src/core/transport/chttp2/status_conversion.h', 'src/core/transport/chttp2/stream_encoder.h', 'src/core/transport/chttp2/stream_map.h', 'src/core/transport/chttp2/timeout_encoding.h', 'src/core/transport/chttp2/varint.h', 'src/core/transport/chttp2_transport.h', 'src/core/transport/metadata.h', 'src/core/transport/stream_op.h', 'src/core/transport/transport.h', 'src/core/transport/transport_impl.h', 'src/core/census/context.h', 'grpc/grpc_security.h', 'grpc/byte_buffer.h', 'grpc/byte_buffer_reader.h', 'grpc/compression.h', 'grpc/grpc.h', 'grpc/status.h', 'grpc/census.h', 'src/core/httpcli/format_request.c', 'src/core/httpcli/httpcli.c', 'src/core/httpcli/httpcli_security_connector.c', 'src/core/httpcli/parser.c', 'src/core/security/base64.c', 'src/core/security/client_auth_filter.c', 'src/core/security/credentials.c', 'src/core/security/credentials_metadata.c', 'src/core/security/credentials_posix.c', 'src/core/security/credentials_win32.c', 'src/core/security/google_default_credentials.c', 'src/core/security/json_token.c', 'src/core/security/secure_endpoint.c', 'src/core/security/secure_transport_setup.c', 'src/core/security/security_connector.c', 'src/core/security/security_context.c', 'src/core/security/server_auth_filter.c', 'src/core/security/server_secure_chttp2.c', 'src/core/surface/init_secure.c', 'src/core/surface/secure_channel_create.c', 'src/core/tsi/fake_transport_security.c', 'src/core/tsi/ssl_transport_security.c', 'src/core/tsi/transport_security.c', 'src/core/census/grpc_context.c', 'src/core/channel/channel_args.c', 'src/core/channel/channel_stack.c', 'src/core/channel/client_channel.c', 'src/core/channel/connected_channel.c', 'src/core/channel/http_client_filter.c', 'src/core/channel/http_server_filter.c', 'src/core/channel/noop_filter.c', 'src/core/client_config/client_config.c', 'src/core/client_config/lb_policies/pick_first.c', 'src/core/client_config/lb_policy.c', 'src/core/client_config/resolver.c', 'src/core/client_config/resolver_factory.c', 'src/core/client_config/resolver_registry.c', 'src/core/client_config/resolvers/dns_resolver.c', 'src/core/client_config/subchannel.c', 'src/core/client_config/subchannel_factory.c', 'src/core/client_config/uri_parser.c', 'src/core/compression/algorithm.c', 'src/core/compression/message_compress.c', 'src/core/debug/trace.c', 'src/core/iomgr/alarm.c', 'src/core/iomgr/alarm_heap.c', 'src/core/iomgr/endpoint.c', 'src/core/iomgr/endpoint_pair_posix.c', 'src/core/iomgr/endpoint_pair_windows.c', 'src/core/iomgr/fd_posix.c', 'src/core/iomgr/iocp_windows.c', 'src/core/iomgr/iomgr.c', 'src/core/iomgr/iomgr_posix.c', 'src/core/iomgr/iomgr_windows.c', 'src/core/iomgr/pollset_kick_posix.c', 'src/core/iomgr/pollset_multipoller_with_epoll.c', 'src/core/iomgr/pollset_multipoller_with_poll_posix.c', 'src/core/iomgr/pollset_posix.c', 'src/core/iomgr/pollset_set_posix.c', 'src/core/iomgr/pollset_set_windows.c', 'src/core/iomgr/pollset_windows.c', 'src/core/iomgr/resolve_address_posix.c', 'src/core/iomgr/resolve_address_windows.c', 'src/core/iomgr/sockaddr_utils.c', 'src/core/iomgr/socket_utils_common_posix.c', 'src/core/iomgr/socket_utils_linux.c', 'src/core/iomgr/socket_utils_posix.c', 'src/core/iomgr/socket_windows.c', 'src/core/iomgr/tcp_client_posix.c', 'src/core/iomgr/tcp_client_windows.c', 'src/core/iomgr/tcp_posix.c', 'src/core/iomgr/tcp_server_posix.c', 'src/core/iomgr/tcp_server_windows.c', 'src/core/iomgr/tcp_windows.c', 'src/core/iomgr/time_averaged_stats.c', 'src/core/iomgr/wakeup_fd_eventfd.c', 'src/core/iomgr/wakeup_fd_nospecial.c', 'src/core/iomgr/wakeup_fd_pipe.c', 'src/core/iomgr/wakeup_fd_posix.c', 'src/core/json/json.c', 'src/core/json/json_reader.c', 'src/core/json/json_string.c', 'src/core/json/json_writer.c', 'src/core/profiling/basic_timers.c', 'src/core/profiling/stap_timers.c', 'src/core/surface/byte_buffer.c', 'src/core/surface/byte_buffer_queue.c', 'src/core/surface/byte_buffer_reader.c', 'src/core/surface/call.c', 'src/core/surface/call_details.c', 'src/core/surface/call_log_batch.c', 'src/core/surface/channel.c', 'src/core/surface/channel_create.c', 'src/core/surface/client.c', 'src/core/surface/completion_queue.c', 'src/core/surface/event_string.c', 'src/core/surface/init.c', 'src/core/surface/lame_client.c', 'src/core/surface/metadata_array.c', 'src/core/surface/server.c', 'src/core/surface/server_chttp2.c', 'src/core/surface/server_create.c', 'src/core/surface/surface_trace.c', 'src/core/transport/chttp2/alpn.c', 'src/core/transport/chttp2/bin_encoder.c', 'src/core/transport/chttp2/frame_data.c', 'src/core/transport/chttp2/frame_goaway.c', 'src/core/transport/chttp2/frame_ping.c', 'src/core/transport/chttp2/frame_rst_stream.c', 'src/core/transport/chttp2/frame_settings.c', 'src/core/transport/chttp2/frame_window_update.c', 'src/core/transport/chttp2/hpack_parser.c', 'src/core/transport/chttp2/hpack_table.c', 'src/core/transport/chttp2/huffsyms.c', 'src/core/transport/chttp2/status_conversion.c', 'src/core/transport/chttp2/stream_encoder.c', 'src/core/transport/chttp2/stream_map.c', 'src/core/transport/chttp2/timeout_encoding.c', 'src/core/transport/chttp2/varint.c', 'src/core/transport/chttp2_transport.c', 'src/core/transport/metadata.c', 'src/core/transport/stream_op.c', 'src/core/transport/transport.c', 'src/core/transport/transport_op_string.c', 'src/core/census/context.c', 'src/core/census/initialize.c', - ss.private_header_files = 'src/core/support/env.h', 'src/core/support/file.h', 'src/core/support/murmur_hash.h', 'src/core/support/string.h', 'src/core/support/string_win32.h', 'src/core/support/thd_internal.h', 'src/core/httpcli/format_request.h', 'src/core/httpcli/httpcli.h', 'src/core/httpcli/httpcli_security_connector.h', 'src/core/httpcli/parser.h', 'src/core/security/auth_filters.h', 'src/core/security/base64.h', 'src/core/security/credentials.h', 'src/core/security/json_token.h', 'src/core/security/secure_endpoint.h', 'src/core/security/secure_transport_setup.h', 'src/core/security/security_connector.h', 'src/core/security/security_context.h', 'src/core/tsi/fake_transport_security.h', 'src/core/tsi/ssl_transport_security.h', 'src/core/tsi/transport_security.h', 'src/core/tsi/transport_security_interface.h', 'src/core/census/grpc_context.h', 'src/core/channel/census_filter.h', 'src/core/channel/channel_args.h', 'src/core/channel/channel_stack.h', 'src/core/channel/client_channel.h', 'src/core/channel/connected_channel.h', 'src/core/channel/context.h', 'src/core/channel/http_client_filter.h', 'src/core/channel/http_server_filter.h', 'src/core/channel/noop_filter.h', 'src/core/client_config/client_config.h', 'src/core/client_config/lb_policies/pick_first.h', 'src/core/client_config/lb_policy.h', 'src/core/client_config/resolver.h', 'src/core/client_config/resolver_factory.h', 'src/core/client_config/resolver_registry.h', 'src/core/client_config/resolvers/dns_resolver.h', 'src/core/client_config/subchannel.h', 'src/core/client_config/subchannel_factory.h', 'src/core/client_config/uri_parser.h', 'src/core/compression/message_compress.h', 'src/core/debug/trace.h', 'src/core/iomgr/alarm.h', 'src/core/iomgr/alarm_heap.h', 'src/core/iomgr/alarm_internal.h', 'src/core/iomgr/endpoint.h', 'src/core/iomgr/endpoint_pair.h', 'src/core/iomgr/fd_posix.h', 'src/core/iomgr/iocp_windows.h', 'src/core/iomgr/iomgr.h', 'src/core/iomgr/iomgr_internal.h', 'src/core/iomgr/iomgr_posix.h', 'src/core/iomgr/pollset.h', 'src/core/iomgr/pollset_kick_posix.h', 'src/core/iomgr/pollset_posix.h', 'src/core/iomgr/pollset_set.h', 'src/core/iomgr/pollset_set_posix.h', 'src/core/iomgr/pollset_set_windows.h', 'src/core/iomgr/pollset_windows.h', 'src/core/iomgr/resolve_address.h', 'src/core/iomgr/sockaddr.h', 'src/core/iomgr/sockaddr_posix.h', 'src/core/iomgr/sockaddr_utils.h', 'src/core/iomgr/sockaddr_win32.h', 'src/core/iomgr/socket_utils_posix.h', 'src/core/iomgr/socket_windows.h', 'src/core/iomgr/tcp_client.h', 'src/core/iomgr/tcp_posix.h', 'src/core/iomgr/tcp_server.h', 'src/core/iomgr/tcp_windows.h', 'src/core/iomgr/time_averaged_stats.h', 'src/core/iomgr/wakeup_fd_pipe.h', 'src/core/iomgr/wakeup_fd_posix.h', 'src/core/json/json.h', 'src/core/json/json_common.h', 'src/core/json/json_reader.h', 'src/core/json/json_writer.h', 'src/core/profiling/timers.h', 'src/core/profiling/timers_preciseclock.h', 'src/core/surface/byte_buffer_queue.h', 'src/core/surface/call.h', 'src/core/surface/channel.h', 'src/core/surface/client.h', 'src/core/surface/completion_queue.h', 'src/core/surface/event_string.h', 'src/core/surface/init.h', 'src/core/surface/server.h', 'src/core/surface/surface_trace.h', 'src/core/transport/chttp2/alpn.h', 'src/core/transport/chttp2/bin_encoder.h', 'src/core/transport/chttp2/frame.h', 'src/core/transport/chttp2/frame_data.h', 'src/core/transport/chttp2/frame_goaway.h', 'src/core/transport/chttp2/frame_ping.h', 'src/core/transport/chttp2/frame_rst_stream.h', 'src/core/transport/chttp2/frame_settings.h', 'src/core/transport/chttp2/frame_window_update.h', 'src/core/transport/chttp2/hpack_parser.h', 'src/core/transport/chttp2/hpack_table.h', 'src/core/transport/chttp2/http2_errors.h', 'src/core/transport/chttp2/huffsyms.h', 'src/core/transport/chttp2/status_conversion.h', 'src/core/transport/chttp2/stream_encoder.h', 'src/core/transport/chttp2/stream_map.h', 'src/core/transport/chttp2/timeout_encoding.h', 'src/core/transport/chttp2/varint.h', 'src/core/transport/chttp2_transport.h', 'src/core/transport/metadata.h', 'src/core/transport/stream_op.h', 'src/core/transport/transport.h', 'src/core/transport/transport_impl.h', 'src/core/census/context.h', + ss.source_files = 'src/core/support/env.h', + 'src/core/support/file.h', + 'src/core/support/murmur_hash.h', + 'src/core/support/grpc_string.h', + 'src/core/support/string_win32.h', + 'src/core/support/thd_internal.h', + 'grpc/support/alloc.h', + 'grpc/support/atm.h', + 'grpc/support/atm_gcc_atomic.h', + 'grpc/support/atm_gcc_sync.h', + 'grpc/support/atm_win32.h', + 'grpc/support/cancellable_platform.h', + 'grpc/support/cmdline.h', + 'grpc/support/cpu.h', + 'grpc/support/histogram.h', + 'grpc/support/host_port.h', + 'grpc/support/log.h', + 'grpc/support/log_win32.h', + 'grpc/support/port_platform.h', + 'grpc/support/slice.h', + 'grpc/support/slice_buffer.h', + 'grpc/support/string_util.h', + 'grpc/support/subprocess.h', + 'grpc/support/sync.h', + 'grpc/support/sync_generic.h', + 'grpc/support/sync_posix.h', + 'grpc/support/sync_win32.h', + 'grpc/support/thd.h', + 'grpc/support/grpc_time.h', + 'grpc/support/tls.h', + 'grpc/support/tls_gcc.h', + 'grpc/support/tls_msvc.h', + 'grpc/support/tls_pthread.h', + 'grpc/support/useful.h', + 'src/core/support/alloc.c', + 'src/core/support/cancellable.c', + 'src/core/support/cmdline.c', + 'src/core/support/cpu_iphone.c', + 'src/core/support/cpu_linux.c', + 'src/core/support/cpu_posix.c', + 'src/core/support/cpu_windows.c', + 'src/core/support/env_linux.c', + 'src/core/support/env_posix.c', + 'src/core/support/env_win32.c', + 'src/core/support/file.c', + 'src/core/support/file_posix.c', + 'src/core/support/file_win32.c', + 'src/core/support/histogram.c', + 'src/core/support/host_port.c', + 'src/core/support/log.c', + 'src/core/support/log_android.c', + 'src/core/support/log_linux.c', + 'src/core/support/log_posix.c', + 'src/core/support/log_win32.c', + 'src/core/support/murmur_hash.c', + 'src/core/support/slice.c', + 'src/core/support/slice_buffer.c', + 'src/core/support/string.c', + 'src/core/support/string_posix.c', + 'src/core/support/string_win32.c', + 'src/core/support/subprocess_posix.c', + 'src/core/support/sync.c', + 'src/core/support/sync_posix.c', + 'src/core/support/sync_win32.c', + 'src/core/support/thd.c', + 'src/core/support/thd_posix.c', + 'src/core/support/thd_win32.c', + 'src/core/support/time.c', + 'src/core/support/time_posix.c', + 'src/core/support/time_win32.c', + 'src/core/support/tls_pthread.c', + 'src/core/httpcli/format_request.h', + 'src/core/httpcli/httpcli.h', + 'src/core/httpcli/httpcli_security_connector.h', + 'src/core/httpcli/parser.h', + 'src/core/security/auth_filters.h', + 'src/core/security/base64.h', + 'src/core/security/credentials.h', + 'src/core/security/json_token.h', + 'src/core/security/secure_endpoint.h', + 'src/core/security/secure_transport_setup.h', + 'src/core/security/security_connector.h', + 'src/core/security/security_context.h', + 'src/core/tsi/fake_transport_security.h', + 'src/core/tsi/ssl_transport_security.h', + 'src/core/tsi/transport_security.h', + 'src/core/tsi/transport_security_interface.h', + 'src/core/census/grpc_context.h', + 'src/core/channel/census_filter.h', + 'src/core/channel/channel_args.h', + 'src/core/channel/channel_stack.h', + 'src/core/channel/client_channel.h', + 'src/core/channel/connected_channel.h', + 'src/core/channel/context.h', + 'src/core/channel/http_client_filter.h', + 'src/core/channel/http_server_filter.h', + 'src/core/channel/noop_filter.h', + 'src/core/client_config/client_config.h', + 'src/core/client_config/lb_policies/pick_first.h', + 'src/core/client_config/lb_policy.h', + 'src/core/client_config/resolver.h', + 'src/core/client_config/resolver_factory.h', + 'src/core/client_config/resolver_registry.h', + 'src/core/client_config/resolvers/dns_resolver.h', + 'src/core/client_config/subchannel.h', + 'src/core/client_config/subchannel_factory.h', + 'src/core/client_config/uri_parser.h', + 'src/core/compression/message_compress.h', + 'src/core/debug/trace.h', + 'src/core/iomgr/alarm.h', + 'src/core/iomgr/alarm_heap.h', + 'src/core/iomgr/alarm_internal.h', + 'src/core/iomgr/endpoint.h', + 'src/core/iomgr/endpoint_pair.h', + 'src/core/iomgr/fd_posix.h', + 'src/core/iomgr/iocp_windows.h', + 'src/core/iomgr/iomgr.h', + 'src/core/iomgr/iomgr_internal.h', + 'src/core/iomgr/iomgr_posix.h', + 'src/core/iomgr/pollset.h', + 'src/core/iomgr/pollset_kick_posix.h', + 'src/core/iomgr/pollset_posix.h', + 'src/core/iomgr/pollset_set.h', + 'src/core/iomgr/pollset_set_posix.h', + 'src/core/iomgr/pollset_set_windows.h', + 'src/core/iomgr/pollset_windows.h', + 'src/core/iomgr/resolve_address.h', + 'src/core/iomgr/sockaddr.h', + 'src/core/iomgr/sockaddr_posix.h', + 'src/core/iomgr/sockaddr_utils.h', + 'src/core/iomgr/sockaddr_win32.h', + 'src/core/iomgr/socket_utils_posix.h', + 'src/core/iomgr/socket_windows.h', + 'src/core/iomgr/tcp_client.h', + 'src/core/iomgr/tcp_posix.h', + 'src/core/iomgr/tcp_server.h', + 'src/core/iomgr/tcp_windows.h', + 'src/core/iomgr/time_averaged_stats.h', + 'src/core/iomgr/wakeup_fd_pipe.h', + 'src/core/iomgr/wakeup_fd_posix.h', + 'src/core/json/json.h', + 'src/core/json/json_common.h', + 'src/core/json/json_reader.h', + 'src/core/json/json_writer.h', + 'src/core/profiling/timers.h', + 'src/core/profiling/timers_preciseclock.h', + 'src/core/surface/byte_buffer_queue.h', + 'src/core/surface/call.h', + 'src/core/surface/channel.h', + 'src/core/surface/client.h', + 'src/core/surface/completion_queue.h', + 'src/core/surface/event_string.h', + 'src/core/surface/init.h', + 'src/core/surface/server.h', + 'src/core/surface/surface_trace.h', + 'src/core/transport/chttp2/alpn.h', + 'src/core/transport/chttp2/bin_encoder.h', + 'src/core/transport/chttp2/frame.h', + 'src/core/transport/chttp2/frame_data.h', + 'src/core/transport/chttp2/frame_goaway.h', + 'src/core/transport/chttp2/frame_ping.h', + 'src/core/transport/chttp2/frame_rst_stream.h', + 'src/core/transport/chttp2/frame_settings.h', + 'src/core/transport/chttp2/frame_window_update.h', + 'src/core/transport/chttp2/hpack_parser.h', + 'src/core/transport/chttp2/hpack_table.h', + 'src/core/transport/chttp2/http2_errors.h', + 'src/core/transport/chttp2/huffsyms.h', + 'src/core/transport/chttp2/status_conversion.h', + 'src/core/transport/chttp2/stream_encoder.h', + 'src/core/transport/chttp2/stream_map.h', + 'src/core/transport/chttp2/timeout_encoding.h', + 'src/core/transport/chttp2/varint.h', + 'src/core/transport/chttp2_transport.h', + 'src/core/transport/metadata.h', + 'src/core/transport/stream_op.h', + 'src/core/transport/transport.h', + 'src/core/transport/transport_impl.h', + 'src/core/census/context.h', + 'grpc/grpc_security.h', + 'grpc/byte_buffer.h', + 'grpc/byte_buffer_reader.h', + 'grpc/compression.h', + 'grpc/grpc.h', + 'grpc/status.h', + 'grpc/census.h', + 'src/core/httpcli/format_request.c', + 'src/core/httpcli/httpcli.c', + 'src/core/httpcli/httpcli_security_connector.c', + 'src/core/httpcli/parser.c', + 'src/core/security/base64.c', + 'src/core/security/client_auth_filter.c', + 'src/core/security/credentials.c', + 'src/core/security/credentials_metadata.c', + 'src/core/security/credentials_posix.c', + 'src/core/security/credentials_win32.c', + 'src/core/security/google_default_credentials.c', + 'src/core/security/json_token.c', + 'src/core/security/secure_endpoint.c', + 'src/core/security/secure_transport_setup.c', + 'src/core/security/security_connector.c', + 'src/core/security/security_context.c', + 'src/core/security/server_auth_filter.c', + 'src/core/security/server_secure_chttp2.c', + 'src/core/surface/init_secure.c', + 'src/core/surface/secure_channel_create.c', + 'src/core/tsi/fake_transport_security.c', + 'src/core/tsi/ssl_transport_security.c', + 'src/core/tsi/transport_security.c', + 'src/core/census/grpc_context.c', + 'src/core/channel/channel_args.c', + 'src/core/channel/channel_stack.c', + 'src/core/channel/client_channel.c', + 'src/core/channel/connected_channel.c', + 'src/core/channel/http_client_filter.c', + 'src/core/channel/http_server_filter.c', + 'src/core/channel/noop_filter.c', + 'src/core/client_config/client_config.c', + 'src/core/client_config/lb_policies/pick_first.c', + 'src/core/client_config/lb_policy.c', + 'src/core/client_config/resolver.c', + 'src/core/client_config/resolver_factory.c', + 'src/core/client_config/resolver_registry.c', + 'src/core/client_config/resolvers/dns_resolver.c', + 'src/core/client_config/subchannel.c', + 'src/core/client_config/subchannel_factory.c', + 'src/core/client_config/uri_parser.c', + 'src/core/compression/algorithm.c', + 'src/core/compression/message_compress.c', + 'src/core/debug/trace.c', + 'src/core/iomgr/alarm.c', + 'src/core/iomgr/alarm_heap.c', + 'src/core/iomgr/endpoint.c', + 'src/core/iomgr/endpoint_pair_posix.c', + 'src/core/iomgr/endpoint_pair_windows.c', + 'src/core/iomgr/fd_posix.c', + 'src/core/iomgr/iocp_windows.c', + 'src/core/iomgr/iomgr.c', + 'src/core/iomgr/iomgr_posix.c', + 'src/core/iomgr/iomgr_windows.c', + 'src/core/iomgr/pollset_kick_posix.c', + 'src/core/iomgr/pollset_multipoller_with_epoll.c', + 'src/core/iomgr/pollset_multipoller_with_poll_posix.c', + 'src/core/iomgr/pollset_posix.c', + 'src/core/iomgr/pollset_set_posix.c', + 'src/core/iomgr/pollset_set_windows.c', + 'src/core/iomgr/pollset_windows.c', + 'src/core/iomgr/resolve_address_posix.c', + 'src/core/iomgr/resolve_address_windows.c', + 'src/core/iomgr/sockaddr_utils.c', + 'src/core/iomgr/socket_utils_common_posix.c', + 'src/core/iomgr/socket_utils_linux.c', + 'src/core/iomgr/socket_utils_posix.c', + 'src/core/iomgr/socket_windows.c', + 'src/core/iomgr/tcp_client_posix.c', + 'src/core/iomgr/tcp_client_windows.c', + 'src/core/iomgr/tcp_posix.c', + 'src/core/iomgr/tcp_server_posix.c', + 'src/core/iomgr/tcp_server_windows.c', + 'src/core/iomgr/tcp_windows.c', + 'src/core/iomgr/time_averaged_stats.c', + 'src/core/iomgr/wakeup_fd_eventfd.c', + 'src/core/iomgr/wakeup_fd_nospecial.c', + 'src/core/iomgr/wakeup_fd_pipe.c', + 'src/core/iomgr/wakeup_fd_posix.c', + 'src/core/json/json.c', + 'src/core/json/json_reader.c', + 'src/core/json/json_string.c', + 'src/core/json/json_writer.c', + 'src/core/profiling/basic_timers.c', + 'src/core/profiling/stap_timers.c', + 'src/core/surface/byte_buffer.c', + 'src/core/surface/byte_buffer_queue.c', + 'src/core/surface/byte_buffer_reader.c', + 'src/core/surface/call.c', + 'src/core/surface/call_details.c', + 'src/core/surface/call_log_batch.c', + 'src/core/surface/channel.c', + 'src/core/surface/channel_create.c', + 'src/core/surface/client.c', + 'src/core/surface/completion_queue.c', + 'src/core/surface/event_string.c', + 'src/core/surface/init.c', + 'src/core/surface/lame_client.c', + 'src/core/surface/metadata_array.c', + 'src/core/surface/server.c', + 'src/core/surface/server_chttp2.c', + 'src/core/surface/server_create.c', + 'src/core/surface/surface_trace.c', + 'src/core/transport/chttp2/alpn.c', + 'src/core/transport/chttp2/bin_encoder.c', + 'src/core/transport/chttp2/frame_data.c', + 'src/core/transport/chttp2/frame_goaway.c', + 'src/core/transport/chttp2/frame_ping.c', + 'src/core/transport/chttp2/frame_rst_stream.c', + 'src/core/transport/chttp2/frame_settings.c', + 'src/core/transport/chttp2/frame_window_update.c', + 'src/core/transport/chttp2/hpack_parser.c', + 'src/core/transport/chttp2/hpack_table.c', + 'src/core/transport/chttp2/huffsyms.c', + 'src/core/transport/chttp2/status_conversion.c', + 'src/core/transport/chttp2/stream_encoder.c', + 'src/core/transport/chttp2/stream_map.c', + 'src/core/transport/chttp2/timeout_encoding.c', + 'src/core/transport/chttp2/varint.c', + 'src/core/transport/chttp2_transport.c', + 'src/core/transport/metadata.c', + 'src/core/transport/stream_op.c', + 'src/core/transport/transport.c', + 'src/core/transport/transport_op_string.c', + 'src/core/census/context.c', + 'src/core/census/initialize.c' + + ss.private_header_files = 'src/core/support/env.h', + 'src/core/support/file.h', + 'src/core/support/murmur_hash.h', + 'src/core/support/string.h', + 'src/core/support/string_win32.h', + 'src/core/support/thd_internal.h', + 'src/core/httpcli/format_request.h', + 'src/core/httpcli/httpcli.h', + 'src/core/httpcli/httpcli_security_connector.h', + 'src/core/httpcli/parser.h', + 'src/core/security/auth_filters.h', + 'src/core/security/base64.h', + 'src/core/security/credentials.h', + 'src/core/security/json_token.h', + 'src/core/security/secure_endpoint.h', + 'src/core/security/secure_transport_setup.h', + 'src/core/security/security_connector.h', + 'src/core/security/security_context.h', + 'src/core/tsi/fake_transport_security.h', + 'src/core/tsi/ssl_transport_security.h', + 'src/core/tsi/transport_security.h', + 'src/core/tsi/transport_security_interface.h', + 'src/core/census/grpc_context.h', + 'src/core/channel/census_filter.h', + 'src/core/channel/channel_args.h', + 'src/core/channel/channel_stack.h', + 'src/core/channel/client_channel.h', + 'src/core/channel/connected_channel.h', + 'src/core/channel/context.h', + 'src/core/channel/http_client_filter.h', + 'src/core/channel/http_server_filter.h', + 'src/core/channel/noop_filter.h', + 'src/core/client_config/client_config.h', + 'src/core/client_config/lb_policies/pick_first.h', + 'src/core/client_config/lb_policy.h', + 'src/core/client_config/resolver.h', + 'src/core/client_config/resolver_factory.h', + 'src/core/client_config/resolver_registry.h', + 'src/core/client_config/resolvers/dns_resolver.h', + 'src/core/client_config/subchannel.h', + 'src/core/client_config/subchannel_factory.h', + 'src/core/client_config/uri_parser.h', + 'src/core/compression/message_compress.h', + 'src/core/debug/trace.h', + 'src/core/iomgr/alarm.h', + 'src/core/iomgr/alarm_heap.h', + 'src/core/iomgr/alarm_internal.h', + 'src/core/iomgr/endpoint.h', + 'src/core/iomgr/endpoint_pair.h', + 'src/core/iomgr/fd_posix.h', + 'src/core/iomgr/iocp_windows.h', + 'src/core/iomgr/iomgr.h', + 'src/core/iomgr/iomgr_internal.h', + 'src/core/iomgr/iomgr_posix.h', + 'src/core/iomgr/pollset.h', + 'src/core/iomgr/pollset_kick_posix.h', + 'src/core/iomgr/pollset_posix.h', + 'src/core/iomgr/pollset_set.h', + 'src/core/iomgr/pollset_set_posix.h', + 'src/core/iomgr/pollset_set_windows.h', + 'src/core/iomgr/pollset_windows.h', + 'src/core/iomgr/resolve_address.h', + 'src/core/iomgr/sockaddr.h', + 'src/core/iomgr/sockaddr_posix.h', + 'src/core/iomgr/sockaddr_utils.h', + 'src/core/iomgr/sockaddr_win32.h', + 'src/core/iomgr/socket_utils_posix.h', + 'src/core/iomgr/socket_windows.h', + 'src/core/iomgr/tcp_client.h', + 'src/core/iomgr/tcp_posix.h', + 'src/core/iomgr/tcp_server.h', + 'src/core/iomgr/tcp_windows.h', + 'src/core/iomgr/time_averaged_stats.h', + 'src/core/iomgr/wakeup_fd_pipe.h', + 'src/core/iomgr/wakeup_fd_posix.h', + 'src/core/json/json.h', + 'src/core/json/json_common.h', + 'src/core/json/json_reader.h', + 'src/core/json/json_writer.h', + 'src/core/profiling/timers.h', + 'src/core/profiling/timers_preciseclock.h', + 'src/core/surface/byte_buffer_queue.h', + 'src/core/surface/call.h', + 'src/core/surface/channel.h', + 'src/core/surface/client.h', + 'src/core/surface/completion_queue.h', + 'src/core/surface/event_string.h', + 'src/core/surface/init.h', + 'src/core/surface/server.h', + 'src/core/surface/surface_trace.h', + 'src/core/transport/chttp2/alpn.h', + 'src/core/transport/chttp2/bin_encoder.h', + 'src/core/transport/chttp2/frame.h', + 'src/core/transport/chttp2/frame_data.h', + 'src/core/transport/chttp2/frame_goaway.h', + 'src/core/transport/chttp2/frame_ping.h', + 'src/core/transport/chttp2/frame_rst_stream.h', + 'src/core/transport/chttp2/frame_settings.h', + 'src/core/transport/chttp2/frame_window_update.h', + 'src/core/transport/chttp2/hpack_parser.h', + 'src/core/transport/chttp2/hpack_table.h', + 'src/core/transport/chttp2/http2_errors.h', + 'src/core/transport/chttp2/huffsyms.h', + 'src/core/transport/chttp2/status_conversion.h', + 'src/core/transport/chttp2/stream_encoder.h', + 'src/core/transport/chttp2/stream_map.h', + 'src/core/transport/chttp2/timeout_encoding.h', + 'src/core/transport/chttp2/varint.h', + 'src/core/transport/chttp2_transport.h', + 'src/core/transport/metadata.h', + 'src/core/transport/stream_op.h', + 'src/core/transport/transport.h', + 'src/core/transport/transport_impl.h', + 'src/core/census/context.h' + ss.header_mappings_dir = '.' ss.requires_arc = false diff --git a/include/grpc++/impl/call.h b/include/grpc++/impl/call.h index 33e66816f5..64fa5d6efb 100644 --- a/include/grpc++/impl/call.h +++ b/include/grpc++/impl/call.h @@ -41,6 +41,7 @@ #include <grpc++/status.h> #include <grpc++/impl/serialization_traits.h> +#include <functional> #include <memory> #include <map> diff --git a/src/core/iomgr/pollset_windows.c b/src/core/iomgr/pollset_windows.c index d0507af960..926ee8fdd9 100644 --- a/src/core/iomgr/pollset_windows.c +++ b/src/core/iomgr/pollset_windows.c @@ -39,6 +39,7 @@ #include "src/core/iomgr/alarm_internal.h" #include "src/core/iomgr/iomgr_internal.h" +#include "src/core/iomgr/pollset.h" #include "src/core/iomgr/pollset_windows.h" /* There isn't really any such thing as a pollset under Windows, due to the @@ -54,6 +55,7 @@ void grpc_pollset_init(grpc_pollset *pollset) { void grpc_pollset_shutdown(grpc_pollset *pollset, void (*shutdown_done)(void *arg), void *shutdown_done_arg) { + grpc_pollset_kick(pollset); shutdown_done(shutdown_done_arg); } @@ -68,10 +70,10 @@ int grpc_pollset_work(grpc_pollset *pollset, gpr_timespec deadline) { if (gpr_time_cmp(now, deadline) > 0) { return 0 /* GPR_FALSE */; } - if (grpc_maybe_call_delayed_callbacks(NULL, 1 /* GPR_TRUE */)) { + if (grpc_maybe_call_delayed_callbacks(&pollset->mu, 1 /* GPR_TRUE */)) { return 1 /* GPR_TRUE */; } - if (grpc_alarm_check(NULL, now, &deadline)) { + if (grpc_alarm_check(&pollset->mu, now, &deadline)) { return 1 /* GPR_TRUE */; } gpr_cv_wait(&pollset->cv, &pollset->mu, deadline); diff --git a/src/core/support/histogram.c b/src/core/support/histogram.c index 2f1adcf511..9029703891 100644 --- a/src/core/support/histogram.c +++ b/src/core/support/histogram.c @@ -164,7 +164,9 @@ static double threshold_for_count_below(gpr_histogram *h, double count_below) { size_t lower_idx; size_t upper_idx; - GPR_ASSERT(h->count >= 1); + if (h->count == 0) { + return 0.0; + } if (count_below <= 0) { return h->min_seen; diff --git a/src/core/surface/completion_queue.c b/src/core/surface/completion_queue.c index bd0fabf9da..063a23cfb1 100644 --- a/src/core/surface/completion_queue.c +++ b/src/core/surface/completion_queue.c @@ -208,6 +208,7 @@ grpc_event grpc_completion_queue_next(grpc_completion_queue *cc, } if (cc->shutdown) { ev = create_shutdown_event(); + grpc_pollset_kick(&cc->pollset); break; } if (!grpc_pollset_work(&cc->pollset, deadline)) { diff --git a/src/objective-c/GRPCClient/private/GRPCSecureChannel.m b/src/objective-c/GRPCClient/private/GRPCSecureChannel.m index 2cbc6e0f83..0f6eece885 100644 --- a/src/objective-c/GRPCClient/private/GRPCSecureChannel.m +++ b/src/objective-c/GRPCClient/private/GRPCSecureChannel.m @@ -38,7 +38,7 @@ @implementation GRPCSecureChannel - (instancetype)initWithHost:(NSString *)host { - static const grpc_credentials *kCredentials; + static grpc_credentials *kCredentials; static dispatch_once_t loading; dispatch_once(&loading, ^{ // Do not use NSBundle.mainBundle, as it's nil for tests of library projects. diff --git a/templates/gRPC.podspec.template b/templates/gRPC.podspec.template index b59b553717..02e90d7180 100644 --- a/templates/gRPC.podspec.template +++ b/templates/gRPC.podspec.template @@ -42,6 +42,22 @@ def fix_header_name(name): if split_name[0] == 'include': split_name = split_name[1:] return '/'.join(split_name) + +def grpc_files(libs): + out = [] + for lib in libs: + if lib.name in ("grpc", "gpr"): + out.extend(fix_header_name(h) for h in lib.get('headers', [])) + out.extend(fix_header_name(h) for h in lib.get('public_headers', [])) + out.extend(lib.get('src', [])) + return out; + +def grpc_private_headers(libs): + out = [] + for lib in libs: + if lib.name in ("grpc", "gpr"): + out.extend(lib.get('headers', [])) + return out %> Pod::Spec.new do |s| s.name = 'gRPC' @@ -70,29 +86,9 @@ Pod::Spec.new do |s| # Core cross-platform gRPC library, written in C. s.subspec 'C-Core' do |ss| - ss.source_files = \ -% for lib in libs: -% if lib.name in ("grpc", "gpr"): -% for hdr in lib.get("headers", []): -'${fix_header_name(hdr)}', \ -% endfor -% for hdr in lib.get("public_headers", []): -'${fix_header_name(hdr)}', \ -% endfor -% for src in lib.src: -'${src}', \ -% endfor -% endif -% endfor - - ss.private_header_files = \ -% for lib in libs: -% if lib.name in ("grpc", "gpr"): -% for hdr in lib.get("headers", []): -'${hdr}', \ -% endfor -% endif -% endfor + ss.source_files = ${(',\n' + 22*' ').join('\'%s\'' % f for f in grpc_files(libs))} + + ss.private_header_files = ${(',\n' + 30*' ').join('\'%s\'' % f for f in grpc_private_headers(libs))} ss.header_mappings_dir = '.' diff --git a/templates/tools/doxygen/Doxyfile.include b/templates/tools/doxygen/Doxyfile.include index 1391016348..2934ebe7d8 100644 --- a/templates/tools/doxygen/Doxyfile.include +++ b/templates/tools/doxygen/Doxyfile.include @@ -778,7 +778,7 @@ WARN_LOGFILE = # spaces. # Note: If this tag is empty the current directory is searched. -INPUT = ${' '.join( +INPUT = ${' \\\n'.join( itertools.chain.from_iterable( target.public_headers + ([] diff --git a/test/proto/messages.proto b/test/proto/messages.proto index 65a8140465..500e79cc81 100644 --- a/test/proto/messages.proto +++ b/test/proto/messages.proto @@ -46,6 +46,14 @@ enum PayloadType { RANDOM = 2; } +// Compression algorithms +enum CompressionType { + // No compression + NONE = 0; + GZIP = 1; + DEFLATE = 2; +} + // A block of data, to simply increase gRPC message size. message Payload { // The type of data in body. @@ -54,6 +62,13 @@ message Payload { optional bytes body = 2; } +// A protobuf representation for grpc status. This is used by test +// clients to specify a status that the server should attempt to return. +message EchoStatus { + optional int32 code = 1; + optional string message = 2; +} + // Unary request. message SimpleRequest { // Desired payload type in the response from the server. @@ -72,6 +87,12 @@ message SimpleRequest { // Whether SimpleResponse should include OAuth scope. optional bool fill_oauth_scope = 5; + + // Compression algorithm to be used by the server for the response (stream) + optional CompressionType response_compression = 6; + + // Whether server should return a given status + optional EchoStatus response_status = 7; } // Unary response, as configured by the request. @@ -123,6 +144,12 @@ message StreamingOutputCallRequest { // Optional input payload sent along with the request. optional Payload payload = 3; + + // Compression algorithm to be used by the server for the response (stream) + optional CompressionType response_compression = 6; + + // Whether server should return a given status + optional EchoStatus response_status = 7; } // Server-streaming response, as configured by the request and parameters. diff --git a/test/proto/test.proto b/test/proto/test.proto index b9483d8437..1214152513 100644 --- a/test/proto/test.proto +++ b/test/proto/test.proto @@ -71,3 +71,11 @@ service TestService { rpc HalfDuplexCall(stream StreamingOutputCallRequest) returns (stream StreamingOutputCallResponse); } + + +// A simple service NOT implemented at servers so clients can test for +// that case. +service UnimplementedService { + // A call that no server should implement + rpc UnimplementedCall(grpc.testing.Empty) returns(grpc.testing.Empty); +} diff --git a/src/core/transport/chttp2/gen_hpack_tables.c b/tools/codegen/core/gen_hpack_tables.c index bdaa3cf094..bdaa3cf094 100644 --- a/src/core/transport/chttp2/gen_hpack_tables.c +++ b/tools/codegen/core/gen_hpack_tables.c diff --git a/tools/doxygen/Doxyfile.c++ b/tools/doxygen/Doxyfile.c++ index f947b7823e..d782dc18f7 100644 --- a/tools/doxygen/Doxyfile.c++ +++ b/tools/doxygen/Doxyfile.c++ @@ -760,7 +760,43 @@ WARN_LOGFILE = # spaces. # Note: If this tag is empty the current directory is searched. -INPUT = include/grpc++/async_generic_service.h include/grpc++/async_unary_call.h include/grpc++/byte_buffer.h include/grpc++/channel_arguments.h include/grpc++/channel_interface.h include/grpc++/client_context.h include/grpc++/completion_queue.h include/grpc++/config.h include/grpc++/config_protobuf.h include/grpc++/create_channel.h include/grpc++/credentials.h include/grpc++/generic_stub.h include/grpc++/impl/call.h include/grpc++/impl/client_unary_call.h include/grpc++/impl/grpc_library.h include/grpc++/impl/internal_stub.h include/grpc++/impl/proto_utils.h include/grpc++/impl/rpc_method.h include/grpc++/impl/rpc_service_method.h include/grpc++/impl/serialization_traits.h include/grpc++/impl/service_type.h include/grpc++/impl/sync.h include/grpc++/impl/sync_cxx11.h include/grpc++/impl/sync_no_cxx11.h include/grpc++/impl/thd.h include/grpc++/impl/thd_cxx11.h include/grpc++/impl/thd_no_cxx11.h include/grpc++/server.h include/grpc++/server_builder.h include/grpc++/server_context.h include/grpc++/server_credentials.h include/grpc++/slice.h include/grpc++/status.h include/grpc++/status_code_enum.h include/grpc++/stream.h include/grpc++/thread_pool_interface.h include/grpc++/time.h +INPUT = include/grpc++/async_generic_service.h \ +include/grpc++/async_unary_call.h \ +include/grpc++/byte_buffer.h \ +include/grpc++/channel_arguments.h \ +include/grpc++/channel_interface.h \ +include/grpc++/client_context.h \ +include/grpc++/completion_queue.h \ +include/grpc++/config.h \ +include/grpc++/config_protobuf.h \ +include/grpc++/create_channel.h \ +include/grpc++/credentials.h \ +include/grpc++/generic_stub.h \ +include/grpc++/impl/call.h \ +include/grpc++/impl/client_unary_call.h \ +include/grpc++/impl/grpc_library.h \ +include/grpc++/impl/internal_stub.h \ +include/grpc++/impl/proto_utils.h \ +include/grpc++/impl/rpc_method.h \ +include/grpc++/impl/rpc_service_method.h \ +include/grpc++/impl/serialization_traits.h \ +include/grpc++/impl/service_type.h \ +include/grpc++/impl/sync.h \ +include/grpc++/impl/sync_cxx11.h \ +include/grpc++/impl/sync_no_cxx11.h \ +include/grpc++/impl/thd.h \ +include/grpc++/impl/thd_cxx11.h \ +include/grpc++/impl/thd_no_cxx11.h \ +include/grpc++/server.h \ +include/grpc++/server_builder.h \ +include/grpc++/server_context.h \ +include/grpc++/server_credentials.h \ +include/grpc++/slice.h \ +include/grpc++/status.h \ +include/grpc++/status_code_enum.h \ +include/grpc++/stream.h \ +include/grpc++/thread_pool_interface.h \ +include/grpc++/time.h # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index a19f89ac7b..4e0b672b41 100644 --- a/tools/doxygen/Doxyfile.c++.internal +++ b/tools/doxygen/Doxyfile.c++.internal @@ -760,7 +760,73 @@ WARN_LOGFILE = # spaces. # Note: If this tag is empty the current directory is searched. -INPUT = include/grpc++/async_generic_service.h include/grpc++/async_unary_call.h include/grpc++/byte_buffer.h include/grpc++/channel_arguments.h include/grpc++/channel_interface.h include/grpc++/client_context.h include/grpc++/completion_queue.h include/grpc++/config.h include/grpc++/config_protobuf.h include/grpc++/create_channel.h include/grpc++/credentials.h include/grpc++/generic_stub.h include/grpc++/impl/call.h include/grpc++/impl/client_unary_call.h include/grpc++/impl/grpc_library.h include/grpc++/impl/internal_stub.h include/grpc++/impl/proto_utils.h include/grpc++/impl/rpc_method.h include/grpc++/impl/rpc_service_method.h include/grpc++/impl/serialization_traits.h include/grpc++/impl/service_type.h include/grpc++/impl/sync.h include/grpc++/impl/sync_cxx11.h include/grpc++/impl/sync_no_cxx11.h include/grpc++/impl/thd.h include/grpc++/impl/thd_cxx11.h include/grpc++/impl/thd_no_cxx11.h include/grpc++/server.h include/grpc++/server_builder.h include/grpc++/server_context.h include/grpc++/server_credentials.h include/grpc++/slice.h include/grpc++/status.h include/grpc++/status_code_enum.h include/grpc++/stream.h include/grpc++/thread_pool_interface.h include/grpc++/time.h src/cpp/client/secure_credentials.h src/cpp/server/secure_server_credentials.h src/cpp/client/channel.h src/cpp/server/thread_pool.h src/cpp/client/secure_credentials.cc src/cpp/server/secure_server_credentials.cc src/cpp/client/channel.cc src/cpp/client/channel_arguments.cc src/cpp/client/client_context.cc src/cpp/client/create_channel.cc src/cpp/client/credentials.cc src/cpp/client/generic_stub.cc src/cpp/client/insecure_credentials.cc src/cpp/client/internal_stub.cc src/cpp/common/call.cc src/cpp/common/completion_queue.cc src/cpp/common/rpc_method.cc src/cpp/proto/proto_utils.cc src/cpp/server/async_generic_service.cc src/cpp/server/create_default_thread_pool.cc src/cpp/server/insecure_server_credentials.cc src/cpp/server/server.cc src/cpp/server/server_builder.cc src/cpp/server/server_context.cc src/cpp/server/server_credentials.cc src/cpp/server/thread_pool.cc src/cpp/util/byte_buffer.cc src/cpp/util/slice.cc src/cpp/util/status.cc src/cpp/util/time.cc +INPUT = include/grpc++/async_generic_service.h \ +include/grpc++/async_unary_call.h \ +include/grpc++/byte_buffer.h \ +include/grpc++/channel_arguments.h \ +include/grpc++/channel_interface.h \ +include/grpc++/client_context.h \ +include/grpc++/completion_queue.h \ +include/grpc++/config.h \ +include/grpc++/config_protobuf.h \ +include/grpc++/create_channel.h \ +include/grpc++/credentials.h \ +include/grpc++/generic_stub.h \ +include/grpc++/impl/call.h \ +include/grpc++/impl/client_unary_call.h \ +include/grpc++/impl/grpc_library.h \ +include/grpc++/impl/internal_stub.h \ +include/grpc++/impl/proto_utils.h \ +include/grpc++/impl/rpc_method.h \ +include/grpc++/impl/rpc_service_method.h \ +include/grpc++/impl/serialization_traits.h \ +include/grpc++/impl/service_type.h \ +include/grpc++/impl/sync.h \ +include/grpc++/impl/sync_cxx11.h \ +include/grpc++/impl/sync_no_cxx11.h \ +include/grpc++/impl/thd.h \ +include/grpc++/impl/thd_cxx11.h \ +include/grpc++/impl/thd_no_cxx11.h \ +include/grpc++/server.h \ +include/grpc++/server_builder.h \ +include/grpc++/server_context.h \ +include/grpc++/server_credentials.h \ +include/grpc++/slice.h \ +include/grpc++/status.h \ +include/grpc++/status_code_enum.h \ +include/grpc++/stream.h \ +include/grpc++/thread_pool_interface.h \ +include/grpc++/time.h \ +src/cpp/client/secure_credentials.h \ +src/cpp/server/secure_server_credentials.h \ +src/cpp/client/channel.h \ +src/cpp/server/thread_pool.h \ +src/cpp/client/secure_credentials.cc \ +src/cpp/server/secure_server_credentials.cc \ +src/cpp/client/channel.cc \ +src/cpp/client/channel_arguments.cc \ +src/cpp/client/client_context.cc \ +src/cpp/client/create_channel.cc \ +src/cpp/client/credentials.cc \ +src/cpp/client/generic_stub.cc \ +src/cpp/client/insecure_credentials.cc \ +src/cpp/client/internal_stub.cc \ +src/cpp/common/call.cc \ +src/cpp/common/completion_queue.cc \ +src/cpp/common/rpc_method.cc \ +src/cpp/proto/proto_utils.cc \ +src/cpp/server/async_generic_service.cc \ +src/cpp/server/create_default_thread_pool.cc \ +src/cpp/server/insecure_server_credentials.cc \ +src/cpp/server/server.cc \ +src/cpp/server/server_builder.cc \ +src/cpp/server/server_context.cc \ +src/cpp/server/server_credentials.cc \ +src/cpp/server/thread_pool.cc \ +src/cpp/util/byte_buffer.cc \ +src/cpp/util/slice.cc \ +src/cpp/util/status.cc \ +src/cpp/util/time.cc # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses diff --git a/tools/doxygen/Doxyfile.core b/tools/doxygen/Doxyfile.core index 7cc96b2e06..1bfd787528 100644 --- a/tools/doxygen/Doxyfile.core +++ b/tools/doxygen/Doxyfile.core @@ -760,7 +760,41 @@ WARN_LOGFILE = # spaces. # Note: If this tag is empty the current directory is searched. -INPUT = include/grpc/grpc_security.h include/grpc/byte_buffer.h include/grpc/byte_buffer_reader.h include/grpc/compression.h include/grpc/grpc.h include/grpc/status.h include/grpc/census.h include/grpc/support/alloc.h include/grpc/support/atm.h include/grpc/support/atm_gcc_atomic.h include/grpc/support/atm_gcc_sync.h include/grpc/support/atm_win32.h include/grpc/support/cancellable_platform.h include/grpc/support/cmdline.h include/grpc/support/cpu.h include/grpc/support/histogram.h include/grpc/support/host_port.h include/grpc/support/log.h include/grpc/support/log_win32.h include/grpc/support/port_platform.h include/grpc/support/slice.h include/grpc/support/slice_buffer.h include/grpc/support/string_util.h include/grpc/support/subprocess.h include/grpc/support/sync.h include/grpc/support/sync_generic.h include/grpc/support/sync_posix.h include/grpc/support/sync_win32.h include/grpc/support/thd.h include/grpc/support/time.h include/grpc/support/tls.h include/grpc/support/tls_gcc.h include/grpc/support/tls_msvc.h include/grpc/support/tls_pthread.h include/grpc/support/useful.h +INPUT = include/grpc/grpc_security.h \ +include/grpc/byte_buffer.h \ +include/grpc/byte_buffer_reader.h \ +include/grpc/compression.h \ +include/grpc/grpc.h \ +include/grpc/status.h \ +include/grpc/census.h \ +include/grpc/support/alloc.h \ +include/grpc/support/atm.h \ +include/grpc/support/atm_gcc_atomic.h \ +include/grpc/support/atm_gcc_sync.h \ +include/grpc/support/atm_win32.h \ +include/grpc/support/cancellable_platform.h \ +include/grpc/support/cmdline.h \ +include/grpc/support/cpu.h \ +include/grpc/support/histogram.h \ +include/grpc/support/host_port.h \ +include/grpc/support/log.h \ +include/grpc/support/log_win32.h \ +include/grpc/support/port_platform.h \ +include/grpc/support/slice.h \ +include/grpc/support/slice_buffer.h \ +include/grpc/support/string_util.h \ +include/grpc/support/subprocess.h \ +include/grpc/support/sync.h \ +include/grpc/support/sync_generic.h \ +include/grpc/support/sync_posix.h \ +include/grpc/support/sync_win32.h \ +include/grpc/support/thd.h \ +include/grpc/support/time.h \ +include/grpc/support/tls.h \ +include/grpc/support/tls_gcc.h \ +include/grpc/support/tls_msvc.h \ +include/grpc/support/tls_pthread.h \ +include/grpc/support/useful.h # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index e6af18d615..a71ebdbf1e 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -760,7 +760,318 @@ WARN_LOGFILE = # spaces. # Note: If this tag is empty the current directory is searched. -INPUT = include/grpc/grpc_security.h include/grpc/byte_buffer.h include/grpc/byte_buffer_reader.h include/grpc/compression.h include/grpc/grpc.h include/grpc/status.h include/grpc/census.h src/core/httpcli/format_request.h src/core/httpcli/httpcli.h src/core/httpcli/httpcli_security_connector.h src/core/httpcli/parser.h src/core/security/auth_filters.h src/core/security/base64.h src/core/security/credentials.h src/core/security/json_token.h src/core/security/secure_endpoint.h src/core/security/secure_transport_setup.h src/core/security/security_connector.h src/core/security/security_context.h src/core/tsi/fake_transport_security.h src/core/tsi/ssl_transport_security.h src/core/tsi/transport_security.h src/core/tsi/transport_security_interface.h src/core/census/grpc_context.h src/core/channel/census_filter.h src/core/channel/channel_args.h src/core/channel/channel_stack.h src/core/channel/client_channel.h src/core/channel/connected_channel.h src/core/channel/context.h src/core/channel/http_client_filter.h src/core/channel/http_server_filter.h src/core/channel/noop_filter.h src/core/client_config/client_config.h src/core/client_config/lb_policies/pick_first.h src/core/client_config/lb_policy.h src/core/client_config/resolver.h src/core/client_config/resolver_factory.h src/core/client_config/resolver_registry.h src/core/client_config/resolvers/dns_resolver.h src/core/client_config/subchannel.h src/core/client_config/subchannel_factory.h src/core/client_config/uri_parser.h src/core/compression/message_compress.h src/core/debug/trace.h src/core/iomgr/alarm.h src/core/iomgr/alarm_heap.h src/core/iomgr/alarm_internal.h src/core/iomgr/endpoint.h src/core/iomgr/endpoint_pair.h src/core/iomgr/fd_posix.h src/core/iomgr/iocp_windows.h src/core/iomgr/iomgr.h src/core/iomgr/iomgr_internal.h src/core/iomgr/iomgr_posix.h src/core/iomgr/pollset.h src/core/iomgr/pollset_kick_posix.h src/core/iomgr/pollset_posix.h src/core/iomgr/pollset_set.h src/core/iomgr/pollset_set_posix.h src/core/iomgr/pollset_set_windows.h src/core/iomgr/pollset_windows.h src/core/iomgr/resolve_address.h src/core/iomgr/sockaddr.h src/core/iomgr/sockaddr_posix.h src/core/iomgr/sockaddr_utils.h src/core/iomgr/sockaddr_win32.h src/core/iomgr/socket_utils_posix.h src/core/iomgr/socket_windows.h src/core/iomgr/tcp_client.h src/core/iomgr/tcp_posix.h src/core/iomgr/tcp_server.h src/core/iomgr/tcp_windows.h src/core/iomgr/time_averaged_stats.h src/core/iomgr/wakeup_fd_pipe.h src/core/iomgr/wakeup_fd_posix.h src/core/json/json.h src/core/json/json_common.h src/core/json/json_reader.h src/core/json/json_writer.h src/core/profiling/timers.h src/core/profiling/timers_preciseclock.h src/core/surface/byte_buffer_queue.h src/core/surface/call.h src/core/surface/channel.h src/core/surface/client.h src/core/surface/completion_queue.h src/core/surface/event_string.h src/core/surface/init.h src/core/surface/server.h src/core/surface/surface_trace.h src/core/transport/chttp2/alpn.h src/core/transport/chttp2/bin_encoder.h src/core/transport/chttp2/frame.h src/core/transport/chttp2/frame_data.h src/core/transport/chttp2/frame_goaway.h src/core/transport/chttp2/frame_ping.h src/core/transport/chttp2/frame_rst_stream.h src/core/transport/chttp2/frame_settings.h src/core/transport/chttp2/frame_window_update.h src/core/transport/chttp2/hpack_parser.h src/core/transport/chttp2/hpack_table.h src/core/transport/chttp2/http2_errors.h src/core/transport/chttp2/huffsyms.h src/core/transport/chttp2/status_conversion.h src/core/transport/chttp2/stream_encoder.h src/core/transport/chttp2/stream_map.h src/core/transport/chttp2/timeout_encoding.h src/core/transport/chttp2/varint.h src/core/transport/chttp2_transport.h src/core/transport/metadata.h src/core/transport/stream_op.h src/core/transport/transport.h src/core/transport/transport_impl.h src/core/census/context.h src/core/httpcli/format_request.c src/core/httpcli/httpcli.c src/core/httpcli/httpcli_security_connector.c src/core/httpcli/parser.c src/core/security/base64.c src/core/security/client_auth_filter.c src/core/security/credentials.c src/core/security/credentials_metadata.c src/core/security/credentials_posix.c src/core/security/credentials_win32.c src/core/security/google_default_credentials.c src/core/security/json_token.c src/core/security/secure_endpoint.c src/core/security/secure_transport_setup.c src/core/security/security_connector.c src/core/security/security_context.c src/core/security/server_auth_filter.c src/core/security/server_secure_chttp2.c src/core/surface/init_secure.c src/core/surface/secure_channel_create.c src/core/tsi/fake_transport_security.c src/core/tsi/ssl_transport_security.c src/core/tsi/transport_security.c src/core/census/grpc_context.c src/core/channel/channel_args.c src/core/channel/channel_stack.c src/core/channel/client_channel.c src/core/channel/connected_channel.c src/core/channel/http_client_filter.c src/core/channel/http_server_filter.c src/core/channel/noop_filter.c src/core/client_config/client_config.c src/core/client_config/lb_policies/pick_first.c src/core/client_config/lb_policy.c src/core/client_config/resolver.c src/core/client_config/resolver_factory.c src/core/client_config/resolver_registry.c src/core/client_config/resolvers/dns_resolver.c src/core/client_config/subchannel.c src/core/client_config/subchannel_factory.c src/core/client_config/uri_parser.c src/core/compression/algorithm.c src/core/compression/message_compress.c src/core/debug/trace.c src/core/iomgr/alarm.c src/core/iomgr/alarm_heap.c src/core/iomgr/endpoint.c src/core/iomgr/endpoint_pair_posix.c src/core/iomgr/endpoint_pair_windows.c src/core/iomgr/fd_posix.c src/core/iomgr/iocp_windows.c src/core/iomgr/iomgr.c src/core/iomgr/iomgr_posix.c src/core/iomgr/iomgr_windows.c src/core/iomgr/pollset_kick_posix.c src/core/iomgr/pollset_multipoller_with_epoll.c src/core/iomgr/pollset_multipoller_with_poll_posix.c src/core/iomgr/pollset_posix.c src/core/iomgr/pollset_set_posix.c src/core/iomgr/pollset_set_windows.c src/core/iomgr/pollset_windows.c src/core/iomgr/resolve_address_posix.c src/core/iomgr/resolve_address_windows.c src/core/iomgr/sockaddr_utils.c src/core/iomgr/socket_utils_common_posix.c src/core/iomgr/socket_utils_linux.c src/core/iomgr/socket_utils_posix.c src/core/iomgr/socket_windows.c src/core/iomgr/tcp_client_posix.c src/core/iomgr/tcp_client_windows.c src/core/iomgr/tcp_posix.c src/core/iomgr/tcp_server_posix.c src/core/iomgr/tcp_server_windows.c src/core/iomgr/tcp_windows.c src/core/iomgr/time_averaged_stats.c src/core/iomgr/wakeup_fd_eventfd.c src/core/iomgr/wakeup_fd_nospecial.c src/core/iomgr/wakeup_fd_pipe.c src/core/iomgr/wakeup_fd_posix.c src/core/json/json.c src/core/json/json_reader.c src/core/json/json_string.c src/core/json/json_writer.c src/core/profiling/basic_timers.c src/core/profiling/stap_timers.c src/core/surface/byte_buffer.c src/core/surface/byte_buffer_queue.c src/core/surface/byte_buffer_reader.c src/core/surface/call.c src/core/surface/call_details.c src/core/surface/call_log_batch.c src/core/surface/channel.c src/core/surface/channel_create.c src/core/surface/client.c src/core/surface/completion_queue.c src/core/surface/event_string.c src/core/surface/init.c src/core/surface/lame_client.c src/core/surface/metadata_array.c src/core/surface/server.c src/core/surface/server_chttp2.c src/core/surface/server_create.c src/core/surface/surface_trace.c src/core/transport/chttp2/alpn.c src/core/transport/chttp2/bin_encoder.c src/core/transport/chttp2/frame_data.c src/core/transport/chttp2/frame_goaway.c src/core/transport/chttp2/frame_ping.c src/core/transport/chttp2/frame_rst_stream.c src/core/transport/chttp2/frame_settings.c src/core/transport/chttp2/frame_window_update.c src/core/transport/chttp2/hpack_parser.c src/core/transport/chttp2/hpack_table.c src/core/transport/chttp2/huffsyms.c src/core/transport/chttp2/status_conversion.c src/core/transport/chttp2/stream_encoder.c src/core/transport/chttp2/stream_map.c src/core/transport/chttp2/timeout_encoding.c src/core/transport/chttp2/varint.c src/core/transport/chttp2_transport.c src/core/transport/metadata.c src/core/transport/stream_op.c src/core/transport/transport.c src/core/transport/transport_op_string.c src/core/census/context.c src/core/census/initialize.c include/grpc/support/alloc.h include/grpc/support/atm.h include/grpc/support/atm_gcc_atomic.h include/grpc/support/atm_gcc_sync.h include/grpc/support/atm_win32.h include/grpc/support/cancellable_platform.h include/grpc/support/cmdline.h include/grpc/support/cpu.h include/grpc/support/histogram.h include/grpc/support/host_port.h include/grpc/support/log.h include/grpc/support/log_win32.h include/grpc/support/port_platform.h include/grpc/support/slice.h include/grpc/support/slice_buffer.h include/grpc/support/string_util.h include/grpc/support/subprocess.h include/grpc/support/sync.h include/grpc/support/sync_generic.h include/grpc/support/sync_posix.h include/grpc/support/sync_win32.h include/grpc/support/thd.h include/grpc/support/time.h include/grpc/support/tls.h include/grpc/support/tls_gcc.h include/grpc/support/tls_msvc.h include/grpc/support/tls_pthread.h include/grpc/support/useful.h src/core/support/env.h src/core/support/file.h src/core/support/murmur_hash.h src/core/support/string.h src/core/support/string_win32.h src/core/support/thd_internal.h src/core/support/alloc.c src/core/support/cancellable.c src/core/support/cmdline.c src/core/support/cpu_iphone.c src/core/support/cpu_linux.c src/core/support/cpu_posix.c src/core/support/cpu_windows.c src/core/support/env_linux.c src/core/support/env_posix.c src/core/support/env_win32.c src/core/support/file.c src/core/support/file_posix.c src/core/support/file_win32.c src/core/support/histogram.c src/core/support/host_port.c src/core/support/log.c src/core/support/log_android.c src/core/support/log_linux.c src/core/support/log_posix.c src/core/support/log_win32.c src/core/support/murmur_hash.c src/core/support/slice.c src/core/support/slice_buffer.c src/core/support/string.c src/core/support/string_posix.c src/core/support/string_win32.c src/core/support/subprocess_posix.c src/core/support/sync.c src/core/support/sync_posix.c src/core/support/sync_win32.c src/core/support/thd.c src/core/support/thd_posix.c src/core/support/thd_win32.c src/core/support/time.c src/core/support/time_posix.c src/core/support/time_win32.c src/core/support/tls_pthread.c +INPUT = include/grpc/grpc_security.h \ +include/grpc/byte_buffer.h \ +include/grpc/byte_buffer_reader.h \ +include/grpc/compression.h \ +include/grpc/grpc.h \ +include/grpc/status.h \ +include/grpc/census.h \ +src/core/httpcli/format_request.h \ +src/core/httpcli/httpcli.h \ +src/core/httpcli/httpcli_security_connector.h \ +src/core/httpcli/parser.h \ +src/core/security/auth_filters.h \ +src/core/security/base64.h \ +src/core/security/credentials.h \ +src/core/security/json_token.h \ +src/core/security/secure_endpoint.h \ +src/core/security/secure_transport_setup.h \ +src/core/security/security_connector.h \ +src/core/security/security_context.h \ +src/core/tsi/fake_transport_security.h \ +src/core/tsi/ssl_transport_security.h \ +src/core/tsi/transport_security.h \ +src/core/tsi/transport_security_interface.h \ +src/core/census/grpc_context.h \ +src/core/channel/census_filter.h \ +src/core/channel/channel_args.h \ +src/core/channel/channel_stack.h \ +src/core/channel/client_channel.h \ +src/core/channel/connected_channel.h \ +src/core/channel/context.h \ +src/core/channel/http_client_filter.h \ +src/core/channel/http_server_filter.h \ +src/core/channel/noop_filter.h \ +src/core/client_config/client_config.h \ +src/core/client_config/lb_policies/pick_first.h \ +src/core/client_config/lb_policy.h \ +src/core/client_config/resolver.h \ +src/core/client_config/resolver_factory.h \ +src/core/client_config/resolver_registry.h \ +src/core/client_config/resolvers/dns_resolver.h \ +src/core/client_config/subchannel.h \ +src/core/client_config/subchannel_factory.h \ +src/core/client_config/uri_parser.h \ +src/core/compression/message_compress.h \ +src/core/debug/trace.h \ +src/core/iomgr/alarm.h \ +src/core/iomgr/alarm_heap.h \ +src/core/iomgr/alarm_internal.h \ +src/core/iomgr/endpoint.h \ +src/core/iomgr/endpoint_pair.h \ +src/core/iomgr/fd_posix.h \ +src/core/iomgr/iocp_windows.h \ +src/core/iomgr/iomgr.h \ +src/core/iomgr/iomgr_internal.h \ +src/core/iomgr/iomgr_posix.h \ +src/core/iomgr/pollset.h \ +src/core/iomgr/pollset_kick_posix.h \ +src/core/iomgr/pollset_posix.h \ +src/core/iomgr/pollset_set.h \ +src/core/iomgr/pollset_set_posix.h \ +src/core/iomgr/pollset_set_windows.h \ +src/core/iomgr/pollset_windows.h \ +src/core/iomgr/resolve_address.h \ +src/core/iomgr/sockaddr.h \ +src/core/iomgr/sockaddr_posix.h \ +src/core/iomgr/sockaddr_utils.h \ +src/core/iomgr/sockaddr_win32.h \ +src/core/iomgr/socket_utils_posix.h \ +src/core/iomgr/socket_windows.h \ +src/core/iomgr/tcp_client.h \ +src/core/iomgr/tcp_posix.h \ +src/core/iomgr/tcp_server.h \ +src/core/iomgr/tcp_windows.h \ +src/core/iomgr/time_averaged_stats.h \ +src/core/iomgr/wakeup_fd_pipe.h \ +src/core/iomgr/wakeup_fd_posix.h \ +src/core/json/json.h \ +src/core/json/json_common.h \ +src/core/json/json_reader.h \ +src/core/json/json_writer.h \ +src/core/profiling/timers.h \ +src/core/profiling/timers_preciseclock.h \ +src/core/surface/byte_buffer_queue.h \ +src/core/surface/call.h \ +src/core/surface/channel.h \ +src/core/surface/client.h \ +src/core/surface/completion_queue.h \ +src/core/surface/event_string.h \ +src/core/surface/init.h \ +src/core/surface/server.h \ +src/core/surface/surface_trace.h \ +src/core/transport/chttp2/alpn.h \ +src/core/transport/chttp2/bin_encoder.h \ +src/core/transport/chttp2/frame.h \ +src/core/transport/chttp2/frame_data.h \ +src/core/transport/chttp2/frame_goaway.h \ +src/core/transport/chttp2/frame_ping.h \ +src/core/transport/chttp2/frame_rst_stream.h \ +src/core/transport/chttp2/frame_settings.h \ +src/core/transport/chttp2/frame_window_update.h \ +src/core/transport/chttp2/hpack_parser.h \ +src/core/transport/chttp2/hpack_table.h \ +src/core/transport/chttp2/http2_errors.h \ +src/core/transport/chttp2/huffsyms.h \ +src/core/transport/chttp2/status_conversion.h \ +src/core/transport/chttp2/stream_encoder.h \ +src/core/transport/chttp2/stream_map.h \ +src/core/transport/chttp2/timeout_encoding.h \ +src/core/transport/chttp2/varint.h \ +src/core/transport/chttp2_transport.h \ +src/core/transport/metadata.h \ +src/core/transport/stream_op.h \ +src/core/transport/transport.h \ +src/core/transport/transport_impl.h \ +src/core/census/context.h \ +src/core/httpcli/format_request.c \ +src/core/httpcli/httpcli.c \ +src/core/httpcli/httpcli_security_connector.c \ +src/core/httpcli/parser.c \ +src/core/security/base64.c \ +src/core/security/client_auth_filter.c \ +src/core/security/credentials.c \ +src/core/security/credentials_metadata.c \ +src/core/security/credentials_posix.c \ +src/core/security/credentials_win32.c \ +src/core/security/google_default_credentials.c \ +src/core/security/json_token.c \ +src/core/security/secure_endpoint.c \ +src/core/security/secure_transport_setup.c \ +src/core/security/security_connector.c \ +src/core/security/security_context.c \ +src/core/security/server_auth_filter.c \ +src/core/security/server_secure_chttp2.c \ +src/core/surface/init_secure.c \ +src/core/surface/secure_channel_create.c \ +src/core/tsi/fake_transport_security.c \ +src/core/tsi/ssl_transport_security.c \ +src/core/tsi/transport_security.c \ +src/core/census/grpc_context.c \ +src/core/channel/channel_args.c \ +src/core/channel/channel_stack.c \ +src/core/channel/client_channel.c \ +src/core/channel/connected_channel.c \ +src/core/channel/http_client_filter.c \ +src/core/channel/http_server_filter.c \ +src/core/channel/noop_filter.c \ +src/core/client_config/client_config.c \ +src/core/client_config/lb_policies/pick_first.c \ +src/core/client_config/lb_policy.c \ +src/core/client_config/resolver.c \ +src/core/client_config/resolver_factory.c \ +src/core/client_config/resolver_registry.c \ +src/core/client_config/resolvers/dns_resolver.c \ +src/core/client_config/subchannel.c \ +src/core/client_config/subchannel_factory.c \ +src/core/client_config/uri_parser.c \ +src/core/compression/algorithm.c \ +src/core/compression/message_compress.c \ +src/core/debug/trace.c \ +src/core/iomgr/alarm.c \ +src/core/iomgr/alarm_heap.c \ +src/core/iomgr/endpoint.c \ +src/core/iomgr/endpoint_pair_posix.c \ +src/core/iomgr/endpoint_pair_windows.c \ +src/core/iomgr/fd_posix.c \ +src/core/iomgr/iocp_windows.c \ +src/core/iomgr/iomgr.c \ +src/core/iomgr/iomgr_posix.c \ +src/core/iomgr/iomgr_windows.c \ +src/core/iomgr/pollset_kick_posix.c \ +src/core/iomgr/pollset_multipoller_with_epoll.c \ +src/core/iomgr/pollset_multipoller_with_poll_posix.c \ +src/core/iomgr/pollset_posix.c \ +src/core/iomgr/pollset_set_posix.c \ +src/core/iomgr/pollset_set_windows.c \ +src/core/iomgr/pollset_windows.c \ +src/core/iomgr/resolve_address_posix.c \ +src/core/iomgr/resolve_address_windows.c \ +src/core/iomgr/sockaddr_utils.c \ +src/core/iomgr/socket_utils_common_posix.c \ +src/core/iomgr/socket_utils_linux.c \ +src/core/iomgr/socket_utils_posix.c \ +src/core/iomgr/socket_windows.c \ +src/core/iomgr/tcp_client_posix.c \ +src/core/iomgr/tcp_client_windows.c \ +src/core/iomgr/tcp_posix.c \ +src/core/iomgr/tcp_server_posix.c \ +src/core/iomgr/tcp_server_windows.c \ +src/core/iomgr/tcp_windows.c \ +src/core/iomgr/time_averaged_stats.c \ +src/core/iomgr/wakeup_fd_eventfd.c \ +src/core/iomgr/wakeup_fd_nospecial.c \ +src/core/iomgr/wakeup_fd_pipe.c \ +src/core/iomgr/wakeup_fd_posix.c \ +src/core/json/json.c \ +src/core/json/json_reader.c \ +src/core/json/json_string.c \ +src/core/json/json_writer.c \ +src/core/profiling/basic_timers.c \ +src/core/profiling/stap_timers.c \ +src/core/surface/byte_buffer.c \ +src/core/surface/byte_buffer_queue.c \ +src/core/surface/byte_buffer_reader.c \ +src/core/surface/call.c \ +src/core/surface/call_details.c \ +src/core/surface/call_log_batch.c \ +src/core/surface/channel.c \ +src/core/surface/channel_create.c \ +src/core/surface/client.c \ +src/core/surface/completion_queue.c \ +src/core/surface/event_string.c \ +src/core/surface/init.c \ +src/core/surface/lame_client.c \ +src/core/surface/metadata_array.c \ +src/core/surface/server.c \ +src/core/surface/server_chttp2.c \ +src/core/surface/server_create.c \ +src/core/surface/surface_trace.c \ +src/core/transport/chttp2/alpn.c \ +src/core/transport/chttp2/bin_encoder.c \ +src/core/transport/chttp2/frame_data.c \ +src/core/transport/chttp2/frame_goaway.c \ +src/core/transport/chttp2/frame_ping.c \ +src/core/transport/chttp2/frame_rst_stream.c \ +src/core/transport/chttp2/frame_settings.c \ +src/core/transport/chttp2/frame_window_update.c \ +src/core/transport/chttp2/hpack_parser.c \ +src/core/transport/chttp2/hpack_table.c \ +src/core/transport/chttp2/huffsyms.c \ +src/core/transport/chttp2/status_conversion.c \ +src/core/transport/chttp2/stream_encoder.c \ +src/core/transport/chttp2/stream_map.c \ +src/core/transport/chttp2/timeout_encoding.c \ +src/core/transport/chttp2/varint.c \ +src/core/transport/chttp2_transport.c \ +src/core/transport/metadata.c \ +src/core/transport/stream_op.c \ +src/core/transport/transport.c \ +src/core/transport/transport_op_string.c \ +src/core/census/context.c \ +src/core/census/initialize.c \ +include/grpc/support/alloc.h \ +include/grpc/support/atm.h \ +include/grpc/support/atm_gcc_atomic.h \ +include/grpc/support/atm_gcc_sync.h \ +include/grpc/support/atm_win32.h \ +include/grpc/support/cancellable_platform.h \ +include/grpc/support/cmdline.h \ +include/grpc/support/cpu.h \ +include/grpc/support/histogram.h \ +include/grpc/support/host_port.h \ +include/grpc/support/log.h \ +include/grpc/support/log_win32.h \ +include/grpc/support/port_platform.h \ +include/grpc/support/slice.h \ +include/grpc/support/slice_buffer.h \ +include/grpc/support/string_util.h \ +include/grpc/support/subprocess.h \ +include/grpc/support/sync.h \ +include/grpc/support/sync_generic.h \ +include/grpc/support/sync_posix.h \ +include/grpc/support/sync_win32.h \ +include/grpc/support/thd.h \ +include/grpc/support/time.h \ +include/grpc/support/tls.h \ +include/grpc/support/tls_gcc.h \ +include/grpc/support/tls_msvc.h \ +include/grpc/support/tls_pthread.h \ +include/grpc/support/useful.h \ +src/core/support/env.h \ +src/core/support/file.h \ +src/core/support/murmur_hash.h \ +src/core/support/string.h \ +src/core/support/string_win32.h \ +src/core/support/thd_internal.h \ +src/core/support/alloc.c \ +src/core/support/cancellable.c \ +src/core/support/cmdline.c \ +src/core/support/cpu_iphone.c \ +src/core/support/cpu_linux.c \ +src/core/support/cpu_posix.c \ +src/core/support/cpu_windows.c \ +src/core/support/env_linux.c \ +src/core/support/env_posix.c \ +src/core/support/env_win32.c \ +src/core/support/file.c \ +src/core/support/file_posix.c \ +src/core/support/file_win32.c \ +src/core/support/histogram.c \ +src/core/support/host_port.c \ +src/core/support/log.c \ +src/core/support/log_android.c \ +src/core/support/log_linux.c \ +src/core/support/log_posix.c \ +src/core/support/log_win32.c \ +src/core/support/murmur_hash.c \ +src/core/support/slice.c \ +src/core/support/slice_buffer.c \ +src/core/support/string.c \ +src/core/support/string_posix.c \ +src/core/support/string_win32.c \ +src/core/support/subprocess_posix.c \ +src/core/support/sync.c \ +src/core/support/sync_posix.c \ +src/core/support/sync_win32.c \ +src/core/support/thd.c \ +src/core/support/thd_posix.c \ +src/core/support/thd_win32.c \ +src/core/support/time.c \ +src/core/support/time_posix.c \ +src/core/support/time_win32.c \ +src/core/support/tls_pthread.c # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses diff --git a/vsprojects/Grpc.mak b/vsprojects/Grpc.mak index 5d7368ccc6..6af866a51d 100644 --- a/vsprojects/Grpc.mak +++ b/vsprojects/Grpc.mak @@ -135,8 +135,8 @@ fling_server: fling_server.exe $(OUT_DIR)\fling_server.exe gen_hpack_tables.exe: build_libs $(OUT_DIR) echo Building gen_hpack_tables - $(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\src\core\transport\chttp2\gen_hpack_tables.c - $(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\gen_hpack_tables.exe" Debug\grpc_test_util.lib Debug\gpr.lib Debug\grpc.lib $(LIBS) $(OUT_DIR)\gen_hpack_tables.obj + $(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\tools\codegen\core\gen_hpack_tables.c + $(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\gen_hpack_tables.exe" Debug\gpr.lib Debug\grpc.lib $(LIBS) $(OUT_DIR)\gen_hpack_tables.obj gen_hpack_tables: gen_hpack_tables.exe echo Running gen_hpack_tables $(OUT_DIR)\gen_hpack_tables.exe |