# HG changeset patch
# User wenzelm
# Date 1375109524 -7200
# Node ID 627fb639a2d91556acc86e5db0b33ca61058068d
# Parent  3e8b9d2f18cb5c06aa8c38296fca2a12f83846d2
maintain explicit execution frontier: avoid conflict with former task via static dependency;
start execution immediate after assignment, to keep frontier simple;

diff -r 3e8b9d2f18cb -r 627fb639a2d9 src/Pure/PIDE/command.ML
--- a/src/Pure/PIDE/command.ML	Mon Jul 29 16:01:05 2013 +0200
+++ b/src/Pure/PIDE/command.ML	Mon Jul 29 16:52:04 2013 +0200
@@ -51,7 +51,7 @@
  | Result res => not (Exn.is_interrupt_exn res));
 
 fun memo_exec execution_id (Memo v) =
-  Synchronized.guarded_access v
+  Synchronized.timed_access v (K (SOME Time.zeroTime))
     (fn expr =>
       (case expr of
         Expr (exec_id, e) =>
@@ -63,7 +63,9 @@
               in SOME (Exn.is_interrupt_exn res, Result res) end
             else SOME (true, expr)) ()
       | Result _ => SOME (false, expr)))
-  |> (fn true => Exn.interrupt () | false => ());
+  |> (fn SOME false => ()
+       | SOME true => Exn.interrupt ()
+       | NONE => error "Conflicting command execution");
 
 fun memo_fork params execution_id (Memo v) =
   (case Synchronized.value v of
diff -r 3e8b9d2f18cb -r 627fb639a2d9 src/Pure/PIDE/document.ML
--- a/src/Pure/PIDE/document.ML	Mon Jul 29 16:01:05 2013 +0200
+++ b/src/Pure/PIDE/document.ML	Mon Jul 29 16:52:04 2013 +0200
@@ -18,7 +18,7 @@
   val init_state: state
   val define_command: Document_ID.command -> string -> string -> state -> state
   val remove_versions: Document_ID.version list -> state -> state
-  val start_execution: state -> unit
+  val start_execution: state -> state
   val timing: bool Unsynchronized.ref
   val update: Document_ID.version -> Document_ID.version -> edit list -> state ->
     Document_ID.exec list * (Document_ID.command * Document_ID.exec list) list * state
@@ -196,10 +196,16 @@
 
 (** main state -- document structure and execution process **)
 
-type execution = {version_id: Document_ID.version, execution_id: Document_ID.execution};
+type execution =
+ {version_id: Document_ID.version,  (*static version id*)
+  execution_id: Document_ID.execution,  (*dynamic execution id*)
+  frontier: Future.task Symtab.table};  (*node name -> running execution task*)
 
-val no_execution = {version_id = Document_ID.none, execution_id = Document_ID.none};
-fun new_execution version_id = {version_id = version_id, execution_id = Execution.start ()};
+val no_execution: execution =
+  {version_id = Document_ID.none, execution_id = Document_ID.none, frontier = Symtab.empty};
+
+fun new_execution version_id frontier : execution =
+  {version_id = version_id, execution_id = Execution.start (), frontier = frontier};
 
 abstype state = State of
  {versions: version Inttab.table,  (*version id -> document content*)
@@ -216,17 +222,15 @@
 val init_state =
   make_state (Inttab.make [(Document_ID.none, empty_version)], Inttab.empty, no_execution);
 
-fun execution_of (State {execution, ...}) = execution;
-
 
 (* document versions *)
 
 fun define_version version_id version =
-  map_state (fn (versions, commands, _) =>
+  map_state (fn (versions, commands, {frontier, ...}) =>
     let
       val versions' = Inttab.update_new (version_id, version) versions
         handle Inttab.DUP dup => err_dup "document version" dup;
-      val execution' = new_execution version_id;
+      val execution' = new_execution version_id frontier;
     in (versions', commands, execution') end);
 
 fun the_version (State {versions, ...}) version_id =
@@ -287,29 +291,37 @@
 
 (* document execution *)
 
-fun start_execution state =
+fun start_execution state = state |> map_state (fn (versions, commands, execution) =>
   let
-    val {version_id, execution_id} = execution_of state;
+    val {version_id, execution_id, frontier} = execution;
     val pri = Options.default_int "editor_execution_priority";
-    val _ =
+
+    val new_tasks =
       if Execution.is_running execution_id then
         nodes_of (the_version state version_id) |> String_Graph.schedule
           (fn deps => fn (name, node) =>
             if visible_node node orelse pending_result node then
-              (singleton o Future.forks)
-                {name = "theory:" ^ name, group = SOME (Future.new_group NONE),
-                  deps = map (Future.task_of o #2) deps, pri = pri, interrupts = false}
-                (fn () =>
-                  iterate_entries (fn (_, opt_exec) => fn () =>
-                    (case opt_exec of
-                      SOME exec =>
-                        if Execution.is_running execution_id
-                        then SOME (Command.exec execution_id exec)
-                        else NONE
-                    | NONE => NONE)) node ())
-            else Future.value ())
+              let
+                val former_task = Symtab.lookup frontier name;
+                val future =
+                  (singleton o Future.forks)
+                    {name = "theory:" ^ name, group = SOME (Future.new_group NONE),
+                      deps = the_list former_task @ map #2 (maps #2 deps),
+                      pri = pri, interrupts = false}
+                    (fn () =>
+                      iterate_entries (fn (_, opt_exec) => fn () =>
+                        (case opt_exec of
+                          SOME exec =>
+                            if Execution.is_running execution_id
+                            then SOME (Command.exec execution_id exec)
+                            else NONE
+                        | NONE => NONE)) node ());
+              in [(name, Future.task_of future)] end
+            else [])
       else [];
-  in () end;
+    val frontier' = (fold o fold) Symtab.update new_tasks frontier;
+    val execution' = {version_id = version_id, execution_id = execution_id, frontier = frontier'};
+  in (versions, commands, execution') end);
 
 
 
diff -r 3e8b9d2f18cb -r 627fb639a2d9 src/Pure/PIDE/protocol.ML
--- a/src/Pure/PIDE/protocol.ML	Mon Jul 29 16:01:05 2013 +0200
+++ b/src/Pure/PIDE/protocol.ML	Mon Jul 29 16:52:04 2013 +0200
@@ -58,10 +58,7 @@
               let open XML.Encode
               in pair int (list (pair int (list int))) end
               |> YXML.string_of_body);
-        val _ =
-          Event_Timer.request (Time.+ (Time.now (), seconds 0.02))
-            (fn () => Document.start_execution state');
-      in state' end));
+      in Document.start_execution state' end));
 
 val _ =
   Isabelle_Process.protocol_command "Document.remove_versions"