Rename async_execution_lock --> combiner, make it use closures, unroll previous changes for idleness

9 years ago · f7cade1b4f
parent 765c538d72
commit f7cade1b4f
31 changed files with 233 additions and 241 deletions
--- a/24
+++ b/24
@ -175,8 +175,8 @@ cc_library(
    "src/core/lib/http/format_request.h",
    "src/core/lib/http/httpcli.h",
    "src/core/lib/http/parser.h",
-    "src/core/lib/iomgr/async_execution_lock.h",
    "src/core/lib/iomgr/closure.h",
+    "src/core/lib/iomgr/combiner.h",
    "src/core/lib/iomgr/endpoint.h",
    "src/core/lib/iomgr/endpoint_pair.h",
    "src/core/lib/iomgr/error.h",
@ -327,8 +327,8 @@ cc_library(
    "src/core/lib/http/format_request.c",
    "src/core/lib/http/httpcli.c",
    "src/core/lib/http/parser.c",
-    "src/core/lib/iomgr/async_execution_lock.c",
    "src/core/lib/iomgr/closure.c",
+    "src/core/lib/iomgr/combiner.c",
    "src/core/lib/iomgr/endpoint.c",
    "src/core/lib/iomgr/endpoint_pair_posix.c",
    "src/core/lib/iomgr/endpoint_pair_windows.c",
@ -564,8 +564,8 @@ cc_library(
    "src/core/lib/http/format_request.h",
    "src/core/lib/http/httpcli.h",
    "src/core/lib/http/parser.h",
-    "src/core/lib/iomgr/async_execution_lock.h",
    "src/core/lib/iomgr/closure.h",
+    "src/core/lib/iomgr/combiner.h",
    "src/core/lib/iomgr/endpoint.h",
    "src/core/lib/iomgr/endpoint_pair.h",
    "src/core/lib/iomgr/error.h",
@ -706,8 +706,8 @@ cc_library(
    "src/core/lib/http/format_request.c",
    "src/core/lib/http/httpcli.c",
    "src/core/lib/http/parser.c",
-    "src/core/lib/iomgr/async_execution_lock.c",
    "src/core/lib/iomgr/closure.c",
+    "src/core/lib/iomgr/combiner.c",
    "src/core/lib/iomgr/endpoint.c",
    "src/core/lib/iomgr/endpoint_pair_posix.c",
    "src/core/lib/iomgr/endpoint_pair_windows.c",
@ -918,8 +918,8 @@ cc_library(
    "src/core/lib/http/format_request.h",
    "src/core/lib/http/httpcli.h",
    "src/core/lib/http/parser.h",
-    "src/core/lib/iomgr/async_execution_lock.h",
    "src/core/lib/iomgr/closure.h",
+    "src/core/lib/iomgr/combiner.h",
    "src/core/lib/iomgr/endpoint.h",
    "src/core/lib/iomgr/endpoint_pair.h",
    "src/core/lib/iomgr/error.h",
@ -1047,8 +1047,8 @@ cc_library(
    "src/core/lib/http/format_request.c",
    "src/core/lib/http/httpcli.c",
    "src/core/lib/http/parser.c",
-    "src/core/lib/iomgr/async_execution_lock.c",
    "src/core/lib/iomgr/closure.c",
+    "src/core/lib/iomgr/combiner.c",
    "src/core/lib/iomgr/endpoint.c",
    "src/core/lib/iomgr/endpoint_pair_posix.c",
    "src/core/lib/iomgr/endpoint_pair_windows.c",
@ -1257,8 +1257,8 @@ cc_library(
    "src/core/lib/http/format_request.h",
    "src/core/lib/http/httpcli.h",
    "src/core/lib/http/parser.h",
-    "src/core/lib/iomgr/async_execution_lock.h",
    "src/core/lib/iomgr/closure.h",
+    "src/core/lib/iomgr/combiner.h",
    "src/core/lib/iomgr/endpoint.h",
    "src/core/lib/iomgr/endpoint_pair.h",
    "src/core/lib/iomgr/error.h",
@ -1392,8 +1392,8 @@ cc_library(
    "src/core/lib/http/format_request.c",
    "src/core/lib/http/httpcli.c",
    "src/core/lib/http/parser.c",
-    "src/core/lib/iomgr/async_execution_lock.c",
    "src/core/lib/iomgr/closure.c",
+    "src/core/lib/iomgr/combiner.c",
    "src/core/lib/iomgr/endpoint.c",
    "src/core/lib/iomgr/endpoint_pair_posix.c",
    "src/core/lib/iomgr/endpoint_pair_windows.c",
@ -1718,8 +1718,8 @@ cc_library(
    "src/core/lib/http/format_request.h",
    "src/core/lib/http/httpcli.h",
    "src/core/lib/http/parser.h",
-    "src/core/lib/iomgr/async_execution_lock.h",
    "src/core/lib/iomgr/closure.h",
+    "src/core/lib/iomgr/combiner.h",
    "src/core/lib/iomgr/endpoint.h",
    "src/core/lib/iomgr/endpoint_pair.h",
    "src/core/lib/iomgr/error.h",
@ -1848,8 +1848,8 @@ cc_library(
    "src/core/lib/http/format_request.c",
    "src/core/lib/http/httpcli.c",
    "src/core/lib/http/parser.c",
-    "src/core/lib/iomgr/async_execution_lock.c",
    "src/core/lib/iomgr/closure.c",
+    "src/core/lib/iomgr/combiner.c",
    "src/core/lib/iomgr/endpoint.c",
    "src/core/lib/iomgr/endpoint_pair_posix.c",
    "src/core/lib/iomgr/endpoint_pair_windows.c",
@ -2267,8 +2267,8 @@ objc_library(
    "src/core/lib/http/format_request.c",
    "src/core/lib/http/httpcli.c",
    "src/core/lib/http/parser.c",
-    "src/core/lib/iomgr/async_execution_lock.c",
    "src/core/lib/iomgr/closure.c",
+    "src/core/lib/iomgr/combiner.c",
    "src/core/lib/iomgr/endpoint.c",
    "src/core/lib/iomgr/endpoint_pair_posix.c",
    "src/core/lib/iomgr/endpoint_pair_windows.c",
@ -2483,8 +2483,8 @@ objc_library(
    "src/core/lib/http/format_request.h",
    "src/core/lib/http/httpcli.h",
    "src/core/lib/http/parser.h",
-    "src/core/lib/iomgr/async_execution_lock.h",
    "src/core/lib/iomgr/closure.h",
+    "src/core/lib/iomgr/combiner.h",
    "src/core/lib/iomgr/endpoint.h",
    "src/core/lib/iomgr/endpoint_pair.h",
    "src/core/lib/iomgr/error.h",
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -141,8 +141,8 @@ add_library(grpc
  src/core/lib/http/format_request.c
  src/core/lib/http/httpcli.c
  src/core/lib/http/parser.c
-  src/core/lib/iomgr/async_execution_lock.c
  src/core/lib/iomgr/closure.c
+  src/core/lib/iomgr/combiner.c
  src/core/lib/iomgr/endpoint.c
  src/core/lib/iomgr/endpoint_pair_posix.c
  src/core/lib/iomgr/endpoint_pair_windows.c
@ -347,8 +347,8 @@ add_library(grpc_cronet
  src/core/lib/http/format_request.c
  src/core/lib/http/httpcli.c
  src/core/lib/http/parser.c
-  src/core/lib/iomgr/async_execution_lock.c
  src/core/lib/iomgr/closure.c
+  src/core/lib/iomgr/combiner.c
  src/core/lib/iomgr/endpoint.c
  src/core/lib/iomgr/endpoint_pair_posix.c
  src/core/lib/iomgr/endpoint_pair_windows.c
@ -530,8 +530,8 @@ add_library(grpc_unsecure
  src/core/lib/http/format_request.c
  src/core/lib/http/httpcli.c
  src/core/lib/http/parser.c
-  src/core/lib/iomgr/async_execution_lock.c
  src/core/lib/iomgr/closure.c
+  src/core/lib/iomgr/combiner.c
  src/core/lib/iomgr/endpoint.c
  src/core/lib/iomgr/endpoint_pair_posix.c
  src/core/lib/iomgr/endpoint_pair_windows.c
@ -735,8 +735,8 @@ add_library(grpc++
  src/core/lib/http/format_request.c
  src/core/lib/http/httpcli.c
  src/core/lib/http/parser.c
-  src/core/lib/iomgr/async_execution_lock.c
  src/core/lib/iomgr/closure.c
+  src/core/lib/iomgr/combiner.c
  src/core/lib/iomgr/endpoint.c
  src/core/lib/iomgr/endpoint_pair_posix.c
  src/core/lib/iomgr/endpoint_pair_windows.c
@ -921,8 +921,8 @@ add_library(grpc++_unsecure
  src/core/lib/http/format_request.c
  src/core/lib/http/httpcli.c
  src/core/lib/http/parser.c
-  src/core/lib/iomgr/async_execution_lock.c
  src/core/lib/iomgr/closure.c
+  src/core/lib/iomgr/combiner.c
  src/core/lib/iomgr/endpoint.c
  src/core/lib/iomgr/endpoint_pair_posix.c
  src/core/lib/iomgr/endpoint_pair_windows.c
--- a/82
+++ b/82
@ -879,7 +879,6 @@ algorithm_test: $(BINDIR)/$(CONFIG)/algorithm_test
 alloc_test: $(BINDIR)/$(CONFIG)/alloc_test
 alpn_test: $(BINDIR)/$(CONFIG)/alpn_test
 api_fuzzer: $(BINDIR)/$(CONFIG)/api_fuzzer
-async_execution_lock_test: $(BINDIR)/$(CONFIG)/async_execution_lock_test
 bad_server_response_test: $(BINDIR)/$(CONFIG)/bad_server_response_test
 bin_decoder_test: $(BINDIR)/$(CONFIG)/bin_decoder_test
 bin_encoder_test: $(BINDIR)/$(CONFIG)/bin_encoder_test
@ -890,6 +889,7 @@ chttp2_status_conversion_test: $(BINDIR)/$(CONFIG)/chttp2_status_conversion_test
 chttp2_stream_map_test: $(BINDIR)/$(CONFIG)/chttp2_stream_map_test
 chttp2_varint_test: $(BINDIR)/$(CONFIG)/chttp2_varint_test
 client_fuzzer: $(BINDIR)/$(CONFIG)/client_fuzzer
+combiner_test: $(BINDIR)/$(CONFIG)/combiner_test
 compression_test: $(BINDIR)/$(CONFIG)/compression_test
 concurrent_connectivity_test: $(BINDIR)/$(CONFIG)/concurrent_connectivity_test
 dns_resolver_connectivity_test: $(BINDIR)/$(CONFIG)/dns_resolver_connectivity_test
@ -1199,7 +1199,6 @@ buildtests_c: privatelibs_c \
  $(BINDIR)/$(CONFIG)/algorithm_test \
  $(BINDIR)/$(CONFIG)/alloc_test \
  $(BINDIR)/$(CONFIG)/alpn_test \
-  $(BINDIR)/$(CONFIG)/async_execution_lock_test \
  $(BINDIR)/$(CONFIG)/bad_server_response_test \
  $(BINDIR)/$(CONFIG)/bin_decoder_test \
  $(BINDIR)/$(CONFIG)/bin_encoder_test \
@ -1209,6 +1208,7 @@ buildtests_c: privatelibs_c \
  $(BINDIR)/$(CONFIG)/chttp2_status_conversion_test \
  $(BINDIR)/$(CONFIG)/chttp2_stream_map_test \
  $(BINDIR)/$(CONFIG)/chttp2_varint_test \
+  $(BINDIR)/$(CONFIG)/combiner_test \
  $(BINDIR)/$(CONFIG)/compression_test \
  $(BINDIR)/$(CONFIG)/concurrent_connectivity_test \
  $(BINDIR)/$(CONFIG)/dns_resolver_connectivity_test \
@ -1500,8 +1500,6 @@ test_c: buildtests_c
 	$(Q) $(BINDIR)/$(CONFIG)/alloc_test || ( echo test alloc_test failed ; exit 1 )
 	$(E) "[RUN]     Testing alpn_test"
 	$(Q) $(BINDIR)/$(CONFIG)/alpn_test || ( echo test alpn_test failed ; exit 1 )
-	$(E) "[RUN]     Testing async_execution_lock_test"
-	$(Q) $(BINDIR)/$(CONFIG)/async_execution_lock_test || ( echo test async_execution_lock_test failed ; exit 1 )
 	$(E) "[RUN]     Testing bad_server_response_test"
 	$(Q) $(BINDIR)/$(CONFIG)/bad_server_response_test || ( echo test bad_server_response_test failed ; exit 1 )
 	$(E) "[RUN]     Testing bin_decoder_test"
@ -1520,6 +1518,8 @@ test_c: buildtests_c
 	$(Q) $(BINDIR)/$(CONFIG)/chttp2_stream_map_test || ( echo test chttp2_stream_map_test failed ; exit 1 )
 	$(E) "[RUN]     Testing chttp2_varint_test"
 	$(Q) $(BINDIR)/$(CONFIG)/chttp2_varint_test || ( echo test chttp2_varint_test failed ; exit 1 )
+	$(E) "[RUN]     Testing combiner_test"
+	$(Q) $(BINDIR)/$(CONFIG)/combiner_test || ( echo test combiner_test failed ; exit 1 )
 	$(E) "[RUN]     Testing compression_test"
 	$(Q) $(BINDIR)/$(CONFIG)/compression_test || ( echo test compression_test failed ; exit 1 )
 	$(E) "[RUN]     Testing concurrent_connectivity_test"
@ -2492,8 +2492,8 @@ LIBGRPC_SRC = \
    src/core/lib/http/format_request.c \
    src/core/lib/http/httpcli.c \
    src/core/lib/http/parser.c \
-    src/core/lib/iomgr/async_execution_lock.c \
    src/core/lib/iomgr/closure.c \
+    src/core/lib/iomgr/combiner.c \
    src/core/lib/iomgr/endpoint.c \
    src/core/lib/iomgr/endpoint_pair_posix.c \
    src/core/lib/iomgr/endpoint_pair_windows.c \
@ -2765,8 +2765,8 @@ LIBGRPC_CRONET_SRC = \
    src/core/lib/http/format_request.c \
    src/core/lib/http/httpcli.c \
    src/core/lib/http/parser.c \
-    src/core/lib/iomgr/async_execution_lock.c \
    src/core/lib/iomgr/closure.c \
+    src/core/lib/iomgr/combiner.c \
    src/core/lib/iomgr/endpoint.c \
    src/core/lib/iomgr/endpoint_pair_posix.c \
    src/core/lib/iomgr/endpoint_pair_windows.c \
@ -3107,8 +3107,8 @@ LIBGRPC_UNSECURE_SRC = \
    src/core/lib/http/format_request.c \
    src/core/lib/http/httpcli.c \
    src/core/lib/http/parser.c \
-    src/core/lib/iomgr/async_execution_lock.c \
    src/core/lib/iomgr/closure.c \
+    src/core/lib/iomgr/combiner.c \
    src/core/lib/iomgr/endpoint.c \
    src/core/lib/iomgr/endpoint_pair_posix.c \
    src/core/lib/iomgr/endpoint_pair_windows.c \
@ -3442,8 +3442,8 @@ LIBGRPC++_SRC = \
    src/core/lib/http/format_request.c \
    src/core/lib/http/httpcli.c \
    src/core/lib/http/parser.c \
-    src/core/lib/iomgr/async_execution_lock.c \
    src/core/lib/iomgr/closure.c \
+    src/core/lib/iomgr/combiner.c \
    src/core/lib/iomgr/endpoint.c \
    src/core/lib/iomgr/endpoint_pair_posix.c \
    src/core/lib/iomgr/endpoint_pair_windows.c \
@ -4054,8 +4054,8 @@ LIBGRPC++_UNSECURE_SRC = \
    src/core/lib/http/format_request.c \
    src/core/lib/http/httpcli.c \
    src/core/lib/http/parser.c \
-    src/core/lib/iomgr/async_execution_lock.c \
    src/core/lib/iomgr/closure.c \
+    src/core/lib/iomgr/combiner.c \
    src/core/lib/iomgr/endpoint.c \
    src/core/lib/iomgr/endpoint_pair_posix.c \
    src/core/lib/iomgr/endpoint_pair_windows.c \
@ -6849,38 +6849,6 @@ endif
 endif


-ASYNC_EXECUTION_LOCK_TEST_SRC = \
-    test/core/iomgr/async_execution_lock_test.c \
-
-ASYNC_EXECUTION_LOCK_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(ASYNC_EXECUTION_LOCK_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/async_execution_lock_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/async_execution_lock_test: $(ASYNC_EXECUTION_LOCK_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(ASYNC_EXECUTION_LOCK_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/async_execution_lock_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/iomgr/async_execution_lock_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_async_execution_lock_test: $(ASYNC_EXECUTION_LOCK_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
-include $(ASYNC_EXECUTION_LOCK_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
 BAD_SERVER_RESPONSE_TEST_SRC = \
    test/core/end2end/bad_server_response_test.c \

@ -7201,6 +7169,38 @@ endif
 endif


+COMBINER_TEST_SRC = \
+    test/core/iomgr/combiner_test.c \
+
+COMBINER_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(COMBINER_TEST_SRC))))
+ifeq ($(NO_SECURE),true)
+
+# You can't build secure targets if you don't have OpenSSL.
+
+$(BINDIR)/$(CONFIG)/combiner_test: openssl_dep_error
+
+else
+
+
+
+$(BINDIR)/$(CONFIG)/combiner_test: $(COMBINER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
+	$(E) "[LD]      Linking $@"
+	$(Q) mkdir -p `dirname $@`
+	$(Q) $(LD) $(LDFLAGS) $(COMBINER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/combiner_test
+
+endif
+
+$(OBJDIR)/$(CONFIG)/test/core/iomgr/combiner_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
+
+deps_combiner_test: $(COMBINER_TEST_OBJS:.o=.dep)
+
+ifneq ($(NO_SECURE),true)
+ifneq ($(NO_DEPS),true)
+-include $(COMBINER_TEST_OBJS:.o=.dep)
+endif
+endif
+
+
 COMPRESSION_TEST_SRC = \
    test/core/compression/compression_test.c \

--- a/binding.gyp
+++ b/binding.gyp
@ -577,8 +577,8 @@
        'src/core/lib/http/format_request.c',
        'src/core/lib/http/httpcli.c',
        'src/core/lib/http/parser.c',
-        'src/core/lib/iomgr/async_execution_lock.c',
        'src/core/lib/iomgr/closure.c',
+        'src/core/lib/iomgr/combiner.c',
        'src/core/lib/iomgr/endpoint.c',
        'src/core/lib/iomgr/endpoint_pair_posix.c',
        'src/core/lib/iomgr/endpoint_pair_windows.c',
--- a/build.yaml
+++ b/build.yaml
@ -166,8 +166,8 @@ filegroups:
  - src/core/lib/http/format_request.h
  - src/core/lib/http/httpcli.h
  - src/core/lib/http/parser.h
-  - src/core/lib/iomgr/async_execution_lock.h
  - src/core/lib/iomgr/closure.h
+  - src/core/lib/iomgr/combiner.h
  - src/core/lib/iomgr/endpoint.h
  - src/core/lib/iomgr/endpoint_pair.h
  - src/core/lib/iomgr/error.h
@ -245,8 +245,8 @@ filegroups:
  - src/core/lib/http/format_request.c
  - src/core/lib/http/httpcli.c
  - src/core/lib/http/parser.c
-  - src/core/lib/iomgr/async_execution_lock.c
  - src/core/lib/iomgr/closure.c
+  - src/core/lib/iomgr/combiner.c
  - src/core/lib/iomgr/endpoint.c
  - src/core/lib/iomgr/endpoint_pair_posix.c
  - src/core/lib/iomgr/endpoint_pair_windows.c
@ -1246,17 +1246,6 @@ targets:
  - test/core/end2end/fuzzers/api_fuzzer_corpus
  dict: test/core/end2end/fuzzers/api_fuzzer.dictionary
  maxlen: 2048
- name: async_execution_lock_test
-  cpu_cost: 30
-  build: test
-  language: c
-  src:
-  - test/core/iomgr/async_execution_lock_test.c
-  deps:
-  - grpc_test_util
-  - grpc
-  - gpr_test_util
-  - gpr
 - name: bad_server_response_test
  build: test
  language: c
@ -1358,6 +1347,17 @@ targets:
  - test/core/end2end/fuzzers/client_fuzzer_corpus
  dict: test/core/end2end/fuzzers/hpack.dictionary
  maxlen: 2048
+- name: combiner_test
+  cpu_cost: 30
+  build: test
+  language: c
+  src:
+  - test/core/iomgr/combiner_test.c
+  deps:
+  - grpc_test_util
+  - grpc
+  - gpr_test_util
+  - gpr
 - name: compression_test
  build: test
  language: c
--- a/config.m4
+++ b/config.m4
@ -96,8 +96,8 @@ if test "$PHP_GRPC" != "no"; then
    src/core/lib/http/format_request.c \
    src/core/lib/http/httpcli.c \
    src/core/lib/http/parser.c \
-    src/core/lib/iomgr/async_execution_lock.c \
    src/core/lib/iomgr/closure.c \
+    src/core/lib/iomgr/combiner.c \
    src/core/lib/iomgr/endpoint.c \
    src/core/lib/iomgr/endpoint_pair_posix.c \
    src/core/lib/iomgr/endpoint_pair_windows.c \
--- a/gRPC.podspec
+++ b/gRPC.podspec
@ -178,8 +178,8 @@ Pod::Spec.new do |s|
                      'src/core/lib/http/format_request.h',
                      'src/core/lib/http/httpcli.h',
                      'src/core/lib/http/parser.h',
-                      'src/core/lib/iomgr/async_execution_lock.h',
                      'src/core/lib/iomgr/closure.h',
+                      'src/core/lib/iomgr/combiner.h',
                      'src/core/lib/iomgr/endpoint.h',
                      'src/core/lib/iomgr/endpoint_pair.h',
                      'src/core/lib/iomgr/error.h',
@ -364,8 +364,8 @@ Pod::Spec.new do |s|
                      'src/core/lib/http/format_request.c',
                      'src/core/lib/http/httpcli.c',
                      'src/core/lib/http/parser.c',
-                      'src/core/lib/iomgr/async_execution_lock.c',
                      'src/core/lib/iomgr/closure.c',
+                      'src/core/lib/iomgr/combiner.c',
                      'src/core/lib/iomgr/endpoint.c',
                      'src/core/lib/iomgr/endpoint_pair_posix.c',
                      'src/core/lib/iomgr/endpoint_pair_windows.c',
@ -564,8 +564,8 @@ Pod::Spec.new do |s|
                              'src/core/lib/http/format_request.h',
                              'src/core/lib/http/httpcli.h',
                              'src/core/lib/http/parser.h',
-                              'src/core/lib/iomgr/async_execution_lock.h',
                              'src/core/lib/iomgr/closure.h',
+                              'src/core/lib/iomgr/combiner.h',
                              'src/core/lib/iomgr/endpoint.h',
                              'src/core/lib/iomgr/endpoint_pair.h',
                              'src/core/lib/iomgr/error.h',
--- a/grpc.gemspec
+++ b/grpc.gemspec
@ -187,8 +187,8 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/http/format_request.h )
  s.files += %w( src/core/lib/http/httpcli.h )
  s.files += %w( src/core/lib/http/parser.h )
-  s.files += %w( src/core/lib/iomgr/async_execution_lock.h )
  s.files += %w( src/core/lib/iomgr/closure.h )
+  s.files += %w( src/core/lib/iomgr/combiner.h )
  s.files += %w( src/core/lib/iomgr/endpoint.h )
  s.files += %w( src/core/lib/iomgr/endpoint_pair.h )
  s.files += %w( src/core/lib/iomgr/error.h )
@ -343,8 +343,8 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/http/format_request.c )
  s.files += %w( src/core/lib/http/httpcli.c )
  s.files += %w( src/core/lib/http/parser.c )
-  s.files += %w( src/core/lib/iomgr/async_execution_lock.c )
  s.files += %w( src/core/lib/iomgr/closure.c )
+  s.files += %w( src/core/lib/iomgr/combiner.c )
  s.files += %w( src/core/lib/iomgr/endpoint.c )
  s.files += %w( src/core/lib/iomgr/endpoint_pair_posix.c )
  s.files += %w( src/core/lib/iomgr/endpoint_pair_windows.c )
--- a/package.xml
+++ b/package.xml
@ -194,8 +194,8 @@
    <file baseinstalldir="/" name="src/core/lib/http/format_request.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/http/httpcli.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/http/parser.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/iomgr/async_execution_lock.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/closure.h" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/iomgr/combiner.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/endpoint.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/endpoint_pair.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/error.h" role="src" />
@ -350,8 +350,8 @@
    <file baseinstalldir="/" name="src/core/lib/http/format_request.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/http/httpcli.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/http/parser.c" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/iomgr/async_execution_lock.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/closure.c" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/iomgr/combiner.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/endpoint.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/endpoint_pair_posix.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/endpoint_pair_windows.c" role="src" />
--- a/src/core/lib/iomgr/closure.h
+++ b/src/core/lib/iomgr/closure.h
@ -37,6 +37,7 @@
 #include <grpc/support/port_platform.h>
 #include <stdbool.h>
 #include "src/core/lib/iomgr/error.h"
+#include "src/core/lib/support/mpscq.h"

 struct grpc_closure;
 typedef struct grpc_closure grpc_closure;
@ -60,6 +61,14 @@ typedef void (*grpc_iomgr_cb_func)(grpc_exec_ctx *exec_ctx, void *arg,

 /** A closure over a grpc_iomgr_cb_func. */
 struct grpc_closure {
+  /** Once queued, next indicates the next queued closure; before then, scratch
+   *  space */
+  union {
+    grpc_closure *next;
+    gpr_mpscq_node atm_next;
+    uintptr_t scratch;
+  } next_data;
+
  /** Bound callback. */
  grpc_iomgr_cb_func cb;

@ -68,13 +77,6 @@ struct grpc_closure {

  /** Once queued, the result of the closure. Before then: scratch space */
  grpc_error *error;
-
-  /** Once queued, next indicates the next queued closure; before then, scratch
-   *  space */
-  union {
-    grpc_closure *next;
-    uintptr_t scratch;
-  } next_data;
 };

 /** Initializes \a closure with \a cb and \a cb_arg. */
--- a/src/core/lib/iomgr/async_execution_lock.c
+++ b/src/core/lib/iomgr/async_execution_lock.c
@ -31,20 +31,14 @@
 *
 */

-#include "src/core/lib/iomgr/async_execution_lock.h"
+#include "src/core/lib/iomgr/combiner.h"

 #include <string.h>

 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>

-typedef struct grpc_aelock_qnode {
-  gpr_mpscq_node mpscq_node;
-  grpc_aelock_action action;
-  void *arg;
-} grpc_aelock_qnode;
-
-struct grpc_aelock {
+struct grpc_combiner {
  grpc_workqueue *optional_workqueue;
  gpr_mpscq queue;
  // state is:
@ -55,10 +49,10 @@ struct grpc_aelock {
 };

 static void continue_finishing(grpc_exec_ctx *exec_ctx, void *arg,
-                               bool success);
+                               grpc_error *error);

-grpc_aelock *grpc_aelock_create(grpc_workqueue *optional_workqueue) {
-  grpc_aelock *lock = gpr_malloc(sizeof(*lock));
+grpc_combiner *grpc_combiner_create(grpc_workqueue *optional_workqueue) {
+  grpc_combiner *lock = gpr_malloc(sizeof(*lock));
  lock->optional_workqueue = optional_workqueue;
  gpr_atm_no_barrier_store(&lock->state, 1);
  gpr_mpscq_init(&lock->queue);
@ -66,34 +60,35 @@ grpc_aelock *grpc_aelock_create(grpc_workqueue *optional_workqueue) {
  return lock;
 }

-static void really_destroy(grpc_aelock *lock) {
+static void really_destroy(grpc_combiner *lock) {
  GPR_ASSERT(gpr_atm_no_barrier_load(&lock->state) == 0);
  gpr_mpscq_destroy(&lock->queue);
  gpr_free(lock);
 }

-void grpc_aelock_destroy(grpc_aelock *lock) {
+void grpc_combiner_destroy(grpc_combiner *lock) {
  if (gpr_atm_full_fetch_add(&lock->state, -1) == 1) {
    really_destroy(lock);
  }
 }

-static bool maybe_finish_one(grpc_exec_ctx *exec_ctx, grpc_aelock *lock) {
+static bool maybe_finish_one(grpc_exec_ctx *exec_ctx, grpc_combiner *lock) {
  gpr_mpscq_node *n = gpr_mpscq_pop(&lock->queue);
  if (n == NULL) {
    // queue is in an inconsistant state: use this as a cue that we should
    // go off and do something else for a while (and come back later)
-    grpc_exec_ctx_enqueue(exec_ctx, &lock->continue_finishing, true,
-                          lock->optional_workqueue);
+    grpc_exec_ctx_sched(exec_ctx, &lock->continue_finishing, GRPC_ERROR_NONE,
+                        lock->optional_workqueue);
    return false;
  }
-  grpc_aelock_qnode *ln = (grpc_aelock_qnode *)n;
-  ln->action(exec_ctx, ln->arg);
-  gpr_free(ln);
+  grpc_closure *cl = (grpc_closure *)n;
+  grpc_error *error = cl->error;
+  cl->cb(exec_ctx, cl->cb_arg, error);
+  GRPC_ERROR_UNREF(error);
  return true;
 }

-static void finish(grpc_exec_ctx *exec_ctx, grpc_aelock *lock) {
+static void finish(grpc_exec_ctx *exec_ctx, grpc_combiner *lock) {
  do {
    switch (gpr_atm_full_fetch_add(&lock->state, -2)) {
      case 3:  // had one count, one unorphaned --> unlocked unorphaned
@ -111,27 +106,20 @@ static void finish(grpc_exec_ctx *exec_ctx, grpc_aelock *lock) {
 }

 static void continue_finishing(grpc_exec_ctx *exec_ctx, void *arg,
-                               bool success) {
+                               grpc_error *error) {
  if (maybe_finish_one(exec_ctx, arg)) finish(exec_ctx, arg);
 }

-void grpc_aelock_execute(grpc_exec_ctx *exec_ctx, grpc_aelock *lock,
-                         grpc_aelock_action action, void *arg,
-                         size_t sizeof_arg) {
+void grpc_combiner_execute(grpc_exec_ctx *exec_ctx, grpc_combiner *lock,
+                           grpc_closure *cl, grpc_error *error) {
  gpr_atm last = gpr_atm_full_fetch_add(&lock->state, 2);
  GPR_ASSERT(last & 1);  // ensure lock has not been destroyed
  if (last == 1) {
-    action(exec_ctx, arg);
+    cl->cb(exec_ctx, cl->cb_arg, error);
+    GRPC_ERROR_UNREF(error);
    finish(exec_ctx, lock);
  } else {
-    grpc_aelock_qnode *n = gpr_malloc(sizeof(*n) + sizeof_arg);
-    n->action = action;
-    if (sizeof_arg > 0) {
-      memcpy(n + 1, arg, sizeof_arg);
-      n->arg = n + 1;
-    } else {
-      n->arg = arg;
-    }
-    gpr_mpscq_push(&lock->queue, &n->mpscq_node);
+    cl->error = error;
+    gpr_mpscq_push(&lock->queue, &cl->next_data.atm_next);
  }
 }
--- a/src/core/lib/iomgr/async_execution_lock.h
+++ b/src/core/lib/iomgr/async_execution_lock.h
@ -40,24 +40,21 @@
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/support/mpscq.h"

-typedef struct grpc_aelock grpc_aelock;
+typedef struct grpc_combiner grpc_combiner;

 // Provides serialized access to some resource.
 // Each action queued on an aelock is executed serially in a borrowed thread.
 // The actual thread executing actions may change over time (but there will only
 // every be one at a time).

-typedef void (*grpc_aelock_action)(grpc_exec_ctx *exec_ctx, void *arg);
-
 // Initialize the lock, with an optional workqueue to shift load to when
 // necessary
-grpc_aelock *grpc_aelock_create(grpc_workqueue *optional_workqueue);
+grpc_combiner *grpc_combiner_create(grpc_workqueue *optional_workqueue);
 // Destroy the lock
-void grpc_aelock_destroy(grpc_aelock *lock);
+void grpc_combiner_destroy(grpc_combiner *lock);
 // Execute \a action within the lock. \a arg is the argument to pass to \a
 // action and sizeof_arg is the sizeof(*arg), or 0 if arg is non-copyable.
-void grpc_aelock_execute(grpc_exec_ctx *exec_ctx, grpc_aelock *lock,
-                         grpc_aelock_action action, void *arg,
-                         size_t sizeof_arg);
+void grpc_combiner_execute(grpc_exec_ctx *exec_ctx, grpc_combiner *lock,
+                           grpc_closure *closure, grpc_error *error);

 #endif /* GRPC_CORE_LIB_IOMGR_ASYNC_EXECUTION_LOCK_H */
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@ -90,8 +90,8 @@ CORE_SOURCE_FILES = [
  'src/core/lib/http/format_request.c',
  'src/core/lib/http/httpcli.c',
  'src/core/lib/http/parser.c',
-  'src/core/lib/iomgr/async_execution_lock.c',
  'src/core/lib/iomgr/closure.c',
+  'src/core/lib/iomgr/combiner.c',
  'src/core/lib/iomgr/endpoint.c',
  'src/core/lib/iomgr/endpoint_pair_posix.c',
  'src/core/lib/iomgr/endpoint_pair_windows.c',
--- a/test/core/iomgr/async_execution_lock_test.c
+++ b/test/core/iomgr/async_execution_lock_test.c
@ -31,7 +31,7 @@
 *
 */

-#include "src/core/lib/iomgr/async_execution_lock.h"
+#include "src/core/lib/iomgr/combiner.h"

 #include <grpc/grpc.h>
 #include <grpc/support/log.h>
@ -42,28 +42,31 @@

 static void test_no_op(void) {
  gpr_log(GPR_DEBUG, "test_no_op");
-  grpc_aelock_destroy(grpc_aelock_create(NULL));
+  grpc_combiner_destroy(grpc_combiner_create(NULL));
 }

-static void set_bool_to_true(grpc_exec_ctx *exec_ctx, void *value) {
+static void set_bool_to_true(grpc_exec_ctx *exec_ctx, void *value,
+                             grpc_error *error) {
  *(bool *)value = true;
 }

 static void test_execute_one(void) {
  gpr_log(GPR_DEBUG, "test_execute_one");

-  grpc_aelock *lock = grpc_aelock_create(NULL);
+  grpc_combiner *lock = grpc_combiner_create(NULL);
  bool done = false;
  grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
-  grpc_aelock_execute(&exec_ctx, lock, set_bool_to_true, &done, 0);
+  grpc_combiner_execute(&exec_ctx, lock,
+                        grpc_closure_create(set_bool_to_true, &done),
+                        GRPC_ERROR_NONE);
  grpc_exec_ctx_finish(&exec_ctx);
  GPR_ASSERT(done);
-  grpc_aelock_destroy(lock);
+  grpc_combiner_destroy(lock);
 }

 typedef struct {
  size_t ctr;
-  grpc_aelock *lock;
+  grpc_combiner *lock;
 } thd_args;

 typedef struct {
@ -71,7 +74,7 @@ typedef struct {
  size_t value;
 } ex_args;

-static void check_one(grpc_exec_ctx *exec_ctx, void *a) {
+static void check_one(grpc_exec_ctx *exec_ctx, void *a, grpc_error *error) {
  ex_args *args = a;
  // gpr_log(GPR_DEBUG, "*%p=%d; step %d", args->ctr, *args->ctr, args->value);
  GPR_ASSERT(*args->ctr == args->value - 1);
@ -85,7 +88,9 @@ static void execute_many_loop(void *a) {
  for (size_t i = 0; i < 10; i++) {
    for (size_t j = 0; j < 10000; j++) {
      ex_args c = {&args->ctr, n++};
-      grpc_aelock_execute(&exec_ctx, args->lock, check_one, &c, sizeof(c));
+      grpc_combiner_execute(&exec_ctx, args->lock,
+                            grpc_closure_create(check_one, &c),
+                            GRPC_ERROR_NONE);
      grpc_exec_ctx_flush(&exec_ctx);
    }
    gpr_sleep_until(GRPC_TIMEOUT_MILLIS_TO_DEADLINE(100));
@ -96,7 +101,7 @@ static void execute_many_loop(void *a) {
 static void test_execute_many(void) {
  gpr_log(GPR_DEBUG, "test_execute_many");

-  grpc_aelock *lock = grpc_aelock_create(NULL);
+  grpc_combiner *lock = grpc_combiner_create(NULL);
  gpr_thd_id thds[100];
  thd_args ta[GPR_ARRAY_SIZE(thds)];
  for (size_t i = 0; i < GPR_ARRAY_SIZE(thds); i++) {
@ -109,7 +114,7 @@ static void test_execute_many(void) {
  for (size_t i = 0; i < GPR_ARRAY_SIZE(thds); i++) {
    gpr_thd_join(thds[i]);
  }
-  grpc_aelock_destroy(lock);
+  grpc_combiner_destroy(lock);
 }

 int main(int argc, char **argv) {
--- a/test/core/support/mpscq_test.c
+++ b/test/core/support/mpscq_test.c
@ -109,7 +109,7 @@ static void test_mt(void) {
    if (tn->i == THREAD_ITERATIONS) num_done++;
    gpr_free(tn);
  }
-  gpr_log(GPR_DEBUG, "spins: %d", spins);
+  gpr_log(GPR_DEBUG, "spins: %" PRIdPTR, spins);
  for (size_t i = 0; i < GPR_ARRAY_SIZE(thds); i++) {
    gpr_thd_join(thds[i]);
  }
--- a/third_party/protobuf
+++ b/third_party/protobuf
@ -1 +1 @@
-Subproject commit d4d13a4349e4e59d67f311185ddcc1890d956d7a
+Subproject commit 3470b6895aa659b7559ed678e029a5338e535f14
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@ -887,8 +887,8 @@ src/core/lib/debug/trace.h \
 src/core/lib/http/format_request.h \
 src/core/lib/http/httpcli.h \
 src/core/lib/http/parser.h \
-src/core/lib/iomgr/async_execution_lock.h \
 src/core/lib/iomgr/closure.h \
+src/core/lib/iomgr/combiner.h \
 src/core/lib/iomgr/endpoint.h \
 src/core/lib/iomgr/endpoint_pair.h \
 src/core/lib/iomgr/error.h \
@ -1022,8 +1022,8 @@ src/core/lib/debug/trace.c \
 src/core/lib/http/format_request.c \
 src/core/lib/http/httpcli.c \
 src/core/lib/http/parser.c \
-src/core/lib/iomgr/async_execution_lock.c \
 src/core/lib/iomgr/closure.c \
+src/core/lib/iomgr/combiner.c \
 src/core/lib/iomgr/endpoint.c \
 src/core/lib/iomgr/endpoint_pair_posix.c \
 src/core/lib/iomgr/endpoint_pair_windows.c \
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@ -804,8 +804,8 @@ src/core/lib/debug/trace.h \
 src/core/lib/http/format_request.h \
 src/core/lib/http/httpcli.h \
 src/core/lib/http/parser.h \
-src/core/lib/iomgr/async_execution_lock.h \
 src/core/lib/iomgr/closure.h \
+src/core/lib/iomgr/combiner.h \
 src/core/lib/iomgr/endpoint.h \
 src/core/lib/iomgr/endpoint_pair.h \
 src/core/lib/iomgr/error.h \
@ -960,8 +960,8 @@ src/core/lib/debug/trace.c \
 src/core/lib/http/format_request.c \
 src/core/lib/http/httpcli.c \
 src/core/lib/http/parser.c \
-src/core/lib/iomgr/async_execution_lock.c \
 src/core/lib/iomgr/closure.c \
+src/core/lib/iomgr/combiner.c \
 src/core/lib/iomgr/endpoint.c \
 src/core/lib/iomgr/endpoint_pair_posix.c \
 src/core/lib/iomgr/endpoint_pair_windows.c \
--- a/tools/run_tests/sources_and_headers.json
+++ b/tools/run_tests/sources_and_headers.json
@ -79,22 +79,6 @@
    "third_party": false, 
    "type": "target"
  }, 
-  {
-    "deps": [
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "async_execution_lock_test", 
-    "src": [
-      "test/core/iomgr/async_execution_lock_test.c"
-    ], 
-    "third_party": false, 
-    "type": "target"
-  }, 
  {
    "deps": [
      "gpr", 
@ -252,6 +236,22 @@
    "third_party": false, 
    "type": "target"
  }, 
+  {
+    "deps": [
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "combiner_test", 
+    "src": [
+      "test/core/iomgr/combiner_test.c"
+    ], 
+    "third_party": false, 
+    "type": "target"
+  }, 
  {
    "deps": [
      "gpr", 
@ -5737,8 +5737,8 @@
      "src/core/lib/http/format_request.h", 
      "src/core/lib/http/httpcli.h", 
      "src/core/lib/http/parser.h", 
-      "src/core/lib/iomgr/async_execution_lock.h", 
      "src/core/lib/iomgr/closure.h", 
+      "src/core/lib/iomgr/combiner.h", 
      "src/core/lib/iomgr/endpoint.h", 
      "src/core/lib/iomgr/endpoint_pair.h", 
      "src/core/lib/iomgr/error.h", 
@ -5839,10 +5839,10 @@
      "src/core/lib/http/httpcli.h", 
      "src/core/lib/http/parser.c", 
      "src/core/lib/http/parser.h", 
-      "src/core/lib/iomgr/async_execution_lock.c", 
-      "src/core/lib/iomgr/async_execution_lock.h", 
      "src/core/lib/iomgr/closure.c", 
      "src/core/lib/iomgr/closure.h", 
+      "src/core/lib/iomgr/combiner.c", 
+      "src/core/lib/iomgr/combiner.h", 
      "src/core/lib/iomgr/endpoint.c", 
      "src/core/lib/iomgr/endpoint.h", 
      "src/core/lib/iomgr/endpoint_pair.h", 
--- a/tools/run_tests/tests.json
+++ b/tools/run_tests/tests.json
@ -93,12 +93,12 @@
      "posix", 
      "windows"
    ], 
-    "cpu_cost": 30, 
+    "cpu_cost": 1.0, 
    "exclude_configs": [], 
    "flaky": false, 
    "gtest": false, 
    "language": "c", 
-    "name": "async_execution_lock_test", 
+    "name": "bad_server_response_test", 
    "platforms": [
      "linux", 
      "mac", 
@ -119,7 +119,7 @@
    "flaky": false, 
    "gtest": false, 
    "language": "c", 
-    "name": "bad_server_response_test", 
+    "name": "bin_decoder_test", 
    "platforms": [
      "linux", 
      "mac", 
@ -140,7 +140,7 @@
    "flaky": false, 
    "gtest": false, 
    "language": "c", 
-    "name": "bin_decoder_test", 
+    "name": "bin_encoder_test", 
    "platforms": [
      "linux", 
      "mac", 
@ -161,7 +161,7 @@
    "flaky": false, 
    "gtest": false, 
    "language": "c", 
-    "name": "bin_encoder_test", 
+    "name": "census_context_test", 
    "platforms": [
      "linux", 
      "mac", 
@ -182,7 +182,7 @@
    "flaky": false, 
    "gtest": false, 
    "language": "c", 
-    "name": "census_context_test", 
+    "name": "channel_create_test", 
    "platforms": [
      "linux", 
      "mac", 
@ -203,7 +203,7 @@
    "flaky": false, 
    "gtest": false, 
    "language": "c", 
-    "name": "channel_create_test", 
+    "name": "chttp2_hpack_encoder_test", 
    "platforms": [
      "linux", 
      "mac", 
@ -224,7 +224,7 @@
    "flaky": false, 
    "gtest": false, 
    "language": "c", 
-    "name": "chttp2_hpack_encoder_test", 
+    "name": "chttp2_status_conversion_test", 
    "platforms": [
      "linux", 
      "mac", 
@ -245,7 +245,7 @@
    "flaky": false, 
    "gtest": false, 
    "language": "c", 
-    "name": "chttp2_status_conversion_test", 
+    "name": "chttp2_stream_map_test", 
    "platforms": [
      "linux", 
      "mac", 
@ -266,7 +266,7 @@
    "flaky": false, 
    "gtest": false, 
    "language": "c", 
-    "name": "chttp2_stream_map_test", 
+    "name": "chttp2_varint_test", 
    "platforms": [
      "linux", 
      "mac", 
@ -282,12 +282,12 @@
      "posix", 
      "windows"
    ], 
-    "cpu_cost": 1.0, 
+    "cpu_cost": 30, 
    "exclude_configs": [], 
    "flaky": false, 
    "gtest": false, 
    "language": "c", 
-    "name": "chttp2_varint_test", 
+    "name": "combiner_test", 
    "platforms": [
      "linux", 
      "mac", 
--- a/vsprojects/buildtests_c.sln
+++ b/vsprojects/buildtests_c.sln
@ -45,17 +45,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "alpn_test", "vcxproj\test\a
 		{B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} = {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "async_execution_lock_test", "vcxproj\test\async_execution_lock_test\async_execution_lock_test.vcxproj", "{5FC080AE-1FE8-2849-6481-E52ADBBC205C}"
-	ProjectSection(myProperties) = preProject
-        	lib = "False"
-	EndProjectSection
-	ProjectSection(ProjectDependencies) = postProject
-		{17BCAFC0-5FDC-4C94-AEB9-95F3E220614B} = {17BCAFC0-5FDC-4C94-AEB9-95F3E220614B}
-		{29D16885-7228-4C31-81ED-5F9187C7F2A9} = {29D16885-7228-4C31-81ED-5F9187C7F2A9}
-		{EAB0A629-17A9-44DB-B5FF-E91A721FE037} = {EAB0A629-17A9-44DB-B5FF-E91A721FE037}
-		{B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} = {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bad_client_test", "vcxproj\test/bad_client\bad_client_test\bad_client_test.vcxproj", "{BA67B418-B699-E41A-9CC4-0279C49481A5}"
 	ProjectSection(myProperties) = preProject
        	lib = "True"
@ -175,6 +164,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chttp2_varint_test", "vcxpr
 		{B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} = {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "combiner_test", "vcxproj\test\combiner_test\combiner_test.vcxproj", "{C237D1E4-8825-80BA-1FC3-5E147E53E96E}"
+	ProjectSection(myProperties) = preProject
+        	lib = "False"
+	EndProjectSection
+	ProjectSection(ProjectDependencies) = postProject
+		{17BCAFC0-5FDC-4C94-AEB9-95F3E220614B} = {17BCAFC0-5FDC-4C94-AEB9-95F3E220614B}
+		{29D16885-7228-4C31-81ED-5F9187C7F2A9} = {29D16885-7228-4C31-81ED-5F9187C7F2A9}
+		{EAB0A629-17A9-44DB-B5FF-E91A721FE037} = {EAB0A629-17A9-44DB-B5FF-E91A721FE037}
+		{B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} = {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792}
+	EndProjectSection
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "compression_test", "vcxproj\test\compression_test\compression_test.vcxproj", "{5AFE7D17-A4A7-D68E-4491-CBC852F9D2A0}"
 	ProjectSection(myProperties) = preProject
        	lib = "False"
@ -1523,22 +1523,6 @@ Global
 		{5BAAE7EA-A972-DD80-F190-29B9E3110BB3}.Release-DLL|Win32.Build.0 = Release|Win32
 		{5BAAE7EA-A972-DD80-F190-29B9E3110BB3}.Release-DLL|x64.ActiveCfg = Release|x64
 		{5BAAE7EA-A972-DD80-F190-29B9E3110BB3}.Release-DLL|x64.Build.0 = Release|x64
-		{5FC080AE-1FE8-2849-6481-E52ADBBC205C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5FC080AE-1FE8-2849-6481-E52ADBBC205C}.Debug|x64.ActiveCfg = Debug|x64
-		{5FC080AE-1FE8-2849-6481-E52ADBBC205C}.Release|Win32.ActiveCfg = Release|Win32
-		{5FC080AE-1FE8-2849-6481-E52ADBBC205C}.Release|x64.ActiveCfg = Release|x64
-		{5FC080AE-1FE8-2849-6481-E52ADBBC205C}.Debug|Win32.Build.0 = Debug|Win32
-		{5FC080AE-1FE8-2849-6481-E52ADBBC205C}.Debug|x64.Build.0 = Debug|x64
-		{5FC080AE-1FE8-2849-6481-E52ADBBC205C}.Release|Win32.Build.0 = Release|Win32
-		{5FC080AE-1FE8-2849-6481-E52ADBBC205C}.Release|x64.Build.0 = Release|x64
-		{5FC080AE-1FE8-2849-6481-E52ADBBC205C}.Debug-DLL|Win32.ActiveCfg = Debug|Win32
-		{5FC080AE-1FE8-2849-6481-E52ADBBC205C}.Debug-DLL|Win32.Build.0 = Debug|Win32
-		{5FC080AE-1FE8-2849-6481-E52ADBBC205C}.Debug-DLL|x64.ActiveCfg = Debug|x64
-		{5FC080AE-1FE8-2849-6481-E52ADBBC205C}.Debug-DLL|x64.Build.0 = Debug|x64
-		{5FC080AE-1FE8-2849-6481-E52ADBBC205C}.Release-DLL|Win32.ActiveCfg = Release|Win32
-		{5FC080AE-1FE8-2849-6481-E52ADBBC205C}.Release-DLL|Win32.Build.0 = Release|Win32
-		{5FC080AE-1FE8-2849-6481-E52ADBBC205C}.Release-DLL|x64.ActiveCfg = Release|x64
-		{5FC080AE-1FE8-2849-6481-E52ADBBC205C}.Release-DLL|x64.Build.0 = Release|x64
 		{BA67B418-B699-E41A-9CC4-0279C49481A5}.Debug|Win32.ActiveCfg = Debug|Win32
 		{BA67B418-B699-E41A-9CC4-0279C49481A5}.Debug|x64.ActiveCfg = Debug|x64
 		{BA67B418-B699-E41A-9CC4-0279C49481A5}.Release|Win32.ActiveCfg = Release|Win32
@ -1715,6 +1699,22 @@ Global
 		{6B29F634-1277-74B8-47F6-78756190BA7B}.Release-DLL|Win32.Build.0 = Release|Win32
 		{6B29F634-1277-74B8-47F6-78756190BA7B}.Release-DLL|x64.ActiveCfg = Release|x64
 		{6B29F634-1277-74B8-47F6-78756190BA7B}.Release-DLL|x64.Build.0 = Release|x64
+		{C237D1E4-8825-80BA-1FC3-5E147E53E96E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C237D1E4-8825-80BA-1FC3-5E147E53E96E}.Debug|x64.ActiveCfg = Debug|x64
+		{C237D1E4-8825-80BA-1FC3-5E147E53E96E}.Release|Win32.ActiveCfg = Release|Win32
+		{C237D1E4-8825-80BA-1FC3-5E147E53E96E}.Release|x64.ActiveCfg = Release|x64
+		{C237D1E4-8825-80BA-1FC3-5E147E53E96E}.Debug|Win32.Build.0 = Debug|Win32
+		{C237D1E4-8825-80BA-1FC3-5E147E53E96E}.Debug|x64.Build.0 = Debug|x64
+		{C237D1E4-8825-80BA-1FC3-5E147E53E96E}.Release|Win32.Build.0 = Release|Win32
+		{C237D1E4-8825-80BA-1FC3-5E147E53E96E}.Release|x64.Build.0 = Release|x64
+		{C237D1E4-8825-80BA-1FC3-5E147E53E96E}.Debug-DLL|Win32.ActiveCfg = Debug|Win32
+		{C237D1E4-8825-80BA-1FC3-5E147E53E96E}.Debug-DLL|Win32.Build.0 = Debug|Win32
+		{C237D1E4-8825-80BA-1FC3-5E147E53E96E}.Debug-DLL|x64.ActiveCfg = Debug|x64
+		{C237D1E4-8825-80BA-1FC3-5E147E53E96E}.Debug-DLL|x64.Build.0 = Debug|x64
+		{C237D1E4-8825-80BA-1FC3-5E147E53E96E}.Release-DLL|Win32.ActiveCfg = Release|Win32
+		{C237D1E4-8825-80BA-1FC3-5E147E53E96E}.Release-DLL|Win32.Build.0 = Release|Win32
+		{C237D1E4-8825-80BA-1FC3-5E147E53E96E}.Release-DLL|x64.ActiveCfg = Release|x64
+		{C237D1E4-8825-80BA-1FC3-5E147E53E96E}.Release-DLL|x64.Build.0 = Release|x64
 		{5AFE7D17-A4A7-D68E-4491-CBC852F9D2A0}.Debug|Win32.ActiveCfg = Debug|Win32
 		{5AFE7D17-A4A7-D68E-4491-CBC852F9D2A0}.Debug|x64.ActiveCfg = Debug|x64
 		{5AFE7D17-A4A7-D68E-4491-CBC852F9D2A0}.Release|Win32.ActiveCfg = Release|Win32
--- a/vsprojects/vcxproj/grpc++/grpc++.vcxproj
+++ b/vsprojects/vcxproj/grpc++/grpc++.vcxproj
@ -387,8 +387,8 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\http\format_request.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\http\httpcli.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\http\parser.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\async_execution_lock.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\closure.h" />
+    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\combiner.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\endpoint.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\endpoint_pair.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\error.h" />
@ -569,10 +569,10 @@
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\http\parser.c">
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\async_execution_lock.c">
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\closure.c">
    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\combiner.c">
+    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\endpoint.c">
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\endpoint_pair_posix.c">
--- a/vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters
@ -136,10 +136,10 @@
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\http\parser.c">
      <Filter>src\core\lib\http</Filter>
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\async_execution_lock.c">
+    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\closure.c">
      <Filter>src\core\lib\iomgr</Filter>
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\closure.c">
+    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\combiner.c">
      <Filter>src\core\lib\iomgr</Filter>
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\endpoint.c">
@ -836,10 +836,10 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\http\parser.h">
      <Filter>src\core\lib\http</Filter>
    </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\async_execution_lock.h">
+    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\closure.h">
      <Filter>src\core\lib\iomgr</Filter>
    </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\closure.h">
+    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\combiner.h">
      <Filter>src\core\lib\iomgr</Filter>
    </ClInclude>
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\endpoint.h">
--- a/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj
+++ b/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj
@ -383,8 +383,8 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\http\format_request.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\http\httpcli.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\http\parser.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\async_execution_lock.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\closure.h" />
+    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\combiner.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\endpoint.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\endpoint_pair.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\error.h" />
@ -555,10 +555,10 @@
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\http\parser.c">
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\async_execution_lock.c">
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\closure.c">
    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\combiner.c">
+    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\endpoint.c">
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\endpoint_pair_posix.c">
--- a/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj.filters
@ -121,10 +121,10 @@
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\http\parser.c">
      <Filter>src\core\lib\http</Filter>
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\async_execution_lock.c">
+    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\closure.c">
      <Filter>src\core\lib\iomgr</Filter>
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\closure.c">
+    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\combiner.c">
      <Filter>src\core\lib\iomgr</Filter>
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\endpoint.c">
@ -809,10 +809,10 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\http\parser.h">
      <Filter>src\core\lib\http</Filter>
    </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\async_execution_lock.h">
+    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\closure.h">
      <Filter>src\core\lib\iomgr</Filter>
    </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\closure.h">
+    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\combiner.h">
      <Filter>src\core\lib\iomgr</Filter>
    </ClInclude>
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\endpoint.h">
--- a/vsprojects/vcxproj/grpc/grpc.vcxproj
+++ b/vsprojects/vcxproj/grpc/grpc.vcxproj
@ -313,8 +313,8 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\http\format_request.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\http\httpcli.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\http\parser.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\async_execution_lock.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\closure.h" />
+    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\combiner.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\endpoint.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\endpoint_pair.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\error.h" />
@ -485,10 +485,10 @@
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\http\parser.c">
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\async_execution_lock.c">
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\closure.c">
    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\combiner.c">
+    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\endpoint.c">
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\endpoint_pair_posix.c">
--- a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters
@ -43,10 +43,10 @@
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\http\parser.c">
      <Filter>src\core\lib\http</Filter>
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\async_execution_lock.c">
+    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\closure.c">
      <Filter>src\core\lib\iomgr</Filter>
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\closure.c">
+    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\combiner.c">
      <Filter>src\core\lib\iomgr</Filter>
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\endpoint.c">
@ -698,10 +698,10 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\http\parser.h">
      <Filter>src\core\lib\http</Filter>
    </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\async_execution_lock.h">
+    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\closure.h">
      <Filter>src\core\lib\iomgr</Filter>
    </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\closure.h">
+    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\combiner.h">
      <Filter>src\core\lib\iomgr</Filter>
    </ClInclude>
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\endpoint.h">
--- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj
+++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj
@ -302,8 +302,8 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\http\format_request.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\http\httpcli.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\http\parser.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\async_execution_lock.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\closure.h" />
+    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\combiner.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\endpoint.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\endpoint_pair.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\error.h" />
@ -452,10 +452,10 @@
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\http\parser.c">
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\async_execution_lock.c">
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\closure.c">
    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\combiner.c">
+    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\endpoint.c">
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\endpoint_pair_posix.c">
--- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters
@ -46,10 +46,10 @@
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\http\parser.c">
      <Filter>src\core\lib\http</Filter>
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\async_execution_lock.c">
+    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\closure.c">
      <Filter>src\core\lib\iomgr</Filter>
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\closure.c">
+    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\combiner.c">
      <Filter>src\core\lib\iomgr</Filter>
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\endpoint.c">
@ -605,10 +605,10 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\http\parser.h">
      <Filter>src\core\lib\http</Filter>
    </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\async_execution_lock.h">
+    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\closure.h">
      <Filter>src\core\lib\iomgr</Filter>
    </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\closure.h">
+    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\combiner.h">
      <Filter>src\core\lib\iomgr</Filter>
    </ClInclude>
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\endpoint.h">
--- a/vsprojects/vcxproj/test/async_execution_lock_test/async_execution_lock_test.vcxproj
+++ b/vsprojects/vcxproj/test/async_execution_lock_test/async_execution_lock_test.vcxproj
@ -20,7 +20,7 @@
    </ProjectConfiguration>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{5FC080AE-1FE8-2849-6481-E52ADBBC205C}</ProjectGuid>
+    <ProjectGuid>{C237D1E4-8825-80BA-1FC3-5E147E53E96E}</ProjectGuid>
    <IgnoreWarnIntDirInTempDetected>true</IgnoreWarnIntDirInTempDetected>
    <IntDir>$(SolutionDir)IntDir\$(MSBuildProjectName)\</IntDir>
  </PropertyGroup>
@ -60,14 +60,14 @@
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
-    <TargetName>async_execution_lock_test</TargetName>
+    <TargetName>combiner_test</TargetName>
    <Linkage-grpc_dependencies_zlib>static</Linkage-grpc_dependencies_zlib>
    <Configuration-grpc_dependencies_zlib>Debug</Configuration-grpc_dependencies_zlib>
    <Linkage-grpc_dependencies_openssl>static</Linkage-grpc_dependencies_openssl>
    <Configuration-grpc_dependencies_openssl>Debug</Configuration-grpc_dependencies_openssl>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)'=='Release'">
-    <TargetName>async_execution_lock_test</TargetName>
+    <TargetName>combiner_test</TargetName>
    <Linkage-grpc_dependencies_zlib>static</Linkage-grpc_dependencies_zlib>
    <Configuration-grpc_dependencies_zlib>Release</Configuration-grpc_dependencies_zlib>
    <Linkage-grpc_dependencies_openssl>static</Linkage-grpc_dependencies_openssl>
@ -158,7 +158,7 @@
  </ItemDefinitionGroup>

  <ItemGroup>
-    <ClCompile Include="$(SolutionDir)\..\test\core\iomgr\async_execution_lock_test.c">
+    <ClCompile Include="$(SolutionDir)\..\test\core\iomgr\combiner_test.c">
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
--- a/vsprojects/vcxproj/test/async_execution_lock_test/async_execution_lock_test.vcxproj.filters
+++ b/vsprojects/vcxproj/test/async_execution_lock_test/async_execution_lock_test.vcxproj.filters
@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
-    <ClCompile Include="$(SolutionDir)\..\test\core\iomgr\async_execution_lock_test.c">
+    <ClCompile Include="$(SolutionDir)\..\test\core\iomgr\combiner_test.c">
      <Filter>test\core\iomgr</Filter>
    </ClCompile>
  </ItemGroup>

  <ItemGroup>
    <Filter Include="test">
-      <UniqueIdentifier>{1553c040-57a4-1c71-539f-06be026b4844}</UniqueIdentifier>
+      <UniqueIdentifier>{82bca2af-d499-b405-fd05-4d345372496c}</UniqueIdentifier>
    </Filter>
    <Filter Include="test\core">
-      <UniqueIdentifier>{112c4757-8861-21ed-d535-83c90a22e14b}</UniqueIdentifier>
+      <UniqueIdentifier>{c32d8e20-b719-532d-ba23-bd9d523fac15}</UniqueIdentifier>
    </Filter>
    <Filter Include="test\core\iomgr">
-      <UniqueIdentifier>{341d4313-1479-2a6a-8ba4-a44c4c15e0d7}</UniqueIdentifier>
+      <UniqueIdentifier>{b4fa8ca1-e6c7-dec5-6d62-8a62396825c6}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
 </Project>