[Tarantool-patches] [PATCH 1/4] backtrace: allow to specify destination buffer
Cyrill Gorcunov
gorcunov at gmail.com
Wed Dec 2 18:18:39 MSK 2020
This will allow to reuse this routine in crash
reports.
Part-of #5261
Signed-off-by: Cyrill Gorcunov <gorcunov at gmail.com>
---
src/lib/core/backtrace.cc | 12 ++++++------
src/lib/core/backtrace.h | 3 +++
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/lib/core/backtrace.cc b/src/lib/core/backtrace.cc
index 456ce9a4d..68d0d3ee6 100644
--- a/src/lib/core/backtrace.cc
+++ b/src/lib/core/backtrace.cc
@@ -131,7 +131,7 @@ get_proc_name(unw_cursor_t *unw_cur, unw_word_t *offset, bool skip_cache)
}
char *
-backtrace(void)
+backtrace(char *start, char *end)
{
int frame_no = 0;
unw_word_t sp = 0, old_sp = 0, ip, offset;
@@ -139,10 +139,8 @@ backtrace(void)
unw_getcontext(&unw_context);
unw_cursor_t unw_cur;
unw_init_local(&unw_cur, &unw_context);
- char *backtrace_buf = (char *)static_alloc(SMALL_STATIC_SIZE);
- char *p = backtrace_buf;
- char *end = p + SMALL_STATIC_SIZE - 1;
int unw_status;
+ char *p = start;
*p = '\0';
while ((unw_status = unw_step(&unw_cur)) > 0) {
const char *proc;
@@ -174,7 +172,7 @@ backtrace(void)
say_debug("unwinding error: %i", unw_status);
#endif
out:
- return backtrace_buf;
+ return start;
}
/*
@@ -436,7 +434,9 @@ backtrace_foreach(backtrace_cb cb, coro_context *coro_ctx, void *cb_ctx)
void
print_backtrace(void)
{
- fdprintf(STDERR_FILENO, "%s", backtrace());
+ char *start = (char *)static_alloc(SMALL_STATIC_SIZE);
+ char *end = start + SMALL_STATIC_SIZE - 1;
+ fdprintf(STDERR_FILENO, "%s", backtrace(start, end));
}
#endif /* ENABLE_BACKTRACE */
diff --git a/src/lib/core/backtrace.h b/src/lib/core/backtrace.h
index c119d5402..55489c01b 100644
--- a/src/lib/core/backtrace.h
+++ b/src/lib/core/backtrace.h
@@ -40,6 +40,9 @@ extern "C" {
#ifdef ENABLE_BACKTRACE
#include <coro.h>
+char *
+backtrace(char *start, char *end);
+
void print_backtrace(void);
typedef int (backtrace_cb)(int frameno, void *frameret,
--
2.26.2
More information about the Tarantool-patches
mailing list