diff options
author | Alexander Gololobov <davenger@yandex-team.com> | 2022-02-10 16:47:37 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:47:37 +0300 |
commit | 39608cdb86363c75ce55b2b9a69841c3b71f22cf (patch) | |
tree | 4ec132c1665bd4d68e3628aa18d937c70d32413b /library/cpp/monlib | |
parent | 54295b9bd4dc45c54d804084fd846d945148a7f0 (diff) | |
download | ydb-39608cdb86363c75ce55b2b9a69841c3b71f22cf.tar.gz |
Restoring authorship annotation for Alexander Gololobov <davenger@yandex-team.com>. Commit 1 of 2.
Diffstat (limited to 'library/cpp/monlib')
-rw-r--r-- | library/cpp/monlib/counters/counters.cpp | 20 | ||||
-rw-r--r-- | library/cpp/monlib/dynamic_counters/counters.h | 12 | ||||
-rw-r--r-- | library/cpp/monlib/dynamic_counters/counters_ut.cpp | 54 | ||||
-rw-r--r-- | library/cpp/monlib/service/pages/templates.h | 4 | ||||
-rw-r--r-- | library/cpp/monlib/service/pages/version_mon_page.cpp | 2 |
5 files changed, 46 insertions, 46 deletions
diff --git a/library/cpp/monlib/counters/counters.cpp b/library/cpp/monlib/counters/counters.cpp index 50dca4c577..2781b8ab4e 100644 --- a/library/cpp/monlib/counters/counters.cpp +++ b/library/cpp/monlib/counters/counters.cpp @@ -7,18 +7,18 @@ namespace NMonitoring { unsigned i = 0; i64 major = val; i64 minor = 0; - const unsigned imax = sizeof(shorts) / sizeof(char); - for (i = 0; i < imax; i++) { + const unsigned imax = sizeof(shorts) / sizeof(char); + for (i = 0; i < imax; i++) { if (major >> 10 == 0) break; else { - minor = major - (major >> 10 << 10); + minor = major - (major >> 10 << 10); major = major >> 10; } } - minor = (minor * 10) >> 10; + minor = (minor * 10) >> 10; - if (i == 0 || i >= imax) + if (i == 0 || i >= imax) *buf = '\0'; else snprintf(buf, size, "%" PRId64 ".%" PRId64 "%c", major, minor, shorts[i]); @@ -28,15 +28,15 @@ namespace NMonitoring { char* PrettyNum(i64 val, char* buf, size_t size) { Y_ASSERT(buf); - if (size < 4) { - buf[0] = 0; - return buf; - } + if (size < 4) { + buf[0] = 0; + return buf; + } PrettyNumShort(val, buf + 2, size - 3); if (buf[2] == 0) { *buf = '\0'; } else { - size_t len = 2 + strnlen(buf + 2, size - 4); + size_t len = 2 + strnlen(buf + 2, size - 4); Y_ASSERT(len < size); buf[0] = ' '; buf[1] = '('; diff --git a/library/cpp/monlib/dynamic_counters/counters.h b/library/cpp/monlib/dynamic_counters/counters.h index dc178cfbe0..5b0db006ae 100644 --- a/library/cpp/monlib/dynamic_counters/counters.h +++ b/library/cpp/monlib/dynamic_counters/counters.h @@ -195,7 +195,7 @@ namespace NMonitoring { private: TRWMutex Lock; - TCounterPtr LookupCounter; // Counts lookups by name + TCounterPtr LookupCounter; // Counts lookups by name TOnLookupPtr OnLookup = nullptr; // Called on each lookup if not nullptr, intended for lightweight tracing. typedef TIntrusivePtr<TCountableBase> TCountablePtr; @@ -241,12 +241,12 @@ namespace NMonitoring { ~TDynamicCounters() override; - // This counter allows to track lookups by name within the whole subtree - void SetLookupCounter(TCounterPtr lookupCounter) { + // This counter allows to track lookups by name within the whole subtree + void SetLookupCounter(TCounterPtr lookupCounter) { TWriteGuard g(Lock); - LookupCounter = lookupCounter; - } - + LookupCounter = lookupCounter; + } + void SetOnLookup(TOnLookupPtr onLookup) { TWriteGuard g(Lock); OnLookup = onLookup; diff --git a/library/cpp/monlib/dynamic_counters/counters_ut.cpp b/library/cpp/monlib/dynamic_counters/counters_ut.cpp index 3591037e0a..f3d87930f9 100644 --- a/library/cpp/monlib/dynamic_counters/counters_ut.cpp +++ b/library/cpp/monlib/dynamic_counters/counters_ut.cpp @@ -284,33 +284,33 @@ Y_UNIT_TEST_SUITE(TDynamicCountersTest) { " sensor:timeMillis = {1: 1, 2: 1, 4: 2, inf: 95}\n" "}\n"); } - - Y_UNIT_TEST(CounterLookupCounter) { - TDynamicCounterPtr rootGroup(new TDynamicCounters()); - TDynamicCounters::TCounterPtr lookups = rootGroup->GetCounter("Lookups", true); - rootGroup->SetLookupCounter(lookups); - - // Create subtree and check that counter is inherited - TDynamicCounterPtr serviceGroup = rootGroup->GetSubgroup("service", "MyService"); - UNIT_ASSERT_VALUES_EQUAL(lookups->Val(), 1); - - TDynamicCounterPtr subGroup = serviceGroup->GetSubgroup("component", "MyComponent"); - UNIT_ASSERT_VALUES_EQUAL(lookups->Val(), 2); - - auto counter = subGroup->GetNamedCounter("range", "20 msec", true); - UNIT_ASSERT_VALUES_EQUAL(lookups->Val(), 3); - - auto hist = subGroup->GetHistogram("timeMsec", ExponentialHistogram(4, 2)); - UNIT_ASSERT_VALUES_EQUAL(lookups->Val(), 4); - - // Replace the counter for subGroup - auto subGroupLookups = rootGroup->GetCounter("LookupsInMyComponent", true); - UNIT_ASSERT_VALUES_EQUAL(lookups->Val(), 5); - subGroup->SetLookupCounter(subGroupLookups); - auto counter2 = subGroup->GetNamedCounter("range", "30 msec", true); - UNIT_ASSERT_VALUES_EQUAL(subGroupLookups->Val(), 1); - UNIT_ASSERT_VALUES_EQUAL(lookups->Val(), 5); - } + + Y_UNIT_TEST(CounterLookupCounter) { + TDynamicCounterPtr rootGroup(new TDynamicCounters()); + TDynamicCounters::TCounterPtr lookups = rootGroup->GetCounter("Lookups", true); + rootGroup->SetLookupCounter(lookups); + + // Create subtree and check that counter is inherited + TDynamicCounterPtr serviceGroup = rootGroup->GetSubgroup("service", "MyService"); + UNIT_ASSERT_VALUES_EQUAL(lookups->Val(), 1); + + TDynamicCounterPtr subGroup = serviceGroup->GetSubgroup("component", "MyComponent"); + UNIT_ASSERT_VALUES_EQUAL(lookups->Val(), 2); + + auto counter = subGroup->GetNamedCounter("range", "20 msec", true); + UNIT_ASSERT_VALUES_EQUAL(lookups->Val(), 3); + + auto hist = subGroup->GetHistogram("timeMsec", ExponentialHistogram(4, 2)); + UNIT_ASSERT_VALUES_EQUAL(lookups->Val(), 4); + + // Replace the counter for subGroup + auto subGroupLookups = rootGroup->GetCounter("LookupsInMyComponent", true); + UNIT_ASSERT_VALUES_EQUAL(lookups->Val(), 5); + subGroup->SetLookupCounter(subGroupLookups); + auto counter2 = subGroup->GetNamedCounter("range", "30 msec", true); + UNIT_ASSERT_VALUES_EQUAL(subGroupLookups->Val(), 1); + UNIT_ASSERT_VALUES_EQUAL(lookups->Val(), 5); + } Y_UNIT_TEST(FindCounters) { TDynamicCounterPtr rootGroup(new TDynamicCounters()); diff --git a/library/cpp/monlib/service/pages/templates.h b/library/cpp/monlib/service/pages/templates.h index b4656f059f..a4de362845 100644 --- a/library/cpp/monlib/service/pages/templates.h +++ b/library/cpp/monlib/service/pages/templates.h @@ -150,8 +150,8 @@ namespace NMonitoring { } ~TTag() { - try { - Str << "</" << tag << ">"; + try { + Str << "</" << tag << ">"; } catch (...) { } } diff --git a/library/cpp/monlib/service/pages/version_mon_page.cpp b/library/cpp/monlib/service/pages/version_mon_page.cpp index 41e29417da..50e6288809 100644 --- a/library/cpp/monlib/service/pages/version_mon_page.cpp +++ b/library/cpp/monlib/service/pages/version_mon_page.cpp @@ -11,6 +11,6 @@ void TVersionMonPage::OutputText(IOutputStream& out, NMonitoring::IMonHttpReques out << version; if (!TString(version).EndsWith("\n")) out << "\n"; - out << GetBuildInfo() << "\n\n"; + out << GetBuildInfo() << "\n\n"; out << "linked with malloc: " << NMalloc::MallocInfo().Name << "\n"; } |