motiejus
/
jgit
1
Fork 0
Code Releases Activity

Add a DfsPackFile method to get the number of cached bytes 

The counter is actually stored in the DfsPackKey so it can be
manipulated by the cache.

Change-Id: I10cee76c92d65c68d1aa1a9dd0c4fd7173c4cede
This commit is contained in:
Dave Borowitz 2011-11-03 12:54:21 -07:00 committed by Shawn O. Pearce
parent dff9d56b94
commit 4fc1af6850
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/DfsBlockCache.java
View File

@ -115,8 +115,12 @@ public static void reconfigure(DfsBlockCacheConfig cfg) {
DfsBlockCache oc = cache;
cache = nc;
if (oc != null && oc.readAheadService != null)
oc.readAheadService.shutdown();
if (oc != null) {
if (oc.readAheadService != null)
oc.readAheadService.shutdown();
for (DfsPackFile pack : oc.getPackFiles())
pack.key.cachedSize.set(0);
}
}
/** @return the currently active DfsBlockCache. */
@ -343,6 +347,7 @@ DfsBlock getOrLoad(DfsPackFile pack, long position, DfsReader ctx)
e2 = table.get(slot);
}
key.cachedSize.addAndGet(v.size());
Ref<DfsBlock> ref = new Ref<DfsBlock>(key, position, v.size(), v);
ref.hot = true;
for (;;) {
@ -389,6 +394,7 @@ private void reserveSpace(int reserve) {
dead.next = null;
dead.value = null;
live -= dead.size;
dead.pack.cachedSize.addAndGet(-dead.size);
statEvict++;
} while (maxBytes < live);
clockHand = prev;
@ -438,6 +444,7 @@ <T> Ref<T> put(DfsPackKey key, long pos, int size, T v) {
}
}
key.cachedSize.addAndGet(size);
ref = new Ref<T>(key, pos, size, v);
ref.hot = true;
for (;;) {

5
org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/DfsPackFile.java
View File

@ -171,6 +171,11 @@ public DfsPackDescription getPackDescription() {
return packDesc;
}
/** @return bytes cached in memory for this pack, excluding the index. */
public long getCachedSize() {
return key.cachedSize.get();
}
private String getPackName() {
return packDesc.getPackName();
}

5
org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/DfsPackKey.java
View File

@ -43,13 +43,18 @@
package org.eclipse.jgit.storage.dfs;
import java.util.concurrent.atomic.AtomicLong;
final class DfsPackKey {
final int hash;
final AtomicLong cachedSize;
DfsPackKey() {
// Multiply by 31 here so we can more directly combine with another
// value without doing the multiply there.
//
hash = System.identityHashCode(this) * 31;
cachedSize = new AtomicLong();
}
}