# HG changeset patch
# User wenzelm
# Date 1223491064 -7200
# Node ID 4c7704c089512343601edd787fcdd1eab8b7fbfb
# Parent  4e2417eb603e29fb6d606c6b042be7f484bf4aa0
less tracing;
removed heartbeat thread;

diff -r 4e2417eb603e -r 4c7704c08951 src/Pure/Concurrent/future.ML
--- a/src/Pure/Concurrent/future.ML	Wed Oct 08 20:21:35 2008 +0200
+++ b/src/Pure/Concurrent/future.ML	Wed Oct 08 20:37:44 2008 +0200
@@ -105,14 +105,13 @@
 fun SYNCHRONIZED name e = Exn.release (uninterruptible (fn restore_attributes => fn () =>
   let
     val _ =
-      if Mutex.trylock lock then Multithreading.tracing 3 (fn () => name ^ ": locked")
+      if Mutex.trylock lock then ()
       else
-       (Multithreading.tracing 2 (fn () => name ^ ": locking ...");
+       (Multithreading.tracing 3 (fn () => name ^ ": locking ...");
         Mutex.lock lock;
-        Multithreading.tracing 2 (fn () => name ^ ": ... locked"));
+        Multithreading.tracing 3 (fn () => name ^ ": ... locked"));
     val result = Exn.capture (restore_attributes e) ();
     val _ = Mutex.unlock lock;
-    val _ = Multithreading.tracing 3 (fn () => name ^ ": unlocked");
   in result end) ());
 
 fun wait name = (*requires SYNCHRONIZED*)
@@ -186,11 +185,6 @@
 
 (* scheduler *)
 
-fun heartbeat name =
- (Multithreading.tracing 1 (fn () => name);
-  OS.Process.sleep (Time.fromSeconds 2);
-  if ! do_shutdown then () else heartbeat name);
-
 fun scheduler_next () = (*requires SYNCHRONIZED*)
   let
     (*worker threads*)
@@ -222,16 +216,15 @@
 
 fun scheduler_loop () =
  (while SYNCHRONIZED "scheduler" scheduler_next do ();
-  Multithreading.tracing 2 (fn () => "scheduler: exit"));
+  Multithreading.tracing 3 (fn () => "scheduler: exit"));
 
 fun scheduler_active () = (*requires SYNCHRONIZED*)
   (case ! scheduler of NONE => false | SOME thread => Thread.isActive thread);
 
 fun scheduler_check name = SYNCHRONIZED name (fn () =>
   if not (scheduler_active ()) then
-    (Multithreading.tracing 2 (fn () => "scheduler: fork");
-     do_shutdown := false; scheduler := SOME (SimpleThread.fork false scheduler_loop);
-     SimpleThread.fork false (fn () => heartbeat ("heartbeat " ^ string_of_int (inc next))); ())
+    (Multithreading.tracing 3 (fn () => "scheduler: fork");
+     do_shutdown := false; scheduler := SOME (SimpleThread.fork false scheduler_loop))
   else if ! do_shutdown then error "Scheduler shutdown in progress"
   else ());