# HG changeset patch
# User wenzelm
# Date 1186151303 -7200
# Node ID ec51a0f7eefe157c64aad74a64f1d2e3bbe32694
# Parent  90a9a6fe0d0189182b5b4df2d87e6fdc9f9ff241
tuned tracing;

diff -r 90a9a6fe0d01 -r ec51a0f7eefe src/Pure/ML-Systems/multithreading_polyml.ML
--- a/src/Pure/ML-Systems/multithreading_polyml.ML	Fri Aug 03 16:28:22 2007 +0200
+++ b/src/Pure/ML-Systems/multithreading_polyml.ML	Fri Aug 03 16:28:23 2007 +0200
@@ -53,17 +53,17 @@
   if self_critical () then e ()
   else
     let
+      val name' = ! critical_name;
       val _ =
         if Mutex.trylock critical_lock then ()
         else
           let
             val timer = Timer.startRealTimer ();
-            val _ = tracing 3 (fn () =>
-              "CRITICAL" ^ show name ^ show' (! critical_name) ^ ": waiting");
+            val _ = tracing 4 (fn () => "CRITICAL" ^ show name ^ show' name' ^ ": waiting");
             val _ = Mutex.lock critical_lock;
-            val _ = tracing 3 (fn () =>
-              "CRITICAL" ^ show name ^ show' (! critical_name) ^ ": passed after " ^
-              Time.toString (Timer.checkRealTimer timer));
+            val time = Timer.checkRealTimer timer;
+            val _ = tracing (if Time.> (time, Time.fromMilliseconds 10) then 3 else 4) (fn () =>
+              "CRITICAL" ^ show name ^ show' name' ^ ": passed after " ^ Time.toString time);
           in () end;
       val _ = critical_thread := SOME (Thread.self ());
       val _ = critical_name := name;
@@ -92,12 +92,15 @@
     val lock = Mutex.mutex ();
     fun PROTECTED name e =
       let
+        val name' = ! protected_name;
         val _ =
           if Mutex.trylock lock then ()
           else
-           (tracing 2 (fn () => "PROTECTED" ^ show name ^ show' (! protected_name) ^ ": waiting");
-            Mutex.lock lock;
-            tracing 2 (fn () => "PROTECTED" ^ show name ^ show' (! protected_name) ^ ": passed"));
+            let
+              val _ = tracing 2 (fn () => "PROTECTED" ^ show name ^ show' name' ^ ": waiting");
+              val _ = Mutex.lock lock;
+              val _ = tracing 2 (fn () => "PROTECTED" ^ show name ^ show' name' ^ ": passed");
+            in () end;
         val _ = protected_name := name;
         val res = Exn.capture e ();
         val _ = protected_name := "";