@@ -13,26 +13,26 @@ ;; ;; ;; Accessors for a dbstruct ;; -(define-inline (dbr:dbstruct-get-main vec) (vector-ref vec 0)) ;; ( db path ) -(define-inline (dbr:dbstruct-get-strdb vec) (vector-ref vec 1)) ;; ( db path ) -(define-inline (dbr:dbstruct-get-path vec) (vector-ref vec 2)) -(define-inline (dbr:dbstruct-get-local vec) (vector-ref vec 3)) -(define-inline (dbr:dbstruct-get-rundb vec) (vector-ref vec 4)) ;; ( db path ) -(define-inline (dbr:dbstruct-get-inmem vec) (vector-ref vec 5)) ;; ( db #f ) -(define-inline (dbr:dbstruct-get-mtime vec) (vector-ref vec 6)) -(define-inline (dbr:dbstruct-get-rtime vec) (vector-ref vec 7)) -(define-inline (dbr:dbstruct-get-stime vec) (vector-ref vec 8)) -(define-inline (dbr:dbstruct-get-inuse vec) (vector-ref vec 9)) -(define-inline (dbr:dbstruct-get-refdb vec) (vector-ref vec 10)) ;; ( db path ) -(define-inline (dbr:dbstruct-get-locdbs vec) (vector-ref vec 11)) -(define-inline (dbr:dbstruct-get-olddb vec) (vector-ref vec 12)) ;; ( db path ) -;; (define-inline (dbr:dbstruct-get-main-path vec) (vector-ref vec 13)) -;; (define-inline (dbr:dbstruct-get-rundb-path vec) (vector-ref vec 14)) -;; (define-inline (dbr:dbstruct-get-run-id vec) (vector-ref vec 13)) +(define-inline (dbr:dbstruct-get-main vec) (safe-vector-ref vec 0)) ;; ( db path ) +(define-inline (dbr:dbstruct-get-strdb vec) (safe-vector-ref vec 1)) ;; ( db path ) +(define-inline (dbr:dbstruct-get-path vec) (safe-vector-ref vec 2)) +(define-inline (dbr:dbstruct-get-local vec) (safe-vector-ref vec 3)) +(define-inline (dbr:dbstruct-get-rundb vec) (safe-vector-ref vec 4)) ;; ( db path ) +(define-inline (dbr:dbstruct-get-inmem vec) (safe-vector-ref vec 5)) ;; ( db #f ) +(define-inline (dbr:dbstruct-get-mtime vec) (safe-vector-ref vec 6)) +(define-inline (dbr:dbstruct-get-rtime vec) (safe-vector-ref vec 7)) +(define-inline (dbr:dbstruct-get-stime vec) (safe-vector-ref vec 8)) +(define-inline (dbr:dbstruct-get-inuse vec) (safe-vector-ref vec 9)) +(define-inline (dbr:dbstruct-get-refdb vec) (safe-vector-ref vec 10)) ;; ( db path ) +(define-inline (dbr:dbstruct-get-locdbs vec) (safe-vector-ref vec 11)) +(define-inline (dbr:dbstruct-get-olddb vec) (safe-vector-ref vec 12)) ;; ( db path ) +;; (define-inline (dbr:dbstruct-get-main-path vec) (safe-vector-ref vec 13)) +;; (define-inline (dbr:dbstruct-get-rundb-path vec) (safe-vector-ref vec 14)) +;; (define-inline (dbr:dbstruct-get-run-id vec) (safe-vector-ref vec 13)) (define-inline (dbr:dbstruct-set-main! vec val)(vector-set! vec 0 val)) (define-inline (dbr:dbstruct-set-strdb! vec val)(vector-set! vec 1 val)) (define-inline (dbr:dbstruct-set-path! vec val)(vector-set! vec 2 val)) (define-inline (dbr:dbstruct-set-local! vec val)(vector-set! vec 3 val)) @@ -65,34 +65,34 @@ (define (dbr:dbstruct-set-localdb! v run-id db) (hash-table-set! (dbr:dbstruct-get-locdbs v) run-id db)) (define (make-db:test)(make-vector 20)) -(define-inline (db:test-get-id vec) (vector-ref vec 0)) -(define-inline (db:test-get-run_id vec) (vector-ref vec 1)) -(define-inline (db:test-get-testname vec) (vector-ref vec 2)) -(define-inline (db:test-get-state vec) (vector-ref vec 3)) -(define-inline (db:test-get-status vec) (vector-ref vec 4)) -(define-inline (db:test-get-event_time vec) (vector-ref vec 5)) -(define-inline (db:test-get-host vec) (vector-ref vec 6)) -(define-inline (db:test-get-cpuload vec) (vector-ref vec 7)) -(define-inline (db:test-get-diskfree vec) (vector-ref vec 8)) -(define-inline (db:test-get-uname vec) (vector-ref vec 9)) -;; (define-inline (db:test-get-rundir vec) (sdb:qry 'getstr (vector-ref vec 10))) -(define-inline (db:test-get-rundir vec) (vector-ref vec 10)) -(define-inline (db:test-get-item-path vec) (vector-ref vec 11)) -(define-inline (db:test-get-run_duration vec) (vector-ref vec 12)) -(define-inline (db:test-get-final_logf vec) (vector-ref vec 13)) -(define-inline (db:test-get-comment vec) (vector-ref vec 14)) -(define-inline (db:test-get-process_id vec) (vector-ref vec 16)) -;; (define-inline (db:test-get-pass_count vec) (vector-ref vec 15)) -;; (define-inline (db:test-get-fail_count vec) (vector-ref vec 16)) +(define-inline (db:test-get-id vec) (safe-vector-ref vec 0)) +(define-inline (db:test-get-run_id vec) (safe-vector-ref vec 1)) +(define-inline (db:test-get-testname vec) (safe-vector-ref vec 2)) +(define-inline (db:test-get-state vec) (safe-vector-ref vec 3)) +(define-inline (db:test-get-status vec) (safe-vector-ref vec 4)) +(define-inline (db:test-get-event_time vec) (safe-vector-ref vec 5)) +(define-inline (db:test-get-host vec) (safe-vector-ref vec 6)) +(define-inline (db:test-get-cpuload vec) (safe-vector-ref vec 7)) +(define-inline (db:test-get-diskfree vec) (safe-vector-ref vec 8)) +(define-inline (db:test-get-uname vec) (safe-vector-ref vec 9)) +;; (define-inline (db:test-get-rundir vec) (sdb:qry 'getstr (safe-vector-ref vec 10))) +(define-inline (db:test-get-rundir vec) (safe-vector-ref vec 10)) +(define-inline (db:test-get-item-path vec) (safe-vector-ref vec 11)) +(define-inline (db:test-get-run_duration vec) (safe-vector-ref vec 12)) +(define-inline (db:test-get-final_logf vec) (safe-vector-ref vec 13)) +(define-inline (db:test-get-comment vec) (safe-vector-ref vec 14)) +(define-inline (db:test-get-process_id vec) (safe-vector-ref vec 16)) +;; (define-inline (db:test-get-pass_count vec) (safe-vector-ref vec 15)) +;; (define-inline (db:test-get-fail_count vec) (safe-vector-ref vec 16)) (define-inline (db:test-get-fullname vec) (conc (db:test-get-testname vec) "/" (db:test-get-item-path vec))) -(define-inline (db:test-get-first_err vec) (printable (vector-ref vec 15))) -(define-inline (db:test-get-first_warn vec) (printable (vector-ref vec 16))) +(define-inline (db:test-get-first_err vec) (printable (safe-vector-ref vec 15))) +(define-inline (db:test-get-first_warn vec) (printable (safe-vector-ref vec 16))) (define-inline (db:test-set-cpuload! vec val)(vector-set! vec 7 val)) (define-inline (db:test-set-diskfree! vec val)(vector-set! vec 8 val)) (define-inline (db:test-set-testname! vec val)(vector-set! vec 2 val)) (define-inline (db:test-set-state! vec val)(vector-set! vec 3 val)) @@ -109,30 +109,30 @@ (equal? (db:test-get-uname vec) "n/a"))) ;; test has never been run ;; make-vector-record "" db mintest id run_id testname state status event_time item_path ;; (define (make-db:mintest)(make-vector 7)) -(define-inline (db:mintest-get-id vec) (vector-ref vec 0)) -(define-inline (db:mintest-get-run_id vec) (vector-ref vec 1)) -(define-inline (db:mintest-get-testname vec) (vector-ref vec 2)) -(define-inline (db:mintest-get-state vec) (vector-ref vec 3)) -(define-inline (db:mintest-get-status vec) (vector-ref vec 4)) -(define-inline (db:mintest-get-event_time vec) (vector-ref vec 5)) -(define-inline (db:mintest-get-item_path vec) (vector-ref vec 6)) +(define-inline (db:mintest-get-id vec) (safe-vector-ref vec 0)) +(define-inline (db:mintest-get-run_id vec) (safe-vector-ref vec 1)) +(define-inline (db:mintest-get-testname vec) (safe-vector-ref vec 2)) +(define-inline (db:mintest-get-state vec) (safe-vector-ref vec 3)) +(define-inline (db:mintest-get-status vec) (safe-vector-ref vec 4)) +(define-inline (db:mintest-get-event_time vec) (safe-vector-ref vec 5)) +(define-inline (db:mintest-get-item_path vec) (safe-vector-ref vec 6)) ;; make-vector-record db testmeta id testname author owner description reviewed iterated avg_runtime avg_disk (define (make-db:testmeta)(make-vector 10 "")) -(define-inline (db:testmeta-get-id vec) (vector-ref vec 0)) -(define-inline (db:testmeta-get-testname vec) (vector-ref vec 1)) -(define-inline (db:testmeta-get-author vec) (vector-ref vec 2)) -(define-inline (db:testmeta-get-owner vec) (vector-ref vec 3)) -(define-inline (db:testmeta-get-description vec) (vector-ref vec 4)) -(define-inline (db:testmeta-get-reviewed vec) (vector-ref vec 5)) -(define-inline (db:testmeta-get-iterated vec) (vector-ref vec 6)) -(define-inline (db:testmeta-get-avg_runtime vec) (vector-ref vec 7)) -(define-inline (db:testmeta-get-avg_disk vec) (vector-ref vec 8)) -(define-inline (db:testmeta-get-tags vec) (vector-ref vec 9)) +(define-inline (db:testmeta-get-id vec) (safe-vector-ref vec 0)) +(define-inline (db:testmeta-get-testname vec) (safe-vector-ref vec 1)) +(define-inline (db:testmeta-get-author vec) (safe-vector-ref vec 2)) +(define-inline (db:testmeta-get-owner vec) (safe-vector-ref vec 3)) +(define-inline (db:testmeta-get-description vec) (safe-vector-ref vec 4)) +(define-inline (db:testmeta-get-reviewed vec) (safe-vector-ref vec 5)) +(define-inline (db:testmeta-get-iterated vec) (safe-vector-ref vec 6)) +(define-inline (db:testmeta-get-avg_runtime vec) (safe-vector-ref vec 7)) +(define-inline (db:testmeta-get-avg_disk vec) (safe-vector-ref vec 8)) +(define-inline (db:testmeta-get-tags vec) (safe-vector-ref vec 9)) (define-inline (db:testmeta-set-id! vec val)(vector-set! vec 0 val)) (define-inline (db:testmeta-set-testname! vec val)(vector-set! vec 1 val)) (define-inline (db:testmeta-set-author! vec val)(vector-set! vec 2 val)) (define-inline (db:testmeta-set-owner! vec val)(vector-set! vec 3 val)) (define-inline (db:testmeta-set-description! vec val)(vector-set! vec 4 val)) @@ -143,21 +143,21 @@ ;;====================================================================== ;; T E S T D A T A ;;====================================================================== (define (make-db:test-data)(make-vector 10)) -(define-inline (db:test-data-get-id vec) (vector-ref vec 0)) -(define-inline (db:test-data-get-test_id vec) (vector-ref vec 1)) -(define-inline (db:test-data-get-category vec) (vector-ref vec 2)) -(define-inline (db:test-data-get-variable vec) (vector-ref vec 3)) -(define-inline (db:test-data-get-value vec) (vector-ref vec 4)) -(define-inline (db:test-data-get-expected vec) (vector-ref vec 5)) -(define-inline (db:test-data-get-tol vec) (vector-ref vec 6)) -(define-inline (db:test-data-get-units vec) (vector-ref vec 7)) -(define-inline (db:test-data-get-comment vec) (vector-ref vec 8)) -(define-inline (db:test-data-get-status vec) (vector-ref vec 9)) -(define-inline (db:test-data-get-type vec) (vector-ref vec 10)) +(define-inline (db:test-data-get-id vec) (safe-vector-ref vec 0)) +(define-inline (db:test-data-get-test_id vec) (safe-vector-ref vec 1)) +(define-inline (db:test-data-get-category vec) (safe-vector-ref vec 2)) +(define-inline (db:test-data-get-variable vec) (safe-vector-ref vec 3)) +(define-inline (db:test-data-get-value vec) (safe-vector-ref vec 4)) +(define-inline (db:test-data-get-expected vec) (safe-vector-ref vec 5)) +(define-inline (db:test-data-get-tol vec) (safe-vector-ref vec 6)) +(define-inline (db:test-data-get-units vec) (safe-vector-ref vec 7)) +(define-inline (db:test-data-get-comment vec) (safe-vector-ref vec 8)) +(define-inline (db:test-data-get-status vec) (safe-vector-ref vec 9)) +(define-inline (db:test-data-get-type vec) (safe-vector-ref vec 10)) (define-inline (db:test-data-set-id! vec val)(vector-set! vec 0 val)) (define-inline (db:test-data-set-test_id! vec val)(vector-set! vec 1 val)) (define-inline (db:test-data-set-category! vec val)(vector-set! vec 2 val)) (define-inline (db:test-data-set-variable! vec val)(vector-set! vec 3 val)) @@ -173,17 +173,17 @@ ;; S T E P S ;;====================================================================== ;; Run steps ;; make-vector-record "Run steps" db step id test_id stepname step_complete step_pass event_time (define (make-db:step)(make-vector 7)) -(define-inline (tdb:step-get-id vec) (vector-ref vec 0)) -(define-inline (tdb:step-get-test_id vec) (vector-ref vec 1)) -(define-inline (tdb:step-get-stepname vec) (vector-ref vec 2)) -(define-inline (tdb:step-get-state vec) (vector-ref vec 3)) -(define-inline (tdb:step-get-status vec) (vector-ref vec 4)) -(define-inline (tdb:step-get-event_time vec) (vector-ref vec 5)) -(define-inline (tdb:step-get-logfile vec) (vector-ref vec 6)) +(define-inline (tdb:step-get-id vec) (safe-vector-ref vec 0)) +(define-inline (tdb:step-get-test_id vec) (safe-vector-ref vec 1)) +(define-inline (tdb:step-get-stepname vec) (safe-vector-ref vec 2)) +(define-inline (tdb:step-get-state vec) (safe-vector-ref vec 3)) +(define-inline (tdb:step-get-status vec) (safe-vector-ref vec 4)) +(define-inline (tdb:step-get-event_time vec) (safe-vector-ref vec 5)) +(define-inline (tdb:step-get-logfile vec) (safe-vector-ref vec 6)) (define-inline (tdb:step-set-id! vec val)(vector-set! vec 0 val)) (define-inline (tdb:step-set-test_id! vec val)(vector-set! vec 1 val)) (define-inline (tdb:step-set-stepname! vec val)(vector-set! vec 2 val)) (define-inline (tdb:step-set-state! vec val)(vector-set! vec 3 val)) (define-inline (tdb:step-set-status! vec val)(vector-set! vec 4 val)) @@ -191,30 +191,30 @@ (define-inline (tdb:step-set-logfile! vec val)(vector-set! vec 6 val)) ;; The steps table (define (make-db:steps-table)(make-vector 5)) -(define-inline (tdb:steps-table-get-stepname vec) (vector-ref vec 0)) -(define-inline (tdb:steps-table-get-start vec) (vector-ref vec 1)) -(define-inline (tdb:steps-table-get-end vec) (vector-ref vec 2)) -(define-inline (tdb:steps-table-get-status vec) (vector-ref vec 3)) -(define-inline (tdb:steps-table-get-runtime vec) (vector-ref vec 4)) +(define-inline (tdb:steps-table-get-stepname vec) (safe-vector-ref vec 0)) +(define-inline (tdb:steps-table-get-start vec) (safe-vector-ref vec 1)) +(define-inline (tdb:steps-table-get-end vec) (safe-vector-ref vec 2)) +(define-inline (tdb:steps-table-get-status vec) (safe-vector-ref vec 3)) +(define-inline (tdb:steps-table-get-runtime vec) (safe-vector-ref vec 4)) (define-inline (tdb:step-stable-set-stepname! vec val)(vector-set! vec 0 val)) (define-inline (tdb:step-stable-set-start! vec val)(vector-set! vec 1 val)) (define-inline (tdb:step-stable-set-end! vec val)(vector-set! vec 2 val)) (define-inline (tdb:step-stable-set-status! vec val)(vector-set! vec 3 val)) (define-inline (tdb:step-stable-set-runtime! vec val)(vector-set! vec 4 val)) ;; The data structure for handing off requests via wire (define (make-cdb:packet)(make-vector 6)) -(define-inline (cdb:packet-get-client-sig vec) (vector-ref vec 0)) -(define-inline (cdb:packet-get-qtype vec) (vector-ref vec 1)) -(define-inline (cdb:packet-get-immediate vec) (vector-ref vec 2)) -(define-inline (cdb:packet-get-query-sig vec) (vector-ref vec 3)) -(define-inline (cdb:packet-get-params vec) (vector-ref vec 4)) -(define-inline (cdb:packet-get-qtime vec) (vector-ref vec 5)) +(define-inline (cdb:packet-get-client-sig vec) (safe-vector-ref vec 0)) +(define-inline (cdb:packet-get-qtype vec) (safe-vector-ref vec 1)) +(define-inline (cdb:packet-get-immediate vec) (safe-vector-ref vec 2)) +(define-inline (cdb:packet-get-query-sig vec) (safe-vector-ref vec 3)) +(define-inline (cdb:packet-get-params vec) (safe-vector-ref vec 4)) +(define-inline (cdb:packet-get-qtime vec) (safe-vector-ref vec 5)) (define-inline (cdb:packet-set-client-sig! vec val)(vector-set! vec 0 val)) (define-inline (cdb:packet-set-qtype! vec val)(vector-set! vec 1 val)) (define-inline (cdb:packet-set-immediate! vec val)(vector-set! vec 2 val)) (define-inline (cdb:packet-set-query-sig! vec val)(vector-set! vec 3 val)) (define-inline (cdb:packet-set-params! vec val)(vector-set! vec 4 val)) (define-inline (cdb:packet-set-qtime! vec val)(vector-set! vec 5 val))