Megatest: Changes On Branch 29e6524e1c9a1ae1

Changes In Branch development Through [29e6524e1c] Excluding Merge-Ins

This is equivalent to a diff from 5e13bdcb3a to 29e6524e1c

2013-03-24
12:15		Merged version bump from trunk, added initial copy of training presentation. check-in: d9a2c9a959 user: matt tags: development
2013-03-21
14:44		Merged development to trunk for v1.54 release check-in: 6e3531ec65 user: mrwellan tags: trunk
14:25		Test panel updates on tree node click mostly working check-in: 29e6524e1c user: mrwellan tags: development
00:07		Added widgets for test control panel check-in: 343014c543 user: matt tags: development
2013-03-12
15:33		Added server controls in megatest.config. check-in: 38ec9768b8 user: mrwellan tags: development
2013-03-11
15:17		Release v1.5302 merged from development check-in: 5e13bdcb3a user: mrwellan tags: trunk
15:08		For -reqtarg we need to allow system in runconfigs parsing or we won't see some runs Leaf check-in: a034278830 user: mrwellan tags: dev
2013-03-07
12:35		Release v1.5301 merged from development check-in: 8857f6c0b8 user: mrwellan tags: trunk, v1.5301

Modified Makefile from [e5d698bf90] to [be97b6abe5].

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

Deleted dashboard-main.scm version [7f5cc3138c].

Modified dashboard.scm from [dd79442032] to [d676ee3f3f].

Modified db.scm from [c3d228a90a] to [a79dc29e57].

Modified db_records.scm from [b53402355f] to [e634aaf404].

Added gutils.scm version [ff468ba086].

Modified http-transport.scm from [6dcdd045c3] to [ee09f9de43].

Added iupexamples/iupwidgetinfo.scm version [c580d04776].

Added iupexamples/tree.scm version [872c01f2cf].

Modified megatest.scm from [80fae04dd6] to [af1aafcd34].

Added newdashboard.scm version [9efd15407e].

Deleted rpc-transport.scm version [7a4845b5a6].

Modified server.scm from [58de22ef88] to [65c872df95].

Added synchash.scm version [68c033427e].

Modified tasks.scm from [6d66ace21c] to [16cec1c8c7].

Modified tests/Makefile from [96e646c70d] to [8fe26078dd].

Modified tests/fullrun/config/mt_include_1.config from [d76d84f7a5] to [4d0b8a5d7e].

Modified tests/fullrun/megatest.config from [d9f969ffd5] to [5c1993a08a].

︙
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
︙
97 98 99 100 101 102 103 104 105 106 107 108 109 110	97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113	+ + +	;; (define keys (open-run-close db:get-keys #f)) (define keys (cdb:remote-run db:get-keys #f)) ;; (define keys (db:get-keys db)) (define dbkeys (map (lambda (x)(vector-ref x 0)) (append keys (list (vector "runname" "blah"))))) (define header #f) (define allruns '()) (define allruns-by-id (make-hash-table)) ;; (define runchangerate (make-hash-table)) (define buttondat (make-hash-table)) ;; <run-id color text test run-key> (define alltestnamelst '()) (define searchpatts (make-hash-table)) (define num-runs 8) (define tot-run-count (cdb:remote-run db:get-num-runs #f "%")) ;; (define tot-run-count (db:get-num-runs db "%")) (define last-update (current-seconds))
︙
160 161 162 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 191 192 193 194 195 196 197 198 ~~199~~ 200 201 202 203 204 205 ~~206~~ 207 208 209 210 211 212 213	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 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242	- + + - + + + + - + + + + + + + - + + + + + + + + + + + + + + + + + - +	(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)))) ;; keypatts: ( (KEY1 "abc%def")(KEY2 "%") ) (define (update-rundat runnamepatt numruns testnamepatt keypatts) ~~(let ((modtime (file-modification-time db-file-path)))~~ (let ((modtime (file-modification-time db-file-path)) (referenced-run-ids '())) (if (or (and (> modtime last-db-update-time) (> (current-seconds)(+ last-db-update-time 5))) (> delayed-update 0)) ~~(begin~~ ;; ;; Run this stuff only when the megatest.db file has changed ;; (let ((full-run (> (random 100) 75))) ;; 25% of the time do a full refresh (debug:print-info 4 "update-rundat runnamepatt: " runnamepatt " numruns: " numruns " testnamepatt: " testnamepatt " keypatts: " keypatts) (set! please-update-buttons #t) (set! last-db-update-time modtime) (set! delayed-update (- delayed-update 1)) (let* ((allruns (cdb:remote-run db:get-runs #f runnamepatt numruns ;; (+ numruns 1) ;; (/ numruns 2)) start-run-offset keypatts)) (header (db:get-header allruns)) (runs (db:get-rows allruns)) (result '()) (maxtests 0) (states (hash-table-keys state-ignore-hash)) (statuses (hash-table-keys status-ignore-hash))) ;; (thread-sleep! 0.1) ;; give some time to other threads (debug:print 6 "update-rundat, got " (length runs) " runs") (if (> (+ last-update 300) (current-seconds)) ;; every five minutes (begin (set! last-update (current-seconds)) ~~(set! tot-run-count (length runs)))) ~~;; (rdb:get-num-runs db runnamepatt))))~~~~ (set! tot-run-count (length runs)))) ;; ;; 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")) (tests (let ((tsts (cdb:remote-run db:get-tests-for-run #f run-id testnamepatt states statuses))) (if tests-sort-reverse (reverse tsts) tsts))) (key-vals (cdb:remote-run db:get-key-vals #f run-id))) ;; 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 hide-empty-runs) ;; this reduces the data burden when set (not (null? tests))) ~~(~~set! resul~~t (~~cons~~ (vector run tests key-vals~~) result))~~)))~~ (let ((dstruct (vector run tests key-vals))) ;; ;; compare the tests with the tests in allruns-by-id same run-id ;; if different then increment value in runchangerate ;; (hash-table-set! allruns-by-id run-id dstruct) (set! result (cons dstruct result)))))) runs) ;; ;; if full-run use referenced-run-ids to delete data in all-runs-by-id and runchangerate ;; (set! header header) (set! allruns result) (debug:print 6 "allruns has " (length allruns) " runs") ;; (set! tot-run-count (+ 1 (length allruns))) maxtests)) ;; ;; Run this if the megatest.db file did not get touched ;; (begin num-tests))) ;; FIXME, naughty coding eh? num-tests)))) ;; FIXME, naughty coding eh? (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)) (fulltestname (iup:attribute btn "TITLE"))
︙
656 657 658 659 660 661 662 ~~663 664~~ 665 666 667 668 669 670 671 672 673	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 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 ~~731~~ 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757	698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 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 809 810 811 812 813 814 815 816 817	- + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +	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 (qryvals "id,run_id,testname,state,status,event_time,host,cpuload,diskfree,uname,rundir,item_path,run_duration,final_logf,comment") ) (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) (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,~~r~~un_id,testname,state,status,event_time,host,cpuload,diskfree,uname,rundir,item_path,run_duration,fin~~al~~_logf,comment "~~~~ (qry (conc "SELECT " qryvals " FROM tests WHERE run_id=? " (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 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)) ;; get a useful subset of the tests data (used in dashboard ;; use db:mintests-get-{id ,run_id,testname ...} (define (db:get-tests-for-runs-mindata db run-ids testpatt states status) (db:get-tests-for-runs db run-ids testpatt states status qryvals: "id,run_id,testname,state,status,event_time,item_path")) ;; NB // This is get tests for "runs" (note the plural!!) ;; ;; 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) (qryvals "id,run_id,testname,state,status,event_time,host,cpuload,diskfree,uname,rundir,item_path,run_duration,final_logf,comment")) ;; '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 " qryvals " 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
︙
914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942	974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023	+ + + + + + + + + + + + + + + + + + + + +	(define last-test-cache-delete (current-seconds)) (define (db:clean-all-caches) (set! test-info (make-hash-table)) (set! test-id-cache (make-hash-table))) ;; Use db:test-get* to access ;; ;; Get test data using test_id (define (db:get-test-info-by-id db test-id) (if (not test-id) (begin (debug:print-info 4 "db:get-test-info-by-id called with test-id=" test-id) #f) (let ((res #f)) (sqlite3:for-each-row (lambda (id run-id testname state status event-time host cpuload diskfree uname rundir item-path run_duration final_logf comment) ;; 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 (set! res (vector id run-id testname state status event-time host cpuload diskfree uname rundir item-path run_duration final_logf comment))) db "SELECT id,run_id,testname,state,status,event_time,host,cpuload,diskfree,uname,rundir,item_path,run_duration,final_logf,comment FROM tests WHERE id=?;" test-id) res))) ;; Use db:test-get* to access ;; ;; Get test data using test_ids (define (db:get-test-info-by-ids db test-ids) (if (null? test-ids) (begin (debug:print-info 4 "db:get-test-info-by-ids called with test-ids=" test-ids) '()) (let ((res '())) (sqlite3:for-each-row (lambda (id run-id testname state status event-time host cpuload diskfree uname rundir item-path run_duration final_logf comment) ;; 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 (set! res (cons (vector id run-id testname state status event-time host cpuload diskfree uname rundir item-path run_duration final_logf comment) res))) db (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 id in (" (string-intersperse (map conc test-ids) ",") ");")) res))) (define (db:get-test-info db run-id testname item-path) (db:get-test-info-by-id db (db:get-test-id db run-id testname item-path))) (define (db:test-set-comment db test-id comment) (sqlite3:execute db
︙
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	1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130	- - - - - - - - - - -	#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	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 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509	- + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - + - - + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + - + + - - - + + + + + + + - - - - - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +	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! server:last-write-flush (current-milliseconds)) (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))) )) ~~#f))~~ (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))) #t) #f))) (define db:process-queue-mutex (make-mutex)) (define number-of-writes 0) (define writes-total-delay 0) (define total-non-write-delay 0) (define number-non-write-queries 0) ;; 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)) (start-time (current-milliseconds)) (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))) (set! number-of-writes (+ number-of-writes 1)) (set! writes-total-delay (+ writes-total-delay 1)) 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 (cond ((member stmt-key db:special-queries) (let ((starttime (current-milliseconds))) (debug:print-info 11 "Handling special statement " stmt-key) (case stmt-key ((immediate) ;; This is a read or mixed read-write query, must clear the cache (case transport-type ((http) (mutex-lock! db:process-queue-mutex) (db:process-cached-writes db) (mutex-unlock! db:process-queue-mutex))) (let* ((proc (car params)) (remparams (cdr params)) ;; we are being handed a procedure so call it ;; (debug:print-info 11 "Running (apply " proc " " remparams ")") (result (server:reply return-address qry-sig #t (apply proc remparams)))) (set! total-non-write-delay (+ total-non-write-delay (- (current-milliseconds) starttime))) (set! number-non-write-queries (+ number-non-write-queries 1)) result)) ((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 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
︙

︙
57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73	57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77	- + + + + + - +	;; hostn)) (db #f) ;; (open-db)) ;; we don't want the server to be opening and closing the db unnecesarily (hostname (get-host-name)) (ipaddrstr (let ((ipstr (if (string=? "-" hostn) (string-intersperse (map number->string (u8vector->list (hostname->ip hostname))) ".") #f))) (if ipstr ipstr hostn))) ;; hostname))) ~~(start-port (if (args:get-arg "-port")~~ (start-port (if (and (args:get-arg "-port") (string->number (args:get-arg "-port"))) (string->number (args:get-arg "-port")) (if (and (config-lookup configdat "server" "port") (string->number (config-lookup configdat "server" "port"))) (string->number (config-lookup configdat "server" "port")) ~~(+ 5000 (random 1001))))~~ (+ 5000 (random 1001))))) (link-tree-path (config-lookup configdat "setup" "linktree"))) (set! cache-on #t) (root-path (if link-tree-path link-tree-path (current-directory))) ;; WARNING: SECURITY HOLE. FIX ASAP! ;; Setup the web server and a /ctrl interface
︙
101 102 103 104 105 106 107 ~~108~~ ~~109 110~~ 111 112 113 114 115 116 117	105 106 107 108 109 110 111 112 113 114 115 116 117 118 119	- + - -	;; (mutex-unlock! db:process-queue-mutex) (debug:print-info 11 "Return value from db:process-queue-item is " res) (send-response body: (conc "<head>ctrl data</head>\n<body>" res "</body>") headers: '((content-type text/plain))))) (else (continue)))))))) ~~(http-transport:try-start-server ipaddrstr start-port)~~ (http-transport:try-start-server ipaddrstr start-port))) ~~~~;; lite3:finalize! db)))~~ ))~~ ;; This is recursively run by http-transport:run until sucessful ;; (define (http-transport:try-start-server ipaddrstr portnum) (handle-exceptions exn (begin
︙
130 131 132 133 134 135 136 ~~137 138 139 140 141 142 143~~ 144 145 146 147 148 149 150	132 133 134 135 136 137 138 139 140 141 142 143 144 145	- - - - - - -	(current-process-id) ipaddrstr portnum 0 'live 'http) (print "INFO: Trying to start server on " ipaddrstr ":" portnum) ;; This starts the spiffy server (start-server port: portnum) (print "INFO: server has been stopped"))) ~~(define (http-transport: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 ;;====================================================================== ;;====================================================================== ;; C L I E N T S ;;======================================================================
︙
216 217 218 219 220 221 222 ~~223 224~~ 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 ~~240~~ ~~241 242 243 244 245~~ 246 247 248 249 250 251 252 253 254 255 ~~256~~ 257 258 259 260 261 262 263 264 265 266 267 268 269 270 ~~271~~ 272 273 274 275 276 277 ~~278 279~~ 280 281 282 ~~283~~ ~~284~~ 285 286 287	211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317	- - + + + + + + + + + - + - - - - - - + + + + + + + + + + + + + + + + - + - - + + + - + - + + + + + + + + + + + + + + + + + +	(begin (sleep 4) (loop)))))) (iface (car server-info)) (port (cadr server-info)) (last-access 0) (tdb (tasks:open-db)) ~~(spid (tasks:server-get-server-id tdb #f iface port #f))) (print "Kee~~p-running got~~ server pid ~~" spid ", using iface~~ " iface " ~~and port~~ " port)~~ (spid (tasks:server-get-server-id tdb #f iface port #f)) (server-timeout (let ((tmo (config-lookup configdat "server" "timeout"))) (if (and (string? tmo) (string->number tmo)) (* 60 60 (string->number tmo)) ;; default to three days (* 3 24 60))))) (debug:print-info 2 "server-timeout: " server-timeout ", server pid: " spid " on " iface ":" port) (let loop ((count 0)) (thread-sleep! 4) ;; no need to do this very often ;; NB// sync currently does NOT return queue-length (let () ;; (queue-len (cdb:client-call server-info 'sync #t 1))) ;; (print "Server running, count is " count) (if (< count 1) ;; 3x3 = 9 secs aprox (loop (+ count 1))) ;; NOTE: Get rid of this mechanism! It really is not needed... (tasks:server-update-heartbeat tdb spid) ;; (if ;; (or (> numrunning 0) ;; stay alive for two days after last access (mutex-lock! heartbeat-mutex) (set! last-access last-db-access) (mutex-unlock! heartbeat-mutex) ;; (debug:print 11 "last-access=" last-access ", server-timeout=" server-timeout) ~~(if (> (+ last-access~~ (if (> (+ last-access server-timeout) ~~;; (* 50 60 60) ;; 48 hrs~~ ~~;; 60 ;; one minute~~ ~~;; (* 60 60) ;; one hour~~ ~~(* 45 60) ;; 45 minutes, until the db deletion bug is fixed.~~ ) (current-seconds)) (begin (debug:print-info 2 "Server continuing, seconds since last db access: " (- (current-seconds) last-access)) (loop 0)) (begin (debug:print-info 0 "Starting to shutdown the server.") ;; need to delete only my server entry (future use) (set! time-to-exit #t) (tasks:server-deregister-self tdb (get-host-name)) (thread-sleep! 1) ~~(debug:print-info 0 "Max cached queries was " max-cache-size)~~ (debug:print-info 0 "Max cached queries was " max-cache-size) (debug:print-info 0 "Number of cached writes " number-of-writes) (debug:print-info 0 "Average cached write time " (if (eq? number-of-writes 0) "n/a (no writes)" (/ writes-total-delay number-of-writes)) " ms") (debug:print-info 0 "Number non-cached queries " number-non-write-queries) (debug:print-info 0 "Average non-cached time " (if (eq? number-non-write-queries 0) "n/a (no queries)" (/ total-non-write-delay number-non-write-queries)) " ms") (debug:print-info 0 "Server shutdown complete. Exiting") (exit))))))) ;; all routes though here end in exit ... (define (http-transport:launch) (if (not toppath) (if (not (setup-for-run)) (begin (debug:print 0 "ERROR: cannot find megatest.config, exiting") (exit)))) (debug:print-info 2 "Starting the standalone server") (let ((hostinfo (open-run-close tasks:get-best-server tasks:open-db))) (debug:print 11 "http-transport:launch hostinfo=" hostinfo) ;; #(1 "143.182.207.24" 5736 -1 "http" 22771 "hostname") (if hostinfo ~~(debug:print-info 2 "NOT starting new server, one is already running on " (~~car~~ hostinfo) ":" (~~cadr~~ hostinfo))~~ (debug:print-info 2 "NOT starting new server, one is already running on " (vector-ref hostinfo 1) ":" (vector-ref hostinfo 2)) (if toppath (let* ((th2 (make-thread (lambda () (http-transport:run (if (args:get-arg "-server") (args:get-arg "-server") "-"))) "Server run")) ~~(th3 (make-thread ~~(lambda ()(~~http-transport:keep-running)) "Keep running")) )~~ (th3 (make-thread http-transport:keep-running "Keep running")) (th1 (make-thread server:write-queue-handler "write queue"))) (thread-start! th2) (thread-start! th3) (thread-start! th1) (set! didsomething #t) ~~(thread-join! th2)~~ (thread-join! th2)) ) (debug:print 0 "ERROR: Failed to setup for megatest"))) (exit))) (define (http-transport:server-signal-handler signum) (handle-exceptions exn (debug:print " ... exiting ...") (let ((th1 (make-thread (lambda () (thread-sleep! 1)) ;; (if (not received-response) ;; (receive-message* runremote))) ;; flush out last call if applicable "eat response")) (th2 (make-thread (lambda () (debug:print 0 "ERROR: Received ^C, attempting clean exit. Please be patient and wait a few seconds before hitting ^C again.") (thread-sleep! 3) ;; give the flush three seconds to do it's stuff (debug:print 0 " Done.") (exit 4)) "exit on ^C timer"))) (thread-start! th2) (thread-start! th1) (thread-join! th2))))

︙
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 79~~ ~~80 81 82 83 84~~ ~~85 86 87 88 89 90 91~~ ~~92 93 94 95~~ ~~96 97 98~~ ~~99 100 101 102 103 104~~ ~~105 106 107 108~~ 109 110 111 112 113 114 115 116 ~~117 118 119~~ 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 ~~139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157~~	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 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119	- - - + + - - + - - - - - - - - + + + + + + + + + - - - - - - - - - - - - + + + + - - - - - - - + + - - - - - + + + + + - - - - - - - + + + + + + + + - - - - + - - - + + - - - - - - + - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - -	;;====================================================================== ;; S E R V E R ;;====================================================================== ;; Call this to start the actual server ;; ~~~~(define db:process-queue-mutex (make-mutex))~~ (define (server:run ~~hostn~~)~~ ;; all routes though here end in exit ... (define (server:launch transport) ~~(debug:print 2 "Attempting to start the server ...")~~ (if (not toppath) (if (not (setup-for-run)) (begin ~~(debug:print 0 "ERROR: cannot find megatest.config, ~~cannot start server,~~ exiting")~~ (debug:print 0 "ERROR: cannot find megatest.config, exiting") (exit)))) (le~~t* (;; (iface (if (st~~rin~~g=?~~ "-" ~~hostn~~) ;; ~~#f ;; (g~~et~~-hos~~t-n~~ame)~~ ;; ho~~stn))~~ ~~(db #f) ;;~~ (ope~~n-db~~)) ;; ~~we don't want~~ the ~~server~~ t~~o be opening~~ an~~d closing the db unnecesarily~~ ~~(hostname~~ (get-h~~ost-name~~)) ~~(ipaddrstr~~ (~~let~~ (~~(ips~~tr ~~(if (~~strin~~g=? "-" hostn~~) (~~string-intersperse (map number->string (u8vector->list (hostname->ip hostname))) ".")~~ #f))) (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)))) ~~(if ipstr ipstr hostn))) ;; hostname)))~~ ~~(start-port (if (args:get-arg "-port")~~ ~~(string->number (args:get-arg "-port"))~~ ~~(+ 5000 (random 1001))))~~ ~~(link-tree-path (config-lookup configdat "setup" "linktree")))~~ ~~(set! cache-on #t)~~ ~~(root-path (if link-tree-path~~ ~~link-tree-path~~ ~~(current-directory))) ;; WARNING: SECURITY HOLE. FIX ASAP!~~ ~~;; Setup the web server and a /ctrl interface~~ ;; ~~(vhost-map `(((* any) . ,(lambda (continue)~~ ;;====================================================================== ;; Q U E U E M A N A G E M E N T ;;====================================================================== ~~;; open the db on the first call~~ ~~(if (not db)(set! db (open-db)))~~ ~~(let* (($ (request-vars source: 'both))~~ ~~(dat ($ 'dat))~~ ~~(res #f))~~ ~~(cond~~ ((equa~~l? (uri-path (reque~~st-~~uri~~ (current-~~request~~))) ;; We don't want to flush the queue if it was just flushed (define server:last-write-flush (current-milliseconds)) ~~'(/ "hey"))~~ ~~(send-response body: "hey there!\n"~~ header~~s: '((~~con~~tent-typ~~e text~~/plain))))~~ ~~;; Th~~i~~s is th~~e ~~/ctrl path where data is handed to the~~ server ~~and~~ ~~;; respon~~ses ;; 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) ~~((equal? (uri-path (request-uri (current-request)))~~ '(/ ~~"ctrl"~~)) (let* (~~(packet (db:string->obj dat)~~) (~~qtyp~~e ~~(cdb:packet-get-qtype packet)~~)) (de~~bug:pr~~int-in~~fo 12 "s~~e~~rver=> received packet=" packet~~) (if (~~not~~ (me~~mber qtype '(sync ping))~~) (begin (let ((db (open-db))) (let loop () (let ((last-write-flush-time #f)) (mutex-lock! incoming-mutex) (set! last-write-flush-time server:last-write-flush) (mutex-unlock! incoming-mutex) (if (> (- (current-milliseconds) last-write-flush-time) 400) (begin ~~(mutex-lock! heartbeat-mutex)~~ ~~(set! last-db-access (current-seconds))~~ ~~(mutex-unlock! heartbeat-mutex)))~~ ;; (mutex-lock! db:process-queue-mutex) ~~;; trying a mutex~~ (mutex-lock! db:process-queue-mutex) ~~~~;; (set! res (open-run-close db:process-queue-item open-db packet))~~ ~~(set! res~~ (db:process-que~~ue-~~ite~~m db packet)~~) ;; (mutex-unlock! db:process-queue-mutex)~~ (db:process-cached-writes db) (mutex-unlock! db:process-queue-mutex) ~~(debug:print-info 11 "Return value from db:process-queue-item is " res)~~ ~~(send-response body: (conc "<head>ctrl data</head>\n<body>"~~ ~~res~~ ~~"</body>")~~ ~~headers: '((content-type text/plain)))))~~ (else ~~(continue))))~~)))) (thread-sleep! 0.5)))) ~~~~(server:try-start-server ipaddrstr start-port)~~ ~~;; lite3:finalize! db~~))) ))~~ (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) ;; (send-message pubsock (case transport-type ((fs) result) ((http)(db:obj->string (vector success/fail query-sig result))) ((zmq) (let ((pub-socket (vector-ref runremote 1))) (send-message pub-socket return-addr send-more: #t) (send-message pub-socket (db:obj->string (vector success/fail query-sig result))))) (else (debug:print 0 "ERROR: unrecognised transport type: " transport-type) result))) ~~;; 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))))~~

︙
17 18 19 20 21 22 23 24 25 26 27 28 29 30	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;make install) && \ (cd fullrun;../../bin/megatest -server - -debug 22) & test0 : cleanprep cd simplerun ; $(MEGATEST) -server - -debug $(DEBUG)& test1 : cleanprep rm -f simplerun/megatest.db
︙
61 62 63 64 65 66 67 68 69 70 71 72 73 74 75	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")))































































































































































































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 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 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 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 191	+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +	#! /usr/bin/env csi (require-library srfi-4 iup) (import srfi-4 iup iup-pplot iup-glcanvas) (define (popup dlg . args) (apply show dlg #:modal? 'yes args) (destroy! dlg)) (define (properties ih) (popup (element-properties-dialog ih)) 'default) (define dlg (dialog (vbox (hbox ; headline (fill) (frame (label " Inspect control and dialog classes " fontsize: 15)) (fill) margin: '0x0) (label "") (label "Dialogs" fontsize: 12) (hbox (button "dialog" action: (lambda (self) (properties (dialog (vbox))))) (button "color-dialog" action: (lambda (self) (properties (color-dialog)))) (button "file-dialog" action: (lambda (self) (properties (file-dialog)))) (button "font-dialog" action: (lambda (self) (properties (font-dialog)))) (button "message-dialog" action: (lambda (self) (properties (message-dialog)))) (fill) margin: '0x0) (hbox (button "layout-dialog" action: (lambda (self) (properties (layout-dialog)))) (button "element-properties-dialog" action: (lambda (self) (properties (element-properties-dialog (create 'user))))) (fill) margin: '0x0) (label "") (label "Composition widgets" fontsize: 12) (hbox (button "fill" action: (lambda (self) (properties (fill)))) (button "hbox" action: (lambda (self) (properties (hbox)))) (button "vbox" action: (lambda (self) (properties (vbox)))) (button "zbox" action: (lambda (self) (properties (zbox)))) (button "radio" action: (lambda (self) (properties (radio (vbox))))) (button "normalizer" action: (lambda (self) (properties (normalizer)))) (button "cbox" action: (lambda (self) (properties (cbox)))) (button "sbox" action: (lambda (self) (properties (sbox (vbox))))) (button "split" action: (lambda (self) (properties (split (vbox) (vbox))))) (fill) margin: '0x0) (label "") (label "Standard widgets" fontsize: 12) (hbox (button "button" action: (lambda (self) (properties (button)))) (button "canvas" action: (lambda (self) (properties (canvas)))) (button "frame" action: (lambda (self) (properties (frame)))) (button "label" action: (lambda (self) (properties (label)))) (button "listbox" action: (lambda (self) (properties (listbox)))) (button "progress-bar" action: (lambda (self) (properties (progress-bar)))) (button "spin" action: (lambda (self) (properties (spin)))) (fill) margin: '0x0) (hbox (button "tabs" action: (lambda (self) (properties (tabs)))) (button "textbox" action: (lambda (self) (properties (textbox)))) (button "toggle" action: (lambda (self) (properties (toggle)))) (button "treebox" action: (lambda (self) (properties (treebox)))) (button "valuator" action: (lambda (self) (properties (valuator "")))) (fill) margin: '0x0) (label "") (label "Additional widgets" fontsize: 12) (hbox (button "cells" action: (lambda (self) (properties (cells)))) (button "color-bar" action: (lambda (self) (properties (color-bar)))) (button "color-browser" action: (lambda (self) (properties (color-browser)))) (button "dial" action: (lambda (self) (properties (dial "")))) (button "matrix" action: (lambda (self) (properties (matrix)))) (fill) margin: '0x0) (hbox (button "pplot" action: (lambda (self) (properties (pplot)))) (button "glcanvas" action: (lambda (self) (properties (glcanvas)))) (button "web-browser" action: (lambda (self) (properties (web-browser)))) (fill) margin: '0x0) (label "") (label "Menu widgets" fontsize: 12) (hbox (button "menu" action: (lambda (self) (properties (menu)))) (button "menu-item" action: (lambda (self) (properties (menu-item)))) (button "menu-separator" action: (lambda (self) (properties (menu-separator)))) (fill) margin: '0x0) (label "") (label "Images" fontsize: 12) (hbox (button "image/palette" action: (lambda (self) (properties (image/palette 1 1 (u8vector->blob (u8vector 0)))))) (button "image/rgb" action: (lambda (self) (properties (image/rgb 1 1 (u8vector->blob (u8vector 0)))))) (button "image/rgba" action: (lambda (self) (properties (image/rgba 1 1 (u8vector->blob (u8vector 0)))))) (button "image/file" action: (lambda (self) (properties ;; same attributes as image/palette (image/palette 1 1 (u8vector->blob (u8vector 0)))))) ;; needs a file in current directory ;(image/file "chicken.ico")))) ; ok ;(image/file "chicken.png")))) ; doesn't work (fill) margin: '0x0) (label "") (label "Other widgets" fontsize: 12) (hbox (button "clipboard" action: (lambda (self) (properties (clipboard)))) (button "timer" action: (lambda (self) (properties (timer)))) (button "spinbox" action: (lambda (self) (properties (spinbox (vbox))))) (fill) margin: '0x0) (fill) (button "E&xit" expand: 'horizontal action: (lambda (self) 'close)) ) margin: '15x15 title: "Iup inspector")) (show dlg) (main-loop) (exit 0)

















































































































































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 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 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145	+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +	(use test) (require-library iup) (import (prefix iup iup:)) (define t #f) (define tree-dialog (iup:dialog #:title "Tree Test" (let ((t1 (iup:treebox #:selection_cb (lambda (obj id state) (print "selection_db with id=" id " state=" state) (print "USERDATA: " (iup:attribute obj "USERDATA")) (print "SPECIALDATA: " (iup:attribute obj "SPECIALDATA")) (print "Depth: " (iup:attribute obj "DEPTH")) )))) (set! t t1) t1))) (iup:show tree-dialog) (map (lambda (elname el) (print "Adding " elname " with value " el) (iup:attribute-set! t elname el) (iup:attribute-set! t "USERDATA" el)) '("VALUE" "NAME" "ADDLEAF" "ADDBRANCH1" "ADDLEAF2" "VALUE") '("0" "Figures" "Other" "triangle" "equilateral" "4") ) (map (lambda (attr) (print attr " is " (iup:attribute t attr))) '("KIND1" "PARENT2" "STATE1")) (define (tree-find-node obj path) ;; start at the base of the tree (if (null? path) #f ;; or 0 ???? (let loop ((hed (car path)) (tal (cdr path)) (depth 0) (nodenum 0)) ;; nodes in iup tree are 100% sequential so iterate over nodenum (if (iup:attribute obj (conc "DEPTH" nodenum)) ;; end when no more nodes (let ((node-depth (string->number (iup:attribute obj (conc "DEPTH" nodenum)))) (node-title (iup:attribute obj (conc "TITLE" nodenum)))) ;; (print 0 "hed: " hed ", depth: " depth ", node-depth: " node-depth ", nodenum: " nodenum ", node-title: " node-title) (if (and (equal? depth node-depth) (equal? hed node-title)) ;; yep, this is the one! (if (null? tal) ;; end of the line nodenum (loop (car tal)(cdr tal)(+ depth 1)(+ 1 nodenum))) ;; this is the case where we found part of the hierarchy but not ;; all of it, i.e. the node-depth went from deep to less deep (if (> depth node-depth) ;; (+ 1 node-depth)) #f (loop hed tal depth (+ nodenum 1))))) #f)))) ;; top is the top node name zeroeth node VALUE=0 (define (tree-add-node obj top nodelst) (if (not (iup:attribute obj "TITLE0")) (iup:attribute-set! obj "ADDBRANCH0" top)) (cond ((not (string=? top (iup:attribute obj "TITLE0"))) (print "ERROR: top name " top " doesn't match " (iup:attribute obj "TITLE0"))) ((null? nodelst)) (else (let loop ((hed (car nodelst)) (tal (cdr nodelst)) (depth 1) (pathl (list top))) ;; Because the tree dialog changes node numbers when ;; nodes are added or removed we must look up nodes ;; each and every time. 0 is the top node so default ;; to that. (let* ((newpath (append pathl (list hed))) (parentnode (tree-find-node obj pathl)) (nodenum (tree-find-node obj newpath))) ;; (print "newpath: " newpath ", nodenum " nodenum ", hed: " hed ", depth: " depth ", parentnode: " parentnode ", pathl: " pathl) ;; Add the branch under lastnode if not found (if (not nodenum) (begin (iup:attribute-set! obj (conc "ADDBRANCH" parentnode) hed) (if (null? tal) #t ;; reset to top (loop (car nodelst)(cdr nodelst) 1 (list top)))) (if (null? tal) ;; if null here then this path has already been added #t ;; (if nodenum (loop (car tal)(cdr tal)(+ depth 1) newpath)))))))) ;; (if nodenum nodenum lastnode))))))) ;; (loop hed tal depth pathl lastnode))))))) (define (tree-node->path obj nodenum) ;; (print "\ncurrnode nodenum depth node-depth node-title path") (let loop ((currnode 0) (depth 0) (path '())) (let ((node-depth (iup:attribute obj (conc "DEPTH" currnode))) (node-title (iup:attribute obj (conc "TITLE" currnode)))) ;; (display (conc "\n "currnode " " nodenum " " depth " " node-depth " " node-title " " path)) (if (> currnode nodenum) path (if (not node-depth) ;; #f if we are out of nodes '() (let ((ndepth (string->number node-depth))) (if (eq? ndepth depth) ;; This next is the match condition depth == node-depth (if (eq? currnode nodenum) (begin ;; (display " <X>") (append path (list node-title))) (loop (+ currnode 1) (+ depth 1) (append path (list node-title)))) ;; didn't match, reset to base path and keep looking ;; due to more iup odditys we don't reset to base (begin ;; (display " <L>") (loop (+ 1 currnode) 2 (append (take path ndepth)(list node-title))))))))))) (test #f 0 (tree-find-node t '("Figures"))) (test #f 1 (tree-find-node t '("Figures" "Other"))) (test #f #f (tree-find-node t '("Figures" "Other" "equilateral"))) (test #f 3 (tree-find-node t '("Figures" "triangle" "equilateral"))) (test #f #t (tree-add-node t "Figures" '())) (test #f #t (tree-add-node t "Figures" '("a" "b" "c"))) (test #f 3 (tree-find-node t '("Figures" "a" "b" "c"))) (test #f #t (tree-add-node t "Figures" '("d" "b" "c"))) (test #f 3 (tree-find-node t '("Figures" "d" "b" "c"))) (test #f 6 (tree-find-node t '("Figures" "a" "b" "c"))) (test #f #t (tree-add-node t "Figures" '("a" "e" "c"))) (test #f 6 (tree-find-node t '("Figures" "a" "e" "c"))) (test #f '("Figures") (tree-node->path t 0)) (test #f '("Figures" "d") (tree-node->path t 1)) (test #f '("Figures" "d" "b" "c") (tree-node->path t 3)) (test #f '("Figures" "a") (tree-node->path t 4)) (test #f '("Figures" "a" "b" "c") (tree-node->path t 8)) (test #f '() (tree-node->path t 40)) (iup:main-loop)