diff options
author | sharpeye <sharpeye@yandex-team.ru> | 2022-02-10 16:49:16 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:49:16 +0300 |
commit | 9a407601824f50398148409237b90de3f95b5ae3 (patch) | |
tree | b5245ea2b5ed12d65fe1230d5f6dae0b9b129894 | |
parent | 1c61afbf3db63940d05e6fefa3104b03457788a1 (diff) | |
download | ydb-9a407601824f50398148409237b90de3f95b5ae3.tar.gz |
Restoring authorship annotation for <sharpeye@yandex-team.ru>. Commit 1 of 2.
-rw-r--r-- | library/cpp/lwtrace/probe.h | 10 | ||||
-rw-r--r-- | library/cpp/lwtrace/trace.cpp | 8 | ||||
-rw-r--r-- | util/generic/scope.h | 42 | ||||
-rw-r--r-- | util/generic/scope_ut.cpp | 36 | ||||
-rw-r--r-- | util/thread/fwd.h | 2 |
5 files changed, 49 insertions, 49 deletions
diff --git a/library/cpp/lwtrace/probe.h b/library/cpp/lwtrace/probe.h index 31fa282da3..8ff69611a9 100644 --- a/library/cpp/lwtrace/probe.h +++ b/library/cpp/lwtrace/probe.h @@ -7,7 +7,7 @@ #include <util/datetime/cputimer.h> #include <util/generic/hide_ptr.h> -#include <util/generic/scope.h> +#include <util/generic/scope.h> #include <util/system/atomic.h> namespace NLWTrace { @@ -235,8 +235,8 @@ namespace NLWTrace { inline void operator()(LWTRACE_FUNCTION_PARAMS) { TParams params; LWTRACE_PREPARE_PARAMS(params); - Y_DEFER { TUserSignature<LWTRACE_TEMPLATE_ARGS>::DestroyParams(params); }; - + Y_DEFER { TUserSignature<LWTRACE_TEMPLATE_ARGS>::DestroyParams(params); }; + TOrbit orbit; Probe.RunExecutors(orbit, params); } @@ -244,8 +244,8 @@ namespace NLWTrace { inline void Run(TOrbit& orbit, LWTRACE_FUNCTION_PARAMS) { TParams params; LWTRACE_PREPARE_PARAMS(params); - Y_DEFER { TUserSignature<LWTRACE_TEMPLATE_ARGS>::DestroyParams(params); }; - + Y_DEFER { TUserSignature<LWTRACE_TEMPLATE_ARGS>::DestroyParams(params); }; + Probe.RunExecutors(orbit, params); Probe.RunShuttles(orbit, params); // Executors can create shuttles } diff --git a/library/cpp/lwtrace/trace.cpp b/library/cpp/lwtrace/trace.cpp index 3c974c85a0..37ee1ea4ac 100644 --- a/library/cpp/lwtrace/trace.cpp +++ b/library/cpp/lwtrace/trace.cpp @@ -709,10 +709,10 @@ namespace NLWTrace { TString val1 = (expectedArgumentCount <= 1) ? "" : statement.GetArgument(1).GetValue(); TString val2 = (expectedArgumentCount <= 2) ? "" : statement.GetArgument(2).GetValue(); - const char* tName1 = (expectedArgumentCount <= 1 || arg1.ParamIdx == size_t(-1)) - ? nullptr : probe->Event.Signature.ParamTypes[arg1.ParamIdx]; - const char* tName2 = (expectedArgumentCount <= 2 || arg2.ParamIdx == size_t(-1)) - ? nullptr : probe->Event.Signature.ParamTypes[arg2.ParamIdx]; + const char* tName1 = (expectedArgumentCount <= 1 || arg1.ParamIdx == size_t(-1)) + ? nullptr : probe->Event.Signature.ParamTypes[arg1.ParamIdx]; + const char* tName2 = (expectedArgumentCount <= 2 || arg2.ParamIdx == size_t(-1)) + ? nullptr : probe->Event.Signature.ParamTypes[arg2.ParamIdx]; if (arg0.Type == OT_VARIABLE) { switch (statement.GetType()) { diff --git a/util/generic/scope.h b/util/generic/scope.h index b2c33af61e..0d7a3b13d3 100644 --- a/util/generic/scope.h +++ b/util/generic/scope.h @@ -1,43 +1,43 @@ #pragma once -#include <util/system/compiler.h> +#include <util/system/compiler.h> #include <util/system/defaults.h> + +#include <utility> -#include <utility> - -namespace NPrivate { - template <typename F> - class TScopeGuard { - public: - TScopeGuard(const F& function) +namespace NPrivate { + template <typename F> + class TScopeGuard { + public: + TScopeGuard(const F& function) : Function_{function} { } - TScopeGuard(F&& function) + TScopeGuard(F&& function) : Function_{std::move(function)} { } - TScopeGuard(TScopeGuard&&) = default; - TScopeGuard(const TScopeGuard&) = default; - - ~TScopeGuard() { - Function_(); - } - + TScopeGuard(TScopeGuard&&) = default; + TScopeGuard(const TScopeGuard&) = default; + + ~TScopeGuard() { + Function_(); + } + private: F Function_; }; - struct TMakeGuardHelper { - template <class F> + struct TMakeGuardHelper { + template <class F> TScopeGuard<F> operator|(F&& function) const { - return std::forward<F>(function); - } + return std::forward<F>(function); + } }; } - + // \brief `Y_SCOPE_EXIT(captures) { body };` // // General implementaion of RAII idiom (resource acquisition is initialization). Executes diff --git a/util/generic/scope_ut.cpp b/util/generic/scope_ut.cpp index bdb434d487..62547f0b1d 100644 --- a/util/generic/scope_ut.cpp +++ b/util/generic/scope_ut.cpp @@ -8,30 +8,30 @@ Y_UNIT_TEST_SUITE(ScopeToolsTest) { int i = 0; { - Y_SCOPE_EXIT(&i) { - i = i * 2; - }; - - Y_SCOPE_EXIT(&i) { - i = i + 1; - }; + Y_SCOPE_EXIT(&i) { + i = i * 2; + }; + + Y_SCOPE_EXIT(&i) { + i = i + 1; + }; } UNIT_ASSERT_VALUES_EQUAL(2, i); } - + Y_UNIT_TEST(OnScopeExitMoveTest) { THolder<int> i{new int{10}}; - int p = 0; - - { - Y_SCOPE_EXIT(i = std::move(i), &p) { - p = *i * 2; - }; - } - - UNIT_ASSERT_VALUES_EQUAL(20, p); - } + int p = 0; + + { + Y_SCOPE_EXIT(i = std::move(i), &p) { + p = *i * 2; + }; + } + + UNIT_ASSERT_VALUES_EQUAL(20, p); + } Y_UNIT_TEST(TestDefer) { int i = 0; diff --git a/util/thread/fwd.h b/util/thread/fwd.h index 6f1caed21c..6d44699dd8 100644 --- a/util/thread/fwd.h +++ b/util/thread/fwd.h @@ -11,7 +11,7 @@ template <class T, class TCounter = TDefaultLFCounter> class TAutoLockFreeQueue; template <class T> -class TLockFreeStack; +class TLockFreeStack; class IThreadFactory; |