fix

Author: MrLolthe1st

ydb/library/yql/utils/backtrace/backtrace.cpp

@@ -1,7 +1,7 @@
 #include "backtrace.h"
 
-#include <ydb/library/yql/utils/backtrace/libbacktrace/backtrace.h>
-#include <ydb/library/yql/utils/backtrace/libbacktrace/symbolizer.h>
+#include "backtrace_lib.h"
+#include "symbolizer.h"
 
 #include <library/cpp/deprecated/atomic/atomic.h>
 #include <library/cpp/malloc/api/malloc.h>
@@ -78,6 +78,8 @@ void SetFatalSignalAction(void (*sigaction)(int, siginfo_t*, void*))
 namespace {
     std::vector<std::function<void(int)>> Before, After;
     bool KikimrSymbolize = false;
+    const int Limit = 400;
+    NYql::NBacktrace::TCollectedFrame Frames[Limit];
 
     void CallCallbacks(decltype(Before)& where, int signum) {
         for (const auto &fn: where) {
@@ -87,14 +89,16 @@ namespace {
         }
     }
 
-    void PrintFrames(IOutputStream* out, const TVector<NYql::NBacktrace::TCollectedFrame>& frames);
+    void PrintFrames(IOutputStream* out, const NYql::NBacktrace::TCollectedFrame* frames, size_t cnt);
 
     void DoBacktrace(IOutputStream* out, void* data) {
-        PrintFrames(out, NYql::NBacktrace::CollectFrames(data));
+        auto cnt = NYql::NBacktrace::CollectFrames(Frames, data);
+        PrintFrames(out, Frames, cnt);
     }
 
     void DoBacktrace(IOutputStream* out, void** stack, size_t cnt) {
-        PrintFrames(out, NYql::NBacktrace::CollectFrames(stack, cnt));
+        Y_UNUSED(NYql::NBacktrace::CollectFrames(Frames, stack, cnt));
+        PrintFrames(out, Frames, cnt);
     }
 
 
@@ -185,11 +189,11 @@ void EnableKikimrBacktraceFormat() {
 }
 
 namespace {
-    void PrintFrames(IOutputStream* out, const TVector<NYql::NBacktrace::TCollectedFrame>& frames) {
+    void PrintFrames(IOutputStream* out, const NYql::NBacktrace::TCollectedFrame* frames, size_t count) {
         auto& outp = *out;
         if (KikimrSymbolize) {
-            TVector<NYql::NBacktrace::TStackFrame> sFrames(frames.size());
-            for (size_t i = 0; i < frames.size(); ++i) {
+            TVector<NYql::NBacktrace::TStackFrame> sFrames(count);
+            for (size_t i = 0; i < count; ++i) {
                 sFrames[i] = NYql::NBacktrace::TStackFrame{frames[i].File, frames[i].Address};
             }
             auto symbolized = NYql::NBacktrace::Symbolize(sFrames);
@@ -198,10 +202,11 @@ namespace {
             }
             return;
         }
-        outp << "StackFrames: " << frames.size() << "\n";
-        for (auto &frame: frames) {
+        outp << "StackFrames: " << count << "\n";
+        for (size_t i = 0; i < count; ++i) {
+            auto& frame = frames[i];
             auto fileName = frame.File;
-            if (fileName == "/proc/self/exe") {
+            if (!strcmp(fileName, "/proc/self/exe")) {
                 fileName = "EXE";
             }
             auto it = NYql::NBacktrace::Mapping.find(fileName);

ydb/library/yql/utils/backtrace/libbacktrace/backtrace_dummy.cpp renamed to ydb/library/yql/utils/backtrace/backtrace_dummy.cpp

@@ -1,4 +1,4 @@
-#include "backtrace.h"
+#include "backtrace_lib.h"
 
 #include <util/system/backtrace.h>
 

ydb/library/yql/utils/backtrace/libbacktrace/backtrace.cpp renamed to ydb/library/yql/utils/backtrace/backtrace_lib.cpp

@@ -1,4 +1,4 @@
-#include "backtrace.h"
+#include "backtrace_lib.h"
 
 #include <util/generic/hash.h>
 #include <util/system/execpath.h>
@@ -34,7 +34,7 @@ namespace {
 namespace NYql {
     namespace NBacktrace {
         TCollectedFrame::TCollectedFrame(uintptr_t addr) {
-            File = GetPersistentExecPath();
+            File = GetPersistentExecPath().c_str();
             Address = addr;
 #if defined(_linux_) && defined(_x86_64_)
             Dl_info dlInfo;
@@ -51,22 +51,20 @@ namespace NYql {
 #endif
         }
 
-        TVector<TCollectedFrame> CollectFrames(void* data) {
+        size_t CollectFrames(TCollectedFrame* frames, void* data) {
 #if defined(_linux_) && defined(_x86_64_)
             DLLs.clear();
             dl_iterate_phdr(DlIterCallback, &DLLs);
 #endif
             size_t cnt = CollectBacktrace(Stack, Limit, data);
-            return CollectFrames(Stack, cnt);
+            return CollectFrames(frames, Stack, cnt);
         }
 
-        TVector<TCollectedFrame> CollectFrames(void** stack, size_t cnt) {
-            TVector<TCollectedFrame> result;
-            result.reserve(cnt);
+        size_t CollectFrames(TCollectedFrame* frames, void** stack, size_t cnt) {
             for (size_t i = 0; i < cnt; ++i) {
-                result.emplace_back(reinterpret_cast<uintptr_t>(stack[i]));
+                new (frames + i)TCollectedFrame(reinterpret_cast<uintptr_t>(stack[i]));
             }
-            return result;
+            return cnt;
         }
     }
 }

ydb/library/yql/utils/backtrace/libbacktrace/backtrace.h renamed to ydb/library/yql/utils/backtrace/backtrace_lib.h

@@ -8,10 +8,11 @@ namespace NYql {
         size_t CollectBacktrace(void** addresses, size_t limit, void* data);
         struct TCollectedFrame {
             TCollectedFrame(uintptr_t addr);
-            TString File;
+            TCollectedFrame() = default;
+            const char* File;
             size_t Address;
         };
-        TVector<TCollectedFrame> CollectFrames(void* data);
-        TVector<TCollectedFrame> CollectFrames(void** stack, size_t cnt);
+        size_t CollectFrames(TCollectedFrame* frames, void* data);
+        size_t CollectFrames(TCollectedFrame* frames, void** stack, size_t cnt);
     }
 }

ydb/library/yql/utils/backtrace/libbacktrace/backtrace_linux.cpp renamed to ydb/library/yql/utils/backtrace/backtrace_linux.cpp

@@ -1,4 +1,4 @@
-#include "backtrace.h"
+#include "backtrace_lib.h"
 
 #include <libunwind.h>
 #include <signal.h>

ydb/library/yql/utils/backtrace/libbacktrace/ya.make

@@ -1,6 +1,6 @@
 #include "backtrace.h"
 
-#include <ydb/library/yql/utils/backtrace/libbacktrace/symbolizer.h>
+#include "symbolizer.h"
 
 #include <util/string/split.h>
 #include <util/stream/str.h>
@@ -10,6 +10,7 @@ namespace NYql {
     namespace NBacktrace {
 
         TString Symbolize(const TString& input, const THashMap<TString, TString>& mapping) {
+#if defined(__linux__) && defined(__x86_64__)
             TString output;
             TStringOutput out(output);
 
@@ -28,14 +29,16 @@ namespace NYql {
                     Split(TString(line), " ", parts);
                     TString modulePath;
                     ui64 address;
-                    if (parts.size() > 2) {
+                    ui64 offset;
+                    if (parts.size() > 3) {
                         modulePath = parts[1];
                         TryFromString<ui64>(parts[2], address);
+                        TryFromString<ui64>(parts[3], offset);
                         auto it = mapping.find(modulePath);
                         if (it != mapping.end()) {
                             modulePath = it->second;
                         }
-                        frames.emplace_back(TStackFrame{modulePath, address});
+                        frames.emplace_back(TStackFrame{modulePath, address - offset});
                     }
                 } else {
                     out << line << "\n";
@@ -49,6 +52,9 @@ namespace NYql {
                 out << e << "\n";
             }
             return output;
+#else
+            return input;
+#endif
         }
 
     } /* namespace NBacktrace */

ydb/library/yql/utils/backtrace/symbolize.cpp

@@ -2,17 +2,31 @@ LIBRARY()
 
 SRCS(
     backtrace.cpp
+    backtrace_lib.cpp
     symbolize.cpp
 )
 
 PEERDIR(
     library/cpp/deprecated/atomic
-    ydb/library/yql/utils/backtrace/libbacktrace
 )
 
-END()
 
-RECURSE_FOR_TESTS(
-    ut
-)
+IF (OS_LINUX AND ARCH_X86_64)
+    SRCS(
+        backtrace_linux.cpp
+        symbolizer_linux.cpp
+    )
+
+    PEERDIR(
+        contrib/libs/backtrace
+        contrib/libs/libunwind
+    )
+    ADDINCL(contrib/libs/libunwind/include)
+    
+ELSE()
+    SRCS(
+        backtrace_dummy.cpp
+    )
+ENDIF()
 
+END()