X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=loopy.scm;h=22b6ac894aac168b3f6c85258e98f89899e54f70;hb=cc3001a104f7e2f75858737eb930343c4a8b7999;hp=55e3da73650f45368295a07bd33585af5e747431;hpb=eacf68150377aa7e4c9fd8842c04eeb295614995;p=8sync.git diff --git a/loopy.scm b/loopy.scm index 55e3da7..22b6ac8 100644 --- a/loopy.scm +++ b/loopy.scm @@ -1,4 +1,4 @@ -(define-module (loopy agenda) +(define-module (eightsync agenda) #:use-module (srfi srfi-1) #:use-module (srfi srfi-9) #:use-module (srfi srfi-9 gnu) @@ -33,12 +33,22 @@ schedule-segments-split schedule-extract-until! add-segments-contents-to-queue! + %sync 8sync %sync-at 8sync-at %sync-delay 8sync-delay + make-run-request run-request? run-request-proc run-request-when + + make-port-request port-request port-request? + port-request-port + port-request-read port-request-write port-request-except + run-it wrap run run-at run-delay + %port-request %run %run-at %run-delay + 8port-request 8run 8run-at 8run-delay + %current-agenda start-agenda agenda-run-once)) @@ -325,7 +335,7 @@ Will produce (0 . 0) instead of a negative number, if needed." ;;; Request to run stuff ;;; ==================== -(define-immutable-record-type +(define-record-type (make-run-request proc when) run-request? (proc run-request-proc) @@ -357,6 +367,25 @@ Will produce (0 . 0) instead of a negative number, if needed." (make-run-request (wrap body ...) (tdelta delay-time))) +;; A request to set up a port with at least one of read, write, except +;; handling processes + +(define-record-type + (make-port-request-intern port read write except) + port-request? + (port port-request-port) + (read port-request-read) + (write port-request-write) + (except port-request-except)) + +(define* (make-port-request port #:key read write except) + (if (not (or read write except)) + (throw 'no-port-handler-given "No port handler given.\n")) + (make-port-request-intern port read write except)) + +(define port-request make-port-request) + + ;;; Asynchronous escape to run things ;;; ================================= @@ -389,22 +418,100 @@ Will produce (0 . 0) instead of a negative number, if needed." (make-future call-first on-success on-fail on-error) when)) -(define-syntax-rule (async body args ...) +(define-syntax-rule (%sync body args ...) + "Run BODY asynchronously at a prompt, passing args to make-future. + +Pronounced `eight-sync' despite the spelling. + +%sync was chosen because (async) was already taken and could lead to +errors, and this version of asynchronous code uses a prompt, so the `a' +character becomes a `%' prompt! :) + +The % and 8 characters kind of look similar... hence this library's +name! (That, and the pun 'eight-synchronous' programming.) +There are 8sync aliases if you prefer that name." (abort-to-prompt (current-agenda-prompt) (wrap body) args ...)) -(define-syntax-rule (async-at body when args ...) +(define-syntax-rule (%sync-at body when args ...) (abort-to-prompt (current-agenda-prompt) (wrap body) - (append (list #:when when) - args ...))) + #:when when + args ...)) -(define-syntax-rule (async-delay body delay-time args ...) +(define-syntax-rule (%sync-delay body delay-time args ...) (abort-to-prompt (current-agenda-prompt) (wrap body) - (append (list #:when (tdelta delay-time)) - args ...))) + #:when (tdelta delay-time) + args ...)) + +(define-syntax-rule (8sync args ...) + "Alias for %sync" + (%sync args ...)) + +(define-syntax-rule (8sync-at args ...) + "Alias for %sync-at" + (%sync-at args ...)) + +(define-syntax-rule (8sync-delay args ...) + "Alias for %sync-delay" + (8sync-delay args ...)) + +;; Async port request and run-request meta-requests +(define (make-async-request proc) + "Wrap PROC in an async-request + +The purpose of this is to make sure that users don't accidentally +return the wrong thing via (8sync) and trip themselves up." + (cons '*async-request* proc)) + +(define (setup-async-request resume-kont async-request) + "Complete an async request for agenda-run-once's continuation handling" + (match async-request + (('*async-request* . async-setup-proc) + (async-setup-proc resume-kont)) + ;; TODO: deliver more helpful errors depending on what the user + ;; returned + (_ (throw 'invalid-async-request + "Invalid request passed back via an (%sync) procedure." + async-request)))) + +(define-syntax-rule (%run body ...) + (%run-at body ... #f)) + +(define-syntax-rule (%run-at body ... when) + (make-async-request + (lambda (kont) + (make-run-request + (wrap + (kont + (begin body ...))) + when)))) + +(define-syntax-rule (%run-delay body ... delay-time) + (%run-at body ... (tdelta delay-time))) + +(define-syntax-rule (%port-request add-this-port port-request-args ...) + (make-async-request + (lambda (kont) + (list (make-port-request port-request-args ...) + (make-run-request kont))))) + +;; TODO +(define-syntax-rule (%run-with-return return body ...) + (make-async-request + (lambda (kont) + (let ((return kont)) + (lambda () + body ...))))) + +;; Aliases +(define-syntax-rule (8run args ...) (%run args ...)) +(define-syntax-rule (8run-at args ...) (%run-at args ...)) +(define-syntax-rule (8run-delay args ...) (%run-delay args ...)) +(define-syntax-rule (8port-request args ...) (%port-request args ...)) + ;;; Execution of agenda, and current agenda @@ -487,6 +594,17 @@ Will produce (0 . 0) instead of a negative number, if needed." (update-agenda) agenda)) +(define (agenda-handle-port-request! agenda port-request) + "Update an agenda for a port-request" + (define (handle-selector request-selector port-map-selector) + (if (request-selector port-request) + (hash-set! (port-map-selector agenda) + (port-request-port port-request) + (request-selector port-request)))) + (handle-selector port-request-read agenda-read-port-map) + (handle-selector port-request-write agenda-write-port-map) + (handle-selector port-request-except agenda-except-port-map)) + (define* (start-agenda agenda #:key stop-condition @@ -525,12 +643,8 @@ Will produce (0 . 0) instead of a negative number, if needed." based on the results" (define (call-proc proc) (call-with-prompt - (agenda-prompt-tag agenda) - (lambda () - (proc)) - (lambda* (resume-with please-run-this . args) - (apply request-future please-run-this resume-with - args)))) + (agenda-prompt-tag agenda) + proc setup-async-request)) (let ((queue (agenda-queue agenda)) (next-queue (make-q))) @@ -554,19 +668,19 @@ based on the results" (schedule-at! request-time (run-request-proc run-request))) (#f (enq! next-queue (run-request-proc run-request)))))))) + (define (handle-individual result) + (match result + ((? run-request? new-proc) + (enqueue new-proc)) + ((? port-request? port-request) + (agenda-handle-port-request! agenda port-request)) + ;; do nothing + (_ #f))) ;; @@: 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 - ((? run-request? new-proc) - (enqueue new-proc)) - (((? run-request? new-procs) ...) - (for-each - (lambda (new-proc) - (enqueue new-proc)) - new-procs)) - ;; do nothing - (_ #f)))) + ((results ...) + (for-each handle-individual results)) + (one-result (handle-individual one-result))))) ;; 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