Alawn/Chronicle-Map
1
0
Fork 0
mirror of https://github.com/OpenHFT/Chronicle-Map.git synced 2021-09-13 01:26:12 +00:00
Code Releases Activity

Update delayed check sum on WriteLock.unlock(), and close stages only if unlocking actually done

Browse Source
This commit is contained in:
leventov
2015-12-23 18:37:14 +03:00
parent 9ff159987e
commit 263e366ee8
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/net/openhft/chronicle/hash/impl/stage/entry/ReadLock.java
+6 -4
View File
@@ -101,10 +101,12 @@ public class ReadLock implements InterProcessLock {
@Override
public void unlock() {
checkOnEachPublicOperation.checkOnEachLockOperation();
// TODO what should close here?
hlp.closeHashLookupPos();
entry.closePos();
entry.closeKeyOffset();
if (s.localLockState != UNLOCKED) {
// TODO what should close here?
hlp.closeHashLookupPos();
entry.closePos();
entry.closeKeyOffset();
}
s.readUnlockAndDecrementCount();
s.setLocalLockState(UNLOCKED);
}
src/main/java/net/openhft/chronicle/hash/impl/stage/entry/UpdateLock.java
+2 -1
View File
@@ -172,18 +172,19 @@ public class UpdateLock implements InterProcessLock {
@Override
public void unlock() {
checkOnEachPublicOperation.checkOnEachLockOperation();
entry.closeDelayedUpdateChecksum();
switch (s.localLockState) {
case UNLOCKED:
case READ_LOCKED:
return;
case UPDATE_LOCKED:
entry.closeDelayedUpdateChecksum();
if (s.decrementUpdate() == 0) {
if (s.writeZero())
s.segmentHeader.downgradeUpdateToReadLock(s.segmentHeaderAddress);
}
break;
case WRITE_LOCKED:
entry.closeDelayedUpdateChecksum();
if (s.decrementWrite() == 0) {
if (!s.updateZero()) {
s.segmentHeader.downgradeWriteToUpdateLock(s.segmentHeaderAddress);
src/main/java/net/openhft/chronicle/hash/impl/stage/entry/WriteLock.java
+2
View File
@@ -32,6 +32,7 @@ public class WriteLock implements InterProcessLock {
@StageRef CheckOnEachPublicOperation checkOnEachPublicOperation;
@StageRef SegmentStages s;
@StageRef HashEntryStages<?> entry;
@Override
public boolean isHeldByCurrentThread() {
@@ -247,6 +248,7 @@ public class WriteLock implements InterProcessLock {
case UPDATE_LOCKED:
return;
case WRITE_LOCKED:
entry.closeDelayedUpdateChecksum();
if (s.decrementWrite() == 0)
s.segmentHeader.downgradeWriteToUpdateLock(s.segmentHeaderAddress);
s.incrementUpdate();