diff options
author | max42 <max42@yandex-team.com> | 2023-07-29 00:02:16 +0300 |
---|---|---|
committer | max42 <max42@yandex-team.com> | 2023-07-29 00:02:16 +0300 |
commit | 73b89de71748a21e102d27b9f3ed1bf658766cb5 (patch) | |
tree | 188bbd2d622fa91cdcbb1b6d6d77fbc84a0646f5 /yt/cpp/mapreduce/interface/logging | |
parent | 528e321bcc2a2b67b53aeba58c3bd88305a141ee (diff) | |
download | ydb-73b89de71748a21e102d27b9f3ed1bf658766cb5.tar.gz |
YT-19210: expose YQL shared library for YT.
After this, a new target libyqlplugin.so appears. in open-source cmake build.
Diff in open-source YDB repo looks like the following: https://paste.yandex-team.ru/f302bdb4-7ef2-4362-91c7-6ca45f329264
Diffstat (limited to 'yt/cpp/mapreduce/interface/logging')
-rw-r--r-- | yt/cpp/mapreduce/interface/logging/CMakeLists.darwin-x86_64.txt | 34 | ||||
-rw-r--r-- | yt/cpp/mapreduce/interface/logging/CMakeLists.linux-aarch64.txt | 35 | ||||
-rw-r--r-- | yt/cpp/mapreduce/interface/logging/CMakeLists.linux-x86_64.txt | 35 | ||||
-rw-r--r-- | yt/cpp/mapreduce/interface/logging/CMakeLists.txt | 17 | ||||
-rw-r--r-- | yt/cpp/mapreduce/interface/logging/CMakeLists.windows-x86_64.txt | 31 | ||||
-rw-r--r-- | yt/cpp/mapreduce/interface/logging/logger.cpp | 188 | ||||
-rw-r--r-- | yt/cpp/mapreduce/interface/logging/logger.h | 43 | ||||
-rw-r--r-- | yt/cpp/mapreduce/interface/logging/ya.make | 16 | ||||
-rw-r--r-- | yt/cpp/mapreduce/interface/logging/yt_log.cpp | 126 | ||||
-rw-r--r-- | yt/cpp/mapreduce/interface/logging/yt_log.h | 17 |
10 files changed, 542 insertions, 0 deletions
diff --git a/yt/cpp/mapreduce/interface/logging/CMakeLists.darwin-x86_64.txt b/yt/cpp/mapreduce/interface/logging/CMakeLists.darwin-x86_64.txt new file mode 100644 index 0000000000..031665ae24 --- /dev/null +++ b/yt/cpp/mapreduce/interface/logging/CMakeLists.darwin-x86_64.txt @@ -0,0 +1,34 @@ + +# This file was generated 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. + + +get_built_tool_path( + TOOL_enum_parser_bin + TOOL_enum_parser_dependency + tools/enum_parser/enum_parser + enum_parser +) + +add_library(mapreduce-interface-logging) +target_compile_options(mapreduce-interface-logging PRIVATE + -Wdeprecated-this-capture +) +target_link_libraries(mapreduce-interface-logging PUBLIC + contrib-libs-cxxsupp + yutil + cpp-yt-logging + tools-enum_parser-enum_serialization_runtime +) +target_sources(mapreduce-interface-logging PRIVATE + ${CMAKE_SOURCE_DIR}/yt/cpp/mapreduce/interface/logging/logger.cpp + ${CMAKE_SOURCE_DIR}/yt/cpp/mapreduce/interface/logging/yt_log.cpp +) +generate_enum_serilization(mapreduce-interface-logging + ${CMAKE_SOURCE_DIR}/yt/cpp/mapreduce/interface/logging/logger.h + INCLUDE_HEADERS + yt/cpp/mapreduce/interface/logging/logger.h +) diff --git a/yt/cpp/mapreduce/interface/logging/CMakeLists.linux-aarch64.txt b/yt/cpp/mapreduce/interface/logging/CMakeLists.linux-aarch64.txt new file mode 100644 index 0000000000..7fa0ca41ef --- /dev/null +++ b/yt/cpp/mapreduce/interface/logging/CMakeLists.linux-aarch64.txt @@ -0,0 +1,35 @@ + +# This file was generated 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. + + +get_built_tool_path( + TOOL_enum_parser_bin + TOOL_enum_parser_dependency + tools/enum_parser/enum_parser + enum_parser +) + +add_library(mapreduce-interface-logging) +target_compile_options(mapreduce-interface-logging PRIVATE + -Wdeprecated-this-capture +) +target_link_libraries(mapreduce-interface-logging PUBLIC + contrib-libs-linux-headers + contrib-libs-cxxsupp + yutil + cpp-yt-logging + tools-enum_parser-enum_serialization_runtime +) +target_sources(mapreduce-interface-logging PRIVATE + ${CMAKE_SOURCE_DIR}/yt/cpp/mapreduce/interface/logging/logger.cpp + ${CMAKE_SOURCE_DIR}/yt/cpp/mapreduce/interface/logging/yt_log.cpp +) +generate_enum_serilization(mapreduce-interface-logging + ${CMAKE_SOURCE_DIR}/yt/cpp/mapreduce/interface/logging/logger.h + INCLUDE_HEADERS + yt/cpp/mapreduce/interface/logging/logger.h +) diff --git a/yt/cpp/mapreduce/interface/logging/CMakeLists.linux-x86_64.txt b/yt/cpp/mapreduce/interface/logging/CMakeLists.linux-x86_64.txt new file mode 100644 index 0000000000..7fa0ca41ef --- /dev/null +++ b/yt/cpp/mapreduce/interface/logging/CMakeLists.linux-x86_64.txt @@ -0,0 +1,35 @@ + +# This file was generated 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. + + +get_built_tool_path( + TOOL_enum_parser_bin + TOOL_enum_parser_dependency + tools/enum_parser/enum_parser + enum_parser +) + +add_library(mapreduce-interface-logging) +target_compile_options(mapreduce-interface-logging PRIVATE + -Wdeprecated-this-capture +) +target_link_libraries(mapreduce-interface-logging PUBLIC + contrib-libs-linux-headers + contrib-libs-cxxsupp + yutil + cpp-yt-logging + tools-enum_parser-enum_serialization_runtime +) +target_sources(mapreduce-interface-logging PRIVATE + ${CMAKE_SOURCE_DIR}/yt/cpp/mapreduce/interface/logging/logger.cpp + ${CMAKE_SOURCE_DIR}/yt/cpp/mapreduce/interface/logging/yt_log.cpp +) +generate_enum_serilization(mapreduce-interface-logging + ${CMAKE_SOURCE_DIR}/yt/cpp/mapreduce/interface/logging/logger.h + INCLUDE_HEADERS + yt/cpp/mapreduce/interface/logging/logger.h +) diff --git a/yt/cpp/mapreduce/interface/logging/CMakeLists.txt b/yt/cpp/mapreduce/interface/logging/CMakeLists.txt new file mode 100644 index 0000000000..f8b31df0c1 --- /dev/null +++ b/yt/cpp/mapreduce/interface/logging/CMakeLists.txt @@ -0,0 +1,17 @@ + +# This file was generated 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 (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND NOT HAVE_CUDA) + include(CMakeLists.linux-aarch64.txt) +elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") + include(CMakeLists.darwin-x86_64.txt) +elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA) + include(CMakeLists.windows-x86_64.txt) +elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA) + include(CMakeLists.linux-x86_64.txt) +endif() diff --git a/yt/cpp/mapreduce/interface/logging/CMakeLists.windows-x86_64.txt b/yt/cpp/mapreduce/interface/logging/CMakeLists.windows-x86_64.txt new file mode 100644 index 0000000000..7801fa5db6 --- /dev/null +++ b/yt/cpp/mapreduce/interface/logging/CMakeLists.windows-x86_64.txt @@ -0,0 +1,31 @@ + +# This file was generated 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. + + +get_built_tool_path( + TOOL_enum_parser_bin + TOOL_enum_parser_dependency + tools/enum_parser/enum_parser + enum_parser +) + +add_library(mapreduce-interface-logging) +target_link_libraries(mapreduce-interface-logging PUBLIC + contrib-libs-cxxsupp + yutil + cpp-yt-logging + tools-enum_parser-enum_serialization_runtime +) +target_sources(mapreduce-interface-logging PRIVATE + ${CMAKE_SOURCE_DIR}/yt/cpp/mapreduce/interface/logging/logger.cpp + ${CMAKE_SOURCE_DIR}/yt/cpp/mapreduce/interface/logging/yt_log.cpp +) +generate_enum_serilization(mapreduce-interface-logging + ${CMAKE_SOURCE_DIR}/yt/cpp/mapreduce/interface/logging/logger.h + INCLUDE_HEADERS + yt/cpp/mapreduce/interface/logging/logger.h +) diff --git a/yt/cpp/mapreduce/interface/logging/logger.cpp b/yt/cpp/mapreduce/interface/logging/logger.cpp new file mode 100644 index 0000000000..bfa56b94f6 --- /dev/null +++ b/yt/cpp/mapreduce/interface/logging/logger.cpp @@ -0,0 +1,188 @@ +#include "logger.h" + +#include <util/datetime/base.h> + +#include <util/stream/file.h> +#include <util/stream/format.h> +#include <util/stream/printf.h> +#include <util/stream/str.h> + +#include <util/system/mutex.h> +#include <util/system/rwlock.h> +#include <util/system/thread.h> + +namespace NYT { + +//////////////////////////////////////////////////////////////////////////////// + +static TStringBuf StripFileName(TStringBuf path) { + TStringBuf l, r; + if (path.TryRSplit('/', l, r) || path.TryRSplit('\\', l, r)) { + return r; + } else { + return path; + } +} + +static char GetLogLevelCode(ILogger::ELevel level) { + switch (level) { + case ILogger::FATAL: return 'F'; + case ILogger::ERROR: return 'E'; + case ILogger::INFO: return 'I'; + case ILogger::DEBUG: return 'D'; + } + Y_UNREACHABLE(); +} + +//////////////////////////////////////////////////////////////////////////////// + +class TNullLogger + : public ILogger +{ +public: + void Log(ELevel level, const TSourceLocation& sourceLocation, const char* format, va_list args) override + { + Y_UNUSED(level); + Y_UNUSED(sourceLocation); + Y_UNUSED(format); + Y_UNUSED(args); + } +}; + +//////////////////////////////////////////////////////////////////////////////// + +class TLoggerBase + : public ILogger +{ +public: + TLoggerBase(ELevel cutLevel) + : CutLevel_(cutLevel) + { } + + virtual void OutputLine(const TString& line) = 0; + + void Log(ELevel level, const TSourceLocation& sourceLocation, const char* format, va_list args) override + { + if (level > CutLevel_) { + return; + } + + TStringStream stream; + stream << TInstant::Now().ToStringLocal() + << " " << GetLogLevelCode(level) + << " [" << Hex(TThread::CurrentThreadId(), HF_FULL) << "] "; + Printf(stream, format, args); + stream << " - " << StripFileName(sourceLocation.File) << ':' << sourceLocation.Line << Endl; + + TGuard<TMutex> guard(Mutex_); + OutputLine(stream.Str()); + } + +private: + ELevel CutLevel_; + TMutex Mutex_; +}; + +//////////////////////////////////////////////////////////////////////////////// + +class TStdErrLogger + : public TLoggerBase +{ +public: + TStdErrLogger(ELevel cutLevel) + : TLoggerBase(cutLevel) + { } + + void OutputLine(const TString& line) override + { + Cerr << line; + } +}; + +ILoggerPtr CreateStdErrLogger(ILogger::ELevel cutLevel) +{ + return new TStdErrLogger(cutLevel); +} + +//////////////////////////////////////////////////////////////////////////////// + +class TFileLogger + : public TLoggerBase +{ +public: + TFileLogger(ELevel cutLevel, const TString& path, bool append) + : TLoggerBase(cutLevel) + , Stream_(TFile(path, OpenAlways | WrOnly | Seq | (append ? ForAppend : EOpenMode()))) + { } + + void OutputLine(const TString& line) override + { + Stream_ << line; + } + +private: + TUnbufferedFileOutput Stream_; +}; + +ILoggerPtr CreateFileLogger(ILogger::ELevel cutLevel, const TString& path, bool append) +{ + return new TFileLogger(cutLevel, path, append); +} +//////////////////////////////////////////////////////////////////////////////// + +class TBufferedFileLogger + : public TLoggerBase +{ +public: + TBufferedFileLogger(ELevel cutLevel, const TString& path, bool append) + : TLoggerBase(cutLevel) + , Stream_(TFile(path, OpenAlways | WrOnly | Seq | (append ? ForAppend : EOpenMode()))) + { } + + void OutputLine(const TString& line) override + { + Stream_ << line; + } + +private: + TFileOutput Stream_; +}; + +ILoggerPtr CreateBufferedFileLogger(ILogger::ELevel cutLevel, const TString& path, bool append) +{ + return new TBufferedFileLogger(cutLevel, path, append); +} + +//////////////////////////////////////////////////////////////////////////////// + +static TRWMutex LoggerMutex; +static ILoggerPtr Logger; + +struct TLoggerInitializer +{ + TLoggerInitializer() + { + Logger = new TNullLogger; + } +} LoggerInitializer; + +void SetLogger(ILoggerPtr logger) +{ + auto guard = TWriteGuard(LoggerMutex); + if (logger) { + Logger = logger; + } else { + Logger = new TNullLogger; + } +} + +ILoggerPtr GetLogger() +{ + auto guard = TReadGuard(LoggerMutex); + return Logger; +} + +//////////////////////////////////////////////////////////////////////////////// + +} + diff --git a/yt/cpp/mapreduce/interface/logging/logger.h b/yt/cpp/mapreduce/interface/logging/logger.h new file mode 100644 index 0000000000..2b5aae87d1 --- /dev/null +++ b/yt/cpp/mapreduce/interface/logging/logger.h @@ -0,0 +1,43 @@ +#pragma once + +#include <util/generic/ptr.h> +#include <util/generic/string.h> +#include <util/system/compat.h> +#include <util/system/src_location.h> + +namespace NYT { + +//////////////////////////////////////////////////////////////////////////////// + +class ILogger + : public TThrRefBase +{ +public: + enum ELevel + { + FATAL /* "fatal", "FATAL" */, + // We don't have such level as `warning', but we support it for compatibility with other APIs. + ERROR /* "error", "warning", "ERROR", "WARNING" */, + INFO /* "info", "INFO" */, + DEBUG /* "debug", "DEBUG" */ + }; + + virtual void Log(ELevel level, const ::TSourceLocation& sourceLocation, const char* format, va_list args) = 0; +}; + +using ILoggerPtr = ::TIntrusivePtr<ILogger>; + +void SetLogger(ILoggerPtr logger); +ILoggerPtr GetLogger(); + +ILoggerPtr CreateStdErrLogger(ILogger::ELevel cutLevel); +ILoggerPtr CreateFileLogger(ILogger::ELevel cutLevel, const TString& path, bool append = false); + +/** + * Create logger that writes to a file in a buffered manner. + * It should result in fewer system calls (useful if you expect a lot of log messages), + * but in case of a crash, you would lose some log messages that haven't been flushed yet. + */ +ILoggerPtr CreateBufferedFileLogger(ILogger::ELevel cutLevel, const TString& path, bool append = false); + +} // namespace NYT diff --git a/yt/cpp/mapreduce/interface/logging/ya.make b/yt/cpp/mapreduce/interface/logging/ya.make new file mode 100644 index 0000000000..8095bfe4ba --- /dev/null +++ b/yt/cpp/mapreduce/interface/logging/ya.make @@ -0,0 +1,16 @@ +LIBRARY() + +INCLUDE(${ARCADIA_ROOT}/yt/ya_cpp.make.inc) + +SRCS( + logger.cpp + yt_log.cpp +) + +PEERDIR( + library/cpp/yt/logging +) + +GENERATE_ENUM_SERIALIZATION(logger.h) + +END() diff --git a/yt/cpp/mapreduce/interface/logging/yt_log.cpp b/yt/cpp/mapreduce/interface/logging/yt_log.cpp new file mode 100644 index 0000000000..9fa7b91580 --- /dev/null +++ b/yt/cpp/mapreduce/interface/logging/yt_log.cpp @@ -0,0 +1,126 @@ +#include "yt_log.h" + +#include "logger.h" + +#include <util/generic/guid.h> + +#include <util/system/mutex.h> + +namespace NYT { + +using namespace NLogging; + +//////////////////////////////////////////////////////////////////////////////// + +namespace { + +class TLogManager + : public ILogManager +{ +public: + static constexpr TStringBuf CategoryName = "Wrapper"; + +public: + void RegisterStaticAnchor( + TLoggingAnchor* anchor, + ::TSourceLocation sourceLocation, + TStringBuf anchorMessage) override + { + if (anchor->Registered.exchange(true)) { + return; + } + + anchor->Enabled.store(true); + + auto guard = Guard(Mutex_); + anchor->SourceLocation = sourceLocation; + anchor->AnchorMessage = anchorMessage; + } + + void UpdateAnchor(TLoggingAnchor* /*position*/) override + { } + + void Enqueue(TLogEvent&& event) override + { + auto message = TString(event.MessageRef.ToStringBuf()); + LogMessage( + ToImplLevel(event.Level), + ::TSourceLocation(event.SourceFile, event.SourceLine), + "%.*s", + event.MessageRef.size(), + event.MessageRef.begin()); + } + + const TLoggingCategory* GetCategory(TStringBuf categoryName) override + { + Y_VERIFY(categoryName == CategoryName); + return &Category_; + } + + void UpdateCategory(TLoggingCategory* /*category*/) override + { + Y_FAIL(); + } + + bool GetAbortOnAlert() const override + { + return false; + } + +private: + static ILogger::ELevel ToImplLevel(ELogLevel level) + { + switch (level) { + case ELogLevel::Minimum: + case ELogLevel::Trace: + case ELogLevel::Debug: + return ILogger::ELevel::DEBUG; + case ELogLevel::Info: + return ILogger::ELevel::INFO; + case ELogLevel::Warning: + case ELogLevel::Error: + return ILogger::ELevel::ERROR; + case ELogLevel::Alert: + case ELogLevel::Fatal: + case ELogLevel::Maximum: + return ILogger::ELevel::FATAL; + } + } + + static void LogMessage(ILogger::ELevel level, const ::TSourceLocation& sourceLocation, const char* format, ...) + { + va_list args; + va_start(args, format); + GetLogger()->Log(level, sourceLocation, format, args); + va_end(args); + } + +private: + ::TMutex Mutex_; + std::atomic<int> ActualVersion_{1}; + const TLoggingCategory Category_{ + .Name{CategoryName}, + .MinPlainTextLevel{ELogLevel::Minimum}, + .CurrentVersion{1}, + .ActualVersion = &ActualVersion_, + }; +}; + +TLogManager LogManager; + +} // namespace + +//////////////////////////////////////////////////////////////////////////////// + +TLogger Logger(&LogManager, TLogManager::CategoryName); + +//////////////////////////////////////////////////////////////////////////////// + +void FormatValue(TStringBuilderBase* builder, const TGUID& value, TStringBuf /*format*/) +{ + builder->AppendString(GetGuidAsString(value)); +} + +//////////////////////////////////////////////////////////////////////////////// + +} // namespace NYT diff --git a/yt/cpp/mapreduce/interface/logging/yt_log.h b/yt/cpp/mapreduce/interface/logging/yt_log.h new file mode 100644 index 0000000000..4cf93a6ba1 --- /dev/null +++ b/yt/cpp/mapreduce/interface/logging/yt_log.h @@ -0,0 +1,17 @@ +#pragma once + +#include <library/cpp/yt/logging/logger.h> + +struct TGUID; + +namespace NYT { + +//////////////////////////////////////////////////////////////////////////////// + +extern NLogging::TLogger Logger; + +void FormatValue(TStringBuilderBase* builder, const TGUID& value, TStringBuf format); + +//////////////////////////////////////////////////////////////////////////////// + +} // namespace NYT |