Index: commonmod.scm ================================================================== --- commonmod.scm +++ commonmod.scm @@ -172,10 +172,11 @@ runs:runrec-serverdat runs:runrec-transport runs:runrec-db runs:runrec-top-path runs:runrec-run_id +test:testdat? test:get-id test:get-run_id test:get-test-name test:get-state test:get-status @@ -849,10 +850,14 @@ (define (test:get-test-name vec)(vector-ref vec 2)) (define (test:get-state vec) (vector-ref vec 3)) (define (test:get-status vec) (vector-ref vec 4)) (define (test:get-item-path vec)(vector-ref vec 5)) +(define (test:testdat? testdat) + (and (vector? testdat) + (>= (vector-length testdat) 6))) + (define (test:test-get-fullname test) (conc (db:test-get-testname test) (if (equal? (db:test-get-item-path test) "") "" (conc "(" (db:test-get-item-path test) ")")))) Index: dashboard.scm ================================================================== --- dashboard.scm +++ dashboard.scm @@ -249,33 +249,33 @@ ;; (begin ;; (debug:print-info 0 *default-log-port* "Forcing db-cache mode due to read-only access to megatest.db") ;; (hash-table-set! args:arg-hash "-use-db-cache" #t)));;;) ;;) -;; data common to all tabs goes here +;;;; data common to all tabs goes here +;;;; +;;(defstruct dboard:commondat +;; ((curr-tab-num 0) : number) +;; please-update +;; tabdats +;; update-mutex +;; updaters +;; updating +;; uidat ;; needs to move to tabdat at some time +;; hide-not-hide-tabs +;; ) ;; -(defstruct dboard:commondat - ((curr-tab-num 0) : number) - please-update - tabdats - update-mutex - updaters - updating - uidat ;; needs to move to tabdat at some time - hide-not-hide-tabs - ) - -(define (dboard:commondat-make) - (make-dboard:commondat - curr-tab-num: 0 - tabdats: (make-hash-table) - please-update: #t - update-mutex: (make-mutex) - updaters: (make-hash-table) - updating: #f - hide-not-hide-tabs: #f - )) +;;(define (dboard:commondat-make) +;; (make-dboard:commondat +;; curr-tab-num: 0 +;; tabdats: (make-hash-table) +;; please-update: #t +;; update-mutex: (make-mutex) +;; updaters: (make-hash-table) +;; updating: #f +;; hide-not-hide-tabs: #f +;; )) ;;====================================================================== ;; buttons color using image ;;====================================================================== @@ -1050,11 +1050,11 @@ ) ;; create a concise list of test names ;; (for-each (lambda (rundat) - (if rundat + (if (dboard:rundat? rundat) (let* ((testdats (dboard:rundat-tests rundat)) (testnames (map test:test-get-fullname (hash-table-values testdats)))) (dcommon:rundat-copy-tests-to-by-name rundat) ;; for the normalized list of testnames (union of all runs) (if (not (and (dboard:tabdat-hide-empty-runs tabdat) Index: dcommon.scm ================================================================== --- dcommon.scm +++ dcommon.scm @@ -549,11 +549,13 @@ (if (and (hash-table? src-ht)(hash-table? trg-ht)) (begin (hash-table-clear! trg-ht) (for-each (lambda (testdat) - (hash-table-set! trg-ht (test:test-get-fullname testdat) testdat)) + (if (test:testdat? testdat) + (hash-table-set! trg-ht (test:test-get-fullname testdat) testdat) + (debug:print 0 *default-log-port* "WARNING: invalid testdat record: "testdat))) (hash-table-values src-ht))) (debug:print 0 *default-log-port* "WARNING: src-ht " src-ht " trg-ht " trg-ht)))) ;;====================================================================== Index: ulex-simple/dbmgr.scm ================================================================== --- ulex-simple/dbmgr.scm +++ ulex-simple/dbmgr.scm @@ -41,10 +41,11 @@ chicken.process chicken.process-context chicken.process-context.posix chicken.sort chicken.string + chicken.tcp chicken.time (prefix sqlite3 sqlite3:) matchable md5 @@ -67,11 +68,11 @@ (prefix mtargs args:) portloggermod ) ;; Configurations for server -;; (tcp-buffer-size 2048) +(tcp-buffer-size 2048) ;; (max-connections 2048) ;; info about me as a listener and my connections to db servers ;; stored (for now) in *db-serv-info* ;;