Index: dashboard.scm ================================================================== --- dashboard.scm +++ dashboard.scm @@ -49,10 +49,11 @@ Usage: dashboard [options] -h : this help -server host:port : connect to host:port instead of db access -test run-id,test-id : control test identified by testid + -xterm run-id,test-id : Start a new xterm with specified run-id and test-id -guimonitor : control panel for runs Misc -rows N : set number of rows ")) @@ -61,10 +62,11 @@ (define remargs (args:get-args (argv) (list "-rows" "-run" "-test" + "-xterm" "-debug" "-host" "-transport" ) (list "-h" @@ -1751,20 +1753,73 @@ (else (let* ((button-key (mkstr runnum testnum)) (butn (iup:button "" ;; button-key #:size "60x15" #:expand "HORIZONTAL" - #:fontsize "10" - #:action (lambda (x) - (let* ((toolpath (car (argv))) - (buttndat (hash-table-ref (d:alldat-buttondat *alldat*) button-key)) - (test-id (db:test-get-id (vector-ref buttndat 3))) - (run-id (db:test-get-run_id (vector-ref buttndat 3))) - (cmd (conc toolpath " -test " run-id "," test-id "&"))) - ;(print "Launching " cmd) - (system cmd)))))) - (hash-table-set! (d:alldat-buttondat *alldat*) button-key (vector 0 "100 100 100" button-key #f #f)) + #:fontsize "10" + ;; :action (lambda (x) + ;; (let* ((toolpath (car (argv))) + ;; (buttndat (hash-table-ref (d:alldat-buttondat *alldat*) button-key)) + ;; (test-id (db:test-get-id (vector-ref buttndat 3))) + ;; (run-id (db:test-get-run_id (vector-ref buttndat 3))) + ;; (cmd (conc toolpath " -test " run-id "," test-id "&"))) + ;; ;(print "Launching " cmd) + ;; (system cmd))) + #:button-cb (lambda (obj a pressed x y btn . rem) + (print "pressed= " pressed " x= " x " y= " y " rem=" rem " btn=" btn " string? " (string? btn)) + (if (substring-index "3" btn) + (if (eq? pressed 1) + (let* ((toolpath (car (argv))) + (buttndat (hash-table-ref (d:alldat-buttondat *alldat*) button-key)) + (test-id (db:test-get-id (vector-ref buttndat 3))) + (run-id (db:test-get-run_id (vector-ref buttndat 3))) + (test-name (db:test-get-testname (rmt:get-test-info-by-id run-id test-id))) + (popup-menu (iup:menu + (iup:menu-item + "Run" + (iup:menu + (iup:menu-item + "Rerun" + #:action + (lambda (obj)(print "Rerun"))))) + (iup:menu-item + "Test" + (iup:menu + (iup:menu-item + "Start xterm" + #:action + (lambda (obj) + (let* ((cmd (conc toolpath " -xterm " run-id "," test-id "&"))) + (system cmd)))) + (iup:menu-item + "Edit testconfig" + #:action + (lambda (obj) + (let* ((all-tests (tests:get-all)) + (editor (or (get-environment-variable "VISUAL") + (get-environment-variable "EDITOR") "gvim")) + (tconfig (conc (hash-table-ref all-tests test-name) "/testconfig")) + (cmd (conc (if (string-search "\\b(vim?|nano|pico)\\b") + (conc "xterm -e " editor) + editor) + " " tconfig))) + (system cmd)))) + ))))) + (iup:show popup-menu + #:x 'mouse + #:y 'mouse + #:modal? "NO") + (print "got here"))) + (if (eq? pressed 0) + (let* ((toolpath (car (argv))) + (buttndat (hash-table-ref (d:alldat-buttondat *alldat*) button-key)) + (test-id (db:test-get-id (vector-ref buttndat 3))) + (run-id (db:test-get-run_id (vector-ref buttndat 3))) + (cmd (conc toolpath " -test " run-id "," test-id "&"))) + (system cmd))) + ))))) + (hash-table-set! (d:alldat-buttondat *alldat*) button-key (vector 0 "100 100 100" button-key #f #f)) (vector-set! testvec testnum butn) (loop runnum (+ testnum 1) testvec (cons butn res)))))) ;; now assemble the hdrlst and bdylst and kick off the dialog (iup:show (iup:dialog @@ -1931,10 +1986,24 @@ (>= test-id 0)) (examine-test run-id test-id) (begin (debug:print 3 *default-log-port* "INFO: tried to open test with invalid run-id,test-id. " (args:get-arg "-test")) (exit 1))))) + ((args:get-arg "-xterm") ;; run-id,test-id + (let* ((dat (let ((d (map string->number (string-split (args:get-arg "-xterm") ",")))) + (if (> (length d) 1) + d + (list #f #f)))) + (run-id (car dat)) + (test-id (cadr dat))) + (if (and (number? run-id) + (number? test-id) + (>= test-id 0)) + (dcommon:examine-xterm run-id test-id) + (begin + (debug:print 3 "INFO: tried to open xterm with invalid run-id,test-id. " (args:get-arg "-xterm")) + (exit 1))))) ((args:get-arg "-guimonitor") (gui-monitor (d:alldat-dblocal data))) (else (set! uidat (make-dashboard-buttons data ;; (d:alldat-dblocal data) (d:alldat-numruns data) Index: dcommon.scm ================================================================== --- dcommon.scm +++ dcommon.scm @@ -318,11 +318,37 @@ (status (vector-ref hed 4)) (newitem (list test-name item-path (list test-id state status)))) (if (null? tal) (reverse (cons newitem res)) (loop (car tal)(cdr tal)(cons newitem res))))))) - + +(define (dcommon:examine-xterm run-id test-id) + (let* + ((testdat (rmt:get-test-info-by-id run-id test-id))) + (if (not testdat) + (begin + (debug:print 2 "ERROR: No test data found for test " test-id ", exiting") + (exit 1)) + (let* + ((rundir (if testdat + (db:test-get-rundir testdat) + logfile)) + (testfullname (if testdat (db:test-get-fullname testdat) "Gathering data ...")) + (xterm (lambda () + (if (directory-exists? rundir) + (let* ((shell (if (get-environment-variable "SHELL") + (conc "-e " (get-environment-variable "SHELL")) + "")) + (command (conc "cd " rundir + ";mt_xterm -T \"" (string-translate testfullname "()" " ") "\" " shell "&"))) + (print "Command =" command) + (common:without-vars + command + "MT_.*")) + (message-window (conc "Directory " rundir " not found")))))) + (xterm) + (print "Adding xterm code"))))) ;;====================================================================== ;; D A T A T A B L E S ;;====================================================================== Index: megatest.scm ================================================================== --- megatest.scm +++ megatest.scm @@ -36,10 +36,11 @@ (declare (uses client)) (declare (uses tests)) (declare (uses genexample)) (declare (uses daemon)) (declare (uses db)) +(declare (uses dcommon)) (declare (uses tdb)) (declare (uses mt)) (declare (uses api)) (declare (uses tasks)) ;; only used for debugging. Index: run-eff.sql ================================================================== --- run-eff.sql +++ run-eff.sql @@ -1,1 +1,14 @@ -select run_id,time(max(event_time+run_duration)-min(event_time),'unixepoch') AS wall_runtime,time(max(run_duration),'unixepoch') AS max_duration,testname from tests where item_path != '' group by run_id; +.mode col +.head on +select runs.runname,num_items,printf("%.2f",wall_runtime) AS runtime,printf("%.2f",max_duration) AS duration,ratio,testname from + (select run_id, + count(id) AS num_items, + (max(event_time+run_duration)-min(event_time))/3600.0 AS wall_runtime, + max(run_duration)/3600.0 AS max_duration, + (max(event_time+run_duration)-min(event_time))/max(run_duration) AS ratio, + testname from tests where item_path != '' AND state != 'DELETED' + group by run_id + order by ratio DESC) AS dat + join runs on dat.run_id=runs.id +WHERE ratio > 1 +AND runs.state != 'deleted';