From 762d2bbba8841b15a712e744c9c71763e6bae6d2 Mon Sep 17 00:00:00 2001
From: innokentii <innokentii@yandex-team.com>
Date: Mon, 12 Feb 2024 11:35:51 +0300
Subject: Replace complex hack in monlib macro
replace complex hack in monlib macro
---
library/cpp/lwtrace/mon/mon_lwtrace.cpp | 2 +-
library/cpp/monlib/service/pages/templates.h | 10 +---------
2 files changed, 2 insertions(+), 10 deletions(-)
(limited to 'library')
diff --git a/library/cpp/lwtrace/mon/mon_lwtrace.cpp b/library/cpp/lwtrace/mon/mon_lwtrace.cpp
index 6642b07098..09d56560c4 100644
--- a/library/cpp/lwtrace/mon/mon_lwtrace.cpp
+++ b/library/cpp/lwtrace/mon/mon_lwtrace.cpp
@@ -3451,8 +3451,8 @@ public:
HTML(os) {
TABLE() {
TTimeline timeline = MakeTimeline(node);
+ TABLED() {};
TABLEHEAD() TABLER() {
- TABLED();
for (auto& e : timeline) TABLED() {
TPatternNode* subnode = e.first;
os << subnode->Name;
diff --git a/library/cpp/monlib/service/pages/templates.h b/library/cpp/monlib/service/pages/templates.h
index ab1d91c54e..6cdcd6525c 100644
--- a/library/cpp/monlib/service/pages/templates.h
+++ b/library/cpp/monlib/service/pages/templates.h
@@ -3,15 +3,7 @@
#include <util/stream/output.h>
#include <util/system/defaults.h>
-#define WITH_SCOPED(var, value) WITH_SCOPED_I(var, value, Y_GENERATE_UNIQUE_ID(WITH_SCOPED_LABEL_))
-
-#define WITH_SCOPED_I(var, value, label) \
- if (auto var = (value)) { \
- Y_UNUSED(var); \
- goto label; \
- } else \
- label \
- :
+#define WITH_SCOPED(var, value) if (auto var = (value); Y_UNUSED(var), true)
#define TAG(name) WITH_SCOPED(tmp, ::NMonitoring::name(__stream))
#define TAG_CLASS(name, cls) WITH_SCOPED(tmp, ::NMonitoring::name(__stream, cls))
--
cgit v1.2.3