Skip to content

Commit 7d199c9

Browse files
committed
Merge branch 'master' of https://github.com/grpc/grpc into v1.8.x
2 parents de6e1f5 + ba89ad4 commit 7d199c9

148 files changed

Lines changed: 3093 additions & 1361 deletions

File tree

Some content is hidden

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

BUILD

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,6 @@ grpc_cc_library(
418418
],
419419
external_deps = [
420420
"nanopb",
421-
"libssl",
422421
],
423422
language = "c++",
424423
public_hdrs = [
@@ -446,6 +445,7 @@ grpc_cc_library(
446445
"src/core/lib/support/env_linux.cc",
447446
"src/core/lib/support/env_posix.cc",
448447
"src/core/lib/support/env_windows.cc",
448+
"src/core/lib/support/fork.cc",
449449
"src/core/lib/support/histogram.cc",
450450
"src/core/lib/support/host_port.cc",
451451
"src/core/lib/support/log.cc",
@@ -455,7 +455,6 @@ grpc_cc_library(
455455
"src/core/lib/support/log_windows.cc",
456456
"src/core/lib/support/mpscq.cc",
457457
"src/core/lib/support/murmur_hash.cc",
458-
"src/core/lib/support/stack_lockfree.cc",
459458
"src/core/lib/support/string.cc",
460459
"src/core/lib/support/string_posix.cc",
461460
"src/core/lib/support/string_util_windows.cc",
@@ -486,23 +485,24 @@ grpc_cc_library(
486485
"src/core/lib/support/atomic_with_atm.h",
487486
"src/core/lib/support/atomic_with_std.h",
488487
"src/core/lib/support/env.h",
489-
"src/core/lib/support/memory.h",
490-
"src/core/lib/support/vector.h",
488+
"src/core/lib/support/fork.h",
491489
"src/core/lib/support/manual_constructor.h",
490+
"src/core/lib/support/memory.h",
492491
"src/core/lib/support/mpscq.h",
493492
"src/core/lib/support/murmur_hash.h",
494493
"src/core/lib/support/spinlock.h",
495-
"src/core/lib/support/stack_lockfree.h",
496494
"src/core/lib/support/string.h",
497495
"src/core/lib/support/string_windows.h",
496+
"src/core/lib/support/thd_internal.h",
498497
"src/core/lib/support/time_precise.h",
499498
"src/core/lib/support/tmpfile.h",
499+
"src/core/lib/support/vector.h",
500500
],
501501
language = "c++",
502502
public_hdrs = GPR_PUBLIC_HDRS,
503503
deps = [
504504
"gpr_codegen",
505-
"@com_google_absl//absl/container:inlined_vector"
505+
"@com_google_absl//absl/container:inlined_vector",
506506
],
507507
)
508508

@@ -514,6 +514,7 @@ grpc_cc_library(
514514
"include/grpc/impl/codegen/atm_gcc_atomic.h",
515515
"include/grpc/impl/codegen/atm_gcc_sync.h",
516516
"include/grpc/impl/codegen/atm_windows.h",
517+
"include/grpc/impl/codegen/fork.h",
517518
"include/grpc/impl/codegen/gpr_slice.h",
518519
"include/grpc/impl/codegen/gpr_types.h",
519520
"include/grpc/impl/codegen/port_platform.h",
@@ -573,6 +574,8 @@ grpc_cc_library(
573574
"src/core/lib/iomgr/ev_windows.cc",
574575
"src/core/lib/iomgr/exec_ctx.cc",
575576
"src/core/lib/iomgr/executor.cc",
577+
"src/core/lib/iomgr/fork_posix.cc",
578+
"src/core/lib/iomgr/fork_windows.cc",
576579
"src/core/lib/iomgr/gethostname_fallback.cc",
577580
"src/core/lib/iomgr/gethostname_host_name_max.cc",
578581
"src/core/lib/iomgr/gethostname_sysconf.cc",
@@ -672,6 +675,7 @@ grpc_cc_library(
672675
"src/core/lib/transport/transport_op_string.cc",
673676
],
674677
hdrs = [
678+
"src/core/lib/backoff/backoff.h",
675679
"src/core/lib/channel/channel_args.h",
676680
"src/core/lib/channel/channel_stack.h",
677681
"src/core/lib/channel/channel_stack_builder.h",
@@ -690,6 +694,7 @@ grpc_cc_library(
690694
"src/core/lib/http/format_request.h",
691695
"src/core/lib/http/httpcli.h",
692696
"src/core/lib/http/parser.h",
697+
"src/core/lib/iomgr/block_annotate.h",
693698
"src/core/lib/iomgr/call_combiner.h",
694699
"src/core/lib/iomgr/closure.h",
695700
"src/core/lib/iomgr/combiner.h",
@@ -734,7 +739,6 @@ grpc_cc_library(
734739
"src/core/lib/iomgr/socket_utils_posix.h",
735740
"src/core/lib/iomgr/socket_windows.h",
736741
"src/core/lib/iomgr/sys_epoll_wrapper.h",
737-
"src/core/lib/iomgr/block_annotate.h",
738742
"src/core/lib/iomgr/tcp_client.h",
739743
"src/core/lib/iomgr/tcp_client_posix.h",
740744
"src/core/lib/iomgr/tcp_posix.h",
@@ -790,7 +794,6 @@ grpc_cc_library(
790794
"src/core/lib/transport/timeout_encoding.h",
791795
"src/core/lib/transport/transport.h",
792796
"src/core/lib/transport/transport_impl.h",
793-
"src/core/lib/backoff/backoff.h",
794797
],
795798
external_deps = [
796799
"zlib",
@@ -1250,8 +1253,8 @@ grpc_cc_library(
12501253
"src/core/ext/transport/chttp2/transport/bin_decoder.h",
12511254
"src/core/ext/transport/chttp2/transport/bin_encoder.h",
12521255
"src/core/ext/transport/chttp2/transport/chttp2_transport.h",
1253-
"src/core/ext/transport/chttp2/transport/frame.h",
12541256
"src/core/ext/transport/chttp2/transport/flow_control.h",
1257+
"src/core/ext/transport/chttp2/transport/frame.h",
12551258
"src/core/ext/transport/chttp2/transport/frame_data.h",
12561259
"src/core/ext/transport/chttp2/transport/frame_goaway.h",
12571260
"src/core/ext/transport/chttp2/transport/frame_ping.h",

0 commit comments

Comments
 (0)