# HG changeset patch
# User wenzelm
# Date 1245014678 -7200
# Node ID 118730fbe2ab9a11e5a474c0c8d7ec0ba17fbb68
# Parent  2f8ed0dca3bd2c2a54a5d3269505ce3e42dd402f
simplified join: do not record dependencies (which are slow, but were only required for dequeue_towards);

diff -r 2f8ed0dca3bd -r 118730fbe2ab src/Pure/Concurrent/future.ML
--- a/src/Pure/Concurrent/future.ML	Sun Jun 14 23:18:32 2009 +0200
+++ b/src/Pure/Concurrent/future.ML	Sun Jun 14 23:24:38 2009 +0200
@@ -301,19 +301,10 @@
       val _ = scheduler_check "join check";
       val _ = Multithreading.self_critical () andalso
         error "Cannot join future values within critical section";
-
       val _ =
-        (case thread_data () of
-          NONE => List.app join_wait xs  (*alien thread -- refrain from contending for resources*)
-        | SOME (name, task) =>           (*proper task -- continue work*)
-            let
-              val pending = filter_out is_finished xs;
-              val deps = map task_of pending;
-              val _ = SYNCHRONIZED "join" (fn () =>
-                (change queue (Task_Queue.depend deps task); notify_all ()));
-              val _ = List.app join_loop pending;
-            in () end);
-
+        if is_some (thread_data ())
+        then List.app join_loop xs   (*proper task -- continue work*)
+        else List.app join_wait xs;  (*alien thread -- refrain from contending for resources*)
     in map get_result xs end) ();
 
 end;