Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
b149ebc
[feature] Maven build of Fast Multi-Level Locks for Java
adamretter Jul 20, 2017
34d8074
[feature] Add facilities for reporting on lock counts
adamretter Jul 20, 2017
78c3819
[doc] Updated README.md with a pointer to the original project
adamretter Jul 20, 2017
70cb852
[test] Tests to try and assert behvaiour of MultiLock
adamretter Aug 19, 2018
275ea7b
[feature] Add convenience construtor to MultiLock
adamretter Aug 25, 2018
1634271
[bugfix] DeuceSTM is only used for comparison tests
adamretter Aug 25, 2018
8d18909
[refactor] Move Hierarchical locking aspects to a seprarate lock clas…
adamretter Aug 25, 2018
1936f0a
[refactor] Rename methods and sub-classes so they are more similar to…
adamretter Aug 25, 2018
465e033
[feature] Implement lock interruptibly methods for MultiLock
adamretter Aug 26, 2018
7dc4e54
[refactor] Don't return boolean unneccesarily
adamretter Aug 29, 2018
058002b
[refactor] Switch tests to JUnit 5
adamretter Aug 29, 2018
d9f7315
[refactor] Remove code duplication in tests
adamretter Aug 29, 2018
87a4648
[feature] Implement try lock methods for MultiLock
adamretter Aug 30, 2018
135ecba
[bugfix] Fix a livelock issue in MultiLock.Sync.tryAcquireShared(long).
adamretter Aug 30, 2018
248ac3b
[feature] Implement try lock with timeout methods for MultiLock
adamretter Aug 30, 2018
b20a49d
[feature] Facilities for checking status
adamretter Jun 27, 2019
0296697
[refactor] Prepare to publish as Evolved Binary
adamretter Jun 27, 2019
aafe521
[refactor] Update the license with regards to our modifications
adamretter Jun 27, 2019
4f78774
[doc] Fix javadoc
adamretter Jun 27, 2019
fc9a6b3
[maven-release-plugin] prepare release 1.0.1
adamretter Jun 27, 2019
4ce1064
[maven-release-plugin] prepare for next development iteration
adamretter Jun 27, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.idea/
*.iml
target/
19 changes: 19 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
language: java

dist: xenial

matrix:
include:
- jdk: openjdk8
- jdk: openjdk9
- jdk: openjdk10
- jdk: openjdk11
- jdk: openjdk12

cache:
directories:
- $HOME/.m2

install: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V

script: mvn verify -B
26 changes: 26 additions & 0 deletions BSD-2.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
Copyright © ${project.inceptionYear}, ${owner}
All rights reserved.

Modifications and additions from the original source code at
https://github.com/kgudka/java-multilocks are
Copyright © ${modifications.year}, ${modifications.owner}

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 changes: 26 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
Copyright © 2010, Khilan Gudka
All rights reserved.

Modifications and additions from the original source code at
https://github.com/kgudka/java-multilocks are
Copyright © 2017, Evolved Binary Ltd

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
31 changes: 27 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,30 @@
# MutiLock

[![Build Status](https://travis-ci.com/evolvedbinary/multilock.svg?branch=master)](https://travis-ci.com/evolvedbinary/mulitlock)

Java implementation of Fast Multi-Level locks.

This is the source-code accompanying our EC^2 2010 Workshop on Exploiting
Concurrency Efficiently and Correctly position paper.
**NOTE:** This is a Mavenized port of the [original source code](https://github.com/kgudka/java-multilocks)
with a few additions and modifications.

The original source code was licensed under *The BSD 2-Clause License*,
as *Copyright (c) 2010-2016 Khilan Gudka*.

We release our modifications under the same license but
*Copyright (c) 2017-2019 Evolved Binary Ltd*.

The original paper by Khilan Gudka and Susan Eisenbach entitled `Fast Multi-Level Locks for Java`
can be found here: https://www.cl.cam.ac.uk/~kg365/pubs/ec2-fastlocks.pdf


## Maven Coordinates

The artifact is available from Maven Central as:

The paper can be found here:
http://pubs.doc.ic.ac.uk/fast-multi-level-locks/
```xml
<dependency>
<groupId>com.evolvedbinary.multilock</groupId>
<artifactId>multilock</artifactId>
<version>1.0.1</version>
</dependency>
```
Loading