Skip to content

Commit c97065d

Browse files
ctillerctiller
committed
Merge github.com:grpc/grpc into error
2 parents 2888bd5 + d30d4e2 commit c97065d

File tree

69 files changed

+636
-265
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+636
-265
lines changed

‎BUILD‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@ cc_library(
187187
"src/core/lib/iomgr/iomgr_internal.h",
188188
"src/core/lib/iomgr/iomgr_posix.h",
189189
"src/core/lib/iomgr/load_file.h",
190+
"src/core/lib/iomgr/polling_entity.h",
190191
"src/core/lib/iomgr/pollset.h",
191192
"src/core/lib/iomgr/pollset_set.h",
192193
"src/core/lib/iomgr/pollset_set_windows.h",
@@ -336,6 +337,7 @@ cc_library(
336337
"src/core/lib/iomgr/iomgr_posix.c",
337338
"src/core/lib/iomgr/iomgr_windows.c",
338339
"src/core/lib/iomgr/load_file.c",
340+
"src/core/lib/iomgr/polling_entity.c",
339341
"src/core/lib/iomgr/pollset_set_windows.c",
340342
"src/core/lib/iomgr/pollset_windows.c",
341343
"src/core/lib/iomgr/resolve_address_posix.c",
@@ -564,6 +566,7 @@ cc_library(
564566
"src/core/lib/iomgr/iomgr_internal.h",
565567
"src/core/lib/iomgr/iomgr_posix.h",
566568
"src/core/lib/iomgr/load_file.h",
569+
"src/core/lib/iomgr/polling_entity.h",
567570
"src/core/lib/iomgr/pollset.h",
568571
"src/core/lib/iomgr/pollset_set.h",
569572
"src/core/lib/iomgr/pollset_set_windows.h",
@@ -703,6 +706,7 @@ cc_library(
703706
"src/core/lib/iomgr/iomgr_posix.c",
704707
"src/core/lib/iomgr/iomgr_windows.c",
705708
"src/core/lib/iomgr/load_file.c",
709+
"src/core/lib/iomgr/polling_entity.c",
706710
"src/core/lib/iomgr/pollset_set_windows.c",
707711
"src/core/lib/iomgr/pollset_windows.c",
708712
"src/core/lib/iomgr/resolve_address_posix.c",
@@ -908,6 +912,7 @@ cc_library(
908912
"src/core/lib/iomgr/iomgr_internal.h",
909913
"src/core/lib/iomgr/iomgr_posix.h",
910914
"src/core/lib/iomgr/load_file.h",
915+
"src/core/lib/iomgr/polling_entity.h",
911916
"src/core/lib/iomgr/pollset.h",
912917
"src/core/lib/iomgr/pollset_set.h",
913918
"src/core/lib/iomgr/pollset_set_windows.h",
@@ -1034,6 +1039,7 @@ cc_library(
10341039
"src/core/lib/iomgr/iomgr_posix.c",
10351040
"src/core/lib/iomgr/iomgr_windows.c",
10361041
"src/core/lib/iomgr/load_file.c",
1042+
"src/core/lib/iomgr/polling_entity.c",
10371043
"src/core/lib/iomgr/pollset_set_windows.c",
10381044
"src/core/lib/iomgr/pollset_windows.c",
10391045
"src/core/lib/iomgr/resolve_address_posix.c",
@@ -1699,6 +1705,7 @@ objc_library(
16991705
"src/core/lib/iomgr/iomgr_posix.c",
17001706
"src/core/lib/iomgr/iomgr_windows.c",
17011707
"src/core/lib/iomgr/load_file.c",
1708+
"src/core/lib/iomgr/polling_entity.c",
17021709
"src/core/lib/iomgr/pollset_set_windows.c",
17031710
"src/core/lib/iomgr/pollset_windows.c",
17041711
"src/core/lib/iomgr/resolve_address_posix.c",
@@ -1906,6 +1913,7 @@ objc_library(
19061913
"src/core/lib/iomgr/iomgr_internal.h",
19071914
"src/core/lib/iomgr/iomgr_posix.h",
19081915
"src/core/lib/iomgr/load_file.h",
1916+
"src/core/lib/iomgr/polling_entity.h",
19091917
"src/core/lib/iomgr/pollset.h",
19101918
"src/core/lib/iomgr/pollset_set.h",
19111919
"src/core/lib/iomgr/pollset_set_windows.h",

‎Makefile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2488,6 +2488,7 @@ LIBGRPC_SRC = \
24882488
src/core/lib/iomgr/iomgr_posix.c \
24892489
src/core/lib/iomgr/iomgr_windows.c \
24902490
src/core/lib/iomgr/load_file.c \
2491+
src/core/lib/iomgr/polling_entity.c \
24912492
src/core/lib/iomgr/pollset_set_windows.c \
24922493
src/core/lib/iomgr/pollset_windows.c \
24932494
src/core/lib/iomgr/resolve_address_posix.c \
@@ -2753,6 +2754,7 @@ LIBGRPC_CRONET_SRC = \
27532754
src/core/lib/iomgr/iomgr_posix.c \
27542755
src/core/lib/iomgr/iomgr_windows.c \
27552756
src/core/lib/iomgr/load_file.c \
2757+
src/core/lib/iomgr/polling_entity.c \
27562758
src/core/lib/iomgr/pollset_set_windows.c \
27572759
src/core/lib/iomgr/pollset_windows.c \
27582760
src/core/lib/iomgr/resolve_address_posix.c \
@@ -3089,6 +3091,7 @@ LIBGRPC_UNSECURE_SRC = \
30893091
src/core/lib/iomgr/iomgr_posix.c \
30903092
src/core/lib/iomgr/iomgr_windows.c \
30913093
src/core/lib/iomgr/load_file.c \
3094+
src/core/lib/iomgr/polling_entity.c \
30923095
src/core/lib/iomgr/pollset_set_windows.c \
30933096
src/core/lib/iomgr/pollset_windows.c \
30943097
src/core/lib/iomgr/resolve_address_posix.c \

‎binding.gyp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -591,6 +591,7 @@
591591
'src/core/lib/iomgr/iomgr_posix.c',
592592
'src/core/lib/iomgr/iomgr_windows.c',
593593
'src/core/lib/iomgr/load_file.c',
594+
'src/core/lib/iomgr/polling_entity.c',
594595
'src/core/lib/iomgr/pollset_set_windows.c',
595596
'src/core/lib/iomgr/pollset_windows.c',
596597
'src/core/lib/iomgr/resolve_address_posix.c',

‎build.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ filegroups:
182182
- src/core/lib/iomgr/iomgr_internal.h
183183
- src/core/lib/iomgr/iomgr_posix.h
184184
- src/core/lib/iomgr/load_file.h
185+
- src/core/lib/iomgr/polling_entity.h
185186
- src/core/lib/iomgr/pollset.h
186187
- src/core/lib/iomgr/pollset_set.h
187188
- src/core/lib/iomgr/pollset_set_windows.h
@@ -259,6 +260,7 @@ filegroups:
259260
- src/core/lib/iomgr/iomgr_posix.c
260261
- src/core/lib/iomgr/iomgr_windows.c
261262
- src/core/lib/iomgr/load_file.c
263+
- src/core/lib/iomgr/polling_entity.c
262264
- src/core/lib/iomgr/pollset_set_windows.c
263265
- src/core/lib/iomgr/pollset_windows.c
264266
- src/core/lib/iomgr/resolve_address_posix.c

‎config.m4‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ if test "$PHP_GRPC" != "no"; then
110110
src/core/lib/iomgr/iomgr_posix.c \
111111
src/core/lib/iomgr/iomgr_windows.c \
112112
src/core/lib/iomgr/load_file.c \
113+
src/core/lib/iomgr/polling_entity.c \
113114
src/core/lib/iomgr/pollset_set_windows.c \
114115
src/core/lib/iomgr/pollset_windows.c \
115116
src/core/lib/iomgr/resolve_address_posix.c \

‎gRPC.podspec‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ Pod::Spec.new do |s|
190190
'src/core/lib/iomgr/iomgr_internal.h',
191191
'src/core/lib/iomgr/iomgr_posix.h',
192192
'src/core/lib/iomgr/load_file.h',
193+
'src/core/lib/iomgr/polling_entity.h',
193194
'src/core/lib/iomgr/pollset.h',
194195
'src/core/lib/iomgr/pollset_set.h',
195196
'src/core/lib/iomgr/pollset_set_windows.h',
@@ -372,6 +373,7 @@ Pod::Spec.new do |s|
372373
'src/core/lib/iomgr/iomgr_posix.c',
373374
'src/core/lib/iomgr/iomgr_windows.c',
374375
'src/core/lib/iomgr/load_file.c',
376+
'src/core/lib/iomgr/polling_entity.c',
375377
'src/core/lib/iomgr/pollset_set_windows.c',
376378
'src/core/lib/iomgr/pollset_windows.c',
377379
'src/core/lib/iomgr/resolve_address_posix.c',
@@ -563,6 +565,7 @@ Pod::Spec.new do |s|
563565
'src/core/lib/iomgr/iomgr_internal.h',
564566
'src/core/lib/iomgr/iomgr_posix.h',
565567
'src/core/lib/iomgr/load_file.h',
568+
'src/core/lib/iomgr/polling_entity.h',
566569
'src/core/lib/iomgr/pollset.h',
567570
'src/core/lib/iomgr/pollset_set.h',
568571
'src/core/lib/iomgr/pollset_set_windows.h',

‎grpc.gemspec‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ Gem::Specification.new do |s|
198198
s.files += %w( src/core/lib/iomgr/iomgr_internal.h )
199199
s.files += %w( src/core/lib/iomgr/iomgr_posix.h )
200200
s.files += %w( src/core/lib/iomgr/load_file.h )
201+
s.files += %w( src/core/lib/iomgr/polling_entity.h )
201202
s.files += %w( src/core/lib/iomgr/pollset.h )
202203
s.files += %w( src/core/lib/iomgr/pollset_set.h )
203204
s.files += %w( src/core/lib/iomgr/pollset_set_windows.h )
@@ -351,6 +352,7 @@ Gem::Specification.new do |s|
351352
s.files += %w( src/core/lib/iomgr/iomgr_posix.c )
352353
s.files += %w( src/core/lib/iomgr/iomgr_windows.c )
353354
s.files += %w( src/core/lib/iomgr/load_file.c )
355+
s.files += %w( src/core/lib/iomgr/polling_entity.c )
354356
s.files += %w( src/core/lib/iomgr/pollset_set_windows.c )
355357
s.files += %w( src/core/lib/iomgr/pollset_windows.c )
356358
s.files += %w( src/core/lib/iomgr/resolve_address_posix.c )

‎package.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@
205205
<file baseinstalldir="/" name="src/core/lib/iomgr/iomgr_internal.h" role="src" />
206206
<file baseinstalldir="/" name="src/core/lib/iomgr/iomgr_posix.h" role="src" />
207207
<file baseinstalldir="/" name="src/core/lib/iomgr/load_file.h" role="src" />
208+
<file baseinstalldir="/" name="src/core/lib/iomgr/polling_entity.h" role="src" />
208209
<file baseinstalldir="/" name="src/core/lib/iomgr/pollset.h" role="src" />
209210
<file baseinstalldir="/" name="src/core/lib/iomgr/pollset_set.h" role="src" />
210211
<file baseinstalldir="/" name="src/core/lib/iomgr/pollset_set_windows.h" role="src" />
@@ -358,6 +359,7 @@
358359
<file baseinstalldir="/" name="src/core/lib/iomgr/iomgr_posix.c" role="src" />
359360
<file baseinstalldir="/" name="src/core/lib/iomgr/iomgr_windows.c" role="src" />
360361
<file baseinstalldir="/" name="src/core/lib/iomgr/load_file.c" role="src" />
362+
<file baseinstalldir="/" name="src/core/lib/iomgr/polling_entity.c" role="src" />
361363
<file baseinstalldir="/" name="src/core/lib/iomgr/pollset_set_windows.c" role="src" />
362364
<file baseinstalldir="/" name="src/core/lib/iomgr/pollset_windows.c" role="src" />
363365
<file baseinstalldir="/" name="src/core/lib/iomgr/resolve_address_posix.c" role="src" />

‎src/core/ext/census/grpc_filter.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ const grpc_channel_filter grpc_client_census_filter = {
180180
grpc_channel_next_op,
181181
sizeof(call_data),
182182
client_init_call_elem,
183-
grpc_call_stack_ignore_set_pollset,
183+
grpc_call_stack_ignore_set_pollset_or_pollset_set,
184184
client_destroy_call_elem,
185185
sizeof(channel_data),
186186
init_channel_elem,
@@ -193,7 +193,7 @@ const grpc_channel_filter grpc_server_census_filter = {
193193
grpc_channel_next_op,
194194
sizeof(call_data),
195195
server_init_call_elem,
196-
grpc_call_stack_ignore_set_pollset,
196+
grpc_call_stack_ignore_set_pollset_or_pollset_set,
197197
server_destroy_call_elem,
198198
sizeof(channel_data),
199199
init_channel_elem,

‎src/core/ext/client_config/client_channel.c‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ static int cc_pick_subchannel(grpc_exec_ctx *exec_ctx, void *elemp,
398398
int r;
399399
GRPC_LB_POLICY_REF(lb_policy, "cc_pick_subchannel");
400400
gpr_mu_unlock(&chand->mu_config);
401-
r = grpc_lb_policy_pick(exec_ctx, lb_policy, calld->pollset,
401+
r = grpc_lb_policy_pick(exec_ctx, lb_policy, calld->pollent,
402402
initial_metadata, initial_metadata_flags,
403403
connected_subchannel, on_ready);
404404
GRPC_LB_POLICY_UNREF(exec_ctx, lb_policy, "cc_pick_subchannel");
@@ -484,18 +484,19 @@ static void destroy_channel_elem(grpc_exec_ctx *exec_ctx,
484484
gpr_mu_destroy(&chand->mu_config);
485485
}
486486

487-
static void cc_set_pollset(grpc_exec_ctx *exec_ctx, grpc_call_element *elem,
488-
grpc_pollset *pollset) {
487+
static void cc_set_pollset_or_pollset_set(grpc_exec_ctx *exec_ctx,
488+
grpc_call_element *elem,
489+
grpc_polling_entity *pollent) {
489490
call_data *calld = elem->call_data;
490-
calld->pollset = pollset;
491+
calld->pollent = pollent;
491492
}
492493

493494
const grpc_channel_filter grpc_client_channel_filter = {
494495
cc_start_transport_stream_op,
495496
cc_start_transport_op,
496497
sizeof(call_data),
497498
init_call_elem,
498-
cc_set_pollset,
499+
cc_set_pollset_or_pollset_set,
499500
destroy_call_elem,
500501
sizeof(channel_data),
501502
init_channel_elem,

0 commit comments

Comments
 (0)