diff options
| author | Vasily Gerasimov <[email protected]> | 2022-02-10 16:49:10 +0300 | 
|---|---|---|
| committer | Daniil Cherednik <[email protected]> | 2022-02-10 16:49:10 +0300 | 
| commit | 1eb755fbca92172a6aec2f57371b2b3a19dfab43 (patch) | |
| tree | 5d5cb817648f650d76cf1076100726fd9b8448e8 /library/cpp/monlib | |
| parent | 6cdc8f140213c595e4ad38bc3d97fcef1146b8c3 (diff) | |
Restoring authorship annotation for Vasily Gerasimov <[email protected]>. Commit 2 of 2.
Diffstat (limited to 'library/cpp/monlib')
| -rw-r--r-- | library/cpp/monlib/dynamic_counters/counters.cpp | 42 | ||||
| -rw-r--r-- | library/cpp/monlib/dynamic_counters/counters.h | 14 | ||||
| -rw-r--r-- | library/cpp/monlib/dynamic_counters/counters_ut.cpp | 6 | 
3 files changed, 31 insertions, 31 deletions
| diff --git a/library/cpp/monlib/dynamic_counters/counters.cpp b/library/cpp/monlib/dynamic_counters/counters.cpp index b6371eb5c73..3635d87d0d2 100644 --- a/library/cpp/monlib/dynamic_counters/counters.cpp +++ b/library/cpp/monlib/dynamic_counters/counters.cpp @@ -19,10 +19,10 @@ namespace {          return dynamic_cast<TExpiringCounter*>(ptr.Get());      } -    TExpiringHistogramCounter* AsExpiringHistogramCounter(const TIntrusivePtr<TCountableBase>& ptr) {  -        return dynamic_cast<TExpiringHistogramCounter*>(ptr.Get());  -    }  -  +    TExpiringHistogramCounter* AsExpiringHistogramCounter(const TIntrusivePtr<TCountableBase>& ptr) { +        return dynamic_cast<TExpiringHistogramCounter*>(ptr.Get()); +    } +      THistogramCounter* AsHistogram(const TIntrusivePtr<TCountableBase>& ptr) {          return dynamic_cast<THistogramCounter*>(ptr.Get());      } @@ -38,10 +38,10 @@ namespace {      THistogramPtr AsHistogramRef(const TIntrusivePtr<TCountableBase>& ptr) {          return VerifyDynamicCast<THistogramCounter*>(ptr.Get());      } -  -    bool IsExpiringCounter(const TIntrusivePtr<TCountableBase>& ptr) {  -        return AsExpiringCounter(ptr) != nullptr || AsExpiringHistogramCounter(ptr) != nullptr;  -    }  + +    bool IsExpiringCounter(const TIntrusivePtr<TCountableBase>& ptr) { +        return AsExpiringCounter(ptr) != nullptr || AsExpiringHistogramCounter(ptr) != nullptr; +    }  }  static constexpr TStringBuf INDENT = "    "; @@ -76,11 +76,11 @@ THistogramPtr TDynamicCounters::GetHistogram(const TString& value, IHistogramCol  THistogramPtr TDynamicCounters::GetNamedHistogram(const TString& name, const TString& value, IHistogramCollectorPtr collector, bool derivative, EVisibility vis) {      return AsHistogramRef(GetNamedCounterImpl<false, THistogramCounter>(name, value, std::move(collector), derivative, vis)); -}  +}  THistogramPtr TDynamicCounters::GetExpiringHistogram(const TString& value, IHistogramCollectorPtr collector, bool derivative, EVisibility vis) {      return GetExpiringNamedHistogram("sensor", value, std::move(collector), derivative, vis); -}  +}  THistogramPtr TDynamicCounters::GetExpiringNamedHistogram(const TString& name, const TString& value, IHistogramCollectorPtr collector, bool derivative, EVisibility vis) {      return AsHistogramRef(GetNamedCounterImpl<true, TExpiringHistogramCounter>(name, value, std::move(collector), derivative, vis)); @@ -265,7 +265,7 @@ void TDynamicCounters::RemoveExpired() const {      TAtomicBase count = 0;      for (auto it = Counters.begin(); it != Counters.end();) { -        if (IsExpiringCounter(it->second) && it->second->RefCount() == 1) {  +        if (IsExpiringCounter(it->second) && it->second->RefCount() == 1) {              it = Counters.erase(it);              ++count;          } else { @@ -275,29 +275,29 @@ void TDynamicCounters::RemoveExpired() const {      AtomicSub(ExpiringCount, count);  } -  -template <bool expiring, class TCounterType, class... TArgs>  -TDynamicCounters::TCountablePtr TDynamicCounters::GetNamedCounterImpl(const TString& name, const TString& value, TArgs&&... args) {  + +template <bool expiring, class TCounterType, class... TArgs> +TDynamicCounters::TCountablePtr TDynamicCounters::GetNamedCounterImpl(const TString& name, const TString& value, TArgs&&... args) {      {          TReadGuard g(Lock);          auto it = Counters.find({name, value});          if (it != Counters.end()) {              return it->second;          } -    }  -  +    } +      auto g = LockForUpdate("GetNamedCounterImpl", name, value);      const TChildId key(name, value);      auto it = Counters.lower_bound(key);      if (it == Counters.end() || it->first != key) {          auto value = MakeIntrusive<TCounterType>(std::forward<TArgs>(args)...);          it = Counters.emplace_hint(it, key, value); -        if constexpr (expiring) {  +        if constexpr (expiring) {              AtomicIncrement(ExpiringCount); -        }  -    }  -    return it->second;  -}  +        } +    } +    return it->second; +}  template <class TCounterType>  TDynamicCounters::TCountablePtr TDynamicCounters::FindNamedCounterImpl(const TString& name, const TString& value) const { diff --git a/library/cpp/monlib/dynamic_counters/counters.h b/library/cpp/monlib/dynamic_counters/counters.h index c25ac18605b..dc178cfbe01 100644 --- a/library/cpp/monlib/dynamic_counters/counters.h +++ b/library/cpp/monlib/dynamic_counters/counters.h @@ -175,10 +175,10 @@ namespace NMonitoring {          bool Derivative_;      }; -    struct TExpiringHistogramCounter: public THistogramCounter {  -        using THistogramCounter::THistogramCounter;  -    };  -  +    struct TExpiringHistogramCounter: public THistogramCounter { +        using THistogramCounter::THistogramCounter; +    }; +      using THistogramPtr = TIntrusivePtr<THistogramCounter>;  #ifdef _MSC_VER @@ -280,7 +280,7 @@ namespace NMonitoring {              const TString& value,              bool derivative = false,              TCountableBase::EVisibility visibility = TCountableBase::EVisibility::Public); -  +          THistogramPtr GetHistogram(              const TString& value,              IHistogramCollectorPtr collector, @@ -364,8 +364,8 @@ namespace NMonitoring {          void RegisterCountable(const TString& name, const TString& value, TCountablePtr countable);          void RemoveExpired() const; -        template <bool expiring, class TCounterType, class... TArgs>  -        TCountablePtr GetNamedCounterImpl(const TString& name, const TString& value, TArgs&&... args);  +        template <bool expiring, class TCounterType, class... TArgs> +        TCountablePtr GetNamedCounterImpl(const TString& name, const TString& value, TArgs&&... args);          template <class TCounterType>          TCountablePtr FindNamedCounterImpl(const TString& name, const TString& value) const; diff --git a/library/cpp/monlib/dynamic_counters/counters_ut.cpp b/library/cpp/monlib/dynamic_counters/counters_ut.cpp index 7d44e682a8e..3591037e0a7 100644 --- a/library/cpp/monlib/dynamic_counters/counters_ut.cpp +++ b/library/cpp/monlib/dynamic_counters/counters_ut.cpp @@ -230,15 +230,15 @@ Y_UNIT_TEST_SUITE(TDynamicCountersTest) {          {              auto c = rootGroup->GetExpiringCounter("foo"); -            auto h = rootGroup->GetExpiringHistogram("bar", ExplicitHistogram({1, 42}));  -            h->Collect(15);  +            auto h = rootGroup->GetExpiringHistogram("bar", ExplicitHistogram({1, 42})); +            h->Collect(15);              TStringStream ss;              TCountersPrinter printer(&ss);              rootGroup->Accept("root", "counters", printer);              UNIT_ASSERT_STRINGS_EQUAL(ss.Str(),                                        "root:counters {\n" -                                      "  sensor:bar = {1: 0, 42: 1, inf: 0}\n"  +                                      "  sensor:bar = {1: 0, 42: 1, inf: 0}\n"                                        "  sensor:foo = 0\n"                                        "}\n");          } | 
