Add time to the agenda

[8sync.git] / loopy.scm

diff --git a/loopy.scm b/loopy.scm
index 73ef5682a91ad6fb80a2ec2e337055653bd9f3c3..6f1516fdb51449be60c4c952b2d024b97369e968 100644 (file)
--- 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-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))
 
@@ -52,12 +60,13 @@
 ;;;    and with reasonable separation from functional components?
 
 (define-immutable-record-type <agenda>
-  (make-agenda-intern queue prompt-tag port-mapping schedule)
+  (make-agenda-intern queue prompt-tag port-mapping schedule time)
   agenda?
   (queue agenda-queue)
   (prompt-tag agenda-prompt-tag)
   (port-mapping agenda-port-mapping)
-  (schedule agenda-schedule))
+  (schedule agenda-schedule)
+  (time agenda-time))
 
 (define (make-async-prompt-tag)
   (make-prompt-tag "prompt"))
@@ -66,8 +75,9 @@
                       (queue (make-q))
                       (prompt (make-prompt-tag))
                       (port-mapping (make-port-mapping))
-                      (schedule (make-schedule)))
-  (make-agenda-intern queue prompt port-mapping schedule))
+                      (schedule (make-schedule))
+                      (time (gettimeofday)))
+  (make-agenda-intern queue prompt port-mapping schedule time))
 
 
 \f
@@ -204,6 +214,14 @@
     (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
 ;;; Port handling
@@ -235,6 +253,29 @@
   (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
 ;;; =======================================
@@ -251,7 +292,11 @@
              (agenda-run-once agenda))))
       (if (and stop-condition (stop-condition agenda))
           'done
-          (loop new-agenda)))))
+          (loop
+           ;; 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)))))))
 
 (define (agenda-run-once agenda)
   "Run once through the agenda, and produce a new agenda
@@ -270,13 +315,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))