health_check_using_rpc: wrap to StartHealthCheckWithDelayMS

src/brpc/details/health_check.cpp

@@ -27,6 +27,9 @@
 
 namespace brpc {
 
+// declared at socket.cpp
+extern SocketVarsCollector* g_vars;
+
 DEFINE_string(health_check_path, "", "Http path of health check call."
         "By default health check succeeds if the server is connectable."
         "If this flag is set, health check is not completed until a http "
@@ -154,20 +157,18 @@ void OnAppHealthCheckDone::Run() {
 
 class HealthCheckTask : public PeriodicTask {
 public:
-    explicit HealthCheckTask(SocketId id, SocketVarsCollector* nhealthcheck);
+    explicit HealthCheckTask(SocketId id);
     bool OnTriggeringTask(timespec* next_abstime) override;
     void OnDestroyingTask() override;
 
 private:
     SocketId _id;
     bool _first_time;
-    SocketVarsCollector* _collector;
 };
 
-HealthCheckTask::HealthCheckTask(SocketId id, SocketVarsCollector* collector)
+HealthCheckTask::HealthCheckTask(SocketId id)
     : _id(id)
-    , _first_time(true)
-    , _collector(collector) {}
+    , _first_time(true) {}
 
 bool HealthCheckTask::OnTriggeringTask(timespec* next_abstime) {
     SocketUniquePtr ptr;
@@ -203,7 +204,7 @@ bool HealthCheckTask::OnTriggeringTask(timespec* next_abstime) {
         }
     }
 
-    _collector->nhealthcheck << 1;
+    g_vars->nhealthcheck << 1;
     int hc = 0;
     if (ptr->_user) {
         hc = ptr->_user->CheckHealth(ptr.get());
@@ -212,7 +213,7 @@ bool HealthCheckTask::OnTriggeringTask(timespec* next_abstime) {
     }
     if (hc == 0) {
         if (ptr->CreatedByConnect()) {
-            _collector->channel_conn << -1;
+            g_vars->channel_conn << -1;
         }
         if (!FLAGS_health_check_path.empty()) {
             ptr->_ninflight_app_health_check.fetch_add(
@@ -237,8 +238,9 @@ void HealthCheckTask::OnDestroyingTask() {
     delete this;
 }
 
-PeriodicTask* NewHealthCheckTask(SocketId id, SocketVarsCollector* collector) {
-    return new HealthCheckTask(id, collector);
+void StartHealthCheckWithDelayMS(SocketId id, int64_t delay_ms) {
+    PeriodicTaskManager::StartTaskAt(new HealthCheckTask(id),
+            butil::milliseconds_from_now(delay_ms));
 }
 
 } // namespace brpc

src/brpc/details/health_check.h

@@ -25,7 +25,8 @@
 
 namespace brpc {
 
-PeriodicTask* NewHealthCheckTask(SocketId id, SocketVarsCollector* collector);
+// Start health check for socket id after delay_ms.
+void StartHealthCheckWithDelayMS(SocketId id, int64_t delay_ms);
 
 } // namespace brpc
 

src/brpc/socket.cpp

@@ -837,10 +837,8 @@ int Socket::SetFailed(int error_code, const char* error_fmt, ...) {
             // comes online.
             if (_health_check_interval_s > 0) {
                 GetOrNewSharedPart()->circuit_breaker.MarkAsBroken();
-                PeriodicTaskManager::StartTaskAt(
-                    NewHealthCheckTask(id(), g_vars),
-                    butil::milliseconds_from_now(GetOrNewSharedPart()->
-                        circuit_breaker.isolation_duration_ms()));
+                StartHealthCheckWithDelayMS(id(),
+                        GetOrNewSharedPart()->circuit_breaker.isolation_duration_ms());
             }
             // Wake up all threads waiting on EPOLLOUT when closing fd
             _epollout_butex->fetch_add(1, butil::memory_order_relaxed);