Merge branch 'master' of git://factorcode.org/git/factor

db4
Doug Coleman 2008-03-03 09:16:30 -06:00
commit 8733b2e08b
3 changed files with 22 additions and 6 deletions

View File

@ -0,0 +1,17 @@
IN: alarms.tests
USING: alarms kernel calendar sequences tools.test threads
concurrency.count-downs ;
[ ] [
1 <count-down>
{ f } clone 2dup
[ first cancel-alarm count-down ] 2curry 1 seconds later
swap set-first
await
] unit-test
[ ] [
[
[ resume ] curry instant later drop
] "test" suspend drop
] unit-test

View File

@ -37,8 +37,8 @@ SYMBOL: alarm-thread
register-alarm ; register-alarm ;
: call-alarm ( alarm -- ) : call-alarm ( alarm -- )
dup alarm-quot try
dup alarm-entry box> drop dup alarm-entry box> drop
dup alarm-quot try
dup alarm-interval [ reschedule-alarm ] [ drop ] if ; dup alarm-interval [ reschedule-alarm ] [ drop ] if ;
: (trigger-alarms) ( alarms now -- ) : (trigger-alarms) ( alarms now -- )
@ -46,8 +46,7 @@ SYMBOL: alarm-thread
2drop 2drop
] [ ] [
over heap-peek drop over alarm-expired? [ over heap-peek drop over alarm-expired? [
over heap-pop drop call-alarm over heap-pop drop call-alarm (trigger-alarms)
(trigger-alarms)
] [ ] [
2drop 2drop
] if ] if

View File

@ -43,8 +43,6 @@ IN: builder
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
! : target ( -- target ) { os [ cpu "." split ] } to-strings "-" join ;
: make-vm ( -- desc ) : make-vm ( -- desc )
<process*> <process*>
{ "make" } >>arguments { "make" } >>arguments
@ -110,7 +108,7 @@ SYMBOL: build-status
"Build machine: " write host-name print "Build machine: " write host-name print
"CPU: " write cpu print "CPU: " write cpu print
"OS: " write os print "OS: " write os print
"Build directory: " write cwd print nl "Build directory: " write cwd print
git-clone [ "git clone failed" print ] run-or-bail git-clone [ "git clone failed" print ] run-or-bail
@ -127,6 +125,8 @@ SYMBOL: build-status
"test-log" delete-file "test-log" delete-file
"git id: " write "git-id" eval-file print nl
"Boot time: " write "boot-time" eval-file milli-seconds>time print "Boot time: " write "boot-time" eval-file milli-seconds>time print
"Load time: " write "load-time" eval-file milli-seconds>time print "Load time: " write "load-time" eval-file milli-seconds>time print
"Test time: " write "test-time" eval-file milli-seconds>time print nl "Test time: " write "test-time" eval-file milli-seconds>time print nl