varun-r-mallya/sysprof
1
0
Fork 0
mirror of https://github.com/varun-r-mallya/sysprof.git synced 2026-02-10 23:20:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

libsysprof-capture: allow for backtrace skip optimization

Browse Source 
We want to be backtracing directly into the capture buffer, but also need
to skip a small number of frames.

If we call the backtrace before filling in information, we can capture to
the position *before* ev->addrs and then overwrite that data right after.
This commit is contained in:
Christian Hergert
2020-02-18 13:35:18 -08:00
parent b6dc058d62
commit 70bea64f88
2 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/libsysprof-capture/sysprof-collector.c
View File

@ -384,6 +384,19 @@ sysprof_collector_allocate (SysprofCaptureAddress alloc_addr,
if ((ev = mapped_ring_buffer_allocate (collector->buffer, len))) if ((ev = mapped_ring_buffer_allocate (collector->buffer, len)))
{ {
/* First take a backtrace, so that backtrace_func() can overwrite
* a little bit of data *BEFORE* ev->addrs as stratch space. This
* is useful to allow using unw_backtrace() or backtrace() to skip
* a small number of frames.
*
* We fill in all the other data afterwards which overwrites that
* scratch space anyway.
*/
if (backtrace_func)
ev->n_addrs = backtrace_func (ev->addrs, MAX_UNWIND_DEPTH, backtrace_data);
else
ev->n_addrs = 0;
ev->frame.type = SYSPROF_CAPTURE_FRAME_ALLOCATION; ev->frame.type = SYSPROF_CAPTURE_FRAME_ALLOCATION;
ev->frame.len = len; ev->frame.len = len;
ev->frame.cpu = _do_getcpu (); ev->frame.cpu = _do_getcpu ();
@ -392,10 +405,6 @@ sysprof_collector_allocate (SysprofCaptureAddress alloc_addr,
ev->tid = collector->tid; ev->tid = collector->tid;
ev->alloc_addr = alloc_addr; ev->alloc_addr = alloc_addr;
ev->alloc_size = alloc_size; ev->alloc_size = alloc_size;
ev->n_addrs = 0;
if (backtrace_func)
ev->n_addrs = backtrace_func (ev->addrs, MAX_UNWIND_DEPTH, backtrace_data);
len = sizeof *ev + sizeof (SysprofCaptureAddress) * ev->n_addrs; len = sizeof *ev + sizeof (SysprofCaptureAddress) * ev->n_addrs;
_realign (&len); _realign (&len);

19
src/libsysprof/preload/sysprof-memory-collector.c
View File

@ -77,17 +77,24 @@ backtrace_func (SysprofCaptureAddress *addrs,
{ {
#if defined(ENABLE_LIBUNWIND) #if defined(ENABLE_LIBUNWIND)
# if GLIB_SIZEOF_VOID_P == 8 # if GLIB_SIZEOF_VOID_P == 8
return unw_backtrace ((void **)addrs, n_addrs); /* We know that collector will overwrite fields *AFTER* it
* has called the backtrace function allowing us to cheat
* and subtract an offset from addrs to avoid having to
* copy frame pointers around.
*/
return unw_backtrace ((void **)addrs - 1, n_addrs);
# else # else
static const gint skip = 1;
void **stack = alloca (n_addrs * sizeof (gpointer)); void **stack = alloca (n_addrs * sizeof (gpointer));
guint n = unw_backtrace (stack, n_addrs); gint n = unw_backtrace (stack, n_addrs);
for (guint i = 0; i < n; i++) for (guint i = skip; i < n; i++)
addrs[i] = GPOINTER_TO_SIZE (stack[i]); addrs[i-skip] = GPOINTER_TO_SIZE (stack[i]);
return n; return MAX (0, n - skip);
# endif # endif
#elif defined(HAVE_EXECINFO_H) #elif defined(HAVE_EXECINFO_H)
# if GLIB_SIZEOF_VOID_P == 8 # if GLIB_SIZEOF_VOID_P == 8
return backtrace ((void **)addrs, n_addrs); /* See note on unw_backtrace() */
return backtrace ((void **)addrs - 1, n_addrs);
# else /* GLIB_SIZEOF_VOID_P != 8 */ # else /* GLIB_SIZEOF_VOID_P != 8 */
void **stack = alloca (n_addrs * sizeof (gpointer)); void **stack = alloca (n_addrs * sizeof (gpointer));
guint n = backtrace (stack, n_addrs); guint n = backtrace (stack, n_addrs);