disable ticker thread if set custom time function

Author: lambdaliu

polaris/quota/quota_manager.cpp

@@ -78,7 +78,7 @@ ReturnCode QuotaManager::Init(Context* context, Config* config) {
 
   context_                 = context;
   ContextMode context_mode = context->GetContextMode();
-  if (context_mode != kLimitContext && context_mode != kShareContext) {
+  if (context_mode == kPrivateContext) {  // provider或consumer私有时不创建quota manger线程
     return kReturnOk;
   }
   bool is_enable = config->GetBoolOrDefault(kRateLimitEnableKey, kRateLimitEnableDefault);

polaris/utils/time_clock.cpp

@@ -14,8 +14,6 @@
 #include "utils/time_clock.h"
 
 #include <features.h>
-#include <google/protobuf/duration.pb.h>
-#include <google/protobuf/timestamp.pb.h>
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -112,7 +110,7 @@ void Time::TrySetUpClock() {
 #if !defined(POLARIS_DISABLE_TIME_TICKER)  // 不使用自定义时钟
   pthread_mutex_lock(&g_custom_clock_lock);
   g_custom_clock_ref_count++;
-  if (g_custom_clock_update_tid == 0) {            // 创建更新线程
+  if (g_custom_clock_update_tid == 0 && current_time_impl == clock_real_time) {  // 创建更新线程
     pthread_atfork(ForkPrepare, NULL, ForkChild);  // 注册Fork事件回调
     // 这里必须先初始化自定义时钟，线程启动后会立即替换
     timespec clock_time;

polaris/utils/time_clock.h

@@ -17,12 +17,8 @@
 #include <stdint.h>
 #include <time.h>
 
-namespace google {
-namespace protobuf {
-class Duration;
-class Timestamp;
-}  // namespace protobuf
-}  // namespace google
+#include <google/protobuf/duration.pb.h>
+#include <google/protobuf/timestamp.pb.h>
 
 namespace polaris {
 

test/plugin/local_registry/local_registry_test.cpp

@@ -372,6 +372,7 @@ TEST_F(InMemoryLocalRegistryTest, TestServiceExpire) {
   TestUtils::FakeNowIncrement(1);
   local_registry_->RemoveExpireServiceData(Time::GetCurrentTimeMs());
   ASSERT_TRUE(mock_server_connector_->saved_handler_ == NULL);
+  TestUtils::TearDownFakeTime();
 }
 
 TEST_F(InMemoryLocalRegistryTest, TestOldServiceDataGc) {
@@ -422,6 +423,7 @@ TEST_F(InMemoryLocalRegistryTest, TestOldServiceDataGc) {
   // 旧服务虽然被缓存删除并被释放，但更新前在使用，所以还需要再次释放
   ASSERT_EQ(init_service_data->DecrementAndGetRef(), 1);
   delete mock_server_connector_->saved_handler_;
+  TestUtils::TearDownFakeTime();
 }
 
 }  // namespace polaris

test/quota/quota_manager_test.cpp

@@ -28,8 +28,7 @@ namespace polaris {
 
 class QuotaManagerTest : public ::testing::Test {
   virtual void SetUp() {
-    context_ = TestContext::CreateContext(kLimitContext);
-    TestUtils::SetUpFakeTime();
+    context_ = TestContext::CreateContext();
     ASSERT_TRUE(context_ != NULL);
     service_key_.namespace_ = "test_namespace";
     service_key_.name_      = "test_name";
@@ -45,7 +44,6 @@ class QuotaManagerTest : public ::testing::Test {
       delete quota_manager_;
       quota_manager_ = NULL;
     }
-    TestUtils::TearDownFakeTime();
   }
 
 protected:
@@ -143,9 +141,6 @@ TEST_F(QuotaManagerTest, GetQuotaWithRule) {
 }
 
 TEST_F(QuotaManagerTest, PrepareQuotaInfo) {
-  delete context_;
-  context_ = TestContext::CreateContext();
-  ASSERT_TRUE(context_ != NULL);
   CreateQuotaManager(true);
 
   MockLocalRegistry *mock_local_registry = TestContext::SetupMockLocalRegistry(context_);

test/utils/time_clock_test.cpp

@@ -71,4 +71,12 @@ TEST_F(TimeClockTest, MultiThreadTest) {
   thread_list.clear();
 }
 
+TEST_F(TimeClockTest, CustomClockFunc) {
+  TestUtils::SetUpFakeTime();  // 设置自定义时间函数
+  Time::TrySetUpClock();
+  ASSERT_EQ(g_custom_clock_update_tid, 0);  // 自定义时间函数时不会启动内部时间线程
+  Time::TryShutdomClock();
+  TestUtils::TearDownFakeTime();
+}
+
 }  // namespace polaris