#:use-module (srfi srfi-9 gnu)
#:use-module (ice-9 q)
#:use-module (ice-9 match)
- #:export (make-agenda
- agenda?
+ #:use-module (ice-9 receive)
+ #: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-<=
- make-schedule
+ <schedule>
+ make-schedule schedule?
schedule-add! schedule-empty?
+ schedule-segments
+
+ 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))
(define (time-segment-right-format time)
(match time
;; time is already a cons of second and microsecnd
- (((? integer? s) (? integer? u)) time)
+ (((? integer? s) . (? integer? u)) time)
;; time was just an integer (just the second)
((? integer? _) (cons time 0))
(_ (throw 'invalid-time "Invalid time" time))))
(and (= (car time1) (car time2))
(= (cdr time1) (cdr time2))))
-(define (make-schedule)
- '())
+(define (time-<= time1 time2)
+ (or (time-< time1 time2)
+ (time-= time1 time2)))
+
+(define-record-type <schedule>
+ (make-schedule-intern segments)
+ schedule?
+ (segments schedule-segments set-schedule-segments!))
+(define* (make-schedule #:optional segments)
+ (make-schedule-intern (or segments '())))
+
+;; TODO: This code is reasonably easy to read but it
+;; mutates AND is worst case of O(n) in both space and time :(
+;; but at least it'll be reasonably easy to refactor to
+;; a more functional setup?
(define (schedule-add! time proc schedule)
(let ((time (time-segment-right-format time)))
- (define (belongs-before? segments)
- (or (null? segments)
- (error))
- )
-
- ;; Find and add a schedule segment
- (error)))
+ (define (new-time-segment)
+ (let ((new-segment
+ (make-time-segment time)))
+ (enq! (time-segment-queue new-segment) proc)
+ new-segment))
+ (define (loop segments)
+ (define (segment-equals-time? segment)
+ (time-= time (time-segment-time segment)))
+
+ (define (segment-more-than-time? segment)
+ (time-< time (time-segment-time segment)))
+
+ ;; We could switch this out to be more mutate'y
+ ;; and avoid the O(n) of space... is that over-optimizing?
+ (match segments
+ ;; If we're at the end of the list, time to make a new
+ ;; segment...
+ ('() (cons (new-time-segment) '()))
+ ;; If the segment's time is exactly our time, good news
+ ;; everyone! Let's append our stuff to its queue
+ (((? segment-equals-time? first) rest ...)
+ (enq! (time-segment-queue first) proc)
+ segments)
+ ;; If the first segment is more than our time,
+ ;; ours belongs before this one, so add it and
+ ;; start consing our way back
+ (((? segment-more-than-time? first) rest ...)
+ (cons (new-time-segment) segments))
+ ;; Otherwise, build up recursive result
+ ((first rest ... )
+ (cons first (loop rest)))))
+ (set-schedule-segments!
+ schedule
+ (loop (schedule-segments schedule)))))
(define (schedule-empty? schedule)
- (eq? schedule '()))
+ (eq? (schedule-segments schedule) '()))
+
+(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)
+ (time-= (time-segment-time segment) time))
+ (define (segment-is-before-now? segment)
+ (time-< (time-segment-time segment) time))
+
+ (let loop ((segments-before '())
+ (segments-left (schedule-segments schedule)))
+ (match segments-left
+ ;; end of the line, return
+ ('()
+ (values (reverse segments-before) '()))
+
+ ;; It's right now, so time to stop, but include this one in before
+ ;; but otherwise return
+ (((? segment-is-now? first) rest ...)
+ (values (reverse (cons first segments-before)) rest))
+
+ ;; This is prior or at now, so add it and keep going
+ (((? segment-is-before-now? first) rest ...)
+ (loop (cons first segments-before) rest))
+
+ ;; Otherwise it's past now, just return what we have
+ (segments-after
+ (values segments-before segments-after))))))
+
+(define (schedule-extract-until! schedule time)
+ "Extract all segments until TIME from SCHEDULE, and pop old segments off"
+ (receive (segments-before segments-after)
+ (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
(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
;;; =======================================
(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))
projects / 8sync.git / blobdiff