dmbcs/mcron
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

job-specifier: Use 'inf' thunk.

Browse source 
* src/mcron/job-specifier.scm (%find-best-next): Call 'inf' thunk
instead of defining an arbitrary high integer.
(bump-time): Adapt to it.
This commit is contained in:
Mathieu Lirzin 2016-07-17 19:18:29 +02:00
commit ae6deb8ea2
No known key found for this signature in database
GPG key ID: 0ADEE10094604D37
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/mcron/job-specifier.scm
View file

@ -50,11 +50,11 @@ go into the list. For example, (range 1 6 2) returns '(1 3 5)."
(unfold (cut >= <> end) identity (cute + <> (max step 1)) start)) (unfold (cut >= <> end) identity (cute + <> (max step 1)) start))
(define (%find-best-next current next-list) (define (%find-best-next current next-list)
;; Takes a value and a list of possible next values (all assumed less than ;; Takes a value and a list of possible next values. It returns a pair
;; 9999). It returns a pair consisting of the smallest element of the ;; consisting of the smallest element of the NEXT-LIST, and the smallest
;; NEXT-LIST, and the smallest element larger than the CURRENT value. If an ;; element larger than the CURRENT value. If an example of the latter
;; example of the latter cannot be found, 9999 will be returned. ;; cannot be found, +INF.0 will be returned.
(let loop ((smallest 9999) (closest+ 9999) (lst next-list)) (let loop ((smallest (inf)) (closest+ (inf)) (lst next-list))
(match lst (match lst
(() (cons smallest closest+)) (() (cons smallest closest+))
((time . rest) ((time . rest)
@ -83,7 +83,7 @@ go into the list. For example, (range 1 6 2) returns '(1 3 5)."
(if (null? value-list) (if (null? value-list)
(set-component! time (+ (component time) 1)) (set-component! time (+ (component time) 1))
(let ((best-next (%find-best-next (component time) (car value-list)))) (let ((best-next (%find-best-next (component time) (car value-list))))
(if (eqv? 9999 (cdr best-next)) (if (inf? (cdr best-next))
(begin (begin
(set-higher-component! time (+ (higher-component time) 1)) (set-higher-component! time (+ (higher-component time) 1))
(set-component! time (car best-next))) (set-component! time (car best-next)))