@@ -59,19 +59,19 @@
 (define *rmt-query-last-call-time* 0)
 (define *rmt-query-last-rest-time* 0) ;; last time there was at least a 1/2 second rest - giving other processes access to the db
 
 ;; NOTE: This query rest algorythm will not adapt to long query times. REDESIGN NEEDED. TODO. FIXME.
 ;;
-(define (rmt:query-rest)
+(define (rmt:query-rest cmd rid params)
   (let* ((now (current-milliseconds)))
     (cond
-     ((> (- now *rmt-query-last-call-time*) 500)  ;; it's been a while since last query - no need to rest
+     ((> (- now *rmt-query-last-call-time*) 100)  ;; it's been a while since last query - no need to rest
       (set! *rmt-query-last-rest-time*  now)
       (set! *rmt-query-last-call-time*  now))
      ((> (- now *rmt-query-last-rest-time*) 5000) ;; no natural rests have happened
-      (debug:print 0 *default-log-port* "query rest needed. blocking for 1/2 second.")
-      (thread-sleep! 0.5) ;; force a rest of a half second
+      (debug:print 0 *default-log-port* "query rest needed. blocking for 0.1 second. cmd="cmd", run id="rid", params="params)
+      (thread-sleep! 0.1) ;; force a rest of a half second
       (set! *rmt-query-last-rest-time* now)
       (set! *rmt-query-last-call-time* now))
      (else ;; sufficient rests have occurred, just record the last query time
       (set! *rmt-query-last-call-time* now)))))
 
@@ -81,11 +81,11 @@
 
   #;(common:telemetry-log (conc "rmt:"(->string cmd))
                         payload: `((rid . ,rid)
                                    (params . ,params)))
   (if (not (equal? (configf:lookup *configdat* "setup" "query-rest") "no"))
-      (rmt:query-rest))
+      (rmt:query-rest cmd rid params))
   
   (if (> attemptnum 2)
       (debug:print 0 *default-log-port* "INFO: attemptnum in rmt:send-receive is " attemptnum))
     
   (cond
@@ -546,15 +546,32 @@
   (rmt:general-call 'register-test run-id run-id test-name item-path))
 
 (define (rmt:get-test-id run-id testname item-path)
   (rmt:send-receive 'get-test-id run-id (list run-id testname item-path)))
 
-;; run-id is NOT used
+;; run-id is NOT used - but it will be! 
 ;;
 (define (rmt:get-test-info-by-id run-id test-id)
   (if (number? test-id)
-      (rmt:send-receive 'get-test-info-by-id run-id (list run-id test-id))
+      (let* ((testdat  (rmt:send-receive 'get-test-info-by-id run-id (list run-id test-id)))
+             (trundir  (vector-ref testdat 10))
+	     (trundatf (conc trundir"/.mt_data/test-run.dat")))
+	;; now we can update a couple fields from the filesystem
+	(handle-exceptions
+	    exn
+	    (begin
+	      (debug:print-info 0 *default-log-port* "Could not update testdat record from "trundatf", exn=" exn)
+	      #f)
+	  (if (and trundir
+		   (file-exists? trundatf))
+	      (let* ((duration     (vector-ref testdat 12)) ;; (db:test-get-run_duration testdat))
+		     (event-time   (vector-ref testdat 5))   ;; (db:test-get-event_time   testdat))
+		     (last-touch   (file-modification-time trundatf))
+		     (new-duration (max duration (- last-touch event-time))))
+		(vector-set! testdat 12 new-duration))))
+	      #;(db:test-set-run_duration! testdat (max duration (- last-touch event-time)))
+	testdat)
       (begin
 	(debug:print 0 *default-log-port* "WARNING: Bad data handed to rmt:get-test-info-by-id run-id=" run-id ", test-id=" test-id)
 	(print-call-chain (current-error-port))
 	#f)))
 
@@ -682,21 +699,23 @@
 	   run-ids))))
 
 (define (rmt:get-prereqs-not-met run-id waitons ref-test-name ref-item-path #!key (mode '(normal))(itemmaps #f))
   (rmt:send-receive 'get-prereqs-not-met run-id (list run-id waitons ref-test-name ref-item-path mode itemmaps)))
 
-(define (rmt:get-count-tests-running-for-run-id run-id fastmode)
-  (rmt:send-receive 'get-count-tests-running-for-run-id run-id (list run-id fastmode)))
+(define (rmt:get-count-tests-running-for-run-id run-id)
+  (if (number? run-id)
+      (rmt:send-receive 'get-count-tests-running-for-run-id run-id (list run-id))
+      0))
 
 (define (rmt:get-not-completed-cnt run-id)
   (rmt:send-receive 'get-not-completed-cnt run-id (list run-id)))
 
 
 ;; Statistical queries
 
-(define (rmt:get-count-tests-running run-id fastmode)
-  (rmt:send-receive 'get-count-tests-running run-id (list run-id fastmode)))
+(define (rmt:get-count-tests-running run-id)
+  (rmt:send-receive 'get-count-tests-running run-id (list run-id)))
 
 (define (rmt:get-count-tests-running-for-testname run-id testname)
   (rmt:send-receive 'get-count-tests-running-for-testname run-id (list run-id testname)))
 
 (define (rmt:get-count-tests-running-in-jobgroup run-id jobgroup)