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

libsysprof-analyze: cleanup various swap bytes code

Browse Source
This commit is contained in:
Christian Hergert
2023-07-10 12:21:00 -07:00
parent 26ceab43f5
commit a08a14374b
1 changed files with 47 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/libsysprof-analyze/sysprof-document.c
View File

@ -121,6 +121,34 @@ enum {
static GParamSpec *properties[N_PROPS]; static GParamSpec *properties[N_PROPS];
static inline guint16
swap_uint16 (gboolean needs_swap,
guint16 value)
{
if (!needs_swap)
return value;
#if G_BYTE_ORDER == G_LITTLE_ENDIAN
return GUINT16_FROM_BE (value);
#else
return GUINT16_FROM_LE (value);
#endif
}
static inline guint32
swap_uint32 (gboolean needs_swap,
guint32 value)
{
if (!needs_swap)
return value;
#if G_BYTE_ORDER == G_LITTLE_ENDIAN
return GUINT32_FROM_BE (value);
#else
return GUINT32_FROM_LE (value);
#endif
}
static inline int static inline int
swap_int32 (gboolean needs_swap, swap_int32 (gboolean needs_swap,
int value) int value)
@ -149,6 +177,20 @@ swap_int64 (gboolean needs_swap,
#endif #endif
} }
static inline guint64
swap_uint64 (gboolean needs_swap,
guint64 value)
{
if G_LIKELY (!needs_swap)
return value;
#if G_BYTE_ORDER == G_LITTLE_ENDIAN
return GUINT64_FROM_BE (value);
#else
return GUINT64_FROM_LE (value);
#endif
}
static GType static GType
sysprof_document_get_item_type (GListModel *model) sysprof_document_get_item_type (GListModel *model)
{ {
@ -977,12 +1019,8 @@ sysprof_document_load_worker (GTask *task,
self->needs_swap = !!self->header.little_endian; self->needs_swap = !!self->header.little_endian;
#endif #endif
if (self->needs_swap) self->header.time = swap_uint64 (self->needs_swap, self->header.time);
{ self->header.end_time = swap_uint64 (self->needs_swap, self->header.end_time);
self->header.time = GUINT64_SWAP_LE_BE (self->header.time);
self->header.end_time = GUINT64_SWAP_LE_BE (self->header.end_time);
}
self->header.capture_time[sizeof self->header.capture_time-1] = 0; self->header.capture_time[sizeof self->header.capture_time-1] = 0;
self->time_span.begin_nsec = self->header.time; self->time_span.begin_nsec = self->header.time;
@ -998,8 +1036,7 @@ sysprof_document_load_worker (GTask *task,
guint16 frame_len; guint16 frame_len;
memcpy (&frame_len, &self->base[pos], sizeof frame_len); memcpy (&frame_len, &self->base[pos], sizeof frame_len);
if (self->needs_swap) frame_len = swap_uint16 (self->needs_swap, frame_len);
frame_len = GUINT16_SWAP_LE_BE (frame_len);
if (frame_len < sizeof (SysprofCaptureFrame)) if (frame_len < sizeof (SysprofCaptureFrame))
{ {
@ -1118,7 +1155,7 @@ sysprof_document_load_worker (GTask *task,
else if (tainted->type == SYSPROF_CAPTURE_FRAME_SAMPLE) else if (tainted->type == SYSPROF_CAPTURE_FRAME_SAMPLE)
{ {
const SysprofCaptureSample *sample = (const SysprofCaptureSample *)tainted; const SysprofCaptureSample *sample = (const SysprofCaptureSample *)tainted;
guint n_addrs = self->needs_swap ? GUINT16_SWAP_LE_BE (sample->n_addrs) : sample->n_addrs; guint n_addrs = swap_uint16 (self->needs_swap, sample->n_addrs);
const guint8 *endptr = (const guint8 *)tainted + ptr->length; const guint8 *endptr = (const guint8 *)tainted + ptr->length;
/* If the sample contains a context-switch, record it */ /* If the sample contains a context-switch, record it */
@ -1128,7 +1165,7 @@ sysprof_document_load_worker (GTask *task,
for (guint i = 0; i < n_addrs; i++) for (guint i = 0; i < n_addrs; i++)
{ {
SysprofAddress addr = self->needs_swap ? GUINT64_SWAP_LE_BE (sample->addrs[i]) : sample->addrs[i]; SysprofAddress addr = swap_uint64 (self->needs_swap, sample->addrs[i]);
if (sysprof_address_is_context_switch (addr, &last_context) && if (sysprof_address_is_context_switch (addr, &last_context) &&
last_context == SYSPROF_ADDRESS_CONTEXT_KERNEL) last_context == SYSPROF_ADDRESS_CONTEXT_KERNEL)