X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=loopy.scm;h=f11b6b8503b2d235c00544b31956052ff718c28e;hb=68e8784ebff46e4cfe588d6f13593709b51fe242;hp=96d6a9044a1138ad622aade1c71887638c1639d5;hpb=4cd7520679450b5e85307f7ae1c7c15319a0894f;p=8sync.git

diff --git a/loopy.scm b/loopy.scm
index 96d6a90..f11b6b8 100644
--- a/loopy.scm
+++ b/loopy.scm
@@ -3,27 +3,38 @@
   #: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-<=
 
-            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))
 
@@ -145,7 +156,7 @@
       (match segments
         ;; If we're at the end of the list, time to make a new
         ;; segment...
-        ('() (cons (make-time-segment time) '()))
+        ('() (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 ...)
@@ -166,6 +177,49 @@
 (define (schedule-empty? 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))
+
 
 
 ;;; Port handling
@@ -197,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
 ;;; =======================================
@@ -232,13 +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
-          ((? 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))