Changeset 4312

Timestamp:

06/14/08 15:12:35 (4 months ago)

Author:

pmoura

Message:

Small optimizations to thread cancellation.

Files:

• trunk/compiler/logtalk.pl (modified) (12 diffs)

trunk/compiler/logtalk.pl

@@ -13214 +13214 @@
     (   Error == '$lgt_terminated' ->
         '$lgt_mt_threaded_and_exit'(Ids, Results)
-    ;   '$lgt_mt_threaded_call_cancel'(Ids, Results, Id),
+    ;   '$lgt_mt_threaded_call_cancel'(Ids, Results),
         throw(Error)
     ).
@@ -13222 +13222 @@
     '$lgt_mt_threaded_and_add_result'(Results, Id, TGoal, Continue),
     (   Continue == false ->
-        '$lgt_mt_threaded_call_join'(Ids, Results)
+        '$lgt_mt_threaded_call_join'(Ids)
     ;   '$lgt_mt_threaded_and_exit'(Ids, Results)
     ).
@@ -13228 +13228 @@
 '$lgt_mt_threaded_and_exit'(false, Id, Ids, Results) :-
     '$lgt_mt_threaded_record_result'(Results, Id, false),
-    '$lgt_mt_threaded_call_cancel'(Ids, Results, Id),
+    '$lgt_mt_threaded_call_cancel'(Ids, Results),
     fail.
 
@@ -13285 +13285 @@
     (   Error == '$lgt_terminated' ->
         '$lgt_mt_threaded_or_exit'(Ids, Results)
-    ;   '$lgt_mt_threaded_call_cancel'(Ids, Results, Id),
+    ;   '$lgt_mt_threaded_call_cancel'(Ids, Results),
         throw(Error)
     ).
@@ -13292 +13292 @@
     thread_get_message('$lgt_result'(Id, TGoal)),
     '$lgt_mt_threaded_record_result'(Results, Id, true),
-    '$lgt_mt_threaded_call_cancel'(Ids, Results, Id),
+    '$lgt_mt_threaded_call_cancel'(Ids, Results),
     '$lgt_mt_threaded_or_exit_unify'(Results, Id, TGoal).
 
@@ -13300 +13300 @@
         '$lgt_mt_threaded_or_exit'(Ids, Results)
     ;   % all goals failed
-        '$lgt_mt_threaded_call_join'(Ids, Results),
+        '$lgt_mt_threaded_call_join'(Ids),
         fail
     ).
@@ -13332 +13332 @@
 % records a thread goal failure and checks if all other thread goals have failed:
 
-'$lgt_mt_threaded_or_record_failure'([id(Id, _, fail)| Results], Id, Continue) :-
+'$lgt_mt_threaded_or_record_failure'([id(Id, _, false)| Results], Id, Continue) :-
     !,
     (   var(Continue) ->    % we still don't know if there are any pending results
@@ -13339 +13339 @@
     ).
 
-'$lgt_mt_threaded_or_record_failure'([id(_, _, Done)| Results], Id, Continue) :-
-    (   var(Done) ->
+'$lgt_mt_threaded_or_record_failure'([id(_, _, Result)| Results], Id, Continue) :-
+    (   var(Result) ->
         Continue = true     % we found a thread whose result is still pending
     ;   true                % otherwise continue examining the remaining thread results
@@ -13349 +13349 @@
 '$lgt_mt_threaded_or_continue'([], false).
 
-'$lgt_mt_threaded_or_continue'([id(_, _, Done)| Results], Continue) :-
-    (   var(Done) ->
+'$lgt_mt_threaded_or_continue'([id(_, _, Result)| Results], Continue) :-
+    (   var(Result) ->
         % we found a thread whose result is still pending
         Continue = true
@@ -13359 +13359 @@
 
 
-% '$lgt_mt_threaded_call_cancel'(+list(thread_identifier), +list, +thread_identifier)
+% '$lgt_mt_threaded_call_cancel'(+list(thread_identifier), +list)
 %
 % aborts a threaded call by aborting and joining all individual threads;
 % we must use catch/3 as some threads may already be terminated
-
-'$lgt_mt_threaded_call_cancel'(Ids, Results, ProtectedId) :-
-    '$lgt_mt_threaded_call_abort'(Ids, ProtectedId),
-    '$lgt_mt_threaded_call_join'(Ids, Results).
-
-
-'$lgt_mt_threaded_call_abort'([], _).
-
-'$lgt_mt_threaded_call_abort'([ProtectedId| Ids], ProtectedId) :-
-    !,
-    '$lgt_mt_threaded_call_abort'(Ids, ProtectedId).
-
-'$lgt_mt_threaded_call_abort'([Id| Ids], ProtectedId) :-
-    (   catch(thread_peek_message(Id, '$lgt_master'), _, fail) ->
-        catch(thread_send_message(Id, '$lgt_status'(_, terminate)), _, true)
-    ;   catch(thread_signal(Id, '$lgt_mt_thread_abort'), _, true)
-    ),
-    '$lgt_mt_threaded_call_abort'(Ids, ProtectedId).
-
 
 '$lgt_mt_threaded_call_cancel'(Ids, Results) :-
@@ -13402 +13383 @@
 '$lgt_mt_threaded_call_join'([Id| Ids], [id(Id, _, Result)| Results]) :-
     (   var(Result) ->
+        % don't leak thread results
         thread_get_message('$lgt_status'(Id, Result)),
         (   Result == true ->
@@ -13416 +13398 @@
     mutex_unlock_all,
     throw('$lgt_terminated').
+
+
+
+% '$lgt_mt_threaded_call_join'(+list(thread_identifier))
+%
+% join all individual threads; we must use catch/3 as some threads may no longer exist
+
+'$lgt_mt_threaded_call_join'([]).
+
+'$lgt_mt_threaded_call_join'([Id| Ids]) :-
+    catch(thread_join(Id, _), _, true),
+    '$lgt_mt_threaded_call_join'(Ids).