TudbuT/tuddylib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

make relocking with different modes work
All checks were successful
/ Build & Publish (push) Successful in 44s
Details

Browse source
This commit is contained in:
Daniella / Tove 2024-06-25 05:31:37 +02:00
parent 8fd30ea15d
commit 28dfebea25
Signed by: TudbuT
GPG key ID: B3CF345217F202D3
1 changed files with 19 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/main/java/de/tudbut/tools/Lock.java
View file

@ -56,16 +56,14 @@ public class Lock extends SimpleLock {
* Wait until unlocked, either by a timer or manually
*/
public synchronized void waitHere() {
if(!isTimed) {
do
super.waitHere();
while(relocking);
return;
}
if(!super.isLocked())
return;
do {
if(!isTimed) {
super.waitHere();
continue;
}
long wt = timeLeft0();
if(wt == 0) {
unlock();
@ -82,30 +80,29 @@ public class Lock extends SimpleLock {
public synchronized void waitHere(int timeout) {
if(timeout == 0)
return;
long start = System.currentTimeMillis();
if(!isTimed) {
do {
long sectionOffset = System.currentTimeMillis() - start;
long wt = timeout - sectionOffset;
if(wt == 0)
break;
super.waitHere(wt);
} while(relocking);
return;
}
if(!super.isLocked())
return;
long start = System.currentTimeMillis();
do {
long sectionOffset = System.currentTimeMillis() - start;
if(!isTimed) {
long wt = timeout - sectionOffset;
if(wt <= 0)
return;
super.waitHere(wt);
continue;
}
long wt = timeLeft0();
if(wt == 0) {
unlock();
return;
}
long sectionOffset = System.currentTimeMillis() - start;
wt = Math.min(wt, timeout - sectionOffset);
if(wt == 0)
break;
if(wt <= 0)
return;
super.waitHere(wt);
} while(relocking);
}