From: Cyrill Gorcunov <gorcunov@gmail.com> To: tml <tarantool-patches@dev.tarantool.org> Cc: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> Subject: [Tarantool-patches] [PATCH v5 2/4] backtrace: allow to specify destination buffer Date: Wed, 23 Dec 2020 18:41:53 +0300 [thread overview] Message-ID: <20201223154155.234884-3-gorcunov@gmail.com> (raw) In-Reply-To: <20201223154155.234884-1-gorcunov@gmail.com> This will allow to reuse this routine in crash reports. Part-of #5261 Acked-by: Serge Petrenko <sergepetrenko@tarantool.org> Signed-off-by: Cyrill Gorcunov <gorcunov@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..b4048089f 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, size_t size) { int frame_no = 0; unw_word_t sp = 0, old_sp = 0, ip, offset; @@ -139,10 +139,9 @@ 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; + char *end = start + size - 1; *p = '\0'; while ((unw_status = unw_step(&unw_cur)) > 0) { const char *proc; @@ -174,7 +173,7 @@ backtrace(void) say_debug("unwinding error: %i", unw_status); #endif out: - return backtrace_buf; + return start; } /* @@ -436,7 +435,8 @@ 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); + fdprintf(STDERR_FILENO, "%s", backtrace(start, SMALL_STATIC_SIZE)); } #endif /* ENABLE_BACKTRACE */ diff --git a/src/lib/core/backtrace.h b/src/lib/core/backtrace.h index c119d5402..e0ae56be4 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, size_t size); + void print_backtrace(void); typedef int (backtrace_cb)(int frameno, void *frameret, -- 2.26.2
next prev parent reply other threads:[~2020-12-23 15:42 UTC|newest] Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-12-23 15:41 [Tarantool-patches] [PATCH v5 0/4] Our feedback daemon sends only a few portions of usage Cyrill Gorcunov 2020-12-23 15:41 ` [Tarantool-patches] [PATCH v5 1/4] util: introduce strlcpy helper Cyrill Gorcunov 2020-12-23 15:41 ` Cyrill Gorcunov [this message] 2020-12-23 15:41 ` [Tarantool-patches] [PATCH v5 3/4] crash: move fatal signal handling in Cyrill Gorcunov 2020-12-23 15:41 ` [Tarantool-patches] [PATCH v5 4/4] crash: report crash data to the feedback server Cyrill Gorcunov 2020-12-23 18:47 ` Vladislav Shpilevoy 2020-12-23 18:57 ` Cyrill Gorcunov 2020-12-23 21:22 ` Cyrill Gorcunov 2020-12-24 13:16 ` Cyrill Gorcunov 2020-12-24 17:15 ` Vladislav Shpilevoy 2020-12-24 17:33 ` Cyrill Gorcunov 2020-12-24 18:22 ` Vladislav Shpilevoy 2020-12-24 18:33 ` Cyrill Gorcunov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20201223154155.234884-3-gorcunov@gmail.com \ --to=gorcunov@gmail.com \ --cc=tarantool-patches@dev.tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v5 2/4] backtrace: allow to specify destination buffer' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox