diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make thread_property/2 deterministic when the second argument is instantiated

Browse Source
This commit is contained in:
Paulo Moura 2013-11-11 17:11:53 +00:00
parent 16e3bda666
commit 2314efdc6c
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pl/threads.yap
View File

@ -858,7 +858,7 @@ thread_signal(Id, Goal) :-
thread_property(Prop) :- thread_property(Prop) :-
'$check_thread_property'(Prop, thread_property(Prop)), '$check_thread_property'(Prop, thread_property(Prop)),
'$thread_self'(Id), '$thread_self'(Id),
'$thread_property'(Id, Prop). '$thread_property'(Prop, Id).
thread_property(Id, Prop) :- thread_property(Id, Prop) :-
( nonvar(Id) -> ( nonvar(Id) ->
@ -867,7 +867,7 @@ thread_property(Id, Prop) :-
), ),
'$check_thread_property'(Prop, thread_property(Id, Prop)), '$check_thread_property'(Prop, thread_property(Id, Prop)),
'$thread_id_alias'(Id0, Id), '$thread_id_alias'(Id0, Id),
'$thread_property'(Id0, Prop). '$thread_property'(Prop, Id0).
'$enumerate_threads'(Id) :- '$enumerate_threads'(Id) :-
'$max_threads'(Max), '$max_threads'(Max),
@ -875,32 +875,31 @@ thread_property(Id, Prop) :-
between(0,Max1,Id), between(0,Max1,Id),
'$thread_stacks'(Id, _, _, _). '$thread_stacks'(Id, _, _, _).
'$thread_property'(Id, alias(Alias)) :- '$thread_property'(alias(Alias), Id) :-
recorded('$thread_alias', [Id|Alias], _). recorded('$thread_alias', [Id|Alias], _).
'$thread_property'(Id, status(Status)) :- '$thread_property'(status(Status), Id) :-
'$mk_tstatus_key'(Id, Key), '$mk_tstatus_key'(Id, Key),
( recorded(Key, Exit, _) -> ( recorded(Key, Exit, _) ->
Status = Exit Status = Exit
; Status = running ; Status = running
). ).
'$thread_property'(Id, detached(Detached)) :- '$thread_property'(detached(Detached), Id) :-
( '$thread_detached'(Id,Detached) -> true ; Detached = false ). ( '$thread_detached'(Id,Detached) -> true ; Detached = false ).
'$thread_property'(Id, at_exit(M:G)) :- '$thread_property'(at_exit(M:G), Id) :-
'$thread_run_at_exit'(G,M). '$thread_run_at_exit'(G,M).
'$thread_property'(Id, InfoSize) :- '$thread_property'(stack(Stack), Id) :-
'$thread_stacks'(Id, Stack, Trail, System), '$thread_stacks'(Id, Stack, _, _).
'$select_thread_property'(InfoSize, Stack, Trail, System). '$thread_property'(trail(Trail), Id) :-
'$thread_stacks'(Id, _, Trail, _).
'$select_thread_property'(stack(Stack), Stack, _, _). '$thread_property'(system(System), Id) :-
'$select_thread_property'(trail(Trail), _, Trail, _). '$thread_stacks'(Id, _, _, System).
'$select_thread_property'(system(System), _, _, System).
threads :- threads :-
format(user_error,'------------------------------------------------------------------------~n',[]), format(user_error,'------------------------------------------------------------------------~n',[]),
format(user_error, '~t~a~48+~n', 'Thread Detached Status'), format(user_error, '~t~a~48+~n', 'Thread Detached Status'),
format(user_error,'------------------------------------------------------------------------~n',[]), format(user_error,'------------------------------------------------------------------------~n',[]),
thread_property(Id, detached(Detached)), thread_property(Id, detached(Detached)),
'$thread_property'(Id, status(Status)), thread_property(Id, status(Status)),
'$thread_id_alias'(Id, Alias), '$thread_id_alias'(Id, Alias),
format(user_error,'~t~q~30+~33|~w~42|~q~n', [Alias, Detached, Status]), format(user_error,'~t~q~30+~33|~w~42|~q~n', [Alias, Detached, Status]),
fail. fail.