From ed254acfa7474877cded7ea14588d0cc8d08ef67 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Tue, 27 Apr 2010 07:18:54 +0200
Subject: - Fix GLProcAddressResolver regression: Use GLProcAddressResolver !

- X11GLXDrawableFactory:
    - Move shared resource creation/destruction into it's own thread
    - Remove the ATI hack (no XDisplay closing) for every Display,
      this is only necessary for the shared XDisplay and in case of AWT.

- Newt
    - Display: Only pumpMessages if device is ready.
    - X11Display: Verify handle not null at DispatchMessage.

- Common recursive ToolkitLock implementation, from
    src/nativewindow/classes/com/jogamp/nativewindow/impl/LockingNativeWindowFactory.java and
    src/newt/classes/com/jogamp/newt/Window.java,
    -> com.jogamp.nativewindow.impl.RecursiveToolkitLock

- Unique XLockDisplay/XUnlockDisplay call via X11Util to simplify debugging.
  X11Util: Added debug code for XLockDisplay/XUnlockDisplay.
           Added fast LongObjectHashMap
           Added static lib loading and initialization.
           Removed active and passive list, as well as unused methods,
           to easy maintenance. Possible since the only 'uncloseable' Display
           might be the shareable one.
- X11Lib: Added static initialization via X11Util

Test:
    junit/com/jogamp/test/junit/jogl/demos/gl2/gears/TestGears*
        - Add WindowListener for quit ..
---
 .../nativewindow/impl/RecursiveToolkitLock.java    | 83 ++++++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 src/nativewindow/classes/com/jogamp/nativewindow/impl/RecursiveToolkitLock.java

(limited to 'src/nativewindow/classes')

diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/impl/RecursiveToolkitLock.java b/src/nativewindow/classes/com/jogamp/nativewindow/impl/RecursiveToolkitLock.java
new file mode 100644
index 0000000..06ce543
--- /dev/null
+++ b/src/nativewindow/classes/com/jogamp/nativewindow/impl/RecursiveToolkitLock.java
@@ -0,0 +1,83 @@
+package com.jogamp.nativewindow.impl;
+
+import javax.media.nativewindow.*;
+
+//
+// Reentrance locking toolkit
+// 
+public class RecursiveToolkitLock implements ToolkitLock {
+    private Thread owner;
+    private int recursionCount;
+    private Exception lockedStack = null;
+    private static final long timeout = 3000;  // maximum wait 3s
+
+    public Exception getLockedStack() {
+        return lockedStack;
+    }
+
+    public Thread getOwner() {
+        return owner;
+    }
+
+    public boolean isOwner() {
+        return isOwner(Thread.currentThread());
+    }
+
+    public synchronized boolean isOwner(Thread thread) {
+        return owner == thread ;
+    }
+
+    public synchronized boolean isLocked() {
+        return null != owner;
+    }
+
+    /** Recursive and blocking lockSurface() implementation */
+    public synchronized void lock() {
+        Thread cur = Thread.currentThread();
+        if (owner == cur) {
+            ++recursionCount;
+            return;
+        }
+
+        long ts = System.currentTimeMillis();
+        while (owner != null && (System.currentTimeMillis()-ts) < timeout) {
+            try {
+                wait(timeout);
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+        }
+        if(owner != null) {
+            lockedStack.printStackTrace();
+            throw new RuntimeException("Waited "+timeout+"ms for: "+owner+" - "+cur);
+        }
+        owner = cur;
+        lockedStack = new Exception("Previously locked by "+owner);
+    }
+    
+
+    /** Recursive and unblocking unlockSurface() implementation */
+    public synchronized void unlock() {
+        unlock(null);
+    }
+
+    /** Recursive and unblocking unlockSurface() implementation */
+    public synchronized void unlock(Runnable releaseAfterUnlockBeforeNotify) {
+        Thread cur = Thread.currentThread();
+        if (owner != cur) {
+            lockedStack.printStackTrace();
+            throw new RuntimeException(cur+": Not owner, owner is "+owner);
+        }
+        if (recursionCount > 0) {
+            --recursionCount;
+            return;
+        }
+        owner = null;
+        lockedStack = null;
+        if(null!=releaseAfterUnlockBeforeNotify) {
+            releaseAfterUnlockBeforeNotify.run();
+        }
+        notifyAll();
+    }
+}
+
-- 
cgit v1.2.3