Deleted Added
full compact
rtree.c (286866) rtree.c (299587)
1#define JEMALLOC_RTREE_C_
2#include "jemalloc/internal/jemalloc_internal.h"
3
4static unsigned
5hmin(unsigned ha, unsigned hb)
6{
7
8 return (ha < hb ? ha : hb);
9}
10
11/* Only the most significant bits of keys passed to rtree_[gs]et() are used. */
12bool
13rtree_new(rtree_t *rtree, unsigned bits, rtree_node_alloc_t *alloc,
14 rtree_node_dalloc_t *dalloc)
15{
16 unsigned bits_in_leaf, height, i;
17
1#define JEMALLOC_RTREE_C_
2#include "jemalloc/internal/jemalloc_internal.h"
3
4static unsigned
5hmin(unsigned ha, unsigned hb)
6{
7
8 return (ha < hb ? ha : hb);
9}
10
11/* Only the most significant bits of keys passed to rtree_[gs]et() are used. */
12bool
13rtree_new(rtree_t *rtree, unsigned bits, rtree_node_alloc_t *alloc,
14 rtree_node_dalloc_t *dalloc)
15{
16 unsigned bits_in_leaf, height, i;
17
18 assert(RTREE_HEIGHT_MAX == ((ZU(1) << (LG_SIZEOF_PTR+3)) /
19 RTREE_BITS_PER_LEVEL));
18 assert(bits > 0 && bits <= (sizeof(uintptr_t) << 3));
19
20 bits_in_leaf = (bits % RTREE_BITS_PER_LEVEL) == 0 ? RTREE_BITS_PER_LEVEL
21 : (bits % RTREE_BITS_PER_LEVEL);
22 if (bits > bits_in_leaf) {
23 height = 1 + (bits - bits_in_leaf) / RTREE_BITS_PER_LEVEL;
24 if ((height-1) * RTREE_BITS_PER_LEVEL + bits_in_leaf != bits)
25 height++;

--- 102 unchanged lines hidden ---
20 assert(bits > 0 && bits <= (sizeof(uintptr_t) << 3));
21
22 bits_in_leaf = (bits % RTREE_BITS_PER_LEVEL) == 0 ? RTREE_BITS_PER_LEVEL
23 : (bits % RTREE_BITS_PER_LEVEL);
24 if (bits > bits_in_leaf) {
25 height = 1 + (bits - bits_in_leaf) / RTREE_BITS_PER_LEVEL;
26 if ((height-1) * RTREE_BITS_PER_LEVEL + bits_in_leaf != bits)
27 height++;

--- 102 unchanged lines hidden ---