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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Peter Lawrey
2021-06-17 13:56:13 +01:00
parent 0ef22ee50a a7f884ec24
commit 763eef2718
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/net/openhft/chronicle/map/FileLockUtil.java
+1 -1
View File
@@ -21,7 +21,7 @@ public final class FileLockUtil {
*/
private static final String DISABLE_LOCKING = "chronicle.map.disable.locking";
private static final ConcurrentHashMap<File, FileLockReference> FILE_LOCKS = new ConcurrentHashMap<>();
private static final boolean USE_EXCLUSIVE_LOCKING = !OS.isWindows() && !Jvm.getBoolean(DISABLE_LOCKING);
private static final boolean USE_EXCLUSIVE_LOCKING = !Jvm.getBoolean(DISABLE_LOCKING);
private static final boolean USE_SHARED_LOCKING = !OS.isWindows() && !Jvm.getBoolean(DISABLE_LOCKING) &&
!"shared".equalsIgnoreCase(System.getProperty(DISABLE_LOCKING));
private static final AtomicBoolean LOCK_WARNING_PRINTED = new AtomicBoolean();
src/test/java/net/openhft/chronicle/map/FileLockUtilTest.java
+7 -11
View File
@@ -48,12 +48,10 @@ public class FileLockUtilTest {
@Test
public void testExclusiveNormalCase() {
if (!OS.isWindows()) {
FileLockUtil.acquireExclusiveFileLock(canonicalFile, fileChannel);
FileLockUtil.releaseExclusiveFileLock(canonicalFile);
FileLockUtil.acquireExclusiveFileLock(canonicalFile, fileChannel);
FileLockUtil.releaseExclusiveFileLock(canonicalFile);
}
FileLockUtil.acquireExclusiveFileLock(canonicalFile, fileChannel);
FileLockUtil.releaseExclusiveFileLock(canonicalFile);
FileLockUtil.acquireExclusiveFileLock(canonicalFile, fileChannel);
FileLockUtil.releaseExclusiveFileLock(canonicalFile);
}
@Test
@@ -98,11 +96,9 @@ public class FileLockUtilTest {
@Test
public void testRunExclusively() {
if (!OS.isWindows()) {
final AtomicInteger cnt = new AtomicInteger();
FileLockUtil.runExclusively(canonicalFile, fileChannel, cnt::incrementAndGet);
assertEquals(1, cnt.get());
}
final AtomicInteger cnt = new AtomicInteger();
FileLockUtil.runExclusively(canonicalFile, fileChannel, cnt::incrementAndGet);
assertEquals(1, cnt.get());
}
@Test