diff options
author | asorotsky <asorotsky@yandex-team.ru> | 2022-02-10 16:47:33 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:47:33 +0300 |
commit | eb540cc7a103419462d0cc870ca403966e2194c6 (patch) | |
tree | c0748b5dcbade83af788c0abfa89c0383d6b779c /library/cpp/actors | |
parent | 80f0a6b4102e3b2c89f23935c7690409033ea24c (diff) | |
download | ydb-eb540cc7a103419462d0cc870ca403966e2194c6.tar.gz |
Restoring authorship annotation for <asorotsky@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'library/cpp/actors')
-rw-r--r-- | library/cpp/actors/core/event_local.h | 4 | ||||
-rw-r--r-- | library/cpp/actors/core/event_pb.h | 10 | ||||
-rw-r--r-- | library/cpp/actors/core/executor_pool_basic.h | 2 | ||||
-rw-r--r-- | library/cpp/actors/core/executor_pool_io.h | 4 | ||||
-rw-r--r-- | library/cpp/actors/core/executor_pool_united.h | 2 | ||||
-rw-r--r-- | library/cpp/actors/core/executor_thread.h | 2 | ||||
-rw-r--r-- | library/cpp/actors/core/log_settings.cpp | 44 | ||||
-rw-r--r-- | library/cpp/actors/core/scheduler_basic.cpp | 4 | ||||
-rw-r--r-- | library/cpp/actors/helpers/future_callback.h | 2 | ||||
-rw-r--r-- | library/cpp/actors/memory_log/memlog.h | 12 | ||||
-rw-r--r-- | library/cpp/actors/util/thread.h | 26 |
11 files changed, 56 insertions, 56 deletions
diff --git a/library/cpp/actors/core/event_local.h b/library/cpp/actors/core/event_local.h index a197a7c9d7..2845aa94dd 100644 --- a/library/cpp/actors/core/event_local.h +++ b/library/cpp/actors/core/event_local.h @@ -9,7 +9,7 @@ namespace NActors { template <typename TEv, ui32 TEventType> class TEventLocal: public TEventBase<TEv, TEventType> { public: - TString ToStringHeader() const override { + TString ToStringHeader() const override { return TypeName<TEv>(); } @@ -17,7 +17,7 @@ namespace NActors { Y_FAIL("Serialization of local event %s type %" PRIu32, TypeName<TEv>().data(), TEventType); } - bool IsSerializable() const override { + bool IsSerializable() const override { return false; } diff --git a/library/cpp/actors/core/event_pb.h b/library/cpp/actors/core/event_pb.h index 32e93fef8a..d7546b901a 100644 --- a/library/cpp/actors/core/event_pb.h +++ b/library/cpp/actors/core/event_pb.h @@ -88,19 +88,19 @@ namespace NActors { return Event; } - bool Next(void** data, int* size) override; - void BackUp(int count) override; + bool Next(void** data, int* size) override; + void BackUp(int count) override; int64_t ByteCount() const override { return TotalSerializedDataSize; } - bool WriteAliasedRaw(const void* data, int size) override; - bool AllowsAliasing() const override; + bool WriteAliasedRaw(const void* data, int size) override; + bool AllowsAliasing() const override; bool WriteRope(const TRope *rope) override; bool WriteString(const TString *s) override; protected: - void DoRun() override; + void DoRun() override; void Resume(); bool Produce(const void *data, size_t size); diff --git a/library/cpp/actors/core/executor_pool_basic.h b/library/cpp/actors/core/executor_pool_basic.h index 9c089bcee6..023190f7fe 100644 --- a/library/cpp/actors/core/executor_pool_basic.h +++ b/library/cpp/actors/core/executor_pool_basic.h @@ -58,7 +58,7 @@ namespace NActors { const ui32 EventsPerMailbox; const int RealtimePriority; - + TAtomic ThreadUtilization; TAtomic MaxUtilizationCounter; TAtomic MaxUtilizationAccumulator; diff --git a/library/cpp/actors/core/executor_pool_io.h b/library/cpp/actors/core/executor_pool_io.h index 03ed4288d3..e576d642a1 100644 --- a/library/cpp/actors/core/executor_pool_io.h +++ b/library/cpp/actors/core/executor_pool_io.h @@ -23,13 +23,13 @@ namespace NActors { TTicketLock ScheduleLock; const TString PoolName; - + public: TIOExecutorPool(ui32 poolId, ui32 threads, const TString& poolName = "", TAffinity* affinity = nullptr, ui32 maxActivityType = 1); explicit TIOExecutorPool(const TIOExecutorPoolConfig& cfg); ~TIOExecutorPool(); - + ui32 GetReadyActivation(TWorkerContext& wctx, ui64 revolvingCounter) override; void Schedule(TInstant deadline, TAutoPtr<IEventHandle> ev, ISchedulerCookie* cookie, TWorkerId workerId) override; diff --git a/library/cpp/actors/core/executor_pool_united.h b/library/cpp/actors/core/executor_pool_united.h index fa8e4f0391..a090ba2466 100644 --- a/library/cpp/actors/core/executor_pool_united.h +++ b/library/cpp/actors/core/executor_pool_united.h @@ -60,7 +60,7 @@ namespace NActors { // Returns per worker schedule writers NSchedulerQueue::TWriter* GetScheduleWriter(TWorkerId workerId) const; - + // Sets executor for specified pool void SetupPool(TPoolId pool, IExecutorPool* executorPool, TMailboxTable* mailboxTable); diff --git a/library/cpp/actors/core/executor_thread.h b/library/cpp/actors/core/executor_thread.h index 1dc8b315e0..9d3c573f0d 100644 --- a/library/cpp/actors/core/executor_thread.h +++ b/library/cpp/actors/core/executor_thread.h @@ -83,7 +83,7 @@ namespace NActors { TVector<THolder<IActor>> DyingActors; TActorId CurrentRecipient; ui64 CurrentActorScheduledEventsCounter = 0; - + // Thread-specific TWorkerContext Ctx; ui64 RevolvingReadCounter = 0; diff --git a/library/cpp/actors/core/log_settings.cpp b/library/cpp/actors/core/log_settings.cpp index 75fa1a1dd6..f52f2fc5d2 100644 --- a/library/cpp/actors/core/log_settings.cpp +++ b/library/cpp/actors/core/log_settings.cpp @@ -49,34 +49,34 @@ namespace NActors { } void TSettings::Append(EComponent minVal, EComponent maxVal, EComponentToStringFunc func) { - Y_VERIFY(minVal >= 0, "NLog::TSettings: minVal must be non-negative"); + Y_VERIFY(minVal >= 0, "NLog::TSettings: minVal must be non-negative"); Y_VERIFY(maxVal > minVal, "NLog::TSettings: maxVal must be greater than minVal"); // update bounds - if (!MaxVal || minVal < MinVal) { - MinVal = minVal; - } + if (!MaxVal || minVal < MinVal) { + MinVal = minVal; + } if (!MaxVal || maxVal > MaxVal) { - MaxVal = maxVal; - + MaxVal = maxVal; + // expand ComponentNames to the new bounds - auto oldMask = Mask; - Mask = PowerOf2Mask(MaxVal); - - TArrayHolder<TAtomic> oldComponentInfo(new TAtomic[Mask + 1]); - ComponentInfo.Swap(oldComponentInfo); - int startVal = oldMask ? oldMask + 1 : 0; - for (int i = 0; i < startVal; i++) { - AtomicSet(ComponentInfo[i], AtomicGet(oldComponentInfo[i])); - } - - TComponentSettings defSetting(DefPriority, DefSamplingPriority, DefSamplingRate); - for (int i = startVal; i < Mask + 1; i++) { - AtomicSet(ComponentInfo[i], defSetting.Raw.Data); - } - - ComponentNames.resize(Mask + 1); + auto oldMask = Mask; + Mask = PowerOf2Mask(MaxVal); + + TArrayHolder<TAtomic> oldComponentInfo(new TAtomic[Mask + 1]); + ComponentInfo.Swap(oldComponentInfo); + int startVal = oldMask ? oldMask + 1 : 0; + for (int i = 0; i < startVal; i++) { + AtomicSet(ComponentInfo[i], AtomicGet(oldComponentInfo[i])); + } + + TComponentSettings defSetting(DefPriority, DefSamplingPriority, DefSamplingRate); + for (int i = startVal; i < Mask + 1; i++) { + AtomicSet(ComponentInfo[i], defSetting.Raw.Data); + } + + ComponentNames.resize(Mask + 1); } // assign new names but validate if newly added members were not used before diff --git a/library/cpp/actors/core/scheduler_basic.cpp b/library/cpp/actors/core/scheduler_basic.cpp index 3cb40546ae..fba200e16b 100644 --- a/library/cpp/actors/core/scheduler_basic.cpp +++ b/library/cpp/actors/core/scheduler_basic.cpp @@ -7,7 +7,7 @@ #ifdef BALLOC #include <library/cpp/balloc/optional/operators.h> #endif - + namespace NActors { struct TBasicSchedulerThread::TMonCounters { @@ -57,7 +57,7 @@ namespace NActors { ui64 currentMonotonic = RelaxedLoad(CurrentMonotonic); ui64 throttledMonotonic = currentMonotonic; - + ui64 activeTick = AlignUp<ui64>(throttledMonotonic, IntrasecondThreshold); TAutoPtr<TMomentMap> activeSec; diff --git a/library/cpp/actors/helpers/future_callback.h b/library/cpp/actors/helpers/future_callback.h index ae8fe045c3..8ca0d99fda 100644 --- a/library/cpp/actors/helpers/future_callback.h +++ b/library/cpp/actors/helpers/future_callback.h @@ -1,7 +1,7 @@ #pragma once #include <library/cpp/actors/core/actor.h> -#include <library/cpp/actors/core/hfunc.h> +#include <library/cpp/actors/core/hfunc.h> namespace NActors { diff --git a/library/cpp/actors/memory_log/memlog.h b/library/cpp/actors/memory_log/memlog.h index a16d694ba2..2aa27272a6 100644 --- a/library/cpp/actors/memory_log/memlog.h +++ b/library/cpp/actors/memory_log/memlog.h @@ -45,7 +45,7 @@ public: return AtomicGet(MemLogBuffer); } - void* GetWriteBuffer(size_t amount) noexcept; + void* GetWriteBuffer(size_t amount) noexcept; inline static void* GetWriteBufferStatic(size_t amount) noexcept { auto logger = GetMemoryLogger(); @@ -62,7 +62,7 @@ public: inline static void CreateMemoryLogBuffer( size_t totalSize = DEFAULT_TOTAL_SIZE, size_t grainSize = DEFAULT_GRAIN_SIZE) - Y_COLD { + Y_COLD { if (AtomicGet(MemLogBuffer) != nullptr) { return; } @@ -73,7 +73,7 @@ public: static std::atomic<bool> PrintLastMark; // buffer must be at least 16 bytes - static void ChangeLastMark(char* buffer) noexcept; + static void ChangeLastMark(char* buffer) noexcept; inline static TThread::TId GetTheadId() noexcept { if (LogThreadId == 0) { @@ -83,7 +83,7 @@ public: } private: - TMemoryLog(size_t totalSize, size_t grainSize) Y_COLD; + TMemoryLog(size_t totalSize, size_t grainSize) Y_COLD; struct TGrain { TAtomic WritePointer = 0; @@ -170,12 +170,12 @@ private: // it's no use of sanitizing this function NO_SANITIZE_THREAD -char* BareMemLogWrite( +char* BareMemLogWrite( const char* begin, size_t msgSize, bool isLast = true) noexcept; // it's no use of sanitizing this function NO_SANITIZE_THREAD -bool MemLogWrite( +bool MemLogWrite( const char* begin, size_t msgSize, bool addLF = false) noexcept; Y_WRAPPER inline bool MemLogWrite(const char* begin, const char* end) noexcept { diff --git a/library/cpp/actors/util/thread.h b/library/cpp/actors/util/thread.h index c3b0c62356..d742c8c585 100644 --- a/library/cpp/actors/util/thread.h +++ b/library/cpp/actors/util/thread.h @@ -1,26 +1,26 @@ -#pragma once - -#include <util/generic/strbuf.h> -#include <util/stream/str.h> -#include <util/system/execpath.h> -#include <util/system/thread.h> -#include <util/system/thread.h> +#pragma once + +#include <util/generic/strbuf.h> +#include <util/stream/str.h> +#include <util/system/execpath.h> +#include <util/system/thread.h> +#include <util/system/thread.h> #include <time.h> - + inline void SetCurrentThreadName(const TString& name, const ui32 maxCharsFromProcessName = 8) { -#if defined(_linux_) +#if defined(_linux_) // linux limits threadname by 15 + \0 TStringBuf procName(GetExecPath()); procName = procName.RNextTok('/'); procName = procName.SubStr(0, maxCharsFromProcessName); - TStringStream linuxName; + TStringStream linuxName; linuxName << procName << "." << name; TThread::SetCurrentThreadName(linuxName.Str().data()); -#else +#else Y_UNUSED(maxCharsFromProcessName); TThread::SetCurrentThreadName(name.data()); -#endif -} +#endif +} |