upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-03-09 01:30:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Repack dns_rbtnode struct to gain some space (reduce packing holes) (#41854)

Browse source 
(cherry picked from commit 8dbf9ceb8c)
(cherry picked from commit 2a461f1348)
This commit is contained in:
Mukund Sivaraman 2016-03-07 16:11:37 +05:30
parent d78d3e3814
commit 4bb2aa3e15
1 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
lib/dns/include/dns/rbt.h
View file

@ -80,22 +80,6 @@ struct dns_rbtnode {
#if DNS_RBT_USEMAGIC
unsigned int magic;
#endif
dns_rbtnode_t *parent;
dns_rbtnode_t *left;
dns_rbtnode_t *right;
dns_rbtnode_t *down;
#ifdef DNS_RBT_USEHASH
dns_rbtnode_t *uppernode;
dns_rbtnode_t *hashnext;
#endif
/*%
* Used for LRU cache. This linked list is used to mark nodes which
* have no data any longer, but we cannot unlink at that exact moment
* because we did not or could not obtain a write lock on the tree.
*/
ISC_LINK(dns_rbtnode_t) deadlink;
/*@{*/
/*!
* The following bitfields add up to a total bitwidth of 32.
@ -119,9 +103,32 @@ struct dns_rbtnode {
/* node needs to be cleaned from rpz */
unsigned int rpz : 1;
/*@{*/
/*!
* These values are used in the RBT DB implementation. The appropriate
* node lock must be held before accessing them.
*/
unsigned int dirty:1;
unsigned int wild:1;
unsigned int locknum:DNS_RBT_LOCKLENGTH;
/*@}*/
#ifdef DNS_RBT_USEHASH
unsigned int hashval;
dns_rbtnode_t *uppernode;
dns_rbtnode_t *hashnext;
#endif
dns_rbtnode_t *parent;
dns_rbtnode_t *left;
dns_rbtnode_t *right;
dns_rbtnode_t *down;
/*%
* Used for LRU cache. This linked list is used to mark nodes which
* have no data any longer, but we cannot unlink at that exact moment
* because we did not or could not obtain a write lock on the tree.
*/
ISC_LINK(dns_rbtnode_t) deadlink;
/*@{*/
/*!
@ -129,9 +136,6 @@ struct dns_rbtnode {
* node lock must be held before accessing them.
*/
void *data;
unsigned int dirty:1;
unsigned int wild:1;
unsigned int locknum:DNS_RBT_LOCKLENGTH;
#ifndef DNS_RBT_USEISCREFCOUNT
unsigned int references:DNS_RBT_REFLENGTH;
#else