add tpp99

Author: wuxianrong

include/pika_cmd_table_manager.h

@@ -29,6 +29,23 @@ struct CommandStatistics {
   std::atomic<uint64_t> cmd_time_consuming = 0;
 };
 
+struct HistogramData {
+  std::shared_ptr<prometheus::Registry> registry;
+  prometheus::Family<prometheus::Histogram>* family;
+  std::unordered_map<std::string, prometheus::Histogram*> histograms;
+
+  HistogramData() {
+    registry = std::make_shared<prometheus::Registry>();
+    family = &prometheus::BuildHistogram()
+        .Name("pika_command_duration_seconds")
+        .Help("Execution time of Pika commands in seconds")
+        .Register(*registry);
+  }
+
+  HistogramData(const HistogramData&) = delete;
+  HistogramData& operator=(const HistogramData&) = delete;
+};
+
 class PikaCmdTableManager {
   friend AclSelector;
 
@@ -53,7 +70,7 @@ class PikaCmdTableManager {
   void UpdateSlowCommandCount(const std::string& opt);
   void ResetCommandCount();
   prometheus::Histogram& GetHistogram(const std::string& opt);
-  prometheus::Family<prometheus::Histogram>* GetHistograms();
+  std::shared_ptr<HistogramData> GetHistogramsData();
 
  private:
   std::shared_ptr<Cmd> NewCommand(const std::string& opt);
@@ -73,11 +90,8 @@ class PikaCmdTableManager {
   */
   std::unordered_map<std::string, CommandStatistics> cmdstat_map_;
   std::unordered_map<std::string, CommandStatistics> slow_command_count_;
-  std::mutex command_mutex_;
-  std::shared_mutex histograms_mutex_;
   std::shared_mutex slow_command_mutex_;
-  std::shared_ptr<prometheus::Registry> prometheus_registry_;
-  prometheus::Family<prometheus::Histogram>* histogram_family_;
-  std::unordered_map<std::string, prometheus::Histogram*> histograms_;
+  std::mutex data_mutex_;
+  std::shared_ptr<HistogramData> data_; 
 };
 #endif

src/pika_admin.cc

@@ -1497,8 +1497,8 @@ void InfoCmd::InfoCommandP99(std::string& info) {
   tmp_stream.precision(2);
   tmp_stream.setf(std::ios::fixed);
   tmp_stream << "# Commands P99" << "\r\n";
-  auto histogram_family = g_pika_cmd_table_manager->GetHistograms(); 
-
+  auto data = g_pika_cmd_table_manager->GetHistogramsData();
+  auto* histogram_family = data->family;
   for (const auto& metric_family : histogram_family->Collect()) {
     for (const auto& metric : metric_family.metric) {
       std::string command_name;

src/pika_cmd_table_manager.cc

@@ -15,24 +15,17 @@
 extern std::unique_ptr<PikaConf> g_pika_conf;
 
 void PikaCmdTableManager::ResetCommandCount() {
-  std::lock_guard<std::mutex> lock(command_mutex_);
-  slow_command_count_.clear();
-  InitHistograms(); 
-}
-
-void PikaCmdTableManager::InitHistograms() {
-  histograms_.clear();
-  prometheus_registry_ = std::make_shared<prometheus::Registry>();
-  histogram_family_ = &prometheus::BuildHistogram()
-      .Name("pika_command_duration_seconds")
-      .Help("Execution time of Pika commands in seconds")
-      .Register(*prometheus_registry_);
+  {
+    std::unique_lock<std::shared_mutex> write_lock(slow_command_mutex_); 
+    slow_command_count_.clear();
+  }
+  std::atomic_store(&data_, std::make_shared<HistogramData>());
 }
 
 PikaCmdTableManager::PikaCmdTableManager() {
   cmds_ = std::make_unique<CmdTable>();
   cmds_->reserve(300);
-  InitHistograms();
+  std::atomic_store(&data_, std::make_shared<HistogramData>());
 }
 
 void PikaCmdTableManager::InitCmdTable(void) {
@@ -80,24 +73,25 @@ void PikaCmdTableManager::RenameCommand(const std::string before, const std::str
 }
 
 prometheus::Histogram& PikaCmdTableManager::GetHistogram(const std::string& opt) {
+  auto current_data = std::atomic_load(&data_);
   {
-    std::shared_lock<std::shared_mutex> read_lock(histograms_mutex_);
-    auto it = histograms_.find(opt);
-    if (it != histograms_.end()) {
+    auto it = current_data->histograms.find(opt);
+    if (it != current_data->histograms.end()) {
       return *(it->second);
     }
   }
-  std::unique_lock<std::shared_mutex> write_lock(histograms_mutex_);
-  auto& new_histogram = histogram_family_->Add(
-    {{"command", opt}}, 
-    prometheus::Histogram::BucketBoundaries{0.5, 1, 2, 3, 5, 7, 10, 15, 20, 30, 40, 50, 65, 75, 85, 100, 125, 140, 150, 160, 175, 185, 200, 300, 400, 500, 750, 1000, 2000, 5000, 10000}
+
+  std::lock_guard<std::mutex> lock(data_mutex_);
+  auto& new_histogram = current_data->family->Add(
+      {{"command", opt}},
+      prometheus::Histogram::BucketBoundaries{0.5, 1, 2, 3, 5, 7, 10, 15, 20, 30, 40, 50, 65, 75, 85, 100, 125, 140, 150, 160, 175, 185, 200, 300, 400, 500, 750, 1000, 2000, 5000, 10000}
   );
-  histograms_[opt] = &new_histogram;
+  current_data->histograms[opt] = &new_histogram;
   return new_histogram;
 }
 
-prometheus::Family<prometheus::Histogram>* PikaCmdTableManager::GetHistograms() {
-  return histogram_family_;
+std::shared_ptr<HistogramData> PikaCmdTableManager::GetHistogramsData() {
+  return std::atomic_load(&data_);
 }
 
 void PikaCmdTableManager::UpdateSlowCommandCount(const std::string& opt) {