From a5d557b96d873873e5f17d96ffca6088e3743af0 Mon Sep 17 00:00:00 2001
From: ncteisen <ncteisen@gmail.com>
Date: Wed, 5 Jul 2017 15:52:28 -0700
Subject: [PATCH] Rename function to avoud future clash
---
src/cpp/client/secure_credentials.cc | 2 +-
src/cpp/server/create_default_thread_pool.cc | 12 ++++--------
src/cpp/server/secure_server_credentials.h | 2 +-
src/cpp/server/thread_pool_interface.h | 2 +-
4 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/src/cpp/client/secure_credentials.cc b/src/cpp/client/secure_credentials.cc
index 0eefd0645b..057a058a3f 100644
--- a/src/cpp/client/secure_credentials.cc
+++ b/src/cpp/client/secure_credentials.cc
@@ -207,7 +207,7 @@ void MetadataCredentialsPluginWrapper::InvokePlugin(
MetadataCredentialsPluginWrapper::MetadataCredentialsPluginWrapper(
std::unique_ptr<MetadataCredentialsPlugin> plugin)
- : thread_pool_(CreateThreadPool()), plugin_(std::move(plugin)) {}
+ : thread_pool_(CreateDefaultThreadPool()), plugin_(std::move(plugin)) {}
std::shared_ptr<CallCredentials> MetadataCredentialsFromPlugin(
std::unique_ptr<MetadataCredentialsPlugin> plugin) {
diff --git a/src/cpp/server/create_default_thread_pool.cc b/src/cpp/server/create_default_thread_pool.cc
index bf76303b45..57faa17f6b 100644
--- a/src/cpp/server/create_default_thread_pool.cc
+++ b/src/cpp/server/create_default_thread_pool.cc
@@ -24,21 +24,17 @@
namespace grpc {
-static ThreadPoolInterface* CreateDefaultThreadPool() {
+static ThreadPoolInterface* CreateDefaultThreadPoolImpl() {
int cores = gpr_cpu_num_cores();
if (!cores) cores = 4;
return new DynamicThreadPool(cores);
}
-static CreateThreadPoolFunc g_ctp_impl = CreateDefaultThreadPool;
+static CreateThreadPoolFunc g_ctp_impl = CreateDefaultThreadPoolImpl;
-ThreadPoolInterface* CreateThreadPool() {
- return g_ctp_impl();
-}
+ThreadPoolInterface* CreateDefaultThreadPool() { return g_ctp_impl(); }
-void SetCreateThreadPool(CreateThreadPoolFunc func) {
- g_ctp_impl = func;
-}
+void SetCreateThreadPool(CreateThreadPoolFunc func) { g_ctp_impl = func; }
} // namespace grpc
diff --git a/src/cpp/server/secure_server_credentials.h b/src/cpp/server/secure_server_credentials.h
index 30ee1c7a36..212f0d1df3 100644
--- a/src/cpp/server/secure_server_credentials.h
+++ b/src/cpp/server/secure_server_credentials.h
@@ -39,7 +39,7 @@ class AuthMetadataProcessorAyncWrapper final {
AuthMetadataProcessorAyncWrapper(
const std::shared_ptr<AuthMetadataProcessor>& processor)
- : thread_pool_(CreateThreadPool()), processor_(processor) {}
+ : thread_pool_(CreateDefaultThreadPool()), processor_(processor) {}
private:
void InvokeProcessor(grpc_auth_context* context, const grpc_metadata* md,
diff --git a/src/cpp/server/thread_pool_interface.h b/src/cpp/server/thread_pool_interface.h
index 5a18298296..028842a776 100644
--- a/src/cpp/server/thread_pool_interface.h
+++ b/src/cpp/server/thread_pool_interface.h
@@ -36,7 +36,7 @@ class ThreadPoolInterface {
typedef ThreadPoolInterface* (*CreateThreadPoolFunc)(void);
void SetCreateThreadPool(CreateThreadPoolFunc func);
-ThreadPoolInterface* CreateThreadPool();
+ThreadPoolInterface* CreateDefaultThreadPool();
} // namespace grpc
--
GitLab