# HG changeset patch
# User wenzelm
# Date 1247950351 -7200
# Node ID 257eac3946e992560c74942324e1510ce2b78788
# Parent  8c391a12df1d62da01ca9cdce71c36e5d4329059
scheduler: tuned tracing (status);
join_wait: more robust is_finished check;

diff -r 8c391a12df1d -r 257eac3946e9 src/Pure/Concurrent/future.ML
--- a/src/Pure/Concurrent/future.ML	Sat Jul 18 22:51:29 2009 +0200
+++ b/src/Pure/Concurrent/future.ML	Sat Jul 18 22:52:31 2009 +0200
@@ -133,7 +133,7 @@
     val ws = ! workers;
     val m = string_of_int (length ws);
     val n = string_of_int (length (filter #2 ws));
-  in Multithreading.tracing 1 (fn () => "SCHEDULE: " ^ m ^ " workers, " ^ n ^ " active") end;
+  in Multithreading.tracing 2 (fn () => "SCHEDULE: " ^ m ^ " workers, " ^ n ^ " active") end;
 
 fun change_active active = (*requires SYNCHRONIZED*)
   change workers (AList.update Thread.equal (Thread.self (), active));
@@ -188,6 +188,15 @@
 
 fun scheduler_next () = (*requires SYNCHRONIZED*)
   let
+    (*queue status*)
+    val _ = Multithreading.tracing 1 (fn () =>
+      let val {ready, pending, running} = Task_Queue.status (! queue) in
+        "SCHEDULE: " ^
+          string_of_int ready ^ " ready, " ^
+          string_of_int pending ^ " pending, " ^
+          string_of_int running ^ " running"
+      end);
+
     (*worker threads*)
     val _ =
       (case List.partition (Thread.isActive o #1) (! workers) of
@@ -277,8 +286,8 @@
 fun get_result x = the_default (Exn.Exn (SYS_ERROR "unfinished future")) (peek x);
 
 fun join_wait x =
-  while not (is_finished x)
-  do SYNCHRONIZED "join_wait" (fn () => wait ());
+  if SYNCHRONIZED "join_wait" (fn () => is_finished x orelse (wait (); false))
+  then () else join_wait x;
 
 fun join_next x = (*requires SYNCHRONIZED*)
   if is_finished x then NONE