Add delete operator overload

6 years ago · ad22f9d7bf
parent 917605735b
commit ad22f9d7bf
19 changed files with 58 additions and 49 deletions
--- a/4
+++ b/4
@ -837,7 +837,7 @@ grpc_cc_library(
        "src/core/lib/iomgr/tcp_server_windows.cc",
        "src/core/lib/iomgr/tcp_uv.cc",
        "src/core/lib/iomgr/tcp_windows.cc",
-        "src/core/lib/iomgr/threadpool/mpmcqueue.cc",
+        "src/core/lib/iomgr/executor/mpmcqueue.cc",
        "src/core/lib/iomgr/time_averaged_stats.cc",
        "src/core/lib/iomgr/timer.cc",
        "src/core/lib/iomgr/timer_custom.cc",
@ -983,7 +983,7 @@ grpc_cc_library(
        "src/core/lib/iomgr/tcp_server.h",
        "src/core/lib/iomgr/tcp_server_utils_posix.h",
        "src/core/lib/iomgr/tcp_windows.h",
-        "src/core/lib/iomgr/threadpool/mpmcqueue.h",
+        "src/core/lib/iomgr/executor/mpmcqueue.h",
        "src/core/lib/iomgr/time_averaged_stats.h",
        "src/core/lib/iomgr/timer.h",
        "src/core/lib/iomgr/timer_custom.h",
--- a/BUILD.gn
+++ b/BUILD.gn
@ -524,6 +524,8 @@ config("grpc_config") {
        "src/core/lib/iomgr/exec_ctx.h",
        "src/core/lib/iomgr/executor.cc",
        "src/core/lib/iomgr/executor.h",
+        "src/core/lib/iomgr/executor/mpmcqueue.cc",
+        "src/core/lib/iomgr/executor/mpmcqueue.h",
        "src/core/lib/iomgr/fork_posix.cc",
        "src/core/lib/iomgr/fork_windows.cc",
        "src/core/lib/iomgr/gethostname.h",
@ -622,8 +624,6 @@ config("grpc_config") {
        "src/core/lib/iomgr/tcp_uv.cc",
        "src/core/lib/iomgr/tcp_windows.cc",
        "src/core/lib/iomgr/tcp_windows.h",
-        "src/core/lib/iomgr/threadpool/mpmcqueue.cc",
-        "src/core/lib/iomgr/threadpool/mpmcqueue.h",
        "src/core/lib/iomgr/time_averaged_stats.cc",
        "src/core/lib/iomgr/time_averaged_stats.h",
        "src/core/lib/iomgr/timer.cc",
@ -1228,6 +1228,7 @@ config("grpc_config") {
        "src/core/lib/iomgr/ev_posix.h",
        "src/core/lib/iomgr/exec_ctx.h",
        "src/core/lib/iomgr/executor.h",
+        "src/core/lib/iomgr/executor/mpmcqueue.h",
        "src/core/lib/iomgr/gethostname.h",
        "src/core/lib/iomgr/grpc_if_nametoindex.h",
        "src/core/lib/iomgr/internal_errqueue.h",
@ -1269,7 +1270,6 @@ config("grpc_config") {
        "src/core/lib/iomgr/tcp_server.h",
        "src/core/lib/iomgr/tcp_server_utils_posix.h",
        "src/core/lib/iomgr/tcp_windows.h",
-        "src/core/lib/iomgr/threadpool/mpmcqueue.h",
        "src/core/lib/iomgr/time_averaged_stats.h",
        "src/core/lib/iomgr/timer.h",
        "src/core/lib/iomgr/timer_custom.h",
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1027,6 +1027,7 @@ add_library(grpc
  src/core/lib/iomgr/ev_windows.cc
  src/core/lib/iomgr/exec_ctx.cc
  src/core/lib/iomgr/executor.cc
+  src/core/lib/iomgr/executor/mpmcqueue.cc
  src/core/lib/iomgr/fork_posix.cc
  src/core/lib/iomgr/fork_windows.cc
  src/core/lib/iomgr/gethostname_fallback.cc
@ -1084,7 +1085,6 @@ add_library(grpc
  src/core/lib/iomgr/tcp_server_windows.cc
  src/core/lib/iomgr/tcp_uv.cc
  src/core/lib/iomgr/tcp_windows.cc
-  src/core/lib/iomgr/threadpool/mpmcqueue.cc
  src/core/lib/iomgr/time_averaged_stats.cc
  src/core/lib/iomgr/timer.cc
  src/core/lib/iomgr/timer_custom.cc
@ -1463,6 +1463,7 @@ add_library(grpc_cronet
  src/core/lib/iomgr/ev_windows.cc
  src/core/lib/iomgr/exec_ctx.cc
  src/core/lib/iomgr/executor.cc
+  src/core/lib/iomgr/executor/mpmcqueue.cc
  src/core/lib/iomgr/fork_posix.cc
  src/core/lib/iomgr/fork_windows.cc
  src/core/lib/iomgr/gethostname_fallback.cc
@ -1520,7 +1521,6 @@ add_library(grpc_cronet
  src/core/lib/iomgr/tcp_server_windows.cc
  src/core/lib/iomgr/tcp_uv.cc
  src/core/lib/iomgr/tcp_windows.cc
-  src/core/lib/iomgr/threadpool/mpmcqueue.cc
  src/core/lib/iomgr/time_averaged_stats.cc
  src/core/lib/iomgr/timer.cc
  src/core/lib/iomgr/timer_custom.cc
@ -1881,6 +1881,7 @@ add_library(grpc_test_util
  src/core/lib/iomgr/ev_windows.cc
  src/core/lib/iomgr/exec_ctx.cc
  src/core/lib/iomgr/executor.cc
+  src/core/lib/iomgr/executor/mpmcqueue.cc
  src/core/lib/iomgr/fork_posix.cc
  src/core/lib/iomgr/fork_windows.cc
  src/core/lib/iomgr/gethostname_fallback.cc
@ -1938,7 +1939,6 @@ add_library(grpc_test_util
  src/core/lib/iomgr/tcp_server_windows.cc
  src/core/lib/iomgr/tcp_uv.cc
  src/core/lib/iomgr/tcp_windows.cc
-  src/core/lib/iomgr/threadpool/mpmcqueue.cc
  src/core/lib/iomgr/time_averaged_stats.cc
  src/core/lib/iomgr/timer.cc
  src/core/lib/iomgr/timer_custom.cc
@ -2212,6 +2212,7 @@ add_library(grpc_test_util_unsecure
  src/core/lib/iomgr/ev_windows.cc
  src/core/lib/iomgr/exec_ctx.cc
  src/core/lib/iomgr/executor.cc
+  src/core/lib/iomgr/executor/mpmcqueue.cc
  src/core/lib/iomgr/fork_posix.cc
  src/core/lib/iomgr/fork_windows.cc
  src/core/lib/iomgr/gethostname_fallback.cc
@ -2269,7 +2270,6 @@ add_library(grpc_test_util_unsecure
  src/core/lib/iomgr/tcp_server_windows.cc
  src/core/lib/iomgr/tcp_uv.cc
  src/core/lib/iomgr/tcp_windows.cc
-  src/core/lib/iomgr/threadpool/mpmcqueue.cc
  src/core/lib/iomgr/time_averaged_stats.cc
  src/core/lib/iomgr/timer.cc
  src/core/lib/iomgr/timer_custom.cc
@ -2519,6 +2519,7 @@ add_library(grpc_unsecure
  src/core/lib/iomgr/ev_windows.cc
  src/core/lib/iomgr/exec_ctx.cc
  src/core/lib/iomgr/executor.cc
+  src/core/lib/iomgr/executor/mpmcqueue.cc
  src/core/lib/iomgr/fork_posix.cc
  src/core/lib/iomgr/fork_windows.cc
  src/core/lib/iomgr/gethostname_fallback.cc
@ -2576,7 +2577,6 @@ add_library(grpc_unsecure
  src/core/lib/iomgr/tcp_server_windows.cc
  src/core/lib/iomgr/tcp_uv.cc
  src/core/lib/iomgr/tcp_windows.cc
-  src/core/lib/iomgr/threadpool/mpmcqueue.cc
  src/core/lib/iomgr/time_averaged_stats.cc
  src/core/lib/iomgr/timer.cc
  src/core/lib/iomgr/timer_custom.cc
@ -3546,6 +3546,7 @@ add_library(grpc++_cronet
  src/core/lib/iomgr/ev_windows.cc
  src/core/lib/iomgr/exec_ctx.cc
  src/core/lib/iomgr/executor.cc
+  src/core/lib/iomgr/executor/mpmcqueue.cc
  src/core/lib/iomgr/fork_posix.cc
  src/core/lib/iomgr/fork_windows.cc
  src/core/lib/iomgr/gethostname_fallback.cc
@ -3603,7 +3604,6 @@ add_library(grpc++_cronet
  src/core/lib/iomgr/tcp_server_windows.cc
  src/core/lib/iomgr/tcp_uv.cc
  src/core/lib/iomgr/tcp_windows.cc
-  src/core/lib/iomgr/threadpool/mpmcqueue.cc
  src/core/lib/iomgr/time_averaged_stats.cc
  src/core/lib/iomgr/timer.cc
  src/core/lib/iomgr/timer_custom.cc
--- a/12
+++ b/12
@ -3520,6 +3520,7 @@ LIBGRPC_SRC = \
    src/core/lib/iomgr/ev_windows.cc \
    src/core/lib/iomgr/exec_ctx.cc \
    src/core/lib/iomgr/executor.cc \
+    src/core/lib/iomgr/executor/mpmcqueue.cc \
    src/core/lib/iomgr/fork_posix.cc \
    src/core/lib/iomgr/fork_windows.cc \
    src/core/lib/iomgr/gethostname_fallback.cc \
@ -3577,7 +3578,6 @@ LIBGRPC_SRC = \
    src/core/lib/iomgr/tcp_server_windows.cc \
    src/core/lib/iomgr/tcp_uv.cc \
    src/core/lib/iomgr/tcp_windows.cc \
-    src/core/lib/iomgr/threadpool/mpmcqueue.cc \
    src/core/lib/iomgr/time_averaged_stats.cc \
    src/core/lib/iomgr/timer.cc \
    src/core/lib/iomgr/timer_custom.cc \
@ -3950,6 +3950,7 @@ LIBGRPC_CRONET_SRC = \
    src/core/lib/iomgr/ev_windows.cc \
    src/core/lib/iomgr/exec_ctx.cc \
    src/core/lib/iomgr/executor.cc \
+    src/core/lib/iomgr/executor/mpmcqueue.cc \
    src/core/lib/iomgr/fork_posix.cc \
    src/core/lib/iomgr/fork_windows.cc \
    src/core/lib/iomgr/gethostname_fallback.cc \
@ -4007,7 +4008,6 @@ LIBGRPC_CRONET_SRC = \
    src/core/lib/iomgr/tcp_server_windows.cc \
    src/core/lib/iomgr/tcp_uv.cc \
    src/core/lib/iomgr/tcp_windows.cc \
-    src/core/lib/iomgr/threadpool/mpmcqueue.cc \
    src/core/lib/iomgr/time_averaged_stats.cc \
    src/core/lib/iomgr/timer.cc \
    src/core/lib/iomgr/timer_custom.cc \
@ -4361,6 +4361,7 @@ LIBGRPC_TEST_UTIL_SRC = \
    src/core/lib/iomgr/ev_windows.cc \
    src/core/lib/iomgr/exec_ctx.cc \
    src/core/lib/iomgr/executor.cc \
+    src/core/lib/iomgr/executor/mpmcqueue.cc \
    src/core/lib/iomgr/fork_posix.cc \
    src/core/lib/iomgr/fork_windows.cc \
    src/core/lib/iomgr/gethostname_fallback.cc \
@ -4418,7 +4419,6 @@ LIBGRPC_TEST_UTIL_SRC = \
    src/core/lib/iomgr/tcp_server_windows.cc \
    src/core/lib/iomgr/tcp_uv.cc \
    src/core/lib/iomgr/tcp_windows.cc \
-    src/core/lib/iomgr/threadpool/mpmcqueue.cc \
    src/core/lib/iomgr/time_averaged_stats.cc \
    src/core/lib/iomgr/timer.cc \
    src/core/lib/iomgr/timer_custom.cc \
@ -4679,6 +4679,7 @@ LIBGRPC_TEST_UTIL_UNSECURE_SRC = \
    src/core/lib/iomgr/ev_windows.cc \
    src/core/lib/iomgr/exec_ctx.cc \
    src/core/lib/iomgr/executor.cc \
+    src/core/lib/iomgr/executor/mpmcqueue.cc \
    src/core/lib/iomgr/fork_posix.cc \
    src/core/lib/iomgr/fork_windows.cc \
    src/core/lib/iomgr/gethostname_fallback.cc \
@ -4736,7 +4737,6 @@ LIBGRPC_TEST_UTIL_UNSECURE_SRC = \
    src/core/lib/iomgr/tcp_server_windows.cc \
    src/core/lib/iomgr/tcp_uv.cc \
    src/core/lib/iomgr/tcp_windows.cc \
-    src/core/lib/iomgr/threadpool/mpmcqueue.cc \
    src/core/lib/iomgr/time_averaged_stats.cc \
    src/core/lib/iomgr/timer.cc \
    src/core/lib/iomgr/timer_custom.cc \
@ -4960,6 +4960,7 @@ LIBGRPC_UNSECURE_SRC = \
    src/core/lib/iomgr/ev_windows.cc \
    src/core/lib/iomgr/exec_ctx.cc \
    src/core/lib/iomgr/executor.cc \
+    src/core/lib/iomgr/executor/mpmcqueue.cc \
    src/core/lib/iomgr/fork_posix.cc \
    src/core/lib/iomgr/fork_windows.cc \
    src/core/lib/iomgr/gethostname_fallback.cc \
@ -5017,7 +5018,6 @@ LIBGRPC_UNSECURE_SRC = \
    src/core/lib/iomgr/tcp_server_windows.cc \
    src/core/lib/iomgr/tcp_uv.cc \
    src/core/lib/iomgr/tcp_windows.cc \
-    src/core/lib/iomgr/threadpool/mpmcqueue.cc \
    src/core/lib/iomgr/time_averaged_stats.cc \
    src/core/lib/iomgr/timer.cc \
    src/core/lib/iomgr/timer_custom.cc \
@ -5960,6 +5960,7 @@ LIBGRPC++_CRONET_SRC = \
    src/core/lib/iomgr/ev_windows.cc \
    src/core/lib/iomgr/exec_ctx.cc \
    src/core/lib/iomgr/executor.cc \
+    src/core/lib/iomgr/executor/mpmcqueue.cc \
    src/core/lib/iomgr/fork_posix.cc \
    src/core/lib/iomgr/fork_windows.cc \
    src/core/lib/iomgr/gethostname_fallback.cc \
@ -6017,7 +6018,6 @@ LIBGRPC++_CRONET_SRC = \
    src/core/lib/iomgr/tcp_server_windows.cc \
    src/core/lib/iomgr/tcp_uv.cc \
    src/core/lib/iomgr/tcp_windows.cc \
-    src/core/lib/iomgr/threadpool/mpmcqueue.cc \
    src/core/lib/iomgr/time_averaged_stats.cc \
    src/core/lib/iomgr/timer.cc \
    src/core/lib/iomgr/timer_custom.cc \
--- a/build.yaml
+++ b/build.yaml
@ -280,6 +280,7 @@ filegroups:
  - src/core/lib/iomgr/ev_windows.cc
  - src/core/lib/iomgr/exec_ctx.cc
  - src/core/lib/iomgr/executor.cc
+  - src/core/lib/iomgr/executor/mpmcqueue.cc
  - src/core/lib/iomgr/fork_posix.cc
  - src/core/lib/iomgr/fork_windows.cc
  - src/core/lib/iomgr/gethostname_fallback.cc
@ -337,7 +338,6 @@ filegroups:
  - src/core/lib/iomgr/tcp_server_windows.cc
  - src/core/lib/iomgr/tcp_uv.cc
  - src/core/lib/iomgr/tcp_windows.cc
-  - src/core/lib/iomgr/threadpool/mpmcqueue.cc
  - src/core/lib/iomgr/time_averaged_stats.cc
  - src/core/lib/iomgr/timer.cc
  - src/core/lib/iomgr/timer_custom.cc
@ -467,6 +467,7 @@ filegroups:
  - src/core/lib/iomgr/ev_posix.h
  - src/core/lib/iomgr/exec_ctx.h
  - src/core/lib/iomgr/executor.h
+  - src/core/lib/iomgr/executor/mpmcqueue.h
  - src/core/lib/iomgr/gethostname.h
  - src/core/lib/iomgr/grpc_if_nametoindex.h
  - src/core/lib/iomgr/internal_errqueue.h
@ -508,7 +509,6 @@ filegroups:
  - src/core/lib/iomgr/tcp_server.h
  - src/core/lib/iomgr/tcp_server_utils_posix.h
  - src/core/lib/iomgr/tcp_windows.h
-  - src/core/lib/iomgr/threadpool/mpmcqueue.h
  - src/core/lib/iomgr/time_averaged_stats.h
  - src/core/lib/iomgr/timer.h
  - src/core/lib/iomgr/timer_custom.h
--- a/config.m4
+++ b/config.m4
@ -127,6 +127,7 @@ if test "$PHP_GRPC" != "no"; then
    src/core/lib/iomgr/ev_windows.cc \
    src/core/lib/iomgr/exec_ctx.cc \
    src/core/lib/iomgr/executor.cc \
+    src/core/lib/iomgr/executor/mpmcqueue.cc \
    src/core/lib/iomgr/fork_posix.cc \
    src/core/lib/iomgr/fork_windows.cc \
    src/core/lib/iomgr/gethostname_fallback.cc \
@ -184,7 +185,6 @@ if test "$PHP_GRPC" != "no"; then
    src/core/lib/iomgr/tcp_server_windows.cc \
    src/core/lib/iomgr/tcp_uv.cc \
    src/core/lib/iomgr/tcp_windows.cc \
-    src/core/lib/iomgr/threadpool/mpmcqueue.cc \
    src/core/lib/iomgr/time_averaged_stats.cc \
    src/core/lib/iomgr/timer.cc \
    src/core/lib/iomgr/timer_custom.cc \
@ -727,7 +727,7 @@ if test "$PHP_GRPC" != "no"; then
  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/iomgr/threadpool)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/iomgr/executor)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/json)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/profiling)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security/context)
--- a/config.w32
+++ b/config.w32
@ -102,6 +102,7 @@ if (PHP_GRPC != "no") {
    "src\\core\\lib\\iomgr\\ev_windows.cc " +
    "src\\core\\lib\\iomgr\\exec_ctx.cc " +
    "src\\core\\lib\\iomgr\\executor.cc " +
+    "src\\core\\lib\\iomgr\\executor\\mpmcqueue.cc " +
    "src\\core\\lib\\iomgr\\fork_posix.cc " +
    "src\\core\\lib\\iomgr\\fork_windows.cc " +
    "src\\core\\lib\\iomgr\\gethostname_fallback.cc " +
@ -159,7 +160,6 @@ if (PHP_GRPC != "no") {
    "src\\core\\lib\\iomgr\\tcp_server_windows.cc " +
    "src\\core\\lib\\iomgr\\tcp_uv.cc " +
    "src\\core\\lib\\iomgr\\tcp_windows.cc " +
-    "src\\core\\lib\\iomgr\\threadpool\\mpmcqueue.cc " +
    "src\\core\\lib\\iomgr\\time_averaged_stats.cc " +
    "src\\core\\lib\\iomgr\\timer.cc " +
    "src\\core\\lib\\iomgr\\timer_custom.cc " +
@ -740,7 +740,7 @@ if (PHP_GRPC != "no") {
  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\\iomgr\\threadpool");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\iomgr\\executor");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\json");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\profiling");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\security");
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@ -466,6 +466,7 @@ Pod::Spec.new do |s|
                      'src/core/lib/iomgr/ev_posix.h',
                      'src/core/lib/iomgr/exec_ctx.h',
                      'src/core/lib/iomgr/executor.h',
+                      'src/core/lib/iomgr/executor/mpmcqueue.h',
                      'src/core/lib/iomgr/gethostname.h',
                      'src/core/lib/iomgr/grpc_if_nametoindex.h',
                      'src/core/lib/iomgr/internal_errqueue.h',
@ -507,7 +508,6 @@ Pod::Spec.new do |s|
                      'src/core/lib/iomgr/tcp_server.h',
                      'src/core/lib/iomgr/tcp_server_utils_posix.h',
                      'src/core/lib/iomgr/tcp_windows.h',
-                      'src/core/lib/iomgr/threadpool/mpmcqueue.h',
                      'src/core/lib/iomgr/time_averaged_stats.h',
                      'src/core/lib/iomgr/timer.h',
                      'src/core/lib/iomgr/timer_custom.h',
@ -671,6 +671,7 @@ Pod::Spec.new do |s|
                              'src/core/lib/iomgr/ev_posix.h',
                              'src/core/lib/iomgr/exec_ctx.h',
                              'src/core/lib/iomgr/executor.h',
+                              'src/core/lib/iomgr/executor/mpmcqueue.h',
                              'src/core/lib/iomgr/gethostname.h',
                              'src/core/lib/iomgr/grpc_if_nametoindex.h',
                              'src/core/lib/iomgr/internal_errqueue.h',
@ -712,7 +713,6 @@ Pod::Spec.new do |s|
                              'src/core/lib/iomgr/tcp_server.h',
                              'src/core/lib/iomgr/tcp_server_utils_posix.h',
                              'src/core/lib/iomgr/tcp_windows.h',
-                              'src/core/lib/iomgr/threadpool/mpmcqueue.h',
                              'src/core/lib/iomgr/time_averaged_stats.h',
                              'src/core/lib/iomgr/timer.h',
                              'src/core/lib/iomgr/timer_custom.h',
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@ -436,6 +436,7 @@ Pod::Spec.new do |s|
                      'src/core/lib/iomgr/ev_posix.h',
                      'src/core/lib/iomgr/exec_ctx.h',
                      'src/core/lib/iomgr/executor.h',
+                      'src/core/lib/iomgr/executor/mpmcqueue.h',
                      'src/core/lib/iomgr/gethostname.h',
                      'src/core/lib/iomgr/grpc_if_nametoindex.h',
                      'src/core/lib/iomgr/internal_errqueue.h',
@ -477,7 +478,6 @@ Pod::Spec.new do |s|
                      'src/core/lib/iomgr/tcp_server.h',
                      'src/core/lib/iomgr/tcp_server_utils_posix.h',
                      'src/core/lib/iomgr/tcp_windows.h',
-                      'src/core/lib/iomgr/threadpool/mpmcqueue.h',
                      'src/core/lib/iomgr/time_averaged_stats.h',
                      'src/core/lib/iomgr/timer.h',
                      'src/core/lib/iomgr/timer_custom.h',
@ -590,6 +590,7 @@ Pod::Spec.new do |s|
                      'src/core/lib/iomgr/ev_windows.cc',
                      'src/core/lib/iomgr/exec_ctx.cc',
                      'src/core/lib/iomgr/executor.cc',
+                      'src/core/lib/iomgr/executor/mpmcqueue.cc',
                      'src/core/lib/iomgr/fork_posix.cc',
                      'src/core/lib/iomgr/fork_windows.cc',
                      'src/core/lib/iomgr/gethostname_fallback.cc',
@ -647,7 +648,6 @@ Pod::Spec.new do |s|
                      'src/core/lib/iomgr/tcp_server_windows.cc',
                      'src/core/lib/iomgr/tcp_uv.cc',
                      'src/core/lib/iomgr/tcp_windows.cc',
-                      'src/core/lib/iomgr/threadpool/mpmcqueue.cc',
                      'src/core/lib/iomgr/time_averaged_stats.cc',
                      'src/core/lib/iomgr/timer.cc',
                      'src/core/lib/iomgr/timer_custom.cc',
@ -1091,6 +1091,7 @@ Pod::Spec.new do |s|
                              'src/core/lib/iomgr/ev_posix.h',
                              'src/core/lib/iomgr/exec_ctx.h',
                              'src/core/lib/iomgr/executor.h',
+                              'src/core/lib/iomgr/executor/mpmcqueue.h',
                              'src/core/lib/iomgr/gethostname.h',
                              'src/core/lib/iomgr/grpc_if_nametoindex.h',
                              'src/core/lib/iomgr/internal_errqueue.h',
@ -1132,7 +1133,6 @@ Pod::Spec.new do |s|
                              'src/core/lib/iomgr/tcp_server.h',
                              'src/core/lib/iomgr/tcp_server_utils_posix.h',
                              'src/core/lib/iomgr/tcp_windows.h',
-                              'src/core/lib/iomgr/threadpool/mpmcqueue.h',
                              'src/core/lib/iomgr/time_averaged_stats.h',
                              'src/core/lib/iomgr/timer.h',
                              'src/core/lib/iomgr/timer_custom.h',
--- a/grpc.gemspec
+++ b/grpc.gemspec
@ -370,6 +370,7 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/iomgr/ev_posix.h )
  s.files += %w( src/core/lib/iomgr/exec_ctx.h )
  s.files += %w( src/core/lib/iomgr/executor.h )
+  s.files += %w( src/core/lib/iomgr/executor/mpmcqueue.h )
  s.files += %w( src/core/lib/iomgr/gethostname.h )
  s.files += %w( src/core/lib/iomgr/grpc_if_nametoindex.h )
  s.files += %w( src/core/lib/iomgr/internal_errqueue.h )
@ -411,7 +412,6 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/iomgr/tcp_server.h )
  s.files += %w( src/core/lib/iomgr/tcp_server_utils_posix.h )
  s.files += %w( src/core/lib/iomgr/tcp_windows.h )
-  s.files += %w( src/core/lib/iomgr/threadpool/mpmcqueue.h )
  s.files += %w( src/core/lib/iomgr/time_averaged_stats.h )
  s.files += %w( src/core/lib/iomgr/timer.h )
  s.files += %w( src/core/lib/iomgr/timer_custom.h )
@ -524,6 +524,7 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/iomgr/ev_windows.cc )
  s.files += %w( src/core/lib/iomgr/exec_ctx.cc )
  s.files += %w( src/core/lib/iomgr/executor.cc )
+  s.files += %w( src/core/lib/iomgr/executor/mpmcqueue.cc )
  s.files += %w( src/core/lib/iomgr/fork_posix.cc )
  s.files += %w( src/core/lib/iomgr/fork_windows.cc )
  s.files += %w( src/core/lib/iomgr/gethostname_fallback.cc )
@ -581,7 +582,6 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/iomgr/tcp_server_windows.cc )
  s.files += %w( src/core/lib/iomgr/tcp_uv.cc )
  s.files += %w( src/core/lib/iomgr/tcp_windows.cc )
-  s.files += %w( src/core/lib/iomgr/threadpool/mpmcqueue.cc )
  s.files += %w( src/core/lib/iomgr/time_averaged_stats.cc )
  s.files += %w( src/core/lib/iomgr/timer.cc )
  s.files += %w( src/core/lib/iomgr/timer_custom.cc )
--- a/grpc.gyp
+++ b/grpc.gyp
@ -309,6 +309,7 @@
        'src/core/lib/iomgr/ev_windows.cc',
        'src/core/lib/iomgr/exec_ctx.cc',
        'src/core/lib/iomgr/executor.cc',
+        'src/core/lib/iomgr/executor/mpmcqueue.cc',
        'src/core/lib/iomgr/fork_posix.cc',
        'src/core/lib/iomgr/fork_windows.cc',
        'src/core/lib/iomgr/gethostname_fallback.cc',
@ -366,7 +367,6 @@
        'src/core/lib/iomgr/tcp_server_windows.cc',
        'src/core/lib/iomgr/tcp_uv.cc',
        'src/core/lib/iomgr/tcp_windows.cc',
-        'src/core/lib/iomgr/threadpool/mpmcqueue.cc',
        'src/core/lib/iomgr/time_averaged_stats.cc',
        'src/core/lib/iomgr/timer.cc',
        'src/core/lib/iomgr/timer_custom.cc',
@ -686,6 +686,7 @@
        'src/core/lib/iomgr/ev_windows.cc',
        'src/core/lib/iomgr/exec_ctx.cc',
        'src/core/lib/iomgr/executor.cc',
+        'src/core/lib/iomgr/executor/mpmcqueue.cc',
        'src/core/lib/iomgr/fork_posix.cc',
        'src/core/lib/iomgr/fork_windows.cc',
        'src/core/lib/iomgr/gethostname_fallback.cc',
@ -743,7 +744,6 @@
        'src/core/lib/iomgr/tcp_server_windows.cc',
        'src/core/lib/iomgr/tcp_uv.cc',
        'src/core/lib/iomgr/tcp_windows.cc',
-        'src/core/lib/iomgr/threadpool/mpmcqueue.cc',
        'src/core/lib/iomgr/time_averaged_stats.cc',
        'src/core/lib/iomgr/timer.cc',
        'src/core/lib/iomgr/timer_custom.cc',
@ -937,6 +937,7 @@
        'src/core/lib/iomgr/ev_windows.cc',
        'src/core/lib/iomgr/exec_ctx.cc',
        'src/core/lib/iomgr/executor.cc',
+        'src/core/lib/iomgr/executor/mpmcqueue.cc',
        'src/core/lib/iomgr/fork_posix.cc',
        'src/core/lib/iomgr/fork_windows.cc',
        'src/core/lib/iomgr/gethostname_fallback.cc',
@ -994,7 +995,6 @@
        'src/core/lib/iomgr/tcp_server_windows.cc',
        'src/core/lib/iomgr/tcp_uv.cc',
        'src/core/lib/iomgr/tcp_windows.cc',
-        'src/core/lib/iomgr/threadpool/mpmcqueue.cc',
        'src/core/lib/iomgr/time_averaged_stats.cc',
        'src/core/lib/iomgr/timer.cc',
        'src/core/lib/iomgr/timer_custom.cc',
@ -1164,6 +1164,7 @@
        'src/core/lib/iomgr/ev_windows.cc',
        'src/core/lib/iomgr/exec_ctx.cc',
        'src/core/lib/iomgr/executor.cc',
+        'src/core/lib/iomgr/executor/mpmcqueue.cc',
        'src/core/lib/iomgr/fork_posix.cc',
        'src/core/lib/iomgr/fork_windows.cc',
        'src/core/lib/iomgr/gethostname_fallback.cc',
@ -1221,7 +1222,6 @@
        'src/core/lib/iomgr/tcp_server_windows.cc',
        'src/core/lib/iomgr/tcp_uv.cc',
        'src/core/lib/iomgr/tcp_windows.cc',
-        'src/core/lib/iomgr/threadpool/mpmcqueue.cc',
        'src/core/lib/iomgr/time_averaged_stats.cc',
        'src/core/lib/iomgr/timer.cc',
        'src/core/lib/iomgr/timer_custom.cc',
--- a/package.xml
+++ b/package.xml
@ -375,6 +375,7 @@
    <file baseinstalldir="/" name="src/core/lib/iomgr/ev_posix.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/exec_ctx.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/executor.h" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/iomgr/executor/mpmcqueue.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/gethostname.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/grpc_if_nametoindex.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/internal_errqueue.h" role="src" />
@ -416,7 +417,6 @@
    <file baseinstalldir="/" name="src/core/lib/iomgr/tcp_server.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/tcp_server_utils_posix.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/tcp_windows.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/iomgr/threadpool/mpmcqueue.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/time_averaged_stats.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/timer.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/timer_custom.h" role="src" />
@ -529,6 +529,7 @@
    <file baseinstalldir="/" name="src/core/lib/iomgr/ev_windows.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/exec_ctx.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/executor.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/iomgr/executor/mpmcqueue.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/fork_posix.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/fork_windows.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/gethostname_fallback.cc" role="src" />
@ -586,7 +587,6 @@
    <file baseinstalldir="/" name="src/core/lib/iomgr/tcp_server_windows.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/tcp_uv.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/tcp_windows.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/iomgr/threadpool/mpmcqueue.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/time_averaged_stats.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/timer.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/timer_custom.cc" role="src" />
--- a/src/core/lib/iomgr/threadpool/mpmcqueue.cc
+++ b/src/core/lib/iomgr/threadpool/mpmcqueue.cc
@ -18,7 +18,7 @@

 #include <grpc/support/port_platform.h>

-#include "src/core/lib/iomgr/threadpool/mpmcqueue.h"
+#include "src/core/lib/iomgr/executor/mpmcqueue.h"

 #include <inttypes.h>
 #include <string.h>
--- a/src/core/lib/iomgr/threadpool/mpmcqueue.h
+++ b/src/core/lib/iomgr/threadpool/mpmcqueue.h
@ -16,8 +16,8 @@
 *
 */

-#ifndef GRPC_CORE_LIB_IOMGR_THREADPOOL_MPMCQUEUE_H
-#define GRPC_CORE_LIB_IOMGR_THREADPOOL_MPMCQUEUE_H
+#ifndef GRPC_CORE_LIB_IOMGR_EXECUTOR_MPMCQUEUE_H
+#define GRPC_CORE_LIB_IOMGR_EXECUTOR_MPMCQUEUE_H

 #include <grpc/support/port_platform.h>

@ -53,7 +53,7 @@ class MPMCQueue : public MPMCQueueInterface {
 public:
  // Create a new Multiple-Producer-Multiple-Consumer Queue. The queue created
  // will have infinite length.
-  explicit MPMCQueue();
+  MPMCQueue();

  // Release all resources hold by the queue. The queue must be empty, and no
  // one waiting on conditional variables.
@ -72,6 +72,15 @@ class MPMCQueue : public MPMCQueueInterface {
  // quickly.
  int count() const { return count_.Load(MemoryOrder::RELAXED); }

+  void* operator new(size_t n) {
+    void* p = gpr_malloc(n);
+    return p;
+  }
+
+  void operator delete(void* p) {
+    gpr_free(p);
+  }
+
 private:
  void* PopFront();

@ -122,4 +131,4 @@ class MPMCQueue : public MPMCQueueInterface {

 }  // namespace grpc_core

-#endif /* GRPC_CORE_LIB_IOMGR_THREADPOOL_MPMCQUEUE_H */
+#endif /* GRPC_CORE_LIB_IOMGR_EXECUTOR_MPMCQUEUE_H */
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@ -101,6 +101,7 @@ CORE_SOURCE_FILES = [
    'src/core/lib/iomgr/ev_windows.cc',
    'src/core/lib/iomgr/exec_ctx.cc',
    'src/core/lib/iomgr/executor.cc',
+    'src/core/lib/iomgr/executor/mpmcqueue.cc',
    'src/core/lib/iomgr/fork_posix.cc',
    'src/core/lib/iomgr/fork_windows.cc',
    'src/core/lib/iomgr/gethostname_fallback.cc',
@ -158,7 +159,6 @@ CORE_SOURCE_FILES = [
    'src/core/lib/iomgr/tcp_server_windows.cc',
    'src/core/lib/iomgr/tcp_uv.cc',
    'src/core/lib/iomgr/tcp_windows.cc',
-    'src/core/lib/iomgr/threadpool/mpmcqueue.cc',
    'src/core/lib/iomgr/time_averaged_stats.cc',
    'src/core/lib/iomgr/timer.cc',
    'src/core/lib/iomgr/timer_custom.cc',
--- a/test/core/iomgr/mpmcqueue_test.cc
+++ b/test/core/iomgr/mpmcqueue_test.cc
@ -16,7 +16,7 @@
 *
 */

-#include "src/core/lib/iomgr/threadpool/mpmcqueue.h"
+#include "src/core/lib/iomgr/executor/mpmcqueue.h"

 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@ -1131,6 +1131,7 @@ src/core/lib/iomgr/ev_poll_posix.h \
 src/core/lib/iomgr/ev_posix.h \
 src/core/lib/iomgr/exec_ctx.h \
 src/core/lib/iomgr/executor.h \
+src/core/lib/iomgr/executor/mpmcqueue.h \
 src/core/lib/iomgr/gethostname.h \
 src/core/lib/iomgr/grpc_if_nametoindex.h \
 src/core/lib/iomgr/internal_errqueue.h \
@ -1172,7 +1173,6 @@ src/core/lib/iomgr/tcp_posix.h \
 src/core/lib/iomgr/tcp_server.h \
 src/core/lib/iomgr/tcp_server_utils_posix.h \
 src/core/lib/iomgr/tcp_windows.h \
-src/core/lib/iomgr/threadpool/mpmcqueue.h \
 src/core/lib/iomgr/time_averaged_stats.h \
 src/core/lib/iomgr/timer.h \
 src/core/lib/iomgr/timer_custom.h \
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@ -1233,6 +1233,8 @@ src/core/lib/iomgr/exec_ctx.cc \
 src/core/lib/iomgr/exec_ctx.h \
 src/core/lib/iomgr/executor.cc \
 src/core/lib/iomgr/executor.h \
+src/core/lib/iomgr/executor/mpmcqueue.cc \
+src/core/lib/iomgr/executor/mpmcqueue.h \
 src/core/lib/iomgr/fork_posix.cc \
 src/core/lib/iomgr/fork_windows.cc \
 src/core/lib/iomgr/gethostname.h \
@ -1331,8 +1333,6 @@ src/core/lib/iomgr/tcp_server_windows.cc \
 src/core/lib/iomgr/tcp_uv.cc \
 src/core/lib/iomgr/tcp_windows.cc \
 src/core/lib/iomgr/tcp_windows.h \
-src/core/lib/iomgr/threadpool/mpmcqueue.cc \
-src/core/lib/iomgr/threadpool/mpmcqueue.h \
 src/core/lib/iomgr/time_averaged_stats.cc \
 src/core/lib/iomgr/time_averaged_stats.h \
 src/core/lib/iomgr/timer.cc \
--- a/tools/run_tests/generated/sources_and_headers.json
+++ b/tools/run_tests/generated/sources_and_headers.json
@ -8442,6 +8442,7 @@
      "src/core/lib/iomgr/ev_windows.cc", 
      "src/core/lib/iomgr/exec_ctx.cc", 
      "src/core/lib/iomgr/executor.cc", 
+      "src/core/lib/iomgr/executor/mpmcqueue.cc", 
      "src/core/lib/iomgr/fork_posix.cc", 
      "src/core/lib/iomgr/fork_windows.cc", 
      "src/core/lib/iomgr/gethostname_fallback.cc", 
@ -8499,7 +8500,6 @@
      "src/core/lib/iomgr/tcp_server_windows.cc", 
      "src/core/lib/iomgr/tcp_uv.cc", 
      "src/core/lib/iomgr/tcp_windows.cc", 
-      "src/core/lib/iomgr/threadpool/mpmcqueue.cc", 
      "src/core/lib/iomgr/time_averaged_stats.cc", 
      "src/core/lib/iomgr/timer.cc", 
      "src/core/lib/iomgr/timer_custom.cc", 
@ -8630,6 +8630,7 @@
      "src/core/lib/iomgr/ev_posix.h", 
      "src/core/lib/iomgr/exec_ctx.h", 
      "src/core/lib/iomgr/executor.h", 
+      "src/core/lib/iomgr/executor/mpmcqueue.h", 
      "src/core/lib/iomgr/gethostname.h", 
      "src/core/lib/iomgr/grpc_if_nametoindex.h", 
      "src/core/lib/iomgr/internal_errqueue.h", 
@ -8671,7 +8672,6 @@
      "src/core/lib/iomgr/tcp_server.h", 
      "src/core/lib/iomgr/tcp_server_utils_posix.h", 
      "src/core/lib/iomgr/tcp_windows.h", 
-      "src/core/lib/iomgr/threadpool/mpmcqueue.h", 
      "src/core/lib/iomgr/time_averaged_stats.h", 
      "src/core/lib/iomgr/timer.h", 
      "src/core/lib/iomgr/timer_custom.h", 
@ -8788,6 +8788,7 @@
      "src/core/lib/iomgr/ev_posix.h", 
      "src/core/lib/iomgr/exec_ctx.h", 
      "src/core/lib/iomgr/executor.h", 
+      "src/core/lib/iomgr/executor/mpmcqueue.h", 
      "src/core/lib/iomgr/gethostname.h", 
      "src/core/lib/iomgr/grpc_if_nametoindex.h", 
      "src/core/lib/iomgr/internal_errqueue.h", 
@ -8829,7 +8830,6 @@
      "src/core/lib/iomgr/tcp_server.h", 
      "src/core/lib/iomgr/tcp_server_utils_posix.h", 
      "src/core/lib/iomgr/tcp_windows.h", 
-      "src/core/lib/iomgr/threadpool/mpmcqueue.h", 
      "src/core/lib/iomgr/time_averaged_stats.h", 
      "src/core/lib/iomgr/timer.h", 
      "src/core/lib/iomgr/timer_custom.h",