You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2011/08/09 18:57:53 UTC
svn commit: r1155435 - in /jackrabbit/branches/2.2: ./
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cache/AbstractCache.java
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cache/ConcurrentCache.java
Author: jukka
Date: Tue Aug 9 16:57:53 2011
New Revision: 1155435
URL: http://svn.apache.org/viewvc?rev=1155435&view=rev
Log:
2.2: Merged revisions 1143396 and 1155431 (JCR-3013)
Modified:
jackrabbit/branches/2.2/ (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cache/AbstractCache.java
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cache/ConcurrentCache.java
Propchange: jackrabbit/branches/2.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 9 16:57:53 2011
@@ -2,4 +2,4 @@
/jackrabbit/sandbox/JCR-1456:774917-886178
/jackrabbit/sandbox/JCR-2170:812417-816332
/jackrabbit/sandbox/tripod-JCR-2209:795441-795863
-/jackrabbit/trunk:1038201,1038203,1038205,1038657,1039064,1039347,1039408,1039422-1039423,1039888,1039946,1040033,1040090,1040459,1040601,1040606,1040661,1040958,1041379,1041439,1041761,1042643,1042647,1042978-1042982,1043084-1043086,1043088,1043343,1043357-1043358,1043430,1043554,1043616,1043618,1043637,1043656,1043893,1043897,1044239,1044312,1044451,1044613,1049473,1049491,1049514,1049518,1049520,1049859,1049870,1049874,1049878,1049880,1049883,1049889,1049891,1049894-1049895,1049899-1049901,1049909-1049911,1049915-1049916,1049919,1049923,1049925,1049931,1049936,1049939,1050212,1050298,1050346,1050551,1055068,1055070-1055071,1055116-1055117,1055127,1055134,1055164,1055498,1060431,1060434,1060753,1063756,1064670,1065599,1065622,1066059,1066071,1069831,1071562,1071573,1071680,1074140,1079314,1079317,1080186,1080540,1087304,1088991,1089032,1089053,1089436,1092106,1092117,1092683,1097363,1097513-1097514,1098963-1098964,1099033,1099172,1100286,1104027,1128175,1130192,1130228,113
2993,1136353,1136360,1138511,1141141,1141717,1143738,1144332,1144338,1144695,1152258
+/jackrabbit/trunk:1038201,1038203,1038205,1038657,1039064,1039347,1039408,1039422-1039423,1039888,1039946,1040033,1040090,1040459,1040601,1040606,1040661,1040958,1041379,1041439,1041761,1042643,1042647,1042978-1042982,1043084-1043086,1043088,1043343,1043357-1043358,1043430,1043554,1043616,1043618,1043637,1043656,1043893,1043897,1044239,1044312,1044451,1044613,1049473,1049491,1049514,1049518,1049520,1049859,1049870,1049874,1049878,1049880,1049883,1049889,1049891,1049894-1049895,1049899-1049901,1049909-1049911,1049915-1049916,1049919,1049923,1049925,1049931,1049936,1049939,1050212,1050298,1050346,1050551,1055068,1055070-1055071,1055116-1055117,1055127,1055134,1055164,1055498,1060431,1060434,1060753,1063756,1064670,1065599,1065622,1066059,1066071,1069831,1071562,1071573,1071680,1074140,1079314,1079317,1080186,1080540,1087304,1088991,1089032,1089053,1089436,1092106,1092117,1092683,1097363,1097513-1097514,1098963-1098964,1099033,1099172,1100286,1104027,1128175,1130192,1130228,113
2993,1136353,1136360,1138511,1141141,1141717,1143396,1143738,1144332,1144338,1144695,1152258,1155431
Modified: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cache/AbstractCache.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cache/AbstractCache.java?rev=1155435&r1=1155434&r2=1155435&view=diff
==============================================================================
--- jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cache/AbstractCache.java (original)
+++ jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cache/AbstractCache.java Tue Aug 9 16:57:53 2011
@@ -18,7 +18,6 @@ package org.apache.jackrabbit.core.cache
import static org.apache.jackrabbit.core.cache.CacheAccessListener.ACCESS_INTERVAL;
-import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;
@@ -57,8 +56,13 @@ public abstract class AbstractCache impl
* {@link CacheAccessListener#cacheAccessed()} events once every
* {@link CacheAccessListener#ACCESS_INTERVAL} calls to the protected
* {@link #recordCacheAccess()} method.
+ * <p>
+ * A long counter is used to prevent integer overflow. Even if the cache
+ * was accessed once every nanosecond, an overflow would only occur in
+ * about 300 years. See
+ * <a href="https://issues.apache.org/jira/browse/JCR-3013">JCR-3013</a>.
*/
- private final AtomicInteger accessCount = new AtomicInteger();
+ private final AtomicLong accessCount = new AtomicLong();
/**
* Cache access listener. Set in the
@@ -94,7 +98,7 @@ public abstract class AbstractCache impl
* interval has passed since the previous listener call.
*/
protected void recordCacheAccess() {
- int count = accessCount.incrementAndGet();
+ long count = accessCount.incrementAndGet();
if (count % ACCESS_INTERVAL == 0) {
CacheAccessListener listener = accessListener.get();
if (listener != null) {
Modified: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cache/ConcurrentCache.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cache/ConcurrentCache.java?rev=1155435&r1=1155434&r2=1155435&view=diff
==============================================================================
--- jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cache/ConcurrentCache.java (original)
+++ jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cache/ConcurrentCache.java Tue Aug 9 16:57:53 2011
@@ -236,7 +236,7 @@ public class ConcurrentCache<K, V> exten
*/
private void shrinkIfNeeded() {
// Semi-random start index to prevent bias against the first segments
- int start = (int) getAccessCount() % segments.length;
+ int start = (int) Math.abs(getAccessCount() % segments.length);
for (int i = start; isTooBig(); i = (i + 1) % segments.length) {
synchronized (segments[i]) {
Iterator<Map.Entry<K, E<V>>> iterator =