Author: j16sdiz
Date: 2008-05-13 12:11:24 +0000 (Tue, 13 May 2008)
New Revision: 19911
Modified:
branches/saltedhashstore/freenet/src/freenet/store/SaltedHashFreenetStore.java
Log:
use queue when no progress
Modified:
branches/saltedhashstore/freenet/src/freenet/store/SaltedHashFreenetStore.java
===================================================================
---
branches/saltedhashstore/freenet/src/freenet/store/SaltedHashFreenetStore.java
2008-05-13 12:10:46 UTC (rev 19910)
+++
branches/saltedhashstore/freenet/src/freenet/store/SaltedHashFreenetStore.java
2008-05-13 12:11:24 UTC (rev 19911)
@@ -796,7 +796,12 @@
maxOldItemOffset = prevStoreSize - 1;
}
- moveOldEntry0(resizeRound > RESIZE_PHASE1_ROUND);
+ boolean needQueue = false;
+ if (resizeRound > RESIZE_PHASE1_ROUND) // too many
rounds
+ needQueue = true;
+ if (resizeRound > 1 && droppedEntries == 0 &&
resolvedEntries == 0) // no progress
+ needQueue = true;
+ moveOldEntry0(needQueue);
if (logMINOR)
Logger.minor(this, "Finished resize round " +
resizeRound + ": newEntries=" + newEntries
