diff options
author | Daniil Cherednik <dan.cherednik@gmail.com> | 2022-09-21 20:17:38 +0300 |
---|---|---|
committer | Daniil Cherednik <dan.cherednik@gmail.com> | 2022-09-21 20:17:38 +0300 |
commit | e6c9b17192c56494adba359d5e132c431b241191 (patch) | |
tree | 6f2449871a118a0e8919ce842b1174e06cb470ef /library/cpp | |
parent | 285021ab1aac39e84b269d9bacd4deee69cf63fc (diff) | |
download | ydb-e6c9b17192c56494adba359d5e132c431b241191.tar.gz |
Ydb stable 22-4-2122.4.21
x-stable-origin-commit: e89099581237299a132feafb5b58af59ebd0468a
Diffstat (limited to 'library/cpp')
74 files changed, 663 insertions, 70 deletions
diff --git a/library/cpp/CMakeLists.txt b/library/cpp/CMakeLists.txt new file mode 100644 index 0000000000..2be083d69c --- /dev/null +++ b/library/cpp/CMakeLists.txt @@ -0,0 +1,88 @@ + +# This file was gererated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +add_subdirectory(accurate_accumulate) +add_subdirectory(actors) +add_subdirectory(archive) +add_subdirectory(balloc) +add_subdirectory(binsaver) +add_subdirectory(bit_io) +add_subdirectory(blockcodecs) +add_subdirectory(bucket_quoter) +add_subdirectory(build_info) +add_subdirectory(cache) +add_subdirectory(case_insensitive_string) +add_subdirectory(cgiparam) +add_subdirectory(charset) +add_subdirectory(codecs) +add_subdirectory(colorizer) +add_subdirectory(compproto) +add_subdirectory(comptable) +add_subdirectory(containers) +add_subdirectory(coroutine) +add_subdirectory(cppparser) +add_subdirectory(cpuid_check) +add_subdirectory(dbg_output) +add_subdirectory(deprecated) +add_subdirectory(diff) +add_subdirectory(digest) +add_subdirectory(dns) +add_subdirectory(enumbitset) +add_subdirectory(execprofile) +add_subdirectory(getopt) +add_subdirectory(grpc) +add_subdirectory(histogram) +add_subdirectory(html) +add_subdirectory(http) +add_subdirectory(hyperloglog) +add_subdirectory(int128) +add_subdirectory(ipmath) +add_subdirectory(ipv6_address) +add_subdirectory(iterator) +add_subdirectory(json) +add_subdirectory(lcs) +add_subdirectory(lfalloc) +add_subdirectory(linear_regression) +add_subdirectory(logger) +add_subdirectory(lwtrace) +add_subdirectory(malloc) +add_subdirectory(messagebus) +add_subdirectory(mime) +add_subdirectory(monlib) +add_subdirectory(on_disk) +add_subdirectory(openssl) +add_subdirectory(packedtypes) +add_subdirectory(packers) +add_subdirectory(pop_count) +add_subdirectory(presort) +add_subdirectory(protobuf) +add_subdirectory(random_provider) +add_subdirectory(regex) +add_subdirectory(resource) +add_subdirectory(retry) +add_subdirectory(scheme) +add_subdirectory(sighandler) +add_subdirectory(sliding_window) +add_subdirectory(sse) +add_subdirectory(streams) +add_subdirectory(string_utils) +add_subdirectory(svnversion) +add_subdirectory(terminate_handler) +add_subdirectory(testing) +add_subdirectory(threading) +add_subdirectory(time_provider) +add_subdirectory(timezone_conversion) +add_subdirectory(tld) +add_subdirectory(unicode) +add_subdirectory(uri) +add_subdirectory(xml) +add_subdirectory(yaml) +add_subdirectory(yson) +add_subdirectory(yson_pull) +add_subdirectory(yt) +add_subdirectory(ytalloc) diff --git a/library/cpp/actors/CMakeLists.txt b/library/cpp/actors/CMakeLists.txt new file mode 100644 index 0000000000..b19b18f7a9 --- /dev/null +++ b/library/cpp/actors/CMakeLists.txt @@ -0,0 +1,20 @@ + +# This file was gererated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +add_subdirectory(core) +add_subdirectory(dnscachelib) +add_subdirectory(dnsresolver) +add_subdirectory(helpers) +add_subdirectory(http) +add_subdirectory(interconnect) +add_subdirectory(memory_log) +add_subdirectory(prof) +add_subdirectory(protos) +add_subdirectory(testlib) +add_subdirectory(util) +add_subdirectory(wilson) diff --git a/library/cpp/actors/core/event_pb.h b/library/cpp/actors/core/event_pb.h index 061e51fa68..2d388fceeb 100644 --- a/library/cpp/actors/core/event_pb.h +++ b/library/cpp/actors/core/event_pb.h @@ -121,11 +121,7 @@ namespace NActors { bool Finished = false; }; -#ifdef ACTORLIB_HUGE_PB_SIZE static const size_t EventMaxByteSize = 140 << 20; // (140MB) -#else - static const size_t EventMaxByteSize = 67108000; -#endif template <typename TEv, typename TRecord /*protobuf record*/, ui32 TEventType, typename TRecHolder> class TEventPBBase: public TEventBase<TEv, TEventType> , public TRecHolder { diff --git a/library/cpp/actors/core/log.cpp b/library/cpp/actors/core/log.cpp index 5f63b5af58..4bafd45842 100644 --- a/library/cpp/actors/core/log.cpp +++ b/library/cpp/actors/core/log.cpp @@ -77,7 +77,7 @@ namespace NActors { HTML(str) { DIV_CLASS("row") { DIV_CLASS("col-md-12") { - H4() { + TAG(TH4) { str << "Counters" << Endl; } DynamicCounters->OutputHtml(str); @@ -142,7 +142,7 @@ namespace NActors { HTML(str) { DIV_CLASS("row") { DIV_CLASS("col-md-12") { - H4() { + TAG(TH4) { str << "Metrics" << Endl; } // TODO: Now, TMetricRegistry does not have the GetOutputHtml function @@ -164,8 +164,6 @@ namespace NActors { std::shared_ptr<NMonitoring::TMetricRegistry> Metrics; }; - TAtomic TLoggerActor::IsOverflow = 0; - TLoggerActor::TLoggerActor(TIntrusivePtr<NLog::TSettings> settings, TAutoPtr<TLogBackend> logBackend, TIntrusivePtr<NMonitoring::TDynamicCounters> counters) @@ -224,8 +222,9 @@ namespace NActors { } void TLoggerActor::Throttle(const NLog::TSettings& settings) { - if (AtomicGet(IsOverflow)) - Sleep(settings.ThrottleDelay); + // throttling via Sleep was removed since it causes unexpected + // incidents when users try to set AllowDrop=false. + Y_UNUSED(settings); } void TLoggerActor::LogIgnoredCount(TInstant now) { @@ -268,10 +267,6 @@ namespace NActors { i64 delayMillisec = (ctx.Now() - ev->Get()->Stamp).MilliSeconds(); WriteMessageStat(*ev->Get()); if (Settings->AllowDrop) { - // Disable throttling if it was enabled previously - if (AtomicGet(IsOverflow)) - AtomicSet(IsOverflow, 0); - // Check if some records have to be dropped if ((PassedCount > 10 && delayMillisec > (i64)Settings->TimeThresholdMs) || IgnoredCount > 0) { Metrics->IncIgnoredMsgs(); @@ -283,12 +278,6 @@ namespace NActors { return; } PassedCount++; - } else { - // Enable of disable throttling depending on the load - if (delayMillisec > (i64)Settings->TimeThresholdMs && !AtomicGet(IsOverflow)) - AtomicSet(IsOverflow, 1); - else if (delayMillisec <= (i64)Settings->TimeThresholdMs && AtomicGet(IsOverflow)) - AtomicSet(IsOverflow, 0); } const auto prio = ev->Get()->Level.ToPrio(); @@ -312,7 +301,7 @@ namespace NActors { void TLoggerActor::RenderComponentPriorities(IOutputStream& str) { using namespace NLog; HTML(str) { - H4() { + TAG(TH4) { str << "Priority Settings for the Components"; } TABLE_SORTABLE_CLASS("table") { @@ -415,7 +404,7 @@ namespace NActors { HTML(str) { DIV_CLASS("row") { DIV_CLASS("col-md-12") { - H4() { + TAG(TH4) { str << "Current log settings for " << Settings->ComponentName(component) << Endl; } UL() { @@ -437,7 +426,7 @@ namespace NActors { DIV_CLASS("row") { DIV_CLASS("col-md-12") { - H4() { + TAG(TH4) { str << "Change priority" << Endl; } UL() { @@ -448,7 +437,7 @@ namespace NActors { } } } - H4() { + TAG(TH4) { str << "Change sampling priority" << Endl; } UL() { @@ -459,7 +448,7 @@ namespace NActors { } } } - H4() { + TAG(TH4) { str << "Change sampling rate" << Endl; } str << "<form method=\"GET\">" << Endl; @@ -467,7 +456,7 @@ namespace NActors { str << "<input type=\"hidden\" name=\"c\" value=\"" << component << "\">" << Endl; str << "<input class=\"btn btn-primary\" type=\"submit\" value=\"Change\"/>" << Endl; str << "</form>" << Endl; - H4() { + TAG(TH4) { str << "<a href='logger'>Cancel</a>" << Endl; } } @@ -503,7 +492,7 @@ namespace NActors { RenderComponentPriorities(str); } DIV_CLASS("col-md-6") { - H4() { + TAG(TH4) { str << "Change priority for all components"; } TABLE_CLASS("table table-condensed") { @@ -525,7 +514,7 @@ namespace NActors { } } } - H4() { + TAG(TH4) { str << "Change sampling priority for all components"; } TABLE_CLASS("table table-condensed") { @@ -547,7 +536,7 @@ namespace NActors { } } } - H4() { + TAG(TH4) { str << "Change sampling rate for all components"; } str << "<form method=\"GET\">" << Endl; @@ -555,7 +544,7 @@ namespace NActors { str << "<input type=\"hidden\" name=\"c\" value=\"-1\">" << Endl; str << "<input class=\"btn btn-primary\" type=\"submit\" value=\"Change\"/>" << Endl; str << "</form>" << Endl; - H4() { + TAG(TH4) { str << "Drop log entries in case of overflow: " << (Settings->AllowDrop ? "Enabled" : "Disabled"); } diff --git a/library/cpp/actors/core/log.h b/library/cpp/actors/core/log.h index c11a7cf3c1..96cbb81958 100644 --- a/library/cpp/actors/core/log.h +++ b/library/cpp/actors/core/log.h @@ -239,7 +239,6 @@ namespace NActors { std::shared_ptr<TLogBackend> LogBackend; ui64 IgnoredCount = 0; ui64 PassedCount = 0; - static TAtomic IsOverflow; TDuration WakeupInterval{TDuration::Seconds(5)}; std::unique_ptr<ILoggerMetrics> Metrics; diff --git a/library/cpp/actors/http/http_ut.cpp b/library/cpp/actors/http/http_ut.cpp index 7a569a08c3..d7d4f5567f 100644 --- a/library/cpp/actors/http/http_ut.cpp +++ b/library/cpp/actors/http/http_ut.cpp @@ -379,6 +379,7 @@ CRA/5XcX13GJwHHj6LCoc3sL7mt8qV9HKY2AOZ88mpObzISZxgPpdKCfjsrdm63V Y_UNIT_TEST(TooLongHeader) { NActors::TTestActorRuntimeBase actorSystem; + actorSystem.SetUseRealInterconnect(); TPortManager portManager; TIpPort port = portManager.GetTcpPort(); TAutoPtr<NActors::IEventHandle> handle; diff --git a/library/cpp/actors/interconnect/CMakeLists.darwin.txt b/library/cpp/actors/interconnect/CMakeLists.darwin.txt index 9bd0c83fce..f73af2defe 100644 --- a/library/cpp/actors/interconnect/CMakeLists.darwin.txt +++ b/library/cpp/actors/interconnect/CMakeLists.darwin.txt @@ -7,6 +7,7 @@ find_package(OpenSSL REQUIRED) +add_subdirectory(mock) add_library(cpp-actors-interconnect) target_link_libraries(cpp-actors-interconnect PUBLIC diff --git a/library/cpp/actors/interconnect/CMakeLists.linux.txt b/library/cpp/actors/interconnect/CMakeLists.linux.txt index c0e1b39c45..94a7bda34d 100644 --- a/library/cpp/actors/interconnect/CMakeLists.linux.txt +++ b/library/cpp/actors/interconnect/CMakeLists.linux.txt @@ -7,6 +7,7 @@ find_package(OpenSSL REQUIRED) +add_subdirectory(mock) add_library(cpp-actors-interconnect) target_link_libraries(cpp-actors-interconnect PUBLIC diff --git a/library/cpp/actors/interconnect/CMakeLists.txt b/library/cpp/actors/interconnect/CMakeLists.txt index fc7b1ee73c..dbfe6fa2c4 100644 --- a/library/cpp/actors/interconnect/CMakeLists.txt +++ b/library/cpp/actors/interconnect/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX AND NOT APPLE) +elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/library/cpp/actors/interconnect/interconnect_handshake.cpp b/library/cpp/actors/interconnect/interconnect_handshake.cpp index aaa8440d72..d7f657299e 100644 --- a/library/cpp/actors/interconnect/interconnect_handshake.cpp +++ b/library/cpp/actors/interconnect/interconnect_handshake.cpp @@ -551,6 +551,7 @@ namespace NActors { // set up incoming socket SetupSocket(); + RegisterInPoller(); // wait for initial request packet TInitialPacket request; @@ -878,8 +879,11 @@ namespace NActors { // start connecting err = -Socket->Connect(address); if (err == EINPROGRESS) { + RegisterInPoller(); WaitPoller(false, true, "WaitConnect"); err = Socket->GetConnectStatus(); + } else if (!err) { + RegisterInPoller(); } // check if connection succeeded @@ -915,9 +919,6 @@ namespace NActors { // setup send buffer size Socket->SetSendBufferSize(Common->Settings.GetSendBufferSize()); - - // register in poller - RegisterInPoller(); } void RegisterInPoller() { diff --git a/library/cpp/actors/interconnect/ut/large.cpp b/library/cpp/actors/interconnect/ut/large.cpp index ba2a50c6f6..192d733325 100644 --- a/library/cpp/actors/interconnect/ut/large.cpp +++ b/library/cpp/actors/interconnect/ut/large.cpp @@ -24,7 +24,7 @@ Y_UNIT_TEST_SUITE(LargeMessage) { void Bootstrap(const TActorContext& ctx) { Become(&TThis::StateFunc); ctx.Send(RecipientActorId, new TEvTest(1, "hello"), IEventHandle::FlagTrackDelivery, 1); - ctx.Send(RecipientActorId, new TEvTest(2, TString(128 * 1024 * 1024, 'X')), IEventHandle::FlagTrackDelivery, 2); + ctx.Send(RecipientActorId, new TEvTest(2, TString(150 * 1024 * 1024, 'X')), IEventHandle::FlagTrackDelivery, 2); } void Handle(TEvents::TEvUndelivered::TPtr ev, const TActorContext& ctx) { diff --git a/library/cpp/actors/wilson/CMakeLists.txt b/library/cpp/actors/wilson/CMakeLists.txt index 75c7b16dff..31566c2628 100644 --- a/library/cpp/actors/wilson/CMakeLists.txt +++ b/library/cpp/actors/wilson/CMakeLists.txt @@ -6,6 +6,7 @@ # original buildsystem will not be accepted. +add_subdirectory(protos) add_library(cpp-actors-wilson) target_link_libraries(cpp-actors-wilson PUBLIC diff --git a/library/cpp/balloc/CMakeLists.txt b/library/cpp/balloc/CMakeLists.txt index d4ed3b53d2..9f044845ba 100644 --- a/library/cpp/balloc/CMakeLists.txt +++ b/library/cpp/balloc/CMakeLists.txt @@ -6,6 +6,8 @@ # original buildsystem will not be accepted. +add_subdirectory(lib) +add_subdirectory(setup) add_library(library-cpp-balloc) target_compile_options(library-cpp-balloc PRIVATE diff --git a/library/cpp/balloc/lib/CMakeLists.txt b/library/cpp/balloc/lib/CMakeLists.txt index fc7b1ee73c..dbfe6fa2c4 100644 --- a/library/cpp/balloc/lib/CMakeLists.txt +++ b/library/cpp/balloc/lib/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX AND NOT APPLE) +elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/library/cpp/blockcodecs/CMakeLists.txt b/library/cpp/blockcodecs/CMakeLists.txt index 7610f291a0..999004c65a 100644 --- a/library/cpp/blockcodecs/CMakeLists.txt +++ b/library/cpp/blockcodecs/CMakeLists.txt @@ -6,6 +6,8 @@ # original buildsystem will not be accepted. +add_subdirectory(codecs) +add_subdirectory(core) add_library(library-cpp-blockcodecs) target_link_libraries(library-cpp-blockcodecs PUBLIC diff --git a/library/cpp/blockcodecs/codecs/CMakeLists.txt b/library/cpp/blockcodecs/codecs/CMakeLists.txt new file mode 100644 index 0000000000..1dc34f79b8 --- /dev/null +++ b/library/cpp/blockcodecs/codecs/CMakeLists.txt @@ -0,0 +1,17 @@ + +# This file was gererated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +add_subdirectory(brotli) +add_subdirectory(bzip) +add_subdirectory(fastlz) +add_subdirectory(legacy_zstd06) +add_subdirectory(lz4) +add_subdirectory(lzma) +add_subdirectory(snappy) +add_subdirectory(zlib) +add_subdirectory(zstd) diff --git a/library/cpp/codecs/CMakeLists.txt b/library/cpp/codecs/CMakeLists.txt index 54b76fbea9..776e37d335 100644 --- a/library/cpp/codecs/CMakeLists.txt +++ b/library/cpp/codecs/CMakeLists.txt @@ -6,6 +6,7 @@ # original buildsystem will not be accepted. +add_subdirectory(greedy_dict) add_library(library-cpp-codecs) target_link_libraries(library-cpp-codecs PUBLIC diff --git a/library/cpp/containers/CMakeLists.txt b/library/cpp/containers/CMakeLists.txt new file mode 100644 index 0000000000..cf1ec79fb8 --- /dev/null +++ b/library/cpp/containers/CMakeLists.txt @@ -0,0 +1,24 @@ + +# This file was gererated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +add_subdirectory(2d_array) +add_subdirectory(atomizer) +add_subdirectory(bitseq) +add_subdirectory(compact_vector) +add_subdirectory(comptrie) +add_subdirectory(disjoint_interval_tree) +add_subdirectory(flat_hash) +add_subdirectory(intrusive_avl_tree) +add_subdirectory(intrusive_rb_tree) +add_subdirectory(paged_vector) +add_subdirectory(ring_buffer) +add_subdirectory(sorted_vector) +add_subdirectory(stack_array) +add_subdirectory(stack_vector) +add_subdirectory(str_map) +add_subdirectory(top_keeper) diff --git a/library/cpp/coroutine/CMakeLists.txt b/library/cpp/coroutine/CMakeLists.txt new file mode 100644 index 0000000000..e684f539b2 --- /dev/null +++ b/library/cpp/coroutine/CMakeLists.txt @@ -0,0 +1,10 @@ + +# This file was gererated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +add_subdirectory(engine) +add_subdirectory(listener) diff --git a/library/cpp/deprecated/CMakeLists.txt b/library/cpp/deprecated/CMakeLists.txt new file mode 100644 index 0000000000..3afb649cd0 --- /dev/null +++ b/library/cpp/deprecated/CMakeLists.txt @@ -0,0 +1,13 @@ + +# This file was gererated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +add_subdirectory(accessors) +add_subdirectory(atomic) +add_subdirectory(enum_codegen) +add_subdirectory(kmp) +add_subdirectory(split) diff --git a/library/cpp/digest/CMakeLists.txt b/library/cpp/digest/CMakeLists.txt new file mode 100644 index 0000000000..7c361872e4 --- /dev/null +++ b/library/cpp/digest/CMakeLists.txt @@ -0,0 +1,15 @@ + +# This file was gererated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +add_subdirectory(argonish) +add_subdirectory(crc32c) +add_subdirectory(lower_case) +add_subdirectory(md5) +add_subdirectory(murmur) +add_subdirectory(old_crc) +add_subdirectory(sfh) diff --git a/library/cpp/digest/argonish/CMakeLists.txt b/library/cpp/digest/argonish/CMakeLists.txt index a110539238..617cc9aa13 100644 --- a/library/cpp/digest/argonish/CMakeLists.txt +++ b/library/cpp/digest/argonish/CMakeLists.txt @@ -6,6 +6,7 @@ # original buildsystem will not be accepted. +add_subdirectory(internal) add_library(cpp-digest-argonish) target_link_libraries(cpp-digest-argonish PUBLIC diff --git a/library/cpp/digest/argonish/internal/CMakeLists.txt b/library/cpp/digest/argonish/internal/CMakeLists.txt new file mode 100644 index 0000000000..8311b4e2a7 --- /dev/null +++ b/library/cpp/digest/argonish/internal/CMakeLists.txt @@ -0,0 +1,13 @@ + +# This file was gererated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +add_subdirectory(argon2) +add_subdirectory(blake2b) +add_subdirectory(blamka) +add_subdirectory(proxies) +add_subdirectory(rotations) diff --git a/library/cpp/digest/argonish/internal/proxies/CMakeLists.txt b/library/cpp/digest/argonish/internal/proxies/CMakeLists.txt new file mode 100644 index 0000000000..4ea0d5c2d9 --- /dev/null +++ b/library/cpp/digest/argonish/internal/proxies/CMakeLists.txt @@ -0,0 +1,14 @@ + +# This file was gererated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +add_subdirectory(avx2) +add_subdirectory(macro) +add_subdirectory(ref) +add_subdirectory(sse2) +add_subdirectory(sse41) +add_subdirectory(ssse3) diff --git a/library/cpp/digest/old_crc/CMakeLists.txt b/library/cpp/digest/old_crc/CMakeLists.txt index 77debee38f..dedf7adedd 100644 --- a/library/cpp/digest/old_crc/CMakeLists.txt +++ b/library/cpp/digest/old_crc/CMakeLists.txt @@ -6,6 +6,7 @@ # original buildsystem will not be accepted. +add_subdirectory(gencrc) add_library(cpp-digest-old_crc) target_link_libraries(cpp-digest-old_crc PUBLIC diff --git a/library/cpp/digest/old_crc/gencrc/CMakeLists.txt b/library/cpp/digest/old_crc/gencrc/CMakeLists.txt index fc7b1ee73c..dbfe6fa2c4 100644 --- a/library/cpp/digest/old_crc/gencrc/CMakeLists.txt +++ b/library/cpp/digest/old_crc/gencrc/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX AND NOT APPLE) +elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/library/cpp/getopt/CMakeLists.txt b/library/cpp/getopt/CMakeLists.txt index 29ac8b8e2c..7c366f9a33 100644 --- a/library/cpp/getopt/CMakeLists.txt +++ b/library/cpp/getopt/CMakeLists.txt @@ -6,6 +6,7 @@ # original buildsystem will not be accepted. +add_subdirectory(small) add_library(library-cpp-getopt INTERFACE) target_link_libraries(library-cpp-getopt INTERFACE diff --git a/library/cpp/grpc/CMakeLists.txt b/library/cpp/grpc/CMakeLists.txt new file mode 100644 index 0000000000..28f45865a3 --- /dev/null +++ b/library/cpp/grpc/CMakeLists.txt @@ -0,0 +1,10 @@ + +# This file was gererated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +add_subdirectory(client) +add_subdirectory(server) diff --git a/library/cpp/grpc/server/CMakeLists.txt b/library/cpp/grpc/server/CMakeLists.txt index eea6892826..0f7e4f6a93 100644 --- a/library/cpp/grpc/server/CMakeLists.txt +++ b/library/cpp/grpc/server/CMakeLists.txt @@ -6,6 +6,7 @@ # original buildsystem will not be accepted. +add_subdirectory(actors) add_library(cpp-grpc-server) target_link_libraries(cpp-grpc-server PUBLIC diff --git a/library/cpp/grpc/server/grpc_request.h b/library/cpp/grpc/server/grpc_request.h index 5bd8d3902b..bb389af276 100644 --- a/library/cpp/grpc/server/grpc_request.h +++ b/library/cpp/grpc/server/grpc_request.h @@ -126,6 +126,7 @@ public: if (auto guard = Server_->ProtectShutdown()) { Ref(); //For grpc c runtime this->Context.AsyncNotifyWhenDone(OnFinishTag.Prepare()); + OnBeforeCall(); if (RequestCallback_) { (this->Service->*RequestCallback_) (&this->Context, Request_, @@ -148,6 +149,8 @@ public: } void DestroyRequest() override { + Y_VERIFY(!CallInProgress_, "Unexpected DestroyRequest while another grpc call is still in progress"); + RequestDestroyed_ = true; if (RequestRegistered_) { Server_->DeregisterRequestCtx(this); RequestRegistered_ = false; @@ -215,6 +218,8 @@ public: GRPC_LOG_DEBUG(Logger_, "[%p] finished streaming Name# %s peer# %s (pushed to grpc)", this, Name_, this->Context.peer().c_str()); + OnBeforeCall(); + Finished_ = true; StreamWriter_->Finish(grpc::Status::OK, GetGRpcTag()); }; StreamAdaptor_->Enqueue(std::move(cb), false); @@ -241,6 +246,19 @@ private: } } + void OnBeforeCall() { + Y_VERIFY(!RequestDestroyed_, "Cannot start grpc calls after request is already destroyed"); + Y_VERIFY(!Finished_, "Cannot start grpc calls after request is finished"); + bool wasInProgress = std::exchange(CallInProgress_, true); + Y_VERIFY(!wasInProgress, "Another grpc call is already in progress"); + } + + void OnAfterCall() { + Y_VERIFY(!RequestDestroyed_, "Finished grpc call after request is already destroyed"); + bool wasInProgress = std::exchange(CallInProgress_, false); + Y_VERIFY(wasInProgress, "Finished grpc call that was not in progress"); + } + void WriteDataOk(NProtoBuf::Message* resp) { auto makeResponseString = [&] { TString x; @@ -257,6 +275,8 @@ private: StateFunc_ = &TThis::SetFinishDone; ResponseSize = sz; Y_VERIFY(this->Context.c_call()); + OnBeforeCall(); + Finished_ = true; Writer_->Finish(TUniversalResponseRef<TOut>(resp), grpc::Status::OK, GetGRpcTag()); } else { GRPC_LOG_DEBUG(Logger_, "[%p] issuing response Name# %s data# %s peer# %s (enqueued)", @@ -270,6 +290,7 @@ private: this, Name_, makeResponseString().data(), this->Context.peer().c_str()); StateFunc_ = &TThis::NextReply; ResponseSize += sz; + OnBeforeCall(); StreamWriter_->Write(*uResp, GetGRpcTag()); }; StreamAdaptor_->Enqueue(std::move(cb), false); @@ -283,6 +304,8 @@ private: this->Context.peer().c_str()); StateFunc_ = &TThis::SetFinishDone; ResponseSize = sz; + OnBeforeCall(); + Finished_ = true; Writer_->Finish(TUniversalResponseRef<TOut>(resp), grpc::Status::OK, GetGRpcTag()); } else { GRPC_LOG_DEBUG(Logger_, "[%p] issuing response Name# %s data# byteString peer# %s (enqueued)", this, Name_, @@ -296,6 +319,7 @@ private: this, Name_, this->Context.peer().c_str()); StateFunc_ = &TThis::NextReply; ResponseSize += sz; + OnBeforeCall(); StreamWriter_->Write(*uResp, GetGRpcTag()); }; StreamAdaptor_->Enqueue(std::move(cb), false); @@ -315,6 +339,8 @@ private: Name_, msg.c_str(), this->Context.peer().c_str(), (int)code); StateFunc_ = &TThis::SetFinishError; TOut resp; + OnBeforeCall(); + Finished_ = true; Writer_->Finish(TUniversalResponseRef<TOut>(&resp), grpc::Status(code, msg), GetGRpcTag()); } else { GRPC_LOG_DEBUG(Logger_, "[%p] issuing response Name# %s nodata (%s) peer# %s, grpc status# (%d)" @@ -324,6 +350,8 @@ private: " (pushed to grpc)", this, Name_, msg.c_str(), this->Context.peer().c_str(), (int)code); StateFunc_ = &TThis::SetFinishError; + OnBeforeCall(); + Finished_ = true; StreamWriter_->Finish(grpc::Status(code, msg), GetGRpcTag()); }; StreamAdaptor_->Enqueue(std::move(cb), urgent); @@ -331,6 +359,8 @@ private: } bool SetRequestDone(bool ok) { + OnAfterCall(); + auto makeRequestString = [&] { TString resp; if (ok) { @@ -398,6 +428,8 @@ private: } bool NextReply(bool ok) { + OnAfterCall(); + auto logCb = [this, ok](int left) { GRPC_LOG_DEBUG(Logger_, "[%p] ready for next reply Name# %s ok# %s peer# %s left# %d", this, Name_, ok ? "true" : "false", this->Context.peer().c_str(), left); @@ -423,6 +455,8 @@ private: } bool SetFinishDone(bool ok) { + OnAfterCall(); + GRPC_LOG_DEBUG(Logger_, "[%p] finished request Name# %s ok# %s peer# %s", this, Name_, ok ? "true" : "false", this->Context.peer().c_str()); //PrintBackTrace(); @@ -433,6 +467,8 @@ private: } bool SetFinishError(bool ok) { + OnAfterCall(); + GRPC_LOG_DEBUG(Logger_, "[%p] finished request with error Name# %s ok# %s peer# %s", this, Name_, ok ? "true" : "false", this->Context.peer().c_str()); if (!SkipUpdateCountersOnError) { @@ -502,6 +538,9 @@ private: THPTimer RequestTimer; TAuthState AuthState_ = 0; bool RequestRegistered_ = false; + bool RequestDestroyed_ = false; + bool CallInProgress_ = false; + bool Finished_ = false; using TFixedEvent = TQueueFixedEvent<TGRpcRequestImpl>; TFixedEvent OnFinishTag = { this, &TGRpcRequestImpl::OnFinish }; diff --git a/library/cpp/histogram/CMakeLists.txt b/library/cpp/histogram/CMakeLists.txt new file mode 100644 index 0000000000..0a062c1029 --- /dev/null +++ b/library/cpp/histogram/CMakeLists.txt @@ -0,0 +1,10 @@ + +# This file was gererated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +add_subdirectory(adaptive) +add_subdirectory(hdr) diff --git a/library/cpp/histogram/adaptive/CMakeLists.txt b/library/cpp/histogram/adaptive/CMakeLists.txt index 8aeaa59dc2..4b8b25ac3f 100644 --- a/library/cpp/histogram/adaptive/CMakeLists.txt +++ b/library/cpp/histogram/adaptive/CMakeLists.txt @@ -6,6 +6,7 @@ # original buildsystem will not be accepted. +add_subdirectory(protos) add_library(cpp-histogram-adaptive) target_link_libraries(cpp-histogram-adaptive PUBLIC diff --git a/library/cpp/html/CMakeLists.txt b/library/cpp/html/CMakeLists.txt new file mode 100644 index 0000000000..6489ac4594 --- /dev/null +++ b/library/cpp/html/CMakeLists.txt @@ -0,0 +1,10 @@ + +# This file was gererated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +add_subdirectory(escape) +add_subdirectory(pcdata) diff --git a/library/cpp/http/CMakeLists.txt b/library/cpp/http/CMakeLists.txt new file mode 100644 index 0000000000..44fdf1d060 --- /dev/null +++ b/library/cpp/http/CMakeLists.txt @@ -0,0 +1,12 @@ + +# This file was gererated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +add_subdirectory(fetch) +add_subdirectory(io) +add_subdirectory(misc) +add_subdirectory(server) diff --git a/library/cpp/json/CMakeLists.txt b/library/cpp/json/CMakeLists.txt index ca36c8f305..7b11a2bf41 100644 --- a/library/cpp/json/CMakeLists.txt +++ b/library/cpp/json/CMakeLists.txt @@ -6,6 +6,11 @@ # original buildsystem will not be accepted. +add_subdirectory(common) +add_subdirectory(easy_parse) +add_subdirectory(fast_sax) +add_subdirectory(writer) +add_subdirectory(yson) add_library(library-cpp-json) target_link_libraries(library-cpp-json PUBLIC diff --git a/library/cpp/lfalloc/CMakeLists.darwin.txt b/library/cpp/lfalloc/CMakeLists.darwin.txt new file mode 100644 index 0000000000..3c17261bd6 --- /dev/null +++ b/library/cpp/lfalloc/CMakeLists.darwin.txt @@ -0,0 +1,23 @@ + +# This file was gererated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +add_subdirectory(alloc_profiler) +add_subdirectory(dbg_info) +add_subdirectory(yt) + +add_library(library-cpp-lfalloc) +target_compile_options(library-cpp-lfalloc PRIVATE + -Wno-everything +) +target_link_libraries(library-cpp-lfalloc PUBLIC + contrib-libs-cxxsupp + cpp-malloc-api +) +target_sources(library-cpp-lfalloc PRIVATE + ${CMAKE_SOURCE_DIR}/library/cpp/lfalloc/lf_allocX64.cpp +) diff --git a/library/cpp/lfalloc/CMakeLists.linux.txt b/library/cpp/lfalloc/CMakeLists.linux.txt new file mode 100644 index 0000000000..d3171b42df --- /dev/null +++ b/library/cpp/lfalloc/CMakeLists.linux.txt @@ -0,0 +1,22 @@ + +# This file was gererated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +add_subdirectory(alloc_profiler) +add_subdirectory(dbg_info) + +add_library(library-cpp-lfalloc) +target_compile_options(library-cpp-lfalloc PRIVATE + -Wno-everything +) +target_link_libraries(library-cpp-lfalloc PUBLIC + contrib-libs-cxxsupp + cpp-malloc-api +) +target_sources(library-cpp-lfalloc PRIVATE + ${CMAKE_SOURCE_DIR}/library/cpp/lfalloc/lf_allocX64.cpp +) diff --git a/library/cpp/lfalloc/CMakeLists.txt b/library/cpp/lfalloc/CMakeLists.txt index 9564ed7af0..dbfe6fa2c4 100644 --- a/library/cpp/lfalloc/CMakeLists.txt +++ b/library/cpp/lfalloc/CMakeLists.txt @@ -6,15 +6,8 @@ # original buildsystem will not be accepted. - -add_library(library-cpp-lfalloc) -target_compile_options(library-cpp-lfalloc PRIVATE - -Wno-everything -) -target_link_libraries(library-cpp-lfalloc PUBLIC - contrib-libs-cxxsupp - cpp-malloc-api -) -target_sources(library-cpp-lfalloc PRIVATE - ${CMAKE_SOURCE_DIR}/library/cpp/lfalloc/lf_allocX64.cpp -) +if (APPLE) + include(CMakeLists.darwin.txt) +elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE) + include(CMakeLists.linux.txt) +endif() diff --git a/library/cpp/logger/CMakeLists.txt b/library/cpp/logger/CMakeLists.txt index be8b8e4ad1..07d54ae816 100644 --- a/library/cpp/logger/CMakeLists.txt +++ b/library/cpp/logger/CMakeLists.txt @@ -6,6 +6,7 @@ # original buildsystem will not be accepted. +add_subdirectory(global) add_library(library-cpp-logger) target_link_libraries(library-cpp-logger PUBLIC diff --git a/library/cpp/lwtrace/CMakeLists.txt b/library/cpp/lwtrace/CMakeLists.txt index ea12841d58..4e5a2aab55 100644 --- a/library/cpp/lwtrace/CMakeLists.txt +++ b/library/cpp/lwtrace/CMakeLists.txt @@ -6,6 +6,8 @@ # original buildsystem will not be accepted. +add_subdirectory(mon) +add_subdirectory(protos) add_library(library-cpp-lwtrace) target_link_libraries(library-cpp-lwtrace PUBLIC diff --git a/library/cpp/lwtrace/mon/CMakeLists.txt b/library/cpp/lwtrace/mon/CMakeLists.txt index ac651febeb..50bdef36cb 100644 --- a/library/cpp/lwtrace/mon/CMakeLists.txt +++ b/library/cpp/lwtrace/mon/CMakeLists.txt @@ -6,6 +6,7 @@ # original buildsystem will not be accepted. +add_subdirectory(analytics) add_library(cpp-lwtrace-mon) target_link_libraries(cpp-lwtrace-mon PUBLIC diff --git a/library/cpp/malloc/CMakeLists.darwin.txt b/library/cpp/malloc/CMakeLists.darwin.txt new file mode 100644 index 0000000000..773e71fc8f --- /dev/null +++ b/library/cpp/malloc/CMakeLists.darwin.txt @@ -0,0 +1,10 @@ + +# This file was gererated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +add_subdirectory(api) +add_subdirectory(jemalloc) diff --git a/library/cpp/malloc/CMakeLists.linux.txt b/library/cpp/malloc/CMakeLists.linux.txt new file mode 100644 index 0000000000..b68a3a50a1 --- /dev/null +++ b/library/cpp/malloc/CMakeLists.linux.txt @@ -0,0 +1,11 @@ + +# This file was gererated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +add_subdirectory(api) +add_subdirectory(jemalloc) +add_subdirectory(tcmalloc) diff --git a/library/cpp/malloc/CMakeLists.txt b/library/cpp/malloc/CMakeLists.txt new file mode 100644 index 0000000000..dbfe6fa2c4 --- /dev/null +++ b/library/cpp/malloc/CMakeLists.txt @@ -0,0 +1,13 @@ + +# This file was gererated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +if (APPLE) + include(CMakeLists.darwin.txt) +elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE) + include(CMakeLists.linux.txt) +endif() diff --git a/library/cpp/malloc/tcmalloc/CMakeLists.txt b/library/cpp/malloc/tcmalloc/CMakeLists.txt index e8c98bfd99..97368e369c 100644 --- a/library/cpp/malloc/tcmalloc/CMakeLists.txt +++ b/library/cpp/malloc/tcmalloc/CMakeLists.txt @@ -6,6 +6,6 @@ # original buildsystem will not be accepted. -if (UNIX AND NOT APPLE) +if (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/library/cpp/messagebus/CMakeLists.txt b/library/cpp/messagebus/CMakeLists.txt index a237adaef8..9f0f8baf67 100644 --- a/library/cpp/messagebus/CMakeLists.txt +++ b/library/cpp/messagebus/CMakeLists.txt @@ -6,6 +6,13 @@ # original buildsystem will not be accepted. +add_subdirectory(actor) +add_subdirectory(config) +add_subdirectory(monitoring) +add_subdirectory(oldmodule) +add_subdirectory(protobuf) +add_subdirectory(scheduler) +add_subdirectory(www) add_library(library-cpp-messagebus) target_link_libraries(library-cpp-messagebus PUBLIC diff --git a/library/cpp/mime/CMakeLists.txt b/library/cpp/mime/CMakeLists.txt new file mode 100644 index 0000000000..e9367ea4a9 --- /dev/null +++ b/library/cpp/mime/CMakeLists.txt @@ -0,0 +1,9 @@ + +# This file was gererated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +add_subdirectory(types) diff --git a/library/cpp/monlib/CMakeLists.txt b/library/cpp/monlib/CMakeLists.txt new file mode 100644 index 0000000000..f618762aa8 --- /dev/null +++ b/library/cpp/monlib/CMakeLists.txt @@ -0,0 +1,15 @@ + +# This file was gererated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +add_subdirectory(deprecated) +add_subdirectory(dynamic_counters) +add_subdirectory(encode) +add_subdirectory(exception) +add_subdirectory(messagebus) +add_subdirectory(metrics) +add_subdirectory(service) diff --git a/library/cpp/monlib/deprecated/CMakeLists.txt b/library/cpp/monlib/deprecated/CMakeLists.txt new file mode 100644 index 0000000000..b413e0df87 --- /dev/null +++ b/library/cpp/monlib/deprecated/CMakeLists.txt @@ -0,0 +1,9 @@ + +# This file was gererated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +add_subdirectory(json) diff --git a/library/cpp/monlib/dynamic_counters/CMakeLists.txt b/library/cpp/monlib/dynamic_counters/CMakeLists.txt index e7bd3b4597..e8dacd3a61 100644 --- a/library/cpp/monlib/dynamic_counters/CMakeLists.txt +++ b/library/cpp/monlib/dynamic_counters/CMakeLists.txt @@ -6,6 +6,7 @@ # original buildsystem will not be accepted. +add_subdirectory(percentile) add_library(cpp-monlib-dynamic_counters) target_link_libraries(cpp-monlib-dynamic_counters PUBLIC diff --git a/library/cpp/monlib/dynamic_counters/page.cpp b/library/cpp/monlib/dynamic_counters/page.cpp index b116adfdef..223a4448a8 100644 --- a/library/cpp/monlib/dynamic_counters/page.cpp +++ b/library/cpp/monlib/dynamic_counters/page.cpp @@ -123,7 +123,7 @@ void TDynamicCountersPage::BeforePre(IMonHttpRequest& request) { out << " for <a href='https://wiki.yandex-team.ru/solomon/'>Solomon</a>"; } - H5() { + TAG(TH5) { out << "Counters subgroups"; } UL() { @@ -136,7 +136,7 @@ void TDynamicCountersPage::BeforePre(IMonHttpRequest& request) { }); } - H4() { + TAG(TH4) { out << "Counters as text"; } } diff --git a/library/cpp/monlib/encode/CMakeLists.txt b/library/cpp/monlib/encode/CMakeLists.txt index c00a5530e3..539c9b07f3 100644 --- a/library/cpp/monlib/encode/CMakeLists.txt +++ b/library/cpp/monlib/encode/CMakeLists.txt @@ -6,6 +6,12 @@ # original buildsystem will not be accepted. +add_subdirectory(buffered) +add_subdirectory(json) +add_subdirectory(legacy_protobuf) +add_subdirectory(prometheus) +add_subdirectory(spack) +add_subdirectory(text) add_library(cpp-monlib-encode) target_link_libraries(cpp-monlib-encode PUBLIC diff --git a/library/cpp/monlib/encode/legacy_protobuf/CMakeLists.txt b/library/cpp/monlib/encode/legacy_protobuf/CMakeLists.txt new file mode 100644 index 0000000000..dde515d0db --- /dev/null +++ b/library/cpp/monlib/encode/legacy_protobuf/CMakeLists.txt @@ -0,0 +1,9 @@ + +# This file was gererated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +add_subdirectory(protos) diff --git a/library/cpp/monlib/service/CMakeLists.txt b/library/cpp/monlib/service/CMakeLists.txt index db4bf963ff..24bc76ad29 100644 --- a/library/cpp/monlib/service/CMakeLists.txt +++ b/library/cpp/monlib/service/CMakeLists.txt @@ -6,6 +6,7 @@ # original buildsystem will not be accepted. +add_subdirectory(pages) add_library(cpp-monlib-service) target_link_libraries(cpp-monlib-service PUBLIC diff --git a/library/cpp/monlib/service/pages/CMakeLists.txt b/library/cpp/monlib/service/pages/CMakeLists.txt index 36b85fd379..cc2387ede1 100644 --- a/library/cpp/monlib/service/pages/CMakeLists.txt +++ b/library/cpp/monlib/service/pages/CMakeLists.txt @@ -6,6 +6,7 @@ # original buildsystem will not be accepted. +add_subdirectory(tablesorter) add_library(monlib-service-pages) target_link_libraries(monlib-service-pages PUBLIC diff --git a/library/cpp/monlib/service/pages/templates.h b/library/cpp/monlib/service/pages/templates.h index b4656f059f..ab1d91c54e 100644 --- a/library/cpp/monlib/service/pages/templates.h +++ b/library/cpp/monlib/service/pages/templates.h @@ -13,14 +13,14 @@ label \ : -#define TAG(name) WITH_SCOPED(tmp, NMonitoring::name(__stream)) -#define TAG_CLASS(name, cls) WITH_SCOPED(tmp, NMonitoring::name(__stream, cls)) -#define TAG_CLASS_STYLE(name, cls, style) WITH_SCOPED(tmp, NMonitoring::name(__stream, {{"class", cls}, {"style", style}})) -#define TAG_CLASS_ID(name, cls, id) WITH_SCOPED(tmp, NMonitoring::name(__stream, cls, "", id)) -#define TAG_CLASS_FOR(name, cls, for0) WITH_SCOPED(tmp, NMonitoring::name(__stream, cls, for0)) -#define TAG_ATTRS(name, ...) WITH_SCOPED(tmp, NMonitoring::name(__stream, ##__VA_ARGS__)) +#define TAG(name) WITH_SCOPED(tmp, ::NMonitoring::name(__stream)) +#define TAG_CLASS(name, cls) WITH_SCOPED(tmp, ::NMonitoring::name(__stream, cls)) +#define TAG_CLASS_STYLE(name, cls, style) WITH_SCOPED(tmp, ::NMonitoring::name(__stream, {{"class", cls}, {"style", style}})) +#define TAG_CLASS_ID(name, cls, id) WITH_SCOPED(tmp, ::NMonitoring::name(__stream, cls, "", id)) +#define TAG_CLASS_FOR(name, cls, for0) WITH_SCOPED(tmp, ::NMonitoring::name(__stream, cls, for0)) +#define TAG_ATTRS(name, ...) WITH_SCOPED(tmp, ::NMonitoring::name(__stream, ##__VA_ARGS__)) -#define HTML(str) WITH_SCOPED(__stream, NMonitoring::TOutputStreamRef(str)) +#define HTML(str) WITH_SCOPED(__stream, ::NMonitoring::TOutputStreamRef(str)) #define HEAD() TAG(THead) #define BODY() TAG(TBody) @@ -55,17 +55,11 @@ #define PARA() TAG(TPara) #define PARA_CLASS(cls) TAG_CLASS(TPara, cls) -#define H1() TAG(TH1) #define H1_CLASS(cls) TAG_CLASS(TH1, cls) -#define H2() TAG(TH2) #define H2_CLASS(cls) TAG_CLASS(TH2, cls) -#define H3() TAG(TH3) #define H3_CLASS(cls) TAG_CLASS(TH3, cls) -#define H4() TAG(TH4) #define H4_CLASS(cls) TAG_CLASS(TH4, cls) -#define H5() TAG(TH5) #define H5_CLASS(cls) TAG_CLASS(TH5, cls) -#define H6() TAG(TH6) #define H6_CLASS(cls) TAG_CLASS(TH6, cls) #define SMALL() TAG(TSMALL) @@ -92,10 +86,10 @@ #define HTML_OUTPUT_TIME_PARAM(str, param) str << #param << ": " << ToStringLocalTimeUpToSeconds(param) << "<br/>" #define COLLAPSED_BUTTON_CONTENT(targetId, buttonText) \ - WITH_SCOPED(tmp, NMonitoring::TCollapsedButton(__stream, targetId, buttonText)) + WITH_SCOPED(tmp, ::NMonitoring::TCollapsedButton(__stream, targetId, buttonText)) #define HREF(path) \ - WITH_SCOPED(tmp, NMonitoring::THref(__stream, path)) + WITH_SCOPED(tmp, ::NMonitoring::THref(__stream, path)) namespace NMonitoring { struct THref { diff --git a/library/cpp/on_disk/CMakeLists.txt b/library/cpp/on_disk/CMakeLists.txt new file mode 100644 index 0000000000..461a4b7a97 --- /dev/null +++ b/library/cpp/on_disk/CMakeLists.txt @@ -0,0 +1,9 @@ + +# This file was gererated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +add_subdirectory(chunks) diff --git a/library/cpp/openssl/CMakeLists.txt b/library/cpp/openssl/CMakeLists.txt new file mode 100644 index 0000000000..392ccc8eb4 --- /dev/null +++ b/library/cpp/openssl/CMakeLists.txt @@ -0,0 +1,12 @@ + +# This file was gererated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +add_subdirectory(holders) +add_subdirectory(init) +add_subdirectory(io) +add_subdirectory(method) diff --git a/library/cpp/protobuf/CMakeLists.txt b/library/cpp/protobuf/CMakeLists.txt new file mode 100644 index 0000000000..41b18218f1 --- /dev/null +++ b/library/cpp/protobuf/CMakeLists.txt @@ -0,0 +1,11 @@ + +# This file was gererated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +add_subdirectory(interop) +add_subdirectory(json) +add_subdirectory(util) diff --git a/library/cpp/protobuf/json/json2proto.cpp b/library/cpp/protobuf/json/json2proto.cpp index 640c10f5a5..92bfe9755b 100644 --- a/library/cpp/protobuf/json/json2proto.cpp +++ b/library/cpp/protobuf/json/json2proto.cpp @@ -377,10 +377,9 @@ namespace NProtobufJson { return; } - Y_ENSURE(json.IsMap(), "expected json map"); - const google::protobuf::Descriptor* descriptor = proto.GetDescriptor(); Y_ASSERT(!!descriptor); + Y_ENSURE(json.IsMap(), "Failed to merge json to proto for message: " << descriptor->full_name() << ", expected json map."); for (int f = 0, endF = descriptor->field_count(); f < endF; ++f) { const google::protobuf::FieldDescriptor* field = descriptor->field(f); diff --git a/library/cpp/protobuf/util/CMakeLists.txt b/library/cpp/protobuf/util/CMakeLists.txt index d25187fbdb..d04f95d395 100644 --- a/library/cpp/protobuf/util/CMakeLists.txt +++ b/library/cpp/protobuf/util/CMakeLists.txt @@ -6,6 +6,7 @@ # original buildsystem will not be accepted. +add_subdirectory(proto) add_library(cpp-protobuf-util) target_link_libraries(cpp-protobuf-util PUBLIC diff --git a/library/cpp/regex/CMakeLists.txt b/library/cpp/regex/CMakeLists.txt new file mode 100644 index 0000000000..0eebca8708 --- /dev/null +++ b/library/cpp/regex/CMakeLists.txt @@ -0,0 +1,11 @@ + +# This file was gererated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +add_subdirectory(hyperscan) +add_subdirectory(pcre) +add_subdirectory(pire) diff --git a/library/cpp/retry/CMakeLists.txt b/library/cpp/retry/CMakeLists.txt index cda3814e3f..3868f3975e 100644 --- a/library/cpp/retry/CMakeLists.txt +++ b/library/cpp/retry/CMakeLists.txt @@ -6,6 +6,7 @@ # original buildsystem will not be accepted. +add_subdirectory(protos) add_library(library-cpp-retry) target_link_libraries(library-cpp-retry PUBLIC diff --git a/library/cpp/streams/CMakeLists.txt b/library/cpp/streams/CMakeLists.txt new file mode 100644 index 0000000000..bdb896c6ed --- /dev/null +++ b/library/cpp/streams/CMakeLists.txt @@ -0,0 +1,13 @@ + +# This file was gererated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +add_subdirectory(brotli) +add_subdirectory(bzip2) +add_subdirectory(lzma) +add_subdirectory(zc_memory_input) +add_subdirectory(zstd) diff --git a/library/cpp/string_utils/CMakeLists.txt b/library/cpp/string_utils/CMakeLists.txt new file mode 100644 index 0000000000..d256782733 --- /dev/null +++ b/library/cpp/string_utils/CMakeLists.txt @@ -0,0 +1,17 @@ + +# This file was gererated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +add_subdirectory(base64) +add_subdirectory(indent_text) +add_subdirectory(levenshtein_diff) +add_subdirectory(parse_size) +add_subdirectory(quote) +add_subdirectory(relaxed_escaper) +add_subdirectory(scan) +add_subdirectory(url) +add_subdirectory(ztstrbuf) diff --git a/library/cpp/testing/CMakeLists.txt b/library/cpp/testing/CMakeLists.txt new file mode 100644 index 0000000000..8a69d51279 --- /dev/null +++ b/library/cpp/testing/CMakeLists.txt @@ -0,0 +1,15 @@ + +# This file was gererated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +add_subdirectory(benchmark) +add_subdirectory(common) +add_subdirectory(gmock_in_unittest) +add_subdirectory(gtest_extensions) +add_subdirectory(hook) +add_subdirectory(unittest) +add_subdirectory(unittest_main) diff --git a/library/cpp/testing/benchmark/CMakeLists.txt b/library/cpp/testing/benchmark/CMakeLists.txt index 2df1ac1d91..359c73c5f4 100644 --- a/library/cpp/testing/benchmark/CMakeLists.txt +++ b/library/cpp/testing/benchmark/CMakeLists.txt @@ -6,6 +6,7 @@ # original buildsystem will not be accepted. +add_subdirectory(main) add_library(cpp-testing-benchmark) target_link_libraries(cpp-testing-benchmark PUBLIC diff --git a/library/cpp/threading/CMakeLists.txt b/library/cpp/threading/CMakeLists.txt new file mode 100644 index 0000000000..1246829e67 --- /dev/null +++ b/library/cpp/threading/CMakeLists.txt @@ -0,0 +1,18 @@ + +# This file was gererated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +add_subdirectory(atomic) +add_subdirectory(chunk_queue) +add_subdirectory(equeue) +add_subdirectory(future) +add_subdirectory(light_rw_lock) +add_subdirectory(local_executor) +add_subdirectory(poor_man_openmp) +add_subdirectory(queue) +add_subdirectory(skip_list) +add_subdirectory(task_scheduler) diff --git a/library/cpp/unicode/CMakeLists.txt b/library/cpp/unicode/CMakeLists.txt new file mode 100644 index 0000000000..915ed345c1 --- /dev/null +++ b/library/cpp/unicode/CMakeLists.txt @@ -0,0 +1,10 @@ + +# This file was gererated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +add_subdirectory(normalization) +add_subdirectory(punycode) diff --git a/library/cpp/xml/CMakeLists.txt b/library/cpp/xml/CMakeLists.txt new file mode 100644 index 0000000000..504e1326a6 --- /dev/null +++ b/library/cpp/xml/CMakeLists.txt @@ -0,0 +1,10 @@ + +# This file was gererated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +add_subdirectory(document) +add_subdirectory(init) diff --git a/library/cpp/yaml/CMakeLists.txt b/library/cpp/yaml/CMakeLists.txt new file mode 100644 index 0000000000..df58c83133 --- /dev/null +++ b/library/cpp/yaml/CMakeLists.txt @@ -0,0 +1,9 @@ + +# This file was gererated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +add_subdirectory(as) diff --git a/library/cpp/yson/CMakeLists.txt b/library/cpp/yson/CMakeLists.txt index 7933584935..43fd932e00 100644 --- a/library/cpp/yson/CMakeLists.txt +++ b/library/cpp/yson/CMakeLists.txt @@ -6,6 +6,8 @@ # original buildsystem will not be accepted. +add_subdirectory(json) +add_subdirectory(node) add_library(library-cpp-yson) target_link_libraries(library-cpp-yson PUBLIC diff --git a/library/cpp/yt/CMakeLists.txt b/library/cpp/yt/CMakeLists.txt new file mode 100644 index 0000000000..c90bdf25de --- /dev/null +++ b/library/cpp/yt/CMakeLists.txt @@ -0,0 +1,18 @@ + +# This file was gererated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +add_subdirectory(assert) +add_subdirectory(coding) +add_subdirectory(exception) +add_subdirectory(malloc) +add_subdirectory(memory) +add_subdirectory(misc) +add_subdirectory(small_containers) +add_subdirectory(string) +add_subdirectory(yson) +add_subdirectory(yson_string) diff --git a/library/cpp/ytalloc/CMakeLists.txt b/library/cpp/ytalloc/CMakeLists.txt new file mode 100644 index 0000000000..0a386de02f --- /dev/null +++ b/library/cpp/ytalloc/CMakeLists.txt @@ -0,0 +1,9 @@ + +# This file was gererated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +add_subdirectory(api) |