aboutsummaryrefslogtreecommitdiffstats
path: root/library/cpp
diff options
context:
space:
mode:
authorAlexSm <alex@ydb.tech>2024-01-18 11:28:56 +0100
committerGitHub <noreply@github.com>2024-01-18 11:28:56 +0100
commit9d0a3761b3201e0d9db879a7adf91876ebdb0564 (patch)
tree541d11ac878c18efd7ebca81e35112aa0fef995b /library/cpp
parent404ef8886ecc9736bc58ade6da2fbd83b486a408 (diff)
downloadydb-9d0a3761b3201e0d9db879a7adf91876ebdb0564.tar.gz
Library import 8 (#1074)
* Library import 8 * Add contrib/libs/cxxsupp/libcxx/include/__verbose_abort
Diffstat (limited to 'library/cpp')
-rw-r--r--library/cpp/http/fetch/exthttpcodes.h1
-rw-r--r--library/cpp/http/fetch/http_digest.cpp41
-rw-r--r--library/cpp/http/fetch/http_digest.h10
-rw-r--r--library/cpp/http/fetch/httpagent.h6
-rw-r--r--library/cpp/http/fetch/httpload.cpp5
-rw-r--r--library/cpp/unified_agent_client/client.h4
-rw-r--r--library/cpp/yt/memory/blob.h2
-rw-r--r--library/cpp/yt/memory/chunked_memory_pool.h2
-rw-r--r--library/cpp/yt/memory/intrusive_ptr.h8
-rw-r--r--library/cpp/yt/memory/new-inl.h4
-rw-r--r--library/cpp/yt/memory/ref.cpp2
-rw-r--r--library/cpp/yt/memory/ref_counted-inl.h2
-rw-r--r--library/cpp/yt/memory/weak_ptr.h6
-rw-r--r--library/cpp/yt/misc/strong_typedef-inl.h51
-rw-r--r--library/cpp/yt/misc/unittests/strong_typedef_ut.cpp4
-rw-r--r--library/cpp/yt/threading/fork_aware_spin_lock.h2
16 files changed, 98 insertions, 52 deletions
diff --git a/library/cpp/http/fetch/exthttpcodes.h b/library/cpp/http/fetch/exthttpcodes.h
index 49e7e5e62d..764e637fee 100644
--- a/library/cpp/http/fetch/exthttpcodes.h
+++ b/library/cpp/http/fetch/exthttpcodes.h
@@ -50,6 +50,7 @@ enum ExtHttpCodes {
HTTP_FETCHER_MB_ERROR = 1041,
HTTP_SSL_CERT_ERROR = 1042,
HTTP_FIREWALL_REJECT = 1043,
+ HTTP_INTERNAL_DNS_ERROR = 1047,
HTTP_PROXY_REQUEST_CANCELED = 1051,
// Custom (replace HTTP 200/304)
diff --git a/library/cpp/http/fetch/http_digest.cpp b/library/cpp/http/fetch/http_digest.cpp
index 4dff4b047d..5adf391709 100644
--- a/library/cpp/http/fetch/http_digest.cpp
+++ b/library/cpp/http/fetch/http_digest.cpp
@@ -47,21 +47,19 @@ const char* httpDigestHandler::getHeaderInstruction() const {
}
/************************************************************/
-void httpDigestHandler::generateCNonce(char* outCNonce) {
- if (!*outCNonce)
- sprintf(outCNonce, "%ld", (long)time(nullptr));
-}
-
-/************************************************************/
-inline void addMD5(MD5& ctx, const char* value) {
+Y_FORCE_INLINE void addMD5(MD5& ctx, const char* value) {
ctx.Update((const unsigned char*)(value), strlen(value));
}
-inline void addMD5(MD5& ctx, const char* value, int len) {
+Y_FORCE_INLINE void addMD5(MD5& ctx, const char* value, int len) {
ctx.Update((const unsigned char*)(value), len);
}
-inline void addMD5Sep(MD5& ctx) {
+Y_FORCE_INLINE void addMD5(MD5& ctx, std::string_view str) {
+ ctx.Update(str);
+}
+
+Y_FORCE_INLINE void addMD5Sep(MD5& ctx) {
addMD5(ctx, ":", 1);
}
@@ -69,7 +67,7 @@ inline void addMD5Sep(MD5& ctx) {
/* calculate H(A1) as per spec */
void httpDigestHandler::digestCalcHA1(const THttpAuthHeader& hd,
char* outSessionKey,
- char* outCNonce) {
+ const std::string& outCNonce) {
MD5 ctx;
ctx.Init();
addMD5(ctx, User_);
@@ -82,8 +80,6 @@ void httpDigestHandler::digestCalcHA1(const THttpAuthHeader& hd,
unsigned char digest[16];
ctx.Final(digest);
- generateCNonce(outCNonce);
-
ctx.Init();
ctx.Update(digest, 16);
addMD5Sep(ctx);
@@ -103,7 +99,7 @@ void httpDigestHandler::digestCalcResponse(const THttpAuthHeader& hd,
const char* method,
const char* nonceCount,
char* outResponse,
- char* outCNonce) {
+ const std::string& outCNonce) {
char HA1[33];
digestCalcHA1(hd, HA1, outCNonce);
@@ -123,9 +119,6 @@ void httpDigestHandler::digestCalcResponse(const THttpAuthHeader& hd,
addMD5Sep(ctx);
if (hd.qop_auth) {
- if (!*outCNonce)
- generateCNonce(outCNonce);
-
addMD5(ctx, nonceCount, 8);
addMD5Sep(ctx);
addMD5(ctx, outCNonce);
@@ -141,7 +134,7 @@ void httpDigestHandler::digestCalcResponse(const THttpAuthHeader& hd,
bool httpDigestHandler::processHeader(const THttpAuthHeader* header,
const char* path,
const char* method,
- const char* cnonce) {
+ const char* cnonceIn) {
if (!User_ || !header || !header->use_auth || !header->realm || !header->nonce)
return false;
@@ -161,16 +154,12 @@ bool httpDigestHandler::processHeader(const THttpAuthHeader* header,
NonceCount_++;
char nonceCount[20];
- sprintf(nonceCount, "%08d", NonceCount_);
+ snprintf(nonceCount, sizeof(nonceCount), "%08d", NonceCount_);
- char CNonce[50];
- if (cnonce)
- strcpy(CNonce, cnonce);
- else
- CNonce[0] = 0;
+ std::string cNonce = cnonceIn ? std::string(cnonceIn) : std::to_string(time(nullptr));
char response[33];
- digestCalcResponse(*header, path, method, nonceCount, response, CNonce);
+ digestCalcResponse(*header, path, method, nonceCount, response, cNonce);
//digest-response = 1#( username | realm | nonce | digest-uri
// | response | [ algorithm ] | [cnonce] |
@@ -189,8 +178,8 @@ bool httpDigestHandler::processHeader(const THttpAuthHeader* header,
if (header->qop_auth)
out << ", qop=auth";
out << ", nc=" << nonceCount;
- if (CNonce[0])
- out << ", cnonce=\"" << CNonce << "\"";
+ if (!cNonce.empty())
+ out << ", cnonce=\"" << cNonce << "\"";
out << ", response=\"" << response << "\"";
if (header->opaque)
out << ", opaque=\"" << header->opaque << "\"";
diff --git a/library/cpp/http/fetch/http_digest.h b/library/cpp/http/fetch/http_digest.h
index 3b1872d70b..e5ffa3c69e 100644
--- a/library/cpp/http/fetch/http_digest.h
+++ b/library/cpp/http/fetch/http_digest.h
@@ -2,11 +2,13 @@
#include "httpheader.h"
+#include <string>
+
#include <util/system/compat.h>
#include <library/cpp/http/misc/httpcodes.h>
class httpDigestHandler {
-protected:
+private:
const char* User_;
const char* Password_;
char* Nonce_;
@@ -15,18 +17,16 @@ protected:
void clear();
- void generateCNonce(char* outCNonce);
-
void digestCalcHA1(const THttpAuthHeader& hd,
char* outSessionKey,
- char* outCNonce);
+ const std::string& outCNonce);
void digestCalcResponse(const THttpAuthHeader& hd,
const char* method,
const char* path,
const char* nonceCount,
char* outResponse,
- char* outCNonce);
+ const std::string& outCNonce);
public:
httpDigestHandler();
diff --git a/library/cpp/http/fetch/httpagent.h b/library/cpp/http/fetch/httpagent.h
index c66af00ced..18f10c160e 100644
--- a/library/cpp/http/fetch/httpagent.h
+++ b/library/cpp/http/fetch/httpagent.h
@@ -172,9 +172,9 @@ public:
Hostheader = (char*)malloc((HostheaderLen = reqHostheaderLen));
}
if (port == 80)
- sprintf(Hostheader, "Host: %s\r\n", hostname);
+ snprintf(Hostheader, HostheaderLen, "Host: %s\r\n", hostname);
else
- sprintf(Hostheader, "Host: %s:%u\r\n", hostname, port);
+ snprintf(Hostheader, HostheaderLen, "Host: %s:%u\r\n", hostname, port);
pHostBeg = strchr(Hostheader, ' ') + 1;
pHostEnd = strchr(pHostBeg, '\r');
// convert hostname to lower case since some web server don't like
@@ -195,7 +195,7 @@ public:
delete[] Hostheader;
Hostheader = new char[(HostheaderLen = reqHostheaderLen)];
}
- sprintf(Hostheader, "Host: %s\r\n", host);
+ snprintf(Hostheader, HostheaderLen, "Host: %s\r\n", host);
}
void SetSocket(SOCKET fd) {
diff --git a/library/cpp/http/fetch/httpload.cpp b/library/cpp/http/fetch/httpload.cpp
index f3f6c5245e..65631203e5 100644
--- a/library/cpp/http/fetch/httpload.cpp
+++ b/library/cpp/http/fetch/httpload.cpp
@@ -259,9 +259,10 @@ bool httpLoadAgent::doSetHost(const TAddrList& addrs) {
return false;
if (RealHost_) {
+ size_t reqHostheaderLen = strlen(RealHost_) + 20;
free(Hostheader);
- Hostheader = (char*)malloc(strlen(RealHost_) + 20);
- sprintf(Hostheader, "Host: %s\r\n", RealHost_);
+ Hostheader = (char*)malloc((HostheaderLen = reqHostheaderLen));
+ snprintf(Hostheader, HostheaderLen, "Host: %s\r\n", RealHost_);
}
if (!URL_.IsNull(THttpURL::FlagAuth)) {
diff --git a/library/cpp/unified_agent_client/client.h b/library/cpp/unified_agent_client/client.h
index 62e1210803..e58ffc8b11 100644
--- a/library/cpp/unified_agent_client/client.h
+++ b/library/cpp/unified_agent_client/client.h
@@ -40,8 +40,8 @@ namespace NUnifiedAgent {
// TLog instance for client library's own logs.
//
// Default: TLoggerOperator<TGlobalLog>::Log()
- TClientParameters& SetLog(TLog& log) {
- Log = log;
+ TClientParameters& SetLog(TLog log) {
+ Log = std::move(log);
return *this;
}
diff --git a/library/cpp/yt/memory/blob.h b/library/cpp/yt/memory/blob.h
index 0a1318c231..42cab83017 100644
--- a/library/cpp/yt/memory/blob.h
+++ b/library/cpp/yt/memory/blob.h
@@ -3,6 +3,8 @@
#include "ref.h"
#include "ref_counted.h"
+#include <library/cpp/yt/misc/port.h>
+
namespace NYT {
////////////////////////////////////////////////////////////////////////////////
diff --git a/library/cpp/yt/memory/chunked_memory_pool.h b/library/cpp/yt/memory/chunked_memory_pool.h
index a22e2ec27c..d5771480ac 100644
--- a/library/cpp/yt/memory/chunked_memory_pool.h
+++ b/library/cpp/yt/memory/chunked_memory_pool.h
@@ -3,6 +3,8 @@
#include "public.h"
#include "ref.h"
+#include <library/cpp/yt/misc/port.h>
+
#include <util/generic/size_literals.h>
namespace NYT {
diff --git a/library/cpp/yt/memory/intrusive_ptr.h b/library/cpp/yt/memory/intrusive_ptr.h
index 1da3b06966..91b15279ae 100644
--- a/library/cpp/yt/memory/intrusive_ptr.h
+++ b/library/cpp/yt/memory/intrusive_ptr.h
@@ -55,7 +55,7 @@ public:
: T_(other.Get())
{
static_assert(
- std::is_base_of_v<TRefCountedBase, T>,
+ std::derived_from<T, TRefCountedBase>,
"Cast allowed only for types derived from TRefCountedBase");
if (T_) {
Ref(T_);
@@ -75,7 +75,7 @@ public:
: T_(other.Get())
{
static_assert(
- std::is_base_of_v<TRefCountedBase, T>,
+ std::derived_from<T, TRefCountedBase>,
"Cast allowed only for types derived from TRefCountedBase");
other.T_ = nullptr;
}
@@ -103,7 +103,7 @@ public:
std::is_convertible_v<U*, T*>,
"U* must be convertible to T*");
static_assert(
- std::is_base_of_v<TRefCountedBase, T>,
+ std::derived_from<T, TRefCountedBase>,
"Cast allowed only for types derived from TRefCountedBase");
TIntrusivePtr(other).Swap(*this);
return *this;
@@ -124,7 +124,7 @@ public:
std::is_convertible_v<U*, T*>,
"U* must be convertible to T*");
static_assert(
- std::is_base_of_v<TRefCountedBase, T>,
+ std::derived_from<T, TRefCountedBase>,
"Cast allowed only for types derived from TRefCountedBase");
TIntrusivePtr(std::move(other)).Swap(*this);
return *this;
diff --git a/library/cpp/yt/memory/new-inl.h b/library/cpp/yt/memory/new-inl.h
index 53adaecdc0..c21bd37a0c 100644
--- a/library/cpp/yt/memory/new-inl.h
+++ b/library/cpp/yt/memory/new-inl.h
@@ -6,6 +6,8 @@
#include "ref_tracked.h"
+#include <library/cpp/yt/misc/port.h>
+
#include <library/cpp/yt/malloc//malloc.h>
namespace NYT {
@@ -121,7 +123,7 @@ Y_FORCE_INLINE T* NewEpilogue(void* ptr, As&& ... args)
}
}
-template <class T, bool = std::is_base_of_v<TRefCountedBase, T>>
+template <class T, bool = std::derived_from<T, TRefCountedBase>>
struct TConstructHelper
{
static constexpr size_t RefCounterSpace = (sizeof(TRefCounter) + alignof(T) - 1) & ~(alignof(T) - 1);
diff --git a/library/cpp/yt/memory/ref.cpp b/library/cpp/yt/memory/ref.cpp
index 605bc4ae2e..b5b636c9db 100644
--- a/library/cpp/yt/memory/ref.cpp
+++ b/library/cpp/yt/memory/ref.cpp
@@ -4,6 +4,8 @@
#include <library/cpp/yt/malloc/malloc.h>
+#include <library/cpp/yt/misc/port.h>
+
#include <util/system/info.h>
#include <util/system/align.h>
diff --git a/library/cpp/yt/memory/ref_counted-inl.h b/library/cpp/yt/memory/ref_counted-inl.h
index fcd64abb17..f86f634ffd 100644
--- a/library/cpp/yt/memory/ref_counted-inl.h
+++ b/library/cpp/yt/memory/ref_counted-inl.h
@@ -103,7 +103,7 @@ Y_FORCE_INLINE void DestroyRefCountedImpl(T* obj)
////////////////////////////////////////////////////////////////////////////////
// Specialization for final classes.
-template <class T, bool = std::is_base_of_v<TRefCountedBase, T>>
+template <class T, bool = std::derived_from<T, TRefCountedBase>>
struct TRefCountedTraits
{
static_assert(
diff --git a/library/cpp/yt/memory/weak_ptr.h b/library/cpp/yt/memory/weak_ptr.h
index a5a7f0a525..c647198aaf 100644
--- a/library/cpp/yt/memory/weak_ptr.h
+++ b/library/cpp/yt/memory/weak_ptr.h
@@ -48,7 +48,7 @@ public:
: TWeakPtr(ptr.Get())
{
static_assert(
- std::is_base_of_v<TRefCountedBase, T>,
+ std::derived_from<T, TRefCountedBase>,
"Cast allowed only for types derived from TRefCountedBase");
}
@@ -63,7 +63,7 @@ public:
: TWeakPtr(other.Lock())
{
static_assert(
- std::is_base_of_v<TRefCountedBase, T>,
+ std::derived_from<T, TRefCountedBase>,
"Cast allowed only for types derived from TRefCountedBase");
}
@@ -78,7 +78,7 @@ public:
TWeakPtr(TWeakPtr<U>&& other) noexcept
{
static_assert(
- std::is_base_of_v<TRefCountedBase, T>,
+ std::derived_from<T, TRefCountedBase>,
"Cast allowed only for types derived from TRefCountedBase");
TIntrusivePtr<U> strongOther = other.Lock();
if (strongOther) {
diff --git a/library/cpp/yt/misc/strong_typedef-inl.h b/library/cpp/yt/misc/strong_typedef-inl.h
index 09b814b62c..0e9adee186 100644
--- a/library/cpp/yt/misc/strong_typedef-inl.h
+++ b/library/cpp/yt/misc/strong_typedef-inl.h
@@ -170,8 +170,55 @@ struct hash<NYT::TStrongTypedef<T, TTag>>
template <class T, class TTag>
requires std::numeric_limits<T>::is_specialized
class numeric_limits<NYT::TStrongTypedef<T, TTag>>
- : public numeric_limits<T>
-{ };
+{
+public:
+ #define XX(name) \
+ static constexpr decltype(numeric_limits<T>::name) name = numeric_limits<T>::name;
+
+ XX(is_specialized)
+ XX(is_signed)
+ XX(digits)
+ XX(digits10)
+ XX(max_digits10)
+ XX(is_integer)
+ XX(is_exact)
+ XX(radix)
+ XX(min_exponent)
+ XX(min_exponent10)
+ XX(max_exponent)
+ XX(max_exponent10)
+ XX(has_infinity)
+ XX(has_quiet_NaN)
+ XX(has_signaling_NaN)
+ XX(has_denorm)
+ XX(has_denorm_loss)
+ XX(is_iec559)
+ XX(is_bounded)
+ XX(is_modulo)
+ XX(traps)
+ XX(tinyness_before)
+ XX(round_style)
+
+ #undef XX
+
+ #define XX(name) \
+ static constexpr NYT::TStrongTypedef<T, TTag> name() noexcept \
+ { \
+ return NYT::TStrongTypedef<T, TTag>(numeric_limits<T>::name()); \
+ }
+
+ XX(min)
+ XX(max)
+ XX(lowest)
+ XX(epsilon)
+ XX(round_error)
+ XX(infinity)
+ XX(quiet_NaN)
+ XX(signaling_NaN)
+ XX(denorm_min)
+
+ #undef XX
+};
////////////////////////////////////////////////////////////////////////////////
diff --git a/library/cpp/yt/misc/unittests/strong_typedef_ut.cpp b/library/cpp/yt/misc/unittests/strong_typedef_ut.cpp
index bc9321bb3c..1a06cc3c8b 100644
--- a/library/cpp/yt/misc/unittests/strong_typedef_ut.cpp
+++ b/library/cpp/yt/misc/unittests/strong_typedef_ut.cpp
@@ -43,8 +43,8 @@ XX(round_style)
#undef XX
#define XX(name) \
- static_assert(std::numeric_limits<TMyInt1>::name() == std::numeric_limits<int>::name()); \
- static_assert(std::numeric_limits<TMyInt2>::name() == std::numeric_limits<int>::name());
+ static_assert(std::numeric_limits<TMyInt1>::name() == TMyInt1(std::numeric_limits<int>::name())); \
+ static_assert(std::numeric_limits<TMyInt2>::name() == TMyInt2(TMyInt1(std::numeric_limits<int>::name())));
XX(min)
XX(max)
diff --git a/library/cpp/yt/threading/fork_aware_spin_lock.h b/library/cpp/yt/threading/fork_aware_spin_lock.h
index 1d69aa1bca..215fb58dc9 100644
--- a/library/cpp/yt/threading/fork_aware_spin_lock.h
+++ b/library/cpp/yt/threading/fork_aware_spin_lock.h
@@ -30,7 +30,7 @@ public:
bool IsLocked() const noexcept;
private:
- TSpinLock SpinLock_;
+ ::TSpinLock SpinLock_;
};
////////////////////////////////////////////////////////////////////////////////