luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-14 16:26:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

gunixmounts: Speed up mtab processing with libmount

Browse Source 
libmnt_context is useless. It contains cache which is useful for searching,
but it isn't used in our case. Let's use mnt_context_parse_mtab instead
directly and the mtab processing will be faster.

https://bugzilla.gnome.org/show_bug.cgi?id=781867
This commit is contained in:
Ondrej Holy 2017-05-05 12:33:58 +02:00
parent b7ffc07d98
commit 53ed1804e2
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gio/gunixmounts.c
View File

@ -391,15 +391,13 @@ static GList *
_g_get_unix_mounts (void) _g_get_unix_mounts (void)
{ {
struct libmnt_table *table = NULL; struct libmnt_table *table = NULL;
struct libmnt_context *ctxt = NULL;
struct libmnt_iter* iter = NULL; struct libmnt_iter* iter = NULL;
struct libmnt_fs *fs = NULL; struct libmnt_fs *fs = NULL;
GUnixMountEntry *mount_entry = NULL; GUnixMountEntry *mount_entry = NULL;
GList *return_list = NULL; GList *return_list = NULL;
ctxt = mnt_new_context (); table = mnt_new_table ();
mnt_context_get_mtab (ctxt, &table); if (mnt_table_parse_mtab (table, NULL) < 0)
if (!table)
goto out; goto out;
iter = mnt_new_iter (MNT_ITER_FORWARD); iter = mnt_new_iter (MNT_ITER_FORWARD);
@ -435,7 +433,7 @@ _g_get_unix_mounts (void)
mnt_free_iter (iter); mnt_free_iter (iter);
out: out:
mnt_free_context (ctxt); mnt_unref_table (table);
return g_list_reverse (return_list); return g_list_reverse (return_list);
} }
@ -875,15 +873,13 @@ static GList *
_g_get_unix_mount_points (void) _g_get_unix_mount_points (void)
{ {
struct libmnt_table *table = NULL; struct libmnt_table *table = NULL;
struct libmnt_context *ctxt = NULL;
struct libmnt_iter* iter = NULL; struct libmnt_iter* iter = NULL;
struct libmnt_fs *fs = NULL; struct libmnt_fs *fs = NULL;
GUnixMountPoint *mount_point = NULL; GUnixMountPoint *mount_point = NULL;
GList *return_list = NULL; GList *return_list = NULL;
ctxt = mnt_new_context (); table = mnt_new_table ();
mnt_context_get_fstab (ctxt, &table); if (mnt_table_parse_mtab (table, NULL) < 0)
if (!table)
goto out; goto out;
iter = mnt_new_iter (MNT_ITER_FORWARD); iter = mnt_new_iter (MNT_ITER_FORWARD);
@ -953,7 +949,7 @@ _g_get_unix_mount_points (void)
mnt_free_iter (iter); mnt_free_iter (iter);
out: out:
mnt_free_context (ctxt); mnt_unref_table (table);
return g_list_reverse (return_list); return g_list_reverse (return_list);
} }