add suspend count to worker stats

project-tsurugi/tsurugi-issues#488
project-tsurugi · Dec 28, 2023 · e61ec8d · e61ec8d
1 parent 39e3b59
commit e61ec8d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/include/tateyama/task_scheduler/impl/worker.h b/include/tateyama/task_scheduler/impl/worker.h
@@ -58,7 +58,12 @@ struct cache_align worker_stat {
     /**
      * @brief the count of when worker gets up (from suspension) and executes at least one task
      */
-    std::size_t wakeup_{};
+    std::size_t wakeup_run_{};
+
+    /**
+     * @brief the count of worker suspends
+     */
+    std::size_t suspend_{};
 };
 
 /**
@@ -179,6 +184,7 @@ class cache_align worker {
             if(empty_work_count > cfg_->worker_try_count()) {
                 empty_work_count = 0;
                 ctx.busy_working(false);
+                ++stat_->suspend_;
                 ctx.thread()->suspend(std::chrono::microseconds{cfg_->worker_suspend_timeout()});
             }
         }
@@ -238,7 +244,7 @@ class cache_align worker {
 
     void execute_task(task& t, context& ctx) {
         if(! ctx.busy_working()) {
-            ++stat_->wakeup_;
+            ++stat_->wakeup_run_;
         }
         ctx.busy_working(true);
         try {

diff --git a/include/tateyama/task_scheduler/scheduler.h b/include/tateyama/task_scheduler/scheduler.h
@@ -15,6 +15,7 @@
  */
 #pragma once
 
+#include <chrono>
 #include <sched.h>
 
 #include <tateyama/logging.h>
@@ -37,6 +38,8 @@ namespace tateyama::task_scheduler {
 template <class T, class S = tateyama::task_scheduler::basic_conditional_task>
 class cache_align scheduler {
 public:
+    // clock used for stats
+    using clock = std::chrono::steady_clock;
 
     /**
      * @brief task type scheduled by this
@@ -221,6 +224,7 @@ class cache_align scheduler {
         if(watcher_thread_) {
             watcher_thread_->activate();
         }
+        started_at_ = clock::now();
         started_ = true;
     }
 
@@ -346,8 +350,10 @@ class cache_align scheduler {
      * @brief print worker stats
      */
     void print_worker_stats(std::ostream& os) {
+        auto duration_us = std::chrono::duration_cast<std::chrono::microseconds>(clock::now() - started_at_).count();
         auto count = contexts_.size();
         os << "{";
+        os << "\"duration_us\":" << duration_us << ",";
         os << "\"worker_count\":" << count << ",";
         os << "\"workers\":[";
         for(std::size_t i=0; i < count; ++i) {
@@ -360,7 +366,8 @@ class cache_align scheduler {
             os << "\"count\":" << stat.count_ << ",";
             os << "\"sticky\":" << stat.sticky_ << ",";
             os << "\"steal\":" << stat.steal_ << ",";
-            os << "\"wakeup\":" << stat.wakeup_;
+            os << "\"wakeup_run\":" << stat.wakeup_run_ << ",";
+            os << "\"suspend\":" << stat.suspend_;
             os << "}";
         }
         os << "]";
@@ -384,6 +391,7 @@ class cache_align scheduler {
     std::unique_ptr<impl::thread_control> watcher_thread_{};
     impl::conditional_worker_context conditional_worker_context_{};
     conditional_worker conditional_worker_{}; // stored for testing
+    clock::time_point started_at_{};
 
     void prepare() {
         auto sz = cfg_.thread_count();
@@ -420,7 +428,7 @@ class cache_align scheduler {
         auto ret = index++;
         return ret % mod;
     }
-    
+
     /**
      * @brief print queue diagnostics
      */