The Copy on Write mode is used

Author: wuxianrong

include/pika_cmd_table_manager.h

@@ -54,7 +54,6 @@ class PikaCmdTableManager {
   virtual ~PikaCmdTableManager() = default;
   void InitCmdTable(void);
   void RenameCommand(const std::string before, const std::string after);
-  void InitHistograms();
   std::shared_ptr<Cmd> GetCmd(const std::string& opt);
   bool CmdExist(const std::string& cmd) const;
   CmdTable* GetCmdTable();
@@ -91,6 +90,7 @@ class PikaCmdTableManager {
   std::unordered_map<std::string, CommandStatistics> cmdstat_map_;
   std::unordered_map<std::string, CommandStatistics> slow_command_count_;
   std::shared_mutex slow_command_mutex_;
+  std::shared_mutex histograms_mutex_;
   std::mutex data_mutex_;
   std::shared_ptr<HistogramData> data_; 
 };

src/pika_cmd_table_manager.cc

@@ -19,7 +19,10 @@ void PikaCmdTableManager::ResetCommandCount() {
     std::unique_lock<std::shared_mutex> write_lock(slow_command_mutex_); 
     slow_command_count_.clear();
   }
-  std::atomic_store(&data_, std::make_shared<HistogramData>());
+  {
+    std::lock_guard<std::mutex> lock(data_mutex_);
+    data_ = std::make_shared<HistogramData>(); 
+  }
 }
 
 PikaCmdTableManager::PikaCmdTableManager() {
@@ -73,25 +76,36 @@ 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_ptr<HistogramData> data_copy;
   {
-    auto it = current_data->histograms.find(opt);
-    if (it != current_data->histograms.end()) {
+    std::lock_guard<std::mutex> lock(data_mutex_);
+    data_copy = data_; 
+  }
+
+  {
+    std::shared_lock<std::shared_mutex> read_lock(histograms_mutex_);
+    auto it = data_copy->histograms.find(opt);
+    if (it != data_copy->histograms.end()) {
       return *(it->second);
     }
   }
 
-  std::lock_guard<std::mutex> lock(data_mutex_);
-  auto& new_histogram = current_data->family->Add(
+  std::unique_lock<std::shared_mutex> write_lock(histograms_mutex_);
+  auto& new_histogram = data_copy->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}
   );
-  current_data->histograms[opt] = &new_histogram;
+  data_copy->histograms[opt] = &new_histogram;
   return new_histogram;
 }
 
 std::shared_ptr<HistogramData> PikaCmdTableManager::GetHistogramsData() {
-  return std::atomic_load(&data_);
+  std::shared_ptr<HistogramData> data_copy;
+  {
+    std::lock_guard<std::mutex> lock(data_mutex_);
+    data_copy = data_; 
+  } 
+  return data_copy;
 }
 
 void PikaCmdTableManager::UpdateSlowCommandCount(const std::string& opt) {