Overview
Comment: | Basic functionality for displaying runs and tests in place in newdashboard |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | newdashboard |
Files: | files | file ages | folders |
SHA1: |
3705ca996820687412f68b017ddf0b5a |
User & Date: | matt on 2013-03-15 02:18:27 |
Other Links: | branch diff | manifest | tags |
Context
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 | |
2013-03-14
| ||
14:46 | Added some instrumention, added missing use of synchash check-in: ab18b06155 user: mrwellan tags: newdashboard | |
Changes
Modified db.scm from [d7321ee147] to [d0b93e0a8f].
︙ | ︙ | |||
502 503 504 505 506 507 508 509 510 511 512 513 514 515 | (vector-ref row n) (if (null? tal) #f (loop (car tal)(cdr tal)(+ n 1))))))) ;;====================================================================== ;; R U N S ;;====================================================================== (define (runs:get-std-run-fields keys remfields) (let* ((header (append (map key:get-fieldname keys) remfields)) (keystr (conc (keys->keystr keys) "," (string-intersperse remfields ",")))) (list keystr header))) | > | 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 | (vector-ref row n) (if (null? tal) #f (loop (car tal)(cdr tal)(+ n 1))))))) ;;====================================================================== ;; R U N S ;;====================================================================== ;; keys list to key1,key2,key3 ... (define (runs:get-std-run-fields keys remfields) (let* ((header (append (map key:get-fieldname keys) remfields)) (keystr (conc (keys->keystr keys) "," (string-intersperse remfields ",")))) (list keystr header))) |
︙ | ︙ |
Modified newdashboard.scm from [10f6b9c015] to [a066911ebf].
︙ | ︙ | |||
23 24 25 26 27 28 29 30 31 32 33 34 35 36 | (declare (uses gutils)) (declare (uses db)) (declare (uses server)) (declare (uses synchash)) (include "common_records.scm") (include "db_records.scm") (define help (conc "Megatest Dashboard, documentation at http://www.kiatoa.com/fossils/megatest version " megatest-version " license GPL, Copyright (C) Matt Welland 2011 Usage: dashboard [options] | > | 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 | (declare (uses gutils)) (declare (uses db)) (declare (uses server)) (declare (uses synchash)) (include "common_records.scm") (include "db_records.scm") (include "key_records.scm") (define help (conc "Megatest Dashboard, documentation at http://www.kiatoa.com/fossils/megatest version " megatest-version " license GPL, Copyright (C) Matt Welland 2011 Usage: dashboard [options] |
︙ | ︙ | |||
282 283 284 285 286 287 288 289 290 291 292 293 294 295 | (iup:vbox (iup:frame #:title "Default"))) (define (tests) (iup:hbox (iup:frame #:title "Tests browser"))) (define (runs) (let* ((runs-matrix (iup:matrix #:expand "YES" ;; #:fittosize "YES" #:scrollbar "YES" #:numcol 100 #:numlin 100 | > > | 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 | (iup:vbox (iup:frame #:title "Default"))) (define (tests) (iup:hbox (iup:frame #:title "Tests browser"))) (define *runs-matrix* #f) (define (runs) (let* ((runs-matrix (iup:matrix #:expand "YES" ;; #:fittosize "YES" #:scrollbar "YES" #:numcol 100 #:numlin 100 |
︙ | ︙ | |||
339 340 341 342 343 344 345 | (iup:attribute-set! mat "WIDTH1" "120") (iup:attribute-set! mat "WIDTH0" "100") ) (list runs-matrix)) ;; (iup:attribute-set! validvals-matrix "WIDTH1" "290") ;; (iup:attribute-set! envovrd-matrix "WIDTH1" "290") | | | 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 | (iup:attribute-set! mat "WIDTH1" "120") (iup:attribute-set! mat "WIDTH0" "100") ) (list runs-matrix)) ;; (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" (iup:vbox runs-matrix))))) (define (main-panel) |
︙ | ︙ | |||
366 367 368 369 370 371 372 373 374 375 376 377 | (iup:attribute-set! tabtop "TABTITLE2" "runconfigs.config") tabtop))) ;;====================================================================== ;; Process runs ;;====================================================================== ;; TO-DO ;; 1. Make "data" hash-table hierarchial store of all displayed data ;; 2. Update synchash to understand "get-runs", "get-tests" etc. ;; 3. Add extraction of filters to synchash calls ;; | > > > > > | > > > > > > > > > > > > > > > > > | > | | > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | | 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 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 481 482 483 484 485 486 487 488 489 | (iup:attribute-set! tabtop "TABTITLE2" "runconfigs.config") tabtop))) ;;====================================================================== ;; Process runs ;;====================================================================== (define *data* (make-hash-table)) (hash-table-set! *data* "runid-to-col" (make-hash-table)) (hash-table-set! *data* "testname-to-row" (make-hash-table)) ;; TO-DO ;; 1. Make "data" hash-table hierarchial store of all displayed data ;; 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 (run-changes (synchash:client-get 'db:get-runs "get-runs" (length keypatts) data runname #f #f keypatts)) ;; Now can calculate the run-ids (run-hash (hash-table-ref/default data "get-runs" #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-for-runs" 0 data run-ids testpatt states statuses)) (runs-hash (hash-table-ref/default data "get-runs" #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"))) (> time-a time-b))) )) (runid-to-col (hash-table-ref *data* "runid-to-col")) (testname-to-row (hash-table-ref *data* "testname-to-row")) (colnum 1) (rownum 0)) ;; rownum = 0 is the header ;; tests related stuff ;; (all-testnames (delete-duplicates (map db:test-get-testname test-changes)))) ;; Given a run-id and testname/item_path calculate a cell R:C ;; Each run is unique on its keys and runname or run-id, store in hash on colnum (for-each (lambda (run-id) (let* (;; (run-id (db:get-value-by-header rundat header "id")) (run-record (hash-table-ref/default runs-hash run-id #f)) (key-vals (map (lambda (key)(db:get-value-by-header run-record header key)) (map key:get-fieldname keys))) (run-name (db:get-value-by-header run-record header "runname")) (col-name (conc (string-intersperse key-vals "\n") "\n" run-name))) (iup:attribute-set! *runs-matrix* (conc rownum ":" colnum) col-name) (hash-table-set! runid-to-col run-id (list colnum run-record)) (set! colnum (+ colnum 1)))) run-ids) ;; Scan all tests to be displayed and organise all the test names, respecting what is in the hash table ;; Do this analysis in the order of the run-ids, the most recent run wins (for-each (lambda (run-id) (let* ((new-test-dat (car test-changes)) (removed-tests (cadr test-changes)) (tests (sort (map cadr (filter (lambda (testrec) (eq? run-id (db:test-get-run_id (cadr testrec)))) 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 db:test-get-testname 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 (for-each (lambda (test) (let* ((state (db:test-get-state test)) (status (db:test-get-status test)) (testname (db:test-get-testname test)) (rownum (hash-table-ref/default testname-to-row testname #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 testname rownum ) ;; create the label (iup:attribute-set! *runs-matrix* (conc rownum ":" 0) testname) )) ;; 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) ;; (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)) (runname "%") (testpatt "%") (keypatts (map (lambda (k)(list (vector-ref k 0) "%")) keys)) (states '()) (statuses '())) (iup:show (main-panel)) (iup:callback-set! *tim* "ACTION_CB" (lambda (x) (let ((changes (run-update keys data runname keypatts testpatt states statuses 'full))) (debug:print 0 "CHANGE(S): " (car changes) "...")))))) (newdashboard) (iup:main-loop) |
Modified synchash.scm from [799e727de6] to [4f4ef7e335].
︙ | ︙ | |||
79 80 81 82 83 84 85 | ;; (debug:print-info 2 "Processing item: " item) (hash-table-set! myhash id dat))) newdat) (for-each (lambda (id) (hash-table-delete! myhash id)) removs) | | | 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 | ;; (debug:print-info 2 "Processing item: " item) (hash-table-set! myhash id dat))) newdat) (for-each (lambda (id) (hash-table-delete! myhash id)) removs) (list newdat removs))) ;; synchash)) (define *synchashes* (make-hash-table)) (define (synchash:server-get db proc synckey keynum . params) ;; (debug:print-info 2 "synckey: " synckey ", keynum: " keynum ", params: " params) (let* ((synchash (hash-table-ref/default *synchashes* synckey #f)) |
︙ | ︙ |