diff options
author | Anton Samokhvalov <pg83@yandex.ru> | 2022-02-10 16:45:15 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:45:15 +0300 |
commit | 72cb13b4aff9bc9cf22e49251bc8fd143f82538f (patch) | |
tree | da2c34829458c7d4e74bdfbdf85dff449e9e7fb8 /library/cpp/actors/core | |
parent | 778e51ba091dc39e7b7fcab2b9cf4dbedfb6f2b5 (diff) | |
download | ydb-72cb13b4aff9bc9cf22e49251bc8fd143f82538f.tar.gz |
Restoring authorship annotation for Anton Samokhvalov <pg83@yandex.ru>. Commit 1 of 2.
Diffstat (limited to 'library/cpp/actors/core')
31 files changed, 201 insertions, 201 deletions
diff --git a/library/cpp/actors/core/actor.h b/library/cpp/actors/core/actor.h index ed29bd14b9..bc0df60536 100644 --- a/library/cpp/actors/core/actor.h +++ b/library/cpp/actors/core/actor.h @@ -16,7 +16,7 @@ namespace NActors { namespace NLog { struct TSettings; - } + } struct TActorContext; @@ -434,7 +434,7 @@ namespace NActors { }; -#define STFUNC_SIG TAutoPtr< ::NActors::IEventHandle>&ev, const ::NActors::TActorContext &ctx +#define STFUNC_SIG TAutoPtr< ::NActors::IEventHandle>&ev, const ::NActors::TActorContext &ctx #define STATEFN_SIG TAutoPtr<::NActors::IEventHandle>& ev #define STFUNC(funcName) void funcName(TAutoPtr< ::NActors::IEventHandle>& ev, const ::NActors::TActorContext& ctx) #define STATEFN(funcName) void funcName(TAutoPtr< ::NActors::IEventHandle>& ev, const ::NActors::TActorContext& ) diff --git a/library/cpp/actors/core/actor_bootstrapped.h b/library/cpp/actors/core/actor_bootstrapped.h index a37887c939..365a18f020 100644 --- a/library/cpp/actors/core/actor_bootstrapped.h +++ b/library/cpp/actors/core/actor_bootstrapped.h @@ -34,4 +34,4 @@ namespace NActors { : TActor<TDerived>(&TDerived::StateBootstrap) {} }; -} +} diff --git a/library/cpp/actors/core/actor_coroutine.cpp b/library/cpp/actors/core/actor_coroutine.cpp index 0ab4d2b24d..ef92fa03ae 100644 --- a/library/cpp/actors/core/actor_coroutine.cpp +++ b/library/cpp/actors/core/actor_coroutine.cpp @@ -162,4 +162,4 @@ namespace NActors { } } -} +} diff --git a/library/cpp/actors/core/actor_coroutine.h b/library/cpp/actors/core/actor_coroutine.h index 6bcb768eaf..dc17f5c9e4 100644 --- a/library/cpp/actors/core/actor_coroutine.h +++ b/library/cpp/actors/core/actor_coroutine.h @@ -171,4 +171,4 @@ namespace NActors { } }; -} +} diff --git a/library/cpp/actors/core/actor_coroutine_ut.cpp b/library/cpp/actors/core/actor_coroutine_ut.cpp index 951512b877..731b14f145 100644 --- a/library/cpp/actors/core/actor_coroutine_ut.cpp +++ b/library/cpp/actors/core/actor_coroutine_ut.cpp @@ -105,7 +105,7 @@ Y_UNIT_TEST_SUITE(ActorCoro) { THolder<TActorSystemSetup> setup = MakeHolder<TActorSystemSetup>(); setup->NodeId = 0; setup->ExecutorsCount = 1; - setup->Executors.Reset(new TAutoPtr<IExecutorPool>[setup->ExecutorsCount]); + setup->Executors.Reset(new TAutoPtr<IExecutorPool>[setup->ExecutorsCount]); for (ui32 i = 0; i < setup->ExecutorsCount; ++i) { setup->Executors[i] = new TBasicExecutorPool(i, 5, 10, "basic"); } diff --git a/library/cpp/actors/core/buffer.cpp b/library/cpp/actors/core/buffer.cpp index 48128d76ef..cb8aaeeadd 100644 --- a/library/cpp/actors/core/buffer.cpp +++ b/library/cpp/actors/core/buffer.cpp @@ -2,7 +2,7 @@ #include <util/system/yassert.h> -#include <algorithm> +#include <algorithm> TBufferBase::TBufferBase(size_t size) noexcept : Size(size) diff --git a/library/cpp/actors/core/buffer.h b/library/cpp/actors/core/buffer.h index 95425046d6..6229114f0b 100644 --- a/library/cpp/actors/core/buffer.h +++ b/library/cpp/actors/core/buffer.h @@ -1,6 +1,6 @@ #pragma once -#include <limits> +#include <limits> class TConstBuffer; class TMutableBuffer; diff --git a/library/cpp/actors/core/callstack.cpp b/library/cpp/actors/core/callstack.cpp index 9297c1a079..dffd3df72f 100644 --- a/library/cpp/actors/core/callstack.cpp +++ b/library/cpp/actors/core/callstack.cpp @@ -7,7 +7,7 @@ namespace NActors { namespace { void (*PreviousFormatBackTrace)(IOutputStream*) = 0; ui32 ActorBackTraceEnableCounter = 0; - } + } void ActorFormatBackTrace(IOutputStream* out) { TStringStream str; @@ -88,6 +88,6 @@ namespace NActors { str << Endl; } } -} +} #endif diff --git a/library/cpp/actors/core/callstack.h b/library/cpp/actors/core/callstack.h index 176717d2ae..0f57e6cb18 100644 --- a/library/cpp/actors/core/callstack.h +++ b/library/cpp/actors/core/callstack.h @@ -44,7 +44,7 @@ namespace NActors { void EnableActorCallstack(); void DisableActorCallstack(); -} +} #else @@ -53,6 +53,6 @@ namespace NActors { inline void DisableActorCallstack(){}; -} +} #endif diff --git a/library/cpp/actors/core/event.h b/library/cpp/actors/core/event.h index 6ff02aaf94..7291699913 100644 --- a/library/cpp/actors/core/event.h +++ b/library/cpp/actors/core/event.h @@ -57,8 +57,8 @@ namespace NActors { }; public: - template <typename TEv> - inline TEv* CastAsLocal() const noexcept { + template <typename TEv> + inline TEv* CastAsLocal() const noexcept { auto fits = GetTypeRewrite() == TEv::EventType; return fits ? static_cast<TEv*>(Event.Get()) : nullptr; diff --git a/library/cpp/actors/core/event_load.h b/library/cpp/actors/core/event_load.h index 0dab1dd374..b7b9bfbe05 100644 --- a/library/cpp/actors/core/event_load.h +++ b/library/cpp/actors/core/event_load.h @@ -36,9 +36,9 @@ namespace NActors { TEventSerializedData(const TEventSerializedData& original, TString extraBuffer) : Rope(original.Rope) , ExtendedFormat(original.ExtendedFormat) - { + { Append(std::move(extraBuffer)); - } + } TEventSerializedData(TString buffer, bool extendedFormat) : ExtendedFormat(extendedFormat) diff --git a/library/cpp/actors/core/event_local.h b/library/cpp/actors/core/event_local.h index 2845aa94dd..f337b39fbe 100644 --- a/library/cpp/actors/core/event_local.h +++ b/library/cpp/actors/core/event_local.h @@ -47,7 +47,7 @@ namespace NActors { }; template <typename TEv, ui32 TEventType> - class TEventSimple: public TEventBase<TEv, TEventType> { + class TEventSimple: public TEventBase<TEv, TEventType> { public: TString ToStringHeader() const override { static TString header(TypeName<TEv>()); diff --git a/library/cpp/actors/core/event_pb.cpp b/library/cpp/actors/core/event_pb.cpp index 018ff9ac34..9ba5014755 100644 --- a/library/cpp/actors/core/event_pb.cpp +++ b/library/cpp/actors/core/event_pb.cpp @@ -220,4 +220,4 @@ namespace NActors { Buffers->Append(*s); return true; } -} +} diff --git a/library/cpp/actors/core/event_pb.h b/library/cpp/actors/core/event_pb.h index d7546b901a..61f3916dce 100644 --- a/library/cpp/actors/core/event_pb.h +++ b/library/cpp/actors/core/event_pb.h @@ -141,14 +141,14 @@ namespace NActors { TEventPBBase() = default; explicit TEventPBBase(const TRecord& rec) - { + { Record = rec; - } + } explicit TEventPBBase(TRecord&& rec) - { + { Record = std::move(rec); - } + } TString ToStringHeader() const override { return Record.GetTypeName(); @@ -394,7 +394,7 @@ namespace NActors { {} }; - template <typename TEv, typename TRecord, ui32 TEventType> + template <typename TEv, typename TRecord, ui32 TEventType> class TEventPB : public TEventPBBase<TEv, TRecord, TEventType, TRecordHolder<TRecord> > { typedef TEventPBBase<TEv, TRecord, TEventType, TRecordHolder<TRecord> > TPbBase; // NOTE: No extra fields allowed: TEventPB must be a "template typedef" @@ -406,25 +406,25 @@ namespace NActors { using TEventPBWithArena = TEventPBBase<TEv, TRecord, TEventType, TArenaRecordHolder<TRecord, InitialBlockSize, MaxBlockSize> >; template <typename TEv, typename TRecord, ui32 TEventType> - class TEventShortDebugPB: public TEventPB<TEv, TRecord, TEventType> { - public: - using TBase = TEventPB<TEv, TRecord, TEventType>; - TEventShortDebugPB() = default; - explicit TEventShortDebugPB(const TRecord& rec) - : TBase(rec) - { - } - explicit TEventShortDebugPB(TRecord&& rec) - : TBase(std::move(rec)) - { - } - TString ToString() const override { - return TypeName<TEv>() + " { " + TBase::Record.ShortDebugString() + " }"; - } - }; + class TEventShortDebugPB: public TEventPB<TEv, TRecord, TEventType> { + public: + using TBase = TEventPB<TEv, TRecord, TEventType>; + TEventShortDebugPB() = default; + explicit TEventShortDebugPB(const TRecord& rec) + : TBase(rec) + { + } + explicit TEventShortDebugPB(TRecord&& rec) + : TBase(std::move(rec)) + { + } + TString ToString() const override { + return TypeName<TEv>() + " { " + TBase::Record.ShortDebugString() + " }"; + } + }; template <typename TEv, typename TRecord, ui32 TEventType> - class TEventPreSerializedPB: public TEventPB<TEv, TRecord, TEventType> { + class TEventPreSerializedPB: public TEventPB<TEv, TRecord, TEventType> { protected: using TBase = TEventPB<TEv, TRecord, TEventType>; using TSelf = TEventPreSerializedPB<TEv, TRecord, TEventType>; @@ -437,13 +437,13 @@ namespace NActors { explicit TEventPreSerializedPB(const TRecord& rec) : TBase(rec) - { - } + { + } explicit TEventPreSerializedPB(TRecord&& rec) : TBase(std::move(rec)) - { - } + { + } // when remote event received locally this method will merge preserialized data const TRecord& GetRecord() { diff --git a/library/cpp/actors/core/event_pb_ut.cpp b/library/cpp/actors/core/event_pb_ut.cpp index a16c3092b3..c0f3ec5e8d 100644 --- a/library/cpp/actors/core/event_pb_ut.cpp +++ b/library/cpp/actors/core/event_pb_ut.cpp @@ -10,18 +10,18 @@ Y_UNIT_TEST_SUITE(TEventSerialization) { SerializeToArcadiaStream(NActors::TChunkSerializer* chunker) const override { return msg->SerializeToZeroCopyStream(chunker); } - bool IsSerializable() const override { - return true; - } + bool IsSerializable() const override { + return true; + } TString ToStringHeader() const override { - return TString(); - } - virtual TString Serialize() const { - return TString(); - } + return TString(); + } + virtual TString Serialize() const { + return TString(); + } ui32 Type() const override { - return 0; - }; + return 0; + }; }; Y_UNIT_TEST(Coroutine) { diff --git a/library/cpp/actors/core/interconnect.h b/library/cpp/actors/core/interconnect.h index 679a4b8cc6..10c036fcee 100644 --- a/library/cpp/actors/core/interconnect.h +++ b/library/cpp/actors/core/interconnect.h @@ -119,7 +119,7 @@ namespace NActors { enum EEv { EvForward = EventSpaceBegin(TEvents::ES_INTERCONNECT), EvResolveNode, // resolve info about node (internal) - EvNodeAddress, // node info (internal) + EvNodeAddress, // node info (internal) EvConnectNode, // request proxy to establish connection (like: we would send something there soon) EvAcceptIncoming, EvNodeConnected, // node connected notify @@ -244,9 +244,9 @@ namespace NActors { THolder<TNodeInfo> Node; }; - struct TEvClosePeerSocket : TEventLocal<TEvClosePeerSocket, EvClosePeerSocket> {}; + struct TEvClosePeerSocket : TEventLocal<TEvClosePeerSocket, EvClosePeerSocket> {}; - struct TEvCloseInputSession : TEventLocal<TEvCloseInputSession, EvCloseInputSession> {}; + struct TEvCloseInputSession : TEventLocal<TEvCloseInputSession, EvCloseInputSession> {}; struct TEvPoisonSession : TEventLocal<TEvPoisonSession, EvPoisonSession> {}; diff --git a/library/cpp/actors/core/log.cpp b/library/cpp/actors/core/log.cpp index 5f63b5af58..4efdc01ad0 100644 --- a/library/cpp/actors/core/log.cpp +++ b/library/cpp/actors/core/log.cpp @@ -3,14 +3,14 @@ #include <library/cpp/monlib/service/pages/templates.h> -static_assert(int(NActors::NLog::PRI_EMERG) == int(::TLOG_EMERG), "expect int(NActors::NLog::PRI_EMERG) == int(::TLOG_EMERG)"); -static_assert(int(NActors::NLog::PRI_ALERT) == int(::TLOG_ALERT), "expect int(NActors::NLog::PRI_ALERT) == int(::TLOG_ALERT)"); -static_assert(int(NActors::NLog::PRI_CRIT) == int(::TLOG_CRIT), "expect int(NActors::NLog::PRI_CRIT) == int(::TLOG_CRIT)"); -static_assert(int(NActors::NLog::PRI_ERROR) == int(::TLOG_ERR), "expect int(NActors::NLog::PRI_ERROR) == int(::TLOG_ERR)"); -static_assert(int(NActors::NLog::PRI_WARN) == int(::TLOG_WARNING), "expect int(NActors::NLog::PRI_WARN) == int(::TLOG_WARNING)"); -static_assert(int(NActors::NLog::PRI_NOTICE) == int(::TLOG_NOTICE), "expect int(NActors::NLog::PRI_NOTICE) == int(::TLOG_NOTICE)"); -static_assert(int(NActors::NLog::PRI_INFO) == int(::TLOG_INFO), "expect int(NActors::NLog::PRI_INFO) == int(::TLOG_INFO)"); -static_assert(int(NActors::NLog::PRI_DEBUG) == int(::TLOG_DEBUG), "expect int(NActors::NLog::PRI_DEBUG) == int(::TLOG_DEBUG)"); +static_assert(int(NActors::NLog::PRI_EMERG) == int(::TLOG_EMERG), "expect int(NActors::NLog::PRI_EMERG) == int(::TLOG_EMERG)"); +static_assert(int(NActors::NLog::PRI_ALERT) == int(::TLOG_ALERT), "expect int(NActors::NLog::PRI_ALERT) == int(::TLOG_ALERT)"); +static_assert(int(NActors::NLog::PRI_CRIT) == int(::TLOG_CRIT), "expect int(NActors::NLog::PRI_CRIT) == int(::TLOG_CRIT)"); +static_assert(int(NActors::NLog::PRI_ERROR) == int(::TLOG_ERR), "expect int(NActors::NLog::PRI_ERROR) == int(::TLOG_ERR)"); +static_assert(int(NActors::NLog::PRI_WARN) == int(::TLOG_WARNING), "expect int(NActors::NLog::PRI_WARN) == int(::TLOG_WARNING)"); +static_assert(int(NActors::NLog::PRI_NOTICE) == int(::TLOG_NOTICE), "expect int(NActors::NLog::PRI_NOTICE) == int(::TLOG_NOTICE)"); +static_assert(int(NActors::NLog::PRI_INFO) == int(::TLOG_INFO), "expect int(NActors::NLog::PRI_INFO) == int(::TLOG_INFO)"); +static_assert(int(NActors::NLog::PRI_DEBUG) == int(::TLOG_DEBUG), "expect int(NActors::NLog::PRI_DEBUG) == int(::TLOG_DEBUG)"); static_assert(int(NActors::NLog::PRI_TRACE) == int(::TLOG_RESOURCES), "expect int(NActors::NLog::PRI_TRACE) == int(::TLOG_RESOURCES)"); namespace { @@ -706,8 +706,8 @@ namespace NActors { public: TLineFileLogBackend(const TString& path) : TFileLogBackend(path) - { - } + { + } // Append newline after every record void WriteData(const TLogRecord& rec) override { @@ -750,4 +750,4 @@ namespace NActors { TAutoPtr<TLogBackend> CreateCompositeLogBackend(TVector<TAutoPtr<TLogBackend>>&& underlyingBackends) { return new TCompositeLogBackend(std::move(underlyingBackends)); } -} +} diff --git a/library/cpp/actors/core/log.h b/library/cpp/actors/core/log.h index c11a7cf3c1..6b66977fa1 100644 --- a/library/cpp/actors/core/log.h +++ b/library/cpp/actors/core/log.h @@ -366,4 +366,4 @@ namespace NActors { MemLogWrite(str.data(), str.size(), true); DeliverLogMessage(actorCtxOrSystem, mPriority, mComponent, std::move(str)); } -} +} diff --git a/library/cpp/actors/core/log_iface.h b/library/cpp/actors/core/log_iface.h index b331db9ca8..3acdcd69bc 100644 --- a/library/cpp/actors/core/log_iface.h +++ b/library/cpp/actors/core/log_iface.h @@ -4,55 +4,55 @@ #include "event_local.h" namespace NActors { - namespace NLog { - using EComponent = int; - - enum EPriority : ui16 { // migrate it to EPrio whenever possible - PRI_EMERG, - PRI_ALERT, - PRI_CRIT, - PRI_ERROR, - PRI_WARN, - PRI_NOTICE, - PRI_INFO, - PRI_DEBUG, - PRI_TRACE - }; - - enum class EPrio : ui16 { - Emerg = 0, - Alert = 1, - Crit = 2, - Error = 3, - Warn = 4, - Notice = 5, - Info = 6, - Debug = 7, - Trace = 8, - }; - - struct TLevel { - TLevel(ui32 raw) - : Raw(raw) - { - } - - TLevel(EPrio prio) - : Raw((ui16(prio) + 1) << 8) - { - } - - EPrio ToPrio() const noexcept { - const auto major = Raw >> 8; - - return major > 0 ? EPrio(major - 1) : EPrio::Emerg; - } - - bool IsUrgentAbortion() const noexcept { - return (Raw >> 8) == 0; - } - - /* Generalized monotonic level value composed with major and minor + namespace NLog { + using EComponent = int; + + enum EPriority : ui16 { // migrate it to EPrio whenever possible + PRI_EMERG, + PRI_ALERT, + PRI_CRIT, + PRI_ERROR, + PRI_WARN, + PRI_NOTICE, + PRI_INFO, + PRI_DEBUG, + PRI_TRACE + }; + + enum class EPrio : ui16 { + Emerg = 0, + Alert = 1, + Crit = 2, + Error = 3, + Warn = 4, + Notice = 5, + Info = 6, + Debug = 7, + Trace = 8, + }; + + struct TLevel { + TLevel(ui32 raw) + : Raw(raw) + { + } + + TLevel(EPrio prio) + : Raw((ui16(prio) + 1) << 8) + { + } + + EPrio ToPrio() const noexcept { + const auto major = Raw >> 8; + + return major > 0 ? EPrio(major - 1) : EPrio::Emerg; + } + + bool IsUrgentAbortion() const noexcept { + return (Raw >> 8) == 0; + } + + /* Generalized monotonic level value composed with major and minor levels. Minor is used for verbosity within major, basic EPrio mapped to (EPrio + 1, 0) and Major = 0 is reserved as special space with meaning like EPrio::Emerg but with extened actions. @@ -60,25 +60,25 @@ namespace NActors { idea how to handle special emergency actions. */ - ui32 Raw = 0; // ((ui16(EPrio) + 1) << 8) | ui8(minor) - }; + ui32 Raw = 0; // ((ui16(EPrio) + 1) << 8) | ui8(minor) + }; - enum class EEv { - Log = EventSpaceBegin(TEvents::ES_LOGGER), - LevelReq, - LevelResp, - Ignored, - End - }; + enum class EEv { + Log = EventSpaceBegin(TEvents::ES_LOGGER), + LevelReq, + LevelResp, + Ignored, + End + }; - static_assert(int(EEv::End) < EventSpaceEnd(TEvents::ES_LOGGER), ""); + static_assert(int(EEv::End) < EventSpaceEnd(TEvents::ES_LOGGER), ""); - class TEvLog: public TEventLocal<TEvLog, int(EEv::Log)> { - public: + class TEvLog: public TEventLocal<TEvLog, int(EEv::Log)> { + public: TEvLog(TInstant stamp, TLevel level, EComponent comp, const TString &line) - : Stamp(stamp) - , Level(level) - , Component(comp) + : Stamp(stamp) + , Level(level) + , Component(comp) , Line(line) { } @@ -87,23 +87,23 @@ namespace NActors { : Stamp(stamp) , Level(level) , Component(comp) - , Line(std::move(line)) - { - } - - TEvLog(EPriority prio, EComponent comp, TString line, TInstant time = TInstant::Now()) - : Stamp(time) - , Level(EPrio(prio)) - , Component(comp) - , Line(std::move(line)) - { - } - - const TInstant Stamp = TInstant::Max(); - const TLevel Level; - const EComponent Component = 0; - TString Line; - }; - - } + , Line(std::move(line)) + { + } + + TEvLog(EPriority prio, EComponent comp, TString line, TInstant time = TInstant::Now()) + : Stamp(time) + , Level(EPrio(prio)) + , Component(comp) + , Line(std::move(line)) + { + } + + const TInstant Stamp = TInstant::Max(); + const TLevel Level; + const EComponent Component = 0; + TString Line; + }; + + } } diff --git a/library/cpp/actors/core/log_settings.cpp b/library/cpp/actors/core/log_settings.cpp index f52f2fc5d2..c4e5a39d46 100644 --- a/library/cpp/actors/core/log_settings.cpp +++ b/library/cpp/actors/core/log_settings.cpp @@ -225,6 +225,6 @@ namespace NActors { return InvalidComponent; } - } + } -} +} diff --git a/library/cpp/actors/core/log_settings.h b/library/cpp/actors/core/log_settings.h index 7fe4504edd..9b611e4285 100644 --- a/library/cpp/actors/core/log_settings.h +++ b/library/cpp/actors/core/log_settings.h @@ -41,8 +41,8 @@ namespace NActors { static const int InvalidComponent = -1; // Functions converts EComponent id to string - using EComponentToStringFunc = std::function<const TString&(EComponent)>; - ; + using EComponentToStringFunc = std::function<const TString&(EComponent)>; + ; // Log settings struct TComponentSettings { @@ -109,7 +109,7 @@ namespace NActors { void Append(EComponent minVal, EComponent maxVal, EComponentToStringFunc func); - template <typename T> + template <typename T> void Append(T minVal, T maxVal, const TString& (*func)(T)) { Append( static_cast<EComponent>(minVal), @@ -171,6 +171,6 @@ namespace NActors { EPriority priority, EComponent component, TString& explanation); }; - } + } -} +} diff --git a/library/cpp/actors/core/mon.h b/library/cpp/actors/core/mon.h index c450f2338e..e8d3ab753d 100644 --- a/library/cpp/actors/core/mon.h +++ b/library/cpp/actors/core/mon.h @@ -17,7 +17,7 @@ namespace NActors { End }; - static_assert(End < EventSpaceEnd(NActors::TEvents::ES_MON), "expect End < EventSpaceEnd(NActors::TEvents::ES_MON)"); + static_assert(End < EventSpaceEnd(NActors::TEvents::ES_MON), "expect End < EventSpaceEnd(NActors::TEvents::ES_MON)"); // request info from an actor in HTML format struct TEvHttpInfo: public NActors::TEventLocal<TEvHttpInfo, HttpInfo> { @@ -229,6 +229,6 @@ namespace NActors { } }; - } + } -} +} diff --git a/library/cpp/actors/core/mon_stats.h b/library/cpp/actors/core/mon_stats.h index d55552af0c..7009c4ddfb 100644 --- a/library/cpp/actors/core/mon_stats.h +++ b/library/cpp/actors/core/mon_stats.h @@ -89,8 +89,8 @@ namespace NActors { TExecutorThreadStats(size_t activityVecSize = 1) // must be not empty as 0 used as default : ElapsedTicksByActivity(activityVecSize) - , ReceivedEventsByActivity(activityVecSize) - , ActorsAliveByActivity(activityVecSize) + , ReceivedEventsByActivity(activityVecSize) + , ActorsAliveByActivity(activityVecSize) , ScheduledEventsByActivity(activityVecSize) {} @@ -144,4 +144,4 @@ namespace NActors { } }; -} +} diff --git a/library/cpp/actors/core/probes.h b/library/cpp/actors/core/probes.h index 4912d6dd26..052be33906 100644 --- a/library/cpp/actors/core/probes.h +++ b/library/cpp/actors/core/probes.h @@ -74,7 +74,7 @@ PROBE(ActorsystemScheduler, GROUPS("Durations"), \ TYPES(ui64, ui64, ui32, ui32, ui64, ui64), \ NAMES("timeUs", "timerfd_expirations", "eventsGottenFromQueues", "eventsSent", \ - "eventsInSendQueue", "eventSchedulingErrorUs")) \ + "eventsInSendQueue", "eventSchedulingErrorUs")) \ PROBE(ForwardEvent, GROUPS("Orbit", "InterconnectSessionTCP"), \ TYPES(ui32, ui32, ui32, LWTYPE_ACTORID, LWTYPE_ACTORID, ui64, ui32), \ NAMES("peerId", "type", "flags", LWNAME_ACTORID("r"), LWNAME_ACTORID("s"), \ @@ -166,7 +166,7 @@ PROBE(MoveCpu, GROUPS("PoolCpuBalancer"), \ TYPES(ui32, ui64, TString, TString, ui32), \ NAMES("fromPoolId", "toPoolId", "fromPool", "toPool", "cpu")) \ - /**/ + /**/ LWTRACE_DECLARE_PROVIDER(ACTORLIB_PROVIDER) diff --git a/library/cpp/actors/core/process_stats.cpp b/library/cpp/actors/core/process_stats.cpp index 0e1dbd0031..8876ab3f34 100644 --- a/library/cpp/actors/core/process_stats.cpp +++ b/library/cpp/actors/core/process_stats.cpp @@ -300,4 +300,4 @@ namespace { IActor* CreateProcStatCollector(TDuration interval, NMonitoring::TMetricRegistry& registry) { return new TRegistryCollector(interval, registry); } -} +} diff --git a/library/cpp/actors/core/process_stats.h b/library/cpp/actors/core/process_stats.h index 66346d0b5a..707ccc9ffa 100644 --- a/library/cpp/actors/core/process_stats.h +++ b/library/cpp/actors/core/process_stats.h @@ -63,4 +63,4 @@ namespace NActors { IActor* CreateProcStatCollector(ui32 intervalSec, NMonitoring::TDynamicCounterPtr counters); IActor* CreateProcStatCollector(TDuration interval, NMonitoring::TMetricRegistry& registry); -} +} diff --git a/library/cpp/actors/core/scheduler_actor.cpp b/library/cpp/actors/core/scheduler_actor.cpp index febc5e40dd..484678a349 100644 --- a/library/cpp/actors/core/scheduler_actor.cpp +++ b/library/cpp/actors/core/scheduler_actor.cpp @@ -8,15 +8,15 @@ #include <util/system/hp_timer.h> #ifdef __linux__ -#include <sys/timerfd.h> -#include <errno.h> +#include <sys/timerfd.h> +#include <errno.h> LWTRACE_USING(ACTORLIB_PROVIDER); namespace NActors { - class TTimerDescriptor: public TSharedDescriptor { + class TTimerDescriptor: public TSharedDescriptor { const int Descriptor; - + public: TTimerDescriptor() : Descriptor(timerfd_create(CLOCK_MONOTONIC, TFD_NONBLOCK)) @@ -33,7 +33,7 @@ namespace NActors { } }; - class TSchedulerActor: public TActor<TSchedulerActor> { + class TSchedulerActor: public TActor<TSchedulerActor> { const TSchedulerConfig Cfg; TIntrusivePtr<TSharedDescriptor> TimerDescriptor; @@ -47,7 +47,7 @@ namespace NActors { ui64 ActiveTick; typedef TMap<ui64, TAutoPtr<NSchedulerQueue::TQueueType>> TMomentMap; // intrasecond queues - typedef THashMap<ui64, TAutoPtr<TMomentMap>> TScheduleMap; // over-second schedule + typedef THashMap<ui64, TAutoPtr<TMomentMap>> TScheduleMap; // over-second schedule TScheduleMap ScheduleMap; @@ -55,7 +55,7 @@ namespace NActors { static const ui64 IntrasecondThreshold = 1048576; // ~second TAutoPtr<TMomentMap> ActiveSec; - volatile ui64* CurrentTimestamp = nullptr; + volatile ui64* CurrentTimestamp = nullptr; volatile ui64* CurrentMonotonic = nullptr; TDeque<TAutoPtr<IEventHandle>> EventsToBeSent; @@ -64,7 +64,7 @@ namespace NActors { return IActor::ACTOR_SYSTEM_SCHEDULER_ACTOR; } - TSchedulerActor(const TSchedulerConfig& cfg) + TSchedulerActor(const TSchedulerConfig& cfg) : TActor(&TSchedulerActor::StateFunc) , Cfg(cfg) , TimerDescriptor(new TTimerDescriptor()) @@ -75,8 +75,8 @@ namespace NActors { Become(&TSchedulerActor::StateFunc); } - void Handle(TEvSchedulerInitialize::TPtr& ev, const TActorContext& ctx) { - const TEvSchedulerInitialize& evInitialize = *ev->Get(); + void Handle(TEvSchedulerInitialize::TPtr& ev, const TActorContext& ctx) { + const TEvSchedulerInitialize& evInitialize = *ev->Get(); Y_ASSERT(evInitialize.ScheduleReaders.size() != 0); Readers.resize(evInitialize.ScheduleReaders.size()); Copy(evInitialize.ScheduleReaders.begin(), evInitialize.ScheduleReaders.end(), Readers.begin()); @@ -114,7 +114,7 @@ namespace NActors { AtomicStore(CurrentMonotonic, MonotonicTime); } - void TryUpdateTime(NHPTimer::STime* lastTimeUpdate) { + void TryUpdateTime(NHPTimer::STime* lastTimeUpdate) { NHPTimer::STime hpnow; GetTimeFast(&hpnow); const ui64 elapsedCycles = hpnow > *lastTimeUpdate ? hpnow - *lastTimeUpdate : 0; @@ -256,7 +256,7 @@ namespace NActors { ) }; - IActor* CreateSchedulerActor(const TSchedulerConfig& cfg) { + IActor* CreateSchedulerActor(const TSchedulerConfig& cfg) { if (cfg.UseSchedulerActor) { return new TSchedulerActor(cfg); } else { @@ -264,16 +264,16 @@ namespace NActors { } } -} +} #else // linux namespace NActors { - IActor* CreateSchedulerActor(const TSchedulerConfig& cfg) { + IActor* CreateSchedulerActor(const TSchedulerConfig& cfg) { Y_UNUSED(cfg); return nullptr; } -} +} #endif // linux diff --git a/library/cpp/actors/core/scheduler_actor.h b/library/cpp/actors/core/scheduler_actor.h index c2c561b43d..f743ed8d83 100644 --- a/library/cpp/actors/core/scheduler_actor.h +++ b/library/cpp/actors/core/scheduler_actor.h @@ -8,22 +8,22 @@ namespace NActors { struct TEvSchedulerInitialize : TEventLocal<TEvSchedulerInitialize, TEvents::TSystem::Bootstrap> { TVector<NSchedulerQueue::TReader*> ScheduleReaders; - volatile ui64* CurrentTimestamp; + volatile ui64* CurrentTimestamp; volatile ui64* CurrentMonotonic; TEvSchedulerInitialize(const TVector<NSchedulerQueue::TReader*>& scheduleReaders, volatile ui64* currentTimestamp, volatile ui64* currentMonotonic) : ScheduleReaders(scheduleReaders) , CurrentTimestamp(currentTimestamp) , CurrentMonotonic(currentMonotonic) - { - } + { + } }; - IActor* CreateSchedulerActor(const TSchedulerConfig& cfg); + IActor* CreateSchedulerActor(const TSchedulerConfig& cfg); inline TActorId MakeSchedulerActorId() { char x[12] = {'s', 'c', 'h', 'e', 'd', 'u', 'l', 'e', 'r', 's', 'e', 'r'}; return TActorId(0, TStringBuf(x, 12)); } -} +} diff --git a/library/cpp/actors/core/scheduler_actor_ut.cpp b/library/cpp/actors/core/scheduler_actor_ut.cpp index 09b7369d36..b449494e6c 100644 --- a/library/cpp/actors/core/scheduler_actor_ut.cpp +++ b/library/cpp/actors/core/scheduler_actor_ut.cpp @@ -30,13 +30,13 @@ Y_UNIT_TEST_SUITE(SchedulerActor) { { } - void Bootstrap(const TActorContext& ctx) { + void Bootstrap(const TActorContext& ctx) { LastWakeup = ctx.Now(); Become(&TThis::StateFunc); ctx.Schedule(ScheduleDelta, new TEvents::TEvWakeup()); } - void Handle(TEvents::TEvWakeup::TPtr& /*ev*/, const TActorContext& ctx) { + void Handle(TEvents::TEvWakeup::TPtr& /*ev*/, const TActorContext& ctx) { const TInstant now = ctx.Now(); UNIT_ASSERT(now - LastWakeup >= ScheduleDelta); LastWakeup = now; @@ -48,25 +48,25 @@ Y_UNIT_TEST_SUITE(SchedulerActor) { } } - STRICT_STFUNC(StateFunc, {HFunc(TEvents::TEvWakeup, Handle)}) + STRICT_STFUNC(StateFunc, {HFunc(TEvents::TEvWakeup, Handle)}) }; void Test(TAtomicBase eventsTotalCount, ui32 scheduleDeltaMs) { THolder<TActorSystemSetup> setup = MakeHolder<TActorSystemSetup>(); setup->NodeId = 0; setup->ExecutorsCount = 1; - setup->Executors.Reset(new TAutoPtr<IExecutorPool>[setup->ExecutorsCount]); + setup->Executors.Reset(new TAutoPtr<IExecutorPool>[setup->ExecutorsCount]); for (ui32 i = 0; i < setup->ExecutorsCount; ++i) { setup->Executors[i] = new TBasicExecutorPool(i, 5, 10, "basic"); } // create poller actor (whether platform supports it) TActorId pollerActorId; - if (IActor* poller = CreatePollerActor()) { + if (IActor* poller = CreatePollerActor()) { pollerActorId = MakePollerActorId(); setup->LocalServices.emplace_back(pollerActorId, TActorSetupCmd(poller, TMailboxType::ReadAsFilled, 0)); } TActorId schedulerActorId; - if (IActor* schedulerActor = CreateSchedulerActor(TSchedulerConfig())) { + if (IActor* schedulerActor = CreateSchedulerActor(TSchedulerConfig())) { schedulerActorId = MakeSchedulerActorId(); setup->LocalServices.emplace_back(schedulerActorId, TActorSetupCmd(schedulerActor, TMailboxType::ReadAsFilled, 0)); } diff --git a/library/cpp/actors/core/scheduler_basic.cpp b/library/cpp/actors/core/scheduler_basic.cpp index fba200e16b..f9a486dc1b 100644 --- a/library/cpp/actors/core/scheduler_basic.cpp +++ b/library/cpp/actors/core/scheduler_basic.cpp @@ -248,7 +248,7 @@ namespace NActors { MainCycle.Destroy(); } -} +} #ifdef __linux__ @@ -261,12 +261,12 @@ namespace NActors { } } -} +} #else // __linux__ namespace NActors { - ISchedulerThread* CreateSchedulerThread(const TSchedulerConfig& config) { + ISchedulerThread* CreateSchedulerThread(const TSchedulerConfig& config) { return new TBasicSchedulerThread(config); } } diff --git a/library/cpp/actors/core/scheduler_basic.h b/library/cpp/actors/core/scheduler_basic.h index 2ccde39235..0237c3c0a8 100644 --- a/library/cpp/actors/core/scheduler_basic.h +++ b/library/cpp/actors/core/scheduler_basic.h @@ -27,7 +27,7 @@ namespace NActors { volatile bool StopFlag; typedef TMap<ui64, TAutoPtr<NSchedulerQueue::TQueueType>> TMomentMap; // intrasecond queues - typedef THashMap<ui64, TAutoPtr<TMomentMap>> TScheduleMap; // over-second schedule + typedef THashMap<ui64, TAutoPtr<TMomentMap>> TScheduleMap; // over-second schedule TScheduleMap ScheduleMap; @@ -50,7 +50,7 @@ namespace NActors { void Stop() override; }; - class TMockSchedulerThread: public ISchedulerThread { + class TMockSchedulerThread: public ISchedulerThread { public: virtual ~TMockSchedulerThread() override { } @@ -76,6 +76,6 @@ namespace NActors { } }; - ISchedulerThread* CreateSchedulerThread(const TSchedulerConfig& cfg); + ISchedulerThread* CreateSchedulerThread(const TSchedulerConfig& cfg); } |