Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Remove avl_size field from struct avl_tree 

This field is used only by illumos mdb.  On other platforms it only
increases the struct size from 32 to 40 bytes.  For struct vdev_queue
including 13 instances of avl_tree_t size means active cache lines.

Keep the padding in user-space for now to not break the ABI.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Matthew Ahrens <mahrens@delphix.com>
Signed-off-by: Alexander Motin <mav@FreeBSD.org>
Sponsored-By: iXsystems, Inc.
Closes #12290
This commit is contained in:
Alexander Motin 2021-07-01 11:32:31 -04:00 committed by GitHub
parent 490c845efe
commit b192a2c0a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/sys/avl_impl.h
View File

@ -147,7 +147,9 @@ struct avl_tree {
int (*avl_compar)(const void *, const void *); int (*avl_compar)(const void *, const void *);
size_t avl_offset; /* offsetof(type, avl_link_t field) */ size_t avl_offset; /* offsetof(type, avl_link_t field) */
ulong_t avl_numnodes; /* number of nodes in the tree */ ulong_t avl_numnodes; /* number of nodes in the tree */
size_t avl_size; /* sizeof user type struct */ #ifndef _KERNEL
size_t avl_pad; /* For backwards ABI compatibility. */
#endif
}; };

2
module/avl/avl.c
View File

@ -875,7 +875,6 @@ avl_swap(avl_tree_t *tree1, avl_tree_t *tree2)
ASSERT3P(tree1->avl_compar, ==, tree2->avl_compar); ASSERT3P(tree1->avl_compar, ==, tree2->avl_compar);
ASSERT3U(tree1->avl_offset, ==, tree2->avl_offset); ASSERT3U(tree1->avl_offset, ==, tree2->avl_offset);
ASSERT3U(tree1->avl_size, ==, tree2->avl_size);
temp_node = tree1->avl_root; temp_node = tree1->avl_root;
temp_numnodes = tree1->avl_numnodes; temp_numnodes = tree1->avl_numnodes;
@ -903,7 +902,6 @@ avl_create(avl_tree_t *tree, int (*compar) (const void *, const void *),
tree->avl_compar = compar; tree->avl_compar = compar;
tree->avl_root = NULL; tree->avl_root = NULL;
tree->avl_numnodes = 0; tree->avl_numnodes = 0;
tree->avl_size = size;
tree->avl_offset = offset; tree->avl_offset = offset;
} }