2004/01/14 06:12:02

[org.ibex.core.git] / src / org / xwt / Scheduler.java

diff --git a/src/org/xwt/Scheduler.java b/src/org/xwt/Scheduler.java
index f433858..8cbbb35 100644 (file)
--- a/src/org/xwt/Scheduler.java
+++ b/src/org/xwt/Scheduler.java
@@ -1,4 +1,4 @@
-// Copyright 2003 Adam Megacz, see the COPYING file for licensing [GPL]
+// Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
 package org.xwt;
 
 import java.util.*;
@@ -8,8 +8,6 @@ import org.xwt.util.*;
 /** Implements cooperative multitasking */
 public class Scheduler {
 
-    // FIXME: prepending events messes with keysate -- make a "no re-ordering" invariant?
-
     // Public API Exposed to org.xwt /////////////////////////////////////////////////
 
     private static Scheduler singleton;
@@ -18,19 +16,29 @@ public class Scheduler {
     /** adds a task to the back of the queue */
     public static void add(Task t) { singleton.runnable.append(t); }
 
-    /** adds a task to the front of the queue (guaranteed to run next) */
-    public static void addAtFront(Task t) { singleton.runnable.prepend(t); }
-
     public static void init() { if (singleton == null) (singleton = Platform.getScheduler()).run(); }
 
-    private static Task current = null;
-    public static Task current() { return current; }
+    private static Task currentTask = null;
+    public static Task current() { return currentTask; }
 
     /** synchronizd so that we can safely call it from an event-delivery thread, in-context */
-    public static synchronized void renderAll() {
-        for(int i=0; i<Surface.allSurfaces.size(); i++) {
-            Surface s = ((Surface)Surface.allSurfaces.elementAt(i));
-            do { s.render(); } while(s.abort);
+    private static volatile boolean rendering = false;
+    private static volatile boolean again = false;
+    public static void renderAll() {
+        if (rendering) { again = true; return; }
+        synchronized(Scheduler.class) {
+            try {
+                rendering = true;
+                do {
+                    again = false;
+                    for(int i=0; i<Surface.allSurfaces.size(); i++) {
+                        Surface s = ((Surface)Surface.allSurfaces.elementAt(i));
+                        do { s.render(); } while(s.abort);
+                    }
+                } while(again);
+            } finally {
+                rendering = false;
+            }
         }
     }
 
@@ -52,13 +60,13 @@ public class Scheduler {
 
     protected static Queue runnable = new Queue(50);
     public void defaultRun() {
-        while(true) {
-            current = (Task)runnable.remove(true);
+        try {while(true) {
+            currentTask = (Task)runnable.remove(true);
             try {
                 synchronized(this) {
                     for(int i=0; i<Surface.allSurfaces.size(); i++) {
                         Surface s = (Surface)Surface.allSurfaces.elementAt(i);
-                        if (current instanceof JSFunction) {
+                        if (currentTask instanceof JS) {
                             s._mousex = Integer.MAX_VALUE;
                             s._mousey = Integer.MAX_VALUE;
                         } else {
@@ -66,17 +74,20 @@ public class Scheduler {
                             s._mousey = s.mousey;
                         }
                     }
-                    current.perform();
+                    currentTask.perform();
                 }
                 renderAll();
             } catch (JSExn e) {
                 Log.info(Scheduler.class, "a JavaScript thread spawned with xwt.thread() threw an exception:");
-                Log.info(Scheduler.class, e);
+                Log.info(Scheduler.class, "JS Exception: " + e.getObject() + "\n" + e.backtrace());
+                Log.info(Scheduler.class,e);
             } catch (Exception e) {
                 Log.info(Scheduler.class, "a Task threw an exception which was caught by the scheduler:");
                 Log.info(Scheduler.class, e);
             }
             // if an Error is thrown it will cause the engine to quit
+}        } catch (Throwable t) {
+            t.printStackTrace();
         }
     }
 }