Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -1664,34 +1664,38 @@
        ;;              (> (- (current-seconds)(+ (db:test-get-event_time testdat)
        ;;                     (db:test-get-run_duration testdat)))
        ;;                    600) 
        ;; (db:delay-if-busy dbdat)
        (sqlite3:for-each-row 
-        (lambda (test-id run-dir uname testname item-path)
+        (lambda (test-id run-dir uname testname item-path event-time run-duration)
           (if (and (equal? uname "n/a")
                    (equal? item-path "")) ;; this is a toplevel test
               ;; what to do with toplevel? call rollup?
               (begin
                 (set! toplevels   (cons (list test-id run-dir uname testname item-path run-id) toplevels))
                 (debug:print-info 0 *default-log-port* "Found old toplevel test in RUNNING state, test-id=" test-id))
-              (set! incompleted (cons (list test-id run-dir uname testname item-path run-id) incompleted))))
+              (begin
+                (set! incompleted (cons (list test-id run-dir uname testname item-path run-id) incompleted))
+                (debug:print-info 0 *default-log-port* "BB> Found old test in RUNNING state, test-id=" test-id" exceeded running-deadtime "running-deadtime" now="(current-seconds)" event-time="event-time" run-duration="run-duration))))
         db
         "SELECT id,rundir,uname,testname,item_path,event_time,run_duration FROM tests WHERE run_id=? AND (strftime('%s','now') - event_time) > (run_duration + ?) AND state IN ('RUNNING');"
         run-id running-deadtime)
+
+       
        (sqlite3:for-each-row 
         (lambda (test-id run-dir uname testname item-path event-time run-duration)
           (if (and (equal? uname "n/a")
                    (equal? item-path "")) ;; this is a toplevel test
               ;; what to do with toplevel? call rollup?
               (begin
                 (set! toplevels   (cons (list test-id run-dir uname testname item-path run-id) toplevels))
                 (debug:print-info 0 *default-log-port* "Found old toplevel test in RUNNING state, test-id=" test-id))
               (begin
-                (debug:print-info 0 *default-log-port* "Found old test in RUNNING state, test-id=" test-id" exceeded running-deadtime "running-deadtime" now="(current-seconds)" event-time="event-time" run-duration="run-duration)
+                (debug:print-info 0 *default-log-port* "BB> Found old test in REMOTEHOSTSTART state, test-id=" test-id" exceeded running-deadtime "running-deadtime" now="(current-seconds)" event-time="event-time" run-duration="run-duration)
                 (set! incompleted (cons (list test-id run-dir uname testname item-path run-id) incompleted)))))
         db
-        "SELECT id,rundir,uname,testname,item_path FROM tests WHERE run_id=? AND (strftime('%s','now') - event_time) > (run_duration + ?) AND state IN ('REMOTEHOSTSTART');"
+        "SELECT id,rundir,uname,testname,item_path,event_time,run_duration FROM tests WHERE run_id=? AND (strftime('%s','now') - event_time) > (run_duration + ?) AND state IN ('REMOTEHOSTSTART');"
         run-id remotehoststart-deadtime)
 
        ;; in LAUNCHED for more than one day. Could be long due to job queues TODO/BUG: Need override for this in config
        ;;
        ;; (db:delay-if-busy dbdat)
@@ -1700,11 +1704,11 @@
           (if (and (equal? uname "n/a")
                    (equal? item-path "")) ;; this is a toplevel test
               ;; what to do with toplevel? call rollup?
               (set! toplevels   (cons (list test-id run-dir uname testname item-path run-id) toplevels))
               (begin
-                (debug:print-info 0 *default-log-port* "Found old test in REMOTEHOSTSTART state, test-id=" test-id" exceeded remotehoststart-deadtime "remotehoststart-deadtime)
+                (debug:print-info 0 *default-log-port* "BB> Found old test in REMOTEHOSTSTART state, test-id=" test-id" exceeded remotehoststart-deadtime "remotehoststart-deadtime)
                 (set! oldlaunched (cons (list test-id run-dir uname testname item-path run-id) oldlaunched)))))
         db
         "SELECT id,rundir,uname,testname,item_path FROM tests WHERE run_id=? AND (strftime('%s','now') - event_time) > 86400 AND state IN ('LAUNCHED');"
         run-id)
        

Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -381,11 +381,11 @@
     (tests:set-full-meta-info #f test-id run-id (calc-minutes) work-area 10)
     (let loop ((minutes   (calc-minutes))
 	       (cpu-load  (alist-ref 'adj-core-load (common:get-normalized-cpu-load #f)))
 	       (disk-free (get-df (current-directory)))
                (last-sync (current-seconds)))
-      (print "launch:monitor-job - top of loop encountered at "(current-seconds)" with last-sync="last-sync)
+      (BB> "launch:monitor-job - top of loop encountered at "(current-seconds)" with last-sync="last-sync)
       (let* ((over-time     (> (current-seconds) (+ last-sync update-period)))
              (new-cpu-load  (let* ((load  (alist-ref 'adj-core-load (common:get-normalized-cpu-load #f)))
                                    (delta (abs (- load cpu-load))))
                               (if (> delta 0.1) ;; don't bother updating with small changes
                                   load
@@ -403,11 +403,11 @@
              (test-info   (rmt:get-test-info-by-id run-id test-id))
              (state       (db:test-get-state test-info))
              (status      (db:test-get-status test-info))
              (kill-reason  "no kill reason specified")
              (kill-job?    #f))
-        (print "launch:monitor-job - decision time encountered at "(current-seconds)" with last-sync="last-sync" do-sync="do-sync" over-time="over-time" update-period="update-period)
+        (BB> "launch:monitor-job - decision time encountered at "(current-seconds)" with last-sync="last-sync" do-sync="do-sync" over-time="over-time" update-period="update-period)
         (cond
          ((test-get-kill-request run-id test-id)
           (set! kill-reason "KILLING TEST since received kill request (KILLREQ)")
           (set! kill-job? #t))
          ((and runtlim (> (- (current-seconds) start-seconds) runtlim))
@@ -420,13 +420,13 @@
         (debug:print 4 *default-log-port* "cpu: " new-cpu-load " disk: " new-disk-free " last-sync: " last-sync " do-sync: " do-sync)
         (launch:handle-zombie-tests run-id)
         (when do-sync
           ;;(with-output-to-file (conc (getenv "MT_TEST_RUN_DIR") "/last-loadinfo.log" #:append)
           ;;  (lambda () (pp (list (current-seconds) new-cpu-load new-disk-free (calc-minutes)))))
-          (print "launch:monitor-job - dosync started at "(current-seconds))
+          (BB> "launch:monitor-job - dosync started at "(current-seconds))
           (tests:update-central-meta-info run-id test-id new-cpu-load new-disk-free (calc-minutes) #f #f)
-          (print "launch:monitor-job - dosync finished at "(current-seconds)))
+          (BB> "launch:monitor-job - dosync finished at "(current-seconds)))
         
 	(if kill-job? 
 	    (begin
               (debug:print-info 0 *default-log-port* "proceeding to kill test: "kill-reason)
 	      (mutex-lock! m)