From e555c00287126c92193fddeb5cfec72a688c4967 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Mon, 3 Mar 2008 02:22:27 -0600 Subject: [PATCH 1/4] Fix alarms bug --- extra/alarms/alarms-tests.factor | 17 +++++++++++++++++ extra/alarms/alarms.factor | 5 ++--- 2 files changed, 19 insertions(+), 3 deletions(-) create mode 100755 extra/alarms/alarms-tests.factor diff --git a/extra/alarms/alarms-tests.factor b/extra/alarms/alarms-tests.factor new file mode 100755 index 0000000000..1af851c9c6 --- /dev/null +++ b/extra/alarms/alarms-tests.factor @@ -0,0 +1,17 @@ +IN: alarms.tests +USING: alarms kernel calendar sequences tools.test threads +concurrency.count-downs ; + +[ ] [ + 1 + { 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 diff --git a/extra/alarms/alarms.factor b/extra/alarms/alarms.factor index d008b7b462..1ccfdcbd30 100755 --- a/extra/alarms/alarms.factor +++ b/extra/alarms/alarms.factor @@ -37,8 +37,8 @@ SYMBOL: alarm-thread register-alarm ; : call-alarm ( alarm -- ) - dup alarm-quot try dup alarm-entry box> drop + dup alarm-quot try dup alarm-interval [ reschedule-alarm ] [ drop ] if ; : (trigger-alarms) ( alarms now -- ) @@ -46,8 +46,7 @@ SYMBOL: alarm-thread 2drop ] [ over heap-peek drop over alarm-expired? [ - over heap-pop drop call-alarm - (trigger-alarms) + over heap-pop drop call-alarm (trigger-alarms) ] [ 2drop ] if From e95a79b50c8d0c9333f43ba6a5e02358113f31ec Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Mon, 3 Mar 2008 04:52:38 -0600 Subject: [PATCH 2/4] builder: minor cleanup --- extra/builder/builder.factor | 2 -- 1 file changed, 2 deletions(-) diff --git a/extra/builder/builder.factor b/extra/builder/builder.factor index 0d5f4292b7..ecce3275cb 100644 --- a/extra/builder/builder.factor +++ b/extra/builder/builder.factor @@ -43,8 +43,6 @@ IN: builder ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -! : target ( -- target ) { os [ cpu "." split ] } to-strings "-" join ; - : make-vm ( -- desc ) { "make" } >>arguments From 8bce800b4a77537735876040c7dc1a0278eb25b6 Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Mon, 3 Mar 2008 04:56:39 -0600 Subject: [PATCH 3/4] builder: show git-id in report --- extra/builder/builder.factor | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extra/builder/builder.factor b/extra/builder/builder.factor index ecce3275cb..fbe4f6149f 100644 --- a/extra/builder/builder.factor +++ b/extra/builder/builder.factor @@ -108,7 +108,8 @@ SYMBOL: build-status "Build machine: " write host-name print "CPU: " write cpu print "OS: " write os print - "Build directory: " write cwd print nl + "Build directory: " write cwd print + "git id: " write "git-id" eval-file print git-clone [ "git clone failed" print ] run-or-bail From e8f72a61dca7a048be801ab00af8465bc4fb8c7d Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Mon, 3 Mar 2008 05:02:59 -0600 Subject: [PATCH 4/4] builder: fix bug --- extra/builder/builder.factor | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extra/builder/builder.factor b/extra/builder/builder.factor index fbe4f6149f..92cd5f5241 100644 --- a/extra/builder/builder.factor +++ b/extra/builder/builder.factor @@ -109,7 +109,6 @@ SYMBOL: build-status "CPU: " write cpu print "OS: " write os print "Build directory: " write cwd print - "git id: " write "git-id" eval-file print git-clone [ "git clone failed" print ] run-or-bail @@ -126,6 +125,8 @@ SYMBOL: build-status "test-log" delete-file + "git id: " write "git-id" eval-file print nl + "Boot time: " write "boot-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