src: move metrics interval state into EnvList

Author: santigimeno

src/nsolid/nsolid_api.cc

@@ -166,7 +166,6 @@ static void calculatePtiles(std::vector<double>* vals, double* med, double* nn);
 // any thread have been blocked longer than the threadshold passed to
 // OnBlockedLoopHook().
 constexpr uint64_t blocked_loop_interval = 100;
-std::atomic<uint64_t> gen_ptiles_interval{5000};
 constexpr uint64_t datapoints_q_interval = 100;
 constexpr size_t datapoints_q_max_size = 100;
 
@@ -1296,7 +1295,7 @@ void EnvList::UpdateConfig(const nlohmann::json& config) {
     if (it != config.end() && !it->is_null()) {
       // If interval changes, next timer cb the timer is reset.
       uint64_t interval = it->get<uint64_t>();
-      gen_ptiles_interval.store(interval, std::memory_order_relaxed);
+      gen_ptiles_interval_.store(interval, std::memory_order_relaxed);
     }
 
     it = config.find("otlp");
@@ -1762,8 +1761,8 @@ void EnvList::env_list_routine_(ns_thread*, EnvList* envlist) {
   CHECK_EQ(er, 0);
   er = envlist->gen_ptiles_timer_.start(
       gen_ptiles_cb_,
-      gen_ptiles_interval.load(std::memory_order_relaxed),
-      gen_ptiles_interval.load(std::memory_order_relaxed));
+      envlist->gen_ptiles_interval_.load(std::memory_order_relaxed),
+      envlist->gen_ptiles_interval_.load(std::memory_order_relaxed));
   CHECK_EQ(er, 0);
   envlist->blocked_loop_timer_.unref();
   envlist->gen_ptiles_timer_.unref();
@@ -1904,7 +1903,8 @@ void EnvList::gen_ptiles_cb_(ns_timer* timer) {
   // Restart timer if interval changed.
   uint64_t interval =
     uv_timer_get_repeat(reinterpret_cast<uv_timer_t*>(timer->base_handle()));
-  uint64_t next_interval = gen_ptiles_interval.load(std::memory_order_relaxed);
+  uint64_t next_interval =
+      envlist->gen_ptiles_interval_.load(std::memory_order_relaxed);
   if (next_interval != interval) {
     int er = envlist->gen_ptiles_timer_.start(
       gen_ptiles_cb_, next_interval, next_interval);

src/nsolid/nsolid_api.h

@@ -730,6 +730,7 @@ class EnvList {
   std::atomic<uint64_t> min_blocked_threshold_ = { UINT64_MAX };
   // TODO(trevnorris): Temporary until Console supports streaming metrics
   nsuv::ns_timer gen_ptiles_timer_;
+  std::atomic<uint64_t> gen_ptiles_interval_ = { 5000 };
   // exit data
   std::atomic<bool> exiting_ = { false };
   std::atomic<int> exit_code_;