#:use-module (ice-9 q)
#:use-module (ice-9 match)
#:use-module (ice-9 receive)
- #:export (make-agenda
- agenda?
+ #:export (<agenda>
+ make-agenda agenda?
agenda-queue agenda-prompt-tag
agenda-port-pmapping agenda-schedule
make-async-prompt-tag
- make-time-segment
- time-segment?
+ <time-segment>
+ make-time-segment time-segment?
time-segment-time time-segment-queue
- time-< time-= time-<=
+ time-< time-= time-<= time-+
- make-schedule
+ <time-delta>
+ make-time-delta time-delta?
+ time-delta-sec time-delta-usec
+
+ <schedule>
+ make-schedule schedule?
schedule-add! schedule-empty?
schedule-segments
- schedule-segments-until schedule-extract-until!
+ schedule-segments-split schedule-extract-until!
+ add-segments-contents-to-queue!
make-port-mapping
port-mapping-set! port-mapping-remove!
port-mapping-empty? port-mapping-non-empty?
+ <run-request>
+ make-run-request run-request?
+ run-request-proc run-request-when
+
+ run wrap run-wrap run-wrap-at
+
%current-agenda
start-agenda agenda-run-once))
;;; and with reasonable separation from functional components?
(define-immutable-record-type <agenda>
- (make-agenda-intern queue prompt-tag port-mapping schedule)
+ (make-agenda-intern queue prompt-tag port-mapping schedule time)
agenda?
(queue agenda-queue)
(prompt-tag agenda-prompt-tag)
(port-mapping agenda-port-mapping)
- (schedule agenda-schedule))
+ (schedule agenda-schedule)
+ (time agenda-time))
(define (make-async-prompt-tag)
(make-prompt-tag "prompt"))
(queue (make-q))
(prompt (make-prompt-tag))
(port-mapping (make-port-mapping))
- (schedule (make-schedule)))
- (make-agenda-intern queue prompt port-mapping schedule))
+ (schedule (make-schedule))
+ (time (gettimeofday)))
+ (make-agenda-intern queue prompt port-mapping schedule time))
\f
(or (time-< time1 time2)
(time-= time1 time2)))
+
+(define-record-type <time-delta>
+ (make-time-delta-intern sec usec)
+ time-delta?
+ (sec time-delta-sec)
+ (usec time-delta-usec))
+
+(define* (make-time-delta sec #:optional usec)
+ (make-time-delta-intern sec (or usec 0)))
+
+(define (time-+ time time-delta)
+ (cons (+ (car time) (time-delta-sec time-delta))
+ (+ (cdr time) (time-delta-usec time-delta))))
+
+
(define-record-type <schedule>
(make-schedule-intern segments)
schedule?
(define (schedule-empty? schedule)
(eq? (schedule-segments schedule) '()))
-(define (schedule-segments-until schedule time)
+(define (schedule-segments-split schedule time)
"Does a multiple value return of time segments before/at and after TIME"
(let ((time (time-segment-right-format time)))
(define (segment-is-now? segment)
(define (schedule-extract-until! schedule time)
"Extract all segments until TIME from SCHEDULE, and pop old segments off"
(receive (segments-before segments-after)
- (schedule-split-segments-until schedule time)
+ (schedule-segments-split schedule time)
(set-schedule-segments! schedule segments-after)
segments-before))
+(define (add-segments-contents-to-queue! segments queue)
+ (for-each
+ (lambda (segment)
+ (let ((seg-queue (time-segment-queue segment)))
+ (while (not (q-empty? seg-queue))
+ (enq! queue (deq! seg-queue)))))
+ segments))
+
\f
;;; Port handling
(not (port-mapping-empty? port-mapping)))
+\f
+;;; Request to run stuff
+;;; ====================
+
+(define-record-type <run-request>
+ (make-run-request proc when)
+ run-request?
+ (proc run-request-proc)
+ (when run-request-when))
+
+(define* (run proc #:optional when)
+ (make-run-request proc when))
+
+(define-syntax-rule (wrap body ...)
+ (lambda ()
+ body ...))
+
+(define-syntax-rule (run-wrap body ...)
+ (run (wrap body ...)))
+
+(define-syntax-rule (run-wrap-at body ... when)
+ (run (wrap body ...) when))
+
\f
;;; Execution of agenda, and current agenda
;;; =======================================
(agenda-run-once agenda))))
(if (and stop-condition (stop-condition agenda))
'done
- (loop new-agenda)))))
+ (let ((updated-agenda
+ ;; 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 new-agenda (agenda-time) (gettimeofday))))
+ (loop updated-agenda))))))
(define (agenda-run-once agenda)
"Run once through the agenda, and produce a new agenda
(let* ((proc (q-pop! queue))
(proc-result (call-proc proc))
(enqueue
- (lambda (new-proc)
- (enq! next-queue new-proc))))
+ (lambda (run-request)
+ (cond
+ ((run-request-when run-request)
+ (error "TODO"))
+ (else
+ (enq! next-queue (run-request-proc run-request)))))))
;; @@: We might support delay-wrapped procedures here
(match proc-result
- ((? procedure? new-proc)
+ ;; TODO: replace procedure with something that indicates
+ ;; intent to run. Use a (run foo) procedure
+ ((? run-request? new-proc)
(enqueue new-proc))
- (((? procedure? new-procs) ...)
+ (((? run-request? new-procs) ...)
(for-each
(lambda (new-proc)
(enqueue new-proc))