Lock ChangeSet: New RecursiveLock interface. Minor API change to of tryLock throws declaration

2 files changed, 55 insertions, 3 deletions

diff --git a/src/java/com/jogamp/common/util/locks/Lock.java b/src/java/com/jogamp/common/util/locks/Lock.java
index ad379ef..41c5a14 100644
--- a/src/java/com/jogamp/common/util/locks/Lock.java
+++ b/src/java/com/jogamp/common/util/locks/Lock.java
@@ -59,14 +59,14 @@ public interface Lock {
     /**
      * Blocking until the lock is acquired by this Thread or <code>maxwait</code> in ms is reached.
      *
-     * @param maxwait Maximum time in ms to wait to acquire the lock. If this value is zero,
+     * @param timeout Maximum time in ms to wait to acquire the lock. If this value is zero,
      *                the call returns immediately either without being able
      *                to acquire the lock, or with acquiring the lock directly while ignoring any scheduling order.
      * @return true if the lock has been acquired within <code>maxwait</code>, otherwise false
      *
-     * @throws RuntimeException in case of {@link #TIMEOUT}
+     * @throws InterruptedException
      */
-    boolean tryLock(long maxwait) throws RuntimeException;
+    boolean tryLock(long timeout) throws InterruptedException;
 
     /**
      * Unblocking.
diff --git a/src/java/com/jogamp/common/util/locks/RecursiveLock.java b/src/java/com/jogamp/common/util/locks/RecursiveLock.java
new file mode 100644
index 0000000..77d7534
--- /dev/null
+++ b/src/java/com/jogamp/common/util/locks/RecursiveLock.java
@@ -0,0 +1,52 @@
+/**
+ * Copyright 2010 JogAmp Community. All rights reserved.
+ *
+ * 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 JogAmp Community ``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 JogAmp Community 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.
+ *
+ * The views and conclusions contained in the software and documentation are those of the
+ * authors and should not be interpreted as representing official policies, either expressed
+ * or implied, of JogAmp Community.
+ */
+
+package com.jogamp.common.util.locks;
+
+import jogamp.common.Debug;
+import java.security.AccessController;
+
+import java.util.LinkedList;
+
+/**
+ * Reentrance locking toolkit, impl a complete fair FIFO scheduler
+ */
+public interface RecursiveLock extends LockExt {
+
+    public static final boolean TRACE_LOCK = Debug.isPropertyDefined("jogamp.debug.Lock.TraceLock", true, AccessController.getContext());
+
+    /** Return the number of locks issued to this lock by the same thread.
+     * A hold count of 0 identifies this lock as unlocked.<br>
+     * A hold count of 1 identifies this lock as locked.<br>
+     * A hold count of &gt; 1 identifies this lock as recursively lock.<br>
+     */
+    int getHoldCount();
+
+    int getQueueLength();
+}
+