Overview
Comment: | wip |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v1.6569-new-view |
Files: | files | file ages | folders |
SHA1: |
b3df55613bb94fa2a3ebe908b99a476a |
User & Date: | mrwellan on 2021-03-01 19:26:48 |
Other Links: | branch diff | manifest | tags |
Context
2021-03-02
| ||
07:59 | Patched in remaining changes from new-view branch but it still doesn't work Closed-Leaf check-in: fd85f0d7b7 user: mrwellan tags: v1.6569-new-view | |
2021-03-01
| ||
19:26 | wip check-in: b3df55613b user: mrwellan tags: v1.6569-new-view | |
17:42 | Manually patched in the new view check-in: f5206150ee user: mrwellan tags: v1.6569-new-view | |
Changes
Modified Makefile from [0dc94ad098] to [3bc35c6cb9].
︙ | ︙ | |||
85 86 87 88 89 90 91 | mtest: $(OFILES) readline-fix.scm megatest.o $(MOFILES) $(MOIMPFILES) megatest-version.scm csc $(CSCOPTS) $(OFILES) $(MOFILES) $(MOIMPFILES) megatest.o -o mtest showmtesthash: @echo $(MTESTHASH) | | | 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 | mtest: $(OFILES) readline-fix.scm megatest.o $(MOFILES) $(MOIMPFILES) megatest-version.scm csc $(CSCOPTS) $(OFILES) $(MOFILES) $(MOIMPFILES) megatest.o -o mtest showmtesthash: @echo $(MTESTHASH) dboard : $(OFILES) $(GOFILES) dashboard.scm $(MOFILES) $(MOIMPFILES) megatest-version.scm megatest-fossil-hash.scm dashboard-new-runs-view.scm csc $(CSCOPTS) $(OFILES) dashboard.scm $(GOFILES) $(MOFILES) $(MOIMPFILES) -o dboard mtut: $(OFILES) $(MOFILES) megatest-fossil-hash.scm mtut.scm megatest-version.scm csc $(CSCOPTS) $(OFILES) $(MOFILES) mtut.scm -o mtut # include makefile.inc |
︙ | ︙ | |||
178 179 180 181 182 183 184 185 186 187 188 189 190 191 | # configf.o : mofiles/commonmod.o vg.o dashboard.o : vg_records.scm megatest-version.scm dcommon.o : run_records.scm mofiles/stml2.o : mofiles/cookie.o # # special include based modules # mofiles/pkts.o : pkts/pkts.scm # mofiles/stml2.o : cookie.o # # mofiles/mtargs.o : mtargs/mtargs.scm # # mofiles/mtconfigf.o : mtconfigf/mtconfigf.scm # mofiles/ulex.o : ulex/ulex.scm | > > | 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 | # configf.o : mofiles/commonmod.o vg.o dashboard.o : vg_records.scm megatest-version.scm dcommon.o : run_records.scm mofiles/stml2.o : mofiles/cookie.o dashboard.scm : # # special include based modules # mofiles/pkts.o : pkts/pkts.scm # mofiles/stml2.o : cookie.o # # mofiles/mtargs.o : mtargs/mtargs.scm # # mofiles/mtconfigf.o : mtconfigf/mtconfigf.scm # mofiles/ulex.o : ulex/ulex.scm |
︙ | ︙ |
Modified dashboard-new-runs-view.scm from [24de2d2df6] to [75c9fe805c].
|
| | | 1 2 3 4 5 6 7 8 | ;:rdat;====================================================================== ;; Extracting the data to display for runs ;; ;; This needs to be re-entrant such that it does one column per call ;; on the zeroeth call update runs data ;; on each subsequent call update one run (configurable - could do two, three ... or update until tdelta exceeded ;; on last run reset to zeroeth ;; |
︙ | ︙ | |||
32 33 34 35 36 37 38 39 | ;; (define (dashboard:update-runs-data rdat) (let* ((tb (dboard:rdat-runs-tree rdat)) (targ-sql-filt (dboard:rdat-targ-sql-filt rdat)) (runname-sql-filt (dboard:rdat-runname-sql-filt rdat)) (state-sql-filt (dboard:rdat-run-state-sql-filt rdat)) (status-sql-filt (dboard:rdat-run-status-sql-filt rdat)) ;; Use (db:get-value-by-header (db:get-header runinfo)(db:get-rows runinfo)) | > > > | > > > > > > | 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 | ;; (define (dashboard:update-runs-data rdat) (let* ((tb (dboard:rdat-runs-tree rdat)) (targ-sql-filt (dboard:rdat-targ-sql-filt rdat)) (runname-sql-filt (dboard:rdat-runname-sql-filt rdat)) (state-sql-filt (dboard:rdat-run-state-sql-filt rdat)) (status-sql-filt (dboard:rdat-run-status-sql-filt rdat)) (offset (dboard:rdat-runs-offset rdat)) (count (dboard:rdat-runs-count rdat)) ;; Use (db:get-value-by-header (db:get-header runinfo)(db:get-rows runinfo)) (data (rmt:simple-get-runs runname-sql-filt count offset targ-sql-filt #f)) (numruns (length data))) (print "Scan runs, offset: "offset" numruns: "numruns" count: "count) (if (< numruns count) ;; i.e. there are no more runs to get (begin (dboard:rdat-runs-offset-set! rdat 0)) ;; start over (dboard:rdat-runs-offset-set! rdat (+ (dboard:rdat-runs-offset rdat) numruns))) ;; store in the runsbynum vector (dboard:rdat-runsbynum-set! rdat (list->vector data)) ;; update runs id => runrec ;; update targ-runid target/runname => run-id (for-each (lambda (runrec) (let* ((run-id (simple-run-id runrec)) |
︙ | ︙ | |||
154 155 156 157 158 159 160 161 162 163 164 165 166 167 | (let* ((run-tests-data (dboard:rdat-run-tests rdat)) ;; from dbmod.scm (define-record simple-run target id runname state status owner event_time) (run-tests-mtx (dboard:rdat-runs-mtx rdat)) (runs-by-num (dboard:rdat-runsbynum rdat)) ;; this is the sequence num (num-runs (vector-length runs-by-num)) ) (debug:print 0 *default-log-port* "num-runs: " num-runs) (let loop ((col-num 1)) (let* ((runrec (vector-ref runs-by-num (- col-num 1))) (run-id (simple-run-id runrec)) (target (simple-run-target runrec)) (runname (simple-run-runname runrec)) (vert-targ (string-translate (conc target "/" runname) "/" "\n")) (run-tests (sparse-vector-ref run-tests-data run-id)) (changed #f)) ;; manage redraws on a column by column basis | > | > > | | 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 | (let* ((run-tests-data (dboard:rdat-run-tests rdat)) ;; from dbmod.scm (define-record simple-run target id runname state status owner event_time) (run-tests-mtx (dboard:rdat-runs-mtx rdat)) (runs-by-num (dboard:rdat-runsbynum rdat)) ;; this is the sequence num (num-runs (vector-length runs-by-num)) ) (debug:print 0 *default-log-port* "num-runs: " num-runs) (let loop ((col-num 1)) (print "col-num: "col-num) (let* ((runrec (vector-ref runs-by-num (- col-num 1))) (run-id (simple-run-id runrec)) (target (simple-run-target runrec)) (runname (simple-run-runname runrec)) (vert-targ (string-translate (conc target "/" runname) "/" "\n")) (run-tests (sparse-vector-ref run-tests-data run-id)) (changed #f)) ;; manage redraws on a column by column basis (debug:print 0 *default-log-port* "num-runs: "num-runs" run-tests: "run-tests) (if (null? run-tests) ;; empty run (if (< col-num num-runs) ;; NOT CORRECT (begin (print "Empty run, num-runs: "num-runs" col-num: "col-num) (loop (+ col-num 1)))) (begin (set! changed (dcommon:modifiy-if-different ;; set the col header run-tests-mtx (conc "0:" col-num) vert-targ changed)) (let testloop ((inum 0) |
︙ | ︙ |
Modified dashboard.scm from [09014c2a40] to [0d082931fc].
︙ | ︙ | |||
449 450 451 452 453 454 455 456 457 458 459 460 461 462 | (toprow 0) ;; topmost visible row (numcols 24) ;; number of columns visible (numrows 20) ;; number of rows visible ;; data from sql db (keys (rmt:get-keys)) ;; to be removed when targets handling is refactored (runs (make-sparse-vector)) ;; id => runrec (runsbynum (make-vector 100 #f)) ;; vector num => runrec (targ-runid (make-hash-table)) ;; area/target/runname => run-id ;; not sure this will be needed (tests (make-hash-table)) ;; test[/itempath] => list of test rec ;; run sql filters (targ-sql-filt "%") (runname-sql-filt "%") | > > > | 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 | (toprow 0) ;; topmost visible row (numcols 24) ;; number of columns visible (numrows 20) ;; number of rows visible ;; data from sql db (keys (rmt:get-keys)) ;; to be removed when targets handling is refactored (runs (make-sparse-vector)) ;; id => runrec (runs-offset 0) ;; paginator pointer (used for offset) (runs-count 5) ;; how many runs to get on each call (run-tests (make-sparse-vector '())) ;; id => list of tests (runsbynum (make-vector 100 #f)) ;; vector num => runrec (targ-runid (make-hash-table)) ;; area/target/runname => run-id ;; not sure this will be needed (tests (make-hash-table)) ;; test[/itempath] => list of test rec ;; run sql filters (targ-sql-filt "%") (runname-sql-filt "%") |
︙ | ︙ |