# HG changeset patch
# User wenzelm
# Date 1373624297 -7200
# Node ID c8f8c29193def05f166a02c85691ceaad6d1a51b
# Parent  f03c6a4d587022e01407568349981b15da6a4279
clarified memo_exec: plain synchronized access without any special tricks;

diff -r f03c6a4d5870 -r c8f8c29193de src/Pure/PIDE/command.ML
--- a/src/Pure/PIDE/command.ML	Fri Jul 12 12:17:03 2013 +0200
+++ b/src/Pure/PIDE/command.ML	Fri Jul 12 12:18:17 2013 +0200
@@ -50,20 +50,18 @@
  | Result res => not (Exn.is_interrupt_exn res));
 
 fun memo_exec execution_id (Memo v) =
-  (case Synchronized.value v of
-    Result res => res
-  | Expr _ =>
-      Synchronized.timed_access v (fn _ => SOME Time.zeroTime)
-        (fn Result res => SOME (res, Result res)
-          | expr as Expr (exec_id, e) =>
-              uninterruptible (fn restore_attributes => fn () =>
-                if Execution.running execution_id exec_id then
-                  let
-                    val res = Exn.capture (restore_attributes e) ();
-                    val _ = Execution.finished exec_id;
-                  in SOME (res, Result res) end
-                else SOME (Exn.interrupt_exn, expr)) ())
-      |> (fn NONE => error "Concurrent execution attempt" | SOME res => res))
+  Synchronized.guarded_access v
+    (fn expr =>
+      (case expr of
+        Result res => SOME (res, expr)
+      | Expr (exec_id, e) =>
+          uninterruptible (fn restore_attributes => fn () =>
+            if Execution.running execution_id exec_id then
+              let
+                val res = Exn.capture (restore_attributes e) ();
+                val _ = Execution.finished exec_id;
+              in SOME (res, Result res) end
+            else SOME (Exn.interrupt_exn, expr)) ()))
   |> Exn.release |> ignore;
 
 fun memo_fork params execution_id (Memo v) =