Index: debugger.scm ================================================================== --- debugger.scm +++ debugger.scm @@ -17,27 +17,28 @@ (mtrx (matrix #:expand "YES" #:numlin 30 #:numcol 3 #:numlin-visible 20 - #:numcol-visible 3 + #:numcol-visible 2 + #:alignment1 "ALEFT" ))) (set! pause (button "Pause" #:action (lambda (obj) (set! *debugger-control* (not *debugger-control*)) (attribute-set! pause "BGCOLOR" (if *debugger-control* "200 0 0" "0 0 200"))))) (set! *debugger-matrix* mtrx) - (attribute-set! mtrx "WIDTH1" "200") + (attribute-set! mtrx "WIDTH1" "300") (vbox mtrx (hbox pause))))) (main-loop))))))) -(define (debugger-start #!key (start 1)) +(define (debugger-start #!key (start 2)) (set! *debugger-rownum* start)) (define (debugger-trace-var varname varval) (let ((oldval (attribute *debugger-matrix* (conc *debugger-rownum* ":1"))) (newval (conc varval))) @@ -58,14 +59,15 @@ (if *debugger-control* (begin (print "PAUSED!") (thread-sleep! 1) (loop)) - (thread-sleep! 0.01)))) + ;;(thread-sleep! 0.01) + ))) ;; ;; lets use the debugger eh? ;; (debugger-start) ;; (debugger-trace-var "can-run-more" can-run-more) ;; (debugger-trace-var "hed" hed) ;; (debugger-trace-var "prereqs-not-met" (runs:pretty-string prereqs-not-met)) ;; (debugger-pauser) Index: rmt.scm ================================================================== --- rmt.scm +++ rmt.scm @@ -73,11 +73,11 @@ #f)))) (define *send-receive-mutex* (make-mutex)) ;; should have separate mutex per run-id (define (rmt:send-receive cmd rid params #!key (attemptnum 1)) ;; start attemptnum at 1 so the modulo below works as expected ;; clean out old connections - (mutex-lock! *db-multi-sync-mutex*) + ;; (mutex-lock! *db-multi-sync-mutex*) (let ((expire-time (- (current-seconds) (server:get-timeout) 10))) ;; don't forget the 10 second margin (for-each (lambda (run-id) (let ((connection (hash-table-ref/default *runremote* run-id #f))) (if (and (vector? connection) @@ -88,11 +88,11 @@ (case *transport-type* ((nmsg)(nn-close (http-transport:server-dat-get-socket (hash-table-ref *runremote* run-id))))) (hash-table-delete! *runremote* run-id))))) (hash-table-keys *runremote*))) - (mutex-unlock! *db-multi-sync-mutex*) + ;; (mutex-unlock! *db-multi-sync-mutex*) ;; (mutex-lock! *send-receive-mutex*) (let* ((run-id (if rid rid 0)) (connection-info (rmt:get-connection-info run-id))) ;; the nmsg method does the encoding under the hood (the http method should be changed to do this also) (if connection-info Index: runs.scm ================================================================== --- runs.scm +++ runs.scm @@ -490,11 +490,12 @@ "\n reruns: " reruns "\n items: " items "\n can-run-more: " can-run-more) ;; lets use the debugger eh? - (debugger-start) + (debugger-start start: 2) + (debugger-trace-var "runs:expand-items" "") (debugger-trace-var "can-run-more" can-run-more) (debugger-trace-var "hed" hed) (debugger-trace-var "prereqs-not-met" (runs:pretty-string prereqs-not-met)) (debugger-pauser) @@ -1041,14 +1042,16 @@ "\n reglen: " reglen "\n length reg: " (length reg) "\n reg: " reg) ;; lets use the debugger eh? - (debugger-start start: 5) + (debugger-start start: 7) (debugger-trace-var "runs:run-tests-queue" "") - (debugger-trace-var "items" items) (debugger-trace-var "hed" hed) + (debugger-trace-var "tal" tal) + (debugger-trace-var "items" items) + (debugger-trace-var "item-path" item-path) (debugger-trace-var "waitons" waitons) (debugger-pauser) ;; check for hed in waitons => this would be circular, remove it and issue an