(define (time-minus time1 time2)
(time-carry-correct
(cons (- (car time1) (car time2))
- (- (car time2) (cdr time2)))))
+ (- (cdr time2) (cdr time2)))))
(define (time-plus time1 time2)
(time-carry-correct
(cons (+ (car time1) (car time2))
- (+ (car time2) (cdr time2)))))
+ (+ (cdr time2) (cdr time2)))))
(define-record-type <schedule>
(cons 0 0))
(soonest-time ; ie, the agenda is non-empty
(let* ((current-time (agenda-time agenda)))
- (if (time<= (pk 'soonest-time soonest-time) (pk 'current-time current-time))
+ (if (time<= soonest-time current-time)
;; Well there's something due so let's select
;; (this avoids a (possible?) race condition chance)
(cons 0 0)
- (pk 'time-minus (time-minus soonest-time current-time)))))
+ (time-minus soonest-time current-time))))
(else
(cons #f #f)))))
(define (do-select)
(agenda-run-once agenda))))
(if (and stop-condition (stop-condition agenda))
'done
- (let* ((new-time (get-time))
- (agenda
- (handle-ports
- ;; Adjust the agenda's time just in time
- ;; We do this here rather than in agenda-run-once to make
- ;; agenda-run-once's behavior fairly predictable
- (set-field agenda (agenda-time) new-time))))
+ (let* ((agenda
+ ;; We have to update the time after ports handled, too
+ ;; because it may have changed after a select
+ (set-field
+ (handle-ports
+ ;; Adjust the agenda's time just in time
+ ;; We do this here rather than in agenda-run-once to make
+ ;; agenda-run-once's behavior fairly predictable
+ (set-field agenda (agenda-time) (get-time)))
+ (agenda-time) (get-time))))
;; Update the agenda's current queue based on
;; currently applicable time segments
(add-segments-contents-to-queue!
- (schedule-extract-until! (agenda-schedule agenda) new-time)
+ (schedule-extract-until! (agenda-schedule agenda) (agenda-time agenda))
(agenda-queue agenda))
(loop agenda))))))