Changeset 4315 for trunk

Timestamp:

06/15/08 09:30:28 (3 months ago)

Author:

pmoura

Message:

Optimized the threaded/1 predicate implementation of competitive or-parallelism.

Files:

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

trunk/compiler/logtalk.pl

@@ -13176 +13176 @@
     thread_self(Id),
     call(Goal),
-    thread_send_message(Queue, '$lgt_result'(Id, Goal)).
+    thread_send_message(Queue, '$lgt_result'(Id, true(Goal))).
 
 
@@ -13189 +13189 @@
 '$lgt_mt_threaded_exit_handler'(Id, Queue) :-
     thread_property(Id, status(Status)),
-    catch(thread_send_message(Queue, '$lgt_status'(Id, Status)), _, thread_detach(Id)).
+    (   Status == true ->
+        true
+    ;   catch(thread_send_message(Queue, '$lgt_result'(Id, Status)), _, thread_detach(Id))
+    ).
 
 
@@ -13199 +13202 @@
 
 '$lgt_mt_threaded_and_exit'(Ids, Results) :-
-    thread_get_message('$lgt_status'(Id, Result)),
+    thread_get_message('$lgt_result'(Id, Result)),
     '$lgt_mt_threaded_and_exit'(Result, Id, Ids, Results).
 
@@ -13218 +13221 @@
     ).
 
-'$lgt_mt_threaded_and_exit'(true, Id, Ids, Results) :-
-    thread_get_message('$lgt_result'(Id, TGoal)),
+'$lgt_mt_threaded_and_exit'(true(TGoal), Id, Ids, Results) :-
     '$lgt_mt_threaded_and_add_result'(Results, Id, TGoal, Continue),
     (   Continue == false ->
@@ -13270 +13272 @@
 
 '$lgt_mt_threaded_or_exit'(Ids, Results) :-
-    thread_get_message('$lgt_status'(Id, Result)),
+    thread_get_message('$lgt_result'(Id, Result)),
     '$lgt_mt_threaded_or_exit'(Result, Id, Ids, Results).
 
@@ -13289 +13291 @@
     ).
 
-'$lgt_mt_threaded_or_exit'(true, Id, Ids, Results) :-
-    thread_get_message('$lgt_result'(Id, TGoal)),
-    '$lgt_mt_threaded_record_result'(Results, Id, true),
-    '$lgt_mt_threaded_call_cancel'(Ids, Results),
-    '$lgt_mt_threaded_or_exit_unify'(Results, Id, TGoal).
+'$lgt_mt_threaded_or_exit'(true(TGoal), Id, Ids, Results) :-
+    '$lgt_mt_threaded_or_exit_unify'(Results, Id, TGoal),
+    '$lgt_mt_threaded_call_cancel'(Ids, Results).
 
 '$lgt_mt_threaded_or_exit'(false, Id, Ids, Results) :-
@@ -13316 +13316 @@
 
 
-% '$lgt_mt_threaded_record_result'(+list, +thread_identifier, +callable)
-%
-% records a thread goal result:
-
-'$lgt_mt_threaded_record_result'([id(Id, _, Result)| _], Id, Result) :-
-    !.
-
-'$lgt_mt_threaded_record_result'([_| Results], Id, Result) :-
-    '$lgt_mt_threaded_record_result'(Results, Id, Result).
-
-
-
 % '$lgt_mt_threaded_or_record_failure'(+list, +thread_identifier, -atom)
 %
@@ -13359 +13347 @@
 
 
+% '$lgt_mt_threaded_record_result'(+list, +thread_identifier, +callable)
+%
+% records a thread goal result:
+
+'$lgt_mt_threaded_record_result'([id(Id, _, Result)| _], Id, Result) :-
+    !.
+
+'$lgt_mt_threaded_record_result'([_| Results], Id, Result) :-
+    '$lgt_mt_threaded_record_result'(Results, Id, Result).
+
+
+
 % '$lgt_mt_threaded_call_cancel'(+list(thread_identifier), +list)
 %
@@ -13373 +13373 @@
 '$lgt_mt_threaded_call_abort'([Id| Ids]) :-
     (   catch(thread_peek_message(Id, '$lgt_master'), _, fail) ->
-        catch(thread_send_message(Id, '$lgt_status'(_, terminate)), _, true)
+        catch(thread_send_message(Id, '$lgt_result'(_, terminate)), _, true)
     ;   catch(thread_signal(Id, throw('$lgt_terminated')), _, true)
     ),
@@ -13383 +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 ->
-            thread_get_message('$lgt_result'(Id, _))
-        ;   true
-        )
+        thread_get_message('$lgt_result'(Id, _))    % don't leak thread results
     ;   true
     ),