X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=loopy.scm;h=f11b6b8503b2d235c00544b31956052ff718c28e;hb=68e8784ebff46e4cfe588d6f13593709b51fe242;hp=261e14db704d9323f2ceab82b3a989359e12da7d;hpb=ec22b5b3398c107215b6303ec63dbadb8f77ac76;p=8sync.git diff --git a/loopy.scm b/loopy.scm index 261e14d..f11b6b8 100644 --- a/loopy.scm +++ b/loopy.scm @@ -4,20 +4,21 @@ #:use-module (ice-9 q) #:use-module (ice-9 match) #:use-module (ice-9 receive) - #:export (make-agenda - agenda? + #:export ( + make-agenda agenda? agenda-queue agenda-prompt-tag agenda-port-pmapping agenda-schedule make-async-prompt-tag - make-time-segment - time-segment? + + make-time-segment time-segment? time-segment-time time-segment-queue time-< time-= time-<= - make-schedule + + make-schedule schedule? schedule-add! schedule-empty? schedule-segments @@ -28,6 +29,12 @@ port-mapping-set! port-mapping-remove! port-mapping-empty? port-mapping-non-empty? + + 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)) @@ -244,6 +251,29 @@ (not (port-mapping-empty? port-mapping))) + +;;; Request to run stuff +;;; ==================== + +(define-record-type + (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)) + ;;; Execution of agenda, and current agenda ;;; ======================================= @@ -279,15 +309,19 @@ based on the results" (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 ;; TODO: replace procedure with something that indicates ;; intent to run. Use a (run foo) procedure - ((? procedure? new-proc) + ((? run-request? new-proc) (enqueue new-proc)) - (((? procedure? new-procs) ...) + (((? run-request? new-procs) ...) (for-each (lambda (new-proc) (enqueue new-proc))