Merge pull request grpc#14459 from vjpai/2phase_thd

C++ize gpr_thread as grpc_core::Thread, make it 2-phase init (construct/Start)
narzolliam · Mar 3, 2018 · 6eae794 · 6eae794
2 parents f22dae6 + 4013f0c
commit 6eae794
Show file tree

Hide file tree

Showing 106 changed files with 1,094 additions and 950 deletions.
diff --git a/BUILD b/BUILD
@@ -527,9 +527,6 @@ grpc_cc_library(
  "src/core/lib/gpr/sync.cc",
  "src/core/lib/gpr/sync_posix.cc",
  "src/core/lib/gpr/sync_windows.cc",
- "src/core/lib/gpr/thd.cc",
- "src/core/lib/gpr/thd_posix.cc",
- "src/core/lib/gpr/thd_windows.cc",
  "src/core/lib/gpr/time.cc",
  "src/core/lib/gpr/time_posix.cc",
  "src/core/lib/gpr/time_precise.cc",
@@ -539,6 +536,8 @@ grpc_cc_library(
  "src/core/lib/gpr/tmpfile_posix.cc",
  "src/core/lib/gpr/tmpfile_windows.cc",
  "src/core/lib/gpr/wrap_memcpy.cc",
+ "src/core/lib/gprpp/thd_posix.cc",
+ "src/core/lib/gprpp/thd_windows.cc",
  "src/core/lib/profiling/basic_timers.cc",
  "src/core/lib/profiling/stap_timers.cc",
  ],
@@ -552,14 +551,17 @@ grpc_cc_library(
  "src/core/lib/gpr/spinlock.h",
  "src/core/lib/gpr/string.h",
  "src/core/lib/gpr/string_windows.h",
- "src/core/lib/gpr/thd.h",
  "src/core/lib/gpr/time_precise.h",
  "src/core/lib/gpr/tls.h",
  "src/core/lib/gpr/tls_gcc.h",
  "src/core/lib/gpr/tls_msvc.h",
  "src/core/lib/gpr/tls_pthread.h",
  "src/core/lib/gpr/tmpfile.h",
  "src/core/lib/gpr/useful.h",
+ "src/core/lib/gprpp/abstract.h",
+ "src/core/lib/gprpp/manual_constructor.h",
+ "src/core/lib/gprpp/memory.h",
+ "src/core/lib/gprpp/thd.h",
  "src/core/lib/profiling/timers.h",
  ],
  language = "c++",
@@ -601,16 +603,6 @@ grpc_cc_library(
  ],
 )
 
-grpc_cc_library(
- name = "gpr++_base",
- language = "c++",
- public_hdrs = [
- "src/core/lib/gprpp/abstract.h",
- "src/core/lib/gprpp/manual_constructor.h",
- "src/core/lib/gprpp/memory.h",
- ],
-)
-
 grpc_cc_library(
  name = "atomic",
  hdrs = [
@@ -633,7 +625,7 @@ grpc_cc_library(
  "src/core/lib/gprpp/inlined_vector.h",
  ],
  deps = [
- "gpr++_base",
+ "gpr_base",
  ],
 )
 
@@ -649,7 +641,7 @@ grpc_cc_library(
  public_hdrs = ["src/core/lib/gprpp/orphanable.h"],
  deps = [
  "debug_location",
- "gpr++_base",
+ "gpr_base",
  "grpc_trace",
  "ref_counted_ptr",
  ],
@@ -661,7 +653,7 @@ grpc_cc_library(
  public_hdrs = ["src/core/lib/gprpp/ref_counted.h"],
  deps = [
  "debug_location",
- "gpr++_base",
+ "gpr_base",
  "grpc_trace",
  "ref_counted_ptr",
  ],
@@ -672,7 +664,7 @@ grpc_cc_library(
  language = "c++",
  public_hdrs = ["src/core/lib/gprpp/ref_counted_ptr.h"],
  deps = [
- "gpr++_base",
+ "gpr_base",
  ],
 )
 
@@ -943,13 +935,12 @@ grpc_cc_library(
  language = "c++",
  public_hdrs = GRPC_PUBLIC_HDRS,
  deps = [
- "gpr++_base",
  "gpr_base",
  "grpc_codegen",
  "grpc_trace",
+ "inlined_vector",
  "ref_counted",
  "ref_counted_ptr",
- "inlined_vector",
  ],
 )
 
@@ -1425,7 +1416,7 @@ grpc_cc_library(
  ],
  language = "c++",
  deps = [
- "gpr++_base",
+ "gpr_base",
  "grpc_base",
  "grpc_http_filters",
  "grpc_transport_chttp2_alpn",

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -659,9 +659,6 @@ add_library(gpr
  src/core/lib/gpr/sync.cc
  src/core/lib/gpr/sync_posix.cc
  src/core/lib/gpr/sync_windows.cc
- src/core/lib/gpr/thd.cc
- src/core/lib/gpr/thd_posix.cc
- src/core/lib/gpr/thd_windows.cc
  src/core/lib/gpr/time.cc
  src/core/lib/gpr/time_posix.cc
  src/core/lib/gpr/time_precise.cc
@@ -671,6 +668,8 @@ add_library(gpr
  src/core/lib/gpr/tmpfile_posix.cc
  src/core/lib/gpr/tmpfile_windows.cc
  src/core/lib/gpr/wrap_memcpy.cc
+ src/core/lib/gprpp/thd_posix.cc
+ src/core/lib/gprpp/thd_windows.cc
  src/core/lib/profiling/basic_timers.cc
  src/core/lib/profiling/stap_timers.cc
 )
@@ -6284,7 +6283,7 @@ endif (gRPC_BUILD_TESTS)
 if (gRPC_BUILD_TESTS)
 
 add_executable(gpr_thd_test
- test/core/gpr/thd_test.cc
+ test/core/gprpp/thd_test.cc
 )
 
 

diff --git a/Makefile b/Makefile
@@ -2920,9 +2920,6 @@ LIBGPR_SRC = \
  src/core/lib/gpr/sync.cc \
  src/core/lib/gpr/sync_posix.cc \
  src/core/lib/gpr/sync_windows.cc \
- src/core/lib/gpr/thd.cc \
- src/core/lib/gpr/thd_posix.cc \
- src/core/lib/gpr/thd_windows.cc \
  src/core/lib/gpr/time.cc \
  src/core/lib/gpr/time_posix.cc \
  src/core/lib/gpr/time_precise.cc \
@@ -2932,6 +2929,8 @@ LIBGPR_SRC = \
  src/core/lib/gpr/tmpfile_posix.cc \
  src/core/lib/gpr/tmpfile_windows.cc \
  src/core/lib/gpr/wrap_memcpy.cc \
+ src/core/lib/gprpp/thd_posix.cc \
+ src/core/lib/gprpp/thd_windows.cc \
  src/core/lib/profiling/basic_timers.cc \
  src/core/lib/profiling/stap_timers.cc \
 
@@ -11078,7 +11077,7 @@ endif
 
 
 GPR_THD_TEST_SRC = \
- test/core/gpr/thd_test.cc \
+ test/core/gprpp/thd_test.cc \
 
 GPR_THD_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GPR_THD_TEST_SRC))))
 ifeq ($(NO_SECURE),true)
@@ -11098,7 +11097,7 @@ $(BINDIR)/$(CONFIG)/gpr_thd_test: $(GPR_THD_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgp
 
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/gpr/thd_test.o: $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
+$(OBJDIR)/$(CONFIG)/test/core/gprpp/thd_test.o: $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
 
 deps_gpr_thd_test: $(GPR_THD_TEST_OBJS:.o=.dep)
 

diff --git a/build.yaml b/build.yaml
@@ -59,9 +59,6 @@ filegroups:
  - src/core/lib/gpr/sync.cc
  - src/core/lib/gpr/sync_posix.cc
  - src/core/lib/gpr/sync_windows.cc
- - src/core/lib/gpr/thd.cc
- - src/core/lib/gpr/thd_posix.cc
- - src/core/lib/gpr/thd_windows.cc
  - src/core/lib/gpr/time.cc
  - src/core/lib/gpr/time_posix.cc
  - src/core/lib/gpr/time_precise.cc
@@ -71,6 +68,8 @@ filegroups:
  - src/core/lib/gpr/tmpfile_posix.cc
  - src/core/lib/gpr/tmpfile_windows.cc
  - src/core/lib/gpr/wrap_memcpy.cc
+ - src/core/lib/gprpp/thd_posix.cc
+ - src/core/lib/gprpp/thd_windows.cc
  - src/core/lib/profiling/basic_timers.cc
  - src/core/lib/profiling/stap_timers.cc
  uses:
@@ -104,7 +103,6 @@ filegroups:
  - src/core/lib/gpr/spinlock.h
  - src/core/lib/gpr/string.h
  - src/core/lib/gpr/string_windows.h
- - src/core/lib/gpr/thd.h
  - src/core/lib/gpr/time_precise.h
  - src/core/lib/gpr/tls.h
  - src/core/lib/gpr/tls_gcc.h
@@ -118,6 +116,7 @@ filegroups:
  - src/core/lib/gprpp/atomic_with_std.h
  - src/core/lib/gprpp/manual_constructor.h
  - src/core/lib/gprpp/memory.h
+ - src/core/lib/gprpp/thd.h
  - src/core/lib/profiling/timers.h
  uses:
  - gpr_codegen
@@ -2330,7 +2329,7 @@ targets:
  build: test
  language: c
  src:
- - test/core/gpr/thd_test.cc
+ - test/core/gprpp/thd_test.cc
  deps:
  - gpr_test_util
  - gpr

diff --git a/config.m4 b/config.m4
@@ -65,9 +65,6 @@ if test "$PHP_GRPC" != "no"; then
  src/core/lib/gpr/sync.cc \
  src/core/lib/gpr/sync_posix.cc \
  src/core/lib/gpr/sync_windows.cc \
- src/core/lib/gpr/thd.cc \
- src/core/lib/gpr/thd_posix.cc \
- src/core/lib/gpr/thd_windows.cc \
  src/core/lib/gpr/time.cc \
  src/core/lib/gpr/time_posix.cc \
  src/core/lib/gpr/time_precise.cc \
@@ -77,6 +74,8 @@ if test "$PHP_GRPC" != "no"; then
  src/core/lib/gpr/tmpfile_posix.cc \
  src/core/lib/gpr/tmpfile_windows.cc \
  src/core/lib/gpr/wrap_memcpy.cc \
+ src/core/lib/gprpp/thd_posix.cc \
+ src/core/lib/gprpp/thd_windows.cc \
  src/core/lib/profiling/basic_timers.cc \
  src/core/lib/profiling/stap_timers.cc \
  src/core/lib/surface/init.cc \
@@ -629,6 +628,7 @@ if test "$PHP_GRPC" != "no"; then
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/compression)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/debug)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/gpr)
+ PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/gprpp)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/http)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/iomgr)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/json)

diff --git a/config.w32 b/config.w32
@@ -42,9 +42,6 @@ if (PHP_GRPC != "no") {
  "src\\core\\lib\\gpr\\sync.cc " +
  "src\\core\\lib\\gpr\\sync_posix.cc " +
  "src\\core\\lib\\gpr\\sync_windows.cc " +
- "src\\core\\lib\\gpr\\thd.cc " +
- "src\\core\\lib\\gpr\\thd_posix.cc " +
- "src\\core\\lib\\gpr\\thd_windows.cc " +
  "src\\core\\lib\\gpr\\time.cc " +
  "src\\core\\lib\\gpr\\time_posix.cc " +
  "src\\core\\lib\\gpr\\time_precise.cc " +
@@ -54,6 +51,8 @@ if (PHP_GRPC != "no") {
  "src\\core\\lib\\gpr\\tmpfile_posix.cc " +
  "src\\core\\lib\\gpr\\tmpfile_windows.cc " +
  "src\\core\\lib\\gpr\\wrap_memcpy.cc " +
+ "src\\core\\lib\\gprpp\\thd_posix.cc " +
+ "src\\core\\lib\\gprpp\\thd_windows.cc " +
  "src\\core\\lib\\profiling\\basic_timers.cc " +
  "src\\core\\lib\\profiling\\stap_timers.cc " +
  "src\\core\\lib\\surface\\init.cc " +
@@ -641,6 +640,7 @@ if (PHP_GRPC != "no") {
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\compression");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\debug");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\gpr");
+ FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\gprpp");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\http");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\iomgr");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\json");

diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec
@@ -220,7 +220,6 @@ Pod::Spec.new do |s|
  'src/core/lib/gpr/spinlock.h',
  'src/core/lib/gpr/string.h',
  'src/core/lib/gpr/string_windows.h',
- 'src/core/lib/gpr/thd.h',
  'src/core/lib/gpr/time_precise.h',
  'src/core/lib/gpr/tls.h',
  'src/core/lib/gpr/tls_gcc.h',
@@ -234,6 +233,7 @@ Pod::Spec.new do |s|
  'src/core/lib/gprpp/atomic_with_std.h',
  'src/core/lib/gprpp/manual_constructor.h',
  'src/core/lib/gprpp/memory.h',
+ 'src/core/lib/gprpp/thd.h',
  'src/core/lib/profiling/timers.h',
  'src/core/ext/transport/chttp2/transport/bin_decoder.h',
  'src/core/ext/transport/chttp2/transport/bin_encoder.h',
@@ -475,7 +475,6 @@ Pod::Spec.new do |s|
  'src/core/lib/gpr/spinlock.h',
  'src/core/lib/gpr/string.h',
  'src/core/lib/gpr/string_windows.h',
- 'src/core/lib/gpr/thd.h',
  'src/core/lib/gpr/time_precise.h',
  'src/core/lib/gpr/tls.h',
  'src/core/lib/gpr/tls_gcc.h',
@@ -489,6 +488,7 @@ Pod::Spec.new do |s|
  'src/core/lib/gprpp/atomic_with_std.h',
  'src/core/lib/gprpp/manual_constructor.h',
  'src/core/lib/gprpp/memory.h',
+ 'src/core/lib/gprpp/thd.h',
  'src/core/lib/profiling/timers.h',
  'src/core/lib/avl/avl.h',
  'src/core/lib/backoff/backoff.h',

diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
@@ -192,7 +192,6 @@ Pod::Spec.new do |s|
  'src/core/lib/gpr/spinlock.h',
  'src/core/lib/gpr/string.h',
  'src/core/lib/gpr/string_windows.h',
- 'src/core/lib/gpr/thd.h',
  'src/core/lib/gpr/time_precise.h',
  'src/core/lib/gpr/tls.h',
  'src/core/lib/gpr/tls_gcc.h',
@@ -206,6 +205,7 @@ Pod::Spec.new do |s|
  'src/core/lib/gprpp/atomic_with_std.h',
  'src/core/lib/gprpp/manual_constructor.h',
  'src/core/lib/gprpp/memory.h',
+ 'src/core/lib/gprpp/thd.h',
  'src/core/lib/profiling/timers.h',
  'src/core/lib/gpr/alloc.cc',
  'src/core/lib/gpr/arena.cc',
@@ -233,9 +233,6 @@ Pod::Spec.new do |s|
  'src/core/lib/gpr/sync.cc',
  'src/core/lib/gpr/sync_posix.cc',
  'src/core/lib/gpr/sync_windows.cc',
- 'src/core/lib/gpr/thd.cc',
- 'src/core/lib/gpr/thd_posix.cc',
- 'src/core/lib/gpr/thd_windows.cc',
  'src/core/lib/gpr/time.cc',
  'src/core/lib/gpr/time_posix.cc',
  'src/core/lib/gpr/time_precise.cc',
@@ -245,6 +242,8 @@ Pod::Spec.new do |s|
  'src/core/lib/gpr/tmpfile_posix.cc',
  'src/core/lib/gpr/tmpfile_windows.cc',
  'src/core/lib/gpr/wrap_memcpy.cc',
+ 'src/core/lib/gprpp/thd_posix.cc',
+ 'src/core/lib/gprpp/thd_windows.cc',
  'src/core/lib/profiling/basic_timers.cc',
  'src/core/lib/profiling/stap_timers.cc',
  'src/core/ext/transport/chttp2/transport/bin_decoder.h',
@@ -726,7 +725,6 @@ Pod::Spec.new do |s|
  'src/core/lib/gpr/spinlock.h',
  'src/core/lib/gpr/string.h',
  'src/core/lib/gpr/string_windows.h',
- 'src/core/lib/gpr/thd.h',
  'src/core/lib/gpr/time_precise.h',
  'src/core/lib/gpr/tls.h',
  'src/core/lib/gpr/tls_gcc.h',
@@ -740,6 +738,7 @@ Pod::Spec.new do |s|
  'src/core/lib/gprpp/atomic_with_std.h',
  'src/core/lib/gprpp/manual_constructor.h',
  'src/core/lib/gprpp/memory.h',
+ 'src/core/lib/gprpp/thd.h',
  'src/core/lib/profiling/timers.h',
  'src/core/ext/transport/chttp2/transport/bin_decoder.h',
  'src/core/ext/transport/chttp2/transport/bin_encoder.h',

diff --git a/grpc.gemspec b/grpc.gemspec
@@ -83,7 +83,6 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/gpr/spinlock.h )
  s.files += %w( src/core/lib/gpr/string.h )
  s.files += %w( src/core/lib/gpr/string_windows.h )
- s.files += %w( src/core/lib/gpr/thd.h )
  s.files += %w( src/core/lib/gpr/time_precise.h )
  s.files += %w( src/core/lib/gpr/tls.h )
  s.files += %w( src/core/lib/gpr/tls_gcc.h )
@@ -97,6 +96,7 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/gprpp/atomic_with_std.h )
  s.files += %w( src/core/lib/gprpp/manual_constructor.h )
  s.files += %w( src/core/lib/gprpp/memory.h )
+ s.files += %w( src/core/lib/gprpp/thd.h )
  s.files += %w( src/core/lib/profiling/timers.h )
  s.files += %w( src/core/lib/gpr/alloc.cc )
  s.files += %w( src/core/lib/gpr/arena.cc )
@@ -124,9 +124,6 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/gpr/sync.cc )
  s.files += %w( src/core/lib/gpr/sync_posix.cc )
  s.files += %w( src/core/lib/gpr/sync_windows.cc )
- s.files += %w( src/core/lib/gpr/thd.cc )
- s.files += %w( src/core/lib/gpr/thd_posix.cc )
- s.files += %w( src/core/lib/gpr/thd_windows.cc )
  s.files += %w( src/core/lib/gpr/time.cc )
  s.files += %w( src/core/lib/gpr/time_posix.cc )
  s.files += %w( src/core/lib/gpr/time_precise.cc )
@@ -136,6 +133,8 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/gpr/tmpfile_posix.cc )
  s.files += %w( src/core/lib/gpr/tmpfile_windows.cc )
  s.files += %w( src/core/lib/gpr/wrap_memcpy.cc )
+ s.files += %w( src/core/lib/gprpp/thd_posix.cc )
+ s.files += %w( src/core/lib/gprpp/thd_windows.cc )
  s.files += %w( src/core/lib/profiling/basic_timers.cc )
  s.files += %w( src/core/lib/profiling/stap_timers.cc )
  s.files += %w( include/grpc/impl/codegen/byte_buffer.h )