Browse Source

Always use try/finally around DfsBlockCache.clockLock

Any RuntimeException or Error in this block will leave the lock
held by the caller thread, which can later result in deadlock or
just cache requests hanging forever because they cannot get to
the lock object.

Wrap everything in try/finally to prevent the lock from hanging,
even though a RuntimeException or Error should never happen in
any of these code paths.

Change-Id: Ibb3467f7ee4c06f617b737858b4be17b10d936e0
stable-1.2
Shawn O. Pearce 13 years ago
parent
commit
9652f16a47
  1. 6
      org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/DfsBlockCache.java

6
org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/DfsBlockCache.java

@ -389,6 +389,7 @@ public final class DfsBlockCache {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private void reserveSpace(int reserve) { private void reserveSpace(int reserve) {
clockLock.lock(); clockLock.lock();
try {
long live = liveBytes + reserve; long live = liveBytes + reserve;
if (maxBytes < live) { if (maxBytes < live) {
Ref prev = clockHand; Ref prev = clockHand;
@ -418,8 +419,10 @@ public final class DfsBlockCache {
clockHand = prev; clockHand = prev;
} }
liveBytes = live; liveBytes = live;
} finally {
clockLock.unlock(); clockLock.unlock();
} }
}
private void creditSpace(int credit) { private void creditSpace(int credit) {
clockLock.lock(); clockLock.lock();
@ -429,14 +432,17 @@ public final class DfsBlockCache {
private void addToClock(Ref ref, int credit) { private void addToClock(Ref ref, int credit) {
clockLock.lock(); clockLock.lock();
try {
if (credit != 0) if (credit != 0)
liveBytes -= credit; liveBytes -= credit;
Ref ptr = clockHand; Ref ptr = clockHand;
ref.next = ptr.next; ref.next = ptr.next;
ptr.next = ref; ptr.next = ref;
clockHand = ref; clockHand = ref;
} finally {
clockLock.unlock(); clockLock.unlock();
} }
}
void put(DfsBlock v) { void put(DfsBlock v) {
put(v.pack, v.start, v.size(), v); put(v.pack, v.start, v.size(), v);

Loading…
Cancel
Save