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: ensure mounts are sorted by length

Browse Source 
This matches what we did previously so that we find the closest mount
match first.
This commit is contained in:
Christian Hergert
2023-05-19 17:07:29 -07:00
parent 39e6be47fb
commit f1d0d71ee5
1 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/libsysprof-analyze/sysprof-mount-namespace.c
View File

@ -29,6 +29,7 @@ struct _SysprofMountNamespace
GObject parent_instance; GObject parent_instance;
GPtrArray *devices; GPtrArray *devices;
GPtrArray *mounts; GPtrArray *mounts;
guint mounts_dirty : 1;
}; };
static GType static GType
@ -145,6 +146,8 @@ sysprof_mount_namespace_add_mount (SysprofMountNamespace *self,
g_return_if_fail (SYSPROF_IS_MOUNT (mount)); g_return_if_fail (SYSPROF_IS_MOUNT (mount));
g_ptr_array_add (self->mounts, mount); g_ptr_array_add (self->mounts, mount);
self->mounts_dirty = TRUE;
} }
void void
@ -193,6 +196,23 @@ sysprof_mount_namespace_find_device (SysprofMountNamespace *self,
return NULL; return NULL;
} }
static gint
sort_by_length (gconstpointer a,
gconstpointer b)
{
SysprofMount *mount_a = *(SysprofMount * const *)a;
SysprofMount *mount_b = *(SysprofMount * const *)b;
gsize alen = strlen (sysprof_mount_get_mount_point (mount_a));
gsize blen = strlen (sysprof_mount_get_mount_point (mount_b));
if (alen > blen)
return -1;
else if (blen > alen)
return 1;
else
return 0;
}
/** /**
* sysprof_mount_namespace_translate: * sysprof_mount_namespace_translate:
* @self: a #SysprofMountNamespace * @self: a #SysprofMountNamespace
@ -217,6 +237,12 @@ sysprof_mount_namespace_translate (SysprofMountNamespace *self,
g_return_val_if_fail (SYSPROF_IS_MOUNT_NAMESPACE (self), NULL); g_return_val_if_fail (SYSPROF_IS_MOUNT_NAMESPACE (self), NULL);
g_return_val_if_fail (file != NULL, NULL); g_return_val_if_fail (file != NULL, NULL);
if (self->mounts_dirty)
{
g_ptr_array_sort (self->mounts, sort_by_length);
self->mounts_dirty = FALSE;
}
strv = g_array_new (TRUE, FALSE, sizeof (char *)); strv = g_array_new (TRUE, FALSE, sizeof (char *));
for (guint i = 0; i < self->mounts->len; i++) for (guint i = 0; i < self->mounts->len; i++)