Changeset 4305

Timestamp:

06/08/08 10:03:53 (4 months ago)

Author:

pmoura

Message:

Corrected a bug in the implementation of the built-in meta-predicate threaded/1 when canceling individual threads when one of them terminates with an exception or a failure.

Location:

trunk

Files:

• compiler/logtalk.pl (modified) (8 diffs)
• RELEASE_NOTES.txt (modified) (1 diff)

trunk/compiler/logtalk.pl

@@ -7409 +7409 @@
 % translates the argument of a call to the built-in predicate threaded/1
 
-'$lgt_tr_threaded_call'((TGoal; TGoals), ThreadedCall) :-
+'$lgt_tr_threaded_call'((TGoal; TGoals), catch(ThreadedCall, '$lgt_terminated', fail)) :-
     !,
     '$lgt_tr_threaded_or_call'((TGoal; TGoals), Queue, MTGoals, Ids, Results),
@@ -7418 +7418 @@
                     ).
 
-'$lgt_tr_threaded_call'((TGoal, TGoals), ThreadedCall) :-
+'$lgt_tr_threaded_call'((TGoal, TGoals), catch(ThreadedCall, '$lgt_terminated', fail)) :-
     !,
     '$lgt_tr_threaded_and_call'((TGoal, TGoals), Queue, MTGoals, Ids, Results),
@@ -13204 +13204 @@
 
 '$lgt_mt_threaded_and_exit'(terminate, _, Ids, _) :-
-    '$lgt_mt_threaded_call_cancel'(Ids).
-
-'$lgt_mt_threaded_and_exit'(exception(Error), _, Ids, _) :-
-    '$lgt_mt_threaded_call_cancel'(Ids, Error),
-    throw(Error).
+    '$lgt_mt_threaded_call_cancel'(Ids),
+    throw('$lgt_terminated').
+
+'$lgt_mt_threaded_and_exit'(exception(Error), Id, Ids, Results) :-
+    (   Error == '$lgt_terminated' ->
+        '$lgt_mt_threaded_and_exit'(Ids, Results)
+    ;   '$lgt_mt_threaded_call_cancel'(Ids, Id),
+        throw(Error)
+    ).
 
 '$lgt_mt_threaded_and_exit'(true, Id, Ids, Results) :-
@@ -13218 +13222 @@
     ).
 
-'$lgt_mt_threaded_and_exit'(false, _, Ids, _) :-
-    '$lgt_mt_threaded_call_cancel'(Ids),
+'$lgt_mt_threaded_and_exit'(false, Id, Ids, _) :-
+    '$lgt_mt_threaded_call_cancel'(Ids, Id),
     fail.
 
@@ -13266 +13270 @@
 
 '$lgt_mt_threaded_or_exit'(terminate, _, Ids, _) :-
-    '$lgt_mt_threaded_call_cancel'(Ids).
-
-'$lgt_mt_threaded_or_exit'(exception(Error), _, Ids, _) :-
-    '$lgt_mt_threaded_call_cancel'(Ids, Error),
-    throw(Error).
+    '$lgt_mt_threaded_call_cancel'(Ids),
+    throw('$lgt_terminated').
+
+'$lgt_mt_threaded_or_exit'(exception(Error), Id, Ids, Results) :-
+    (   Error == '$lgt_terminated' ->
+        '$lgt_mt_threaded_or_exit'(Ids, Results)
+    ;   '$lgt_mt_threaded_call_cancel'(Ids, Id),
+        throw(Error)
+    ).
 
 '$lgt_mt_threaded_or_exit'(true, Id, Ids, Results) :-
     thread_get_message('$lgt_result'(Id, TGoal)),
-    '$lgt_mt_threaded_call_cancel'(Ids),
+    '$lgt_mt_threaded_call_cancel'(Ids, Id),
     '$lgt_mt_threaded_or_exit_unify'(Results, Id, TGoal).
 
@@ -13329 +13337 @@
 
 
-% '$lgt_mt_threaded_call_abort'(+list(thread_identifier))
+% '$lgt_mt_threaded_call_cancel'(+list(thread_identifier), thread_identifier)
 %
 % 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, ProtectedId) :-
+    '$lgt_mt_threaded_call_abort'(Ids, ProtectedId),
+    '$lgt_mt_threaded_call_join'(Ids).
+
+
+'$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) :-
@@ -13344 +13371 @@
     (   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'(abort)), _, true)
+    ;   catch(thread_signal(Id, '$lgt_mt_thread_abort'), _, true)
     ),
     '$lgt_mt_threaded_call_abort'(Ids).
-
-
-'$lgt_mt_threaded_call_cancel'(Ids, Error) :-
-    '$lgt_mt_threaded_call_abort'(Ids, Error),
-    '$lgt_mt_threaded_call_join'(Ids).
-
-
-'$lgt_mt_threaded_call_abort'([], _).
-
-'$lgt_mt_threaded_call_abort'([Id| Ids], Error) :-
-    (   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'(Error)), _, true)
-    ),
-    '$lgt_mt_threaded_call_abort'(Ids, Error).
 
 
@@ -13371 +13383 @@
 
 
-'$lgt_mt_thread_abort'(Error) :-
+'$lgt_mt_thread_abort' :-
     mutex_unlock_all,
-    throw(Error).
+    throw('$lgt_terminated').
 
 

trunk/RELEASE_NOTES.txt

@@ -22 +22 @@
     Updated the Logtalk runtime error handler to test for non-instantiated 
     exception terms. Thanks to Joerg Schuster for the bug report.
+
+    Corrected a bug in the implementation of the built-in meta-predicate 
+    threaded/1 when canceling individual threads when one of them terminates 
+    with an exception or a failure.
 
     Added a new default compiler option, multifile_directive, to all config