varun-r-mallya/sysprof
1
0
Fork 0
mirror of https://github.com/varun-r-mallya/sysprof.git synced 2025-12-31 20:36:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

capture: rename PidRoot to Overlay and add src/dst

Browse Source 
Really what we want to deal with here is tracking an overlay that we may
need to be able to decode after the fact (in case processes exit or we
need to do post-processing symbol resolution).

For the podman case, that is $some_path mapped to root (/), generally
speaking. For flatpak though, that would have two mappings, one for
/app and another for /usr (possibly more).
This commit is contained in:
Christian Hergert
2021-02-25 13:43:09 -08:00
parent 8b0f3f4682
commit 14139232d5
11 changed files with 153 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/libsysprof-capture/sysprof-capture-reader.c
View File

@ -354,14 +354,18 @@ sysprof_capture_reader_bswap_mark (SysprofCaptureReader *self,
}
static inline void
sysprof_capture_reader_bswap_pid_root (SysprofCaptureReader *self,
SysprofCapturePidRoot *pr)
sysprof_capture_reader_bswap_overlay (SysprofCaptureReader *self,
SysprofCaptureOverlay *pr)
{
assert (self != NULL);
assert (pr != NULL);
if (SYSPROF_UNLIKELY (self->endian != __BYTE_ORDER))
pr->layer = bswap_32 (pr->layer);
{
pr->layer = bswap_32 (pr->layer);
pr->src_len = bswap_32 (pr->src_len);
pr->dst_len = bswap_32 (pr->dst_len);
}
}
static inline void
@ -690,10 +694,10 @@ sysprof_capture_reader_read_mark (SysprofCaptureReader *self)
return mark;
}
const SysprofCapturePidRoot *
sysprof_capture_reader_read_pid_root (SysprofCaptureReader *self)
const SysprofCaptureOverlay *
sysprof_capture_reader_read_overlay (SysprofCaptureReader *self)
{
SysprofCapturePidRoot *pr;
SysprofCaptureOverlay *pr;
assert (self != NULL);
assert ((self->pos % SYSPROF_CAPTURE_ALIGN) == 0);
@ -702,22 +706,30 @@ sysprof_capture_reader_read_pid_root (SysprofCaptureReader *self)
if (!sysprof_capture_reader_ensure_space_for (self, sizeof *pr + 1))
return NULL;
pr = (SysprofCapturePidRoot *)(void *)&self->buf[self->pos];
pr = (SysprofCaptureOverlay *)(void *)&self->buf[self->pos];
sysprof_capture_reader_bswap_frame (self, &pr->frame);
if (pr->frame.type != SYSPROF_CAPTURE_FRAME_PID_ROOT)
if (pr->frame.type != SYSPROF_CAPTURE_FRAME_OVERLAY)
return NULL;
if (pr->frame.len < (sizeof *pr + 1))
if (pr->frame.len < (sizeof *pr + 2))
return NULL;
if (!sysprof_capture_reader_ensure_space_for (self, pr->frame.len))
return NULL;
pr = (SysprofCapturePidRoot *)(void *)&self->buf[self->pos];
pr = (SysprofCaptureOverlay *)(void *)&self->buf[self->pos];
sysprof_capture_reader_bswap_pid_root (self, pr);
sysprof_capture_reader_bswap_overlay (self, pr);
/* Make sure there is enough space for paths and trailing \0 */
if (((size_t)pr->src_len + (size_t)pr->dst_len) > (pr->frame.len - sizeof *pr - 2))
return NULL;
/* Enforce trailing \0 */
pr->data[pr->src_len] = 0;
pr->data[pr->src_len+1+pr->dst_len] = 0;
self->pos += pr->frame.len;