[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[hurd] 28/61: fatfs: improve diskfs_node_iterate
From: |
Samuel Thibault |
Subject: |
[hurd] 28/61: fatfs: improve diskfs_node_iterate |
Date: |
Tue, 27 May 2014 08:32:11 +0000 |
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch upstream
in repository hurd.
commit ff9e97b120076b8707474b4580e1bab205f6dd62
Author: Justus Winter <address@hidden>
Date: Wed Apr 30 02:04:31 2014 +0200
fatfs: improve diskfs_node_iterate
Currently, diskfs_node_iterate iterates twice over all nodes in the
cache. The first time only to determine the number of nodes currently
in the cache. Simply count them instead.
* fatfs/inode.c (nodehash_nr_items): New variable.
(diskfs_cached_lookup): Increment nodehash_nr_items.
(diskfs_cached_lookup_in_dirbuf): Likewise.
(diskfs_node_norefs): Decrement nodehash_nr_items.
(diskfs_node_iterate): Fix the type of num_nodes, use nodehash_nr_items.
---
fatfs/inode.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/fatfs/inode.c b/fatfs/inode.c
index 4229806..ed6f3f0 100644
--- a/fatfs/inode.c
+++ b/fatfs/inode.c
@@ -45,6 +45,7 @@
#endif
static struct node *nodehash[INOHSZ];
+static size_t nodehash_nr_items;
static error_t read_node (struct node *np, vm_address_t buf);
@@ -106,6 +107,7 @@ diskfs_cached_lookup (ino64_t inum, struct node **npp)
dn->hnext->dn->hprevp = &dn->hnext;
dn->hprevp = &nodehash[INOHASH(inum)];
nodehash[INOHASH(inum)] = np;
+ nodehash_nr_items += 1;
pthread_spin_unlock (&diskfs_node_refcnt_lock);
@@ -171,6 +173,7 @@ diskfs_cached_lookup_in_dirbuf (int inum, struct node
**npp, vm_address_t buf)
dn->hnext->dn->hprevp = &dn->hnext;
dn->hprevp = &nodehash[INOHASH(inum)];
nodehash[INOHASH(inum)] = np;
+ nodehash_nr_items += 1;
pthread_spin_unlock (&diskfs_node_refcnt_lock);
@@ -216,7 +219,8 @@ diskfs_node_norefs (struct node *np)
*np->dn->hprevp = np->dn->hnext;
if (np->dn->hnext)
np->dn->hnext->dn->hprevp = np->dn->hprevp;
-
+ nodehash_nr_items -= 1;
+
while (last)
{
struct cluster_chain *next = last->next;
@@ -546,7 +550,8 @@ error_t
diskfs_node_iterate (error_t (*fun)(struct node *))
{
error_t err = 0;
- int n, num_nodes = 0;
+ int n;
+ size_t num_nodes;
struct node *node, **node_list, **p;
pthread_spin_lock (&diskfs_node_refcnt_lock);
@@ -557,9 +562,7 @@ diskfs_node_iterate (error_t (*fun)(struct node *))
diskfs_node_refcnt_lock, but we can't hold this while locking the
individual node locks). */
- for (n = 0; n < INOHSZ; n++)
- for (node = nodehash[n]; node; node = node->dn->hnext)
- num_nodes++;
+ num_nodes = nodehash_nr_items;
node_list = alloca (num_nodes * sizeof (struct node *));
p = node_list;
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-hurd/hurd.git
- [hurd] 11/61: boot: remove the ourdevice hack, (continued)
- [hurd] 11/61: boot: remove the ourdevice hack, Samuel Thibault, 2014/05/27
- [hurd] 01/61: libpager: fix receiver lookups, Samuel Thibault, 2014/05/27
- [hurd] 03/61: Merge branch 'master' of git.savannah.gnu.org:/srv/git/hurd/hurd, Samuel Thibault, 2014/05/27
- [hurd] 19/61: Add missing receiver lookup fix, Samuel Thibault, 2014/05/27
- [hurd] 13/61: libpager: fix notify_port_t receiver lookups, Samuel Thibault, 2014/05/27
- [hurd] 20/61: libdiskfs: set the default sync interval to 30 seconds, Samuel Thibault, 2014/05/27
- [hurd] 12/61: console: fix notify_port_t receiver lookups, Samuel Thibault, 2014/05/27
- [hurd] 21/61: libports: work around bugs in server termination, Samuel Thibault, 2014/05/27
- [hurd] 18/61: Merge branch 'master' of git.savannah.gnu.org:/srv/git/hurd/hurd, Samuel Thibault, 2014/05/27
- [hurd] 16/61: build: Remove configure check for libcrypt., Samuel Thibault, 2014/05/27
- [hurd] 28/61: fatfs: improve diskfs_node_iterate,
Samuel Thibault <=
- [hurd] 26/61: fatfs: simplify expression, Samuel Thibault, 2014/05/27
- [hurd] 29/61: tmpfs: improve diskfs_node_iterate, Samuel Thibault, 2014/05/27
- [hurd] 07/61: libports: fix notify_port_t receiver lookups, Samuel Thibault, 2014/05/27
- [hurd] 14/61: libpager: fix notify_port_t receiver lookups, Samuel Thibault, 2014/05/27
- [hurd] 34/61: libihash: reduce the default maximum load factor to 75%, Samuel Thibault, 2014/05/27
- [hurd] 17/61: Add TODO about fork() making rpctrace emit an error, Samuel Thibault, 2014/05/27
- [hurd] 33/61: ext2fs: cache the superblock, Samuel Thibault, 2014/05/27
- [hurd] 35/61: libihash: fix type of max_load, Samuel Thibault, 2014/05/27
- [hurd] 27/61: ext2fs: improve diskfs_node_iterate, Samuel Thibault, 2014/05/27
- [hurd] 39/61: trans/fakeroot: remove spurious semicolon, Samuel Thibault, 2014/05/27