Skip to content

Commit 7eebba3

Browse files
committed
Fixes needed to make roll-forward of StartCall and corking work
1 parent 2786710 commit 7eebba3

11 files changed

+162
-38
lines changed

BUILD

+1
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ GRPC_SECURE_PUBLIC_HDRS = [
124124
# TODO(ctiller): layer grpc atop grpc_unsecure, layer grpc++ atop grpc++_unsecure
125125
GRPCXX_SRCS = [
126126
"src/cpp/client/channel_cc.cc",
127+
"src/cpp/client/client_callback.cc",
127128
"src/cpp/client/client_context.cc",
128129
"src/cpp/client/client_interceptor.cc",
129130
"src/cpp/client/create_channel.cc",

BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -1220,6 +1220,7 @@ config("grpc_config") {
12201220
"include/grpcpp/support/time.h",
12211221
"include/grpcpp/support/validate_service_config.h",
12221222
"src/cpp/client/channel_cc.cc",
1223+
"src/cpp/client/client_callback.cc",
12231224
"src/cpp/client/client_context.cc",
12241225
"src/cpp/client/client_interceptor.cc",
12251226
"src/cpp/client/create_channel.cc",

CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -2482,6 +2482,7 @@ endif()
24822482

24832483
add_library(grpc++
24842484
src/cpp/client/channel_cc.cc
2485+
src/cpp/client/client_callback.cc
24852486
src/cpp/client/client_context.cc
24862487
src/cpp/client/client_interceptor.cc
24872488
src/cpp/client/create_channel.cc
@@ -3183,6 +3184,7 @@ endif()
31833184

31843185
add_library(grpc++_unsecure
31853186
src/cpp/client/channel_cc.cc
3187+
src/cpp/client/client_callback.cc
31863188
src/cpp/client/client_context.cc
31873189
src/cpp/client/client_interceptor.cc
31883190
src/cpp/client/create_channel.cc

Makefile

+2
Original file line numberDiff line numberDiff line change
@@ -4717,6 +4717,7 @@ $(OBJDIR)/$(CONFIG)/test/cpp/microbenchmarks/helpers.o: $(GENDIR)/src/proto/grpc
47174717

47184718
LIBGRPC++_SRC = \
47194719
src/cpp/client/channel_cc.cc \
4720+
src/cpp/client/client_callback.cc \
47204721
src/cpp/client/client_context.cc \
47214722
src/cpp/client/client_interceptor.cc \
47224723
src/cpp/client/create_channel.cc \
@@ -5423,6 +5424,7 @@ endif
54235424

54245425
LIBGRPC++_UNSECURE_SRC = \
54255426
src/cpp/client/channel_cc.cc \
5427+
src/cpp/client/client_callback.cc \
54265428
src/cpp/client/client_context.cc \
54275429
src/cpp/client/client_interceptor.cc \
54285430
src/cpp/client/create_channel.cc \

build_autogenerated.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -2203,6 +2203,7 @@ libs:
22032203
- src/cpp/thread_manager/thread_manager.h
22042204
src:
22052205
- src/cpp/client/channel_cc.cc
2206+
- src/cpp/client/client_callback.cc
22062207
- src/cpp/client/client_context.cc
22072208
- src/cpp/client/client_interceptor.cc
22082209
- src/cpp/client/create_channel.cc
@@ -2592,6 +2593,7 @@ libs:
25922593
- src/cpp/thread_manager/thread_manager.h
25932594
src:
25942595
- src/cpp/client/channel_cc.cc
2596+
- src/cpp/client/client_callback.cc
25952597
- src/cpp/client/client_context.cc
25962598
- src/cpp/client/client_interceptor.cc
25972599
- src/cpp/client/create_channel.cc

gRPC-C++.podspec

+1
Original file line numberDiff line numberDiff line change
@@ -616,6 +616,7 @@ Pod::Spec.new do |s|
616616
'src/core/tsi/transport_security_grpc.h',
617617
'src/core/tsi/transport_security_interface.h',
618618
'src/cpp/client/channel_cc.cc',
619+
'src/cpp/client/client_callback.cc',
619620
'src/cpp/client/client_context.cc',
620621
'src/cpp/client/client_interceptor.cc',
621622
'src/cpp/client/create_channel.cc',

grpc.gyp

+2
Original file line numberDiff line numberDiff line change
@@ -1313,6 +1313,7 @@
13131313
],
13141314
'sources': [
13151315
'src/cpp/client/channel_cc.cc',
1316+
'src/cpp/client/client_callback.cc',
13161317
'src/cpp/client/client_context.cc',
13171318
'src/cpp/client/client_interceptor.cc',
13181319
'src/cpp/client/create_channel.cc',
@@ -1464,6 +1465,7 @@
14641465
],
14651466
'sources': [
14661467
'src/cpp/client/channel_cc.cc',
1468+
'src/cpp/client/client_callback.cc',
14671469
'src/cpp/client/client_context.cc',
14681470
'src/cpp/client/client_interceptor.cc',
14691471
'src/cpp/client/create_channel.cc',

0 commit comments

Comments
 (0)