summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvvvv <[email protected]>2025-06-17 22:29:00 +0300
committervvvv <[email protected]>2025-06-17 22:43:23 +0300
commiteb5cfac23dd911355748ad88375812f00b50958e (patch)
treef823600ace6fba9caa5356afa53870fc4fed7186
parent0a23534b4271d9f9299a4b3bb382be2b3128cfc5 (diff)
YQL-20086 utils
commit_hash:a17cddd8437124cb2737507cf91b8946df93f631
-rw-r--r--yql/essentials/utils/backtrace/backtrace_lib.cpp9
-rw-r--r--yql/essentials/utils/failure_injector/failure_injector.cpp12
-rw-r--r--yql/essentials/utils/failure_injector/failure_injector.h4
-rw-r--r--yql/essentials/utils/fetch/fetch.cpp30
-rw-r--r--yql/essentials/utils/log/log.cpp22
-rw-r--r--yql/essentials/utils/multi_resource_lock.h6
-rw-r--r--yql/essentials/utils/oom_helper/inject.cpp4
-rw-r--r--yql/essentials/utils/signals/signals.cpp10
-rw-r--r--yql/essentials/utils/sys/linux_version.h2
-rw-r--r--yql/essentials/utils/url_builder.cpp18
-rw-r--r--yql/essentials/utils/url_builder.h4
11 files changed, 61 insertions, 60 deletions
diff --git a/yql/essentials/utils/backtrace/backtrace_lib.cpp b/yql/essentials/utils/backtrace/backtrace_lib.cpp
index c0c7b2c667a..dd2d295dc30 100644
--- a/yql/essentials/utils/backtrace/backtrace_lib.cpp
+++ b/yql/essentials/utils/backtrace/backtrace_lib.cpp
@@ -33,7 +33,7 @@ namespace {
return 0;
}
#endif
- bool comp(const TDllInfo& a, const TDllInfo& b) {
+ bool Comp(const TDllInfo& a, const TDllInfo& b) {
return strcmp(a.Path, b.Path) < 0;
}
@@ -49,7 +49,7 @@ namespace NYql {
memset(&dlInfo, 0, sizeof(dlInfo));
auto ret = dladdr(reinterpret_cast<void*>(addr), &dlInfo);
if (ret) {
- auto it = std::lower_bound(DLLs, DLLs + DLLCount, std::remove_reference_t<decltype(DLLs[0])> {dlInfo.dli_fname, {}}, comp);
+ auto it = std::lower_bound(DLLs, DLLs + DLLCount, std::remove_reference_t<decltype(DLLs[0])> {dlInfo.dli_fname, {}}, Comp);
if (it != DLLs + DLLCount && !strcmp(it->Path, dlInfo.dli_fname)) {
File = it->Path;
Address -= it->BaseAddress;
@@ -63,7 +63,7 @@ namespace NYql {
DLLCount = 0;
dl_iterate_phdr(DlIterCallback, &DLLs);
#endif
- std::stable_sort(DLLs, DLLs + DLLCount, comp);
+ std::stable_sort(DLLs, DLLs + DLLCount, Comp);
size_t cnt = CollectBacktrace(Stack, Limit, data);
return CollectFrames(frames, Stack, cnt);
}
@@ -75,4 +75,5 @@ namespace NYql {
return cnt;
}
}
-} \ No newline at end of file
+}
+
diff --git a/yql/essentials/utils/failure_injector/failure_injector.cpp b/yql/essentials/utils/failure_injector/failure_injector.cpp
index 4f4f9c1eb69..dfaff74503a 100644
--- a/yql/essentials/utils/failure_injector/failure_injector.cpp
+++ b/yql/essentials/utils/failure_injector/failure_injector.cpp
@@ -30,8 +30,8 @@ THashMap<TString, TFailureInjector::TFailureSpec> TFailureInjector::GetCurrentSt
THashMap<TString, TFailureInjector::TFailureSpec> TFailureInjector::GetCurrentStateImpl() {
THashMap<TString, TFailureInjector::TFailureSpec> copy;
- with_lock(Lock) {
- copy = FailureSpecs;
+ with_lock(Lock_) {
+ copy = FailureSpecs_;
}
return copy;
}
@@ -40,8 +40,8 @@ void TFailureInjector::ReachImpl(std::string_view name, std::function<void()> ac
if (!Enabled_.load()) {
return;
}
- with_lock(Lock) {
- if (auto failureSpec = FailureSpecs.FindPtr(name)) {
+ with_lock(Lock_) {
+ if (auto failureSpec = FailureSpecs_.FindPtr(name)) {
YQL_LOG(DEBUG) << "TFailureInjector::Reach: " << name << ", Skip=" << failureSpec->Skip << ", Fails=" << failureSpec->CountOfFails;
if (failureSpec->Skip > 0) {
--failureSpec->Skip;
@@ -55,9 +55,9 @@ void TFailureInjector::ReachImpl(std::string_view name, std::function<void()> ac
}
void TFailureInjector::SetImpl(std::string_view name, ui64 skip, ui64 countOfFails) {
- with_lock(Lock) {
+ with_lock(Lock_) {
YQL_ENSURE(countOfFails > 0, "failure " << name << ", 'countOfFails' must be positive");
- FailureSpecs[TString{name}] = TFailureSpec{skip, countOfFails};
+ FailureSpecs_[TString{name}] = TFailureSpec{skip, countOfFails};
}
}
diff --git a/yql/essentials/utils/failure_injector/failure_injector.h b/yql/essentials/utils/failure_injector/failure_injector.h
index 6db79fc8c0e..227eb1518f1 100644
--- a/yql/essentials/utils/failure_injector/failure_injector.h
+++ b/yql/essentials/utils/failure_injector/failure_injector.h
@@ -29,8 +29,8 @@ private:
THashMap<TString, TFailureSpec> GetCurrentStateImpl();
std::atomic<bool> Enabled_ = false;
- THashMap<TString, TFailureSpec> FailureSpecs;
- TMutex Lock;
+ THashMap<TString, TFailureSpec> FailureSpecs_;
+ TMutex Lock_;
};
} // NYql
diff --git a/yql/essentials/utils/fetch/fetch.cpp b/yql/essentials/utils/fetch/fetch.cpp
index d35baeb0974..0797e81b2a7 100644
--- a/yql/essentials/utils/fetch/fetch.cpp
+++ b/yql/essentials/utils/fetch/fetch.cpp
@@ -64,33 +64,33 @@ public:
rqs << "\r\n";
}
- Socket.Reset(new TSocket(TNetworkAddress(host, port), timeout));
- SocketInput.Reset(new TSocketInput(*Socket));
- SocketOutput.Reset(new TSocketOutput(*Socket));
+ Socket_.Reset(new TSocket(TNetworkAddress(host, port), timeout));
+ SocketInput_.Reset(new TSocketInput(*Socket_));
+ SocketOutput_.Reset(new TSocketOutput(*Socket_));
- Socket->SetSocketTimeout(timeout.Seconds(), timeout.MilliSeconds() % 1000);
+ Socket_->SetSocketTimeout(timeout.Seconds(), timeout.MilliSeconds() % 1000);
if (https) {
- Ssl.Reset(new TOpenSslClientIO(SocketInput.Get(), SocketOutput.Get()));
+ Ssl_.Reset(new TOpenSslClientIO(SocketInput_.Get(), SocketOutput_.Get()));
}
{
- THttpOutput ho(Ssl ? (IOutputStream*)Ssl.Get() : (IOutputStream*)SocketOutput.Get());
+ THttpOutput ho(Ssl_ ? (IOutputStream*)Ssl_.Get() : (IOutputStream*)SocketOutput_.Get());
(ho << req).Finish();
}
- HttpInput.Reset(new THttpInput(Ssl ? (IInputStream*)Ssl.Get() : (IInputStream*)SocketInput.Get()));
+ HttpInput_.Reset(new THttpInput(Ssl_ ? (IInputStream*)Ssl_.Get() : (IInputStream*)SocketInput_.Get()));
}
THttpInput& GetStream() override {
- return *HttpInput;
+ return *HttpInput_;
}
unsigned GetRetCode() override {
- return ParseHttpRetCode(HttpInput->FirstLine());
+ return ParseHttpRetCode(HttpInput_->FirstLine());
}
THttpURL GetRedirectURL(const THttpURL& baseUrl) override {
- for (auto i = HttpInput->Headers().Begin(); i != HttpInput->Headers().End(); ++i) {
+ for (auto i = HttpInput_->Headers().Begin(); i != HttpInput_->Headers().End(); ++i) {
if (0 == TCiString::compare(i->Name(), TStringBuf("location"))) {
THttpURL target = ParseURL(i->Value(), THttpURL::FeaturesAll | NUri::TFeature::FeatureConvertHostIDN);
if (!target.IsValidAbs()) {
@@ -107,11 +107,11 @@ public:
}
private:
- THolder<TSocket> Socket;
- THolder<TSocketInput> SocketInput;
- THolder<TSocketOutput> SocketOutput;
- THolder<TOpenSslClientIO> Ssl;
- THolder<THttpInput> HttpInput;
+ THolder<TSocket> Socket_;
+ THolder<TSocketInput> SocketInput_;
+ THolder<TSocketOutput> SocketOutput_;
+ THolder<TOpenSslClientIO> Ssl_;
+ THolder<THttpInput> HttpInput_;
};
inline bool IsRedirectCode(unsigned code) {
diff --git a/yql/essentials/utils/log/log.cpp b/yql/essentials/utils/log/log.cpp
index fc63913c750..519b9aabe9e 100644
--- a/yql/essentials/utils/log/log.cpp
+++ b/yql/essentials/utils/log/log.cpp
@@ -26,9 +26,9 @@ namespace {
class TLimitedLogBackend final : public TLogBackend {
public:
TLimitedLogBackend(TAutoPtr<TLogBackend> b, TAtomic& flag, ui64 limit) noexcept
- : Backend(b)
- , Flag(flag)
- , Limit(limit)
+ : Backend_(b)
+ , Flag_(flag)
+ , Limit_(limit)
{
}
@@ -36,24 +36,24 @@ public:
}
void ReopenLog() final {
- Backend->ReopenLog();
+ Backend_->ReopenLog();
}
void WriteData(const TLogRecord& rec) final {
- const auto remaining = AtomicGet(Limit);
- const bool final = remaining > 0 && AtomicSub(Limit, rec.Len) <= 0;
+ const auto remaining = AtomicGet(Limit_);
+ const bool final = remaining > 0 && AtomicSub(Limit_, rec.Len) <= 0;
if (remaining > 0 || rec.Priority <= TLOG_WARNING) {
- Backend->WriteData(rec);
+ Backend_->WriteData(rec);
}
if (final) {
- AtomicSet(Flag, 1);
+ AtomicSet(Flag_, 1);
}
}
private:
- THolder<TLogBackend> Backend;
- TAtomic& Flag;
- TAtomic Limit;
+ THolder<TLogBackend> Backend_;
+ TAtomic& Flag_;
+ TAtomic Limit_;
};
class TEmergencyLogOutput: public IOutputStream {
diff --git a/yql/essentials/utils/multi_resource_lock.h b/yql/essentials/utils/multi_resource_lock.h
index 61804fa9a49..c7f4ea49e27 100644
--- a/yql/essentials/utils/multi_resource_lock.h
+++ b/yql/essentials/utils/multi_resource_lock.h
@@ -18,7 +18,7 @@ private:
return RefCount() == 1;
}
- TMutex Mutex_;
+ TMutex Mutex;
};
public:
@@ -29,7 +29,7 @@ public:
, ResourceId_(std::move(resourceId))
{
Y_ENSURE(Lock_);
- Lock_->Mutex_.Acquire();
+ Lock_->Mutex.Acquire();
}
TResourceLock(TResourceLock&& other)
@@ -47,7 +47,7 @@ public:
return;
}
- Lock_->Mutex_.Release();
+ Lock_->Mutex.Release();
// decrement ref count before TryCleanup
Lock_ = nullptr;
Owner_.TryCleanup(ResourceId_);
diff --git a/yql/essentials/utils/oom_helper/inject.cpp b/yql/essentials/utils/oom_helper/inject.cpp
index 089d1a3b24f..e0b6a2e0c8e 100644
--- a/yql/essentials/utils/oom_helper/inject.cpp
+++ b/yql/essentials/utils/oom_helper/inject.cpp
@@ -11,7 +11,7 @@
#define UNIT SYSCALL_MMAP2_UNIT
#define OFF_MASK ((-0x2000ULL << (8*sizeof(long)-1)) | (UNIT-1))
-void *__mmap(void *start, size_t len, int prot, int flags, int fd, off_t off)
+void *Mmap(void *start, size_t len, int prot, int flags, int fd, off_t off)
{
void* ret = (void*)-1;
if (off & OFF_MASK) {
@@ -39,7 +39,7 @@ void *__mmap(void *start, size_t len, int prot, int flags, int fd, off_t off)
void *mmap(void *start, size_t len, int prot, int flags, int fd, off_t off)
{
- auto res = __mmap(start, len, prot, flags, fd, off);
+ auto res = Mmap(start, len, prot, flags, fd, off);
if (res == (void*) -1 && errno == ENOMEM) {
fprintf(stderr, "mmap failed with ENOMEM\n");
_exit(2);
diff --git a/yql/essentials/utils/signals/signals.cpp b/yql/essentials/utils/signals/signals.cpp
index 45e199e95f4..bb22e266240 100644
--- a/yql/essentials/utils/signals/signals.cpp
+++ b/yql/essentials/utils/signals/signals.cpp
@@ -128,8 +128,8 @@ int SetSignalHandler(int signo, void (*handler)(int))
struct TSignalHandlerDesc
{
- int signo;
- void (*handler)(int);
+ int Signo;
+ void (*Handler)(int);
};
void SetSignalHandlers(const TSignalHandlerDesc* handlerDescs)
@@ -137,11 +137,11 @@ void SetSignalHandlers(const TSignalHandlerDesc* handlerDescs)
sigset_t interestedSignals;
SigEmptySet(&interestedSignals);
- for (int i = 0; handlerDescs[i].signo != -1; i++) {
- int signo = handlerDescs[i].signo;
+ for (int i = 0; handlerDescs[i].Signo != -1; i++) {
+ int signo = handlerDescs[i].Signo;
SigAddSet(&interestedSignals, signo);
- if (SetSignalHandler(signo, handlerDescs[i].handler) == -1) {
+ if (SetSignalHandler(signo, handlerDescs[i].Handler) == -1) {
ythrow TSystemError() << "Cannot set handler for signal "
<< strsignal(signo);
}
diff --git a/yql/essentials/utils/sys/linux_version.h b/yql/essentials/utils/sys/linux_version.h
index c8c32da125c..7ae893d257d 100644
--- a/yql/essentials/utils/sys/linux_version.h
+++ b/yql/essentials/utils/sys/linux_version.h
@@ -9,5 +9,5 @@ namespace NYql {
// returns version, patch level
std::pair<int, int> DetectLinuxKernelVersion2();
- bool IsLinuxKernelBelow4_3();
+ bool IsLinuxKernelBelow4_3(); // NOLINT(readability-identifier-naming)
}
diff --git a/yql/essentials/utils/url_builder.cpp b/yql/essentials/utils/url_builder.cpp
index 31344fbb221..e8a55561e84 100644
--- a/yql/essentials/utils/url_builder.cpp
+++ b/yql/essentials/utils/url_builder.cpp
@@ -5,12 +5,12 @@
namespace NYql {
TUrlBuilder::TUrlBuilder(const TString& uri)
- : MainUri(uri)
+ : MainUri_(uri)
{
}
TUrlBuilder& TUrlBuilder::AddUrlParam(const TString& name, const TString& value) {
- Params.emplace_back(TParam {name, value});
+ Params_.emplace_back(TParam {name, value});
return *this;
}
@@ -19,25 +19,25 @@ TUrlBuilder& TUrlBuilder::AddPathComponent(const TString& value) {
throw yexception() << "Empty path component is not allowed";
}
TStringBuilder res;
- res << MainUri;
- if (!MainUri.EndsWith('/')) {
+ res << MainUri_;
+ if (!MainUri_.EndsWith('/')) {
res << '/';
}
res << UrlEscapeRet(value, true);
- MainUri = std::move(res);
+ MainUri_ = std::move(res);
return *this;
}
TString TUrlBuilder::Build() const {
- if (Params.empty()) {
- return MainUri;
+ if (Params_.empty()) {
+ return MainUri_;
}
TStringBuilder res;
- res << MainUri << "?";
+ res << MainUri_ << "?";
TStringBuf separator = ""sv;
- for (const auto& p : Params) {
+ for (const auto& p : Params_) {
res << separator << p.Name;
if (p.Value) {
res << "=" << CGIEscapeRet(p.Value);
diff --git a/yql/essentials/utils/url_builder.h b/yql/essentials/utils/url_builder.h
index 774bc3bcd86..c4d4cfb7854 100644
--- a/yql/essentials/utils/url_builder.h
+++ b/yql/essentials/utils/url_builder.h
@@ -19,8 +19,8 @@ public:
TString Build() const;
private:
- std::vector<TParam> Params;
- TString MainUri;
+ std::vector<TParam> Params_;
+ TString MainUri_;
};
} // NYql