X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=loopy.scm;h=b93a1debbfab0bc6701c3b536394f3442c353c30;hb=e0499fb27f966a6c81679e9d83260164197e5ff7;hp=7172e9b57b3a6d7cefcaad6fe29c00248f3c6bd1;hpb=7ff622de68d583e0dccc400aa887b8f52c7c592e;p=8sync.git

diff --git a/loopy.scm b/loopy.scm
index 7172e9b..b93a1de 100644
--- a/loopy.scm
+++ b/loopy.scm
@@ -4,29 +4,37 @@
   #: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-<=
 
-            make-schedule
+            <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))
 
@@ -169,7 +177,7 @@
 (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)
@@ -200,10 +208,18 @@
 (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))
+
 
 
 ;;; Port handling
@@ -235,6 +251,29 @@
   (not (port-mapping-empty? port-mapping)))
 
 
+
+;;; 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))
+
 
 ;;; Execution of agenda, and current agenda
 ;;; =======================================
@@ -274,6 +313,8 @@ based on the results"
                 (enq! next-queue new-proc))))
         ;; @@: 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)
            (enqueue new-proc))
           (((? procedure? new-procs) ...)