libsysprof-analyze: rename some private API

prefix with _, use frame type directly, use needs_swap rather than
is_native so it's more clear to readers.
This commit is contained in:
Christian Hergert
2023-04-25 16:11:59 -07:00
parent a3cf041326
commit a5dafa5409
3 changed files with 22 additions and 22 deletions

View File

@ -31,8 +31,8 @@ struct _SysprofDocumentFrameClass
GObjectClass parent_class; GObjectClass parent_class;
}; };
SysprofDocumentFrame *sysprof_document_frame_new (GMappedFile *mapped, SysprofDocumentFrame *_sysprof_document_frame_new (GMappedFile *mapped,
gconstpointer data, const SysprofCaptureFrame *frame,
gboolean is_native); gboolean needs_swap);
G_END_DECLS G_END_DECLS

View File

@ -26,7 +26,7 @@ typedef struct _SysprofDocumentFramePrivate
{ {
GMappedFile *mapped_file; GMappedFile *mapped_file;
const SysprofCaptureFrame *frame; const SysprofCaptureFrame *frame;
guint is_native : 1; guint needs_swap : 1;
} SysprofDocumentFramePrivate; } SysprofDocumentFramePrivate;
G_DEFINE_TYPE_WITH_PRIVATE (SysprofDocumentFrame, sysprof_document_frame, G_TYPE_OBJECT) G_DEFINE_TYPE_WITH_PRIVATE (SysprofDocumentFrame, sysprof_document_frame, G_TYPE_OBJECT)
@ -50,7 +50,7 @@ sysprof_document_frame_finalize (GObject *object)
g_clear_pointer (&priv->mapped_file, g_mapped_file_unref); g_clear_pointer (&priv->mapped_file, g_mapped_file_unref);
priv->frame = NULL; priv->frame = NULL;
priv->is_native = 0; priv->needs_swap = 0;
G_OBJECT_CLASS (sysprof_document_frame_parent_class)->finalize (object); G_OBJECT_CLASS (sysprof_document_frame_parent_class)->finalize (object);
} }
@ -120,9 +120,9 @@ sysprof_document_frame_init (SysprofDocumentFrame *self)
} }
SysprofDocumentFrame * SysprofDocumentFrame *
sysprof_document_frame_new (GMappedFile *mapped_file, _sysprof_document_frame_new (GMappedFile *mapped_file,
gconstpointer data, const SysprofCaptureFrame *frame,
gboolean is_native) gboolean needs_swap)
{ {
SysprofDocumentFrame *self; SysprofDocumentFrame *self;
SysprofDocumentFramePrivate *priv; SysprofDocumentFramePrivate *priv;
@ -131,8 +131,8 @@ sysprof_document_frame_new (GMappedFile *mapped_file,
priv = sysprof_document_frame_get_instance_private (self); priv = sysprof_document_frame_get_instance_private (self);
priv->mapped_file = g_mapped_file_ref (mapped_file); priv->mapped_file = g_mapped_file_ref (mapped_file);
priv->frame = data; priv->frame = frame;
priv->is_native = !!is_native; priv->needs_swap = !!needs_swap;
return self; return self;
} }
@ -145,7 +145,7 @@ sysprof_document_frame_get_cpu (SysprofDocumentFrame *self)
g_return_val_if_fail (SYSPROF_IS_DOCUMENT_FRAME (self), 0); g_return_val_if_fail (SYSPROF_IS_DOCUMENT_FRAME (self), 0);
if G_LIKELY (priv->is_native) if G_LIKELY (priv->needs_swap)
ret = priv->frame->cpu; ret = priv->frame->cpu;
else else
ret = GUINT32_SWAP_LE_BE (priv->frame->cpu); ret = GUINT32_SWAP_LE_BE (priv->frame->cpu);
@ -161,7 +161,7 @@ sysprof_document_frame_get_pid (SysprofDocumentFrame *self)
g_return_val_if_fail (SYSPROF_IS_DOCUMENT_FRAME (self), 0); g_return_val_if_fail (SYSPROF_IS_DOCUMENT_FRAME (self), 0);
if G_LIKELY (priv->is_native) if G_LIKELY (priv->needs_swap)
ret = priv->frame->pid; ret = priv->frame->pid;
else else
ret = GUINT32_SWAP_LE_BE (priv->frame->pid); ret = GUINT32_SWAP_LE_BE (priv->frame->pid);
@ -177,7 +177,7 @@ sysprof_document_frame_get_time (SysprofDocumentFrame *self)
g_return_val_if_fail (SYSPROF_IS_DOCUMENT_FRAME (self), 0); g_return_val_if_fail (SYSPROF_IS_DOCUMENT_FRAME (self), 0);
if G_LIKELY (priv->is_native) if G_LIKELY (priv->needs_swap)
ret = priv->frame->time; ret = priv->frame->time;
else else
ret = GUINT32_SWAP_LE_BE (priv->frame->time); ret = GUINT32_SWAP_LE_BE (priv->frame->time);

View File

@ -33,7 +33,7 @@ struct _SysprofDocument
GPtrArray *frames; GPtrArray *frames;
GMappedFile *mapped_file; GMappedFile *mapped_file;
SysprofCaptureFileHeader header; SysprofCaptureFileHeader header;
guint is_native : 1; guint needs_swap : 1;
}; };
static GType static GType
@ -57,9 +57,9 @@ sysprof_document_get_item (GListModel *model,
if (position >= self->frames->len) if (position >= self->frames->len)
return NULL; return NULL;
return sysprof_document_frame_new (self->mapped_file, return _sysprof_document_frame_new (self->mapped_file,
g_ptr_array_index (self->frames, position), g_ptr_array_index (self->frames, position),
self->is_native); self->needs_swap);
} }
static void static void
@ -121,12 +121,12 @@ sysprof_document_load (SysprofDocument *self,
/* Keep a copy of our header */ /* Keep a copy of our header */
memcpy (&self->header, data, sizeof self->header); memcpy (&self->header, data, sizeof self->header);
#if G_BYTE_ORDER == G_LITTLE_ENDIAN #if G_BYTE_ORDER == G_LITTLE_ENDIAN
self->is_native = !!self->header.little_endian; self->needs_swap = !self->header.little_endian;
#else #else
self->is_native = !self->header.little_endian; self->needs_swap = !!self->header.little_endian;
#endif #endif
if (!self->is_native) if (self->needs_swap)
{ {
self->header.time = GUINT64_SWAP_LE_BE (self->header.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.end_time = GUINT64_SWAP_LE_BE (self->header.end_time);
@ -138,8 +138,8 @@ sysprof_document_load (SysprofDocument *self,
guint16 frame_len; guint16 frame_len;
memcpy (&frame_len, &data[pos], sizeof frame_len); memcpy (&frame_len, &data[pos], sizeof frame_len);
if (!self->is_native) if (self->needs_swap)
frame_len = GUINT16_SWAP_LE_BE (self->is_native); frame_len = GUINT16_SWAP_LE_BE (frame_len);
if (frame_len < sizeof (SysprofCaptureFrame)) if (frame_len < sizeof (SysprofCaptureFrame))
break; break;