Megatest: Changes On Branch 7bbc43c98de6974b

Changes In Branch newdashboard Through [7bbc43c98d] Excluding Merge-Ins

This is equivalent to a diff from ee045df3bc to 7bbc43c98d

2013-03-19
17:08		Merged newdashboard branch to development check-in: 8aed4ce36c user: mrwellan tags: development
11:26		Partial re-implementation (again) of transaction wrapped writes, now working except for transaction within transaction issue check-in: 69c6ef28ac user: mrwellan tags: newdashboard
11:22		Partial re-implementation (again) of transaction wrapped writes, now working except for transaction within transaction issue check-in: 7bbc43c98d user: mrwellan tags: newdashboard
10:24		Partial re-implementation (again) of transaction wrapped writes check-in: 5de9fdab73 user: mrwellan tags: newdashboard
2013-03-13
11:17		Start development of newdashboard check-in: d3730a8a47 user: mrwellan tags: newdashboard
07:27		Added runs matrix to new dashboard check-in: ee045df3bc user: matt tags: development
00:12		Partial implementation of more effiicent dashboard updating check-in: 277a4e1def user: matt tags: development

Modified Makefile from [e5d698bf90] to [be97b6abe5].

Modified client.scm from [d31c23bc39] to [f2a506634d].

Deleted dashboard-main.scm version [818e9bede8].

Modified dashboard.scm from [1751468de5] to [d676ee3f3f].

Modified db.scm from [c3d228a90a] to [5fd4db1042].

Added gutils.scm version [ff468ba086].

Modified http-transport.scm from [2cef6439e2] to [f36a48c1d7].

Added newdashboard.scm version [0644fad3fb].

Modified server.scm from [30f7393268] to [9a280937cc].

Added synchash.scm version [a2802c8af7].

Modified tests/Makefile from [beba797f76] to [8fe26078dd].

︙
25 26 27 28 29 30 31 32 33 34 35 36 37 38 39	25 26 27 28 29 30 31 32 33 34 35 36 37 38 39	- +	(declare (uses db)) (declare (uses configf)) (declare (uses process)) (declare (uses launch)) (declare (uses runs)) (declare (uses dashboard-tests)) (declare (uses dashboard-guimonitor)) ~~(declare (uses dashboard-main))~~ ;; (declare (uses dashboard-main)) (declare (uses megatest-version)) (include "common_records.scm") (include "db_records.scm") (include "run_records.scm") (define help (conc
︙
685 686 687 688 689 690 691 ~~692 693~~ 694 695 696 697 698 699 700 701 702	685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700	- -	(if testid (examine-test testid) (begin (print "ERROR: testid is not a number " (args:get-arg "-test")) (exit 1))))) ((args:get-arg "-guimonitor") (gui-monitor db)) ~~((args:get-arg "-main")~~ ~~(iup:show (main-panel)))~~ (else (set! uidat (make-dashboard-buttons num-runs num-tests dbkeys)) (iup:callback-set! tim "ACTION_CB" (lambda (x) (run-update x))))) ;(print x))))) (iup:main-loop)

︙
34 35 36 37 38 39 40 41 42 43 44 45 46 47 48	34 35 36 37 38 39 40 41 42 43 44 45 46 47 48	- +	(include "db_records.scm") (include "key_records.scm") (include "run_records.scm") ;; timestamp type (val1 val2 ...) ;; type: meta-info, step (define incoming-writes '()) ~~(define completed-writes '())~~ (define completed-writes (make-hash-table)) (define incoming-last-time (current-seconds)) (define incoming-mutex (make-mutex)) (define completed-mutex (make-mutex)) (define cache-on #f) (define (db:set-sync db) (let* ((syncval (config-lookup configdat "setup" "synchronous"))
︙
502 503 504 505 506 507 508 509 510 511 512 513 514 515	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)))
︙
697 698 699 700 701 702 703 ~~704~~ 705 706 707 708 709 710 711	698 699 700 701 702 703 704 705 706 707 708 709 710 711	-	run-id test-name pth)) item-paths) (debug:print-info 11 "db:tests-register-test END db=" db ", run-id=" run-id ", test-name=" test-name ", item-path=\"" item-path "\"") #f)) ;; states and statuses are lists, turn them into ("PASS","FAIL"...) and use NOT IN ;; i.e. these lists define what to NOT show. ;; states and statuses are required to be lists, empty is ok ;; not-in #t = above behaviour, #f = must match (define (db:get-tests-for-run db run-id testpatt states statuses #!key (not-in #t) (sort-by #f) ;; 'rundir 'event_time
︙
744 745 746 747 748 749 750 751 752 753 754 755 756 757	744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808	+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +	(set! res (cons (apply vector a b) res))) ;; id run-id testname state status event-time host cpuload diskfree uname rundir item-path run-duration final-logf comment) res))) db qry run-id ) (debug:print-info 11 "db:get-tests-for-run START run-id=" run-id ", testpatt=" testpatt ", states=" states ", statuses=" statuses ", not-in=" not-in ", sort-by=" sort-by) res)) ;; states and statuses are lists, turn them into ("PASS","FAIL"...) and use NOT IN ;; i.e. these lists define what to NOT show. ;; states and statuses are required to be lists, empty is ok ;; not-in #t = above behaviour, #f = must match ;; run-ids is a list of run-ids or a single number (define (db:get-tests-for-runs db run-ids testpatt states statuses #!key (not-in #t) (sort-by #f)) ;; 'rundir 'event_time (debug:print-info 11 "db:get-tests-for-run START run-ids=" run-ids ", testpatt=" testpatt ", states=" states ", statuses=" statuses ", not-in=" not-in ", sort-by=" sort-by) (let* ((res '()) ;; if states or statuses are null then assume match all when not-in is false (states-qry (if (null? states) #f (conc " state " (if not-in "NOT" "") " IN ('" (string-intersperse states "','") "')"))) (statuses-qry (if (null? statuses) #f (conc " status " (if not-in "NOT" "") " IN ('" (string-intersperse statuses "','") "')"))) (tests-match-qry (tests:match->sqlqry testpatt)) (qry (conc "SELECT id,run_id,testname,state,status,event_time,host,cpuload,diskfree,uname,rundir,item_path,run_duration,final_logf,comment " " FROM tests WHERE " (if run-ids (if (list? run-ids) (conc " run_id in (" (string-intersperse (map conc run-ids) ",") ") ") (conc "run_id=" run-ids " ")) " ") ;; #f => run-ids don't filter on run-ids (if states-qry (conc " AND " states-qry) "") (if statuses-qry (conc " AND " statuses-qry) "") (if tests-match-qry (conc " AND (" tests-match-qry ") ") "") (case sort-by ((rundir) " ORDER BY length(rundir) DESC;") ((event_time) " ORDER BY event_time ASC;") (else ";")) ))) (debug:print-info 8 "db:get-tests-for-run qry=" qry) (sqlite3:for-each-row (lambda (a . b) ;; id run-id testname state status event-time host cpuload diskfree uname rundir item-path run-duration final-logf comment) (set! res (cons (apply vector a b) res))) ;; id run-id testname state status event-time host cpuload diskfree uname rundir item-path run-duration final-logf comment) res))) db qry ) (debug:print-info 11 "db:get-tests-for-run START run-ids=" run-ids ", testpatt=" testpatt ", states=" states ", statuses=" statuses ", not-in=" not-in ", sort-by=" sort-by) res)) ;; this one is a bit broken BUG FIXME (define (db:delete-test-step-records db test-id) ;; Breaking it into two queries for better file access interleaving (let* ((tdb (db:open-test-db-by-test-id db test-id))) ;; test db's can go away - must check every time (if tdb
︙
1036 1037 1038 1039 1040 1041 1042 ~~1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053~~ 1054 1055 1056 1057 1058 1059 1060	1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100	- - - - - - - - - - -	#f (loop (car tal)(cdr tal)))))))))) ;;====================================================================== ;; QUEUE UP META, TEST STATUS AND STEPS REMOTE ACCESS ;;====================================================================== ~~;; db:updater is run in a thread to write out the cached data periodically~~ ~~;; (define (db:updater)~~ ~~;; (debug:print-info 4 "Starting cache processing")~~ ~~;; (let loop ()~~ ~~;; (thread-sleep! 10) ;; move save time around to minimize regular collisions?~~ ~~;; (db:write-cached-data)~~ ~~;; (loop)))~~ ~~;; The queue is a list of vectors where the zeroth slot indicates the type of query to~~ ~~;; apply and the second slot is the time of the query and the third entry is a list of~~ ~~;; values to be applied~~ ;; ;; NOTE: Can remove the regex and base64 encoding for zmq (define (db:obj->string obj) (case transport-type ((fs) obj) ((http) (string-substitute (regexp "=") "_"
︙
1250 1251 1252 1253 1254 1255 1256 ~~1257~~ ~~1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270~~ ~~1271 1272~~ ~~1273 1274~~ ~~1275 1276 1277 1278 1279 1280 1281~~ ~~1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301~~ ~~1302 1303~~ 1304 1305 1306 1307 1308 1309 ~~1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321~~ 1322 ~~1323~~ 1324 ~~1325 1326 1327~~ ~~1328~~ 1329 1330 ~~1331 1332 1333 1334~~ ~~1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349~~ 1350 ~~1351 1352 1353 1354 1355~~ 1356 1357 1358 1359 1360 1361 1362 1363 1364 ~~1365 1366~~ 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420	1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462	- + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - + - - + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + - - - - - - - - - - - - + + + + + + + + - + + - - - + + + + + + + - - - - - + - - - - - - - - - - - - - - - - - - - - + + + + + + + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +	sync set-verbosity killserver)) ;; not used, intended to indicate to run in calling process (define db:run-local-queries '()) ;; rollup-tests-pass-fail)) ~~(define (db:~~write~~-cached-~~data~~)~~ (define (db:process-cached-writes db) ~~(open-run-close~~ ~~(lambda (db . junkparams)~~ (let ((queries (make-hash-table)) (data #f)) (mutex-lock! incoming-mutex) (set! data (reverse incoming-writes)) ;; (sort ... (lambda (a b)(< (vector-ref a 1)(vector-ref b 1))))) (set! incoming-writes '()) (mutex-unlock! incoming-mutex) (if (> (length data) 0) (debug:print-info 4 "Writing cached data " data)) ;; prepare the needed statements (for-each (lambda (request-item) (let ((stmt-key (vector-ref request-item 0))) (let ((queries (make-hash-table)) (data #f)) (mutex-lock! incoming-mutex) ;; data is a list of query packets <vector qry-sig query params (set! data (reverse incoming-writes)) ;; (sort ... (lambda (a b)(< (vector-ref a 1)(vector-ref b 1))))) (set! incoming-writes '()) (mutex-unlock! incoming-mutex) (if (> (length data) 0) ;; Process if we have data (begin (debug:print-info 7 "Writing cached data " data) ;; Prepare the needed sql statements ;; (for-each (lambda (request-item) (let ((stmt-key (vector-ref request-item 0)) ~~~~(if (not (hash-table-ref/default queries stmt-key #f))~~ ~~(let~~ (~~(stmt~~ (~~alist~~-ref ~~stmt-key db:~~que~~ries~~)))~~ (query (vector-ref request-item 1))) ~~~~(if stmt~~ (hash-table-set! queries stmt-key (sqlite3:prepare db ~~(ca~~r ~~stmt~~)))~~ (hash-table-set! queries stmt-key (sqlite3:prepare db query)))) ~~(debug:print 0 "ERROR: Missing query spec for " stmt-key "!"))))))~~ data) ;; No outer loop needed. Single loop for write items only. Reads trigger flush of queue ;; and then are executed. (sqlite3:with-transaction db (lambda () data) ;; No outer loop needed. Single loop for write items only. Reads trigger flush of queue ;; and then are executed. (sqlite3:with-transaction db (lambda () ~~(debug:print-info 11 "flushing " data " to db")~~ (for-each (lambda (hed) (let ((params (vector-ref hed 2)) (stmt-key (vector-ref hed 0))) (~~debug:print-info 11 "Executing "~~ stmt~~-key " for " params)~~ (apply sqlite3:execute ~~(hash-table-ref queries stmt-key)~~ params))) data))) ;; let all the waiting calls know all is done (mutex-lock! completed-mutex) (set! completed-writes ~~(append~~ completed-writes data)) (mutex-unlock! completed-mutex) ;; finalize the statements (for-each (lambda (stmt-key) (sqlite3:finalize! (hash-table-ref queries stmt-key))) (hash-table-keys queries)) ~~;; keep a little chest thumping data around~~ (let ((cache-size (length data))) (if (> cache-size max-cache-size) (set! max-cache-size cache-size))) (for-each (lambda (hed) (let* ((params (vector-ref hed 2)) (stmt-key (vector-ref hed 0)) (stmt (hash-table-ref/default queries stmt-key #f))) (if stmt (apply sqlite3:execute stmt params) (debug:print 0 "ERROR: Problem Executing " stmt-key " for " params)))) data))) ;; let all the waiting calls know all is done (mutex-lock! completed-mutex) (for-each (lambda (item) (let ((qry-sig (cdb:packet-get-client-sig item))) (debug:print-info 7 "Registering query " qry-sig " as done") (hash-table-set! completed-writes qry-sig #t))) data) (mutex-unlock! completed-mutex) ;; Finalize the statements. Should this be done inside the mutex above? ;; I think sqlite3 mutexes will keep the data safe (for-each (lambda (stmt-key) (sqlite3:finalize! (hash-table-ref queries stmt-key))) (hash-table-keys queries)) ;; Do a little record keeping (let ((cache-size (length data))) (if (> cache-size max-cache-size) (set! max-cache-size cache-size))) ~~)) #f))~~ #t) #f))) (define db:process-queue-mutex (make-mutex)) ;; The queue is a list of vectors where the zeroth slot indicates the type of query to ;; apply and the second slot is the time of the query and the third entry is a list of ;; values to be applied ;; ~~;; (define (db:process-queue db pubsock indata)~~ ~~;; (let* ((data (sort indata (lambda (a b)~~ ~~;; (< (cdb:packet-get-qtime a)(cdb:packet-get-qtime b))))))~~ ~~;; (for-each~~ ~~;; (lambda (item)~~ ~~;; (db:process-queue-item db pubsock item))~~ ~~;; data)))~~ (define (db:queue-write-and-wait db ~~item~~) ~~(let (~~(res #f) (got-it #f) ~~(qry-sig (cdb:packet-get-query-sig item)))~~ (define (db:queue-write-and-wait db qry-sig query params) (let ((queue-len 0) (res #f) (got-it #f) (qry-pkt (vector qry-sig query params)) (timeout (+ 10 (current-seconds)))) ;; set the time out to 10 secs in future ;; Put the item in the queue incoming-writes (mutex-lock! incoming-mutex) ~~(set! incoming-writes (cons ~~item~~ incoming-writes))~~ (set! incoming-writes* (cons qry-pkt incoming-writes)) (set! queue-len (length incoming-writes)) (mutex-unlock! incoming-mutex) ~~~~;; let the queue build three times, look for processed~~ ~~;; item.~~ (let loop (~~(count 0)~~)~~ (debug:print-info 7 "Current write queue length is " queue-len) ;; poll for the write to complete, timeout after 10 seconds ;; periodic flushing of the queue is taken care of by ;; db:flush-queue (let loop () ~~(debug:print-info 11 "db:queue-write-and-wait count=" count ", item=" item)~~ (thread-sleep! 0.1) (mutex-lock! completed-mutex) ~~~~(for-each (lambda (result)~~ ~~(if (equal? (cdb:packet-get-query-sig result) qry-sig)~~ ~~(set! got-it #t)))~~ completed-writes)~~ (if (hash-table-ref/default completed-writes qry-sig #f) ~~(mutex-unlock! completed-mutex)~~ ~~(if (not got-it)~~ ~~(if (< count 4) ;; give it 3/10 of a second of queue up time~~ ~~(loop (+ count 1))~~ ~~(db:write-cached-data))))~~ ~~;; at the point db:write-cached-data was called either by this call~~ ~~;; or by another. Now every 1/100 sec check to see if this query is~~ ~~;; at the "head" of the completed queue and pop it off~~ ~~(let loop ()~~ ~~(thread-sleep! 0.001)~~ ~~;; there must always be at least one item in the completed-writes at this point, right?~~ ~~(mutex-lock! completed-mutex)~~ ~~(set! res (car completed-writes))~~ ~~(mutex-unlock! completed-mutex)~~ ~~(if (equal? (cdb:packet-get-query-sig res) qry-sig) ;; yay! we are done!~~ (begin ~~(mute~~x-lock~~! completed-mutex) (set! completed-writes (cdr completed-writes)) (mutex-unlock! completed-mutex) ~~res~~) ~~(loop))~~)))~~ (hash-table-delete! completed-writes qry-sig) (set! got-it #t))) (mutex-unlock! completed-mutex) (if (and (not got-it) (< (current-seconds) timeout)) (loop))) got-it)) (define (db:process-queue-item db item) (let* ((stmt-key (cdb:packet-get-qtype item)) (qry-sig (cdb:packet-get-query-sig item)) (return-address (cdb:packet-get-client-sig item)) (params (cdb:packet-get-params item)) (query (let ((q (alist-ref stmt-key db:queries))) (if q (car q) #f)))) (debug:print-info 11 "Special queries/requests stmt-key=" stmt-key ", return-address=" return-address ", query=" query ", params=" params) ~~~~(cond~~ (query~~ (if query ~~;; transactionize needed here.~~ ;; (case transport-type ~~;; ((http)~~(db:queue-write-and-wait db ~~item~~)) ;; (else (apply sqlite3:execute db query params) ;; )) (server:reply return-address qry-sig ~~#t #t~~)) ((member stmt-key db:special-queries) (debug:print-info 11 "Handling special statement " stmt-key) (case stmt-key ((immediate) (let ((proc (car params)) (remparams (cdr params))) ;; we are being handed a procedure so call it (debug:print-info 11 "Running (apply " proc " " remparams ")") (server:reply return-address qry-sig #t (apply proc remparams)))) ((login) (if (< (length params) 3) ;; should get toppath, version and signature (server:reply return-address qry-sig '(#f "login failed due to missing params")) ;; missing params (let ((calling-path (car params)) (calling-vers (cadr params)) (client-key (caddr params))) (if (and (equal? calling-path toppath) (equal? megatest-version calling-vers)) (begin (hash-table-set! logged-in-clients client-key (current-seconds)) (server:reply return-address qry-sig #t '(#t "successful login"))) ;; path matches - pass! Should vet the caller at this time ... (server:reply return-address qry-sig #f (list #f (conc "Login failed due to mismatch paths: " calling-path ", " toppath))))))) ((flush sync) (server:reply return-address qry-sig #t 1)) ;; (length data))) ((set-verbosity) (set! verbosity (car params)) (server:reply return-address qry-sig #t '(#t verbosity))) ((killserver) (debug:print 0 "WARNING: Server going down in 15 seconds by user request!") (open-run-close tasks:server-deregister tasks:open-db (car runremote) pullport: (cadr runremote)) (thread-start! (make-thread (lambda ()(thread-sleep! 15)(exit)))) (server:reply return-address qry-sig #t '(#t "exit process started"))) (else ;; not a command, i.e. is a query (debug:print 0 "ERROR: Unrecognised query/command " stmt-key) (server:reply pubsock return-address qry-sig #f 'failed)))) (else (debug:print-info 11 "Executing " stmt-key " for " params) (apply sqlite3:execute (hash-table-ref queries stmt-key) params) (server:reply return-address qry-sig #t #t))))) ;; hand queries off to the write queue (let ((response (case transport-type ((http) (debug:print-info 7 "Queuing item " item " for wrapped write") (db:queue-write-and-wait db qry-sig query params)) (else (apply sqlite3:execute db query params) #t)))) (debug:print-info 7 "Received " response " from wrapped write") (server:reply return-address qry-sig response response)) ;; otherwise if appropriate flush the queue (this is a read or complex query) (begin (case transport-type ((http)(db:process-cached-writes db))) (cond ((member stmt-key db:special-queries) (debug:print-info 11 "Handling special statement " stmt-key) (case stmt-key ((immediate) (let ((proc (car params)) (remparams (cdr params))) ;; we are being handed a procedure so call it (debug:print-info 11 "Running (apply " proc " " remparams ")") (server:reply return-address qry-sig #t (apply proc remparams)))) ((login) (if (< (length params) 3) ;; should get toppath, version and signature (server:reply return-address qry-sig '(#f "login failed due to missing params")) ;; missing params (let ((calling-path (car params)) (calling-vers (cadr params)) (client-key (caddr params))) (if (and (equal? calling-path toppath) (equal? megatest-version calling-vers)) (begin (hash-table-set! logged-in-clients client-key (current-seconds)) (server:reply return-address qry-sig #t '(#t "successful login"))) ;; path matches - pass! Should vet the caller at this time ... (server:reply return-address qry-sig #f (list #f (conc "Login failed due to mismatch paths: " calling-path ", " toppath))))))) ((flush sync) (server:reply return-address qry-sig #t 1)) ;; (length data))) ((set-verbosity) (set! verbosity (car params)) (server:reply return-address qry-sig #t '(#t verbosity))) ((killserver) (debug:print 0 "WARNING: Server going down in 15 seconds by user request!") (open-run-close tasks:server-deregister tasks:open-db (car runremote) pullport: (cadr runremote)) (thread-start! (make-thread (lambda ()(thread-sleep! 15)(exit)))) (server:reply return-address qry-sig #t '(#t "exit process started"))) (else ;; not a command, i.e. is a query (debug:print 0 "ERROR: Unrecognised query/command " stmt-key) (server:reply pubsock return-address qry-sig #f 'failed)))) (else (debug:print-info 11 "Executing " stmt-key " for " params) (apply sqlite3:execute (hash-table-ref queries stmt-key) params) (server:reply return-address qry-sig #t #t))))))) (define (db:test-get-records-for-index-file db run-id test-name) (let ((res '())) (sqlite3:for-each-row (lambda (id itempath state status run_duration logf comment) (set! res (cons (vector id itempath state status run_duration logf comment) res))) db
︙

︙
15 16 17 18 19 20 21 22 23 24 25 26 27 28	15 16 17 18 19 20 21 22 23 24 25 26 27 28 29	+	(use spiffy uri-common intarweb http-client spiffy-request-vars) (declare (unit server)) (declare (uses common)) (declare (uses db)) (declare (uses tasks)) ;; tasks are where stuff is maintained about what is running. (declare (uses synchash)) (declare (uses http-transport)) (declare (uses zmq-transport)) (include "common_records.scm") (include "db_records.scm") (define (server:make-server-url hostport)
︙
36 37 38 39 40 41 42 ~~43 44~~ 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 ~~69 70 71~~ 72 73 74 75 76 77 78	37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96	- - + + + + + + + + + + + + + + + + + + + + + + - - -	;;====================================================================== ;; S E R V E R ;;====================================================================== ;; Call this to start the actual server ;; ~~(define db:process-queue-mutex (make-mutex))~~ ;; all routes though here end in exit ... (define (server:launch transport) (if (not toppath) (if (not (setup-for-run)) (begin (debug:print 0 "ERROR: cannot find megatest.config, exiting") (exit)))) (debug:print-info 2 "Starting server using " transport " transport") (set! transport-type transport) (case transport ((fs) (exit)) ;; there is no "fs" transport ((http) (http-transport:launch)) ((zmq) (zmq-transport:launch)) (else (debug:print "WARNING: unrecognised transport " transport) (exit)))) ;;====================================================================== ;; Q U E U E M A N A G E M E N T ;;====================================================================== ;; Flush the queue every third of a second. Can we assume that setup-for-run ;; has already been done? (define (server:write-queue-handler) (if (setup-for-run) (let ((db (open-db))) (let loop () (db:process-cached-writes db) (thread-sleep! 0.3) (loop))) (begin (debug:print 0 "ERROR: failed to setup for Megatest in server:write-queue-handler") (exit 1)))) ;;====================================================================== ;; S E R V E R U T I L I T I E S ;;====================================================================== ;; Generate a unique signature for this server (define (server:mk-signature) (message-digest-string (md5-primitive) (with-output-to-string (lambda () (write (list (current-directory) (argv))))))) ~~;;======================================================================~~ ~~;; S E R V E R U T I L I T I E S~~ ~~;;======================================================================~~ ;; When using zmq this would send the message back (two step process) ;; with spiffy or rpc this simply returns the return data to be returned ;; (define (server:reply return-addr query-sig success/fail result) (debug:print-info 11 "server:reply return-addr=" return-addr ", result=" result) ;; (send-message pubsock target send-more: #t)
︙

︙
17 18 19 20 21 22 23 24 25 26 27 28 29 30 31	17 18 19 20 21 22 23 24 25 26 27 28 29 30 31	- +	# The NEWTARGET causes some tests to fail. Do not use until this is fixed. NEWTARGET = "-target $(OS)/$(FS)/$(VER)" TARGET = "-target ubuntu/nfs/none" all : test1 test2 test3 test4 test5 server : ~~(cd ..;make install) && \~~ (cd ..;make;make install) && \ (cd fullrun;../../bin/megatest -server - -debug 22) & test0 : cleanprep cd simplerun ; $(MEGATEST) -server - -debug $(DEBUG)& test1 : cleanprep rm -f simplerun/megatest.db
︙
62 63 64 65 66 67 68 69 70 71 72 73 74 75 76	62 63 64 65 66 67 68 69 70 71 72 73 74 75 76	- +	cd fullrun;$(MEGATEST) -runtests runfirst -testpatt %/1 -reqtarg ubuntu/nfs/none :runname $(RUNNAME)_itempatt -v cd fullrun;$(MEGATEST) -runtests runfirst -testpatt %blahha% -reqtarg ubuntu/nfs/none :runname $(RUNNAME)_itempatt -debug 10 cd fullrun;$(MEGATEST) -rollup :runname newrun -target ubuntu/nfs/none -debug 10 cleanprep : ../.scm Makefile /.config mkdir -p /tmp/mt_runs /tmp/mt_links ~~cd ..;make install~~ cd ..;make;make install rm -f /logging.db touch cleanprep fullprep : cleanprep cd fullrun;$(MEGATEST) -remove-runs :runname $(RUNNAME)% -target %/%/% -testpatt %/% cd fullrun;$(BINPATH)/dashboard -rows 15 &
︙










































1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42	+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +	;;====================================================================== ;; Copyright 2006-2012, Matthew Welland. ;; ;; This program is made available under the GNU GPL version 2.0 or ;; greater. See the accompanying file COPYING for details. ;; ;; This program is distributed WITHOUT ANY WARRANTY; without even the ;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ;; PURPOSE. ;;====================================================================== (require-library iup) (import (prefix iup iup:)) (use canvas-draw) (use srfi-1 regex regex-case srfi-69) (declare (unit gutils)) (define (gutils:colors-similar? color1 color2) (let* ((c1 (map string->number (string-split color1))) (c2 (map string->number (string-split color2))) (delta (map (lambda (a b)(abs (- a b))) c1 c2))) (null? (filter (lambda (x)(> x 3)) delta)))) (define (gutils:get-color-for-state-status state status) (case (string->symbol state) ((COMPLETED) (if (equal? status "PASS") "70 249 73" (if (or (equal? status "WARN") (equal? status "WAIVED")) "255 172 13" "223 33 49"))) ;; greenish orangeish redish ((LAUNCHED) "101 123 142") ((CHECK) "255 100 50") ((REMOTEHOSTSTART) "50 130 195") ((RUNNING) "9 131 232") ((KILLREQ) "39 82 206") ((KILLED) "234 101 17") ((NOT_STARTED) "240 240 240") (else "192 192 192")))