X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=loopy.scm;h=3954fea34a853c82e49726eaf40329f2a4509ba7;hb=a012234d31abba1bcf26265fdaadce66356c4dc9;hp=389d8e7a20dfe1583a8a911e47e39524eb4223eb;hpb=b990dc5b4ff43cf5b4f47b7f9fd2274f6bf16b83;p=8sync.git

diff --git a/loopy.scm b/loopy.scm
index 389d8e7..3954fea 100644
--- a/loopy.scm
+++ b/loopy.scm
@@ -18,7 +18,7 @@
             time-< time-= time-<= time-+
 
             <time-delta>
-            make-time-delta time-delta?
+            make-time-delta tdelta time-delta?
             time-delta-sec time-delta-usec
 
             <schedule>
@@ -90,7 +90,7 @@
 
 ;;; This is where we handle timed events for the future
 
-;; This section totally borrows from SICP
+;; This section totally borrows from the ideas in SICP
 ;; <3 <3 <3
 
 ;; NOTE: time is a cons of (seconds . microseconds)
@@ -141,6 +141,8 @@
 (define* (make-time-delta sec #:optional usec)
   (make-time-delta-intern sec (or usec 0)))
 
+(define tdelta make-time-delta)
+
 (define (time-+ time time-delta)
   (cons (+ (car time) (time-delta-sec time-delta))
         (+ (cdr time) (time-delta-usec time-delta))))
@@ -158,7 +160,7 @@
 ;;   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)
+(define (schedule-add! schedule time proc)
   (let ((time (time-segment-right-format time)))
     (define (new-time-segment)
       (let ((new-segment
@@ -303,7 +305,7 @@
 
 (define* (start-agenda agenda #:optional stop-condition)
   (let loop ((agenda agenda))
-    (let ((new-agenda   
+    (let ((agenda   
            ;; @@: Hm, maybe here would be a great place to handle
            ;;   select'ing on ports.
            ;;   We could compose over agenda-run-once and agenda-read-ports
@@ -311,12 +313,18 @@
              (agenda-run-once agenda))))
       (if (and stop-condition (stop-condition agenda))
           'done
-          (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))))))
+          (let* ((new-time (gettimeofday))
+                 (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 agenda (agenda-time) new-time)))
+            ;; Update the agenda's current queue based on
+            ;; currently applicable time segments
+            (add-segments-contents-to-queue!
+             (schedule-extract-until! (agenda-schedule agenda) new-time)
+             (agenda-queue agenda))
+            (loop agenda))))))
 
 (define (agenda-run-once agenda)
   "Run once through the agenda, and produce a new agenda
@@ -336,16 +344,21 @@ based on the results"
              (proc-result (call-proc proc))
              (enqueue
               (lambda (run-request)
-                (match (run-request-when run-request)
-                  ((? time-delta? _)
-                   (error "TODO"))
-                  ((? integer? sec)
-                   (let ((time (cons sec 0)))
-                     (error "Also TODO")))
-                  (((? integer? sec) . (? integer? usec))
-                   (error "Also also TODO"))
-                  (#f
-                   (enq! next-queue (run-request-proc run-request)))))))
+                (define (schedule-at! time proc)
+                  (schedule-add! (agenda-schedule agenda) time proc))
+                (let ((request-time (run-request-when run-request)))
+                  (match request-time
+                    ((? time-delta? time-delta)
+                     (let ((time (time-+ (agenda-time agenda)
+                                         time-delta)))
+                       (schedule-at! time (run-request-proc run-request))))
+                    ((? integer? sec)
+                     (let ((time (cons sec 0)))
+                       (schedule-at! time (run-request-proc run-request))))
+                    (((? integer? sec) . (? integer? usec))
+                     (schedule-at! request-time (run-request-proc run-request)))
+                    (#f
+                     (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
@@ -359,6 +372,7 @@ based on the results"
             new-procs))
           ;; do nothing
           (_ #f))))
-    ;; TODO: Selecting on ports would happen here?
+    ;; TODO: Alternately, we could return the next-queue
+    ;;   along with changes to be added to the schedule here?
     ;; Return new agenda, with next queue set
     (set-field agenda (agenda-queue) next-queue)))