From c964517ebf2496b6eec0fb3d688d41b3a3ba626b Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Sat, 26 Nov 2011 06:21:49 +0100 Subject: Move TRACE_LOCK from RecursiveLock -> Lock --- src/java/com/jogamp/common/util/locks/Lock.java | 5 ++++- src/java/com/jogamp/common/util/locks/RecursiveLock.java | 8 -------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/java/com/jogamp/common/util/locks/Lock.java b/src/java/com/jogamp/common/util/locks/Lock.java index 41c5a14..28f9642 100644 --- a/src/java/com/jogamp/common/util/locks/Lock.java +++ b/src/java/com/jogamp/common/util/locks/Lock.java @@ -36,6 +36,9 @@ import java.security.AccessController; */ public interface Lock { + /** Enable via the property jogamp.debug.Lock.TraceLock */ + public static final boolean TRACE_LOCK = Debug.isPropertyDefined("jogamp.debug.Lock.TraceLock", true, AccessController.getContext()); + /** Enable via the property jogamp.debug.Lock */ public static final boolean DEBUG = Debug.debug("Lock"); @@ -45,7 +48,7 @@ public interface Lock { /** * Defines the TIMEOUT for {@link #lock()} in ms, * and defaults to {@link #DEFAULT_TIMEOUT}.
- * It can be overriden via the system property jogamp.common.utils.locks.Lock.timeout. + * It can be overridden via the system property jogamp.common.utils.locks.Lock.timeout. */ public static final long TIMEOUT = Debug.getLongProperty("jogamp.common.utils.locks.Lock.timeout", true, AccessController.getContext(), DEFAULT_TIMEOUT); diff --git a/src/java/com/jogamp/common/util/locks/RecursiveLock.java b/src/java/com/jogamp/common/util/locks/RecursiveLock.java index 77d7534..e3d677a 100644 --- a/src/java/com/jogamp/common/util/locks/RecursiveLock.java +++ b/src/java/com/jogamp/common/util/locks/RecursiveLock.java @@ -28,18 +28,10 @@ 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.
* A hold count of 1 identifies this lock as locked.
-- cgit v1.2.3