Make checksum computation delayed, on lock release

This commit is contained in:
leventov
2015-12-05 05:37:17 +03:00
parent 6045d017e6
commit d5ee1f9aae
19 changed files with 58 additions and 73 deletions
@@ -16,9 +16,7 @@
package net.openhft.chronicle.hash.impl.stage.entry;
import net.openhft.chronicle.hash.ChecksumEntry;
public interface ChecksumStrategy extends ChecksumEntry {
public interface ChecksumStrategy {
int CHECKSUM_STORED_BYTES = 4;
@@ -17,7 +17,6 @@
package net.openhft.chronicle.hash.impl.stage.entry;
import net.openhft.chronicle.algo.hashing.LongHashFunction;
import net.openhft.chronicle.hash.impl.stage.hash.CheckOnEachPublicOperation;
import net.openhft.sg.StageRef;
import net.openhft.sg.Staged;
@@ -26,7 +25,6 @@ import static net.openhft.chronicle.hash.impl.stage.entry.ChecksumHashing.hash8T
@Staged
public class HashEntryChecksumStrategy implements ChecksumStrategy {
@StageRef CheckOnEachPublicOperation checkOnEachPublicOperation;
@StageRef SegmentStages s;
@StageRef HashEntryStages<?> e;
@StageRef KeyHashCode h;
@@ -55,12 +53,6 @@ public class HashEntryChecksumStrategy implements ChecksumStrategy {
return (int) ((checksum >>> 32) ^ checksum);
}
@Override
public void updateChecksum() {
checkOnEachPublicOperation.checkOnEachPublicOperation();
computeAndStoreChecksum();
}
@Override
public boolean innerCheckSum() {
int oldChecksum = s.segmentBS.readInt(e.entryEnd());
@@ -68,12 +60,6 @@ public class HashEntryChecksumStrategy implements ChecksumStrategy {
return oldChecksum == checksum;
}
@Override
public boolean checkSum() {
checkOnEachPublicOperation.checkOnEachPublicOperation();
return innerCheckSum();
}
@Override
public long extraEntryBytes() {
return CHECKSUM_STORED_BYTES;
@@ -21,6 +21,7 @@ import net.openhft.chronicle.bytes.Bytes;
import net.openhft.chronicle.hash.ChecksumEntry;
import net.openhft.chronicle.hash.Data;
import net.openhft.chronicle.hash.HashEntry;
import net.openhft.chronicle.hash.impl.LocalLockState;
import net.openhft.chronicle.hash.impl.VanillaChronicleHashHolder;
import net.openhft.chronicle.hash.impl.stage.data.bytes.EntryKeyBytesData;
import net.openhft.chronicle.hash.impl.stage.hash.CheckOnEachPublicOperation;
@@ -51,6 +52,8 @@ public abstract class HashEntryStages<K> implements HashEntry<K>, ChecksumEntry
@Stage("EntryOffset") public long keySizeOffset = -1;
public abstract boolean entryOffsetInit();
public void initEntryOffset() {
keySizeOffset = s.entrySpaceOffset + pos * hh.h().chunkSize;
}
@@ -67,6 +70,8 @@ public abstract class HashEntryStages<K> implements HashEntry<K>, ChecksumEntry
this.keyOffset = keyOffset;
}
public abstract void closeKeyOffset();
public void readExistingEntry(long pos) {
initPos(pos);
Bytes segmentBytes = s.segmentBytesForRead();
@@ -111,14 +116,43 @@ public abstract class HashEntryStages<K> implements HashEntry<K>, ChecksumEntry
public final ChecksumStrategy checksumStrategy = hh.h().checksumEntries ?
hashEntryChecksumStrategy : NoChecksumStrategy.INSTANCE;
public boolean delayedUpdateChecksum = false;
public void initDelayedUpdateChecksum(boolean delayedUpdateChecksum) {
// makes delayedUpdateChecksum dependent on keySizeOffset and Locks stages, to trigger
// delayedUpdateChecksum close on these stages' close
assert entryOffsetInit() && keySizeOffset >= 0;
assert s.locksInit() && s.localLockState != LocalLockState.UNLOCKED;
assert delayedUpdateChecksum; // doesn't make sense to init to "uninit" false value
this.delayedUpdateChecksum = true;
}
abstract boolean delayedUpdateChecksumInit();
public void closeDelayedUpdateChecksum() {
if (hh.h().checksumEntries)
hashEntryChecksumStrategy.computeAndStoreChecksum();
delayedUpdateChecksum = false;
}
@Override
public void updateChecksum() {
checksumStrategy.updateChecksum();
checkOnEachPublicOperation.checkOnEachPublicOperation();
if (!hh.h().checksumEntries) {
throw new UnsupportedOperationException(
"Checksum is not stored in this Chronicle Hash");
}
initDelayedUpdateChecksum(true);
}
@Override
public boolean checkSum() {
return checksumStrategy.checkSum();
checkOnEachPublicOperation.checkOnEachPublicOperation();
if (!hh.h().checksumEntries) {
throw new UnsupportedOperationException(
"Checksum is not stored in this Chronicle Hash");
}
return delayedUpdateChecksumInit() || checksumStrategy.innerCheckSum();
}
long entrySize() {
@@ -21,11 +21,6 @@ public enum NoChecksumStrategy implements ChecksumStrategy {
@Override
public void computeAndStoreChecksum() {
// no-op
}
@Override
public void updateChecksum() {
throw new UnsupportedOperationException("Checksum is not stored in this Chronicle Hash");
}
@@ -34,11 +29,6 @@ public enum NoChecksumStrategy implements ChecksumStrategy {
return true;
}
@Override
public boolean checkSum() {
throw new UnsupportedOperationException("Checksum is not stored in this Chronicle Hash");
}
@Override
public long extraEntryBytes() {
return 0; // no extra bytes to store checksum
@@ -93,10 +93,11 @@ public class ReadLock implements InterProcessLock {
@Override
public void unlock() {
s.readUnlockAndDecrementCount();
s.setLocalLockState(UNLOCKED);
// TODO what should close here?
hlp.closeHashLookupPos();
entry.closePos();
entry.closeKeyOffset();
s.readUnlockAndDecrementCount();
s.setLocalLockState(UNLOCKED);
}
}
@@ -483,6 +483,8 @@ public abstract class SegmentStages implements SegmentLock, LocksInterface {
@Stage("SegmentTier") public long tierIndex;
@Stage("SegmentTier") public long tierBaseAddr;
public abstract boolean segmentTierInit();
public void initSegmentTier() {
tierIndex = segmentIndex + 1; // tiers are 1-counted
tierBaseAddr = hh.h().segmentBaseAddr(segmentIndex);
@@ -32,6 +32,7 @@ public class UpdateLock implements InterProcessLock {
@StageRef LogHolder logHolder;
@StageRef SegmentStages s;
@StageRef HashEntryStages<?> entry;
@Override
public boolean isHeldByCurrentThread() {
@@ -163,6 +164,7 @@ public class UpdateLock implements InterProcessLock {
@Override
public void unlock() {
entry.closeDelayedUpdateChecksum();
switch (s.localLockState) {
case UNLOCKED:
case READ_LOCKED:
@@ -140,6 +140,8 @@ public abstract class HashSegmentIteration<K, E extends HashEntry<K>>
steps--;
hlp.initHashLookupPos(currentHashLookupPos);
}
// force entry checksum update (delayedUpdateChecksum depends on keyOffset)
e.closeKeyOffset();
}
}
}