Index: megatest-version.scm ================================================================== --- megatest-version.scm +++ megatest-version.scm @@ -1,7 +1,7 @@ ;; Always use two digit decimal ;; 1.01, 1.02...1.10,1.11 ... 1.99,2.00.. (declare (unit megatest-version)) -(define megatest-version 1.5211) +(define megatest-version 1.5212) Index: mockup-cached-writes.scm ================================================================== --- mockup-cached-writes.scm +++ mockup-cached-writes.scm @@ -1,22 +1,31 @@ (define (make-cached-writer the-db) (let ((db the-db) (queue '())) - (lambda (cacheable . qry-params) + (lambda (cacheable . qry-params) ;; fn qry (if cacheable - (set! queue (cons qry-params queue)) + (begin + (set! queue (cons qry-params queue)) + (call/cc)) (begin (print "Starting transaction") (for-each (lambda (queue-item) - (print "WRITE to " db ": " queue-item)) + (let ((fn (car queue-item)) + (qry (cdr queue-item))) + (print "WRITE to " db ": " qry) + ) (reverse queue)) (print "End transaction") (print "READ from " db ": " qry-params)))))) -(define a (make-cached-writer "the db")) -(a #t "insert abc") -(a #t "insert def") -(a #t "insert hij") -(a #f "select foo") +(define *cw* (make-cached-writer "the db")) + +(define (dbcall cacheable query) + (*cw* cacheable query)) + +(dbcall #t "insert abc") +(dbcall #t "insert def") +(dbcall #t "insert hij") +(dbcall #f "select foo") Index: runs.scm ================================================================== --- runs.scm +++ runs.scm @@ -120,11 +120,11 @@ itemdat)) (define *last-num-running-tests* 0) (define *runs:can-run-more-tests-delay* 0) (define (runs:shrink-can-run-more-tests-delay) - (set! *runs:can-run-more-tests-delay* (/ *runs:can-run-more-tests-delay* 2))) + (set! *runs:can-run-more-tests-delay* 0)) ;; (/ *runs:can-run-more-tests-delay* 2))) (define (runs:can-run-more-tests test-record) (thread-sleep! *runs:can-run-more-tests-delay*) (let* ((tconfig (tests:testqueue-get-testconfig test-record)) (jobgroup (config-lookup tconfig "requirements" "jobgroup")) @@ -140,11 +140,11 @@ 1))) (job-group-limit (config-lookup *configdat* "jobgroups" jobgroup))) (if (and (> (+ num-running num-running-in-jobgroup) 0) (< *runs:can-run-more-tests-delay* 10)) (begin - (set! *runs:can-run-more-tests-delay* (+ *runs:can-run-more-tests-delay* 0.1)) + (set! *runs:can-run-more-tests-delay* (+ *runs:can-run-more-tests-delay* 1)) ;; 0.1)) (debug:print-info 14 "can-run-more-tests-delay: " *runs:can-run-more-tests-delay*))) (if (not (eq? *last-num-running-tests* num-running)) (begin (debug:print 2 "max-concurrent-jobs: " max-concurrent-jobs ", num-running: " num-running) (set! *last-num-running-tests* num-running)))