From 02069b48da048efbca2fb49d09108c4d5b62f027 Mon Sep 17 00:00:00 2001 From: = Date: Wed, 15 May 2019 23:33:07 -0700 Subject: [PATCH 1/3] Remove get-grpc.sh --- .../grpc_interop_aspnetcore/build_interop.sh.template | 2 -- .../interoptest/grpc_interop_aspnetcore/build_interop.sh | 2 -- 2 files changed, 4 deletions(-) diff --git a/templates/tools/dockerfile/interoptest/grpc_interop_aspnetcore/build_interop.sh.template b/templates/tools/dockerfile/interoptest/grpc_interop_aspnetcore/build_interop.sh.template index d64286ab03c..55ecfb30192 100644 --- a/templates/tools/dockerfile/interoptest/grpc_interop_aspnetcore/build_interop.sh.template +++ b/templates/tools/dockerfile/interoptest/grpc_interop_aspnetcore/build_interop.sh.template @@ -38,7 +38,5 @@ then ln -s $(pwd)/.dotnet/dotnet /usr/local/bin/dotnet fi - - ./build/get-grpc.sh dotnet build --configuration Debug Grpc.AspNetCore.sln diff --git a/tools/dockerfile/interoptest/grpc_interop_aspnetcore/build_interop.sh b/tools/dockerfile/interoptest/grpc_interop_aspnetcore/build_interop.sh index 65e848ded32..0b32638b54b 100644 --- a/tools/dockerfile/interoptest/grpc_interop_aspnetcore/build_interop.sh +++ b/tools/dockerfile/interoptest/grpc_interop_aspnetcore/build_interop.sh @@ -37,6 +37,4 @@ then ln -s $(pwd)/.dotnet/dotnet /usr/local/bin/dotnet fi -./build/get-grpc.sh - dotnet build --configuration Debug Grpc.AspNetCore.sln From 39be72a230d4a89c7441220780edf41a8a76bb95 Mon Sep 17 00:00:00 2001 From: Vijay Pai Date: Thu, 16 May 2019 08:46:45 -0700 Subject: [PATCH 2/3] Remove "class Channel" forward reference from generated code --- src/compiler/cpp_generator.cc | 1 - test/cpp/codegen/compiler_test_golden | 1 - 2 files changed, 2 deletions(-) diff --git a/src/compiler/cpp_generator.cc b/src/compiler/cpp_generator.cc index ecec3206577..3380aeb257b 100644 --- a/src/compiler/cpp_generator.cc +++ b/src/compiler/cpp_generator.cc @@ -160,7 +160,6 @@ grpc::string GetHeaderIncludes(grpc_generator::File* file, printer->Print(vars, "class MessageAllocator;\n"); printer->Print(vars, "} // namespace experimental\n"); printer->Print(vars, "class CompletionQueue;\n"); - printer->Print(vars, "class Channel;\n"); printer->Print(vars, "class ServerCompletionQueue;\n"); printer->Print(vars, "class ServerContext;\n"); printer->Print(vars, "} // namespace grpc\n\n"); diff --git a/test/cpp/codegen/compiler_test_golden b/test/cpp/codegen/compiler_test_golden index 9e99bc7b0a2..46efdf1603a 100644 --- a/test/cpp/codegen/compiler_test_golden +++ b/test/cpp/codegen/compiler_test_golden @@ -46,7 +46,6 @@ template class MessageAllocator; } // namespace experimental class CompletionQueue; -class Channel; class ServerCompletionQueue; class ServerContext; } // namespace grpc From 62b422c4ee5d5950c0febd4ef20e00ff4c897047 Mon Sep 17 00:00:00 2001 From: Vijay Pai Date: Thu, 16 May 2019 17:00:18 -0700 Subject: [PATCH 3/3] Grab a ref on fake resolver generator before scheduling a closure --- .../ext/filters/client_channel/resolver/fake/fake_resolver.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc b/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc index 85b9bea6f70..7f613ee21bc 100644 --- a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc +++ b/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc @@ -175,11 +175,13 @@ void FakeResolverResponseGenerator::SetResponseLocked(void* arg, resolver->next_result_ = std::move(closure_arg->result); resolver->has_next_result_ = true; resolver->MaybeSendResultLocked(); + closure_arg->generator->Unref(); Delete(closure_arg); } void FakeResolverResponseGenerator::SetResponse(Resolver::Result result) { if (resolver_ != nullptr) { + Ref().release(); // ref to be held by closure SetResponseClosureArg* closure_arg = New(); closure_arg->generator = this; closure_arg->result = std::move(result);