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

libsysprof-capture: Use reallocarray() instead of GPtrArray in cursor

Browse Source 
There are typically 0 or 1 conditions applied to a cursor, and they’re
only applied at construction time, so it makes sense to only grow the
conditions array linearly when it’s used. This means the array may stay
as `NULL` throughout the lifetime of the cursor.

There’s currently no way to return an error from
`sysprof_capture_cursor_add_condition()`, so an allocation failure
results in an abort.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

Helps: #40
This commit is contained in:
Philip Withnall
2020-07-02 09:59:08 +01:00
parent 607af73676
commit b509daaa42
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/libsysprof-capture/sysprof-capture-cursor.c
View File

@ -57,6 +57,7 @@
#include "config.h" #include "config.h"
#include <assert.h> #include <assert.h>
#include <stdlib.h>
#include "sysprof-capture-condition.h" #include "sysprof-capture-condition.h"
#include "sysprof-capture-cursor.h" #include "sysprof-capture-cursor.h"
@ -71,7 +72,8 @@ typedef const SysprofCaptureFrame *(*ReadDelegate) (SysprofCaptureReader *);
struct _SysprofCaptureCursor struct _SysprofCaptureCursor
{ {
volatile int ref_count; volatile int ref_count;
GPtrArray *conditions; SysprofCaptureCondition **conditions; /* (nullable) (owned) */
size_t n_conditions;
SysprofCaptureReader *reader; SysprofCaptureReader *reader;
unsigned int reversed : 1; unsigned int reversed : 1;
}; };
@ -79,7 +81,9 @@ struct _SysprofCaptureCursor
static void static void
sysprof_capture_cursor_finalize (SysprofCaptureCursor *self) sysprof_capture_cursor_finalize (SysprofCaptureCursor *self)
{ {
sysprof_clear_pointer (&self->conditions, g_ptr_array_unref); for (size_t i = 0; i < self->n_conditions; i++)
sysprof_capture_condition_unref (self->conditions[i]);
sysprof_clear_pointer (&self->conditions, free);
sysprof_clear_pointer (&self->reader, sysprof_capture_reader_unref); sysprof_clear_pointer (&self->reader, sysprof_capture_reader_unref);
free (self); free (self);
} }
@ -93,7 +97,8 @@ sysprof_capture_cursor_init (void)
if (self == NULL) if (self == NULL)
return NULL; return NULL;
self->conditions = g_ptr_array_new_with_free_func ((GDestroyNotify) sysprof_capture_condition_unref); self->conditions = NULL;
self->n_conditions = 0;
self->ref_count = 1; self->ref_count = 1;
return sysprof_steal_pointer (&self); return sysprof_steal_pointer (&self);
@ -229,16 +234,16 @@ sysprof_capture_cursor_foreach (SysprofCaptureCursor *self,
if (NULL == (frame = delegate (self->reader))) if (NULL == (frame = delegate (self->reader)))
return; return;
if (self->conditions->len == 0) if (self->n_conditions == 0)
{ {
if (!callback (frame, user_data)) if (!callback (frame, user_data))
return; return;
} }
else else
{ {
for (size_t i = 0; i < self->conditions->len; i++) for (size_t i = 0; i < self->n_conditions; i++)
{ {
const SysprofCaptureCondition *condition = g_ptr_array_index (self->conditions, i); const SysprofCaptureCondition *condition = self->conditions[i];
if (sysprof_capture_condition_match (condition, frame)) if (sysprof_capture_condition_match (condition, frame))
{ {
@ -283,7 +288,15 @@ sysprof_capture_cursor_add_condition (SysprofCaptureCursor *self,
assert (self != NULL); assert (self != NULL);
assert (condition != NULL); assert (condition != NULL);
g_ptr_array_add (self->conditions, condition); /* Grow the array linearly to keep the code simple: there are typically 0 or 1
* conditions applied to a given cursor, just after it’s constructed.
*
* FIXME: There’s currently no error reporting from this function, so ENOMEM
* results in an abort. */
self->conditions = reallocarray (self->conditions, ++self->n_conditions, sizeof (*self->conditions));
assert (self->conditions != NULL);
self->conditions[self->n_conditions - 1] = sysprof_steal_pointer (&condition);
} }
/** /**