From 13c2f6e69d04804b4c1cba6380b54f6adb80cee0 Mon Sep 17 00:00:00 2001 From: David Garcia Quintas Date: Thu, 17 Mar 2016 22:51:52 -0700 Subject: Implemented compression level algorithms properly (as a function of the accepted algorithms by the call's peer. --- src/cpp/server/server_context.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/cpp') diff --git a/src/cpp/server/server_context.cc b/src/cpp/server/server_context.cc index eb49b21037..5d12ce2ecf 100644 --- a/src/cpp/server/server_context.cc +++ b/src/cpp/server/server_context.cc @@ -43,6 +43,7 @@ #include #include "src/core/channel/compress_filter.h" +#include "src/core/surface/call.h" #include "src/cpp/common/create_auth_context.h" namespace grpc { @@ -197,7 +198,7 @@ bool ServerContext::IsCancelled() const { void ServerContext::set_compression_level(grpc_compression_level level) { const grpc_compression_algorithm algorithm_for_level = - grpc_compression_algorithm_for_level(level); + grpc_call_compression_for_level(call_, level); set_compression_algorithm(algorithm_for_level); } -- cgit v1.2.3 From d85ef060644e315bd20c660a2efda6d7384e6376 Mon Sep 17 00:00:00 2001 From: Yuchen Zeng Date: Fri, 18 Mar 2016 11:05:25 -0700 Subject: Doc Fixit: src/cpp/README.md Replace liquid templates with relative links. --- src/cpp/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/cpp') diff --git a/src/cpp/README.md b/src/cpp/README.md index 83d37aa2ed..f2935e52d9 100644 --- a/src/cpp/README.md +++ b/src/cpp/README.md @@ -61,7 +61,7 @@ below. #Documentation You can find out how to build and run our simplest gRPC C++ example in our -[C++ quick start](https://github.com/grpc/grpc/tree/{{ site.data.config.grpc_release_branch }}/examples/cpp). +[C++ quick start](../../examples/cpp). For more detailed documentation on using gRPC in C++ , see our main documentation site at [grpc.io](http://grpc.io), specifically: @@ -79,4 +79,4 @@ documentation site at [grpc.io](http://grpc.io), specifically: # Examples Code examples for gRPC C++ live in this repository's -[examples/cpp](https://github.com/grpc/grpc/tree/{{ site.data.config.grpc_release_branch }}/examples/cpp) directory. +[examples/cpp](../../examples/cpp) directory. -- cgit v1.2.3 From 146070db8db189a62112ae0b84de5d12ffc02f3a Mon Sep 17 00:00:00 2001 From: David Garcia Quintas Date: Fri, 18 Mar 2016 15:53:28 -0700 Subject: fixed multiple initialization of globals --- include/grpc++/impl/grpc_library.h | 8 ++++++-- src/cpp/client/secure_credentials.cc | 3 +-- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'src/cpp') diff --git a/include/grpc++/impl/grpc_library.h b/include/grpc++/impl/grpc_library.h index d26f4a4cab..ecb5a4d64d 100644 --- a/include/grpc++/impl/grpc_library.h +++ b/include/grpc++/impl/grpc_library.h @@ -58,8 +58,12 @@ static CoreCodegen g_core_codegen; class GrpcLibraryInitializer GRPC_FINAL { public: GrpcLibraryInitializer() { - grpc::g_glip = &g_gli; - grpc::g_core_codegen_interface = &g_core_codegen; + if (grpc::g_glip == nullptr) { + grpc::g_glip = &g_gli; + } + if (grpc::g_core_codegen_interface == nullptr) { + grpc::g_core_codegen_interface = &g_core_codegen; + } } /// A no-op method to force the linker to reference this class, which will diff --git a/src/cpp/client/secure_credentials.cc b/src/cpp/client/secure_credentials.cc index 308455527c..c34b840f90 100644 --- a/src/cpp/client/secure_credentials.cc +++ b/src/cpp/client/secure_credentials.cc @@ -60,8 +60,7 @@ std::shared_ptr SecureChannelCredentials::CreateChannel( SecureCallCredentials::SecureCallCredentials(grpc_call_credentials* c_creds) : c_creds_(c_creds) { - internal::GrpcLibraryInitializer gli_initializer; - gli_initializer.summon(); + g_gli_initializer.summon(); } bool SecureCallCredentials::ApplyToCall(grpc_call* call) { -- cgit v1.2.3