From b6fa407d4bf19ef9fe387454b5eeca68853532b9 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Sun, 25 Nov 2012 14:58:05 +0100 Subject: SWTEDTUtil/AWTEDTUtil: Fix deadlock situation in waitUntilStopped(), etc - wrap task execution (or enqueing) into status-sync 'edtLock' This fixes the disparity w/ DefaultEDTUtil, i.e. aligns it's implementation/semantics. --- src/newt/classes/jogamp/newt/DefaultEDTUtil.java | 2 +- src/newt/classes/jogamp/newt/driver/awt/AWTEDTUtil.java | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'src/newt/classes/jogamp') diff --git a/src/newt/classes/jogamp/newt/DefaultEDTUtil.java b/src/newt/classes/jogamp/newt/DefaultEDTUtil.java index 18418a8dc..98987ef96 100644 --- a/src/newt/classes/jogamp/newt/DefaultEDTUtil.java +++ b/src/newt/classes/jogamp/newt/DefaultEDTUtil.java @@ -150,7 +150,7 @@ public class DefaultEDTUtil implements EDTUtil { System.err.println("Warning: EDT about (1) to stop, won't enqueue new task: "+edt); Thread.dumpStack(); } - return; + return; } // System.err.println(Thread.currentThread()+" XXX stop: "+stop+", tasks: "+edt.tasks.size()+", task: "+task); // Thread.dumpStack(); diff --git a/src/newt/classes/jogamp/newt/driver/awt/AWTEDTUtil.java b/src/newt/classes/jogamp/newt/driver/awt/AWTEDTUtil.java index 6fa053dd3..01b5ad8a4 100644 --- a/src/newt/classes/jogamp/newt/driver/awt/AWTEDTUtil.java +++ b/src/newt/classes/jogamp/newt/driver/awt/AWTEDTUtil.java @@ -142,13 +142,17 @@ public class AWTEDTUtil implements EDTUtil { // Thread.dumpStack(); } } - - // start if should not stop && not started yet - if( !stop && !nedt.isRunning() ) { - startImpl(); + if( isCurrentThreadEDT() ) { + task.run(); + wait = false; // running in same thread (EDT) -> no wait + } else { + // start if should not stop && not started yet + if( !stop && !nedt.isRunning() ) { + startImpl(); + } + AWTEDTExecutor.singleton.invoke(wait, task); } } - AWTEDTExecutor.singleton.invoke(wait, task); } @Override -- cgit v1.2.3