@@ -643,27 +643,27 @@ typedef struct RT_SIZE_CLASS_ELEM
643
643
644
644
static const RT_SIZE_CLASS_ELEM RT_SIZE_CLASS_INFO [] = {
645
645
[RT_CLASS_4 ] = {
646
- .name = RT_STR (RT_PREFIX ) "radix_tree node4" ,
646
+ .name = RT_STR (RT_PREFIX ) "_radix_tree node4" ,
647
647
.fanout = RT_FANOUT_4 ,
648
648
.allocsize = sizeof (RT_NODE_4 ) + RT_FANOUT_4 * sizeof (RT_PTR_ALLOC ),
649
649
},
650
650
[RT_CLASS_16_LO ] = {
651
- .name = RT_STR (RT_PREFIX ) "radix_tree node16_lo" ,
651
+ .name = RT_STR (RT_PREFIX ) "_radix_tree node16_lo" ,
652
652
.fanout = RT_FANOUT_16_LO ,
653
653
.allocsize = sizeof (RT_NODE_16 ) + RT_FANOUT_16_LO * sizeof (RT_PTR_ALLOC ),
654
654
},
655
655
[RT_CLASS_16_HI ] = {
656
- .name = RT_STR (RT_PREFIX ) "radix_tree node16_hi" ,
656
+ .name = RT_STR (RT_PREFIX ) "_radix_tree node16_hi" ,
657
657
.fanout = RT_FANOUT_16_HI ,
658
658
.allocsize = sizeof (RT_NODE_16 ) + RT_FANOUT_16_HI * sizeof (RT_PTR_ALLOC ),
659
659
},
660
660
[RT_CLASS_48 ] = {
661
- .name = RT_STR (RT_PREFIX ) "radix_tree node48" ,
661
+ .name = RT_STR (RT_PREFIX ) "_radix_tree node48" ,
662
662
.fanout = RT_FANOUT_48 ,
663
663
.allocsize = sizeof (RT_NODE_48 ) + RT_FANOUT_48 * sizeof (RT_PTR_ALLOC ),
664
664
},
665
665
[RT_CLASS_256 ] = {
666
- .name = RT_STR (RT_PREFIX ) "radix_tree node256" ,
666
+ .name = RT_STR (RT_PREFIX ) "_radix_tree node256" ,
667
667
.fanout = RT_FANOUT_256 ,
668
668
.allocsize = sizeof (RT_NODE_256 ),
669
669
},
@@ -1837,7 +1837,7 @@ RT_CREATE(MemoryContext ctx)
1837
1837
* pfree
1838
1838
*/
1839
1839
tree -> iter_context = AllocSetContextCreate (ctx ,
1840
- RT_STR (RT_PREFIX ) "radix_tree iter context" ,
1840
+ RT_STR (RT_PREFIX ) "_radix_tree iter context" ,
1841
1841
ALLOCSET_SMALL_SIZES );
1842
1842
1843
1843
#ifdef RT_SHMEM
@@ -1873,7 +1873,7 @@ RT_CREATE(MemoryContext ctx)
1873
1873
*/
1874
1874
if (sizeof (RT_VALUE_TYPE ) > sizeof (RT_PTR_ALLOC ))
1875
1875
tree -> leaf_context = SlabContextCreate (ctx ,
1876
- RT_STR (RT_PREFIX ) "radix_tree leaf contex " ,
1876
+ RT_STR (RT_PREFIX ) "_radix_tree leaf context " ,
1877
1877
RT_SLAB_BLOCK_SIZE (sizeof (RT_VALUE_TYPE )),
1878
1878
sizeof (RT_VALUE_TYPE ));
1879
1879
#endif /* !RT_VARLEN_VALUE_SIZE */
@@ -2305,7 +2305,7 @@ RT_COPY_ARRAYS_AND_DELETE(uint8 *dst_chunks, RT_PTR_ALLOC * dst_children,
2305
2305
/*
2306
2306
* Note: While all node-growing functions are called to perform an insertion
2307
2307
* when no more space is available, shrinking is not a hard-and-fast requirement.
2308
- * When shrinking nodes, we generally wait until the count is about 3/4* of
2308
+ * When shrinking nodes, we generally wait until the count is about 3/4 of
2309
2309
* the next lower node's fanout. This prevents ping-ponging between different
2310
2310
* node sizes.
2311
2311
*
@@ -2556,9 +2556,7 @@ RT_REMOVE_CHILD_4(RT_RADIX_TREE * tree, RT_PTR_ALLOC * parent_slot, RT_CHILD_PTR
2556
2556
}
2557
2557
2558
2558
/*
2559
- * Search for the child pointer corresponding to "key" in the given node.
2560
- *
2561
- * Delete the node and return true if the key is found, otherwise return false.
2559
+ * Delete the child pointer corresponding to "key" in the given node.
2562
2560
*/
2563
2561
static inline void
2564
2562
RT_NODE_DELETE (RT_RADIX_TREE * tree , RT_PTR_ALLOC * parent_slot , RT_CHILD_PTR node , uint8 chunk , RT_PTR_ALLOC * slot )
@@ -2662,7 +2660,7 @@ RT_DELETE(RT_RADIX_TREE * tree, uint64 key)
2662
2660
return deleted ;
2663
2661
}
2664
2662
2665
- #endif /* USE_RT_DELETE */
2663
+ #endif /* RT_USE_DELETE */
2666
2664
2667
2665
/***************** UTILITY FUNCTIONS *****************/
2668
2666
@@ -2999,7 +2997,6 @@ RT_DUMP_NODE(RT_NODE * node)
2999
2997
#undef RT_BEGIN_ITERATE
3000
2998
#undef RT_ITERATE_NEXT
3001
2999
#undef RT_END_ITERATE
3002
- #undef RT_USE_DELETE
3003
3000
#undef RT_DELETE
3004
3001
#undef RT_MEMORY_USAGE
3005
3002
#undef RT_DUMP_NODE
0 commit comments