forked from pool/coreutils
- Add coreutils-df-hash-in-filter.patch that speeds up df.
OBS-URL: https://build.opensuse.org/package/show/Base:System/coreutils?expand=0&rev=274
This commit is contained in:
Philipp Thomas
Git OBS Bridge
parent
2f40bbb851
commit
4488160d56
162
coreutils-df-hash-in-filter.patch
Normal file
162
coreutils-df-hash-in-filter.patch
Normal file
@ -0,0 +1,162 @@
|
||||
From: Philipp Thomas <pth@suse.de>
|
||||
Date: 2016-07-22 10:34:59+02:00
|
||||
Subject: speed up df
|
||||
References:
|
||||
Upstream:
|
||||
|
||||
|
||||
Use hash table for seaching in filter_mount_list() and get_dev().
|
||||
Patch was done by Josef Cejka <jcejka@suse.com>.
|
||||
|
||||
---
|
||||
src/df.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++---------------
|
||||
1 file changed, 62 insertions(+), 18 deletions(-)
|
||||
|
||||
Index: coreutils-8.25/src/df.c
|
||||
===================================================================
|
||||
--- coreutils-8.25.orig/src/df.c 2016-07-22 10:31:00.838791851 +0200
|
||||
+++ coreutils-8.25/src/df.c 2016-07-22 10:33:37.285989052 +0200
|
||||
@@ -34,6 +34,7 @@
|
||||
#include "mountlist.h"
|
||||
#include "quote.h"
|
||||
#include "find-mount-point.h"
|
||||
+#include "hash.h"
|
||||
|
||||
/* The official name of this program (e.g., no 'g' prefix). */
|
||||
#define PROGRAM_NAME "df"
|
||||
@@ -43,14 +44,16 @@
|
||||
proper_name ("David MacKenzie"), \
|
||||
proper_name ("Paul Eggert")
|
||||
|
||||
-/* Filled with device numbers of examined file systems to avoid
|
||||
- duplicates in output. */
|
||||
-static struct devlist
|
||||
+struct devlist
|
||||
{
|
||||
dev_t dev_num;
|
||||
struct mount_entry *me;
|
||||
struct devlist *next;
|
||||
-} *device_list;
|
||||
+};
|
||||
+
|
||||
+/* Filled with device numbers of examined file systems to avoid
|
||||
+ duplicates in output. */
|
||||
+static Hash_table *devlist_table;
|
||||
|
||||
/* If true, show even file systems with zero size or
|
||||
uninteresting types. */
|
||||
@@ -603,6 +606,37 @@ excluded_fstype (const char *fstype)
|
||||
return false;
|
||||
}
|
||||
|
||||
+static size_t
|
||||
+devlist_hash (void const *x, size_t table_size)
|
||||
+{
|
||||
+ struct devlist const *p = x;
|
||||
+ return (uintmax_t) p->dev_num % table_size;
|
||||
+}
|
||||
+
|
||||
+static bool
|
||||
+devlist_compare (void const *x, void const *y)
|
||||
+{
|
||||
+ struct devlist const *a = x;
|
||||
+ struct devlist const *b = y;
|
||||
+ return a->dev_num == b->dev_num;
|
||||
+}
|
||||
+
|
||||
+static struct devlist *
|
||||
+devlist_for_dev (dev_t dev)
|
||||
+{
|
||||
+ struct devlist dev_entry;
|
||||
+ dev_entry.dev_num = dev;
|
||||
+ if (devlist_table == NULL)
|
||||
+ return NULL;
|
||||
+ return hash_lookup(devlist_table, &dev_entry);
|
||||
+}
|
||||
+
|
||||
+static void
|
||||
+devlist_free(void *p)
|
||||
+{
|
||||
+ free(p);
|
||||
+}
|
||||
+
|
||||
/* Filter mount list by skipping duplicate entries.
|
||||
In the case of duplicates - based on the device number - the mount entry
|
||||
with a '/' in its me_devname (i.e., not pseudo name like tmpfs) wins.
|
||||
@@ -615,6 +649,20 @@ filter_mount_list (bool devices_only)
|
||||
{
|
||||
struct mount_entry *me;
|
||||
|
||||
+ /* temp list to keep entries ordered */
|
||||
+ struct devlist *device_list = NULL;
|
||||
+ int mount_list_size = 0;
|
||||
+
|
||||
+ for (me = mount_list; me; me = me->me_next)
|
||||
+ mount_list_size++;
|
||||
+
|
||||
+ devlist_table = hash_initialize (mount_list_size, NULL,
|
||||
+ devlist_hash,
|
||||
+ devlist_compare,
|
||||
+ devlist_free);
|
||||
+ if (devlist_table == NULL)
|
||||
+ xalloc_die ();
|
||||
+
|
||||
/* Sort all 'wanted' entries into the list device_list. */
|
||||
for (me = mount_list; me;)
|
||||
{
|
||||
@@ -635,9 +683,7 @@ filter_mount_list (bool devices_only)
|
||||
else
|
||||
{
|
||||
/* If we've already seen this device... */
|
||||
- for (devlist = device_list; devlist; devlist = devlist->next)
|
||||
- if (devlist->dev_num == buf.st_dev)
|
||||
- break;
|
||||
+ devlist = devlist_for_dev(buf.st_dev);
|
||||
|
||||
if (devlist)
|
||||
{
|
||||
@@ -697,6 +743,8 @@ filter_mount_list (bool devices_only)
|
||||
devlist->dev_num = buf.st_dev;
|
||||
devlist->next = device_list;
|
||||
device_list = devlist;
|
||||
+ if (hash_insert (devlist_table, devlist) == NULL)
|
||||
+ xalloc_die ();
|
||||
|
||||
me = me->me_next;
|
||||
}
|
||||
@@ -711,28 +759,24 @@ filter_mount_list (bool devices_only)
|
||||
me = device_list->me;
|
||||
me->me_next = mount_list;
|
||||
mount_list = me;
|
||||
- /* Free devlist entry and advance. */
|
||||
- struct devlist *devlist = device_list->next;
|
||||
- free (device_list);
|
||||
- device_list = devlist;
|
||||
+ device_list = device_list->next;
|
||||
}
|
||||
+
|
||||
+ hash_free(devlist_table);
|
||||
+ devlist_table = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
+
|
||||
/* Search a mount entry list for device id DEV.
|
||||
Return the corresponding mount entry if found or NULL if not. */
|
||||
|
||||
static struct mount_entry const * _GL_ATTRIBUTE_PURE
|
||||
me_for_dev (dev_t dev)
|
||||
{
|
||||
- struct devlist *dl = device_list;
|
||||
-
|
||||
- while (dl)
|
||||
- {
|
||||
- if (dl->dev_num == dev)
|
||||
+ struct devlist *dl = devlist_for_dev(dev);
|
||||
+ if (dl)
|
||||
return dl->me;
|
||||
- dl = dl->next;
|
||||
- }
|
||||
|
||||
return NULL;
|
||||
}
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 22 10:48:50 CEST 2016 - pth@suse.de
|
||||
|
||||
- Add coreutils-df-hash-in-filter.patch that speeds up df.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 6 06:54:54 UTC 2016 - mail@bernhard-voelker.de
|
||||
|
||||
|
||||
@ -114,6 +114,9 @@ Patch112: coreutils-getaddrinfo.patch
|
||||
# Assorted fixes
|
||||
Patch113: coreutils-misc.patch
|
||||
|
||||
#use hash table for seaching in filter_mount_list() and get_dev()
|
||||
Patch114: coreutils-df-hash-in-filter.patch
|
||||
|
||||
# Skip 2 valgrind'ed sort tests on ppc/ppc64 which would fail due to
|
||||
# a glibc issue in mkstemp.
|
||||
Patch300: coreutils-skip-some-sort-tests-on-ppc.patch
|
||||
@ -175,6 +178,7 @@ the GNU fileutils, sh-utils, and textutils packages.
|
||||
%patch501
|
||||
|
||||
%patch700
|
||||
%patch114 -p1
|
||||
|
||||
#???## We need to statically link to gmp, otherwise we have a build loop
|
||||
#???#sed -i s,'$(LIB_GMP)',%%{_libdir}/libgmp.a,g Makefile.in
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 22 10:48:50 CEST 2016 - pth@suse.de
|
||||
|
||||
- Add coreutils-df-hash-in-filter.patch that speeds up df.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 6 06:54:54 UTC 2016 - mail@bernhard-voelker.de
|
||||
|
||||
|
||||
@ -114,6 +114,9 @@ Patch112: coreutils-getaddrinfo.patch
|
||||
# Assorted fixes
|
||||
Patch113: coreutils-misc.patch
|
||||
|
||||
#use hash table for seaching in filter_mount_list() and get_dev()
|
||||
Patch114: coreutils-df-hash-in-filter.patch
|
||||
|
||||
# Skip 2 valgrind'ed sort tests on ppc/ppc64 which would fail due to
|
||||
# a glibc issue in mkstemp.
|
||||
Patch300: coreutils-skip-some-sort-tests-on-ppc.patch
|
||||
@ -175,6 +178,7 @@ the GNU fileutils, sh-utils, and textutils packages.
|
||||
%patch501
|
||||
|
||||
%patch700
|
||||
%patch114 -p1
|
||||
|
||||
#???## We need to statically link to gmp, otherwise we have a build loop
|
||||
#???#sed -i s,'$(LIB_GMP)',%%{_libdir}/libgmp.a,g Makefile.in
|
||||
|
||||
Loading…
Reference in New Issue
Block a user