Changes In Branch v1.61
Through [1a47cc93d9]
Excluding Merge-Ins
This is equivalent to a diff from
96a1f6b9af
to 1a47cc93d9
Modified common.scm
from [f17c224b46]
to [b1aba2dd8c].
| ︙ | | |
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
|
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
|
-
+
|
;; given path get free space, allows override in [setup]
;; with free-space-script /path/to/some/script.sh
;;
(define (get-df path)
(if (configf:lookup *configdat* "setup" "free-space-script")
(with-input-from-pipe
(configf:lookup *configdat* "setup" "free-space-script")
(conc (configf:lookup *configdat* "setup" "free-space-script") " " path)
(lambda ()
(let ((res (read-line)))
(if (string? res)
(string->number res)))))
(get-unix-df path)))
(define (get-unix-df path)
|
| ︙ | | |
Modified dashboard.scm
from [078fb7a126]
to [f16124ad57].
| ︙ | | |
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
|
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
|
-
+
-
-
-
-
+
+
+
+
-
-
+
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
|
test1-older)
(if same-time
(string>? test-name1 test-name2)
test1-older))))
;; create a virtual table of all the tests
;; keypatts: ( (KEY1 "abc%def")(KEY2 "%") )
(define (update-rundat runnamepatt numruns testnamepatt keypatts)
(define (update-rundat data runnamepatt numruns testnamepatt keypatts)
(let* ((referenced-run-ids '())
(allruns (if (d:alldat-useserver *alldat*)
(rmt:get-runs runnamepatt numruns (d:alldat-start-run-offset *alldat*) keypatts)
(db:get-runs (d:alldat-dblocal *alldat*) runnamepatt numruns ;; (+ numruns 1) ;; (/ numruns 2))
(d:alldat-start-run-offset *alldat*) keypatts)))
(allruns (if (d:alldat-useserver data)
(rmt:get-runs runnamepatt numruns (d:alldat-start-run-offset data) keypatts)
(db:get-runs (d:alldat-dblocal data) runnamepatt numruns ;; (+ numruns 1) ;; (/ numruns 2))
(d:alldat-start-run-offset data) keypatts)))
(header (db:get-header allruns))
(runs (db:get-rows allruns))
(result '())
(maxtests 0)
(states (hash-table-keys (d:alldat-state-ignore-hash *alldat*)))
(statuses (hash-table-keys (d:alldat-status-ignore-hash *alldat*)))
(states (hash-table-keys (d:alldat-state-ignore-hash data)))
(statuses (hash-table-keys (d:alldat-status-ignore-hash data)))
(sort-info (get-curr-sort))
(sort-by (vector-ref sort-info 1))
(sort-order (vector-ref sort-info 2))
(bubble-type (if (member sort-order '(testname))
'testname
'itempath)))
;;
;; trim runs to only those that are changing often here
;;
(for-each (lambda (run)
(let* ((run-id (db:get-value-by-header run header "id"))
(key-vals (if (d:alldat-useserver *alldat*)
(key-vals (if (d:alldat-useserver data)
(rmt:get-key-vals run-id)
(db:get-key-vals (d:alldat-dblocal *alldat*) run-id)))
(prev-dat (let ((rec (hash-table-ref/default (d:alldat-allruns-by-id *alldat*) run-id #f)))
(db:get-key-vals (d:alldat-dblocal data) run-id)))
(prev-dat (let ((rec (hash-table-ref/default (d:alldat-allruns-by-id data) run-id #f)))
(if rec rec (vector run '() key-vals -100)))) ;; -100 is before time began
(prev-tests (vector-ref prev-dat 1))
(last-update (vector-ref prev-dat 3))
(tmptests (if (d:alldat-useserver *alldat*)
(tmptests (if (d:alldat-useserver data)
(rmt:get-tests-for-run run-id testnamepatt states statuses
#f #f
(d:alldat-hide-not-hide *alldat*)
(d:alldat-hide-not-hide data)
sort-by
sort-order
'shortlist
last-update)
(db:get-tests-for-run (d:alldat-dblocal *alldat*) run-id testnamepatt states statuses
(db:get-tests-for-run (d:alldat-dblocal data) run-id testnamepatt states statuses
#f #f
(d:alldat-hide-not-hide *alldat*)
(d:alldat-hide-not-hide data)
sort-by
sort-order
'shortlist
last-update)))
(tests (let ((newdat (filter
(lambda (x)
(not (equal? (db:test-get-state x) "DELETED"))) ;; remove deleted tests but do it after merging
(delete-duplicates (append tmptests prev-tests)
(lambda (a b)
(eq? (db:test-get-id a)(db:test-get-id b)))))))
(if (eq? *tests-sort-reverse* 3) ;; +event_time
(sort newdat compare-tests)
newdat))))
;; NOTE: bubble-up also sets the global (d:alldat-item-test-names *alldat*)
;; NOTE: bubble-up also sets the global (d:alldat-item-test-names data)
;; (tests (bubble-up tmptests priority: bubble-type))
;; NOTE: 11/01/2013 This routine is *NOT* getting called excessively.
;; (debug:print 0 "Getting data for run " run-id " with key-vals=" key-vals)
;; Not sure this is needed?
(set! referenced-run-ids (cons run-id referenced-run-ids))
(if (> (length tests) maxtests)
(set! maxtests (length tests)))
(if (or (not (d:alldat-hide-empty-runs *alldat*)) ;; this reduces the data burden when set
(if (or (not (d:alldat-hide-empty-runs data)) ;; this reduces the data burden when set
(not (null? tests)))
(let ((dstruct (vector run tests key-vals (- (current-seconds) 10))))
(hash-table-set! (d:alldat-allruns-by-id *alldat*) run-id dstruct)
(hash-table-set! (d:alldat-allruns-by-id data) run-id dstruct)
(set! result (cons dstruct result))))))
runs)
(d:alldat-header-set! *alldat* header)
(d:alldat-allruns-set! *alldat* result)
(debug:print-info 6 "(d:alldat-allruns *alldat*) has " (length (d:alldat-allruns *alldat*)) " runs")
(d:alldat-header-set! data header)
(d:alldat-allruns-set! data result)
(debug:print-info 6 "(d:alldat-allruns data) has " (length (d:alldat-allruns data)) " runs")
maxtests))
(define *collapsed* (make-hash-table))
; (define *row-lookup* (make-hash-table)) ;; testname => (rownum lableobj)
(define (toggle-hide lnum) ; fulltestname)
(let* ((btn (vector-ref (dboard:uidat-get-lftcol uidat) lnum))
|
| ︙ | | |
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
|
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
|
-
-
+
+
+
|
;; )))
;;======================================================================
;; S U M M A R Y
;;======================================================================
;;
;; General info about the run(s) and megatest area
(define (dashboard:summary db)
(let ((rawconfig (read-config (conc *toppath* "/megatest.config") #f #f))) ;; changed to #f since I want #{} to be expanded by [system ...] to NOT be expanded. WAS: 'return-string)))
(define (dashboard:summary data)
(let* ((db (d:alldat-dblocal data))
(rawconfig (read-config (conc *toppath* "/megatest.config") #f #f))) ;; changed to #f since I want #{} to be expanded by [system ...] to NOT be expanded. WAS: 'return-string)))
(iup:vbox
(iup:split
#:value 500
(iup:frame
#:title "General Info"
(iup:vbox
(iup:hbox
|
| ︙ | | |
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
|
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
|
-
-
+
+
+
|
tb
run-matrix)))
;;======================================================================
;; R U N S
;;======================================================================
(define (make-dashboard-buttons db nruns ntests keynames runs-sum-dat new-view-dat)
(let* ((nkeys (length keynames))
(define (make-dashboard-buttons data nruns ntests keynames runs-sum-dat new-view-dat)
(let* ((db (d:alldat-dblocal data))
(nkeys (length keynames))
(runsvec (make-vector nruns))
(header (make-vector nruns))
(lftcol (make-vector ntests))
(keycol (make-vector ntests))
(controls '())
(lftlst '())
(hdrlst '())
|
| ︙ | | |
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
|
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
|
-
+
|
(apply iup:hbox (reverse bdylst))))))
controls))
(data (d:data-init (make-d:data)))
(tabs (iup:tabs
#:tabchangepos-cb (lambda (obj curr prev)
(d:alldat-please-update-set! *alldat* #t)
(d:alldat-curr-tab-num-set! *alldat* curr))
(dashboard:summary db)
(dashboard:summary *alldat*)
runs-view
(dashboard:one-run db runs-sum-dat)
(dashboard:new-view db new-view-dat)
(dashboard:run-controls)
)))
;; (set! (iup:callback tabs tabchange-cb:) (lambda (a b c)(print "SWITCHED TO TAB: " a " " b " " c)))
(iup:attribute-set! tabs "TABTITLE0" "Summary")
|
| ︙ | | |
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
|
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
|
-
-
+
+
|
(if (or (args:get-arg "-rows")
(get-environment-variable "DASHBOARDROWS" ))
(begin
(d:alldat-num-tests-set! *alldat* (string->number
(or (args:get-arg "-rows")
(get-environment-variable "DASHBOARDROWS"))))
(update-rundat "%" (d:alldat-numruns *alldat*) "%/%" '()))
(d:alldat-num-tests-set! *alldat* (min (max (update-rundat "%" (d:alldat-numruns *alldat*) "%/%" '()) 8) 20)))
(update-rundat *alldat* "%" (d:alldat-numruns *alldat*) "%/%" '()))
(d:alldat-num-tests-set! *alldat* (min (max (update-rundat *alldat* "%" (d:alldat-numruns *alldat*) "%/%" '()) 8) 20)))
(define *tim* (iup:timer))
(define *ord* #f)
(iup:attribute-set! *tim* "TIME" 300)
(iup:attribute-set! *tim* "RUN" "YES")
;; Move this stuff to db.scm? I'm not sure that is the right thing to do...
|
| ︙ | | |
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
|
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
|
-
+
|
(if dashboard:update-servers-table (dashboard:update-servers-table))))
(if recalc
(begin
(case (d:alldat-curr-tab-num *alldat*)
((0)
(if dashboard:update-summary-tab (dashboard:update-summary-tab)))
((1) ;; The runs table is active
(update-rundat (hash-table-ref/default (d:alldat-searchpatts *alldat*) "runname" "%") (d:alldat-numruns *alldat*)
(update-rundat *alldat* (hash-table-ref/default (d:alldat-searchpatts *alldat*) "runname" "%") (d:alldat-numruns *alldat*)
(hash-table-ref/default (d:alldat-searchpatts *alldat*) "test-name" "%/%")
;; (hash-table-ref/default (d:alldat-searchpatts *alldat*) "item-name" "%")
(let ((res '()))
(for-each (lambda (key)
(if (not (equal? key "runname"))
(let ((val (hash-table-ref/default (d:alldat-searchpatts *alldat*) key #f)))
(if val (set! res (cons (list key val) res))))))
|
| ︙ | | |
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
|
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
|
-
+
|
(examine-test run-id test-id)
(begin
(debug:print 3 "INFO: tried to open test with invalid run-id,test-id. " (args:get-arg "-test"))
(exit 1)))))
((args:get-arg "-guimonitor")
(gui-monitor (d:alldat-dblocal *alldat*)))
(else
(set! uidat (make-dashboard-buttons (d:alldat-dblocal *alldat*)
(set! uidat (make-dashboard-buttons *alldat* ;; (d:alldat-dblocal *alldat*)
(d:alldat-numruns *alldat*)
(d:alldat-num-tests *alldat*)
(d:alldat-dbkeys *alldat*)
runs-sum-dat new-view-dat))
(iup:callback-set! *tim*
"ACTION_CB"
(lambda (x)
|
| ︙ | | |
Modified datashare-testing/.sretrieve.config
from [f5fc49272d]
to [71cb2ce9dc].
1
2
3
4
5
6
7
8
|
1
2
3
4
5
6
7
8
|
-
+
|
[settings]
base-dir /tmp/delme_data
allowed-users matt
allowed-chars [0-9a-zA-Z\-\.]+
allowed-sub-paths [0-9a-zA-Z\-\.]+
[database]
location #{scheme (create-directory "/tmp/#{getenv USER}" #t)}
|
Added docs/waiton-analysis.gnumeric version [3f09f77a41].
cannot compute difference between binary files
Added inteldate.scm version [a6b831c59f].