Overview
Context
Changes
Modified db.scm
from [aefc44cdb9]
to [2692e38780].
︙ | | |
2576
2577
2578
2579
2580
2581
2582
2583
2584
2585
2586
2587
2588
2589
2590
2591
2592
2593
2594
2595
|
2576
2577
2578
2579
2580
2581
2582
2583
2584
2585
2586
2587
2588
2589
2590
2591
2592
2593
2594
2595
|
-
+
-
-
-
+
+
+
|
(let* ((dbdat (if (vector? dbstruct)
(db:get-db dbstruct run-id)
dbstruct)) ;; still settling on when to use dbstruct or dbdat
(db (db:dbdat-get-db dbdat))
(res '()))
(db:delay-if-busy dbdat)
(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 shortdir attemptnum archived)
(lambda (id run_id testname state status event_time host cpuload diskfree uname rundir item_path run_duration final_logf comment shortdir attemptnum archived)
;; 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
;;(set! res (cons (vector id run-id testname state status event-time host cpuload diskfree uname rundir item-path run-duration final-logf comment shortdir attemptnum archived)
(set! res (cons (make-db:test-rec id: id run-id: run-id testname: testname state: state status: status event_time: event-time
host: host cpuload: cpuload diskfree: diskfree uname: uname rundir: rundir item_path: item-path
run_duration: run-duration final_logf: final-logf comment: comment shortdir: shortdir
(set! res (cons (make-db:test-rec id: id run_id: run_id testname: testname state: state status: status event_time: event_time
host: host cpuload: cpuload diskfree: diskfree uname: uname rundir: rundir item_path: item_path
run_duration: run_duration final_logf: final_logf comment: comment shortdir: shortdir
attemptnum: attemptnum archived: archived )
res)))
db
(conc "SELECT " db:test-record-qry-selector " FROM tests WHERE state != 'DELETED' AND run_id=?;")
run-id)
res))
|
︙ | | |
2657
2658
2659
2660
2661
2662
2663
2664
2665
2666
2667
2668
2669
2670
2671
2672
2673
2674
2675
2676
2677
|
2657
2658
2659
2660
2661
2662
2663
2664
2665
2666
2667
2668
2669
2670
2671
2672
2673
2674
2675
2676
2677
|
-
+
-
-
-
-
+
+
+
+
|
(db:with-db
dbstruct
run-id
#f
(lambda (db)
(let ((res #f))
(sqlite3:for-each-row ;; attemptnum added to hold pid of top process (not Megatest) controlling a test
(lambda (id run-id test-name state status event-time host cpu-load disk-free uname run-dir item-path run-duration final-logf comment short-dir attempt-num archived)
(lambda (id run_id testname state status event_time host cpuload diskfree uname rundir item_path run_duration final_logf comment shortdir attemptnum archived)
;; 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
;;(set! res (vector id run-id testname state status event-time host cpuload diskfree uname rundir item-path run_duration final-logf comment short-dir attemptnum archived)))
(set! res (make-db:test-rec id: id run-id: run-id test-name: test-name state: state status: status event-time: event-time
host: host cpu-load: cpu-load disk-free: disk-free uname: uname run-dir: run-dir item-path: item-path
run-duration: run-duration final-logf: final-logf comment: comment short-dir: short-dir
attempt-num: attempt-num archived: archived)))
(set! res (make-db:test-rec id: id run_id: run_id testname: testname state: state status: status event_time: event_time
host: host cpuload: cpuload diskfree: diskfree uname: uname rundir: rundir item_path: item_path
run_duration: run_duration final_logf: final_logf comment: comment shortdir: shortdir
attemptnum: attemptnum archived: archived )))
db
(conc "SELECT " db:test-record-qry-selector " FROM tests WHERE id=?;")
test-id)
res))))
;; Use db:test-get* to access
;; Get test data using test_ids. NB// Only works within a single run!!
|
︙ | | |
Modified db_records.scm
from [4495f8ce16]
to [5b2f22e401].
︙ | | |
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
|
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
|
-
-
+
+
-
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
+
+
+
+
+
+
-
-
+
+
-
+
-
-
+
+
-
-
-
-
+
+
+
+
|
(hash-table-ref/default (dbr:dbstruct-get-locdbs v) run-id #f))
(define (dbr:dbstruct-set-localdb! v run-id db)
(hash-table-set! (dbr:dbstruct-get-locdbs v) run-id db))
(require-extension typed-records)
(defstruct db:test-rec ((id -1) : number)
((run-id -1) : number)
((test-name "") : string)
((run_id -1) : number)
((testname "") : string)
((state "") : string)
((status "") : string)
((event-time -1) : number)
((event_time -1) : number)
((host "") : string)
((cpu-load -1) : number)
((disk-free -1) : number)
((cpuload -1) : number)
((diskfree -1) : number)
((uname "") : string)
((run-dir "") : string)
((item-path "") : string)
((run-duration -1) : number)
((final-logf "") : string)
((rundir "") : string)
((item_path "") : string)
((run_duration -1) : number)
((final_logf "") : string)
((comment "") : string)
((process-id -1) : number)
((archived -1) : number)
((short-dir -1) : number)
((attempt-num -1) : number))
((shortdir -1) : number)
((attemptnum -1) : number))
"id" "run_id" "testname" "state" "status" "event_time"
"host" "cpuload" "diskfree" "uname" "rundir" "item_path"
"run_duration" "final_logf" "comment" "shortdir" "attemptnum" "archived"
(define (db:qry-gen-alist qrystr listvals)
(define listqry (string-split qrystr ","))
(if (null? listqry)
'()
(let loop ((strhead (car listqry))
(strtail (cdr listqry))
(valhead (car listvals))
(valtail (cdr listvals))
(res '()))
(let* ((slot-val-pair (cons (string->symbol strhead) valhead)))
(if (or (null? strtail)
(null? valtail))
(cons slot-val-pair res);;(print strhead valhead));;(cons (cons (string->symbol strhead) valhead) res))
(loop (car strtail)(cdr strtail)(car valtail)(cdr valtail)(cons slot-val-pair res)))))))
(define (db:test-get-id typed-rec) (db:test-rec-id typed-rec))
(define (db:test-get-run_id typed-rec) (db:test-rec-run-id typed-rec))
(define (db:test-get-testname typed-rec) (db:test-rec-test-name typed-rec))
(define (db:test-get-run_id typed-rec) (db:test-rec-run_id typed-rec))
(define (db:test-get-testname typed-rec) (db:test-rec-testname typed-rec))
(define (db:test-get-state typed-rec) (db:test-rec-state typed-rec))
(define (db:test-get-status typed-rec) (db:test-rec-status typed-rec))
(define (db:test-get-event_time typed-rec) (db:test-rec-event-time typed-rec))
(define (db:test-get-event_time typed-rec) (db:test-rec-event_time typed-rec))
(define (db:test-get-host typed-rec) (db:test-rec-host typed-rec))
(define (db:test-get-cpuload typed-rec) (db:test-rec-cpu-load typed-rec))
(define (db:test-get-diskfree typed-rec) (db:test-rec-disk-free typed-rec))
(define (db:test-get-cpuload typed-rec) (db:test-rec-cpuload typed-rec))
(define (db:test-get-diskfree typed-rec) (db:test-rec-diskfree typed-rec))
(define (db:test-get-uname typed-rec) (db:test-rec-uname typed-rec))
(define (db:test-get-rundir typed-rec) (db:test-rec-run-dir typed-rec))
(define (db:test-get-item-path typed-rec) (db:test-rec-item-path typed-rec))
(define (db:test-get-run_duration typed-rec) (db:test-rec-run-duration typed-rec))
(define (db:test-get-final_logf typed-rec) (db:test-rec-final-logf typed-rec))
(define (db:test-get-rundir typed-rec) (db:test-rec-rundir typed-rec))
(define (db:test-get-item-path typed-rec) (db:test-rec-item_path typed-rec))
(define (db:test-get-run_duration typed-rec) (db:test-rec-run_duration typed-rec))
(define (db:test-get-final_logf typed-rec) (db:test-rec-final_logf typed-rec))
(define (db:test-get-comment typed-rec) (db:test-rec-comment typed-rec))
(define (db:test-get-process_id typed-rec) (db:test-rec-process-id typed-rec))
(define (db:test-get-archived typed-rec) (db:test-rec-archived typed-rec))
;; (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-fullname vec)
|
︙ | | |