2422 |
|
++hc; |
2423 |
|
} |
2424 |
|
} |
2425 |
< |
ln = (lc <= UNTREEIFY_THRESHOLD ? untreeify(lo) : |
2426 |
< |
(hc != 0) ? new TreeBin<K,V>(lo) : t); |
2427 |
< |
hn = (hc <= UNTREEIFY_THRESHOLD ? untreeify(hi) : |
2428 |
< |
(lc != 0) ? new TreeBin<K,V>(hi) : t); |
2425 |
> |
ln = (lc <= UNTREEIFY_THRESHOLD) ? untreeify(lo) : |
2426 |
> |
(hc != 0) ? new TreeBin<K,V>(lo) : t; |
2427 |
> |
hn = (hc <= UNTREEIFY_THRESHOLD) ? untreeify(hi) : |
2428 |
> |
(lc != 0) ? new TreeBin<K,V>(hi) : t; |
2429 |
|
} |
2430 |
|
else |
2431 |
|
ln = hn = null; |
2475 |
|
} |
2476 |
|
|
2477 |
|
/** |
2478 |
< |
* Returns a list on non-TreeNodes replacing those in given list |
2478 |
> |
* Returns a list on non-TreeNodes replacing those in given list. |
2479 |
|
*/ |
2480 |
|
static <K,V> Node<K,V> untreeify(Node<K,V> b) { |
2481 |
|
Node<K,V> hd = null, tl = null; |
2613 |
|
} |
2614 |
|
|
2615 |
|
/** |
2616 |
< |
* Acquires write lock for tree restructuring |
2616 |
> |
* Acquires write lock for tree restructuring. |
2617 |
|
*/ |
2618 |
|
private final void lockRoot() { |
2619 |
|
if (!U.compareAndSwapInt(this, LOCKSTATE, 0, WRITER)) |
2621 |
|
} |
2622 |
|
|
2623 |
|
/** |
2624 |
< |
* Releases write lock for tree restructuring |
2624 |
> |
* Releases write lock for tree restructuring. |
2625 |
|
*/ |
2626 |
|
private final void unlockRoot() { |
2627 |
|
lockState = 0; |
2628 |
|
} |
2629 |
|
|
2630 |
|
/** |
2631 |
< |
* Possibly blocks awaiting root lock |
2631 |
> |
* Possibly blocks awaiting root lock. |
2632 |
|
*/ |
2633 |
|
private final void contendedLock() { |
2634 |
|
boolean waiting = false; |
2751 |
|
* that are accessible independently of lock. So instead we |
2752 |
|
* swap the tree linkages. |
2753 |
|
* |
2754 |
< |
* @return true if now too small so should be untreeified. |
2754 |
> |
* @return true if now too small, so should be untreeified |
2755 |
|
*/ |
2756 |
|
final boolean removeTreeNode(TreeNode<K,V> p) { |
2757 |
|
TreeNode<K,V> next = (TreeNode<K,V>)p.next; |
3146 |
|
|
3147 |
|
/** |
3148 |
|
* Base of key, value, and entry Iterators. Adds fields to |
3149 |
< |
* Traverser to support iterator.remove |
3149 |
> |
* Traverser to support iterator.remove. |
3150 |
|
*/ |
3151 |
|
static class BaseIterator<K,V> extends Traverser<K,V> { |
3152 |
|
final ConcurrentHashMapV8<K,V> map; |
5986 |
|
} |
5987 |
|
|
5988 |
|
/** |
5989 |
< |
* Generates initial value for per-thread CounterHashCodes |
5989 |
> |
* Generates initial value for per-thread CounterHashCodes. |
5990 |
|
*/ |
5991 |
|
static final AtomicInteger counterHashCodeGenerator = new AtomicInteger(); |
5992 |
|
|