Changeset 3842 for trunk/compiler

Timestamp:

09/16/07 01:08:53 (16 months ago)

Author:

pmoura

Message:

Corrected a bug when retrieving multi-threading replies.

Files:

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

trunk/compiler/logtalk.pl

@@ -12364 +12364 @@
         (   Option == ignore ->     % don't bother reporting goal success, failure, or exception
             thread_create(catch(Goal, _, true), _, [detached(true)])
-        ;   Option = once(Tag) ->       % make thread goal deterministic
+        ;   Option = once(Tag) ->   % make thread goal deterministic
             thread_create('$lgt_mt_det_goal'(Queue, Goal, This, Self, Tag), _, [detached(true)])
-        ;   Option = call(Tag) ->
+        ;   Option = call(Tag) ->   % make thread goal non-deterministic
             thread_create('$lgt_mt_non_det_goal'(Queue, Goal, This, Self, Tag), _, [detached(false)])
         ),
@@ -12373 +12373 @@
 
 
-% '$lgt_mt_det_goal'(+message_queue, +callable, +object_identifier, +object_identifier, @nonvar)
+% '$lgt_mt_det_goal'(+atom, +callable, +object_identifier, +object_identifier, @nonvar)
 %
 % processes a deterministic message received by an object's message queue
@@ -12393 +12393 @@
 
 
-% '$lgt_mt_non_det_goal'(+message_queue, +callable, +object_identifier, +object_identifier, @nonvar)
+% '$lgt_mt_non_det_goal'(+atom, +callable, +object_identifier, +object_identifier, @nonvar)
 %
 % processes a non-deterministic message received by an object's message queue
@@ -12482 +12482 @@
 '$lgt_mt_get_reply'(Queue, Goal, Sender, This, Self, Tag) :-
     (   % first check if there is a thread running for proving the goal before proceeding:
-        \+ \+ thread_peek_message(Queue, '$lgt_thread_id'(Type, Goal, This, Self, Tag, Id)) ->
+        thread_peek_message(Queue, '$lgt_thread_id'(Type, Goal, This, Self, Tag, Id)) ->
         % answering thread exists; go ahead and retrieve the solution(s):
-        thread_get_message(Queue, '$lgt_thread_id'(Type, _, This, Self, Tag, Id)),
+        thread_get_message(Queue, '$lgt_thread_id'(Type, Goal, This, Self, Tag, Id)),
         call_cleanup(
             '$lgt_mt_get_reply_aux'(Type, Queue, Goal, This, Self, Tag, Id),