X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=loopy.scm;h=a77b7927d835886527c999168a6d5dfd1b87a195;hb=54436fdab23d09ee5e0c8976e584a32a3c0eca34;hp=3db157d4cf3f05ca18e8a06135d96a9dd97c04a1;hpb=3d3254bb7e398a28b6eb2f7596836684b897aeb0;p=8sync.git

diff --git a/loopy.scm b/loopy.scm
index 3db157d..a77b792 100644
--- a/loopy.scm
+++ b/loopy.scm
@@ -4,33 +4,52 @@
              (ice-9 match))
 
 ;; @@: Using immutable agendas here, so wouldn't it make sense to
-;;   replace this
+;;   replace this queue stuff with using pfds based immutable queues?
 
 (define-immutable-record-type <agenda>
-  (make-agenda queue)
+  (make-agenda-intern queue prompt-tag)
   agenda?
-  (queue agenda-queue))
+  (queue agenda-queue)
+  (prompt-tag agenda-prompt-tag))
 
-(define %current-agenda
-  (make-parameter (make-agenda (make-q))))
+(define (make-async-prompt-tag)
+  (make-prompt-tag "prompt"))
+
+(define* (make-agenda #:key
+                      (queue (make-q))
+                      (prompt (make-prompt-tag)))
+  (make-agenda-intern queue prompt))
+
+(define %current-agenda (make-parameter #f))
 
 (define* (start-agenda agenda #:optional stop-condition)
   (let loop ((agenda agenda))
-    (let ((new-agenda
-           (agenda-run-once agenda)))
-      (%current-agenda new-agenda)
-      (if (and stop-condition (stop-condition))
+    (let ((new-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
+           (parameterize ((%current-agenda agenda))
+             (agenda-run-once agenda))))
+      (if (and stop-condition (stop-condition agenda))
           'done
           (loop new-agenda)))))
 
 (define (agenda-run-once agenda)
   "Run once through the agenda, and produce a new agenda
 based on the results"
+  (define (call-proc proc)
+    (call-with-prompt
+        (agenda-prompt-tag agenda)
+      (lambda ()
+        (proc))
+      ;; TODO
+      (lambda (k) k)))
+
   (let ((queue (agenda-queue agenda))
         (next-queue (make-q)))
     (while (not (q-empty? queue))
       (let* ((proc (q-pop! queue))
-             (proc-result (proc))
+             (proc-result (call-proc proc))
              (enqueue
               (lambda (new-proc)
                 (enq! next-queue new-proc))))
@@ -38,11 +57,11 @@ based on the results"
         (match proc-result
           ((? procedure? new-proc)
            (enqueue new-proc))
-          (((? procedure? new-procs) ..)
+          (((? procedure? new-procs) ...)
            (for-each
             (lambda (new-proc)
               (enqueue new-proc))
-            new-procs)))
-        ;; TODO: Selecting on ports would happen here?
-        ;; Return new agenda, with next queue set
-        (set-field agenda (agenda-queue) next-queue)))))
+            new-procs)))))
+    ;; TODO: Selecting on ports would happen here?
+    ;; Return new agenda, with next queue set
+    (set-field agenda (agenda-queue) next-queue)))