Overview
Comment: | Added display of test/items and added blanket redraw |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | newdashboard |
Files: | files | file ages | folders |
SHA1: |
f88f2187734cbedcef376e69c8c52845 |
User & Date: | matt on 2013-03-17 12:27:48 |
Other Links: | branch diff | manifest | tags |
Context
2013-03-19
| ||
00:27 | Added backoff mechanism to newdashboard for when db is overloaded check-in: 3c92aeb733 user: matt tags: newdashboard | |
2013-03-17
| ||
12:27 | Added display of test/items and added blanket redraw check-in: f88f218773 user: matt tags: newdashboard | |
2013-03-15
| ||
02:18 | Basic functionality for displaying runs and tests in place in newdashboard check-in: 3705ca9968 user: matt tags: newdashboard | |
Changes
Modified client.scm from [d31c23bc39] to [f2a506634d].
︙ | ︙ | |||
27 28 29 30 31 32 33 | (include "common_records.scm") (include "db_records.scm") ;; client:get-signature (define (client:get-signature) (if *my-client-signature* *my-client-signature* | | | 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 | (include "common_records.scm") (include "db_records.scm") ;; client:get-signature (define (client:get-signature) (if *my-client-signature* *my-client-signature* (let ((sig (conc (get-host-name) " " (current-process-id)))) (set! *my-client-signature* sig) *my-client-signature*))) ;; client:login serverdat (define (client:login serverdat) (cdb:login serverdat *toppath* (client:get-signature))) |
︙ | ︙ |
Modified newdashboard.scm from [a066911ebf] to [4dd7f06139].
︙ | ︙ | |||
114 115 116 117 118 119 120 | (define (update-search x val) (hash-table-set! *searchpatts* x val)) (define (main-menu) (iup:menu ;; a menu is a special attribute to a dialog (think Gnome putting the menu at screen top) (iup:menu-item "Files" (iup:menu ;; Note that you can use either #:action or action: for options (iup:menu-item "Open" action: (lambda (obj) | | | 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 | (define (update-search x val) (hash-table-set! *searchpatts* x val)) (define (main-menu) (iup:menu ;; a menu is a special attribute to a dialog (think Gnome putting the menu at screen top) (iup:menu-item "Files" (iup:menu ;; Note that you can use either #:action or action: for options (iup:menu-item "Open" action: (lambda (obj) (iup:show (iup:file-dialog)) (print "File->open " obj))) (iup:menu-item "Save" #:action (lambda (obj)(print "File->save " obj))) (iup:menu-item "Exit" #:action (lambda (obj)(exit))))) (iup:menu-item "Tools" (iup:menu (iup:menu-item "Create new blah" #:action (lambda (obj)(print "Tools->new blah"))) ;; (iup:menu-item "Show dialog" #:action (lambda (obj) ;; (show message-window |
︙ | ︙ | |||
328 329 330 331 332 333 334 | ;; (iup:attribute-set! mat (conc curr-row-num ":0") var) ;; (iup:attribute-set! mat (conc curr-row-num ":1") (config-lookup rawconfig fname var)) ;; (set! curr-row-num (+ curr-row-num 1))) ;; (configf:section-vars rawconfig fname))) ;; (list setup-matrix jobtools-matrix validvals-matrix envovrd-matrix disks-matrix) ;; (list "setup" "jobtools" "validvalues" "env-override" "disks")) | < < < | < < < | < < < | 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 | ;; (iup:attribute-set! mat (conc curr-row-num ":0") var) ;; (iup:attribute-set! mat (conc curr-row-num ":1") (config-lookup rawconfig fname var)) ;; (set! curr-row-num (+ curr-row-num 1))) ;; (configf:section-vars rawconfig fname))) ;; (list setup-matrix jobtools-matrix validvals-matrix envovrd-matrix disks-matrix) ;; (list "setup" "jobtools" "validvalues" "env-override" "disks")) (iup:attribute-set! runs-matrix "RESIZEMATRIX" "YES") (iup:attribute-set! runs-matrix "WIDTH0" "100") ;; (iup:attribute-set! validvals-matrix "WIDTH1" "290") ;; (iup:attribute-set! envovrd-matrix "WIDTH1" "290") (set! *runs-matrix* runs-matrix) (iup:hbox (iup:frame #:title "Runs browser" |
︙ | ︙ | |||
382 383 384 385 386 387 388 | ;; 2. Update synchash to understand "get-runs", "get-tests" etc. ;; 3. Add extraction of filters to synchash calls ;; ;; Mode is 'full or 'incremental for full refresh or incremental refresh (define (run-update keys data runname keypatts testpatt states statuses mode) (let* (;; count and offset => #f so not used ;; the synchash calls modify the "data" hash | > > | | | | | 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 | ;; 2. Update synchash to understand "get-runs", "get-tests" etc. ;; 3. Add extraction of filters to synchash calls ;; ;; Mode is 'full or 'incremental for full refresh or incremental refresh (define (run-update keys data runname keypatts testpatt states statuses mode) (let* (;; count and offset => #f so not used ;; the synchash calls modify the "data" hash (get-runs-sig (conc (client:get-signature) " get-runs")) (get-tests-sig (conc (client:get-signature) " get-tests")) (run-changes (synchash:client-get 'db:get-runs get-runs-sig (length keypatts) data runname #f #f keypatts)) ;; Now can calculate the run-ids (run-hash (hash-table-ref/default data get-runs-sig #f)) (run-ids (if run-hash (filter number? (hash-table-keys run-hash)) '())) (test-changes (synchash:client-get 'db:get-tests-for-runs get-tests-sig 0 data run-ids testpatt states statuses)) (runs-hash (hash-table-ref/default data get-runs-sig #f)) (header (hash-table-ref/default runs-hash "header" #f)) (run-ids (sort (filter number? (hash-table-keys runs-hash)) (lambda (a b) (let* ((record-a (hash-table-ref runs-hash a)) (record-b (hash-table-ref runs-hash b)) (time-a (db:get-value-by-header record-a header "event_time")) (time-b (db:get-value-by-header record-b header "event_time"))) |
︙ | ︙ | |||
434 435 436 437 438 439 440 | new-test-dat)) (lambda (a b) (let ((time-a (db:test-get-event_time a)) (time-b (db:test-get-event_time b))) (> time-a time-b))))) ;; test-changes is a list of (( id record ) ... ) ;; Get list of test names sorted by time, remove tests | | > > > > > > > > > > > | | | | > | 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 | new-test-dat)) (lambda (a b) (let ((time-a (db:test-get-event_time a)) (time-b (db:test-get-event_time b))) (> time-a time-b))))) ;; test-changes is a list of (( id record ) ... ) ;; Get list of test names sorted by time, remove tests (test-names (delete-duplicates (map (lambda (t) (let ((i (db:test-get-item-path t)) (n (db:test-get-testname t))) (if (string=? i "") (conc " " i) n))) tests))) (colnum (car (hash-table-ref runid-to-col run-id)))) ;; for each test name get the slot if it exists and fill in the cell ;; or take the next slot and fill in the cell, deal with items in the ;; run view panel? The run view panel can have a tree selector for ;; browsing the tests/items ;; SWITCH THIS TO USING CHANGED TESTS ONLY (for-each (lambda (test) (let* ((state (db:test-get-state test)) (status (db:test-get-status test)) (testname (db:test-get-testname test)) (itempath (db:test-get-item-path test)) (fullname (conc testname "/" itempath)) (dispname (if (string=? itempath "") testname (conc " " itempath))) (rownum (hash-table-ref/default testname-to-row fullname #f))) (if (not rownum) (let ((rownums (hash-table-values testname-to-row))) (set! rownum (if (null? rownums) 1 (+ 1 (apply max rownums)))) (hash-table-set! testname-to-row fullname rownum) ;; create the label (iup:attribute-set! *runs-matrix* (conc rownum ":" 0) dispname) )) ;; set the cell text and color ;; (debug:print 2 "rownum:colnum=" rownum ":" colnum ", state=" status) (iup:attribute-set! *runs-matrix* (conc rownum ":" colnum) status) (iup:attribute-set! *runs-matrix* (conc "BGCOLOR" rownum ":" colnum) (gutils:get-color-for-state-status state status)) )) tests))) run-ids) (iup:attribute-set! *runs-matrix* "REDRAW" "ALL") ;; (debug:print 2 "run-changes: " run-changes) ;; (debug:print 2 "test-changes: " test-changes) (list run-changes test-changes))) (define (newdashboard) (let* ((data (make-hash-table)) (keys (cdb:remote-run db:get-keys #f)) |
︙ | ︙ |