diff options
| author | Sven Gothel <[email protected]> | 2010-10-07 05:22:39 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2010-10-07 05:22:39 +0200 |
| commit | c8a9c59e4838cd43090378a7ed60544449472801 (patch) | |
| tree | c17b1b9b8f6aea4a491ef6085be7c9910f057c5c /make | |
| parent | 018c7e8660dc0af68bd129be9af5094d04d0b431 (diff) | |
Fix: NativeWindow RecursiveToolkitLock, GLWindow lockSurface/unlockSurface
Fix: NativeWindow RecursiveToolkitLock
- Use notify(), instead of notifyAll(), so only one thread is being awakened
for the single resource. Otherwise starvation and timeout happen, since
the oldest thread might not get waken up (earlier than other threads) within timeout.
- Inner class for all synchronized (flow/mem) fields for easier fine grained sync/lock.
Fix: GLWindow lockSurface/unlockSurface
- Enter locked surface block only if surface lock could be acquired
Diffstat (limited to 'make')
| -rwxr-xr-x | make/scripts/java-run-all.sh | 1 | ||||
| -rw-r--r-- | make/scripts/tests.bat | 4 | ||||
| -rwxr-xr-x | make/scripts/tests.sh | 6 |
3 files changed, 8 insertions, 3 deletions
diff --git a/make/scripts/java-run-all.sh b/make/scripts/java-run-all.sh index 2b3fc21e7..6bb053a16 100755 --- a/make/scripts/java-run-all.sh +++ b/make/scripts/java-run-all.sh @@ -48,6 +48,7 @@ uname -a | grep -i Darwin && MOSX=1 # D_ARGS="-Dnewt.debug.EDT -Dnewt.debug.Window" # D_ARGS="-Dsun.awt.disableMixing=true -Dnewt.debug.EDT" D_ARGS="-Dnewt.debug.EDT" +# D_ARGS="-Dnativewindow.debug.TraceLock" # D_ARGS="-Dnewt.debug.Display" # D_ARGS="-Djogl.debug.Animator -Dnewt.debug.Window -Dnewt.debug.Display" # D_ARGS="-Dnewt.debug.Window -Dnewt.debug.Display -Dnewt.test.Window.reparent.incompatible=true" diff --git a/make/scripts/tests.bat b/make/scripts/tests.bat index 82dba1c9b..f9bc7a5c8 100644 --- a/make/scripts/tests.bat +++ b/make/scripts/tests.bat @@ -12,4 +12,6 @@ REM # ./scripts/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.paren REM # ./scripts/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.TestGLWindows01NEWT REM # ./scripts/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.TestGLWindows02NEWTAnimated REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.parenting.TestParenting01NEWT -scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestFocus01SwingAWT +scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestFocus01SwingAWTRobot +REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestFocus01SwingAWTRobot +REM scripts\java-win64-dbg.bat com.jogamp.test.junit.nativewindow.TestRecursiveToolkitLockCORE diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 0e3688bb4..c5939e5e5 100755 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -21,14 +21,16 @@ spath=`dirname $0` # $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.TestParenting02NEWT $* # $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.TestParenting01aAWT $* -$spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.TestParenting01bAWT $* +# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.TestParenting01bAWT $* # $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.TestParenting01cAWT $* # $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.TestParenting01cSwingAWT $* # $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.TestParenting02AWT $* # $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.jogl.awt.TestSwingAWTRobotUsageBeforeJOGLInitBug411 $* -# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.TestFocus01SwingAWTRobot $* +$spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.TestFocus01SwingAWTRobot $* # $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.TestFocus02SwingAWTRobot $* +# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.nativewindow.TestRecursiveToolkitLockCORE $* + $spath/count-edt-start.sh java-run.log |