Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into uv_core_transport

Browse Source
reviewable/pr8125/r7
murgatroid99 8 years ago
parent 6a30178ef2 d9cbec465d
commit b516cadc2a
213 changed files with 1665 additions and 1315 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 296
      BUILD
  2. 120
      CMakeLists.txt
  3. 156
      Makefile
  4. 40
      binding.gyp
  5. 112
      build.yaml
  6. 42
      config.m4
  7. 7
      examples/node/dynamic_codegen/route_guide/route_guide_client.js
  8. 7
      examples/node/static_codegen/route_guide/route_guide_client.js
  9. 108
      gRPC-Core.podspec
  10. 74
      grpc.gemspec
  11. 2
      include/grpc++/ext/reflection.grpc.pb.h
  12. 13
      include/grpc++/impl/codegen/method_handler_impl.h
  13. 1
      include/grpc++/impl/codegen/server_context.h
  14. 11
      include/grpc++/impl/codegen/service_type.h
  15. 37
      include/grpc++/impl/codegen/sync_stream.h
  16. 74
      package.xml
  17. 96
      src/compiler/cpp_generator.cc
  18. 0
      src/core/ext/client_channel/README.md
  19. 2
      src/core/ext/client_channel/channel_connectivity.c
  20. 8
      src/core/ext/client_channel/client_channel.c
  21. 10
      src/core/ext/client_channel/client_channel.h
  22. 2
      src/core/ext/client_channel/client_channel_factory.c
  23. 8
      src/core/ext/client_channel/client_channel_factory.h
  24. 12
      src/core/ext/client_channel/client_channel_plugin.c
  25. 2
      src/core/ext/client_channel/connector.c
  26. 6
      src/core/ext/client_channel/connector.h
  27. 0
      src/core/ext/client_channel/default_initial_connect_string.c
  28. 4
      src/core/ext/client_channel/http_connect_handshaker.c
  29. 6
      src/core/ext/client_channel/http_connect_handshaker.h
  30. 2
      src/core/ext/client_channel/initial_connect_string.c
  31. 6
      src/core/ext/client_channel/initial_connect_string.h
  32. 2
      src/core/ext/client_channel/lb_policy.c
  33. 9
      src/core/ext/client_channel/lb_policy.h
  34. 2
      src/core/ext/client_channel/lb_policy_factory.c
  35. 10
      src/core/ext/client_channel/lb_policy_factory.h
  36. 2
      src/core/ext/client_channel/lb_policy_registry.c
  37. 8
      src/core/ext/client_channel/lb_policy_registry.h
  38. 2
      src/core/ext/client_channel/method_config.c
  39. 6
      src/core/ext/client_channel/method_config.h
  40. 2
      src/core/ext/client_channel/parse_address.c
  41. 8
      src/core/ext/client_channel/parse_address.h
  42. 2
      src/core/ext/client_channel/resolver.c
  43. 10
      src/core/ext/client_channel/resolver.h
  44. 2
      src/core/ext/client_channel/resolver_factory.c
  45. 12
      src/core/ext/client_channel/resolver_factory.h
  46. 4
      src/core/ext/client_channel/resolver_registry.c
  47. 8
      src/core/ext/client_channel/resolver_registry.h
  48. 2
      src/core/ext/client_channel/resolver_result.c
  49. 9
      src/core/ext/client_channel/resolver_result.h
  50. 8
      src/core/ext/client_channel/subchannel.c
  51. 8
      src/core/ext/client_channel/subchannel.h
  52. 2
      src/core/ext/client_channel/subchannel_index.c
  53. 10
      src/core/ext/client_channel/subchannel_index.h
  54. 2
      src/core/ext/client_channel/uri_parser.c
  55. 6
      src/core/ext/client_channel/uri_parser.h
  56. 8
      src/core/ext/lb_policy/grpclb/grpclb.c
  57. 2
      src/core/ext/lb_policy/grpclb/grpclb.h
  58. 2
      src/core/ext/lb_policy/grpclb/load_balancer_api.h
  59. 2
      src/core/ext/lb_policy/pick_first/pick_first.c
  60. 2
      src/core/ext/lb_policy/round_robin/round_robin.c
  61. 2
      src/core/ext/load_reporting/load_reporting.h
  62. 2
      src/core/ext/load_reporting/load_reporting_filter.c
  63. 6
      src/core/ext/resolver/dns/native/dns_resolver.c
  64. 5
      src/core/ext/resolver/sockaddr/sockaddr_resolver.c
  65. 6
      src/core/ext/transport/chttp2/client/insecure/channel_create.c
  66. 11
      src/core/ext/transport/chttp2/client/secure/secure_channel_create.c
  67. 7
      src/core/lib/channel/http_server_filter.c
  68. 2
      src/core/lib/channel/message_size_filter.c
  69. 2
      src/core/lib/transport/static_metadata.c
  70. 8
      src/core/lib/transport/static_metadata.h
  71. 8
      src/core/plugin_registry/grpc_cronet_plugin_registry.c
  72. 8
      src/core/plugin_registry/grpc_plugin_registry.c
  73. 8
      src/core/plugin_registry/grpc_unsecure_plugin_registry.c
  74. 5
      src/csharp/Grpc.IntegrationTesting.QpsWorker/project.json
  75. 1
      src/csharp/Grpc.IntegrationTesting/InteropClient.cs
  76. 8
      src/node/ext/node_grpc.cc
  77. 12
      src/objective-c/examples/Sample/Sample.xcodeproj/project.pbxproj
  78. 2
      src/objective-c/examples/Sample/Sample.xcodeproj/xcshareddata/xcschemes/Sample.xcscheme
  79. 18
      src/objective-c/examples/SwiftSample/SwiftSample.xcodeproj/project.pbxproj
  80. 2
      src/objective-c/examples/SwiftSample/SwiftSample.xcodeproj/xcshareddata/xcschemes/SwiftSample.xcscheme
  81. 25
      src/objective-c/examples/SwiftSample/ViewController.swift
  82. 2
      src/objective-c/tests/Info.plist
  83. 16
      src/objective-c/tests/Tests.xcodeproj/project.pbxproj
  84. 2
      src/objective-c/tests/Tests.xcodeproj/xcshareddata/xcschemes/AllTests.xcscheme
  85. 2
      src/objective-c/tests/Tests.xcodeproj/xcshareddata/xcschemes/CoreCronetEnd2EndTests.xcscheme
  86. 2
      src/objective-c/tests/Tests.xcodeproj/xcshareddata/xcschemes/InteropTestsLocalCleartext.xcscheme
  87. 2
      src/objective-c/tests/Tests.xcodeproj/xcshareddata/xcschemes/InteropTestsLocalSSL.xcscheme
  88. 2
      src/objective-c/tests/Tests.xcodeproj/xcshareddata/xcschemes/InteropTestsRemote.xcscheme
  89. 2
      src/objective-c/tests/Tests.xcodeproj/xcshareddata/xcschemes/InteropTestsRemoteWithCronet.xcscheme
  90. 2
      src/objective-c/tests/Tests.xcodeproj/xcshareddata/xcschemes/RxLibraryUnitTests.xcscheme
  91. 1
      src/proto/grpc/testing/duplicate/echo_duplicate.proto
  92. 2
      src/proto/grpc/testing/test.proto
  93. 40
      src/python/grpcio/grpc_core_dependencies.py
  94. 2
      src/ruby/README.md
  95. 5
      templates/src/csharp/Grpc.IntegrationTesting.QpsWorker/project.json.template
  96. 4
      test/core/client_channel/lb_policies_test.c
  97. 2
      test/core/client_channel/resolvers/dns_resolver_connectivity_test.c
  98. 2
      test/core/client_channel/resolvers/dns_resolver_test.c
  99. 4
      test/core/client_channel/resolvers/sockaddr_resolver_test.c
  100. 3
      test/core/client_channel/set_initial_connect_string_test.c
  101. Some files were not shown because too many files have changed in this diff Show More

296
BUILD
Unescape View File

@ -298,23 +298,23 @@ cc_library(
"src/core/lib/tsi/ssl_types.h", "src/core/lib/tsi/ssl_types.h",
"src/core/lib/tsi/transport_security.h", "src/core/lib/tsi/transport_security.h",
"src/core/lib/tsi/transport_security_interface.h", "src/core/lib/tsi/transport_security_interface.h",
"src/core/ext/client_config/client_channel.h", "src/core/ext/client_channel/client_channel.h",
"src/core/ext/client_config/client_channel_factory.h", "src/core/ext/client_channel/client_channel_factory.h",
"src/core/ext/client_config/connector.h", "src/core/ext/client_channel/connector.h",
"src/core/ext/client_config/http_connect_handshaker.h", "src/core/ext/client_channel/http_connect_handshaker.h",
"src/core/ext/client_config/initial_connect_string.h", "src/core/ext/client_channel/initial_connect_string.h",
"src/core/ext/client_config/lb_policy.h", "src/core/ext/client_channel/lb_policy.h",
"src/core/ext/client_config/lb_policy_factory.h", "src/core/ext/client_channel/lb_policy_factory.h",
"src/core/ext/client_config/lb_policy_registry.h", "src/core/ext/client_channel/lb_policy_registry.h",
"src/core/ext/client_config/method_config.h", "src/core/ext/client_channel/method_config.h",
"src/core/ext/client_config/parse_address.h", "src/core/ext/client_channel/parse_address.h",
"src/core/ext/client_config/resolver.h", "src/core/ext/client_channel/resolver.h",
"src/core/ext/client_config/resolver_factory.h", "src/core/ext/client_channel/resolver_factory.h",
"src/core/ext/client_config/resolver_registry.h", "src/core/ext/client_channel/resolver_registry.h",
"src/core/ext/client_config/resolver_result.h", "src/core/ext/client_channel/resolver_result.h",
"src/core/ext/client_config/subchannel.h", "src/core/ext/client_channel/subchannel.h",
"src/core/ext/client_config/subchannel_index.h", "src/core/ext/client_channel/subchannel_index.h",
"src/core/ext/client_config/uri_parser.h", "src/core/ext/client_channel/uri_parser.h",
"src/core/ext/lb_policy/grpclb/grpclb.h", "src/core/ext/lb_policy/grpclb/grpclb.h",
"src/core/ext/lb_policy/grpclb/load_balancer_api.h", "src/core/ext/lb_policy/grpclb/load_balancer_api.h",
"src/core/ext/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h", "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h",
@ -488,26 +488,26 @@ cc_library(
"src/core/lib/tsi/ssl_transport_security.c", "src/core/lib/tsi/ssl_transport_security.c",
"src/core/lib/tsi/transport_security.c", "src/core/lib/tsi/transport_security.c",
"src/core/ext/transport/chttp2/client/secure/secure_channel_create.c", "src/core/ext/transport/chttp2/client/secure/secure_channel_create.c",
"src/core/ext/client_config/channel_connectivity.c", "src/core/ext/client_channel/channel_connectivity.c",
"src/core/ext/client_config/client_channel.c", "src/core/ext/client_channel/client_channel.c",
"src/core/ext/client_config/client_channel_factory.c", "src/core/ext/client_channel/client_channel_factory.c",
"src/core/ext/client_config/client_config_plugin.c", "src/core/ext/client_channel/client_channel_plugin.c",
"src/core/ext/client_config/connector.c", "src/core/ext/client_channel/connector.c",
"src/core/ext/client_config/default_initial_connect_string.c", "src/core/ext/client_channel/default_initial_connect_string.c",
"src/core/ext/client_config/http_connect_handshaker.c", "src/core/ext/client_channel/http_connect_handshaker.c",
"src/core/ext/client_config/initial_connect_string.c", "src/core/ext/client_channel/initial_connect_string.c",
"src/core/ext/client_config/lb_policy.c", "src/core/ext/client_channel/lb_policy.c",
"src/core/ext/client_config/lb_policy_factory.c", "src/core/ext/client_channel/lb_policy_factory.c",
"src/core/ext/client_config/lb_policy_registry.c", "src/core/ext/client_channel/lb_policy_registry.c",
"src/core/ext/client_config/method_config.c", "src/core/ext/client_channel/method_config.c",
"src/core/ext/client_config/parse_address.c", "src/core/ext/client_channel/parse_address.c",
"src/core/ext/client_config/resolver.c", "src/core/ext/client_channel/resolver.c",
"src/core/ext/client_config/resolver_factory.c", "src/core/ext/client_channel/resolver_factory.c",
"src/core/ext/client_config/resolver_registry.c", "src/core/ext/client_channel/resolver_registry.c",
"src/core/ext/client_config/resolver_result.c", "src/core/ext/client_channel/resolver_result.c",
"src/core/ext/client_config/subchannel.c", "src/core/ext/client_channel/subchannel.c",
"src/core/ext/client_config/subchannel_index.c", "src/core/ext/client_channel/subchannel_index.c",
"src/core/ext/client_config/uri_parser.c", "src/core/ext/client_channel/uri_parser.c",
"src/core/ext/transport/chttp2/server/insecure/server_chttp2.c", "src/core/ext/transport/chttp2/server/insecure/server_chttp2.c",
"src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.c", "src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.c",
"src/core/ext/transport/chttp2/client/insecure/channel_create.c", "src/core/ext/transport/chttp2/client/insecure/channel_create.c",
@ -698,23 +698,23 @@ cc_library(
"src/core/ext/transport/chttp2/transport/stream_map.h", "src/core/ext/transport/chttp2/transport/stream_map.h",
"src/core/ext/transport/chttp2/transport/varint.h", "src/core/ext/transport/chttp2/transport/varint.h",
"src/core/ext/transport/chttp2/alpn/alpn.h", "src/core/ext/transport/chttp2/alpn/alpn.h",
"src/core/ext/client_config/client_channel.h", "src/core/ext/client_channel/client_channel.h",
"src/core/ext/client_config/client_channel_factory.h", "src/core/ext/client_channel/client_channel_factory.h",
"src/core/ext/client_config/connector.h", "src/core/ext/client_channel/connector.h",
"src/core/ext/client_config/http_connect_handshaker.h", "src/core/ext/client_channel/http_connect_handshaker.h",
"src/core/ext/client_config/initial_connect_string.h", "src/core/ext/client_channel/initial_connect_string.h",
"src/core/ext/client_config/lb_policy.h", "src/core/ext/client_channel/lb_policy.h",
"src/core/ext/client_config/lb_policy_factory.h", "src/core/ext/client_channel/lb_policy_factory.h",
"src/core/ext/client_config/lb_policy_registry.h", "src/core/ext/client_channel/lb_policy_registry.h",
"src/core/ext/client_config/method_config.h", "src/core/ext/client_channel/method_config.h",
"src/core/ext/client_config/parse_address.h", "src/core/ext/client_channel/parse_address.h",
"src/core/ext/client_config/resolver.h", "src/core/ext/client_channel/resolver.h",
"src/core/ext/client_config/resolver_factory.h", "src/core/ext/client_channel/resolver_factory.h",
"src/core/ext/client_config/resolver_registry.h", "src/core/ext/client_channel/resolver_registry.h",
"src/core/ext/client_config/resolver_result.h", "src/core/ext/client_channel/resolver_result.h",
"src/core/ext/client_config/subchannel.h", "src/core/ext/client_channel/subchannel.h",
"src/core/ext/client_config/subchannel_index.h", "src/core/ext/client_channel/subchannel_index.h",
"src/core/ext/client_config/uri_parser.h", "src/core/ext/client_channel/uri_parser.h",
"src/core/lib/security/context/security_context.h", "src/core/lib/security/context/security_context.h",
"src/core/lib/security/credentials/composite/composite_credentials.h", "src/core/lib/security/credentials/composite/composite_credentials.h",
"src/core/lib/security/credentials/credentials.h", "src/core/lib/security/credentials/credentials.h",
@ -871,26 +871,26 @@ cc_library(
"src/core/ext/transport/chttp2/transport/varint.c", "src/core/ext/transport/chttp2/transport/varint.c",
"src/core/ext/transport/chttp2/transport/writing.c", "src/core/ext/transport/chttp2/transport/writing.c",
"src/core/ext/transport/chttp2/alpn/alpn.c", "src/core/ext/transport/chttp2/alpn/alpn.c",
"src/core/ext/client_config/channel_connectivity.c", "src/core/ext/client_channel/channel_connectivity.c",
"src/core/ext/client_config/client_channel.c", "src/core/ext/client_channel/client_channel.c",
"src/core/ext/client_config/client_channel_factory.c", "src/core/ext/client_channel/client_channel_factory.c",
"src/core/ext/client_config/client_config_plugin.c", "src/core/ext/client_channel/client_channel_plugin.c",
"src/core/ext/client_config/connector.c", "src/core/ext/client_channel/connector.c",
"src/core/ext/client_config/default_initial_connect_string.c", "src/core/ext/client_channel/default_initial_connect_string.c",
"src/core/ext/client_config/http_connect_handshaker.c", "src/core/ext/client_channel/http_connect_handshaker.c",
"src/core/ext/client_config/initial_connect_string.c", "src/core/ext/client_channel/initial_connect_string.c",
"src/core/ext/client_config/lb_policy.c", "src/core/ext/client_channel/lb_policy.c",
"src/core/ext/client_config/lb_policy_factory.c", "src/core/ext/client_channel/lb_policy_factory.c",
"src/core/ext/client_config/lb_policy_registry.c", "src/core/ext/client_channel/lb_policy_registry.c",
"src/core/ext/client_config/method_config.c", "src/core/ext/client_channel/method_config.c",
"src/core/ext/client_config/parse_address.c", "src/core/ext/client_channel/parse_address.c",
"src/core/ext/client_config/resolver.c", "src/core/ext/client_channel/resolver.c",
"src/core/ext/client_config/resolver_factory.c", "src/core/ext/client_channel/resolver_factory.c",
"src/core/ext/client_config/resolver_registry.c", "src/core/ext/client_channel/resolver_registry.c",
"src/core/ext/client_config/resolver_result.c", "src/core/ext/client_channel/resolver_result.c",
"src/core/ext/client_config/subchannel.c", "src/core/ext/client_channel/subchannel.c",
"src/core/ext/client_config/subchannel_index.c", "src/core/ext/client_channel/subchannel_index.c",
"src/core/ext/client_config/uri_parser.c", "src/core/ext/client_channel/uri_parser.c",
"src/core/lib/http/httpcli_security_connector.c", "src/core/lib/http/httpcli_security_connector.c",
"src/core/lib/security/context/security_context.c", "src/core/lib/security/context/security_context.c",
"src/core/lib/security/credentials/composite/composite_credentials.c", "src/core/lib/security/credentials/composite/composite_credentials.c",
@ -1075,23 +1075,23 @@ cc_library(
"src/core/ext/transport/chttp2/transport/stream_map.h", "src/core/ext/transport/chttp2/transport/stream_map.h",
"src/core/ext/transport/chttp2/transport/varint.h", "src/core/ext/transport/chttp2/transport/varint.h",
"src/core/ext/transport/chttp2/alpn/alpn.h", "src/core/ext/transport/chttp2/alpn/alpn.h",
"src/core/ext/client_config/client_channel.h", "src/core/ext/client_channel/client_channel.h",
"src/core/ext/client_config/client_channel_factory.h", "src/core/ext/client_channel/client_channel_factory.h",
"src/core/ext/client_config/connector.h", "src/core/ext/client_channel/connector.h",
"src/core/ext/client_config/http_connect_handshaker.h", "src/core/ext/client_channel/http_connect_handshaker.h",
"src/core/ext/client_config/initial_connect_string.h", "src/core/ext/client_channel/initial_connect_string.h",
"src/core/ext/client_config/lb_policy.h", "src/core/ext/client_channel/lb_policy.h",
"src/core/ext/client_config/lb_policy_factory.h", "src/core/ext/client_channel/lb_policy_factory.h",
"src/core/ext/client_config/lb_policy_registry.h", "src/core/ext/client_channel/lb_policy_registry.h",
"src/core/ext/client_config/method_config.h", "src/core/ext/client_channel/method_config.h",
"src/core/ext/client_config/parse_address.h", "src/core/ext/client_channel/parse_address.h",
"src/core/ext/client_config/resolver.h", "src/core/ext/client_channel/resolver.h",
"src/core/ext/client_config/resolver_factory.h", "src/core/ext/client_channel/resolver_factory.h",
"src/core/ext/client_config/resolver_registry.h", "src/core/ext/client_channel/resolver_registry.h",
"src/core/ext/client_config/resolver_result.h", "src/core/ext/client_channel/resolver_result.h",
"src/core/ext/client_config/subchannel.h", "src/core/ext/client_channel/subchannel.h",
"src/core/ext/client_config/subchannel_index.h", "src/core/ext/client_channel/subchannel_index.h",
"src/core/ext/client_config/uri_parser.h", "src/core/ext/client_channel/uri_parser.h",
"src/core/ext/load_reporting/load_reporting.h", "src/core/ext/load_reporting/load_reporting.h",
"src/core/ext/load_reporting/load_reporting_filter.h", "src/core/ext/load_reporting/load_reporting_filter.h",
"src/core/ext/lb_policy/grpclb/grpclb.h", "src/core/ext/lb_policy/grpclb/grpclb.h",
@ -1241,26 +1241,26 @@ cc_library(
"src/core/ext/transport/chttp2/alpn/alpn.c", "src/core/ext/transport/chttp2/alpn/alpn.c",
"src/core/ext/transport/chttp2/client/insecure/channel_create.c", "src/core/ext/transport/chttp2/client/insecure/channel_create.c",
"src/core/ext/transport/chttp2/client/insecure/channel_create_posix.c", "src/core/ext/transport/chttp2/client/insecure/channel_create_posix.c",
"src/core/ext/client_config/channel_connectivity.c", "src/core/ext/client_channel/channel_connectivity.c",
"src/core/ext/client_config/client_channel.c", "src/core/ext/client_channel/client_channel.c",
"src/core/ext/client_config/client_channel_factory.c", "src/core/ext/client_channel/client_channel_factory.c",
"src/core/ext/client_config/client_config_plugin.c", "src/core/ext/client_channel/client_channel_plugin.c",
"src/core/ext/client_config/connector.c", "src/core/ext/client_channel/connector.c",
"src/core/ext/client_config/default_initial_connect_string.c", "src/core/ext/client_channel/default_initial_connect_string.c",
"src/core/ext/client_config/http_connect_handshaker.c", "src/core/ext/client_channel/http_connect_handshaker.c",
"src/core/ext/client_config/initial_connect_string.c", "src/core/ext/client_channel/initial_connect_string.c",
"src/core/ext/client_config/lb_policy.c", "src/core/ext/client_channel/lb_policy.c",
"src/core/ext/client_config/lb_policy_factory.c", "src/core/ext/client_channel/lb_policy_factory.c",
"src/core/ext/client_config/lb_policy_registry.c", "src/core/ext/client_channel/lb_policy_registry.c",
"src/core/ext/client_config/method_config.c", "src/core/ext/client_channel/method_config.c",
"src/core/ext/client_config/parse_address.c", "src/core/ext/client_channel/parse_address.c",
"src/core/ext/client_config/resolver.c", "src/core/ext/client_channel/resolver.c",
"src/core/ext/client_config/resolver_factory.c", "src/core/ext/client_channel/resolver_factory.c",
"src/core/ext/client_config/resolver_registry.c", "src/core/ext/client_channel/resolver_registry.c",
"src/core/ext/client_config/resolver_result.c", "src/core/ext/client_channel/resolver_result.c",
"src/core/ext/client_config/subchannel.c", "src/core/ext/client_channel/subchannel.c",
"src/core/ext/client_config/subchannel_index.c", "src/core/ext/client_channel/subchannel_index.c",
"src/core/ext/client_config/uri_parser.c", "src/core/ext/client_channel/uri_parser.c",
"src/core/ext/resolver/dns/native/dns_resolver.c", "src/core/ext/resolver/dns/native/dns_resolver.c",
"src/core/ext/resolver/sockaddr/sockaddr_resolver.c", "src/core/ext/resolver/sockaddr/sockaddr_resolver.c",
"src/core/ext/load_reporting/load_reporting.c", "src/core/ext/load_reporting/load_reporting.c",
@ -2043,26 +2043,26 @@ objc_library(
"src/core/lib/tsi/ssl_transport_security.c", "src/core/lib/tsi/ssl_transport_security.c",
"src/core/lib/tsi/transport_security.c", "src/core/lib/tsi/transport_security.c",
"src/core/ext/transport/chttp2/client/secure/secure_channel_create.c", "src/core/ext/transport/chttp2/client/secure/secure_channel_create.c",
"src/core/ext/client_config/channel_connectivity.c", "src/core/ext/client_channel/channel_connectivity.c",
"src/core/ext/client_config/client_channel.c", "src/core/ext/client_channel/client_channel.c",
"src/core/ext/client_config/client_channel_factory.c", "src/core/ext/client_channel/client_channel_factory.c",
"src/core/ext/client_config/client_config_plugin.c", "src/core/ext/client_channel/client_channel_plugin.c",
"src/core/ext/client_config/connector.c", "src/core/ext/client_channel/connector.c",
"src/core/ext/client_config/default_initial_connect_string.c", "src/core/ext/client_channel/default_initial_connect_string.c",
"src/core/ext/client_config/http_connect_handshaker.c", "src/core/ext/client_channel/http_connect_handshaker.c",
"src/core/ext/client_config/initial_connect_string.c", "src/core/ext/client_channel/initial_connect_string.c",
"src/core/ext/client_config/lb_policy.c", "src/core/ext/client_channel/lb_policy.c",
"src/core/ext/client_config/lb_policy_factory.c", "src/core/ext/client_channel/lb_policy_factory.c",
"src/core/ext/client_config/lb_policy_registry.c", "src/core/ext/client_channel/lb_policy_registry.c",
"src/core/ext/client_config/method_config.c", "src/core/ext/client_channel/method_config.c",
"src/core/ext/client_config/parse_address.c", "src/core/ext/client_channel/parse_address.c",
"src/core/ext/client_config/resolver.c", "src/core/ext/client_channel/resolver.c",
"src/core/ext/client_config/resolver_factory.c", "src/core/ext/client_channel/resolver_factory.c",
"src/core/ext/client_config/resolver_registry.c", "src/core/ext/client_channel/resolver_registry.c",
"src/core/ext/client_config/resolver_result.c", "src/core/ext/client_channel/resolver_result.c",
"src/core/ext/client_config/subchannel.c", "src/core/ext/client_channel/subchannel.c",
"src/core/ext/client_config/subchannel_index.c", "src/core/ext/client_channel/subchannel_index.c",
"src/core/ext/client_config/uri_parser.c", "src/core/ext/client_channel/uri_parser.c",
"src/core/ext/transport/chttp2/server/insecure/server_chttp2.c", "src/core/ext/transport/chttp2/server/insecure/server_chttp2.c",
"src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.c", "src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.c",
"src/core/ext/transport/chttp2/client/insecure/channel_create.c", "src/core/ext/transport/chttp2/client/insecure/channel_create.c",
@ -2255,23 +2255,23 @@ objc_library(
"src/core/lib/tsi/ssl_types.h", "src/core/lib/tsi/ssl_types.h",
"src/core/lib/tsi/transport_security.h", "src/core/lib/tsi/transport_security.h",
"src/core/lib/tsi/transport_security_interface.h", "src/core/lib/tsi/transport_security_interface.h",
"src/core/ext/client_config/client_channel.h", "src/core/ext/client_channel/client_channel.h",
"src/core/ext/client_config/client_channel_factory.h", "src/core/ext/client_channel/client_channel_factory.h",
"src/core/ext/client_config/connector.h", "src/core/ext/client_channel/connector.h",
"src/core/ext/client_config/http_connect_handshaker.h", "src/core/ext/client_channel/http_connect_handshaker.h",
"src/core/ext/client_config/initial_connect_string.h", "src/core/ext/client_channel/initial_connect_string.h",
"src/core/ext/client_config/lb_policy.h", "src/core/ext/client_channel/lb_policy.h",
"src/core/ext/client_config/lb_policy_factory.h", "src/core/ext/client_channel/lb_policy_factory.h",
"src/core/ext/client_config/lb_policy_registry.h", "src/core/ext/client_channel/lb_policy_registry.h",
"src/core/ext/client_config/method_config.h", "src/core/ext/client_channel/method_config.h",
"src/core/ext/client_config/parse_address.h", "src/core/ext/client_channel/parse_address.h",
"src/core/ext/client_config/resolver.h", "src/core/ext/client_channel/resolver.h",
"src/core/ext/client_config/resolver_factory.h", "src/core/ext/client_channel/resolver_factory.h",
"src/core/ext/client_config/resolver_registry.h", "src/core/ext/client_channel/resolver_registry.h",
"src/core/ext/client_config/resolver_result.h", "src/core/ext/client_channel/resolver_result.h",
"src/core/ext/client_config/subchannel.h", "src/core/ext/client_channel/subchannel.h",
"src/core/ext/client_config/subchannel_index.h", "src/core/ext/client_channel/subchannel_index.h",
"src/core/ext/client_config/uri_parser.h", "src/core/ext/client_channel/uri_parser.h",
"src/core/ext/lb_policy/grpclb/grpclb.h", "src/core/ext/lb_policy/grpclb/grpclb.h",
"src/core/ext/lb_policy/grpclb/load_balancer_api.h", "src/core/ext/lb_policy/grpclb/load_balancer_api.h",
"src/core/ext/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h", "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h",

120
CMakeLists.txt
Unescape View File

@ -446,26 +446,26 @@ add_library(grpc
src/core/lib/tsi/ssl_transport_security.c src/core/lib/tsi/ssl_transport_security.c
src/core/lib/tsi/transport_security.c src/core/lib/tsi/transport_security.c
src/core/ext/transport/chttp2/client/secure/secure_channel_create.c src/core/ext/transport/chttp2/client/secure/secure_channel_create.c
src/core/ext/client_config/channel_connectivity.c src/core/ext/client_channel/channel_connectivity.c
src/core/ext/client_config/client_channel.c src/core/ext/client_channel/client_channel.c
src/core/ext/client_config/client_channel_factory.c src/core/ext/client_channel/client_channel_factory.c
src/core/ext/client_config/client_config_plugin.c src/core/ext/client_channel/client_channel_plugin.c
src/core/ext/client_config/connector.c src/core/ext/client_channel/connector.c
src/core/ext/client_config/default_initial_connect_string.c src/core/ext/client_channel/default_initial_connect_string.c
src/core/ext/client_config/http_connect_handshaker.c src/core/ext/client_channel/http_connect_handshaker.c
src/core/ext/client_config/initial_connect_string.c src/core/ext/client_channel/initial_connect_string.c
src/core/ext/client_config/lb_policy.c src/core/ext/client_channel/lb_policy.c
src/core/ext/client_config/lb_policy_factory.c src/core/ext/client_channel/lb_policy_factory.c
src/core/ext/client_config/lb_policy_registry.c src/core/ext/client_channel/lb_policy_registry.c
src/core/ext/client_config/method_config.c src/core/ext/client_channel/method_config.c
src/core/ext/client_config/parse_address.c src/core/ext/client_channel/parse_address.c
src/core/ext/client_config/resolver.c src/core/ext/client_channel/resolver.c
src/core/ext/client_config/resolver_factory.c src/core/ext/client_channel/resolver_factory.c
src/core/ext/client_config/resolver_registry.c src/core/ext/client_channel/resolver_registry.c
src/core/ext/client_config/resolver_result.c src/core/ext/client_channel/resolver_result.c
src/core/ext/client_config/subchannel.c src/core/ext/client_channel/subchannel.c
src/core/ext/client_config/subchannel_index.c src/core/ext/client_channel/subchannel_index.c
src/core/ext/client_config/uri_parser.c src/core/ext/client_channel/uri_parser.c
src/core/ext/transport/chttp2/server/insecure/server_chttp2.c src/core/ext/transport/chttp2/server/insecure/server_chttp2.c
src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.c src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.c
src/core/ext/transport/chttp2/client/insecure/channel_create.c src/core/ext/transport/chttp2/client/insecure/channel_create.c
@ -693,26 +693,26 @@ add_library(grpc_cronet
src/core/ext/transport/chttp2/transport/varint.c src/core/ext/transport/chttp2/transport/varint.c
src/core/ext/transport/chttp2/transport/writing.c src/core/ext/transport/chttp2/transport/writing.c
src/core/ext/transport/chttp2/alpn/alpn.c src/core/ext/transport/chttp2/alpn/alpn.c
src/core/ext/client_config/channel_connectivity.c src/core/ext/client_channel/channel_connectivity.c
src/core/ext/client_config/client_channel.c src/core/ext/client_channel/client_channel.c
src/core/ext/client_config/client_channel_factory.c src/core/ext/client_channel/client_channel_factory.c
src/core/ext/client_config/client_config_plugin.c src/core/ext/client_channel/client_channel_plugin.c
src/core/ext/client_config/connector.c src/core/ext/client_channel/connector.c
src/core/ext/client_config/default_initial_connect_string.c src/core/ext/client_channel/default_initial_connect_string.c
src/core/ext/client_config/http_connect_handshaker.c src/core/ext/client_channel/http_connect_handshaker.c
src/core/ext/client_config/initial_connect_string.c src/core/ext/client_channel/initial_connect_string.c
src/core/ext/client_config/lb_policy.c src/core/ext/client_channel/lb_policy.c
src/core/ext/client_config/lb_policy_factory.c src/core/ext/client_channel/lb_policy_factory.c
src/core/ext/client_config/lb_policy_registry.c src/core/ext/client_channel/lb_policy_registry.c
src/core/ext/client_config/method_config.c src/core/ext/client_channel/method_config.c
src/core/ext/client_config/parse_address.c src/core/ext/client_channel/parse_address.c
src/core/ext/client_config/resolver.c src/core/ext/client_channel/resolver.c
src/core/ext/client_config/resolver_factory.c src/core/ext/client_channel/resolver_factory.c
src/core/ext/client_config/resolver_registry.c src/core/ext/client_channel/resolver_registry.c
src/core/ext/client_config/resolver_result.c src/core/ext/client_channel/resolver_result.c
src/core/ext/client_config/subchannel.c src/core/ext/client_channel/subchannel.c
src/core/ext/client_config/subchannel_index.c src/core/ext/client_channel/subchannel_index.c
src/core/ext/client_config/uri_parser.c src/core/ext/client_channel/uri_parser.c
src/core/lib/http/httpcli_security_connector.c src/core/lib/http/httpcli_security_connector.c
src/core/lib/security/context/security_context.c src/core/lib/security/context/security_context.c
src/core/lib/security/credentials/composite/composite_credentials.c src/core/lib/security/credentials/composite/composite_credentials.c
@ -937,26 +937,26 @@ add_library(grpc_unsecure
src/core/ext/transport/chttp2/alpn/alpn.c src/core/ext/transport/chttp2/alpn/alpn.c
src/core/ext/transport/chttp2/client/insecure/channel_create.c src/core/ext/transport/chttp2/client/insecure/channel_create.c
src/core/ext/transport/chttp2/client/insecure/channel_create_posix.c src/core/ext/transport/chttp2/client/insecure/channel_create_posix.c
src/core/ext/client_config/channel_connectivity.c src/core/ext/client_channel/channel_connectivity.c
src/core/ext/client_config/client_channel.c src/core/ext/client_channel/client_channel.c
src/core/ext/client_config/client_channel_factory.c src/core/ext/client_channel/client_channel_factory.c
src/core/ext/client_config/client_config_plugin.c src/core/ext/client_channel/client_channel_plugin.c
src/core/ext/client_config/connector.c src/core/ext/client_channel/connector.c
src/core/ext/client_config/default_initial_connect_string.c src/core/ext/client_channel/default_initial_connect_string.c
src/core/ext/client_config/http_connect_handshaker.c src/core/ext/client_channel/http_connect_handshaker.c
src/core/ext/client_config/initial_connect_string.c src/core/ext/client_channel/initial_connect_string.c
src/core/ext/client_config/lb_policy.c src/core/ext/client_channel/lb_policy.c
src/core/ext/client_config/lb_policy_factory.c src/core/ext/client_channel/lb_policy_factory.c
src/core/ext/client_config/lb_policy_registry.c src/core/ext/client_channel/lb_policy_registry.c
src/core/ext/client_config/method_config.c src/core/ext/client_channel/method_config.c
src/core/ext/client_config/parse_address.c src/core/ext/client_channel/parse_address.c
src/core/ext/client_config/resolver.c src/core/ext/client_channel/resolver.c
src/core/ext/client_config/resolver_factory.c src/core/ext/client_channel/resolver_factory.c
src/core/ext/client_config/resolver_registry.c src/core/ext/client_channel/resolver_registry.c
src/core/ext/client_config/resolver_result.c src/core/ext/client_channel/resolver_result.c
src/core/ext/client_config/subchannel.c src/core/ext/client_channel/subchannel.c
src/core/ext/client_config/subchannel_index.c src/core/ext/client_channel/subchannel_index.c
src/core/ext/client_config/uri_parser.c src/core/ext/client_channel/uri_parser.c
src/core/ext/resolver/dns/native/dns_resolver.c src/core/ext/resolver/dns/native/dns_resolver.c
src/core/ext/resolver/sockaddr/sockaddr_resolver.c src/core/ext/resolver/sockaddr/sockaddr_resolver.c
src/core/ext/load_reporting/load_reporting.c src/core/ext/load_reporting/load_reporting.c

156
Makefile
Unescape View File

@ -1232,9 +1232,9 @@ pc_cxx: $(LIBDIR)/$(CONFIG)/pkgconfig/grpc++.pc
pc_cxx_unsecure: $(LIBDIR)/$(CONFIG)/pkgconfig/grpc++_unsecure.pc pc_cxx_unsecure: $(LIBDIR)/$(CONFIG)/pkgconfig/grpc++_unsecure.pc
ifeq ($(EMBED_OPENSSL),true) ifeq ($(EMBED_OPENSSL),true)
privatelibs_cxx: $(LIBDIR)/$(CONFIG)/libgrpc++_reflection_codegen.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_cli_libs.a $(LIBDIR)/$(CONFIG)/libinterop_client_helper.a $(LIBDIR)/$(CONFIG)/libinterop_client_main.a $(LIBDIR)/$(CONFIG)/libinterop_server_helper.a $(LIBDIR)/$(CONFIG)/libinterop_server_lib.a $(LIBDIR)/$(CONFIG)/libinterop_server_main.a $(LIBDIR)/$(CONFIG)/libqps.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl_aes_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_asn1_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_base64_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_bio_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_bn_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_bytestring_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_aead_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_cipher_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_cmac_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_ed25519_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_x25519_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_dh_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_digest_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_ec_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_ecdsa_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_err_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_evp_extra_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_evp_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_pbkdf_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_hmac_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_pkcs12_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_pkcs8_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_poly1305_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_rsa_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_x509_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_ssl_test_lib.a privatelibs_cxx: $(LIBDIR)/$(CONFIG)/libgrpc++_reflection_codegen.a $(LIBDIR)/$(CONFIG)/libgrpc++_test.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_cli_libs.a $(LIBDIR)/$(CONFIG)/libinterop_client_helper.a $(LIBDIR)/$(CONFIG)/libinterop_client_main.a $(LIBDIR)/$(CONFIG)/libinterop_server_helper.a $(LIBDIR)/$(CONFIG)/libinterop_server_lib.a $(LIBDIR)/$(CONFIG)/libinterop_server_main.a $(LIBDIR)/$(CONFIG)/libqps.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl_aes_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_asn1_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_base64_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_bio_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_bn_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_bytestring_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_aead_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_cipher_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_cmac_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_ed25519_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_x25519_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_dh_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_digest_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_ec_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_ecdsa_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_err_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_evp_extra_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_evp_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_pbkdf_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_hmac_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_pkcs12_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_pkcs8_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_poly1305_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_rsa_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_x509_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_ssl_test_lib.a
else else
privatelibs_cxx: $(LIBDIR)/$(CONFIG)/libgrpc++_reflection_codegen.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_cli_libs.a $(LIBDIR)/$(CONFIG)/libinterop_client_helper.a $(LIBDIR)/$(CONFIG)/libinterop_client_main.a $(LIBDIR)/$(CONFIG)/libinterop_server_helper.a $(LIBDIR)/$(CONFIG)/libinterop_server_lib.a $(LIBDIR)/$(CONFIG)/libinterop_server_main.a $(LIBDIR)/$(CONFIG)/libqps.a privatelibs_cxx: $(LIBDIR)/$(CONFIG)/libgrpc++_reflection_codegen.a $(LIBDIR)/$(CONFIG)/libgrpc++_test.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_cli_libs.a $(LIBDIR)/$(CONFIG)/libinterop_client_helper.a $(LIBDIR)/$(CONFIG)/libinterop_client_main.a $(LIBDIR)/$(CONFIG)/libinterop_server_helper.a $(LIBDIR)/$(CONFIG)/libinterop_server_lib.a $(LIBDIR)/$(CONFIG)/libinterop_server_main.a $(LIBDIR)/$(CONFIG)/libqps.a
endif endif
@ -2707,26 +2707,26 @@ LIBGRPC_SRC = \
src/core/lib/tsi/ssl_transport_security.c \ src/core/lib/tsi/ssl_transport_security.c \
src/core/lib/tsi/transport_security.c \ src/core/lib/tsi/transport_security.c \
src/core/ext/transport/chttp2/client/secure/secure_channel_create.c \ src/core/ext/transport/chttp2/client/secure/secure_channel_create.c \
src/core/ext/client_config/channel_connectivity.c \ src/core/ext/client_channel/channel_connectivity.c \
src/core/ext/client_config/client_channel.c \ src/core/ext/client_channel/client_channel.c \
src/core/ext/client_config/client_channel_factory.c \ src/core/ext/client_channel/client_channel_factory.c \
src/core/ext/client_config/client_config_plugin.c \ src/core/ext/client_channel/client_channel_plugin.c \
src/core/ext/client_config/connector.c \ src/core/ext/client_channel/connector.c \
src/core/ext/client_config/default_initial_connect_string.c \ src/core/ext/client_channel/default_initial_connect_string.c \
src/core/ext/client_config/http_connect_handshaker.c \ src/core/ext/client_channel/http_connect_handshaker.c \
src/core/ext/client_config/initial_connect_string.c \ src/core/ext/client_channel/initial_connect_string.c \
src/core/ext/client_config/lb_policy.c \ src/core/ext/client_channel/lb_policy.c \
src/core/ext/client_config/lb_policy_factory.c \ src/core/ext/client_channel/lb_policy_factory.c \
src/core/ext/client_config/lb_policy_registry.c \ src/core/ext/client_channel/lb_policy_registry.c \
src/core/ext/client_config/method_config.c \ src/core/ext/client_channel/method_config.c \
src/core/ext/client_config/parse_address.c \ src/core/ext/client_channel/parse_address.c \
src/core/ext/client_config/resolver.c \ src/core/ext/client_channel/resolver.c \
src/core/ext/client_config/resolver_factory.c \ src/core/ext/client_channel/resolver_factory.c \
src/core/ext/client_config/resolver_registry.c \ src/core/ext/client_channel/resolver_registry.c \
src/core/ext/client_config/resolver_result.c \ src/core/ext/client_channel/resolver_result.c \
src/core/ext/client_config/subchannel.c \ src/core/ext/client_channel/subchannel.c \
src/core/ext/client_config/subchannel_index.c \ src/core/ext/client_channel/subchannel_index.c \
src/core/ext/client_config/uri_parser.c \ src/core/ext/client_channel/uri_parser.c \
src/core/ext/transport/chttp2/server/insecure/server_chttp2.c \ src/core/ext/transport/chttp2/server/insecure/server_chttp2.c \
src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.c \ src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.c \
src/core/ext/transport/chttp2/client/insecure/channel_create.c \ src/core/ext/transport/chttp2/client/insecure/channel_create.c \
@ -2972,26 +2972,26 @@ LIBGRPC_CRONET_SRC = \
src/core/ext/transport/chttp2/transport/varint.c \ src/core/ext/transport/chttp2/transport/varint.c \
src/core/ext/transport/chttp2/transport/writing.c \ src/core/ext/transport/chttp2/transport/writing.c \
src/core/ext/transport/chttp2/alpn/alpn.c \ src/core/ext/transport/chttp2/alpn/alpn.c \
src/core/ext/client_config/channel_connectivity.c \ src/core/ext/client_channel/channel_connectivity.c \
src/core/ext/client_config/client_channel.c \ src/core/ext/client_channel/client_channel.c \
src/core/ext/client_config/client_channel_factory.c \ src/core/ext/client_channel/client_channel_factory.c \
src/core/ext/client_config/client_config_plugin.c \ src/core/ext/client_channel/client_channel_plugin.c \
src/core/ext/client_config/connector.c \ src/core/ext/client_channel/connector.c \
src/core/ext/client_config/default_initial_connect_string.c \ src/core/ext/client_channel/default_initial_connect_string.c \
src/core/ext/client_config/http_connect_handshaker.c \ src/core/ext/client_channel/http_connect_handshaker.c \
src/core/ext/client_config/initial_connect_string.c \ src/core/ext/client_channel/initial_connect_string.c \
src/core/ext/client_config/lb_policy.c \ src/core/ext/client_channel/lb_policy.c \
src/core/ext/client_config/lb_policy_factory.c \ src/core/ext/client_channel/lb_policy_factory.c \
src/core/ext/client_config/lb_policy_registry.c \ src/core/ext/client_channel/lb_policy_registry.c \
src/core/ext/client_config/method_config.c \ src/core/ext/client_channel/method_config.c \
src/core/ext/client_config/parse_address.c \ src/core/ext/client_channel/parse_address.c \
src/core/ext/client_config/resolver.c \ src/core/ext/client_channel/resolver.c \
src/core/ext/client_config/resolver_factory.c \ src/core/ext/client_channel/resolver_factory.c \
src/core/ext/client_config/resolver_registry.c \ src/core/ext/client_channel/resolver_registry.c \
src/core/ext/client_config/resolver_result.c \ src/core/ext/client_channel/resolver_result.c \
src/core/ext/client_config/subchannel.c \ src/core/ext/client_channel/subchannel.c \
src/core/ext/client_config/subchannel_index.c \ src/core/ext/client_channel/subchannel_index.c \
src/core/ext/client_config/uri_parser.c \ src/core/ext/client_channel/uri_parser.c \
src/core/lib/http/httpcli_security_connector.c \ src/core/lib/http/httpcli_security_connector.c \
src/core/lib/security/context/security_context.c \ src/core/lib/security/context/security_context.c \
src/core/lib/security/credentials/composite/composite_credentials.c \ src/core/lib/security/credentials/composite/composite_credentials.c \
@ -3461,26 +3461,26 @@ LIBGRPC_UNSECURE_SRC = \
src/core/ext/transport/chttp2/alpn/alpn.c \ src/core/ext/transport/chttp2/alpn/alpn.c \
src/core/ext/transport/chttp2/client/insecure/channel_create.c \ src/core/ext/transport/chttp2/client/insecure/channel_create.c \
src/core/ext/transport/chttp2/client/insecure/channel_create_posix.c \ src/core/ext/transport/chttp2/client/insecure/channel_create_posix.c \
src/core/ext/client_config/channel_connectivity.c \ src/core/ext/client_channel/channel_connectivity.c \
src/core/ext/client_config/client_channel.c \ src/core/ext/client_channel/client_channel.c \
src/core/ext/client_config/client_channel_factory.c \ src/core/ext/client_channel/client_channel_factory.c \
src/core/ext/client_config/client_config_plugin.c \ src/core/ext/client_channel/client_channel_plugin.c \
src/core/ext/client_config/connector.c \ src/core/ext/client_channel/connector.c \
src/core/ext/client_config/default_initial_connect_string.c \ src/core/ext/client_channel/default_initial_connect_string.c \
src/core/ext/client_config/http_connect_handshaker.c \ src/core/ext/client_channel/http_connect_handshaker.c \
src/core/ext/client_config/initial_connect_string.c \ src/core/ext/client_channel/initial_connect_string.c \
src/core/ext/client_config/lb_policy.c \ src/core/ext/client_channel/lb_policy.c \
src/core/ext/client_config/lb_policy_factory.c \ src/core/ext/client_channel/lb_policy_factory.c \
src/core/ext/client_config/lb_policy_registry.c \ src/core/ext/client_channel/lb_policy_registry.c \
src/core/ext/client_config/method_config.c \ src/core/ext/client_channel/method_config.c \
src/core/ext/client_config/parse_address.c \ src/core/ext/client_channel/parse_address.c \
src/core/ext/client_config/resolver.c \ src/core/ext/client_channel/resolver.c \
src/core/ext/client_config/resolver_factory.c \ src/core/ext/client_channel/resolver_factory.c \
src/core/ext/client_config/resolver_registry.c \ src/core/ext/client_channel/resolver_registry.c \
src/core/ext/client_config/resolver_result.c \ src/core/ext/client_channel/resolver_result.c \
src/core/ext/client_config/subchannel.c \ src/core/ext/client_channel/subchannel.c \
src/core/ext/client_config/subchannel_index.c \ src/core/ext/client_channel/subchannel_index.c \
src/core/ext/client_config/uri_parser.c \ src/core/ext/client_channel/uri_parser.c \
src/core/ext/resolver/dns/native/dns_resolver.c \ src/core/ext/resolver/dns/native/dns_resolver.c \
src/core/ext/resolver/sockaddr/sockaddr_resolver.c \ src/core/ext/resolver/sockaddr/sockaddr_resolver.c \
src/core/ext/load_reporting/load_reporting.c \ src/core/ext/load_reporting/load_reporting.c \
@ -7519,7 +7519,7 @@ endif
DNS_RESOLVER_CONNECTIVITY_TEST_SRC = \ DNS_RESOLVER_CONNECTIVITY_TEST_SRC = \
test/core/client_config/resolvers/dns_resolver_connectivity_test.c \ test/core/client_channel/resolvers/dns_resolver_connectivity_test.c \
DNS_RESOLVER_CONNECTIVITY_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(DNS_RESOLVER_CONNECTIVITY_TEST_SRC)))) DNS_RESOLVER_CONNECTIVITY_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(DNS_RESOLVER_CONNECTIVITY_TEST_SRC))))
ifeq ($(NO_SECURE),true) ifeq ($(NO_SECURE),true)
@ -7539,7 +7539,7 @@ $(BINDIR)/$(CONFIG)/dns_resolver_connectivity_test: $(DNS_RESOLVER_CONNECTIVITY_
endif endif
$(OBJDIR)/$(CONFIG)/test/core/client_config/resolvers/dns_resolver_connectivity_test.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(OBJDIR)/$(CONFIG)/test/core/client_channel/resolvers/dns_resolver_connectivity_test.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
deps_dns_resolver_connectivity_test: $(DNS_RESOLVER_CONNECTIVITY_TEST_OBJS:.o=.dep) deps_dns_resolver_connectivity_test: $(DNS_RESOLVER_CONNECTIVITY_TEST_OBJS:.o=.dep)
@ -7551,7 +7551,7 @@ endif
DNS_RESOLVER_TEST_SRC = \ DNS_RESOLVER_TEST_SRC = \
test/core/client_config/resolvers/dns_resolver_test.c \ test/core/client_channel/resolvers/dns_resolver_test.c \
DNS_RESOLVER_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(DNS_RESOLVER_TEST_SRC)))) DNS_RESOLVER_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(DNS_RESOLVER_TEST_SRC))))
ifeq ($(NO_SECURE),true) ifeq ($(NO_SECURE),true)
@ -7571,7 +7571,7 @@ $(BINDIR)/$(CONFIG)/dns_resolver_test: $(DNS_RESOLVER_TEST_OBJS) $(LIBDIR)/$(CON
endif endif
$(OBJDIR)/$(CONFIG)/test/core/client_config/resolvers/dns_resolver_test.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(OBJDIR)/$(CONFIG)/test/core/client_channel/resolvers/dns_resolver_test.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
deps_dns_resolver_test: $(DNS_RESOLVER_TEST_OBJS:.o=.dep) deps_dns_resolver_test: $(DNS_RESOLVER_TEST_OBJS:.o=.dep)
@ -9727,7 +9727,7 @@ endif
LB_POLICIES_TEST_SRC = \ LB_POLICIES_TEST_SRC = \
test/core/client_config/lb_policies_test.c \ test/core/client_channel/lb_policies_test.c \
LB_POLICIES_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LB_POLICIES_TEST_SRC)))) LB_POLICIES_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LB_POLICIES_TEST_SRC))))
ifeq ($(NO_SECURE),true) ifeq ($(NO_SECURE),true)
@ -9747,7 +9747,7 @@ $(BINDIR)/$(CONFIG)/lb_policies_test: $(LB_POLICIES_TEST_OBJS) $(LIBDIR)/$(CONFI
endif endif
$(OBJDIR)/$(CONFIG)/test/core/client_config/lb_policies_test.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(OBJDIR)/$(CONFIG)/test/core/client_channel/lb_policies_test.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
deps_lb_policies_test: $(LB_POLICIES_TEST_OBJS:.o=.dep) deps_lb_policies_test: $(LB_POLICIES_TEST_OBJS:.o=.dep)
@ -10335,7 +10335,7 @@ endif
SET_INITIAL_CONNECT_STRING_TEST_SRC = \ SET_INITIAL_CONNECT_STRING_TEST_SRC = \
test/core/client_config/set_initial_connect_string_test.c \ test/core/client_channel/set_initial_connect_string_test.c \
SET_INITIAL_CONNECT_STRING_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(SET_INITIAL_CONNECT_STRING_TEST_SRC)))) SET_INITIAL_CONNECT_STRING_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(SET_INITIAL_CONNECT_STRING_TEST_SRC))))
ifeq ($(NO_SECURE),true) ifeq ($(NO_SECURE),true)
@ -10355,7 +10355,7 @@ $(BINDIR)/$(CONFIG)/set_initial_connect_string_test: $(SET_INITIAL_CONNECT_STRIN
endif endif
$(OBJDIR)/$(CONFIG)/test/core/client_config/set_initial_connect_string_test.o: $(LIBDIR)/$(CONFIG)/libtest_tcp_server.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(OBJDIR)/$(CONFIG)/test/core/client_channel/set_initial_connect_string_test.o: $(LIBDIR)/$(CONFIG)/libtest_tcp_server.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
deps_set_initial_connect_string_test: $(SET_INITIAL_CONNECT_STRING_TEST_OBJS:.o=.dep) deps_set_initial_connect_string_test: $(SET_INITIAL_CONNECT_STRING_TEST_OBJS:.o=.dep)
@ -10367,7 +10367,7 @@ endif
SOCKADDR_RESOLVER_TEST_SRC = \ SOCKADDR_RESOLVER_TEST_SRC = \
test/core/client_config/resolvers/sockaddr_resolver_test.c \ test/core/client_channel/resolvers/sockaddr_resolver_test.c \
SOCKADDR_RESOLVER_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(SOCKADDR_RESOLVER_TEST_SRC)))) SOCKADDR_RESOLVER_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(SOCKADDR_RESOLVER_TEST_SRC))))
ifeq ($(NO_SECURE),true) ifeq ($(NO_SECURE),true)
@ -10387,7 +10387,7 @@ $(BINDIR)/$(CONFIG)/sockaddr_resolver_test: $(SOCKADDR_RESOLVER_TEST_OBJS) $(LIB
endif endif
$(OBJDIR)/$(CONFIG)/test/core/client_config/resolvers/sockaddr_resolver_test.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(OBJDIR)/$(CONFIG)/test/core/client_channel/resolvers/sockaddr_resolver_test.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
deps_sockaddr_resolver_test: $(SOCKADDR_RESOLVER_TEST_OBJS:.o=.dep) deps_sockaddr_resolver_test: $(SOCKADDR_RESOLVER_TEST_OBJS:.o=.dep)
@ -10815,7 +10815,7 @@ endif
URI_FUZZER_TEST_SRC = \ URI_FUZZER_TEST_SRC = \
test/core/client_config/uri_fuzzer_test.c \ test/core/client_channel/uri_fuzzer_test.c \
URI_FUZZER_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(URI_FUZZER_TEST_SRC)))) URI_FUZZER_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(URI_FUZZER_TEST_SRC))))
ifeq ($(NO_SECURE),true) ifeq ($(NO_SECURE),true)
@ -10835,7 +10835,7 @@ $(BINDIR)/$(CONFIG)/uri_fuzzer_test: $(URI_FUZZER_TEST_OBJS) $(LIBDIR)/$(CONFIG)
endif endif
$(OBJDIR)/$(CONFIG)/test/core/client_config/uri_fuzzer_test.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(OBJDIR)/$(CONFIG)/test/core/client_channel/uri_fuzzer_test.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
deps_uri_fuzzer_test: $(URI_FUZZER_TEST_OBJS:.o=.dep) deps_uri_fuzzer_test: $(URI_FUZZER_TEST_OBJS:.o=.dep)
@ -10847,7 +10847,7 @@ endif
URI_PARSER_TEST_SRC = \ URI_PARSER_TEST_SRC = \
test/core/client_config/uri_parser_test.c \ test/core/client_channel/uri_parser_test.c \
URI_PARSER_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(URI_PARSER_TEST_SRC)))) URI_PARSER_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(URI_PARSER_TEST_SRC))))
ifeq ($(NO_SECURE),true) ifeq ($(NO_SECURE),true)
@ -10867,7 +10867,7 @@ $(BINDIR)/$(CONFIG)/uri_parser_test: $(URI_PARSER_TEST_OBJS) $(LIBDIR)/$(CONFIG)
endif endif
$(OBJDIR)/$(CONFIG)/test/core/client_config/uri_parser_test.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(OBJDIR)/$(CONFIG)/test/core/client_channel/uri_parser_test.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
deps_uri_parser_test: $(URI_PARSER_TEST_OBJS:.o=.dep) deps_uri_parser_test: $(URI_PARSER_TEST_OBJS:.o=.dep)
@ -15835,7 +15835,7 @@ endif
URI_FUZZER_TEST_ONE_ENTRY_SRC = \ URI_FUZZER_TEST_ONE_ENTRY_SRC = \
test/core/client_config/uri_fuzzer_test.c \ test/core/client_channel/uri_fuzzer_test.c \
test/core/util/one_corpus_entry_fuzzer.c \ test/core/util/one_corpus_entry_fuzzer.c \
URI_FUZZER_TEST_ONE_ENTRY_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(URI_FUZZER_TEST_ONE_ENTRY_SRC)))) URI_FUZZER_TEST_ONE_ENTRY_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(URI_FUZZER_TEST_ONE_ENTRY_SRC))))
@ -15856,7 +15856,7 @@ $(BINDIR)/$(CONFIG)/uri_fuzzer_test_one_entry: $(URI_FUZZER_TEST_ONE_ENTRY_OBJS)
endif endif
$(OBJDIR)/$(CONFIG)/test/core/client_config/uri_fuzzer_test.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(OBJDIR)/$(CONFIG)/test/core/client_channel/uri_fuzzer_test.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
$(OBJDIR)/$(CONFIG)/test/core/util/one_corpus_entry_fuzzer.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(OBJDIR)/$(CONFIG)/test/core/util/one_corpus_entry_fuzzer.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a

40
binding.gyp
Unescape View File

@ -724,26 +724,26 @@
'src/core/lib/tsi/ssl_transport_security.c', 'src/core/lib/tsi/ssl_transport_security.c',
'src/core/lib/tsi/transport_security.c', 'src/core/lib/tsi/transport_security.c',
'src/core/ext/transport/chttp2/client/secure/secure_channel_create.c', 'src/core/ext/transport/chttp2/client/secure/secure_channel_create.c',
'src/core/ext/client_config/channel_connectivity.c', 'src/core/ext/client_channel/channel_connectivity.c',
'src/core/ext/client_config/client_channel.c', 'src/core/ext/client_channel/client_channel.c',
'src/core/ext/client_config/client_channel_factory.c', 'src/core/ext/client_channel/client_channel_factory.c',
'src/core/ext/client_config/client_config_plugin.c', 'src/core/ext/client_channel/client_channel_plugin.c',
'src/core/ext/client_config/connector.c', 'src/core/ext/client_channel/connector.c',
'src/core/ext/client_config/default_initial_connect_string.c', 'src/core/ext/client_channel/default_initial_connect_string.c',
'src/core/ext/client_config/http_connect_handshaker.c', 'src/core/ext/client_channel/http_connect_handshaker.c',
'src/core/ext/client_config/initial_connect_string.c', 'src/core/ext/client_channel/initial_connect_string.c',
'src/core/ext/client_config/lb_policy.c', 'src/core/ext/client_channel/lb_policy.c',
'src/core/ext/client_config/lb_policy_factory.c', 'src/core/ext/client_channel/lb_policy_factory.c',
'src/core/ext/client_config/lb_policy_registry.c', 'src/core/ext/client_channel/lb_policy_registry.c',
'src/core/ext/client_config/method_config.c', 'src/core/ext/client_channel/method_config.c',
'src/core/ext/client_config/parse_address.c', 'src/core/ext/client_channel/parse_address.c',
'src/core/ext/client_config/resolver.c', 'src/core/ext/client_channel/resolver.c',
'src/core/ext/client_config/resolver_factory.c', 'src/core/ext/client_channel/resolver_factory.c',
'src/core/ext/client_config/resolver_registry.c', 'src/core/ext/client_channel/resolver_registry.c',
'src/core/ext/client_config/resolver_result.c', 'src/core/ext/client_channel/resolver_result.c',
'src/core/ext/client_config/subchannel.c', 'src/core/ext/client_channel/subchannel.c',
'src/core/ext/client_config/subchannel_index.c', 'src/core/ext/client_channel/subchannel_index.c',
'src/core/ext/client_config/uri_parser.c', 'src/core/ext/client_channel/uri_parser.c',
'src/core/ext/transport/chttp2/server/insecure/server_chttp2.c', 'src/core/ext/transport/chttp2/server/insecure/server_chttp2.c',
'src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.c', 'src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.c',
'src/core/ext/transport/chttp2/client/insecure/channel_create.c', 'src/core/ext/transport/chttp2/client/insecure/channel_create.c',

112
build.yaml
Unescape View File

@ -367,47 +367,47 @@ filegroups:
- gpr - gpr
uses: uses:
- grpc_codegen - grpc_codegen
- name: grpc_client_config - name: grpc_client_channel
headers: headers:
- src/core/ext/client_config/client_channel.h - src/core/ext/client_channel/client_channel.h
- src/core/ext/client_config/client_channel_factory.h - src/core/ext/client_channel/client_channel_factory.h
- src/core/ext/client_config/connector.h - src/core/ext/client_channel/connector.h
- src/core/ext/client_config/http_connect_handshaker.h - src/core/ext/client_channel/http_connect_handshaker.h
- src/core/ext/client_config/initial_connect_string.h - src/core/ext/client_channel/initial_connect_string.h
- src/core/ext/client_config/lb_policy.h - src/core/ext/client_channel/lb_policy.h
- src/core/ext/client_config/lb_policy_factory.h - src/core/ext/client_channel/lb_policy_factory.h
- src/core/ext/client_config/lb_policy_registry.h - src/core/ext/client_channel/lb_policy_registry.h
- src/core/ext/client_config/method_config.h - src/core/ext/client_channel/method_config.h
- src/core/ext/client_config/parse_address.h - src/core/ext/client_channel/parse_address.h
- src/core/ext/client_config/resolver.h - src/core/ext/client_channel/resolver.h
- src/core/ext/client_config/resolver_factory.h - src/core/ext/client_channel/resolver_factory.h
- src/core/ext/client_config/resolver_registry.h - src/core/ext/client_channel/resolver_registry.h
- src/core/ext/client_config/resolver_result.h - src/core/ext/client_channel/resolver_result.h
- src/core/ext/client_config/subchannel.h - src/core/ext/client_channel/subchannel.h
- src/core/ext/client_config/subchannel_index.h - src/core/ext/client_channel/subchannel_index.h
- src/core/ext/client_config/uri_parser.h - src/core/ext/client_channel/uri_parser.h
src: src:
- src/core/ext/client_config/channel_connectivity.c - src/core/ext/client_channel/channel_connectivity.c
- src/core/ext/client_config/client_channel.c - src/core/ext/client_channel/client_channel.c
- src/core/ext/client_config/client_channel_factory.c - src/core/ext/client_channel/client_channel_factory.c
- src/core/ext/client_config/client_config_plugin.c - src/core/ext/client_channel/client_channel_plugin.c
- src/core/ext/client_config/connector.c - src/core/ext/client_channel/connector.c
- src/core/ext/client_config/default_initial_connect_string.c - src/core/ext/client_channel/default_initial_connect_string.c
- src/core/ext/client_config/http_connect_handshaker.c - src/core/ext/client_channel/http_connect_handshaker.c
- src/core/ext/client_config/initial_connect_string.c - src/core/ext/client_channel/initial_connect_string.c
- src/core/ext/client_config/lb_policy.c - src/core/ext/client_channel/lb_policy.c
- src/core/ext/client_config/lb_policy_factory.c - src/core/ext/client_channel/lb_policy_factory.c
- src/core/ext/client_config/lb_policy_registry.c - src/core/ext/client_channel/lb_policy_registry.c
- src/core/ext/client_config/method_config.c - src/core/ext/client_channel/method_config.c
- src/core/ext/client_config/parse_address.c - src/core/ext/client_channel/parse_address.c
- src/core/ext/client_config/resolver.c - src/core/ext/client_channel/resolver.c
- src/core/ext/client_config/resolver_factory.c - src/core/ext/client_channel/resolver_factory.c
- src/core/ext/client_config/resolver_registry.c - src/core/ext/client_channel/resolver_registry.c
- src/core/ext/client_config/resolver_result.c - src/core/ext/client_channel/resolver_result.c
- src/core/ext/client_config/subchannel.c - src/core/ext/client_channel/subchannel.c
- src/core/ext/client_config/subchannel_index.c - src/core/ext/client_channel/subchannel_index.c
- src/core/ext/client_config/uri_parser.c - src/core/ext/client_channel/uri_parser.c
plugin: grpc_client_config plugin: grpc_client_channel
uses: uses:
- grpc_base - grpc_base
- name: grpc_codegen - name: grpc_codegen
@ -432,7 +432,7 @@ filegroups:
plugin: grpc_lb_policy_grpclb plugin: grpc_lb_policy_grpclb
uses: uses:
- grpc_base - grpc_base
- grpc_client_config - grpc_client_channel
- nanopb - nanopb
- name: grpc_lb_policy_pick_first - name: grpc_lb_policy_pick_first
src: src:
@ -440,14 +440,14 @@ filegroups:
plugin: grpc_lb_policy_pick_first plugin: grpc_lb_policy_pick_first
uses: uses:
- grpc_base - grpc_base
- grpc_client_config - grpc_client_channel
- name: grpc_lb_policy_round_robin - name: grpc_lb_policy_round_robin
src: src:
- src/core/ext/lb_policy/round_robin/round_robin.c - src/core/ext/lb_policy/round_robin/round_robin.c
plugin: grpc_lb_policy_round_robin plugin: grpc_lb_policy_round_robin
uses: uses:
- grpc_base - grpc_base
- grpc_client_config - grpc_client_channel
- name: grpc_load_reporting - name: grpc_load_reporting
headers: headers:
- src/core/ext/load_reporting/load_reporting.h - src/core/ext/load_reporting/load_reporting.h
@ -464,14 +464,14 @@ filegroups:
plugin: grpc_resolver_dns_native plugin: grpc_resolver_dns_native
uses: uses:
- grpc_base - grpc_base
- grpc_client_config - grpc_client_channel
- name: grpc_resolver_sockaddr - name: grpc_resolver_sockaddr
src: src:
- src/core/ext/resolver/sockaddr/sockaddr_resolver.c - src/core/ext/resolver/sockaddr/sockaddr_resolver.c
plugin: grpc_resolver_sockaddr plugin: grpc_resolver_sockaddr
uses: uses:
- grpc_base - grpc_base
- grpc_client_config - grpc_client_channel
- name: grpc_secure - name: grpc_secure
public_headers: public_headers:
- include/grpc/grpc_security.h - include/grpc/grpc_security.h
@ -622,14 +622,14 @@ filegroups:
uses: uses:
- grpc_transport_chttp2 - grpc_transport_chttp2
- grpc_base - grpc_base
- grpc_client_config - grpc_client_channel
- name: grpc_transport_chttp2_client_secure - name: grpc_transport_chttp2_client_secure
src: src:
- src/core/ext/transport/chttp2/client/secure/secure_channel_create.c - src/core/ext/transport/chttp2/client/secure/secure_channel_create.c
uses: uses:
- grpc_transport_chttp2 - grpc_transport_chttp2
- grpc_base - grpc_base
- grpc_client_config - grpc_client_channel
- grpc_secure - grpc_secure
- name: grpc_transport_chttp2_server_insecure - name: grpc_transport_chttp2_server_insecure
src: src:
@ -1048,7 +1048,7 @@ libs:
src: src:
- src/proto/grpc/reflection/v1alpha/reflection.proto - src/proto/grpc/reflection/v1alpha/reflection.proto
- name: grpc++_test - name: grpc++_test
build: test build: private
language: c++ language: c++
headers: headers:
- include/grpc++/test/server_context_test_spouse.h - include/grpc++/test/server_context_test_spouse.h
@ -1519,7 +1519,7 @@ targets:
build: test build: test
language: c language: c
src: src:
- test/core/client_config/resolvers/dns_resolver_connectivity_test.c - test/core/client_channel/resolvers/dns_resolver_connectivity_test.c
deps: deps:
- grpc_test_util - grpc_test_util
- grpc - grpc
@ -1531,7 +1531,7 @@ targets:
build: test build: test
language: c language: c
src: src:
- test/core/client_config/resolvers/dns_resolver_test.c - test/core/client_channel/resolvers/dns_resolver_test.c
deps: deps:
- grpc_test_util - grpc_test_util
- grpc - grpc
@ -2239,7 +2239,7 @@ targets:
build: test build: test
language: c language: c
src: src:
- test/core/client_config/lb_policies_test.c - test/core/client_channel/lb_policies_test.c
deps: deps:
- grpc_test_util - grpc_test_util
- grpc - grpc
@ -2456,7 +2456,7 @@ targets:
build: test build: test
language: c language: c
src: src:
- test/core/client_config/set_initial_connect_string_test.c - test/core/client_channel/set_initial_connect_string_test.c
deps: deps:
- test_tcp_server - test_tcp_server
- grpc_test_util - grpc_test_util
@ -2469,7 +2469,7 @@ targets:
build: test build: test
language: c language: c
src: src:
- test/core/client_config/resolvers/sockaddr_resolver_test.c - test/core/client_channel/resolvers/sockaddr_resolver_test.c
deps: deps:
- grpc_test_util - grpc_test_util
- grpc - grpc
@ -2649,20 +2649,20 @@ targets:
build: fuzzer build: fuzzer
language: c language: c
src: src:
- test/core/client_config/uri_fuzzer_test.c - test/core/client_channel/uri_fuzzer_test.c
deps: deps:
- grpc_test_util - grpc_test_util
- grpc - grpc
- gpr_test_util - gpr_test_util
- gpr - gpr
corpus_dirs: corpus_dirs:
- test/core/client_config/uri_corpus - test/core/client_channel/uri_corpus
maxlen: 128 maxlen: 128
- name: uri_parser_test - name: uri_parser_test
build: test build: test
language: c language: c
src: src:
- test/core/client_config/uri_parser_test.c - test/core/client_channel/uri_parser_test.c
deps: deps:
- grpc_test_util - grpc_test_util
- grpc - grpc

42
config.m4
Unescape View File

@ -240,26 +240,26 @@ if test "$PHP_GRPC" != "no"; then
src/core/lib/tsi/ssl_transport_security.c \ src/core/lib/tsi/ssl_transport_security.c \
src/core/lib/tsi/transport_security.c \ src/core/lib/tsi/transport_security.c \
src/core/ext/transport/chttp2/client/secure/secure_channel_create.c \ src/core/ext/transport/chttp2/client/secure/secure_channel_create.c \
src/core/ext/client_config/channel_connectivity.c \ src/core/ext/client_channel/channel_connectivity.c \
src/core/ext/client_config/client_channel.c \ src/core/ext/client_channel/client_channel.c \
src/core/ext/client_config/client_channel_factory.c \ src/core/ext/client_channel/client_channel_factory.c \
src/core/ext/client_config/client_config_plugin.c \ src/core/ext/client_channel/client_channel_plugin.c \
src/core/ext/client_config/connector.c \ src/core/ext/client_channel/connector.c \
src/core/ext/client_config/default_initial_connect_string.c \ src/core/ext/client_channel/default_initial_connect_string.c \
src/core/ext/client_config/http_connect_handshaker.c \ src/core/ext/client_channel/http_connect_handshaker.c \
src/core/ext/client_config/initial_connect_string.c \ src/core/ext/client_channel/initial_connect_string.c \
src/core/ext/client_config/lb_policy.c \ src/core/ext/client_channel/lb_policy.c \
src/core/ext/client_config/lb_policy_factory.c \ src/core/ext/client_channel/lb_policy_factory.c \
src/core/ext/client_config/lb_policy_registry.c \ src/core/ext/client_channel/lb_policy_registry.c \
src/core/ext/client_config/method_config.c \ src/core/ext/client_channel/method_config.c \
src/core/ext/client_config/parse_address.c \ src/core/ext/client_channel/parse_address.c \
src/core/ext/client_config/resolver.c \ src/core/ext/client_channel/resolver.c \
src/core/ext/client_config/resolver_factory.c \ src/core/ext/client_channel/resolver_factory.c \
src/core/ext/client_config/resolver_registry.c \ src/core/ext/client_channel/resolver_registry.c \
src/core/ext/client_config/resolver_result.c \ src/core/ext/client_channel/resolver_result.c \
src/core/ext/client_config/subchannel.c \ src/core/ext/client_channel/subchannel.c \
src/core/ext/client_config/subchannel_index.c \ src/core/ext/client_channel/subchannel_index.c \
src/core/ext/client_config/uri_parser.c \ src/core/ext/client_channel/uri_parser.c \
src/core/ext/transport/chttp2/server/insecure/server_chttp2.c \ src/core/ext/transport/chttp2/server/insecure/server_chttp2.c \
src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.c \ src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.c \
src/core/ext/transport/chttp2/client/insecure/channel_create.c \ src/core/ext/transport/chttp2/client/insecure/channel_create.c \
@ -598,7 +598,7 @@ if test "$PHP_GRPC" != "no"; then
PHP_ADD_BUILD_DIR($ext_builddir/src/boringssl) PHP_ADD_BUILD_DIR($ext_builddir/src/boringssl)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/census) PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/census)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/census/gen) PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/census/gen)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/client_config) PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/client_channel)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/lb_policy/grpclb) PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/lb_policy/grpclb)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/lb_policy/grpclb/proto/grpc/lb/v1) PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/lb_policy/grpclb/proto/grpc/lb/v1)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/lb_policy/pick_first) PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/lb_policy/pick_first)

7
examples/node/dynamic_codegen/route_guide/route_guide_client.js
Unescape View File

@ -55,6 +55,7 @@ function runGetFeature(callback) {
function featureCallback(error, feature) { function featureCallback(error, feature) {
if (error) { if (error) {
callback(error); callback(error);
return;
} }
if (feature.name === '') { if (feature.name === '') {
console.log('Found no feature at ' + console.log('Found no feature at ' +
@ -117,13 +118,17 @@ function runRecordRoute(callback) {
string: 'db_path' string: 'db_path'
}); });
fs.readFile(path.resolve(argv.db_path), function(err, data) { fs.readFile(path.resolve(argv.db_path), function(err, data) {
if (err) callback(err); if (err) {
callback(err);
return;
}
var feature_list = JSON.parse(data); var feature_list = JSON.parse(data);
var num_points = 10; var num_points = 10;
var call = client.recordRoute(function(error, stats) { var call = client.recordRoute(function(error, stats) {
if (error) { if (error) {
callback(error); callback(error);
return;
} }
console.log('Finished trip with', stats.point_count, 'points'); console.log('Finished trip with', stats.point_count, 'points');
console.log('Passed', stats.feature_count, 'features'); console.log('Passed', stats.feature_count, 'features');

7
examples/node/static_codegen/route_guide/route_guide_client.js
Unescape View File

@ -56,6 +56,7 @@ function runGetFeature(callback) {
function featureCallback(error, feature) { function featureCallback(error, feature) {
if (error) { if (error) {
callback(error); callback(error);
return;
} }
var latitude = feature.getLocation().getLatitude(); var latitude = feature.getLocation().getLatitude();
var longitude = feature.getLocation().getLongitude(); var longitude = feature.getLocation().getLongitude();
@ -115,7 +116,10 @@ function runRecordRoute(callback) {
string: 'db_path' string: 'db_path'
}); });
fs.readFile(path.resolve(argv.db_path), function(err, data) { fs.readFile(path.resolve(argv.db_path), function(err, data) {
if (err) callback(err); if (err) {
callback(err);
return;
}
// Transform the loaded features to Feature objects // Transform the loaded features to Feature objects
var feature_list = _.map(JSON.parse(data), function(value) { var feature_list = _.map(JSON.parse(data), function(value) {
var feature = new messages.Feature(); var feature = new messages.Feature();
@ -131,6 +135,7 @@ function runRecordRoute(callback) {
var call = client.recordRoute(function(error, stats) { var call = client.recordRoute(function(error, stats) {
if (error) { if (error) {
callback(error); callback(error);
return;
} }
console.log('Finished trip with', stats.getPointCount(), 'points'); console.log('Finished trip with', stats.getPointCount(), 'points');
console.log('Passed', stats.getFeatureCount(), 'features'); console.log('Passed', stats.getFeatureCount(), 'features');

108
gRPC-Core.podspec
Unescape View File

@ -385,23 +385,23 @@ Pod::Spec.new do |s|
'src/core/lib/tsi/ssl_types.h', 'src/core/lib/tsi/ssl_types.h',
'src/core/lib/tsi/transport_security.h', 'src/core/lib/tsi/transport_security.h',
'src/core/lib/tsi/transport_security_interface.h', 'src/core/lib/tsi/transport_security_interface.h',
'src/core/ext/client_config/client_channel.h', 'src/core/ext/client_channel/client_channel.h',
'src/core/ext/client_config/client_channel_factory.h', 'src/core/ext/client_channel/client_channel_factory.h',
'src/core/ext/client_config/connector.h', 'src/core/ext/client_channel/connector.h',
'src/core/ext/client_config/http_connect_handshaker.h', 'src/core/ext/client_channel/http_connect_handshaker.h',
'src/core/ext/client_config/initial_connect_string.h', 'src/core/ext/client_channel/initial_connect_string.h',
'src/core/ext/client_config/lb_policy.h', 'src/core/ext/client_channel/lb_policy.h',
'src/core/ext/client_config/lb_policy_factory.h', 'src/core/ext/client_channel/lb_policy_factory.h',
'src/core/ext/client_config/lb_policy_registry.h', 'src/core/ext/client_channel/lb_policy_registry.h',
'src/core/ext/client_config/method_config.h', 'src/core/ext/client_channel/method_config.h',
'src/core/ext/client_config/parse_address.h', 'src/core/ext/client_channel/parse_address.h',
'src/core/ext/client_config/resolver.h', 'src/core/ext/client_channel/resolver.h',
'src/core/ext/client_config/resolver_factory.h', 'src/core/ext/client_channel/resolver_factory.h',
'src/core/ext/client_config/resolver_registry.h', 'src/core/ext/client_channel/resolver_registry.h',
'src/core/ext/client_config/resolver_result.h', 'src/core/ext/client_channel/resolver_result.h',
'src/core/ext/client_config/subchannel.h', 'src/core/ext/client_channel/subchannel.h',
'src/core/ext/client_config/subchannel_index.h', 'src/core/ext/client_channel/subchannel_index.h',
'src/core/ext/client_config/uri_parser.h', 'src/core/ext/client_channel/uri_parser.h',
'src/core/ext/lb_policy/grpclb/grpclb.h', 'src/core/ext/lb_policy/grpclb/grpclb.h',
'src/core/ext/lb_policy/grpclb/load_balancer_api.h', 'src/core/ext/lb_policy/grpclb/load_balancer_api.h',
'src/core/ext/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h', 'src/core/ext/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h',
@ -579,26 +579,26 @@ Pod::Spec.new do |s|
'src/core/lib/tsi/ssl_transport_security.c', 'src/core/lib/tsi/ssl_transport_security.c',
'src/core/lib/tsi/transport_security.c', 'src/core/lib/tsi/transport_security.c',
'src/core/ext/transport/chttp2/client/secure/secure_channel_create.c', 'src/core/ext/transport/chttp2/client/secure/secure_channel_create.c',
'src/core/ext/client_config/channel_connectivity.c', 'src/core/ext/client_channel/channel_connectivity.c',
'src/core/ext/client_config/client_channel.c', 'src/core/ext/client_channel/client_channel.c',
'src/core/ext/client_config/client_channel_factory.c', 'src/core/ext/client_channel/client_channel_factory.c',
'src/core/ext/client_config/client_config_plugin.c', 'src/core/ext/client_channel/client_channel_plugin.c',
'src/core/ext/client_config/connector.c', 'src/core/ext/client_channel/connector.c',
'src/core/ext/client_config/default_initial_connect_string.c', 'src/core/ext/client_channel/default_initial_connect_string.c',
'src/core/ext/client_config/http_connect_handshaker.c', 'src/core/ext/client_channel/http_connect_handshaker.c',
'src/core/ext/client_config/initial_connect_string.c', 'src/core/ext/client_channel/initial_connect_string.c',
'src/core/ext/client_config/lb_policy.c', 'src/core/ext/client_channel/lb_policy.c',
'src/core/ext/client_config/lb_policy_factory.c', 'src/core/ext/client_channel/lb_policy_factory.c',
'src/core/ext/client_config/lb_policy_registry.c', 'src/core/ext/client_channel/lb_policy_registry.c',
'src/core/ext/client_config/method_config.c', 'src/core/ext/client_channel/method_config.c',
'src/core/ext/client_config/parse_address.c', 'src/core/ext/client_channel/parse_address.c',
'src/core/ext/client_config/resolver.c', 'src/core/ext/client_channel/resolver.c',
'src/core/ext/client_config/resolver_factory.c', 'src/core/ext/client_channel/resolver_factory.c',
'src/core/ext/client_config/resolver_registry.c', 'src/core/ext/client_channel/resolver_registry.c',
'src/core/ext/client_config/resolver_result.c', 'src/core/ext/client_channel/resolver_result.c',
'src/core/ext/client_config/subchannel.c', 'src/core/ext/client_channel/subchannel.c',
'src/core/ext/client_config/subchannel_index.c', 'src/core/ext/client_channel/subchannel_index.c',
'src/core/ext/client_config/uri_parser.c', 'src/core/ext/client_channel/uri_parser.c',
'src/core/ext/transport/chttp2/server/insecure/server_chttp2.c', 'src/core/ext/transport/chttp2/server/insecure/server_chttp2.c',
'src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.c', 'src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.c',
'src/core/ext/transport/chttp2/client/insecure/channel_create.c', 'src/core/ext/transport/chttp2/client/insecure/channel_create.c',
@ -780,23 +780,23 @@ Pod::Spec.new do |s|
'src/core/lib/tsi/ssl_types.h', 'src/core/lib/tsi/ssl_types.h',
'src/core/lib/tsi/transport_security.h', 'src/core/lib/tsi/transport_security.h',
'src/core/lib/tsi/transport_security_interface.h', 'src/core/lib/tsi/transport_security_interface.h',
'src/core/ext/client_config/client_channel.h', 'src/core/ext/client_channel/client_channel.h',
'src/core/ext/client_config/client_channel_factory.h', 'src/core/ext/client_channel/client_channel_factory.h',
'src/core/ext/client_config/connector.h', 'src/core/ext/client_channel/connector.h',
'src/core/ext/client_config/http_connect_handshaker.h', 'src/core/ext/client_channel/http_connect_handshaker.h',
'src/core/ext/client_config/initial_connect_string.h', 'src/core/ext/client_channel/initial_connect_string.h',
'src/core/ext/client_config/lb_policy.h', 'src/core/ext/client_channel/lb_policy.h',
'src/core/ext/client_config/lb_policy_factory.h', 'src/core/ext/client_channel/lb_policy_factory.h',
'src/core/ext/client_config/lb_policy_registry.h', 'src/core/ext/client_channel/lb_policy_registry.h',
'src/core/ext/client_config/method_config.h', 'src/core/ext/client_channel/method_config.h',
'src/core/ext/client_config/parse_address.h', 'src/core/ext/client_channel/parse_address.h',
'src/core/ext/client_config/resolver.h', 'src/core/ext/client_channel/resolver.h',
'src/core/ext/client_config/resolver_factory.h', 'src/core/ext/client_channel/resolver_factory.h',
'src/core/ext/client_config/resolver_registry.h', 'src/core/ext/client_channel/resolver_registry.h',
'src/core/ext/client_config/resolver_result.h', 'src/core/ext/client_channel/resolver_result.h',
'src/core/ext/client_config/subchannel.h', 'src/core/ext/client_channel/subchannel.h',
'src/core/ext/client_config/subchannel_index.h', 'src/core/ext/client_channel/subchannel_index.h',
'src/core/ext/client_config/uri_parser.h', 'src/core/ext/client_channel/uri_parser.h',
'src/core/ext/lb_policy/grpclb/grpclb.h', 'src/core/ext/lb_policy/grpclb/grpclb.h',
'src/core/ext/lb_policy/grpclb/load_balancer_api.h', 'src/core/ext/lb_policy/grpclb/load_balancer_api.h',
'src/core/ext/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h', 'src/core/ext/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h',

74
grpc.gemspec
Unescape View File

@ -305,23 +305,23 @@ Gem::Specification.new do |s|
s.files += %w( src/core/lib/tsi/ssl_types.h ) s.files += %w( src/core/lib/tsi/ssl_types.h )
s.files += %w( src/core/lib/tsi/transport_security.h ) s.files += %w( src/core/lib/tsi/transport_security.h )
s.files += %w( src/core/lib/tsi/transport_security_interface.h ) s.files += %w( src/core/lib/tsi/transport_security_interface.h )
s.files += %w( src/core/ext/client_config/client_channel.h ) s.files += %w( src/core/ext/client_channel/client_channel.h )
s.files += %w( src/core/ext/client_config/client_channel_factory.h ) s.files += %w( src/core/ext/client_channel/client_channel_factory.h )
s.files += %w( src/core/ext/client_config/connector.h ) s.files += %w( src/core/ext/client_channel/connector.h )
s.files += %w( src/core/ext/client_config/http_connect_handshaker.h ) s.files += %w( src/core/ext/client_channel/http_connect_handshaker.h )
s.files += %w( src/core/ext/client_config/initial_connect_string.h ) s.files += %w( src/core/ext/client_channel/initial_connect_string.h )
s.files += %w( src/core/ext/client_config/lb_policy.h ) s.files += %w( src/core/ext/client_channel/lb_policy.h )
s.files += %w( src/core/ext/client_config/lb_policy_factory.h ) s.files += %w( src/core/ext/client_channel/lb_policy_factory.h )
s.files += %w( src/core/ext/client_config/lb_policy_registry.h ) s.files += %w( src/core/ext/client_channel/lb_policy_registry.h )
s.files += %w( src/core/ext/client_config/method_config.h ) s.files += %w( src/core/ext/client_channel/method_config.h )
s.files += %w( src/core/ext/client_config/parse_address.h ) s.files += %w( src/core/ext/client_channel/parse_address.h )
s.files += %w( src/core/ext/client_config/resolver.h ) s.files += %w( src/core/ext/client_channel/resolver.h )
s.files += %w( src/core/ext/client_config/resolver_factory.h ) s.files += %w( src/core/ext/client_channel/resolver_factory.h )
s.files += %w( src/core/ext/client_config/resolver_registry.h ) s.files += %w( src/core/ext/client_channel/resolver_registry.h )
s.files += %w( src/core/ext/client_config/resolver_result.h ) s.files += %w( src/core/ext/client_channel/resolver_result.h )
s.files += %w( src/core/ext/client_config/subchannel.h ) s.files += %w( src/core/ext/client_channel/subchannel.h )
s.files += %w( src/core/ext/client_config/subchannel_index.h ) s.files += %w( src/core/ext/client_channel/subchannel_index.h )
s.files += %w( src/core/ext/client_config/uri_parser.h ) s.files += %w( src/core/ext/client_channel/uri_parser.h )
s.files += %w( src/core/ext/lb_policy/grpclb/grpclb.h ) s.files += %w( src/core/ext/lb_policy/grpclb/grpclb.h )
s.files += %w( src/core/ext/lb_policy/grpclb/load_balancer_api.h ) s.files += %w( src/core/ext/lb_policy/grpclb/load_balancer_api.h )
s.files += %w( src/core/ext/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h ) s.files += %w( src/core/ext/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h )
@ -499,26 +499,26 @@ Gem::Specification.new do |s|
s.files += %w( src/core/lib/tsi/ssl_transport_security.c ) s.files += %w( src/core/lib/tsi/ssl_transport_security.c )
s.files += %w( src/core/lib/tsi/transport_security.c ) s.files += %w( src/core/lib/tsi/transport_security.c )
s.files += %w( src/core/ext/transport/chttp2/client/secure/secure_channel_create.c ) s.files += %w( src/core/ext/transport/chttp2/client/secure/secure_channel_create.c )
s.files += %w( src/core/ext/client_config/channel_connectivity.c ) s.files += %w( src/core/ext/client_channel/channel_connectivity.c )
s.files += %w( src/core/ext/client_config/client_channel.c ) s.files += %w( src/core/ext/client_channel/client_channel.c )
s.files += %w( src/core/ext/client_config/client_channel_factory.c ) s.files += %w( src/core/ext/client_channel/client_channel_factory.c )
s.files += %w( src/core/ext/client_config/client_config_plugin.c ) s.files += %w( src/core/ext/client_channel/client_channel_plugin.c )
s.files += %w( src/core/ext/client_config/connector.c ) s.files += %w( src/core/ext/client_channel/connector.c )
s.files += %w( src/core/ext/client_config/default_initial_connect_string.c ) s.files += %w( src/core/ext/client_channel/default_initial_connect_string.c )
s.files += %w( src/core/ext/client_config/http_connect_handshaker.c ) s.files += %w( src/core/ext/client_channel/http_connect_handshaker.c )
s.files += %w( src/core/ext/client_config/initial_connect_string.c ) s.files += %w( src/core/ext/client_channel/initial_connect_string.c )
s.files += %w( src/core/ext/client_config/lb_policy.c ) s.files += %w( src/core/ext/client_channel/lb_policy.c )
s.files += %w( src/core/ext/client_config/lb_policy_factory.c ) s.files += %w( src/core/ext/client_channel/lb_policy_factory.c )
s.files += %w( src/core/ext/client_config/lb_policy_registry.c ) s.files += %w( src/core/ext/client_channel/lb_policy_registry.c )
s.files += %w( src/core/ext/client_config/method_config.c ) s.files += %w( src/core/ext/client_channel/method_config.c )
s.files += %w( src/core/ext/client_config/parse_address.c ) s.files += %w( src/core/ext/client_channel/parse_address.c )
s.files += %w( src/core/ext/client_config/resolver.c ) s.files += %w( src/core/ext/client_channel/resolver.c )
s.files += %w( src/core/ext/client_config/resolver_factory.c ) s.files += %w( src/core/ext/client_channel/resolver_factory.c )
s.files += %w( src/core/ext/client_config/resolver_registry.c ) s.files += %w( src/core/ext/client_channel/resolver_registry.c )
s.files += %w( src/core/ext/client_config/resolver_result.c ) s.files += %w( src/core/ext/client_channel/resolver_result.c )
s.files += %w( src/core/ext/client_config/subchannel.c ) s.files += %w( src/core/ext/client_channel/subchannel.c )
s.files += %w( src/core/ext/client_config/subchannel_index.c ) s.files += %w( src/core/ext/client_channel/subchannel_index.c )
s.files += %w( src/core/ext/client_config/uri_parser.c ) s.files += %w( src/core/ext/client_channel/uri_parser.c )
s.files += %w( src/core/ext/transport/chttp2/server/insecure/server_chttp2.c ) s.files += %w( src/core/ext/transport/chttp2/server/insecure/server_chttp2.c )
s.files += %w( src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.c ) s.files += %w( src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.c )
s.files += %w( src/core/ext/transport/chttp2/client/insecure/channel_create.c ) s.files += %w( src/core/ext/transport/chttp2/client/insecure/channel_create.c )

2
include/grpc++/ext/reflection.grpc.pb.h
Unescape View File

@ -176,6 +176,8 @@ class ServerReflection GRPC_FINAL {
} }
}; };
typedef Service StreamedUnaryService; typedef Service StreamedUnaryService;
typedef Service SplitStreamedService;
typedef Service StreamedService;
}; };
} // namespace v1alpha } // namespace v1alpha

13
include/grpc++/impl/codegen/method_handler_impl.h
Unescape View File

@ -236,6 +236,19 @@ class StreamedUnaryHandler
ServerUnaryStreamer<RequestType, ResponseType>, true>(func) {} ServerUnaryStreamer<RequestType, ResponseType>, true>(func) {}
}; };
template <class RequestType, class ResponseType>
class SplitServerStreamingHandler
: public TemplatedBidiStreamingHandler<
ServerSplitStreamer<RequestType, ResponseType>, false> {
public:
explicit SplitServerStreamingHandler(
std::function<Status(ServerContext*,
ServerSplitStreamer<RequestType, ResponseType>*)>
func)
: TemplatedBidiStreamingHandler<
ServerSplitStreamer<RequestType, ResponseType>, false>(func) {}
};
// Handle unknown method by returning UNIMPLEMENTED error. // Handle unknown method by returning UNIMPLEMENTED error.
class UnknownMethodHandler : public MethodHandler { class UnknownMethodHandler : public MethodHandler {
public: public:

1
include/grpc++/impl/codegen/server_context.h
Unescape View File

@ -44,7 +44,6 @@
#include <grpc++/impl/codegen/time.h> #include <grpc++/impl/codegen/time.h>
#include <grpc/impl/codegen/compression_types.h> #include <grpc/impl/codegen/compression_types.h>
struct gpr_timespec;
struct grpc_metadata; struct grpc_metadata;
struct grpc_call; struct grpc_call;
struct census_context; struct census_context;

11
include/grpc++/impl/codegen/service_type.h
Unescape View File

@ -147,14 +147,15 @@ class Service {
methods_[index].reset(); methods_[index].reset();
} }
void MarkMethodStreamedUnary(int index, void MarkMethodStreamed(int index, MethodHandler* streamed_method) {
MethodHandler* streamed_unary_method) {
GPR_CODEGEN_ASSERT(methods_[index] && methods_[index]->handler() && GPR_CODEGEN_ASSERT(methods_[index] && methods_[index]->handler() &&
"Cannot mark an async or generic method Streamed Unary"); "Cannot mark an async or generic method Streamed");
methods_[index]->SetHandler(streamed_unary_method); methods_[index]->SetHandler(streamed_method);
// From the server's point of view, streamed unary is a special // From the server's point of view, streamed unary is a special
// case of BIDI_STREAMING that has 1 read and 1 write, in that order. // case of BIDI_STREAMING that has 1 read and 1 write, in that order,
// and split server-side streaming is BIDI_STREAMING with 1 read and
// any number of writes, in that order
methods_[index]->SetMethodType(::grpc::RpcMethod::BIDI_STREAMING); methods_[index]->SetMethodType(::grpc::RpcMethod::BIDI_STREAMING);
} }

37
include/grpc++/impl/codegen/sync_stream.h
Unescape View File

@ -577,6 +577,43 @@ class ServerUnaryStreamer GRPC_FINAL
bool write_done_; bool write_done_;
}; };
/// A class to represent a flow-controlled server-side streaming call.
/// This is something of a hybrid between server-side and bidi streaming.
/// This is invoked through a server-side streaming call on the client side,
/// but the server responds to it as though it were a bidi streaming call that
/// must first have exactly 1 Read and then any number of Writes.
template <class RequestType, class ResponseType>
class ServerSplitStreamer GRPC_FINAL
: public ServerReaderWriterInterface<ResponseType, RequestType> {
public:
ServerSplitStreamer(Call* call, ServerContext* ctx)
: body_(call, ctx), read_done_(false) {}
void SendInitialMetadata() GRPC_OVERRIDE { body_.SendInitialMetadata(); }
bool NextMessageSize(uint32_t* sz) GRPC_OVERRIDE {
return body_.NextMessageSize(sz);
}
bool Read(RequestType* request) GRPC_OVERRIDE {
if (read_done_) {
return false;
}
read_done_ = true;
return body_.Read(request);
}
using WriterInterface<ResponseType>::Write;
bool Write(const ResponseType& response,
const WriteOptions& options) GRPC_OVERRIDE {
return read_done_ && body_.Write(response, options);
}
private:
internal::ServerReaderWriterBody<ResponseType, RequestType> body_;
bool read_done_;
};
} // namespace grpc } // namespace grpc
#endif // GRPCXX_IMPL_CODEGEN_SYNC_STREAM_H #endif // GRPCXX_IMPL_CODEGEN_SYNC_STREAM_H

74
package.xml
Unescape View File

@ -312,23 +312,23 @@
<file baseinstalldir="/" name="src/core/lib/tsi/ssl_types.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/tsi/ssl_types.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/tsi/transport_security.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/tsi/transport_security.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/tsi/transport_security_interface.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/tsi/transport_security_interface.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/client_channel.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_channel/client_channel.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/client_channel_factory.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_channel/client_channel_factory.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/connector.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_channel/connector.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/http_connect_handshaker.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_channel/http_connect_handshaker.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/initial_connect_string.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_channel/initial_connect_string.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/lb_policy.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_channel/lb_policy.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/lb_policy_factory.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_channel/lb_policy_factory.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/lb_policy_registry.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_channel/lb_policy_registry.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/method_config.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_channel/method_config.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/parse_address.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_channel/parse_address.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/resolver.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_channel/resolver.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/resolver_factory.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_channel/resolver_factory.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/resolver_registry.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_channel/resolver_registry.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/resolver_result.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_channel/resolver_result.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/subchannel.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_channel/subchannel.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/subchannel_index.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_channel/subchannel_index.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/uri_parser.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_channel/uri_parser.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/lb_policy/grpclb/grpclb.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/lb_policy/grpclb/grpclb.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/lb_policy/grpclb/load_balancer_api.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/lb_policy/grpclb/load_balancer_api.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h" role="src" />
@ -506,26 +506,26 @@
<file baseinstalldir="/" name="src/core/lib/tsi/ssl_transport_security.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/tsi/ssl_transport_security.c" role="src" />
<file baseinstalldir="/" name="src/core/lib/tsi/transport_security.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/tsi/transport_security.c" role="src" />
<file baseinstalldir="/" name="src/core/ext/transport/chttp2/client/secure/secure_channel_create.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/transport/chttp2/client/secure/secure_channel_create.c" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/channel_connectivity.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_channel/channel_connectivity.c" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/client_channel.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_channel/client_channel.c" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/client_channel_factory.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_channel/client_channel_factory.c" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/client_config_plugin.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_channel/client_channel_plugin.c" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/connector.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_channel/connector.c" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/default_initial_connect_string.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_channel/default_initial_connect_string.c" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/http_connect_handshaker.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_channel/http_connect_handshaker.c" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/initial_connect_string.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_channel/initial_connect_string.c" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/lb_policy.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_channel/lb_policy.c" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/lb_policy_factory.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_channel/lb_policy_factory.c" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/lb_policy_registry.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_channel/lb_policy_registry.c" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/method_config.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_channel/method_config.c" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/parse_address.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_channel/parse_address.c" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/resolver.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_channel/resolver.c" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/resolver_factory.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_channel/resolver_factory.c" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/resolver_registry.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_channel/resolver_registry.c" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/resolver_result.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_channel/resolver_result.c" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/subchannel.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_channel/subchannel.c" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/subchannel_index.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_channel/subchannel_index.c" role="src" />
<file baseinstalldir="/" name="src/core/ext/client_config/uri_parser.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_channel/uri_parser.c" role="src" />
<file baseinstalldir="/" name="src/core/ext/transport/chttp2/server/insecure/server_chttp2.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/transport/chttp2/server/insecure/server_chttp2.c" role="src" />
<file baseinstalldir="/" name="src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.c" role="src" />
<file baseinstalldir="/" name="src/core/ext/transport/chttp2/client/insecure/channel_create.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/transport/chttp2/client/insecure/channel_create.c" role="src" />

96
src/compiler/cpp_generator.cc
Unescape View File

@ -624,7 +624,7 @@ void PrintHeaderServerMethodStreamedUnary(
printer->Indent(); printer->Indent();
printer->Print(*vars, printer->Print(*vars,
"WithStreamedUnaryMethod_$Method$() {\n" "WithStreamedUnaryMethod_$Method$() {\n"
" ::grpc::Service::MarkMethodStreamedUnary($Idx$,\n" " ::grpc::Service::MarkMethodStreamed($Idx$,\n"
" new ::grpc::StreamedUnaryHandler< $Request$, " " new ::grpc::StreamedUnaryHandler< $Request$, "
"$Response$>(std::bind" "$Response$>(std::bind"
"(&WithStreamedUnaryMethod_$Method$<BaseClass>::" "(&WithStreamedUnaryMethod_$Method$<BaseClass>::"
@ -656,6 +656,58 @@ void PrintHeaderServerMethodStreamedUnary(
} }
} }
void PrintHeaderServerMethodSplitStreaming(
Printer *printer, const Method *method,
std::map<grpc::string, grpc::string> *vars) {
(*vars)["Method"] = method->name();
(*vars)["Request"] = method->input_type_name();
(*vars)["Response"] = method->output_type_name();
if (method->ServerOnlyStreaming()) {
printer->Print(*vars, "template <class BaseClass>\n");
printer->Print(*vars,
"class WithSplitStreamingMethod_$Method$ : "
"public BaseClass {\n");
printer->Print(
" private:\n"
" void BaseClassMustBeDerivedFromService(const Service *service) "
"{}\n");
printer->Print(" public:\n");
printer->Indent();
printer->Print(*vars,
"WithSplitStreamingMethod_$Method$() {\n"
" ::grpc::Service::MarkMethodStreamed($Idx$,\n"
" new ::grpc::SplitServerStreamingHandler< $Request$, "
"$Response$>(std::bind"
"(&WithSplitStreamingMethod_$Method$<BaseClass>::"
"Streamed$Method$, this, std::placeholders::_1, "
"std::placeholders::_2)));\n"
"}\n");
printer->Print(*vars,
"~WithSplitStreamingMethod_$Method$() GRPC_OVERRIDE {\n"
" BaseClassMustBeDerivedFromService(this);\n"
"}\n");
printer->Print(
*vars,
"// disable regular version of this method\n"
"::grpc::Status $Method$("
"::grpc::ServerContext* context, const $Request$* request, "
"::grpc::ServerWriter< $Response$>* writer) GRPC_FINAL GRPC_OVERRIDE "
"{\n"
" abort();\n"
" return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, \"\");\n"
"}\n");
printer->Print(*vars,
"// replace default version of method with split streamed\n"
"virtual ::grpc::Status Streamed$Method$("
"::grpc::ServerContext* context, "
"::grpc::ServerSplitStreamer< "
"$Request$,$Response$>* server_split_streamer)"
" = 0;\n");
printer->Outdent();
printer->Print(*vars, "};\n");
}
}
void PrintHeaderServerMethodGeneric( void PrintHeaderServerMethodGeneric(
Printer *printer, const Method *method, Printer *printer, const Method *method,
std::map<grpc::string, grpc::string> *vars) { std::map<grpc::string, grpc::string> *vars) {
@ -844,6 +896,48 @@ void PrintHeaderService(Printer *printer, const Service *service,
} }
printer->Print(" StreamedUnaryService;\n"); printer->Print(" StreamedUnaryService;\n");
// Server side - controlled server-side streaming
for (int i = 0; i < service->method_count(); ++i) {
(*vars)["Idx"] = as_string(i);
PrintHeaderServerMethodSplitStreaming(printer, service->method(i).get(),
vars);
}
printer->Print("typedef ");
for (int i = 0; i < service->method_count(); ++i) {
(*vars)["method_name"] = service->method(i).get()->name();
if (service->method(i)->ServerOnlyStreaming()) {
printer->Print(*vars, "WithSplitStreamingMethod_$method_name$<");
}
}
printer->Print("Service");
for (int i = 0; i < service->method_count(); ++i) {
if (service->method(i)->ServerOnlyStreaming()) {
printer->Print(" >");
}
}
printer->Print(" SplitStreamedService;\n");
// Server side - typedef for controlled both unary and server-side streaming
printer->Print("typedef ");
for (int i = 0; i < service->method_count(); ++i) {
(*vars)["method_name"] = service->method(i).get()->name();
if (service->method(i)->ServerOnlyStreaming()) {
printer->Print(*vars, "WithSplitStreamingMethod_$method_name$<");
}
if (service->method(i)->NoStreaming()) {
printer->Print(*vars, "WithStreamedUnaryMethod_$method_name$<");
}
}
printer->Print("Service");
for (int i = 0; i < service->method_count(); ++i) {
if (service->method(i)->NoStreaming() ||
service->method(i)->ServerOnlyStreaming()) {
printer->Print(" >");
}
}
printer->Print(" StreamedService;\n");
printer->Outdent(); printer->Outdent();
printer->Print("};\n"); printer->Print("};\n");
printer->Print(service->GetTrailingComments().c_str()); printer->Print(service->GetTrailingComments().c_str());

0
src/core/ext/client_config/README.md → src/core/ext/client_channel/README.md
Unescape View File

2
src/core/ext/client_config/channel_connectivity.c → src/core/ext/client_channel/channel_connectivity.c
Unescape View File

@ -36,7 +36,7 @@
#include <grpc/support/alloc.h> #include <grpc/support/alloc.h>
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include "src/core/ext/client_config/client_channel.h" #include "src/core/ext/client_channel/client_channel.h"
#include "src/core/lib/iomgr/timer.h" #include "src/core/lib/iomgr/timer.h"
#include "src/core/lib/surface/api_trace.h" #include "src/core/lib/surface/api_trace.h"
#include "src/core/lib/surface/completion_queue.h" #include "src/core/lib/surface/completion_queue.h"

8
src/core/ext/client_config/client_channel.c → src/core/ext/client_channel/client_channel.c
Unescape View File

@ -31,7 +31,7 @@
* *
*/ */
#include "src/core/ext/client_config/client_channel.h" #include "src/core/ext/client_channel/client_channel.h"
#include <stdbool.h> #include <stdbool.h>
#include <stdio.h> #include <stdio.h>
@ -42,9 +42,9 @@
#include <grpc/support/sync.h> #include <grpc/support/sync.h>
#include <grpc/support/useful.h> #include <grpc/support/useful.h>
#include "src/core/ext/client_config/lb_policy_registry.h" #include "src/core/ext/client_channel/lb_policy_registry.h"
#include "src/core/ext/client_config/method_config.h" #include "src/core/ext/client_channel/method_config.h"
#include "src/core/ext/client_config/subchannel.h" #include "src/core/ext/client_channel/subchannel.h"
#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/channel/connected_channel.h" #include "src/core/lib/channel/connected_channel.h"
#include "src/core/lib/channel/deadline_filter.h" #include "src/core/lib/channel/deadline_filter.h"

10
src/core/ext/client_config/client_channel.h → src/core/ext/client_channel/client_channel.h
Unescape View File

@ -31,11 +31,11 @@
* *
*/ */
#ifndef GRPC_CORE_EXT_CLIENT_CONFIG_CLIENT_CHANNEL_H #ifndef GRPC_CORE_EXT_CLIENT_CHANNEL_CLIENT_CHANNEL_H
#define GRPC_CORE_EXT_CLIENT_CONFIG_CLIENT_CHANNEL_H #define GRPC_CORE_EXT_CLIENT_CHANNEL_CLIENT_CHANNEL_H
#include "src/core/ext/client_config/client_channel_factory.h" #include "src/core/ext/client_channel/client_channel_factory.h"
#include "src/core/ext/client_config/resolver.h" #include "src/core/ext/client_channel/resolver.h"
#include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/channel_stack.h"
/* A client channel is a channel that begins disconnected, and can connect /* A client channel is a channel that begins disconnected, and can connect
@ -61,4 +61,4 @@ void grpc_client_channel_watch_connectivity_state(
grpc_exec_ctx *exec_ctx, grpc_channel_element *elem, grpc_pollset *pollset, grpc_exec_ctx *exec_ctx, grpc_channel_element *elem, grpc_pollset *pollset,
grpc_connectivity_state *state, grpc_closure *on_complete); grpc_connectivity_state *state, grpc_closure *on_complete);
#endif /* GRPC_CORE_EXT_CLIENT_CONFIG_CLIENT_CHANNEL_H */ #endif /* GRPC_CORE_EXT_CLIENT_CHANNEL_CLIENT_CHANNEL_H */

2
src/core/ext/client_config/client_channel_factory.c → src/core/ext/client_channel/client_channel_factory.c
Unescape View File

@ -31,7 +31,7 @@
* *
*/ */
#include "src/core/ext/client_config/client_channel_factory.h" #include "src/core/ext/client_channel/client_channel_factory.h"
void grpc_client_channel_factory_ref(grpc_client_channel_factory* factory) { void grpc_client_channel_factory_ref(grpc_client_channel_factory* factory) {
factory->vtable->ref(factory); factory->vtable->ref(factory);

8
src/core/ext/client_config/client_channel_factory.h → src/core/ext/client_channel/client_channel_factory.h
Unescape View File

@ -31,12 +31,12 @@
* *
*/ */
#ifndef GRPC_CORE_EXT_CLIENT_CONFIG_CLIENT_CHANNEL_FACTORY_H #ifndef GRPC_CORE_EXT_CLIENT_CHANNEL_CLIENT_CHANNEL_FACTORY_H
#define GRPC_CORE_EXT_CLIENT_CONFIG_CLIENT_CHANNEL_FACTORY_H #define GRPC_CORE_EXT_CLIENT_CHANNEL_CLIENT_CHANNEL_FACTORY_H
#include <grpc/impl/codegen/grpc_types.h> #include <grpc/impl/codegen/grpc_types.h>
#include "src/core/ext/client_config/subchannel.h" #include "src/core/ext/client_channel/subchannel.h"
#include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/channel_stack.h"
typedef struct grpc_client_channel_factory grpc_client_channel_factory; typedef struct grpc_client_channel_factory grpc_client_channel_factory;
@ -82,4 +82,4 @@ grpc_channel *grpc_client_channel_factory_create_channel(
grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *factory, grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *factory,
const char *target, grpc_client_channel_type type, grpc_channel_args *args); const char *target, grpc_client_channel_type type, grpc_channel_args *args);
#endif /* GRPC_CORE_EXT_CLIENT_CONFIG_CLIENT_CHANNEL_FACTORY_H */ #endif /* GRPC_CORE_EXT_CLIENT_CHANNEL_CLIENT_CHANNEL_FACTORY_H */

12
src/core/ext/client_config/client_config_plugin.c → src/core/ext/client_channel/client_channel_plugin.c
Unescape View File

@ -37,10 +37,10 @@
#include <grpc/support/alloc.h> #include <grpc/support/alloc.h>
#include "src/core/ext/client_config/client_channel.h" #include "src/core/ext/client_channel/client_channel.h"
#include "src/core/ext/client_config/lb_policy_registry.h" #include "src/core/ext/client_channel/lb_policy_registry.h"
#include "src/core/ext/client_config/resolver_registry.h" #include "src/core/ext/client_channel/resolver_registry.h"
#include "src/core/ext/client_config/subchannel_index.h" #include "src/core/ext/client_channel/subchannel_index.h"
#include "src/core/lib/surface/channel_init.h" #include "src/core/lib/surface/channel_init.h"
static bool append_filter(grpc_channel_stack_builder *builder, void *arg) { static bool append_filter(grpc_channel_stack_builder *builder, void *arg) {
@ -73,7 +73,7 @@ static bool set_default_host_if_unset(grpc_channel_stack_builder *builder,
return true; return true;
} }
void grpc_client_config_init(void) { void grpc_client_channel_init(void) {
grpc_lb_policy_registry_init(); grpc_lb_policy_registry_init();
grpc_resolver_registry_init(); grpc_resolver_registry_init();
grpc_subchannel_index_init(); grpc_subchannel_index_init();
@ -83,7 +83,7 @@ void grpc_client_config_init(void) {
(void *)&grpc_client_channel_filter); (void *)&grpc_client_channel_filter);
} }
void grpc_client_config_shutdown(void) { void grpc_client_channel_shutdown(void) {
grpc_subchannel_index_shutdown(); grpc_subchannel_index_shutdown();
grpc_channel_init_shutdown(); grpc_channel_init_shutdown();
grpc_resolver_registry_shutdown(); grpc_resolver_registry_shutdown();

2
src/core/ext/client_config/connector.c → src/core/ext/client_channel/connector.c
Unescape View File

@ -31,7 +31,7 @@
* *
*/ */
#include "src/core/ext/client_config/connector.h" #include "src/core/ext/client_channel/connector.h"
grpc_connector* grpc_connector_ref(grpc_connector* connector) { grpc_connector* grpc_connector_ref(grpc_connector* connector) {
connector->vtable->ref(connector); connector->vtable->ref(connector);

6
src/core/ext/client_config/connector.h → src/core/ext/client_channel/connector.h
Unescape View File

@ -31,8 +31,8 @@
* *
*/ */
#ifndef GRPC_CORE_EXT_CLIENT_CONFIG_CONNECTOR_H #ifndef GRPC_CORE_EXT_CLIENT_CHANNEL_CONNECTOR_H
#define GRPC_CORE_EXT_CLIENT_CONFIG_CONNECTOR_H #define GRPC_CORE_EXT_CLIENT_CHANNEL_CONNECTOR_H
#include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/channel_stack.h"
#include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/resolve_address.h"
@ -89,4 +89,4 @@ void grpc_connector_connect(grpc_exec_ctx *exec_ctx, grpc_connector *connector,
void grpc_connector_shutdown(grpc_exec_ctx *exec_ctx, void grpc_connector_shutdown(grpc_exec_ctx *exec_ctx,
grpc_connector *connector); grpc_connector *connector);
#endif /* GRPC_CORE_EXT_CLIENT_CONFIG_CONNECTOR_H */ #endif /* GRPC_CORE_EXT_CLIENT_CHANNEL_CONNECTOR_H */

0
src/core/ext/client_config/default_initial_connect_string.c → src/core/ext/client_channel/default_initial_connect_string.c
Unescape View File

4
src/core/ext/client_config/http_connect_handshaker.c → src/core/ext/client_channel/http_connect_handshaker.c
Unescape View File

@ -31,7 +31,7 @@
* *
*/ */
#include "src/core/ext/client_config/http_connect_handshaker.h" #include "src/core/ext/client_channel/http_connect_handshaker.h"
#include <string.h> #include <string.h>
@ -40,7 +40,7 @@
#include <grpc/support/slice_buffer.h> #include <grpc/support/slice_buffer.h>
#include <grpc/support/string_util.h> #include <grpc/support/string_util.h>
#include "src/core/ext/client_config/uri_parser.h" #include "src/core/ext/client_channel/uri_parser.h"
#include "src/core/lib/http/format_request.h" #include "src/core/lib/http/format_request.h"
#include "src/core/lib/http/parser.h" #include "src/core/lib/http/parser.h"
#include "src/core/lib/iomgr/timer.h" #include "src/core/lib/iomgr/timer.h"

6
src/core/ext/client_config/http_connect_handshaker.h → src/core/ext/client_channel/http_connect_handshaker.h
Unescape View File

@ -31,8 +31,8 @@
* *
*/ */
#ifndef GRPC_CORE_EXT_CLIENT_CONFIG_HTTP_CONNECT_HANDSHAKER_H #ifndef GRPC_CORE_EXT_CLIENT_CHANNEL_HTTP_CONNECT_HANDSHAKER_H
#define GRPC_CORE_EXT_CLIENT_CONFIG_HTTP_CONNECT_HANDSHAKER_H #define GRPC_CORE_EXT_CLIENT_CHANNEL_HTTP_CONNECT_HANDSHAKER_H
#include "src/core/lib/channel/handshaker.h" #include "src/core/lib/channel/handshaker.h"
@ -44,4 +44,4 @@ grpc_handshaker* grpc_http_connect_handshaker_create(const char* proxy_server,
/// Caller takes ownership of result. /// Caller takes ownership of result.
char* grpc_get_http_proxy_server(); char* grpc_get_http_proxy_server();
#endif /* GRPC_CORE_EXT_CLIENT_CONFIG_HTTP_CONNECT_HANDSHAKER_H */ #endif /* GRPC_CORE_EXT_CLIENT_CHANNEL_HTTP_CONNECT_HANDSHAKER_H */

2
src/core/ext/client_config/initial_connect_string.c → src/core/ext/client_channel/initial_connect_string.c
Unescape View File

@ -31,7 +31,7 @@
* *
*/ */
#include "src/core/ext/client_config/initial_connect_string.h" #include "src/core/ext/client_channel/initial_connect_string.h"
#include <stddef.h> #include <stddef.h>

6
src/core/ext/client_config/initial_connect_string.h → src/core/ext/client_channel/initial_connect_string.h
Unescape View File

@ -31,8 +31,8 @@
* *
*/ */
#ifndef GRPC_CORE_EXT_CLIENT_CONFIG_INITIAL_CONNECT_STRING_H #ifndef GRPC_CORE_EXT_CLIENT_CHANNEL_INITIAL_CONNECT_STRING_H
#define GRPC_CORE_EXT_CLIENT_CONFIG_INITIAL_CONNECT_STRING_H #define GRPC_CORE_EXT_CLIENT_CHANNEL_INITIAL_CONNECT_STRING_H
#include <grpc/support/slice.h> #include <grpc/support/slice.h>
@ -47,4 +47,4 @@ void grpc_test_set_initial_connect_string_function(
void grpc_set_initial_connect_string(grpc_resolved_address **addr, void grpc_set_initial_connect_string(grpc_resolved_address **addr,
gpr_slice *connect_string); gpr_slice *connect_string);
#endif /* GRPC_CORE_EXT_CLIENT_CONFIG_INITIAL_CONNECT_STRING_H */ #endif /* GRPC_CORE_EXT_CLIENT_CHANNEL_INITIAL_CONNECT_STRING_H */

2
src/core/ext/client_config/lb_policy.c → src/core/ext/client_channel/lb_policy.c
Unescape View File

@ -31,7 +31,7 @@
* *
*/ */
#include "src/core/ext/client_config/lb_policy.h" #include "src/core/ext/client_channel/lb_policy.h"
#define WEAK_REF_BITS 16 #define WEAK_REF_BITS 16

9
src/core/ext/client_config/lb_policy.h → src/core/ext/client_channel/lb_policy.h
Unescape View File

@ -31,10 +31,11 @@
* *
*/ */
#ifndef GRPC_CORE_EXT_CLIENT_CONFIG_LB_POLICY_H #ifndef GRPC_CORE_EXT_CLIENT_CHANNEL_LB_POLICY_H
#define GRPC_CORE_EXT_CLIENT_CONFIG_LB_POLICY_H #define GRPC_CORE_EXT_CLIENT_CHANNEL_LB_POLICY_H
#include "src/core/ext/client_config/subchannel.h" #include "src/core/ext/client_channel/subchannel.h"
#include "src/core/lib/iomgr/polling_entity.h"
#include "src/core/lib/transport/connectivity_state.h" #include "src/core/lib/transport/connectivity_state.h"
/** A load balancing policy: specified by a vtable and a struct (which /** A load balancing policy: specified by a vtable and a struct (which
@ -192,4 +193,4 @@ grpc_connectivity_state grpc_lb_policy_check_connectivity(
grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy, grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy,
grpc_error **connectivity_error); grpc_error **connectivity_error);
#endif /* GRPC_CORE_EXT_CLIENT_CONFIG_LB_POLICY_H */ #endif /* GRPC_CORE_EXT_CLIENT_CHANNEL_LB_POLICY_H */

2
src/core/ext/client_config/lb_policy_factory.c → src/core/ext/client_channel/lb_policy_factory.c
Unescape View File

@ -36,7 +36,7 @@
#include <grpc/support/alloc.h> #include <grpc/support/alloc.h>
#include <grpc/support/string_util.h> #include <grpc/support/string_util.h>
#include "src/core/ext/client_config/lb_policy_factory.h" #include "src/core/ext/client_channel/lb_policy_factory.h"
grpc_lb_addresses* grpc_lb_addresses_create(size_t num_addresses) { grpc_lb_addresses* grpc_lb_addresses_create(size_t num_addresses) {
grpc_lb_addresses* addresses = gpr_malloc(sizeof(grpc_lb_addresses)); grpc_lb_addresses* addresses = gpr_malloc(sizeof(grpc_lb_addresses));

10
src/core/ext/client_config/lb_policy_factory.h → src/core/ext/client_channel/lb_policy_factory.h
Unescape View File

@ -31,11 +31,11 @@
* *
*/ */
#ifndef GRPC_CORE_EXT_CLIENT_CONFIG_LB_POLICY_FACTORY_H #ifndef GRPC_CORE_EXT_CLIENT_CHANNEL_LB_POLICY_FACTORY_H
#define GRPC_CORE_EXT_CLIENT_CONFIG_LB_POLICY_FACTORY_H #define GRPC_CORE_EXT_CLIENT_CHANNEL_LB_POLICY_FACTORY_H
#include "src/core/ext/client_config/client_channel_factory.h" #include "src/core/ext/client_channel/client_channel_factory.h"
#include "src/core/ext/client_config/lb_policy.h" #include "src/core/ext/client_channel/lb_policy.h"
#include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/exec_ctx.h"
#include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/resolve_address.h"
@ -118,4 +118,4 @@ grpc_lb_policy *grpc_lb_policy_factory_create_lb_policy(
grpc_exec_ctx *exec_ctx, grpc_lb_policy_factory *factory, grpc_exec_ctx *exec_ctx, grpc_lb_policy_factory *factory,
grpc_lb_policy_args *args); grpc_lb_policy_args *args);
#endif /* GRPC_CORE_EXT_CLIENT_CONFIG_LB_POLICY_FACTORY_H */ #endif /* GRPC_CORE_EXT_CLIENT_CHANNEL_LB_POLICY_FACTORY_H */

2
src/core/ext/client_config/lb_policy_registry.c → src/core/ext/client_channel/lb_policy_registry.c
Unescape View File

@ -31,7 +31,7 @@
* *
*/ */
#include "src/core/ext/client_config/lb_policy_registry.h" #include "src/core/ext/client_channel/lb_policy_registry.h"
#include <string.h> #include <string.h>

8
src/core/ext/client_config/lb_policy_registry.h → src/core/ext/client_channel/lb_policy_registry.h
Unescape View File

@ -31,10 +31,10 @@
* *
*/ */
#ifndef GRPC_CORE_EXT_CLIENT_CONFIG_LB_POLICY_REGISTRY_H #ifndef GRPC_CORE_EXT_CLIENT_CHANNEL_LB_POLICY_REGISTRY_H
#define GRPC_CORE_EXT_CLIENT_CONFIG_LB_POLICY_REGISTRY_H #define GRPC_CORE_EXT_CLIENT_CHANNEL_LB_POLICY_REGISTRY_H
#include "src/core/ext/client_config/lb_policy_factory.h" #include "src/core/ext/client_channel/lb_policy_factory.h"
#include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/exec_ctx.h"
/** Initialize the registry and set \a default_factory as the factory to be /** Initialize the registry and set \a default_factory as the factory to be
@ -52,4 +52,4 @@ void grpc_register_lb_policy(grpc_lb_policy_factory *factory);
grpc_lb_policy *grpc_lb_policy_create(grpc_exec_ctx *exec_ctx, const char *name, grpc_lb_policy *grpc_lb_policy_create(grpc_exec_ctx *exec_ctx, const char *name,
grpc_lb_policy_args *args); grpc_lb_policy_args *args);
#endif /* GRPC_CORE_EXT_CLIENT_CONFIG_LB_POLICY_REGISTRY_H */ #endif /* GRPC_CORE_EXT_CLIENT_CHANNEL_LB_POLICY_REGISTRY_H */

2
src/core/ext/client_config/method_config.c → src/core/ext/client_channel/method_config.c
Unescape View File

@ -29,7 +29,7 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// //
#include "src/core/ext/client_config/method_config.h" #include "src/core/ext/client_channel/method_config.h"
#include <string.h> #include <string.h>

6
src/core/ext/client_config/method_config.h → src/core/ext/client_channel/method_config.h
Unescape View File

@ -29,8 +29,8 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// //
#ifndef GRPC_CORE_EXT_CLIENT_CONFIG_METHOD_CONFIG_H #ifndef GRPC_CORE_EXT_CLIENT_CHANNEL_METHOD_CONFIG_H
#define GRPC_CORE_EXT_CLIENT_CONFIG_METHOD_CONFIG_H #define GRPC_CORE_EXT_CLIENT_CHANNEL_METHOD_CONFIG_H
#include <stdbool.h> #include <stdbool.h>
@ -113,4 +113,4 @@ grpc_method_config* grpc_method_config_table_get_method_config(
grpc_arg grpc_method_config_table_create_channel_arg( grpc_arg grpc_method_config_table_create_channel_arg(
grpc_method_config_table* table); grpc_method_config_table* table);
#endif /* GRPC_CORE_EXT_CLIENT_CONFIG_METHOD_CONFIG_H */ #endif /* GRPC_CORE_EXT_CLIENT_CHANNEL_METHOD_CONFIG_H */

2
src/core/ext/client_config/parse_address.c → src/core/ext/client_channel/parse_address.c
Unescape View File

@ -31,7 +31,7 @@
* *
*/ */
#include "src/core/ext/client_config/parse_address.h" #include "src/core/ext/client_channel/parse_address.h"
#include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/sockaddr.h"
#include <stdio.h> #include <stdio.h>

8
src/core/ext/client_config/parse_address.h → src/core/ext/client_channel/parse_address.h
Unescape View File

@ -31,12 +31,12 @@
* *
*/ */
#ifndef GRPC_CORE_EXT_CLIENT_CONFIG_PARSE_ADDRESS_H #ifndef GRPC_CORE_EXT_CLIENT_CHANNEL_PARSE_ADDRESS_H
#define GRPC_CORE_EXT_CLIENT_CONFIG_PARSE_ADDRESS_H #define GRPC_CORE_EXT_CLIENT_CHANNEL_PARSE_ADDRESS_H
#include <stddef.h> #include <stddef.h>
#include "src/core/ext/client_config/uri_parser.h" #include "src/core/ext/client_channel/uri_parser.h"
#include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/resolve_address.h"
/** Populate \a addr and \a len from \a uri, whose path is expected to contain a /** Populate \a addr and \a len from \a uri, whose path is expected to contain a
@ -51,4 +51,4 @@ int parse_ipv4(grpc_uri *uri, grpc_resolved_address *resolved_addr);
* host:port pair. Returns true upon success. */ * host:port pair. Returns true upon success. */
int parse_ipv6(grpc_uri *uri, grpc_resolved_address *resolved_addr); int parse_ipv6(grpc_uri *uri, grpc_resolved_address *resolved_addr);
#endif /* GRPC_CORE_EXT_CLIENT_CONFIG_PARSE_ADDRESS_H */ #endif /* GRPC_CORE_EXT_CLIENT_CHANNEL_PARSE_ADDRESS_H */

2
src/core/ext/client_config/resolver.c → src/core/ext/client_channel/resolver.c
Unescape View File

@ -31,7 +31,7 @@
* *
*/ */
#include "src/core/ext/client_config/resolver.h" #include "src/core/ext/client_channel/resolver.h"
void grpc_resolver_init(grpc_resolver *resolver, void grpc_resolver_init(grpc_resolver *resolver,
const grpc_resolver_vtable *vtable) { const grpc_resolver_vtable *vtable) {

10
src/core/ext/client_config/resolver.h → src/core/ext/client_channel/resolver.h
Unescape View File

@ -31,11 +31,11 @@
* *
*/ */
#ifndef GRPC_CORE_EXT_CLIENT_CONFIG_RESOLVER_H #ifndef GRPC_CORE_EXT_CLIENT_CHANNEL_RESOLVER_H
#define GRPC_CORE_EXT_CLIENT_CONFIG_RESOLVER_H #define GRPC_CORE_EXT_CLIENT_CHANNEL_RESOLVER_H
#include "src/core/ext/client_config/resolver_result.h" #include "src/core/ext/client_channel/resolver_result.h"
#include "src/core/ext/client_config/subchannel.h" #include "src/core/ext/client_channel/subchannel.h"
#include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/iomgr/iomgr.h"
typedef struct grpc_resolver grpc_resolver; typedef struct grpc_resolver grpc_resolver;
@ -91,4 +91,4 @@ void grpc_resolver_next(grpc_exec_ctx *exec_ctx, grpc_resolver *resolver,
grpc_resolver_result **result, grpc_resolver_result **result,
grpc_closure *on_complete); grpc_closure *on_complete);
#endif /* GRPC_CORE_EXT_CLIENT_CONFIG_RESOLVER_H */ #endif /* GRPC_CORE_EXT_CLIENT_CHANNEL_RESOLVER_H */

2
src/core/ext/client_config/resolver_factory.c → src/core/ext/client_channel/resolver_factory.c
Unescape View File

@ -31,7 +31,7 @@
* *
*/ */
#include "src/core/ext/client_config/resolver_factory.h" #include "src/core/ext/client_channel/resolver_factory.h"
void grpc_resolver_factory_ref(grpc_resolver_factory* factory) { void grpc_resolver_factory_ref(grpc_resolver_factory* factory) {
factory->vtable->ref(factory); factory->vtable->ref(factory);

12
src/core/ext/client_config/resolver_factory.h → src/core/ext/client_channel/resolver_factory.h
Unescape View File

@ -31,12 +31,12 @@
* *
*/ */
#ifndef GRPC_CORE_EXT_CLIENT_CONFIG_RESOLVER_FACTORY_H #ifndef GRPC_CORE_EXT_CLIENT_CHANNEL_RESOLVER_FACTORY_H
#define GRPC_CORE_EXT_CLIENT_CONFIG_RESOLVER_FACTORY_H #define GRPC_CORE_EXT_CLIENT_CHANNEL_RESOLVER_FACTORY_H
#include "src/core/ext/client_config/client_channel_factory.h" #include "src/core/ext/client_channel/client_channel_factory.h"
#include "src/core/ext/client_config/resolver.h" #include "src/core/ext/client_channel/resolver.h"
#include "src/core/ext/client_config/uri_parser.h" #include "src/core/ext/client_channel/uri_parser.h"
typedef struct grpc_resolver_factory grpc_resolver_factory; typedef struct grpc_resolver_factory grpc_resolver_factory;
typedef struct grpc_resolver_factory_vtable grpc_resolver_factory_vtable; typedef struct grpc_resolver_factory_vtable grpc_resolver_factory_vtable;
@ -76,4 +76,4 @@ grpc_resolver *grpc_resolver_factory_create_resolver(
char *grpc_resolver_factory_get_default_authority( char *grpc_resolver_factory_get_default_authority(
grpc_resolver_factory *factory, grpc_uri *uri); grpc_resolver_factory *factory, grpc_uri *uri);
#endif /* GRPC_CORE_EXT_CLIENT_CONFIG_RESOLVER_FACTORY_H */ #endif /* GRPC_CORE_EXT_CLIENT_CHANNEL_RESOLVER_FACTORY_H */

4
src/core/ext/client_config/resolver_registry.c → src/core/ext/client_channel/resolver_registry.c
Unescape View File

@ -31,7 +31,7 @@
* *
*/ */
#include "src/core/ext/client_config/resolver_registry.h" #include "src/core/ext/client_channel/resolver_registry.h"
#include <string.h> #include <string.h>
@ -55,7 +55,7 @@ void grpc_resolver_registry_shutdown(void) {
grpc_resolver_factory_unref(g_all_of_the_resolvers[i]); grpc_resolver_factory_unref(g_all_of_the_resolvers[i]);
} }
// FIXME(ctiller): this should live in grpc_resolver_registry_init, // FIXME(ctiller): this should live in grpc_resolver_registry_init,
// however that would have the client_config plugin call this AFTER we start // however that would have the client_channel plugin call this AFTER we start
// registering resolvers from third party plugins, and so they'd never show // registering resolvers from third party plugins, and so they'd never show
// up. // up.
// We likely need some kind of dependency system for plugins.... what form // We likely need some kind of dependency system for plugins.... what form

8
src/core/ext/client_config/resolver_registry.h → src/core/ext/client_channel/resolver_registry.h
Unescape View File

@ -31,10 +31,10 @@
* *
*/ */
#ifndef GRPC_CORE_EXT_CLIENT_CONFIG_RESOLVER_REGISTRY_H #ifndef GRPC_CORE_EXT_CLIENT_CHANNEL_RESOLVER_REGISTRY_H
#define GRPC_CORE_EXT_CLIENT_CONFIG_RESOLVER_REGISTRY_H #define GRPC_CORE_EXT_CLIENT_CHANNEL_RESOLVER_REGISTRY_H
#include "src/core/ext/client_config/resolver_factory.h" #include "src/core/ext/client_channel/resolver_factory.h"
void grpc_resolver_registry_init(); void grpc_resolver_registry_init();
void grpc_resolver_registry_shutdown(void); void grpc_resolver_registry_shutdown(void);
@ -68,4 +68,4 @@ grpc_resolver_factory *grpc_resolver_factory_lookup(const char *name);
representing the default authority to pass from a client. */ representing the default authority to pass from a client. */
char *grpc_get_default_authority(const char *target); char *grpc_get_default_authority(const char *target);
#endif /* GRPC_CORE_EXT_CLIENT_CONFIG_RESOLVER_REGISTRY_H */ #endif /* GRPC_CORE_EXT_CLIENT_CHANNEL_RESOLVER_REGISTRY_H */

2
src/core/ext/client_config/resolver_result.c → src/core/ext/client_channel/resolver_result.c
Unescape View File

@ -29,7 +29,7 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// //
#include "src/core/ext/client_config/resolver_result.h" #include "src/core/ext/client_channel/resolver_result.h"
#include <string.h> #include <string.h>

9
src/core/ext/client_config/resolver_result.h → src/core/ext/client_channel/resolver_result.h
Unescape View File

@ -29,11 +29,10 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// //
#ifndef GRPC_CORE_EXT_CLIENT_CONFIG_RESOLVER_RESULT_H #ifndef GRPC_CORE_EXT_CLIENT_CHANNEL_RESOLVER_RESULT_H
#define GRPC_CORE_EXT_CLIENT_CONFIG_RESOLVER_RESULT_H #define GRPC_CORE_EXT_CLIENT_CHANNEL_RESOLVER_RESULT_H
#include "src/core/ext/client_config/lb_policy_factory.h" #include "src/core/ext/client_channel/lb_policy_factory.h"
#include "src/core/lib/iomgr/resolve_address.h"
// TODO(roth, ctiller): In the long term, we are considering replacing // TODO(roth, ctiller): In the long term, we are considering replacing
// the resolver_result data structure with grpc_channel_args. The idea is // the resolver_result data structure with grpc_channel_args. The idea is
@ -66,4 +65,4 @@ const char* grpc_resolver_result_get_lb_policy_name(
grpc_channel_args* grpc_resolver_result_get_lb_policy_args( grpc_channel_args* grpc_resolver_result_get_lb_policy_args(
grpc_resolver_result* result); grpc_resolver_result* result);
#endif /* GRPC_CORE_EXT_CLIENT_CONFIG_RESOLVER_RESULT_H */ #endif /* GRPC_CORE_EXT_CLIENT_CHANNEL_RESOLVER_RESULT_H */

8
src/core/ext/client_config/subchannel.c → src/core/ext/client_channel/subchannel.c
Unescape View File

@ -31,7 +31,7 @@
* *
*/ */
#include "src/core/ext/client_config/subchannel.h" #include "src/core/ext/client_channel/subchannel.h"
#include <limits.h> #include <limits.h>
#include <string.h> #include <string.h>
@ -39,9 +39,9 @@
#include <grpc/support/alloc.h> #include <grpc/support/alloc.h>
#include <grpc/support/avl.h> #include <grpc/support/avl.h>
#include "src/core/ext/client_config/client_channel.h" #include "src/core/ext/client_channel/client_channel.h"
#include "src/core/ext/client_config/initial_connect_string.h" #include "src/core/ext/client_channel/initial_connect_string.h"
#include "src/core/ext/client_config/subchannel_index.h" #include "src/core/ext/client_channel/subchannel_index.h"
#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/channel/connected_channel.h" #include "src/core/lib/channel/connected_channel.h"
#include "src/core/lib/iomgr/timer.h" #include "src/core/lib/iomgr/timer.h"

8
src/core/ext/client_config/subchannel.h → src/core/ext/client_channel/subchannel.h
Unescape View File

@ -31,10 +31,10 @@
* *
*/ */
#ifndef GRPC_CORE_EXT_CLIENT_CONFIG_SUBCHANNEL_H #ifndef GRPC_CORE_EXT_CLIENT_CHANNEL_SUBCHANNEL_H
#define GRPC_CORE_EXT_CLIENT_CONFIG_SUBCHANNEL_H #define GRPC_CORE_EXT_CLIENT_CHANNEL_SUBCHANNEL_H
#include "src/core/ext/client_config/connector.h" #include "src/core/ext/client_channel/connector.h"
#include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/channel_stack.h"
#include "src/core/lib/iomgr/polling_entity.h" #include "src/core/lib/iomgr/polling_entity.h"
#include "src/core/lib/transport/connectivity_state.h" #include "src/core/lib/transport/connectivity_state.h"
@ -175,4 +175,4 @@ grpc_subchannel *grpc_subchannel_create(grpc_exec_ctx *exec_ctx,
grpc_connector *connector, grpc_connector *connector,
grpc_subchannel_args *args); grpc_subchannel_args *args);
#endif /* GRPC_CORE_EXT_CLIENT_CONFIG_SUBCHANNEL_H */ #endif /* GRPC_CORE_EXT_CLIENT_CHANNEL_SUBCHANNEL_H */

2
src/core/ext/client_config/subchannel_index.c → src/core/ext/client_channel/subchannel_index.c
Unescape View File

@ -31,7 +31,7 @@
// //
// //
#include "src/core/ext/client_config/subchannel_index.h" #include "src/core/ext/client_channel/subchannel_index.h"
#include <stdbool.h> #include <stdbool.h>
#include <string.h> #include <string.h>

10
src/core/ext/client_config/subchannel_index.h → src/core/ext/client_channel/subchannel_index.h
Unescape View File

@ -31,11 +31,11 @@
* *
*/ */
#ifndef GRPC_CORE_EXT_CLIENT_CONFIG_SUBCHANNEL_INDEX_H #ifndef GRPC_CORE_EXT_CLIENT_CHANNEL_SUBCHANNEL_INDEX_H
#define GRPC_CORE_EXT_CLIENT_CONFIG_SUBCHANNEL_INDEX_H #define GRPC_CORE_EXT_CLIENT_CHANNEL_SUBCHANNEL_INDEX_H
#include "src/core/ext/client_config/connector.h" #include "src/core/ext/client_channel/connector.h"
#include "src/core/ext/client_config/subchannel.h" #include "src/core/ext/client_channel/subchannel.h"
/** \file Provides an index of active subchannels so that they can be /** \file Provides an index of active subchannels so that they can be
shared amongst channels */ shared amongst channels */
@ -74,4 +74,4 @@ void grpc_subchannel_index_init(void);
/** Shutdown the subchannel index (global) */ /** Shutdown the subchannel index (global) */
void grpc_subchannel_index_shutdown(void); void grpc_subchannel_index_shutdown(void);
#endif /* GRPC_CORE_EXT_CLIENT_CONFIG_SUBCHANNEL_INDEX_H */ #endif /* GRPC_CORE_EXT_CLIENT_CHANNEL_SUBCHANNEL_INDEX_H */

2
src/core/ext/client_config/uri_parser.c → src/core/ext/client_channel/uri_parser.c
Unescape View File

@ -31,7 +31,7 @@
* *
*/ */
#include "src/core/ext/client_config/uri_parser.h" #include "src/core/ext/client_channel/uri_parser.h"
#include <string.h> #include <string.h>

6
src/core/ext/client_config/uri_parser.h → src/core/ext/client_channel/uri_parser.h
Unescape View File

@ -31,8 +31,8 @@
* *
*/ */
#ifndef GRPC_CORE_EXT_CLIENT_CONFIG_URI_PARSER_H #ifndef GRPC_CORE_EXT_CLIENT_CHANNEL_URI_PARSER_H
#define GRPC_CORE_EXT_CLIENT_CONFIG_URI_PARSER_H #define GRPC_CORE_EXT_CLIENT_CHANNEL_URI_PARSER_H
#include <stddef.h> #include <stddef.h>
@ -60,4 +60,4 @@ const char *grpc_uri_get_query_arg(const grpc_uri *uri, const char *key);
/** destroy a uri */ /** destroy a uri */
void grpc_uri_destroy(grpc_uri *uri); void grpc_uri_destroy(grpc_uri *uri);
#endif /* GRPC_CORE_EXT_CLIENT_CONFIG_URI_PARSER_H */ #endif /* GRPC_CORE_EXT_CLIENT_CHANNEL_URI_PARSER_H */

8
src/core/ext/lb_policy/grpclb/grpclb.c
Unescape View File

@ -109,10 +109,10 @@
#include <grpc/support/string_util.h> #include <grpc/support/string_util.h>
#include <grpc/support/time.h> #include <grpc/support/time.h>
#include "src/core/ext/client_config/client_channel_factory.h" #include "src/core/ext/client_channel/client_channel_factory.h"
#include "src/core/ext/client_config/lb_policy_factory.h" #include "src/core/ext/client_channel/lb_policy_factory.h"
#include "src/core/ext/client_config/lb_policy_registry.h" #include "src/core/ext/client_channel/lb_policy_registry.h"
#include "src/core/ext/client_config/parse_address.h" #include "src/core/ext/client_channel/parse_address.h"
#include "src/core/ext/lb_policy/grpclb/grpclb.h" #include "src/core/ext/lb_policy/grpclb/grpclb.h"
#include "src/core/ext/lb_policy/grpclb/load_balancer_api.h" #include "src/core/ext/lb_policy/grpclb/load_balancer_api.h"
#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args.h"

2
src/core/ext/lb_policy/grpclb/grpclb.h
Unescape View File

@ -34,7 +34,7 @@
#ifndef GRPC_CORE_EXT_LB_POLICY_GRPCLB_GRPCLB_H #ifndef GRPC_CORE_EXT_LB_POLICY_GRPCLB_GRPCLB_H
#define GRPC_CORE_EXT_LB_POLICY_GRPCLB_GRPCLB_H #define GRPC_CORE_EXT_LB_POLICY_GRPCLB_GRPCLB_H
#include "src/core/ext/client_config/lb_policy_factory.h" #include "src/core/ext/client_channel/lb_policy_factory.h"
/** Returns a load balancing factory for the glb policy, which tries to connect /** Returns a load balancing factory for the glb policy, which tries to connect
* to a load balancing server to decide the next successfully connected * to a load balancing server to decide the next successfully connected

2
src/core/ext/lb_policy/grpclb/load_balancer_api.h
Unescape View File

@ -36,7 +36,7 @@
#include <grpc/support/slice_buffer.h> #include <grpc/support/slice_buffer.h>
#include "src/core/ext/client_config/lb_policy_factory.h" #include "src/core/ext/client_channel/lb_policy_factory.h"
#include "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h" #include "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h"
#ifdef __cplusplus #ifdef __cplusplus

2
src/core/ext/lb_policy/pick_first/pick_first.c
Unescape View File

@ -34,7 +34,7 @@
#include <string.h> #include <string.h>
#include <grpc/support/alloc.h> #include <grpc/support/alloc.h>
#include "src/core/ext/client_config/lb_policy_registry.h" #include "src/core/ext/client_channel/lb_policy_registry.h"
#include "src/core/lib/transport/connectivity_state.h" #include "src/core/lib/transport/connectivity_state.h"
typedef struct pending_pick { typedef struct pending_pick {

2
src/core/ext/lb_policy/round_robin/round_robin.c
Unescape View File

@ -63,7 +63,7 @@
#include <grpc/support/alloc.h> #include <grpc/support/alloc.h>
#include "src/core/ext/client_config/lb_policy_registry.h" #include "src/core/ext/client_channel/lb_policy_registry.h"
#include "src/core/lib/debug/trace.h" #include "src/core/lib/debug/trace.h"
#include "src/core/lib/transport/connectivity_state.h" #include "src/core/lib/transport/connectivity_state.h"
#include "src/core/lib/transport/static_metadata.h" #include "src/core/lib/transport/static_metadata.h"

2
src/core/ext/load_reporting/load_reporting.h
Unescape View File

@ -51,7 +51,7 @@
* The value corresponding to this key is an opaque binary blob reported by the * The value corresponding to this key is an opaque binary blob reported by the
* backend as part of its trailing metadata containing cost information for the * backend as part of its trailing metadata containing cost information for the
* call. */ * call. */
#define GRPC_LB_COST_MD_KEY "lb-cost" #define GRPC_LB_COST_MD_KEY "lb-cost-bin"
/** Identifiers for the invocation point of the users LR callback */ /** Identifiers for the invocation point of the users LR callback */
typedef enum grpc_load_reporting_source { typedef enum grpc_load_reporting_source {

2
src/core/ext/load_reporting/load_reporting_filter.c
Unescape View File

@ -193,7 +193,7 @@ static grpc_mdelem *lr_trailing_md_filter(void *user_data, grpc_mdelem *md) {
grpc_call_element *elem = user_data; grpc_call_element *elem = user_data;
call_data *calld = elem->call_data; call_data *calld = elem->call_data;
if (md->key == GRPC_MDSTR_LB_COST) { if (md->key == GRPC_MDSTR_LB_COST_BIN) {
calld->trailing_md_string = gpr_strdup(grpc_mdstr_as_c_string(md->value)); calld->trailing_md_string = gpr_strdup(grpc_mdstr_as_c_string(md->value));
return NULL; return NULL;
} }

6
src/core/ext/resolver/dns/native/dns_resolver.c
Unescape View File

@ -37,9 +37,9 @@
#include <grpc/support/host_port.h> #include <grpc/support/host_port.h>
#include <grpc/support/string_util.h> #include <grpc/support/string_util.h>
#include "src/core/ext/client_config/http_connect_handshaker.h" #include "src/core/ext/client_channel/http_connect_handshaker.h"
#include "src/core/ext/client_config/lb_policy_registry.h" #include "src/core/ext/client_channel/lb_policy_registry.h"
#include "src/core/ext/client_config/resolver_registry.h" #include "src/core/ext/client_channel/resolver_registry.h"
#include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/resolve_address.h"
#include "src/core/lib/iomgr/timer.h" #include "src/core/lib/iomgr/timer.h"
#include "src/core/lib/support/backoff.h" #include "src/core/lib/support/backoff.h"

5
src/core/ext/resolver/sockaddr/sockaddr_resolver.c
Unescape View File

@ -41,9 +41,8 @@
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
#include <grpc/support/string_util.h> #include <grpc/support/string_util.h>
#include "src/core/ext/client_config/parse_address.h" #include "src/core/ext/client_channel/parse_address.h"
#include "src/core/ext/client_config/resolver_registry.h" #include "src/core/ext/client_channel/resolver_registry.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/resolve_address.h"
#include "src/core/lib/iomgr/unix_sockets_posix.h" #include "src/core/lib/iomgr/unix_sockets_posix.h"
#include "src/core/lib/support/string.h" #include "src/core/lib/support/string.h"

6
src/core/ext/transport/chttp2/client/insecure/channel_create.c
Unescape View File

@ -40,9 +40,9 @@
#include <grpc/support/slice.h> #include <grpc/support/slice.h>
#include <grpc/support/slice_buffer.h> #include <grpc/support/slice_buffer.h>
#include "src/core/ext/client_config/client_channel.h" #include "src/core/ext/client_channel/client_channel.h"
#include "src/core/ext/client_config/http_connect_handshaker.h" #include "src/core/ext/client_channel/http_connect_handshaker.h"
#include "src/core/ext/client_config/resolver_registry.h" #include "src/core/ext/client_channel/resolver_registry.h"
#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/channel/compress_filter.h" #include "src/core/lib/channel/compress_filter.h"

11
src/core/ext/transport/chttp2/client/secure/secure_channel_create.c
Unescape View File

@ -40,9 +40,9 @@
#include <grpc/support/slice.h> #include <grpc/support/slice.h>
#include <grpc/support/slice_buffer.h> #include <grpc/support/slice_buffer.h>
#include "src/core/ext/client_config/client_channel.h" #include "src/core/ext/client_channel/client_channel.h"
#include "src/core/ext/client_config/http_connect_handshaker.h" #include "src/core/ext/client_channel/http_connect_handshaker.h"
#include "src/core/ext/client_config/resolver_registry.h" #include "src/core/ext/client_channel/resolver_registry.h"
#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/channel/handshaker.h" #include "src/core/lib/channel/handshaker.h"
@ -290,8 +290,6 @@ static grpc_channel *client_channel_factory_create_channel(
channel = NULL; channel = NULL;
} }
GRPC_SECURITY_CONNECTOR_UNREF(&f->security_connector->base,
"client_channel_factory_create_channel");
return channel; return channel;
} }
@ -360,6 +358,9 @@ grpc_channel *grpc_secure_channel_create(grpc_channel_credentials *creds,
grpc_channel *channel = client_channel_factory_create_channel( grpc_channel *channel = client_channel_factory_create_channel(
&exec_ctx, &f->base, target, GRPC_CLIENT_CHANNEL_TYPE_REGULAR, NULL); &exec_ctx, &f->base, target, GRPC_CLIENT_CHANNEL_TYPE_REGULAR, NULL);
GRPC_SECURITY_CONNECTOR_UNREF(&f->security_connector->base,
"client_channel_factory_create_channel");
grpc_client_channel_factory_unref(&exec_ctx, &f->base); grpc_client_channel_factory_unref(&exec_ctx, &f->base);
grpc_exec_ctx_finish(&exec_ctx); grpc_exec_ctx_finish(&exec_ctx);

7
src/core/lib/channel/http_server_filter.c
Unescape View File

@ -42,6 +42,8 @@
#define EXPECTED_CONTENT_TYPE "application/grpc" #define EXPECTED_CONTENT_TYPE "application/grpc"
#define EXPECTED_CONTENT_TYPE_LENGTH sizeof(EXPECTED_CONTENT_TYPE) - 1 #define EXPECTED_CONTENT_TYPE_LENGTH sizeof(EXPECTED_CONTENT_TYPE) - 1
extern int grpc_http_trace;
typedef struct call_data { typedef struct call_data {
uint8_t seen_path; uint8_t seen_path;
uint8_t seen_method; uint8_t seen_method;
@ -209,6 +211,11 @@ static void hs_on_recv(grpc_exec_ctx *exec_ctx, void *user_data,
err, GRPC_ERROR_CREATE("Missing te: trailers header")); err, GRPC_ERROR_CREATE("Missing te: trailers header"));
} }
/* Error this call out */ /* Error this call out */
if (grpc_http_trace) {
const char *error_str = grpc_error_string(err);
gpr_log(GPR_ERROR, "Invalid http2 headers: %s", error_str);
grpc_error_free_string(error_str);
}
grpc_call_element_send_cancel(exec_ctx, elem); grpc_call_element_send_cancel(exec_ctx, elem);
} }
} else { } else {

2
src/core/lib/channel/message_size_filter.c
Unescape View File

@ -38,7 +38,7 @@
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include <grpc/support/string_util.h> #include <grpc/support/string_util.h>
#include "src/core/ext/client_config/method_config.h" #include "src/core/ext/client_channel/method_config.h"
#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args.h"
#define DEFAULT_MAX_SEND_MESSAGE_LENGTH -1 // Unlimited. #define DEFAULT_MAX_SEND_MESSAGE_LENGTH -1 // Unlimited.

2
src/core/lib/transport/static_metadata.c
Unescape View File

@ -126,7 +126,7 @@ const char *const grpc_static_metadata_strings[GRPC_STATIC_MDSTR_COUNT] = {
"if-range", "if-range",
"if-unmodified-since", "if-unmodified-since",
"last-modified", "last-modified",
"lb-cost", "lb-cost-bin",
"lb-token", "lb-token",
"link", "link",
"location", "location",

8
src/core/lib/transport/static_metadata.h
Unescape View File

@ -175,8 +175,8 @@ extern grpc_mdstr grpc_static_mdstr_table[GRPC_STATIC_MDSTR_COUNT];
#define GRPC_MDSTR_IF_UNMODIFIED_SINCE (&grpc_static_mdstr_table[62]) #define GRPC_MDSTR_IF_UNMODIFIED_SINCE (&grpc_static_mdstr_table[62])
/* "last-modified" */ /* "last-modified" */
#define GRPC_MDSTR_LAST_MODIFIED (&grpc_static_mdstr_table[63]) #define GRPC_MDSTR_LAST_MODIFIED (&grpc_static_mdstr_table[63])
/* "lb-cost" */ /* "lb-cost-bin" */
#define GRPC_MDSTR_LB_COST (&grpc_static_mdstr_table[64]) #define GRPC_MDSTR_LB_COST_BIN (&grpc_static_mdstr_table[64])
/* "lb-token" */ /* "lb-token" */
#define GRPC_MDSTR_LB_TOKEN (&grpc_static_mdstr_table[65]) #define GRPC_MDSTR_LB_TOKEN (&grpc_static_mdstr_table[65])
/* "link" */ /* "link" */
@ -337,8 +337,8 @@ extern uintptr_t grpc_static_mdelem_user_data[GRPC_STATIC_MDELEM_COUNT];
#define GRPC_MDELEM_IF_UNMODIFIED_SINCE_EMPTY (&grpc_static_mdelem_table[44]) #define GRPC_MDELEM_IF_UNMODIFIED_SINCE_EMPTY (&grpc_static_mdelem_table[44])
/* "last-modified": "" */ /* "last-modified": "" */
#define GRPC_MDELEM_LAST_MODIFIED_EMPTY (&grpc_static_mdelem_table[45]) #define GRPC_MDELEM_LAST_MODIFIED_EMPTY (&grpc_static_mdelem_table[45])
/* "lb-cost": "" */ /* "lb-cost-bin": "" */
#define GRPC_MDELEM_LB_COST_EMPTY (&grpc_static_mdelem_table[46]) #define GRPC_MDELEM_LB_COST_BIN_EMPTY (&grpc_static_mdelem_table[46])
/* "lb-token": "" */ /* "lb-token": "" */
#define GRPC_MDELEM_LB_TOKEN_EMPTY (&grpc_static_mdelem_table[47]) #define GRPC_MDELEM_LB_TOKEN_EMPTY (&grpc_static_mdelem_table[47])
/* "link": "" */ /* "link": "" */

8
src/core/plugin_registry/grpc_cronet_plugin_registry.c
Unescape View File

@ -35,12 +35,12 @@
extern void grpc_chttp2_plugin_init(void); extern void grpc_chttp2_plugin_init(void);
extern void grpc_chttp2_plugin_shutdown(void); extern void grpc_chttp2_plugin_shutdown(void);
extern void grpc_client_config_init(void); extern void grpc_client_channel_init(void);
extern void grpc_client_config_shutdown(void); extern void grpc_client_channel_shutdown(void);
void grpc_register_built_in_plugins(void) { void grpc_register_built_in_plugins(void) {
grpc_register_plugin(grpc_chttp2_plugin_init, grpc_register_plugin(grpc_chttp2_plugin_init,
grpc_chttp2_plugin_shutdown); grpc_chttp2_plugin_shutdown);
grpc_register_plugin(grpc_client_config_init, grpc_register_plugin(grpc_client_channel_init,
grpc_client_config_shutdown); grpc_client_channel_shutdown);
} }

8
src/core/plugin_registry/grpc_plugin_registry.c
Unescape View File

@ -35,8 +35,8 @@
extern void grpc_chttp2_plugin_init(void); extern void grpc_chttp2_plugin_init(void);
extern void grpc_chttp2_plugin_shutdown(void); extern void grpc_chttp2_plugin_shutdown(void);
extern void grpc_client_config_init(void); extern void grpc_client_channel_init(void);
extern void grpc_client_config_shutdown(void); extern void grpc_client_channel_shutdown(void);
extern void grpc_lb_policy_grpclb_init(void); extern void grpc_lb_policy_grpclb_init(void);
extern void grpc_lb_policy_grpclb_shutdown(void); extern void grpc_lb_policy_grpclb_shutdown(void);
extern void grpc_lb_policy_pick_first_init(void); extern void grpc_lb_policy_pick_first_init(void);
@ -55,8 +55,8 @@ extern void census_grpc_plugin_shutdown(void);
void grpc_register_built_in_plugins(void) { void grpc_register_built_in_plugins(void) {
grpc_register_plugin(grpc_chttp2_plugin_init, grpc_register_plugin(grpc_chttp2_plugin_init,
grpc_chttp2_plugin_shutdown); grpc_chttp2_plugin_shutdown);
grpc_register_plugin(grpc_client_config_init, grpc_register_plugin(grpc_client_channel_init,
grpc_client_config_shutdown); grpc_client_channel_shutdown);
grpc_register_plugin(grpc_lb_policy_grpclb_init, grpc_register_plugin(grpc_lb_policy_grpclb_init,
grpc_lb_policy_grpclb_shutdown); grpc_lb_policy_grpclb_shutdown);
grpc_register_plugin(grpc_lb_policy_pick_first_init, grpc_register_plugin(grpc_lb_policy_pick_first_init,

8
src/core/plugin_registry/grpc_unsecure_plugin_registry.c
Unescape View File

@ -35,8 +35,8 @@
extern void grpc_chttp2_plugin_init(void); extern void grpc_chttp2_plugin_init(void);
extern void grpc_chttp2_plugin_shutdown(void); extern void grpc_chttp2_plugin_shutdown(void);
extern void grpc_client_config_init(void); extern void grpc_client_channel_init(void);
extern void grpc_client_config_shutdown(void); extern void grpc_client_channel_shutdown(void);
extern void grpc_resolver_dns_native_init(void); extern void grpc_resolver_dns_native_init(void);
extern void grpc_resolver_dns_native_shutdown(void); extern void grpc_resolver_dns_native_shutdown(void);
extern void grpc_resolver_sockaddr_init(void); extern void grpc_resolver_sockaddr_init(void);
@ -55,8 +55,8 @@ extern void census_grpc_plugin_shutdown(void);
void grpc_register_built_in_plugins(void) { void grpc_register_built_in_plugins(void) {
grpc_register_plugin(grpc_chttp2_plugin_init, grpc_register_plugin(grpc_chttp2_plugin_init,
grpc_chttp2_plugin_shutdown); grpc_chttp2_plugin_shutdown);
grpc_register_plugin(grpc_client_config_init, grpc_register_plugin(grpc_client_channel_init,
grpc_client_config_shutdown); grpc_client_channel_shutdown);
grpc_register_plugin(grpc_resolver_dns_native_init, grpc_register_plugin(grpc_resolver_dns_native_init,
grpc_resolver_dns_native_shutdown); grpc_resolver_dns_native_shutdown);
grpc_register_plugin(grpc_resolver_sockaddr_init, grpc_register_plugin(grpc_resolver_sockaddr_init,

5
src/csharp/Grpc.IntegrationTesting.QpsWorker/project.json
Unescape View File

@ -67,5 +67,10 @@
} }
} }
} }
},
"runtimeOptions": {
"configProperties": {
"System.GC.Server": true
}
} }
} }

1
src/csharp/Grpc.IntegrationTesting/InteropClient.cs
Unescape View File

@ -583,7 +583,6 @@ namespace Grpc.IntegrationTesting
var e = Assert.Throws<RpcException>(() => client.UnimplementedCall(new Empty())); var e = Assert.Throws<RpcException>(() => client.UnimplementedCall(new Empty()));
Assert.AreEqual(StatusCode.Unimplemented, e.Status.StatusCode); Assert.AreEqual(StatusCode.Unimplemented, e.Status.StatusCode);
Assert.AreEqual("", e.Status.Detail);
Console.WriteLine("Passed!"); Console.WriteLine("Passed!");
} }

8
src/node/ext/node_grpc.cc
Unescape View File

@ -269,10 +269,10 @@ void InitLogConstants(Local<Object> exports) {
Nan::HandleScope scope; Nan::HandleScope scope;
Local<Object> log_verbosity = Nan::New<Object>(); Local<Object> log_verbosity = Nan::New<Object>();
Nan::Set(exports, Nan::New("logVerbosity").ToLocalChecked(), log_verbosity); Nan::Set(exports, Nan::New("logVerbosity").ToLocalChecked(), log_verbosity);
Local<Value> DEBUG_LOG(Nan::New<Uint32, uint32_t>(GPR_LOG_SEVERITY_DEBUG)); Local<Value> LOG_DEBUG(Nan::New<Uint32, uint32_t>(GPR_LOG_SEVERITY_DEBUG));
Nan::Set(log_verbosity, Nan::New("DEBUG").ToLocalChecked(), DEBUG_LOG); Nan::Set(log_verbosity, Nan::New("DEBUG").ToLocalChecked(), LOG_DEBUG);
Local<Value> INFO(Nan::New<Uint32, uint32_t>(GPR_LOG_SEVERITY_INFO)); Local<Value> LOG_INFO(Nan::New<Uint32, uint32_t>(GPR_LOG_SEVERITY_INFO));
Nan::Set(log_verbosity, Nan::New("INFO").ToLocalChecked(), INFO); Nan::Set(log_verbosity, Nan::New("INFO").ToLocalChecked(), LOG_INFO);
Local<Value> LOG_ERROR(Nan::New<Uint32, uint32_t>(GPR_LOG_SEVERITY_ERROR)); Local<Value> LOG_ERROR(Nan::New<Uint32, uint32_t>(GPR_LOG_SEVERITY_ERROR));
Nan::Set(log_verbosity, Nan::New("ERROR").ToLocalChecked(), LOG_ERROR); Nan::Set(log_verbosity, Nan::New("ERROR").ToLocalChecked(), LOG_ERROR);
} }

12
src/objective-c/examples/Sample/Sample.xcodeproj/project.pbxproj
Unescape View File

@ -3,7 +3,7 @@
archiveVersion = 1; archiveVersion = 1;
classes = { classes = {
}; };
objectVersion = 48; objectVersion = 46;
objects = { objects = {
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
@ -129,7 +129,7 @@
6369A2621A9322E20015FC5C /* Project object */ = { 6369A2621A9322E20015FC5C /* Project object */ = {
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
LastUpgradeCheck = 0800; LastUpgradeCheck = 0730;
ORGANIZATIONNAME = gRPC; ORGANIZATIONNAME = gRPC;
TargetAttributes = { TargetAttributes = {
6369A2691A9322E20015FC5C = { 6369A2691A9322E20015FC5C = {
@ -138,7 +138,7 @@
}; };
}; };
buildConfigurationList = 6369A2651A9322E20015FC5C /* Build configuration list for PBXProject "Sample" */; buildConfigurationList = 6369A2651A9322E20015FC5C /* Build configuration list for PBXProject "Sample" */;
compatibilityVersion = "Xcode 8.0"; compatibilityVersion = "Xcode 3.2";
developmentRegion = English; developmentRegion = English;
hasScannedForEncodings = 0; hasScannedForEncodings = 0;
knownRegions = ( knownRegions = (
@ -253,10 +253,8 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@ -265,7 +263,6 @@
ENABLE_TESTABILITY = YES; ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99; GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1", "DEBUG=1",
@ -299,10 +296,8 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@ -310,7 +305,6 @@
ENABLE_NS_ASSERTIONS = NO; ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99; GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNDECLARED_SELECTOR = YES;

2
src/objective-c/examples/Sample/Sample.xcodeproj/xcshareddata/xcschemes/Sample.xcscheme
Unescape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0800" LastUpgradeVersion = "0730"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

18
src/objective-c/examples/SwiftSample/SwiftSample.xcodeproj/project.pbxproj
Unescape View File

@ -3,7 +3,7 @@
archiveVersion = 1; archiveVersion = 1;
classes = { classes = {
}; };
objectVersion = 48; objectVersion = 46;
objects = { objects = {
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
@ -123,17 +123,16 @@
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
LastSwiftUpdateCheck = 0710; LastSwiftUpdateCheck = 0710;
LastUpgradeCheck = 0800; LastUpgradeCheck = 0730;
ORGANIZATIONNAME = gRPC; ORGANIZATIONNAME = gRPC;
TargetAttributes = { TargetAttributes = {
633BFFC11B950B210007E424 = { 633BFFC11B950B210007E424 = {
CreatedOnToolsVersion = 6.4; CreatedOnToolsVersion = 6.4;
LastSwiftMigration = 0800;
}; };
}; };
}; };
buildConfigurationList = 633BFFBD1B950B210007E424 /* Build configuration list for PBXProject "SwiftSample" */; buildConfigurationList = 633BFFBD1B950B210007E424 /* Build configuration list for PBXProject "SwiftSample" */;
compatibilityVersion = "Xcode 8.0"; compatibilityVersion = "Xcode 3.2";
developmentRegion = English; developmentRegion = English;
hasScannedForEncodings = 0; hasScannedForEncodings = 0;
knownRegions = ( knownRegions = (
@ -247,10 +246,8 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@ -295,10 +292,8 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@ -317,7 +312,6 @@
IPHONEOS_DEPLOYMENT_TARGET = 8.4; IPHONEOS_DEPLOYMENT_TARGET = 8.4;
MTL_ENABLE_DEBUG_INFO = NO; MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos; SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES; VALIDATE_PRODUCT = YES;
}; };
@ -333,7 +327,6 @@
PRODUCT_BUNDLE_IDENTIFIER = "io.grpc.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_BUNDLE_IDENTIFIER = "io.grpc.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = ""; SWIFT_OBJC_BRIDGING_HEADER = "";
SWIFT_VERSION = 3.0;
USER_HEADER_SEARCH_PATHS = ""; USER_HEADER_SEARCH_PATHS = "";
}; };
name = Debug; name = Debug;
@ -348,7 +341,6 @@
PRODUCT_BUNDLE_IDENTIFIER = "io.grpc.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_BUNDLE_IDENTIFIER = "io.grpc.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = ""; SWIFT_OBJC_BRIDGING_HEADER = "";
SWIFT_VERSION = 3.0;
USER_HEADER_SEARCH_PATHS = ""; USER_HEADER_SEARCH_PATHS = "";
}; };
name = Release; name = Release;
@ -363,7 +355,7 @@
633BFFE01B950B210007E424 /* Release */, 633BFFE01B950B210007E424 /* Release */,
); );
defaultConfigurationIsVisible = 0; defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug; defaultConfigurationName = Release;
}; };
633BFFE11B950B210007E424 /* Build configuration list for PBXNativeTarget "SwiftSample" */ = { 633BFFE11B950B210007E424 /* Build configuration list for PBXNativeTarget "SwiftSample" */ = {
isa = XCConfigurationList; isa = XCConfigurationList;
@ -372,7 +364,7 @@
633BFFE31B950B210007E424 /* Release */, 633BFFE31B950B210007E424 /* Release */,
); );
defaultConfigurationIsVisible = 0; defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug; defaultConfigurationName = Release;
}; };
/* End XCConfigurationList section */ /* End XCConfigurationList section */
}; };

2
src/objective-c/examples/SwiftSample/SwiftSample.xcodeproj/xcshareddata/xcschemes/SwiftSample.xcscheme
Unescape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0800" LastUpgradeVersion = "0730"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

25
src/objective-c/examples/SwiftSample/ViewController.swift
Unescape View File

@ -51,7 +51,7 @@ class ViewController: UIViewController {
// Example gRPC call using a generated proto client library: // Example gRPC call using a generated proto client library:
let service = RMTTestService(host: RemoteHost) let service = RMTTestService(host: RemoteHost)
service.unaryCall(with: request) { response, error in service.unaryCallWithRequest(request) { response, error in
if let response = response { if let response = response {
NSLog("1. Finished successfully with response:\n\(response)") NSLog("1. Finished successfully with response:\n\(response)")
} else { } else {
@ -63,39 +63,40 @@ class ViewController: UIViewController {
// Same but manipulating headers: // Same but manipulating headers:
var RPC : GRPCProtoCall! // Needed to convince Swift to capture by reference (__block) var RPC : GRPCProtoCall! // Needed to convince Swift to capture by reference (__block)
RPC = service.rpcToUnaryCall(with: request) { response, error in RPC = service.RPCToUnaryCallWithRequest(request) { response, error in
if let response = response { if let response = response {
NSLog("2. Finished successfully with response:\n\(response)") NSLog("2. Finished successfully with response:\n\(response)")
} else { } else {
NSLog("2. Finished with error: \(error!)") NSLog("2. Finished with error: \(error!)")
} }
NSLog("2. Response headers: \(RPC.responseHeaders!)") NSLog("2. Response headers: \(RPC.responseHeaders)")
NSLog("2. Response trailers: \(RPC.responseTrailers!)") NSLog("2. Response trailers: \(RPC.responseTrailers)")
} }
RPC.requestHeaders["My-Header"] = "My value"; // TODO(jcanizales): Revert to using subscript syntax once XCode 8 is released.
RPC.requestHeaders.setObject("My value", forKey: "My-Header")
RPC.start() RPC.start()
// Same example call using the generic gRPC client library: // Same example call using the generic gRPC client library:
let method = GRPCProtoMethod(package: "grpc.testing", service: "TestService", method: "UnaryCall")! let method = GRPCProtoMethod(package: "grpc.testing", service: "TestService", method: "UnaryCall")
let requestsWriter = GRXWriter(value: request.data()) let requestsWriter = GRXWriter(value: request.data())
let call = GRPCCall(host: RemoteHost, path: method.httpPath, requestsWriter: requestsWriter)! let call = GRPCCall(host: RemoteHost, path: method.HTTPPath, requestsWriter: requestsWriter)
call.requestHeaders["My-Header"] = "My value"; call.requestHeaders.setObject("My value", forKey: "My-Header")
call.start(with: GRXWriteable { response, error in call.startWithWriteable(GRXWriteable { response, error in
if let response = response as? Data { if let response = response as? NSData {
NSLog("3. Received response:\n\(try! RMTSimpleResponse(data: response))") NSLog("3. Received response:\n\(try! RMTSimpleResponse(data: response))")
} else { } else {
NSLog("3. Finished with error: \(error!)") NSLog("3. Finished with error: \(error!)")
} }
NSLog("3. Response headers: \(call.responseHeaders!)") NSLog("3. Response headers: \(call.responseHeaders)")
NSLog("3. Response trailers: \(call.responseTrailers!)") NSLog("3. Response trailers: \(call.responseTrailers)")
}) })
} }
} }

2
src/objective-c/tests/Info.plist
Unescape View File

@ -7,7 +7,7 @@
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string> <string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string> <string>gRPC.$(PRODUCT_NAME:rfc1034identifier)</string>
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string> <string>6.0</string>
<key>CFBundleName</key> <key>CFBundleName</key>

16
src/objective-c/tests/Tests.xcodeproj/project.pbxproj
Unescape View File

@ -3,7 +3,7 @@
archiveVersion = 1; archiveVersion = 1;
classes = { classes = {
}; };
objectVersion = 48; objectVersion = 46;
objects = { objects = {
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
@ -535,7 +535,7 @@
635697BF1B14FC11007A7283 /* Project object */ = { 635697BF1B14FC11007A7283 /* Project object */ = {
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
LastUpgradeCheck = 0800; LastUpgradeCheck = 0630;
ORGANIZATIONNAME = gRPC; ORGANIZATIONNAME = gRPC;
TargetAttributes = { TargetAttributes = {
5E8A5DA31D3840B4000F8BC4 = { 5E8A5DA31D3840B4000F8BC4 = {
@ -565,7 +565,7 @@
}; };
}; };
buildConfigurationList = 635697C21B14FC11007A7283 /* Build configuration list for PBXProject "Tests" */; buildConfigurationList = 635697C21B14FC11007A7283 /* Build configuration list for PBXProject "Tests" */;
compatibilityVersion = "Xcode 8.0"; compatibilityVersion = "Xcode 3.2";
developmentRegion = English; developmentRegion = English;
hasScannedForEncodings = 0; hasScannedForEncodings = 0;
knownRegions = ( knownRegions = (
@ -1151,10 +1151,8 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
@ -1207,7 +1205,6 @@
); );
INFOPLIST_FILE = Info.plist; INFOPLIST_FILE = Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "gRPC.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };
name = Cronet; name = Cronet;
@ -1365,7 +1362,6 @@
); );
INFOPLIST_FILE = Info.plist; INFOPLIST_FILE = Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "gRPC.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };
name = Debug; name = Debug;
@ -1380,7 +1376,6 @@
); );
INFOPLIST_FILE = Info.plist; INFOPLIST_FILE = Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "gRPC.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };
name = Release; name = Release;
@ -1398,16 +1393,13 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99; GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES; GCC_NO_COMMON_BLOCKS = YES;
@ -1444,10 +1436,8 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;

2
src/objective-c/tests/Tests.xcodeproj/xcshareddata/xcschemes/AllTests.xcscheme
Unescape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0800" LastUpgradeVersion = "0630"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

2
src/objective-c/tests/Tests.xcodeproj/xcshareddata/xcschemes/CoreCronetEnd2EndTests.xcscheme
Unescape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0800" LastUpgradeVersion = "0730"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

2
src/objective-c/tests/Tests.xcodeproj/xcshareddata/xcschemes/InteropTestsLocalCleartext.xcscheme
Unescape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0800" LastUpgradeVersion = "0700"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

2
src/objective-c/tests/Tests.xcodeproj/xcshareddata/xcschemes/InteropTestsLocalSSL.xcscheme
Unescape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0800" LastUpgradeVersion = "0700"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

2
src/objective-c/tests/Tests.xcodeproj/xcshareddata/xcschemes/InteropTestsRemote.xcscheme
Unescape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0800" LastUpgradeVersion = "0700"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

2
src/objective-c/tests/Tests.xcodeproj/xcshareddata/xcschemes/InteropTestsRemoteWithCronet.xcscheme
Unescape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0800" LastUpgradeVersion = "0730"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

2
src/objective-c/tests/Tests.xcodeproj/xcshareddata/xcschemes/RxLibraryUnitTests.xcscheme
Unescape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0800" LastUpgradeVersion = "0700"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

1
src/proto/grpc/testing/duplicate/echo_duplicate.proto
Unescape View File

@ -38,4 +38,5 @@ package grpc.testing.duplicate;
service EchoTestService { service EchoTestService {
rpc Echo(grpc.testing.EchoRequest) returns (grpc.testing.EchoResponse); rpc Echo(grpc.testing.EchoRequest) returns (grpc.testing.EchoResponse);
rpc ResponseStream(EchoRequest) returns (stream EchoResponse);
} }

2
src/proto/grpc/testing/test.proto
Unescape View File

@ -77,7 +77,7 @@ service TestService {
// The test server will not implement this method. It will be used // The test server will not implement this method. It will be used
// to test the behavior when clients call unimplemented methods. // to test the behavior when clients call unimplemented methods.
rpc UnimplementedMethod(grpc.testing.Empty) returns (grpc.testing.Empty); rpc UnimplementedCall(grpc.testing.Empty) returns (grpc.testing.Empty);
} }
// A simple service NOT implemented at servers so clients can test for // A simple service NOT implemented at servers so clients can test for

40
src/python/grpcio/grpc_core_dependencies.py
Unescape View File

@ -234,26 +234,26 @@ CORE_SOURCE_FILES = [
'src/core/lib/tsi/ssl_transport_security.c', 'src/core/lib/tsi/ssl_transport_security.c',
'src/core/lib/tsi/transport_security.c', 'src/core/lib/tsi/transport_security.c',
'src/core/ext/transport/chttp2/client/secure/secure_channel_create.c', 'src/core/ext/transport/chttp2/client/secure/secure_channel_create.c',
'src/core/ext/client_config/channel_connectivity.c', 'src/core/ext/client_channel/channel_connectivity.c',
'src/core/ext/client_config/client_channel.c', 'src/core/ext/client_channel/client_channel.c',
'src/core/ext/client_config/client_channel_factory.c', 'src/core/ext/client_channel/client_channel_factory.c',
'src/core/ext/client_config/client_config_plugin.c', 'src/core/ext/client_channel/client_channel_plugin.c',
'src/core/ext/client_config/connector.c', 'src/core/ext/client_channel/connector.c',
'src/core/ext/client_config/default_initial_connect_string.c', 'src/core/ext/client_channel/default_initial_connect_string.c',
'src/core/ext/client_config/http_connect_handshaker.c', 'src/core/ext/client_channel/http_connect_handshaker.c',
'src/core/ext/client_config/initial_connect_string.c', 'src/core/ext/client_channel/initial_connect_string.c',
'src/core/ext/client_config/lb_policy.c', 'src/core/ext/client_channel/lb_policy.c',
'src/core/ext/client_config/lb_policy_factory.c', 'src/core/ext/client_channel/lb_policy_factory.c',
'src/core/ext/client_config/lb_policy_registry.c', 'src/core/ext/client_channel/lb_policy_registry.c',
'src/core/ext/client_config/method_config.c', 'src/core/ext/client_channel/method_config.c',
'src/core/ext/client_config/parse_address.c', 'src/core/ext/client_channel/parse_address.c',
'src/core/ext/client_config/resolver.c', 'src/core/ext/client_channel/resolver.c',
'src/core/ext/client_config/resolver_factory.c', 'src/core/ext/client_channel/resolver_factory.c',
'src/core/ext/client_config/resolver_registry.c', 'src/core/ext/client_channel/resolver_registry.c',
'src/core/ext/client_config/resolver_result.c', 'src/core/ext/client_channel/resolver_result.c',
'src/core/ext/client_config/subchannel.c', 'src/core/ext/client_channel/subchannel.c',
'src/core/ext/client_config/subchannel_index.c', 'src/core/ext/client_channel/subchannel_index.c',
'src/core/ext/client_config/uri_parser.c', 'src/core/ext/client_channel/uri_parser.c',
'src/core/ext/transport/chttp2/server/insecure/server_chttp2.c', 'src/core/ext/transport/chttp2/server/insecure/server_chttp2.c',
'src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.c', 'src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.c',
'src/core/ext/transport/chttp2/client/insecure/channel_create.c', 'src/core/ext/transport/chttp2/client/insecure/channel_create.c',

2
src/ruby/README.md
Unescape View File

@ -59,7 +59,7 @@ Directory structure is the layout for [ruby extensions][]
- bin: example gRPC clients and servers, e.g, - bin: example gRPC clients and servers, e.g,
```ruby ```ruby
stub = Math::Math::Stub.new('my.test.math.server.com:8080') stub = Math::Math::Stub.new('my.test.math.server.com:8080', :this_channel_is_insecure)
req = Math::DivArgs.new(dividend: 7, divisor: 3) req = Math::DivArgs.new(dividend: 7, divisor: 3)
GRPC.logger.info("div(7/3): req=#{req.inspect}") GRPC.logger.info("div(7/3): req=#{req.inspect}")
resp = stub.div(req) resp = stub.div(req)

5
templates/src/csharp/Grpc.IntegrationTesting.QpsWorker/project.json.template
Unescape View File

@ -20,5 +20,10 @@
} }
} }
} }
},
"runtimeOptions": {
"configProperties": {
"System.GC.Server": true
}
} }
} }

4
test/core/client_config/lb_policies_test.c → test/core/client_channel/lb_policies_test.c
Unescape View File

@ -41,8 +41,8 @@
#include <grpc/support/string_util.h> #include <grpc/support/string_util.h>
#include <grpc/support/time.h> #include <grpc/support/time.h>
#include "src/core/ext/client_config/client_channel.h" #include "src/core/ext/client_channel/client_channel.h"
#include "src/core/ext/client_config/lb_policy_registry.h" #include "src/core/ext/client_channel/lb_policy_registry.h"
#include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/channel_stack.h"
#include "src/core/lib/support/string.h" #include "src/core/lib/support/string.h"
#include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/channel.h"

2
test/core/client_config/resolvers/dns_resolver_connectivity_test.c → test/core/client_channel/resolvers/dns_resolver_connectivity_test.c
Unescape View File

@ -36,7 +36,7 @@
#include <grpc/grpc.h> #include <grpc/grpc.h>
#include <grpc/support/alloc.h> #include <grpc/support/alloc.h>
#include "src/core/ext/client_config/resolver_registry.h" #include "src/core/ext/client_channel/resolver_registry.h"
#include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/resolve_address.h"
#include "src/core/lib/iomgr/timer.h" #include "src/core/lib/iomgr/timer.h"
#include "test/core/util/test_config.h" #include "test/core/util/test_config.h"

2
test/core/client_config/resolvers/dns_resolver_test.c → test/core/client_channel/resolvers/dns_resolver_test.c
Unescape View File

@ -35,7 +35,7 @@
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include "src/core/ext/client_config/resolver_registry.h" #include "src/core/ext/client_channel/resolver_registry.h"
#include "test/core/util/test_config.h" #include "test/core/util/test_config.h"
static void test_succeeds(grpc_resolver_factory *factory, const char *string) { static void test_succeeds(grpc_resolver_factory *factory, const char *string) {

4
test/core/client_config/resolvers/sockaddr_resolver_test.c → test/core/client_channel/resolvers/sockaddr_resolver_test.c
Unescape View File

@ -37,8 +37,8 @@
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include <grpc/support/string_util.h> #include <grpc/support/string_util.h>
#include "src/core/ext/client_config/resolver_registry.h" #include "src/core/ext/client_channel/resolver_registry.h"
#include "src/core/ext/client_config/resolver_result.h" #include "src/core/ext/client_channel/resolver_result.h"
#include "test/core/util/test_config.h" #include "test/core/util/test_config.h"

3
test/core/client_config/set_initial_connect_string_test.c → test/core/client_channel/set_initial_connect_string_test.c
Unescape View File

@ -41,7 +41,8 @@
#include <grpc/support/slice.h> #include <grpc/support/slice.h>
#include <grpc/support/thd.h> #include <grpc/support/thd.h>
#include "src/core/ext/client_config/initial_connect_string.h" #include "src/core/ext/client_channel/initial_connect_string.h"
#include "src/core/lib/iomgr/sockaddr.h"
#include "src/core/lib/security/credentials/fake/fake_credentials.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h"
#include "src/core/lib/support/string.h" #include "src/core/lib/support/string.h"
#include "test/core/util/port.h" #include "test/core/util/port.h"

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save