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

fixed some minor issues in c_alarms

Browse Source
This commit is contained in:
Theofrastos Mantadelis 2011-02-01 17:36:34 +01:00
parent 73918e78aa
commit f0c7c76966
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
library/c_alarms.yap
View File

@ -9,9 +9,9 @@
% %
% Contributions to this file: % Contributions to this file:
% Author: Theofrastos Mantadelis % Author: Theofrastos Mantadelis
% Version: 0.1 % Version: 1.0
% Date: 01/02/2011 % Date: 01/02/2011
% Comments: The timer implementation is inspired by Bernd Gutmann timers % Contributions: The timer implementation is inspired by Bernd Gutmann's timers
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
@ -203,7 +203,7 @@
:- module(c_alarms, [set_alarm/3, :- module(c_alarms, [set_alarm/3,
unset_alarm/1, unset_alarm/1,
time_out_call/3, time_out_call_once/3,
timer_start/1, timer_start/1,
timer_restart/1, timer_restart/1,
timer_stop/2, timer_stop/2,
@ -227,15 +227,19 @@
:- use_module(library(lists), [member/2, memberchk/2, delete/3]). :- use_module(library(lists), [member/2, memberchk/2, delete/3]).
:- use_module(library(ordsets), [ord_add_element/3]). :- use_module(library(ordsets), [ord_add_element/3]).
:- use_module(library(apply_macros), [maplist/3]). :- use_module(library(apply_macros), [maplist/3]).
:- dynamic('$timer'/3).
:- meta_predicate(set_alarm(+, 0, -)).
:- meta_predicate(time_out_call_once(+, 0, -)).
:- meta_predicate(prove_once(0)).
:- initialization(local_init). :- initialization(local_init).
local_init:- local_init:-
bb_put(alarms, []), bb_put(alarms, []),
bb_put(identity, 0). bb_put(identity, 0).
:- meta_predicate(set_alarm(+, 0, -)).
:- meta_predicate(time_out_call(+, 0, -)).
get_next_identity(ID):- get_next_identity(ID):-
bb_get(identity, ID), bb_get(identity, ID),
NID is ID + 1, NID is ID + 1,
@ -312,13 +316,12 @@ execute([alarm(_, _, Execute)|R]):-
call(Execute), call(Execute),
execute(R). execute(R).
time_out_call(Seconds, Goal, Return):- time_out_call_once(Seconds, Goal, Return):-
bb_get(identity, ID), bb_get(identity, ID),
set_alarm(Seconds, throw(timeout(ID)), ID),
catch(( catch((
(set_alarm(Seconds, throw(timeout(ID)), ID) ; unset_alarm(ID), fail), prove_once(Goal, Return),
Goal, unset_alarm(ID))
unset_alarm(ID),
Return = success)
, Exception, ( , Exception, (
(Exception == timeout(ID) -> (Exception == timeout(ID) ->
Return = timeout Return = timeout
@ -327,7 +330,9 @@ time_out_call(Seconds, Goal, Return):-
throw(Exception) throw(Exception)
))). ))).
:- dynamic('$timer'/3). prove_once(Goal, success):-
once(Goal).
prove_once(_Goal, failure).
timer_start(Name):- timer_start(Name):-
\+ ground(Name), \+ ground(Name),