--- /dev/null
+*~
+.#*
+*.go
+*.log
+autom4te.cache/
+build-aux/
+Makefile
+Makefile.in
+/configure
+/env
+/config.status
+/config.log
+/aclocal.m4
+/pre-inst-env
+/missing
--- /dev/null
+;; Copyright (C) 2015 Christopher Allan Webber <cwebber@dustycloud.org>
+
+;; This library is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU Lesser General Public
+;; License as published by the Free Software Foundation; either
+;; version 3 of the License, or (at your option) any later version.
+;;
+;; This library is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+;; Lesser General Public License for more details.
+;;
+;; You should have received a copy of the GNU Lesser General Public
+;; License along with this library; if not, write to the Free Software
+;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+;; 02110-1301 USA
+
+(define-module (eightsync agenda)
+ #:use-module (srfi srfi-1)
+ #:use-module (srfi srfi-9)
+ #:use-module (srfi srfi-9 gnu)
+ #:use-module (ice-9 q)
+ #:use-module (ice-9 match)
+ #:use-module (ice-9 receive)
+ #:export (<agenda>
+ make-agenda agenda?
+ agenda-queue agenda-prompt-tag
+ agenda-read-port-map agenda-write-port-map agenda-except-port-map
+ agenda-schedule
+
+ make-async-prompt-tag
+
+ <time-segment>
+ make-time-segment time-segment?
+ time-segment-time time-segment-queue
+
+ time< time= time<= time-delta+
+ time-minus time-plus
+
+ <time-delta>
+ make-time-delta tdelta time-delta?
+ time-delta-sec time-delta-usec
+
+ <schedule>
+ make-schedule schedule?
+ schedule-add! schedule-empty?
+ schedule-segments
+ schedule-soonest-time
+
+ schedule-segments-split schedule-extract-until!
+ add-segments-contents-to-queue!
+
+ %sync 8sync
+
+ <run-request>
+ make-run-request run-request?
+ run-request-proc run-request-when
+
+ <port-request>
+ 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))
+
+;; @@: Using immutable agendas here, so wouldn't it make sense to
+;; replace this queue stuff with using pfds based immutable queues?
+
+\f
+;;; Agenda definition
+;;; =================
+
+;;; The agenda consists of:
+;;; - a queue of immediate items to handle
+;;; - sheduled future events to be added to a future queue
+;;; - a tag by which running processes can escape for some asynchronous
+;;; operation (from which they can be returned later)
+;;; - a mapping of ports to various handler procedures
+;;;
+;;; The goal, eventually, is for this all to be immutable and functional.
+;;; However, we aren't there yet. Some tricky things:
+;;; - The schedule needs to be immutable, yet reasonably efficient.
+;;; - Need to use immutable queues (ijp's pfds library?)
+;;; - Modeling reading from ports as something repeatable,
+;;; and with reasonable separation from functional components?
+
+(define-immutable-record-type <agenda>
+ (make-agenda-intern queue prompt-tag
+ read-port-map write-port-map except-port-map
+ schedule time)
+ agenda?
+ (queue agenda-queue)
+ (prompt-tag agenda-prompt-tag)
+ (read-port-map agenda-read-port-map)
+ (write-port-map agenda-write-port-map)
+ (except-port-map agenda-except-port-map)
+ (schedule agenda-schedule)
+ (time agenda-time))
+
+(define (make-async-prompt-tag)
+ "Make an async prompt tag for an agenda.
+
+Generally done automatically for the user through (make-agenda)."
+ (make-prompt-tag "prompt"))
+
+(define* (make-agenda #:key
+ (queue (make-q))
+ (prompt (make-prompt-tag))
+ (read-port-map (make-hash-table))
+ (write-port-map (make-hash-table))
+ (except-port-map (make-hash-table))
+ (schedule (make-schedule))
+ (time (gettimeofday)))
+ ;; TODO: document arguments
+ "Make a fresh agenda."
+ (make-agenda-intern queue prompt
+ read-port-map write-port-map except-port-map
+ schedule time))
+
+(define (current-agenda-prompt)
+ "Get the prompt for the current agenda; signal an error if there isn't one."
+ (let ((current-agenda (%current-agenda)))
+ (if (not current-agenda)
+ (throw
+ 'no-current-agenda
+ "Can't get current agenda prompt if there's no current agenda!")
+ (agenda-prompt-tag current-agenda))))
+
+
+\f
+;;; Schedule
+;;; ========
+
+;;; This is where we handle timed events for the future
+
+;; This section totally borrows from the ideas in SICP
+;; <3 <3 <3
+
+;; NOTE: time is a cons of (seconds . microseconds)
+
+(define-record-type <time-segment>
+ (make-time-segment-intern time queue)
+ time-segment?
+ (time time-segment-time)
+ (queue time-segment-queue))
+
+(define (time-segment-right-format time)
+ "Ensure TIME is in the right format.
+
+The right format means (second . microsecond).
+If an integer, will convert appropriately."
+ ;; TODO: add floating point / rational number support.
+ (match time
+ ;; time is already a cons of second and microsecnd
+ (((? integer? s) . (? integer? u)) time)
+ ;; time was just an integer (just the second)
+ ((? integer? _) (cons time 0))
+ (_ (throw 'invalid-time "Invalid time" time))))
+
+(define* (make-time-segment time #:optional (queue (make-q)))
+ "Make a time segment of TIME and QUEUE
+
+No automatic conversion is done, so you might have to
+run (time-segment-right-format) first."
+ (make-time-segment-intern time queue))
+
+(define (time< time1 time2)
+ "Check if TIME1 is less than TIME2"
+ (cond ((< (car time1)
+ (car time2))
+ #t)
+ ((and (= (car time1)
+ (car time2))
+ (< (cdr time1)
+ (cdr time2)))
+ #t)
+ (else #f)))
+
+(define (time= time1 time2)
+ "Check whether TIME1 and TIME2 are equivalent"
+ (and (= (car time1) (car time2))
+ (= (cdr time1) (cdr time2))))
+
+(define (time<= time1 time2)
+ "Check if TIME1 is less than or equal to TIME2"
+ (or (time< time1 time2)
+ (time= time1 time2)))
+
+
+(define-record-type <time-delta>
+ (make-time-delta-intern sec usec)
+ time-delta?
+ (sec time-delta-sec)
+ (usec time-delta-usec))
+
+(define* (make-time-delta sec #:optional (usec 0))
+ "Make a <time-delta> of SEC seconds and USEC microseconds.
+
+This is used primarily so the agenda can recognize RUN-REQUEST objects
+which are meant "
+ (make-time-delta-intern sec usec))
+
+(define tdelta make-time-delta)
+
+(define (time-carry-correct time)
+ "Corrects/handles time microsecond carry.
+Will produce (0 . 0) instead of a negative number, if needed."
+ (cond ((>= (cdr time) 1000000)
+ (cons
+ (+ (car time) 1)
+ (- (cdr time) 1000000)))
+ ((< (cdr time) 0)
+ (if (= (car time) 0)
+ '(0 0)
+ (cons
+ (- (car time) 1)
+ (+ (cdr time) 1000000))))
+ (else time)))
+
+(define (time-delta+ time time-delta)
+ "Increment a TIME by the value of TIME-DELTA"
+ (time-carry-correct
+ (cons (+ (car time) (time-delta-sec time-delta))
+ (+ (cdr time) (time-delta-usec time-delta)))))
+
+(define (time-minus time1 time2)
+ "Subtract TIME2 from TIME1"
+ (time-carry-correct
+ (cons (- (car time1) (car time2))
+ (- (cdr time2) (cdr time2)))))
+
+(define (time-plus time1 time2)
+ "Add TIME1 and TIME2"
+ (time-carry-correct
+ (cons (+ (car time1) (car time2))
+ (+ (cdr time2) (cdr time2)))))
+
+
+(define-record-type <schedule>
+ (make-schedule-intern segments)
+ schedule?
+ (segments schedule-segments set-schedule-segments!))
+
+(define* (make-schedule #:optional segments)
+ "Make a schedule, optionally pre-composed of SEGMENTS"
+ (make-schedule-intern (or segments '())))
+
+(define (schedule-soonest-time schedule)
+ "Return a cons of (sec . usec) for next time segement, or #f if none"
+ (let ((segments (schedule-segments schedule)))
+ (if (eq? segments '())
+ #f
+ (time-segment-time (car segments)))))
+
+;; TODO: This code is reasonably easy to read but it
+;; 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! schedule time proc)
+ "Mutate SCHEDULE, adding PROC at an appropriate time segment for TIME"
+ (let ((time (time-segment-right-format time)))
+ (define (new-time-segment)
+ (let ((new-segment
+ (make-time-segment time)))
+ (enq! (time-segment-queue new-segment) proc)
+ new-segment))
+ (define (loop segments)
+ (define (segment-equals-time? segment)
+ (time= time (time-segment-time segment)))
+
+ (define (segment-more-than-time? segment)
+ (time< time (time-segment-time segment)))
+
+ ;; We could switch this out to be more mutate'y
+ ;; and avoid the O(n) of space... is that over-optimizing?
+ (match segments
+ ;; If we're at the end of the list, time to make a new
+ ;; segment...
+ ('() (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 ...)
+ (enq! (time-segment-queue first) proc)
+ segments)
+ ;; If the first segment is more than our time,
+ ;; ours belongs before this one, so add it and
+ ;; start consing our way back
+ (((? segment-more-than-time? first) rest ...)
+ (cons (new-time-segment) segments))
+ ;; Otherwise, build up recursive result
+ ((first rest ... )
+ (cons first (loop rest)))))
+ (set-schedule-segments!
+ schedule
+ (loop (schedule-segments schedule)))))
+
+(define (schedule-empty? schedule)
+ "Check if the SCHEDULE is currently empty"
+ (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))
+
+
+\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-it proc #:optional when)
+ "Make a request to run PROC (possibly at WHEN)"
+ (make-run-request proc when))
+
+(define-syntax-rule (wrap body ...)
+ "Wrap contents in a procedure"
+ (lambda ()
+ body ...))
+
+;; @@: Do we really want `body ...' here?
+;; what about just `body'?
+(define-syntax-rule (run body ...)
+ "Run everything in BODY but wrap in a convenient procedure"
+ (make-run-request (wrap body ...) #f))
+
+(define-syntax-rule (run-at body ... when)
+ "Run BODY at WHEN"
+ (make-run-request (wrap body ...) when))
+
+;; @@: Is it okay to overload the term "delay" like this?
+;; Would `run-in' be better?
+(define-syntax-rule (run-delay body ... delay-time)
+ "Run BODY at DELAY-TIME time from now"
+ (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 <port-request>
+ (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)
+
+
+\f
+;;; Asynchronous escape to run things
+;;; =================================
+
+;; The future's in futures
+
+(define (make-future call-first on-success on-fail on-error)
+ ;; TODO: add error stuff here
+ (lambda ()
+ (let ((call-result (call-first)))
+ ;; queue up calling the
+ (run (on-success call-result)))))
+
+(define (agenda-on-error agenda)
+ (const #f))
+
+(define (agenda-on-fail agenda)
+ (const #f))
+
+(define* (request-future call-first on-success
+ #:key
+ (agenda (%current-agenda))
+ (on-fail (agenda-on-fail agenda))
+ (on-error (agenda-on-error agenda))
+ (when #f))
+ ;; TODO: error handling
+ ;; do we need some distinction between expected, catchable errors,
+ ;; and unexpected, uncatchable ones? Probably...?
+ (make-run-request
+ (make-future call-first on-success on-fail on-error)
+ when))
+
+(define-syntax-rule (%sync async-request)
+ "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)
+ async-request))
+
+(define-syntax-rule (8sync args ...)
+ "Alias for %sync"
+ (%sync 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 ...))
+
+
+\f
+;;; Execution of agenda, and current agenda
+;;; =======================================
+
+(define %current-agenda (make-parameter #f))
+
+(define (update-agenda-from-select! agenda)
+ "Potentially (select) on ports specified in agenda, adding items to queue"
+ (define (hash-keys hash)
+ (hash-map->list (lambda (k v) k) hash))
+ (define (get-wait-time)
+ ;; TODO: we need to figure this out based on whether there's anything
+ ;; in the queue, and if not, how long till the next scheduled item
+ (let ((soonest-time (schedule-soonest-time (agenda-schedule agenda))))
+ (cond
+ ((not (q-empty? (agenda-queue agenda)))
+ (cons 0 0))
+ (soonest-time ; ie, the agenda is non-empty
+ (let* ((current-time (agenda-time agenda)))
+ (if (time<= soonest-time current-time)
+ ;; Well there's something due so let's select
+ ;; (this avoids a (possible?) race condition chance)
+ (cons 0 0)
+ (time-minus soonest-time current-time))))
+ (else
+ (cons #f #f)))))
+ (define (do-select)
+ ;; TODO: support usecond wait time too
+ (match (get-wait-time)
+ ((sec . usec)
+ (select (hash-keys (agenda-read-port-map agenda))
+ (hash-keys (agenda-write-port-map agenda))
+ (hash-keys (agenda-except-port-map agenda))
+ sec usec))))
+ (define (get-procs-to-run)
+ (define (ports->procs ports port-map)
+ (lambda (initial-procs)
+ (fold
+ (lambda (port prev)
+ (cons (lambda ()
+ ((hash-ref port-map port) port))
+ prev))
+ initial-procs
+ ports)))
+ (match (do-select)
+ ((read-ports write-ports except-ports)
+ ;; @@: Come on, we can do better than append ;P
+ ((compose (ports->procs
+ read-ports
+ (agenda-read-port-map agenda))
+ (ports->procs
+ write-ports
+ (agenda-write-port-map agenda))
+ (ports->procs
+ except-ports
+ (agenda-except-port-map agenda)))
+ '()))))
+ (define (update-agenda)
+ (let ((procs-to-run (get-procs-to-run))
+ (q (agenda-queue agenda)))
+ (for-each
+ (lambda (proc)
+ (enq! q proc))
+ procs-to-run))
+ agenda)
+ (define (ports-to-select?)
+ (define (has-items? selector)
+ ;; @@: O(n)
+ ;; ... we could use hash-for-each and a continuation to jump
+ ;; out with a #t at first indication of an item
+ (not (= (hash-count (const #t)
+ (selector agenda))
+ 0)))
+ (or (has-items? agenda-read-port-map)
+ (has-items? agenda-write-port-map)
+ (has-items? agenda-except-port-map)))
+
+ (if (ports-to-select?)
+ (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
+ (get-time gettimeofday)
+ (handle-ports update-agenda-from-select!))
+ ;; TODO: Document fields
+ "Start up the AGENDA"
+ (let loop ((agenda 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
+ (agenda-run-once agenda)))
+ (if (and stop-condition (stop-condition agenda))
+ 'done
+ (let* ((agenda
+ ;; We have to update the time after ports handled, too
+ ;; because it may have changed after a select
+ (set-field
+ (handle-ports
+ ;; 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) (get-time)))
+ (agenda-time) (get-time))))
+ ;; Update the agenda's current queue based on
+ ;; currently applicable time segments
+ (add-segments-contents-to-queue!
+ (schedule-extract-until! (agenda-schedule agenda) (agenda-time agenda))
+ (agenda-queue agenda))
+ (loop 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 ()
+ (parameterize ((%current-agenda agenda))
+ (proc)))
+ (lambda (kont async-request)
+ (setup-async-request kont async-request))))
+
+ (let ((queue (agenda-queue agenda))
+ (next-queue (make-q)))
+ (while (not (q-empty? queue))
+ (let* ((proc (q-pop! queue))
+ (proc-result (call-proc proc))
+ (enqueue
+ (lambda (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-delta+ (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))))))))
+ (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
+ ((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
+ (set-field agenda (agenda-queue) next-queue)))
--- /dev/null
+## Copyright (C) 2015 Christopher Allan Webber <cwebber@dustycloud.org>
+
+## parts of this automake recipe borrowed from:
+
+## GNU Guix --- Functional package management for GNU
+## Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
+## Copyright © 2013 Andreas Enge <andreas@enge.fr>
+## Copyright © 2015 Alex Kost <alezost@gmail.com>
+
+## Sly
+## Copyright (C) 2013, 2014 David Thompson <dthompson2@worcester.edu>
+
+## This program is free software: you can redistribute it and/or
+## modify it under the terms of the GNU General Public License as
+## published by the Free Software Foundation, either version 3 of the
+## License, or (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+## General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program. If not, see
+## <http://www.gnu.org/licenses/>.
+
+GOBJECTS = $(SOURCES:%.scm=%.go)
+nobase_mod_DATA = $(SOURCES)
+nobase_go_DATA = $(GOBJECTS)
+
+# Make sure source files are installed first, so that the mtime of
+# installed compiled files is greater than that of installed source
+# files. See
+# <http://lists.gnu.org/archive/html/guile-devel/2010-07/msg00125.html>
+# for details.
+guile_install_go_files = install-nobase_goDATA
+$(guile_install_go_files): install-nobase_modDATA
+
+GUILE_WARNINGS = -Wunbound-variable -Warity-mismatch -Wformat
+SUFFIXES = .scm .go
+.scm.go:
+ $(AM_V_GEN)$(top_builddir)/pre-inst-env $(GUILE_TOOLS) compile $(GUILE_WARNINGS) -o "$@" "$<"
+
+moddir=$(prefix)/share/guile/site/2.0
+godir=$(libdir)/guile/2.0/ccache
+
+SOURCES = \
+ 8sync/agenda.scm
+
+
+TESTS = \
+ tests/test-agenda.scm
+
+TEST_EXTENSIONS = .scm
+
+SCM_LOG_COMPILER = $(GUILE)
+AM_SCM_LOG_FLAGS = --no-auto-compile -L $(top_srcdir)
+
+CLEANFILES = \
+ $(GOBJECTS) \
+ $(TESTS:tests/%.scm=%.log) \
+ *.log *.tar.gz
+
+
+EXTRA_DIST = \
+ $(SOURCES) \
+ $(TESTS) \
+ pre-inst-env.in
+# tests/utils.scm
--- /dev/null
+#!/bin/sh
+
+autoreconf -vif
--- /dev/null
+AC_INIT([8sync], [0.1.dev], [cwebber@dustycloud.org])
+
+PKG_CHECK_MODULES([GUILE], [guile-2.0])
+
+AM_INIT_AUTOMAKE([-Wall -Werror foreign])
+
+GUILE_PROGS
+
+AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([env], [chmod +x env])
+AC_CONFIG_FILES([pre-inst-env], [chmod +x pre-inst-env])
+AC_OUTPUT
--- /dev/null
+#!/bin/sh
+
+## Also borrowed from guile-opengl, which is GPLv3+
+
+GUILE_LOAD_PATH=@abs_top_srcdir@:$GUILE_LOAD_PATH
+if test "@abs_top_srcdir@" != "@abs_top_builddir@"; then
+ GUILE_LOAD_PATH=@abs_top_builddir@:$GUILE_LOAD_PATH
+fi
+GUILE_LOAD_COMPILED_PATH=@abs_top_builddir@:$GUILE_LOAD_PATH
+PATH=@abs_top_builddir@/bin:$PATH
+
+export GUILE_LOAD_PATH
+export GUILE_LOAD_COMPILED_PATH
+export PATH
+
+exec "$@"
--- /dev/null
+#!/bin/sh
+# install - install a program, script, or datafile
+
+scriptversion=2011-11-20.07; # UTC
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# 'make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.
+
+nl='
+'
+IFS=" "" $nl"
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit=${DOITPROG-}
+if test -z "$doit"; then
+ doit_exec=exec
+else
+ doit_exec=$doit
+fi
+
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
+
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_glob='?'
+initialize_posix_glob='
+ test "$posix_glob" != "?" || {
+ if (set -f) 2>/dev/null; then
+ posix_glob=
+ else
+ posix_glob=:
+ fi
+ }
+'
+
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
+
+chgrpcmd=
+chmodcmd=$chmodprog
+chowncmd=
+mvcmd=$mvprog
+rmcmd="$rmprog -f"
+stripcmd=
+
+src=
+dst=
+dir_arg=
+dst_arg=
+
+copy_on_change=false
+no_target_directory=
+
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+ or: $0 [OPTION]... SRCFILES... DIRECTORY
+ or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+ or: $0 [OPTION]... -d DIRECTORIES...
+
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
+
+Options:
+ --help display this help and exit.
+ --version display version info and exit.
+
+ -c (ignored)
+ -C install only if different (preserve the last data modification time)
+ -d create directories instead of installing files.
+ -g GROUP $chgrpprog installed files to GROUP.
+ -m MODE $chmodprog installed files to MODE.
+ -o USER $chownprog installed files to USER.
+ -s $stripprog installed files.
+ -t DIRECTORY install into DIRECTORY.
+ -T report an error if DSTFILE is a directory.
+
+Environment variables override the default commands:
+ CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+ RMPROG STRIPPROG
+"
+
+while test $# -ne 0; do
+ case $1 in
+ -c) ;;
+
+ -C) copy_on_change=true;;
+
+ -d) dir_arg=true;;
+
+ -g) chgrpcmd="$chgrpprog $2"
+ shift;;
+
+ --help) echo "$usage"; exit $?;;
+
+ -m) mode=$2
+ case $mode in
+ *' '* | *' '* | *'
+'* | *'*'* | *'?'* | *'['*)
+ echo "$0: invalid mode: $mode" >&2
+ exit 1;;
+ esac
+ shift;;
+
+ -o) chowncmd="$chownprog $2"
+ shift;;
+
+ -s) stripcmd=$stripprog;;
+
+ -t) dst_arg=$2
+ # Protect names problematic for 'test' and other utilities.
+ case $dst_arg in
+ -* | [=\(\)!]) dst_arg=./$dst_arg;;
+ esac
+ shift;;
+
+ -T) no_target_directory=true;;
+
+ --version) echo "$0 $scriptversion"; exit $?;;
+
+ --) shift
+ break;;
+
+ -*) echo "$0: invalid option: $1" >&2
+ exit 1;;
+
+ *) break;;
+ esac
+ shift
+done
+
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+ # When -d is used, all remaining arguments are directories to create.
+ # When -t is used, the destination is already specified.
+ # Otherwise, the last argument is the destination. Remove it from $@.
+ for arg
+ do
+ if test -n "$dst_arg"; then
+ # $@ is not empty: it contains at least $arg.
+ set fnord "$@" "$dst_arg"
+ shift # fnord
+ fi
+ shift # arg
+ dst_arg=$arg
+ # Protect names problematic for 'test' and other utilities.
+ case $dst_arg in
+ -* | [=\(\)!]) dst_arg=./$dst_arg;;
+ esac
+ done
+fi
+
+if test $# -eq 0; then
+ if test -z "$dir_arg"; then
+ echo "$0: no input file specified." >&2
+ exit 1
+ fi
+ # It's OK to call 'install-sh -d' without argument.
+ # This can happen when creating conditional directories.
+ exit 0
+fi
+
+if test -z "$dir_arg"; then
+ do_exit='(exit $ret); exit $ret'
+ trap "ret=129; $do_exit" 1
+ trap "ret=130; $do_exit" 2
+ trap "ret=141; $do_exit" 13
+ trap "ret=143; $do_exit" 15
+
+ # Set umask so as not to create temps with too-generous modes.
+ # However, 'strip' requires both read and write access to temps.
+ case $mode in
+ # Optimize common cases.
+ *644) cp_umask=133;;
+ *755) cp_umask=22;;
+
+ *[0-7])
+ if test -z "$stripcmd"; then
+ u_plus_rw=
+ else
+ u_plus_rw='% 200'
+ fi
+ cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+ *)
+ if test -z "$stripcmd"; then
+ u_plus_rw=
+ else
+ u_plus_rw=,u+rw
+ fi
+ cp_umask=$mode$u_plus_rw;;
+ esac
+fi
+
+for src
+do
+ # Protect names problematic for 'test' and other utilities.
+ case $src in
+ -* | [=\(\)!]) src=./$src;;
+ esac
+
+ if test -n "$dir_arg"; then
+ dst=$src
+ dstdir=$dst
+ test -d "$dstdir"
+ dstdir_status=$?
+ else
+
+ # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+ # might cause directories to be created, which would be especially bad
+ # if $src (and thus $dsttmp) contains '*'.
+ if test ! -f "$src" && test ! -d "$src"; then
+ echo "$0: $src does not exist." >&2
+ exit 1
+ fi
+
+ if test -z "$dst_arg"; then
+ echo "$0: no destination specified." >&2
+ exit 1
+ fi
+ dst=$dst_arg
+
+ # If destination is a directory, append the input filename; won't work
+ # if double slashes aren't ignored.
+ if test -d "$dst"; then
+ if test -n "$no_target_directory"; then
+ echo "$0: $dst_arg: Is a directory" >&2
+ exit 1
+ fi
+ dstdir=$dst
+ dst=$dstdir/`basename "$src"`
+ dstdir_status=0
+ else
+ # Prefer dirname, but fall back on a substitute if dirname fails.
+ dstdir=`
+ (dirname "$dst") 2>/dev/null ||
+ expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$dst" : 'X\(//\)[^/]' \| \
+ X"$dst" : 'X\(//\)$' \| \
+ X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$dst" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'
+ `
+
+ test -d "$dstdir"
+ dstdir_status=$?
+ fi
+ fi
+
+ obsolete_mkdir_used=false
+
+ if test $dstdir_status != 0; then
+ case $posix_mkdir in
+ '')
+ # Create intermediate dirs using mode 755 as modified by the umask.
+ # This is like FreeBSD 'install' as of 1997-10-28.
+ umask=`umask`
+ case $stripcmd.$umask in
+ # Optimize common cases.
+ *[2367][2367]) mkdir_umask=$umask;;
+ .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+ *[0-7])
+ mkdir_umask=`expr $umask + 22 \
+ - $umask % 100 % 40 + $umask % 20 \
+ - $umask % 10 % 4 + $umask % 2
+ `;;
+ *) mkdir_umask=$umask,go-w;;
+ esac
+
+ # With -d, create the new directory with the user-specified mode.
+ # Otherwise, rely on $mkdir_umask.
+ if test -n "$dir_arg"; then
+ mkdir_mode=-m$mode
+ else
+ mkdir_mode=
+ fi
+
+ posix_mkdir=false
+ case $umask in
+ *[123567][0-7][0-7])
+ # POSIX mkdir -p sets u+wx bits regardless of umask, which
+ # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+ ;;
+ *)
+ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+ if (umask $mkdir_umask &&
+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+ then
+ if test -z "$dir_arg" || {
+ # Check for POSIX incompatibilities with -m.
+ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+ # other-writable bit of parent directory when it shouldn't.
+ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+ ls_ld_tmpdir=`ls -ld "$tmpdir"`
+ case $ls_ld_tmpdir in
+ d????-?r-*) different_mode=700;;
+ d????-?--*) different_mode=755;;
+ *) false;;
+ esac &&
+ $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+ ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+ }
+ }
+ then posix_mkdir=:
+ fi
+ rmdir "$tmpdir/d" "$tmpdir"
+ else
+ # Remove any dirs left behind by ancient mkdir implementations.
+ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+ fi
+ trap '' 0;;
+ esac;;
+ esac
+
+ if
+ $posix_mkdir && (
+ umask $mkdir_umask &&
+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+ )
+ then :
+ else
+
+ # The umask is ridiculous, or mkdir does not conform to POSIX,
+ # or it failed possibly due to a race condition. Create the
+ # directory the slow way, step by step, checking for races as we go.
+
+ case $dstdir in
+ /*) prefix='/';;
+ [-=\(\)!]*) prefix='./';;
+ *) prefix='';;
+ esac
+
+ eval "$initialize_posix_glob"
+
+ oIFS=$IFS
+ IFS=/
+ $posix_glob set -f
+ set fnord $dstdir
+ shift
+ $posix_glob set +f
+ IFS=$oIFS
+
+ prefixes=
+
+ for d
+ do
+ test X"$d" = X && continue
+
+ prefix=$prefix$d
+ if test -d "$prefix"; then
+ prefixes=
+ else
+ if $posix_mkdir; then
+ (umask=$mkdir_umask &&
+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+ # Don't fail if two instances are running concurrently.
+ test -d "$prefix" || exit 1
+ else
+ case $prefix in
+ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+ *) qprefix=$prefix;;
+ esac
+ prefixes="$prefixes '$qprefix'"
+ fi
+ fi
+ prefix=$prefix/
+ done
+
+ if test -n "$prefixes"; then
+ # Don't fail if two instances are running concurrently.
+ (umask $mkdir_umask &&
+ eval "\$doit_exec \$mkdirprog $prefixes") ||
+ test -d "$dstdir" || exit 1
+ obsolete_mkdir_used=true
+ fi
+ fi
+ fi
+
+ if test -n "$dir_arg"; then
+ { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+ { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+ test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
+ else
+
+ # Make a couple of temp file names in the proper directory.
+ dsttmp=$dstdir/_inst.$$_
+ rmtmp=$dstdir/_rm.$$_
+
+ # Trap to clean up those temp files at exit.
+ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+
+ # Copy the file name to the temp name.
+ (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+
+ # and set any options; do chmod last to preserve setuid bits.
+ #
+ # If any of these fail, we abort the whole thing. If we want to
+ # ignore errors from any of these, just make sure not to ignore
+ # errors from the above "$doit $cpprog $src $dsttmp" command.
+ #
+ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+ { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+ { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+ # If -C, don't bother to copy if it wouldn't change the file.
+ if $copy_on_change &&
+ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
+ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
+
+ eval "$initialize_posix_glob" &&
+ $posix_glob set -f &&
+ set X $old && old=:$2:$4:$5:$6 &&
+ set X $new && new=:$2:$4:$5:$6 &&
+ $posix_glob set +f &&
+
+ test "$old" = "$new" &&
+ $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+ then
+ rm -f "$dsttmp"
+ else
+ # Rename the file to the real destination.
+ $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+ # The rename failed, perhaps because mv can't rename something else
+ # to itself, or perhaps because mv is so ancient that it does not
+ # support -f.
+ {
+ # Now remove or move aside any old file at destination location.
+ # We try this two ways since rm can't unlink itself on some
+ # systems and the destination file might be busy for other
+ # reasons. In this case, the final cleanup might fail but the new
+ # file should still install successfully.
+ {
+ test ! -f "$dst" ||
+ $doit $rmcmd -f "$dst" 2>/dev/null ||
+ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+ { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+ } ||
+ { echo "$0: cannot unlink or rename $dst" >&2
+ (exit 1); exit 1
+ }
+ } &&
+
+ # Now rename the file to the real destination.
+ $doit $mvcmd "$dsttmp" "$dst"
+ }
+ fi || exit 1
+
+ trap '' 0
+ fi
+done
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
+++ /dev/null
-;; Copyright (C) 2015 Christopher Allan Webber <cwebber@dustycloud.org>
-
-;; This library is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU Lesser General Public
-;; License as published by the Free Software Foundation; either
-;; version 3 of the License, or (at your option) any later version.
-;;
-;; This library is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; Lesser General Public License for more details.
-;;
-;; You should have received a copy of the GNU Lesser General Public
-;; License along with this library; if not, write to the Free Software
-;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-;; 02110-1301 USA
-
-(define-module (eightsync agenda)
- #:use-module (srfi srfi-1)
- #:use-module (srfi srfi-9)
- #:use-module (srfi srfi-9 gnu)
- #:use-module (ice-9 q)
- #:use-module (ice-9 match)
- #:use-module (ice-9 receive)
- #:export (<agenda>
- make-agenda agenda?
- agenda-queue agenda-prompt-tag
- agenda-read-port-map agenda-write-port-map agenda-except-port-map
- agenda-schedule
-
- make-async-prompt-tag
-
- <time-segment>
- make-time-segment time-segment?
- time-segment-time time-segment-queue
-
- time< time= time<= time-delta+
- time-minus time-plus
-
- <time-delta>
- make-time-delta tdelta time-delta?
- time-delta-sec time-delta-usec
-
- <schedule>
- make-schedule schedule?
- schedule-add! schedule-empty?
- schedule-segments
- schedule-soonest-time
-
- schedule-segments-split schedule-extract-until!
- add-segments-contents-to-queue!
-
- %sync 8sync
-
- <run-request>
- make-run-request run-request?
- run-request-proc run-request-when
-
- <port-request>
- 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))
-
-;; @@: Using immutable agendas here, so wouldn't it make sense to
-;; replace this queue stuff with using pfds based immutable queues?
-
-\f
-;;; Agenda definition
-;;; =================
-
-;;; The agenda consists of:
-;;; - a queue of immediate items to handle
-;;; - sheduled future events to be added to a future queue
-;;; - a tag by which running processes can escape for some asynchronous
-;;; operation (from which they can be returned later)
-;;; - a mapping of ports to various handler procedures
-;;;
-;;; The goal, eventually, is for this all to be immutable and functional.
-;;; However, we aren't there yet. Some tricky things:
-;;; - The schedule needs to be immutable, yet reasonably efficient.
-;;; - Need to use immutable queues (ijp's pfds library?)
-;;; - Modeling reading from ports as something repeatable,
-;;; and with reasonable separation from functional components?
-
-(define-immutable-record-type <agenda>
- (make-agenda-intern queue prompt-tag
- read-port-map write-port-map except-port-map
- schedule time)
- agenda?
- (queue agenda-queue)
- (prompt-tag agenda-prompt-tag)
- (read-port-map agenda-read-port-map)
- (write-port-map agenda-write-port-map)
- (except-port-map agenda-except-port-map)
- (schedule agenda-schedule)
- (time agenda-time))
-
-(define (make-async-prompt-tag)
- "Make an async prompt tag for an agenda.
-
-Generally done automatically for the user through (make-agenda)."
- (make-prompt-tag "prompt"))
-
-(define* (make-agenda #:key
- (queue (make-q))
- (prompt (make-prompt-tag))
- (read-port-map (make-hash-table))
- (write-port-map (make-hash-table))
- (except-port-map (make-hash-table))
- (schedule (make-schedule))
- (time (gettimeofday)))
- ;; TODO: document arguments
- "Make a fresh agenda."
- (make-agenda-intern queue prompt
- read-port-map write-port-map except-port-map
- schedule time))
-
-(define (current-agenda-prompt)
- "Get the prompt for the current agenda; signal an error if there isn't one."
- (let ((current-agenda (%current-agenda)))
- (if (not current-agenda)
- (throw
- 'no-current-agenda
- "Can't get current agenda prompt if there's no current agenda!")
- (agenda-prompt-tag current-agenda))))
-
-
-\f
-;;; Schedule
-;;; ========
-
-;;; This is where we handle timed events for the future
-
-;; This section totally borrows from the ideas in SICP
-;; <3 <3 <3
-
-;; NOTE: time is a cons of (seconds . microseconds)
-
-(define-record-type <time-segment>
- (make-time-segment-intern time queue)
- time-segment?
- (time time-segment-time)
- (queue time-segment-queue))
-
-(define (time-segment-right-format time)
- "Ensure TIME is in the right format.
-
-The right format means (second . microsecond).
-If an integer, will convert appropriately."
- ;; TODO: add floating point / rational number support.
- (match time
- ;; time is already a cons of second and microsecnd
- (((? integer? s) . (? integer? u)) time)
- ;; time was just an integer (just the second)
- ((? integer? _) (cons time 0))
- (_ (throw 'invalid-time "Invalid time" time))))
-
-(define* (make-time-segment time #:optional (queue (make-q)))
- "Make a time segment of TIME and QUEUE
-
-No automatic conversion is done, so you might have to
-run (time-segment-right-format) first."
- (make-time-segment-intern time queue))
-
-(define (time< time1 time2)
- "Check if TIME1 is less than TIME2"
- (cond ((< (car time1)
- (car time2))
- #t)
- ((and (= (car time1)
- (car time2))
- (< (cdr time1)
- (cdr time2)))
- #t)
- (else #f)))
-
-(define (time= time1 time2)
- "Check whether TIME1 and TIME2 are equivalent"
- (and (= (car time1) (car time2))
- (= (cdr time1) (cdr time2))))
-
-(define (time<= time1 time2)
- "Check if TIME1 is less than or equal to TIME2"
- (or (time< time1 time2)
- (time= time1 time2)))
-
-
-(define-record-type <time-delta>
- (make-time-delta-intern sec usec)
- time-delta?
- (sec time-delta-sec)
- (usec time-delta-usec))
-
-(define* (make-time-delta sec #:optional (usec 0))
- "Make a <time-delta> of SEC seconds and USEC microseconds.
-
-This is used primarily so the agenda can recognize RUN-REQUEST objects
-which are meant "
- (make-time-delta-intern sec usec))
-
-(define tdelta make-time-delta)
-
-(define (time-carry-correct time)
- "Corrects/handles time microsecond carry.
-Will produce (0 . 0) instead of a negative number, if needed."
- (cond ((>= (cdr time) 1000000)
- (cons
- (+ (car time) 1)
- (- (cdr time) 1000000)))
- ((< (cdr time) 0)
- (if (= (car time) 0)
- '(0 0)
- (cons
- (- (car time) 1)
- (+ (cdr time) 1000000))))
- (else time)))
-
-(define (time-delta+ time time-delta)
- "Increment a TIME by the value of TIME-DELTA"
- (time-carry-correct
- (cons (+ (car time) (time-delta-sec time-delta))
- (+ (cdr time) (time-delta-usec time-delta)))))
-
-(define (time-minus time1 time2)
- "Subtract TIME2 from TIME1"
- (time-carry-correct
- (cons (- (car time1) (car time2))
- (- (cdr time2) (cdr time2)))))
-
-(define (time-plus time1 time2)
- "Add TIME1 and TIME2"
- (time-carry-correct
- (cons (+ (car time1) (car time2))
- (+ (cdr time2) (cdr time2)))))
-
-
-(define-record-type <schedule>
- (make-schedule-intern segments)
- schedule?
- (segments schedule-segments set-schedule-segments!))
-
-(define* (make-schedule #:optional segments)
- "Make a schedule, optionally pre-composed of SEGMENTS"
- (make-schedule-intern (or segments '())))
-
-(define (schedule-soonest-time schedule)
- "Return a cons of (sec . usec) for next time segement, or #f if none"
- (let ((segments (schedule-segments schedule)))
- (if (eq? segments '())
- #f
- (time-segment-time (car segments)))))
-
-;; TODO: This code is reasonably easy to read but it
-;; 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! schedule time proc)
- "Mutate SCHEDULE, adding PROC at an appropriate time segment for TIME"
- (let ((time (time-segment-right-format time)))
- (define (new-time-segment)
- (let ((new-segment
- (make-time-segment time)))
- (enq! (time-segment-queue new-segment) proc)
- new-segment))
- (define (loop segments)
- (define (segment-equals-time? segment)
- (time= time (time-segment-time segment)))
-
- (define (segment-more-than-time? segment)
- (time< time (time-segment-time segment)))
-
- ;; We could switch this out to be more mutate'y
- ;; and avoid the O(n) of space... is that over-optimizing?
- (match segments
- ;; If we're at the end of the list, time to make a new
- ;; segment...
- ('() (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 ...)
- (enq! (time-segment-queue first) proc)
- segments)
- ;; If the first segment is more than our time,
- ;; ours belongs before this one, so add it and
- ;; start consing our way back
- (((? segment-more-than-time? first) rest ...)
- (cons (new-time-segment) segments))
- ;; Otherwise, build up recursive result
- ((first rest ... )
- (cons first (loop rest)))))
- (set-schedule-segments!
- schedule
- (loop (schedule-segments schedule)))))
-
-(define (schedule-empty? schedule)
- "Check if the SCHEDULE is currently empty"
- (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))
-
-
-\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-it proc #:optional when)
- "Make a request to run PROC (possibly at WHEN)"
- (make-run-request proc when))
-
-(define-syntax-rule (wrap body ...)
- "Wrap contents in a procedure"
- (lambda ()
- body ...))
-
-;; @@: Do we really want `body ...' here?
-;; what about just `body'?
-(define-syntax-rule (run body ...)
- "Run everything in BODY but wrap in a convenient procedure"
- (make-run-request (wrap body ...) #f))
-
-(define-syntax-rule (run-at body ... when)
- "Run BODY at WHEN"
- (make-run-request (wrap body ...) when))
-
-;; @@: Is it okay to overload the term "delay" like this?
-;; Would `run-in' be better?
-(define-syntax-rule (run-delay body ... delay-time)
- "Run BODY at DELAY-TIME time from now"
- (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 <port-request>
- (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)
-
-
-\f
-;;; Asynchronous escape to run things
-;;; =================================
-
-;; The future's in futures
-
-(define (make-future call-first on-success on-fail on-error)
- ;; TODO: add error stuff here
- (lambda ()
- (let ((call-result (call-first)))
- ;; queue up calling the
- (run (on-success call-result)))))
-
-(define (agenda-on-error agenda)
- (const #f))
-
-(define (agenda-on-fail agenda)
- (const #f))
-
-(define* (request-future call-first on-success
- #:key
- (agenda (%current-agenda))
- (on-fail (agenda-on-fail agenda))
- (on-error (agenda-on-error agenda))
- (when #f))
- ;; TODO: error handling
- ;; do we need some distinction between expected, catchable errors,
- ;; and unexpected, uncatchable ones? Probably...?
- (make-run-request
- (make-future call-first on-success on-fail on-error)
- when))
-
-(define-syntax-rule (%sync async-request)
- "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)
- async-request))
-
-(define-syntax-rule (8sync args ...)
- "Alias for %sync"
- (%sync 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 ...))
-
-
-\f
-;;; Execution of agenda, and current agenda
-;;; =======================================
-
-(define %current-agenda (make-parameter #f))
-
-(define (update-agenda-from-select! agenda)
- "Potentially (select) on ports specified in agenda, adding items to queue"
- (define (hash-keys hash)
- (hash-map->list (lambda (k v) k) hash))
- (define (get-wait-time)
- ;; TODO: we need to figure this out based on whether there's anything
- ;; in the queue, and if not, how long till the next scheduled item
- (let ((soonest-time (schedule-soonest-time (agenda-schedule agenda))))
- (cond
- ((not (q-empty? (agenda-queue agenda)))
- (cons 0 0))
- (soonest-time ; ie, the agenda is non-empty
- (let* ((current-time (agenda-time agenda)))
- (if (time<= soonest-time current-time)
- ;; Well there's something due so let's select
- ;; (this avoids a (possible?) race condition chance)
- (cons 0 0)
- (time-minus soonest-time current-time))))
- (else
- (cons #f #f)))))
- (define (do-select)
- ;; TODO: support usecond wait time too
- (match (get-wait-time)
- ((sec . usec)
- (select (hash-keys (agenda-read-port-map agenda))
- (hash-keys (agenda-write-port-map agenda))
- (hash-keys (agenda-except-port-map agenda))
- sec usec))))
- (define (get-procs-to-run)
- (define (ports->procs ports port-map)
- (lambda (initial-procs)
- (fold
- (lambda (port prev)
- (cons (lambda ()
- ((hash-ref port-map port) port))
- prev))
- initial-procs
- ports)))
- (match (do-select)
- ((read-ports write-ports except-ports)
- ;; @@: Come on, we can do better than append ;P
- ((compose (ports->procs
- read-ports
- (agenda-read-port-map agenda))
- (ports->procs
- write-ports
- (agenda-write-port-map agenda))
- (ports->procs
- except-ports
- (agenda-except-port-map agenda)))
- '()))))
- (define (update-agenda)
- (let ((procs-to-run (get-procs-to-run))
- (q (agenda-queue agenda)))
- (for-each
- (lambda (proc)
- (enq! q proc))
- procs-to-run))
- agenda)
- (define (ports-to-select?)
- (define (has-items? selector)
- ;; @@: O(n)
- ;; ... we could use hash-for-each and a continuation to jump
- ;; out with a #t at first indication of an item
- (not (= (hash-count (const #t)
- (selector agenda))
- 0)))
- (or (has-items? agenda-read-port-map)
- (has-items? agenda-write-port-map)
- (has-items? agenda-except-port-map)))
-
- (if (ports-to-select?)
- (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
- (get-time gettimeofday)
- (handle-ports update-agenda-from-select!))
- ;; TODO: Document fields
- "Start up the AGENDA"
- (let loop ((agenda 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
- (agenda-run-once agenda)))
- (if (and stop-condition (stop-condition agenda))
- 'done
- (let* ((agenda
- ;; We have to update the time after ports handled, too
- ;; because it may have changed after a select
- (set-field
- (handle-ports
- ;; 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) (get-time)))
- (agenda-time) (get-time))))
- ;; Update the agenda's current queue based on
- ;; currently applicable time segments
- (add-segments-contents-to-queue!
- (schedule-extract-until! (agenda-schedule agenda) (agenda-time agenda))
- (agenda-queue agenda))
- (loop 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 ()
- (parameterize ((%current-agenda agenda))
- (proc)))
- (lambda (kont async-request)
- (setup-async-request kont async-request))))
-
- (let ((queue (agenda-queue agenda))
- (next-queue (make-q)))
- (while (not (q-empty? queue))
- (let* ((proc (q-pop! queue))
- (proc-result (call-proc proc))
- (enqueue
- (lambda (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-delta+ (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))))))))
- (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
- ((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
- (set-field agenda (agenda-queue) next-queue)))
--- /dev/null
+#!/bin/sh
+
+# srt2vtt --- SRT to WebVTT converter
+# Copyright © 2015 David Thompson <davet@gnu.org>
+# Copyright © 2015 Christopher Allan Webber <cwebber@dustycloud.org>
+#
+# srt2vtt is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# srt2vtt is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with srt2vtt. If not, see <http://www.gnu.org/licenses/>.
+
+abs_top_srcdir="`cd "@abs_top_srcdir@" > /dev/null; pwd`"
+abs_top_builddir="`cd "@abs_top_builddir@" > /dev/null; pwd`"
+
+GUILE_LOAD_COMPILED_PATH="$abs_top_builddir${GUILE_LOAD_COMPILED_PATH:+:}$GUILE_LOAD_COMPILED_PATH"
+GUILE_LOAD_PATH="$abs_top_builddir:$abs_top_srcdir${GUILE_LOAD_PATH:+:}:$GUILE_LOAD_PATH"
+export GUILE_LOAD_COMPILED_PATH GUILE_LOAD_PATH
+
+PATH="$abs_top_builddir/scripts:$PATH"
+export PATH
+
+exec "$@"
+++ /dev/null
-;; Copyright (C) 2015 Christopher Allan Webber <cwebber@dustycloud.org>
-
-;; This library is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU Lesser General Public
-;; License as published by the Free Software Foundation; either
-;; version 3 of the License, or (at your option) any later version.
-;;
-;; This library is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; Lesser General Public License for more details.
-;;
-;; You should have received a copy of the GNU Lesser General Public
-;; License along with this library; if not, write to the Free Software
-;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-;; 02110-1301 USA
-
-#!/usr/bin/guile \
--s
-!#
-
-(define-module (tests test-core)
- #:use-module (srfi srfi-64)
- #:use-module (ice-9 q)
- #:use-module (ice-9 receive)
- #:use-module (eightsync agenda))
-
-(test-begin "tests")
-
-\f
-
-;;; Helpers
-;;; =======
-
-(define (speak-it)
- (let ((messages '()))
- (lambda* (#:optional message)
- (if message (set! messages (append messages (list message))))
- messages)))
-
-\f
-;; Timer tests
-;; ===========
-
-(test-assert (time= '(1 . 1) '(1 . 1)))
-(test-assert (not (time= '(1 . 1) '(1 . 0))))
-(test-assert (not (time= '(0 . 1) '(1 . 1))))
-
-(test-assert (time< '(1 . 1) '(1 . 2)))
-(test-assert (time< '(7 . 2) '(8 . 2)))
-(test-assert (not (time< '(7 . 2) '(7 . 2))))
-(test-assert (not (time< '(7 . 8) '(7 . 2))))
-(test-assert (not (time< '(8 . 2) '(7 . 2))))
-
-(let ((tdelta (make-time-delta 8)))
- (test-assert (time-delta? tdelta))
- (test-eqv (time-delta-sec tdelta) 8)
- (test-eqv (time-delta-usec tdelta) 0)
- (test-equal
- (time-delta+ '(2 . 3) tdelta)
- '(10 . 3)))
-
-(let ((tdelta (make-time-delta 10 1)))
- (test-assert (time-delta? tdelta))
- (test-eqv (time-delta-sec tdelta) 10)
- (test-eqv (time-delta-usec tdelta) 1)
- (test-equal
- (time-delta+ '(2 . 3) tdelta)
- '(12 . 4)))
-
-
-\f
-;;; Schedule tests
-;;; ==============
-
-;; helpers
-(define (assert-times-expected time-segments expected-times)
- (test-equal (map time-segment-time time-segments)
- expected-times))
-
-(define a-proc (const 'a))
-(define b-proc (const 'b))
-(define c-proc (const 'c))
-(define d-proc (const 'd))
-(define e-proc (const 'e))
-(define f-proc (const 'f))
-
-(define sched (make-schedule))
-(test-assert (schedule-empty? sched))
-
-;; Add a segment at (10 . 0)
-(schedule-add! sched 10 a-proc)
-(test-assert (not (schedule-empty? sched)))
-(test-equal (length (schedule-segments sched)) 1)
-(test-equal (time-segment-time (car (schedule-segments sched)))
- '(10 . 0))
-(test-equal (q-length (time-segment-queue (car (schedule-segments sched))))
- 1)
-(test-eq (q-front (time-segment-queue (car (schedule-segments sched))))
- a-proc)
-(test-eq (q-rear (time-segment-queue (car (schedule-segments sched))))
- a-proc)
-(test-eq ((q-front (time-segment-queue (car (schedule-segments sched)))))
- 'a) ;; why not
-(assert-times-expected (schedule-segments sched)
- '((10 . 0)))
-
-;; Add another segment at (10 . 0)
-(schedule-add! sched '(10 . 0) b-proc)
-(test-assert (not (schedule-empty? sched)))
-(test-equal (length (schedule-segments sched)) 1)
-(test-equal (time-segment-time (car (schedule-segments sched)))
- '(10 . 0))
-(test-equal (q-length (time-segment-queue (car (schedule-segments sched))))
- 2)
-(test-eq (q-front (time-segment-queue (car (schedule-segments sched))))
- a-proc)
-(test-eq (q-rear (time-segment-queue (car (schedule-segments sched))))
- b-proc)
-(assert-times-expected (schedule-segments sched)
- '((10 . 0)))
-
-;; Add a segment to (11 . 0), (8 . 1) and (10 . 10)
-(schedule-add! sched 11 c-proc)
-(schedule-add! sched '(8 . 1) d-proc)
-(schedule-add! sched '(10 . 10) e-proc)
-(test-assert (not (schedule-empty? sched)))
-(test-equal (length (schedule-segments sched)) 4)
-(assert-times-expected (schedule-segments sched)
- '((8 . 1) (10 . 0) (10 . 10) (11 . 0)))
-
-;; Splitting
-(define (test-split-at schedule time expected-before expected-after)
- (receive (segments-before segments-after)
- (schedule-segments-split schedule time)
- (assert-times-expected segments-before expected-before)
- (assert-times-expected segments-after expected-after)))
-
-(test-split-at sched 0
- '()
- '((8 . 1) (10 . 0) (10 . 10) (11 . 0)))
-(test-split-at sched '(8 . 0)
- '()
- '((8 . 1) (10 . 0) (10 . 10) (11 . 0)))
-(test-split-at sched '(8 . 1)
- '((8 . 1))
- '((10 . 0) (10 . 10) (11 . 0)))
-(test-split-at sched 9
- '((8 . 1))
- '((10 . 0) (10 . 10) (11 . 0)))
-(test-split-at sched 10
- '((8 . 1) (10 . 0))
- '((10 . 10) (11 . 0)))
-(test-split-at sched 9000
- '((8 . 1) (10 . 0) (10 . 10) (11 . 0))
- '())
-(test-split-at sched '(9000 . 1) ; over nine thousaaaaaaand
- '((8 . 1) (10 . 0) (10 . 10) (11 . 0))
- '())
-
-;; Break off half of those and do some tests on them
-(define some-extracted
- (schedule-extract-until! sched 10))
-(assert-times-expected some-extracted '((8 . 1) (10 . 0)))
-(assert-times-expected (schedule-segments sched) '((10 . 10) (11 . 0)))
-(define first-extracted-queue
- (time-segment-queue (car some-extracted)))
-(define second-extracted-queue
- (time-segment-queue (cadr some-extracted)))
-(test-assert (not (q-empty? first-extracted-queue)))
-(test-equal ((deq! first-extracted-queue)) 'd)
-(test-assert (q-empty? first-extracted-queue))
-
-(test-assert (not (q-empty? second-extracted-queue)))
-(test-equal ((deq! second-extracted-queue)) 'a)
-(test-equal ((deq! second-extracted-queue)) 'b)
-(test-assert (q-empty? second-extracted-queue))
-
-;; Add one more and test flattening to a queue
-(test-assert (not (schedule-empty? sched)))
-(schedule-add! sched '(10 . 10) f-proc)
-(define remaining-segments
- (schedule-extract-until! sched '(9000 . 1)))
-(test-assert (schedule-empty? sched))
-(define some-queue (make-q))
-(enq! some-queue (const 'ho-ho))
-(enq! some-queue (const 'ha-ha))
-(add-segments-contents-to-queue! remaining-segments some-queue)
-(test-assert (not (q-empty? some-queue)))
-(test-equal 'ho-ho ((deq! some-queue)))
-(test-equal 'ha-ha ((deq! some-queue)))
-(test-equal 'e ((deq! some-queue)))
-(test-equal 'f ((deq! some-queue)))
-(test-equal 'c ((deq! some-queue)))
-(test-assert (q-empty? some-queue))
-
-;; ... whew!
-
-;; Run/wrap request stuff
-;; ----------------------
-
-(let ((wrapped (wrap (+ 1 2))))
- (test-assert (procedure? wrapped))
- (test-equal (wrapped) 3))
-
-(let ((run-two-squared (run-it (lambda () (* 2 2)))))
- (test-assert (run-request? run-two-squared))
- (test-assert (procedure? (run-request-proc run-two-squared)))
- (test-equal ((run-request-proc run-two-squared)) 4)
- (test-eq (run-request-when run-two-squared) #f))
-
-(let ((run-two-squared (run-it (lambda () (* 2 2)) '(88 . 0))))
- (test-assert (run-request? run-two-squared))
- (test-assert (procedure? (run-request-proc run-two-squared)))
- (test-equal ((run-request-proc run-two-squared)) 4)
- (test-equal (run-request-when run-two-squared) '(88 . 0)))
-
-(let ((run-two-squared (run (* 2 2))))
- (test-assert (run-request? run-two-squared))
- (test-assert (procedure? (run-request-proc run-two-squared)))
- (test-equal ((run-request-proc run-two-squared)) 4)
- (test-eq (run-request-when run-two-squared) #f))
-
-(let ((run-two-squared (run-at (* 2 2) '(88 . 0))))
- (test-assert (run-request? run-two-squared))
- (test-assert (procedure? (run-request-proc run-two-squared)))
- (test-equal ((run-request-proc run-two-squared)) 4)
- (test-equal (run-request-when run-two-squared) '(88 . 0)))
-
-
-;;; %run, %sync and friends tests
-;;; -----------------------------
-
-(define (test-%run-and-friends async-request expected-when)
- (let* ((fake-kont (speak-it))
- (run-request ((@@ (eightsync agenda) setup-async-request)
- fake-kont async-request)))
- (test-equal (car async-request) '*async-request*)
- (test-equal (run-request-when run-request) expected-when)
- ;; we're using speaker as a fake continuation ;p
- ((run-request-proc run-request))
- (test-equal (fake-kont)
- '("applesauce"))))
-
-(test-%run-and-friends (%run (string-concatenate '("apple" "sauce")))
- #f)
-
-(test-%run-and-friends (%run-at (string-concatenate '("apple" "sauce"))
- '(8 . 0))
- '(8 . 0))
-
-(test-%run-and-friends (%run-delay (string-concatenate '("apple" "sauce"))
- 8)
- ;; whoa, I'm surprised equal? can
- ;; compare records like this
- (tdelta 8 0))
-
-;; TODO: test %port-request
-;; TODO: test %sync and friends!
-
-
-;;; Agenda tests
-;;; ------------
-
-;; helpers
-
-(define (true-after-n-times n)
- (let ((count 0))
- (lambda _
- (set! count (+ count 1))
- (if (>= count n) #t #f))))
-
-;; the dummy test
-
-(define speaker (speak-it))
-
-(define (dummy-func)
- (speaker "I'm a dummy\n"))
-
-(define (run-dummy)
- (speaker "I bet I can make you say you're a dummy!\n")
- (run-it dummy-func))
-
-(let ((q (make-q)))
- (set! speaker (speak-it)) ; reset the speaker
- (enq! q run-dummy)
- (start-agenda (make-agenda #:queue q)
- #:stop-condition (true-after-n-times 2))
- (test-equal (speaker)
- '("I bet I can make you say you're a dummy!\n"
- "I'm a dummy\n")))
-
-;; should only do the first one after one round though
-(let ((q (make-q)))
- (set! speaker (speak-it)) ; reset the speaker
- (enq! q run-dummy)
- (start-agenda (make-agenda #:queue q)
- #:stop-condition (true-after-n-times 1))
- (test-equal (speaker)
- '("I bet I can make you say you're a dummy!\n")))
-
-;; delimited continuation tests
-
-(define (return-monkey)
- (speaker "(Hint, it's a monkey...)\n")
- 'monkey)
-
-(define (talk-about-the-zoo)
- (speaker "Today I went to the zoo and I saw...\n")
- (speaker
- (string-concatenate
- `("A " ,(symbol->string (%sync (%run (return-monkey)))) "!\n"))))
-
-(let ((q (make-q)))
- (set! speaker (speak-it))
- (enq! q talk-about-the-zoo)
- ;; (enq! q talk-about-the-zoo-but-wait)
- (start-agenda (make-agenda #:queue q)
- #:stop-condition (true-after-n-times 10))
- (test-equal (speaker)
- '("Today I went to the zoo and I saw...\n"
- "(Hint, it's a monkey...)\n"
- "A monkey!\n")))
-
-;; End tests
-
-(test-end "tests")
-;; (test-exit)
-
--- /dev/null
+;; Copyright (C) 2015 Christopher Allan Webber <cwebber@dustycloud.org>
+
+;; This library is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU Lesser General Public
+;; License as published by the Free Software Foundation; either
+;; version 3 of the License, or (at your option) any later version.
+;;
+;; This library is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+;; Lesser General Public License for more details.
+;;
+;; You should have received a copy of the GNU Lesser General Public
+;; License along with this library; if not, write to the Free Software
+;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+;; 02110-1301 USA
+
+#!/usr/bin/guile \
+-s
+!#
+
+(define-module (tests test-core)
+ #:use-module (srfi srfi-64)
+ #:use-module (ice-9 q)
+ #:use-module (ice-9 receive)
+ #:use-module (eightsync agenda))
+
+(test-begin "tests-agenda")
+
+\f
+
+;;; Helpers
+;;; =======
+
+(define (speak-it)
+ (let ((messages '()))
+ (lambda* (#:optional message)
+ (if message (set! messages (append messages (list message))))
+ messages)))
+
+\f
+;; Timer tests
+;; ===========
+
+(test-assert (time= '(1 . 1) '(1 . 1)))
+(test-assert (not (time= '(1 . 1) '(1 . 0))))
+(test-assert (not (time= '(0 . 1) '(1 . 1))))
+
+(test-assert (time< '(1 . 1) '(1 . 2)))
+(test-assert (time< '(7 . 2) '(8 . 2)))
+(test-assert (not (time< '(7 . 2) '(7 . 2))))
+(test-assert (not (time< '(7 . 8) '(7 . 2))))
+(test-assert (not (time< '(8 . 2) '(7 . 2))))
+
+(let ((tdelta (make-time-delta 8)))
+ (test-assert (time-delta? tdelta))
+ (test-eqv (time-delta-sec tdelta) 8)
+ (test-eqv (time-delta-usec tdelta) 0)
+ (test-equal
+ (time-delta+ '(2 . 3) tdelta)
+ '(10 . 3)))
+
+(let ((tdelta (make-time-delta 10 1)))
+ (test-assert (time-delta? tdelta))
+ (test-eqv (time-delta-sec tdelta) 10)
+ (test-eqv (time-delta-usec tdelta) 1)
+ (test-equal
+ (time-delta+ '(2 . 3) tdelta)
+ '(12 . 4)))
+
+
+\f
+;;; Schedule tests
+;;; ==============
+
+;; helpers
+(define (assert-times-expected time-segments expected-times)
+ (test-equal (map time-segment-time time-segments)
+ expected-times))
+
+(define a-proc (const 'a))
+(define b-proc (const 'b))
+(define c-proc (const 'c))
+(define d-proc (const 'd))
+(define e-proc (const 'e))
+(define f-proc (const 'f))
+
+(define sched (make-schedule))
+(test-assert (schedule-empty? sched))
+
+;; Add a segment at (10 . 0)
+(schedule-add! sched 10 a-proc)
+(test-assert (not (schedule-empty? sched)))
+(test-equal (length (schedule-segments sched)) 1)
+(test-equal (time-segment-time (car (schedule-segments sched)))
+ '(10 . 0))
+(test-equal (q-length (time-segment-queue (car (schedule-segments sched))))
+ 1)
+(test-eq (q-front (time-segment-queue (car (schedule-segments sched))))
+ a-proc)
+(test-eq (q-rear (time-segment-queue (car (schedule-segments sched))))
+ a-proc)
+(test-eq ((q-front (time-segment-queue (car (schedule-segments sched)))))
+ 'a) ;; why not
+(assert-times-expected (schedule-segments sched)
+ '((10 . 0)))
+
+;; Add another segment at (10 . 0)
+(schedule-add! sched '(10 . 0) b-proc)
+(test-assert (not (schedule-empty? sched)))
+(test-equal (length (schedule-segments sched)) 1)
+(test-equal (time-segment-time (car (schedule-segments sched)))
+ '(10 . 0))
+(test-equal (q-length (time-segment-queue (car (schedule-segments sched))))
+ 2)
+(test-eq (q-front (time-segment-queue (car (schedule-segments sched))))
+ a-proc)
+(test-eq (q-rear (time-segment-queue (car (schedule-segments sched))))
+ b-proc)
+(assert-times-expected (schedule-segments sched)
+ '((10 . 0)))
+
+;; Add a segment to (11 . 0), (8 . 1) and (10 . 10)
+(schedule-add! sched 11 c-proc)
+(schedule-add! sched '(8 . 1) d-proc)
+(schedule-add! sched '(10 . 10) e-proc)
+(test-assert (not (schedule-empty? sched)))
+(test-equal (length (schedule-segments sched)) 4)
+(assert-times-expected (schedule-segments sched)
+ '((8 . 1) (10 . 0) (10 . 10) (11 . 0)))
+
+;; Splitting
+(define (test-split-at schedule time expected-before expected-after)
+ (receive (segments-before segments-after)
+ (schedule-segments-split schedule time)
+ (assert-times-expected segments-before expected-before)
+ (assert-times-expected segments-after expected-after)))
+
+(test-split-at sched 0
+ '()
+ '((8 . 1) (10 . 0) (10 . 10) (11 . 0)))
+(test-split-at sched '(8 . 0)
+ '()
+ '((8 . 1) (10 . 0) (10 . 10) (11 . 0)))
+(test-split-at sched '(8 . 1)
+ '((8 . 1))
+ '((10 . 0) (10 . 10) (11 . 0)))
+(test-split-at sched 9
+ '((8 . 1))
+ '((10 . 0) (10 . 10) (11 . 0)))
+(test-split-at sched 10
+ '((8 . 1) (10 . 0))
+ '((10 . 10) (11 . 0)))
+(test-split-at sched 9000
+ '((8 . 1) (10 . 0) (10 . 10) (11 . 0))
+ '())
+(test-split-at sched '(9000 . 1) ; over nine thousaaaaaaand
+ '((8 . 1) (10 . 0) (10 . 10) (11 . 0))
+ '())
+
+;; Break off half of those and do some tests on them
+(define some-extracted
+ (schedule-extract-until! sched 10))
+(assert-times-expected some-extracted '((8 . 1) (10 . 0)))
+(assert-times-expected (schedule-segments sched) '((10 . 10) (11 . 0)))
+(define first-extracted-queue
+ (time-segment-queue (car some-extracted)))
+(define second-extracted-queue
+ (time-segment-queue (cadr some-extracted)))
+(test-assert (not (q-empty? first-extracted-queue)))
+(test-equal ((deq! first-extracted-queue)) 'd)
+(test-assert (q-empty? first-extracted-queue))
+
+(test-assert (not (q-empty? second-extracted-queue)))
+(test-equal ((deq! second-extracted-queue)) 'a)
+(test-equal ((deq! second-extracted-queue)) 'b)
+(test-assert (q-empty? second-extracted-queue))
+
+;; Add one more and test flattening to a queue
+(test-assert (not (schedule-empty? sched)))
+(schedule-add! sched '(10 . 10) f-proc)
+(define remaining-segments
+ (schedule-extract-until! sched '(9000 . 1)))
+(test-assert (schedule-empty? sched))
+(define some-queue (make-q))
+(enq! some-queue (const 'ho-ho))
+(enq! some-queue (const 'ha-ha))
+(add-segments-contents-to-queue! remaining-segments some-queue)
+(test-assert (not (q-empty? some-queue)))
+(test-equal 'ho-ho ((deq! some-queue)))
+(test-equal 'ha-ha ((deq! some-queue)))
+(test-equal 'e ((deq! some-queue)))
+(test-equal 'f ((deq! some-queue)))
+(test-equal 'c ((deq! some-queue)))
+(test-assert (q-empty? some-queue))
+
+;; ... whew!
+
+;; Run/wrap request stuff
+;; ----------------------
+
+(let ((wrapped (wrap (+ 1 2))))
+ (test-assert (procedure? wrapped))
+ (test-equal (wrapped) 3))
+
+(let ((run-two-squared (run-it (lambda () (* 2 2)))))
+ (test-assert (run-request? run-two-squared))
+ (test-assert (procedure? (run-request-proc run-two-squared)))
+ (test-equal ((run-request-proc run-two-squared)) 4)
+ (test-eq (run-request-when run-two-squared) #f))
+
+(let ((run-two-squared (run-it (lambda () (* 2 2)) '(88 . 0))))
+ (test-assert (run-request? run-two-squared))
+ (test-assert (procedure? (run-request-proc run-two-squared)))
+ (test-equal ((run-request-proc run-two-squared)) 4)
+ (test-equal (run-request-when run-two-squared) '(88 . 0)))
+
+(let ((run-two-squared (run (* 2 2))))
+ (test-assert (run-request? run-two-squared))
+ (test-assert (procedure? (run-request-proc run-two-squared)))
+ (test-equal ((run-request-proc run-two-squared)) 4)
+ (test-eq (run-request-when run-two-squared) #f))
+
+(let ((run-two-squared (run-at (* 2 2) '(88 . 0))))
+ (test-assert (run-request? run-two-squared))
+ (test-assert (procedure? (run-request-proc run-two-squared)))
+ (test-equal ((run-request-proc run-two-squared)) 4)
+ (test-equal (run-request-when run-two-squared) '(88 . 0)))
+
+
+;;; %run, %sync and friends tests
+;;; -----------------------------
+
+(define (test-%run-and-friends async-request expected-when)
+ (let* ((fake-kont (speak-it))
+ (run-request ((@@ (eightsync agenda) setup-async-request)
+ fake-kont async-request)))
+ (test-equal (car async-request) '*async-request*)
+ (test-equal (run-request-when run-request) expected-when)
+ ;; we're using speaker as a fake continuation ;p
+ ((run-request-proc run-request))
+ (test-equal (fake-kont)
+ '("applesauce"))))
+
+(test-%run-and-friends (%run (string-concatenate '("apple" "sauce")))
+ #f)
+
+(test-%run-and-friends (%run-at (string-concatenate '("apple" "sauce"))
+ '(8 . 0))
+ '(8 . 0))
+
+(test-%run-and-friends (%run-delay (string-concatenate '("apple" "sauce"))
+ 8)
+ ;; whoa, I'm surprised equal? can
+ ;; compare records like this
+ (tdelta 8 0))
+
+;; TODO: test %port-request
+;; TODO: test %sync and friends!
+
+
+;;; Agenda tests
+;;; ------------
+
+;; helpers
+
+(define (true-after-n-times n)
+ (let ((count 0))
+ (lambda _
+ (set! count (+ count 1))
+ (if (>= count n) #t #f))))
+
+;; the dummy test
+
+(define speaker (speak-it))
+
+(define (dummy-func)
+ (speaker "I'm a dummy\n"))
+
+(define (run-dummy)
+ (speaker "I bet I can make you say you're a dummy!\n")
+ (run-it dummy-func))
+
+(let ((q (make-q)))
+ (set! speaker (speak-it)) ; reset the speaker
+ (enq! q run-dummy)
+ (start-agenda (make-agenda #:queue q)
+ #:stop-condition (true-after-n-times 2))
+ (test-equal (speaker)
+ '("I bet I can make you say you're a dummy!\n"
+ "I'm a dummy\n")))
+
+;; should only do the first one after one round though
+(let ((q (make-q)))
+ (set! speaker (speak-it)) ; reset the speaker
+ (enq! q run-dummy)
+ (start-agenda (make-agenda #:queue q)
+ #:stop-condition (true-after-n-times 1))
+ (test-equal (speaker)
+ '("I bet I can make you say you're a dummy!\n")))
+
+;; delimited continuation tests
+
+(define (return-monkey)
+ (speaker "(Hint, it's a monkey...)\n")
+ 'monkey)
+
+(define (talk-about-the-zoo)
+ (speaker "Today I went to the zoo and I saw...\n")
+ (speaker
+ (string-concatenate
+ `("A " ,(symbol->string (%sync (%run (return-monkey)))) "!\n"))))
+
+(let ((q (make-q)))
+ (set! speaker (speak-it))
+ (enq! q talk-about-the-zoo)
+ ;; (enq! q talk-about-the-zoo-but-wait)
+ (start-agenda (make-agenda #:queue q)
+ #:stop-condition (true-after-n-times 10))
+ (test-equal (speaker)
+ '("Today I went to the zoo and I saw...\n"
+ "(Hint, it's a monkey...)\n"
+ "A monkey!\n")))
+
+;; End tests
+
+(test-end "tests-agenda")
+;; (test-exit)
+
projects / 8sync.git / commitdiff