Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -19,24 +19,26 @@
 # rm <files>.o ; make install CSCOPTS='-profile' ; ... ;  chicken-profile | less
 SHELL=/bin/bash
 PREFIX=$(PWD)
 CSCOPTS=
 INSTALL=install
-SRCFILES = common.scm items.scm launch.scm ods.scm runconfig.scm	\
-           server.scm configf.scm db.scm keys.scm margs.scm		\
-           process.scm runs.scm tasks.scm tests.scm genexample.scm	\
-           http-transport.scm filedb.scm tdb.scm client.scm mt.scm	\
-           ezsteps.scm lock-queue.scm sdb.scm rmt.scm api.scm		\
-           subrun.scm portlogger.scm archive.scm env.scm		\
-           diff-report.scm cgisetup/models/pgdb.scm
+SRCFILES =
+
+# all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut ndboard
+all : $(PREFIX)/bin/.$(ARCHSTR) mtest
+# add dboard mtut and tcmt back later
 
 # module source files
-MSRCFILES = 
-# ftail.scm rmtmod.scm commonmod.scm removed
-# MSRCFILES = ducttape-lib.scm pkts.scm stml2.scm cookie.scm mutils.scm	\
-#             mtargs.scm commonmod.scm dbmod.scm adjutant.scm ulex.scm	\
-#             rmtmod.scm apimod.scm
+MSRCFILES = autoload.scm dbi.scm ducttape-lib.scm pkts.scm stml2.scm	\
+            cookie.scm mutils.scm mtargs.scm apimod.scm			\
+            configfmod.scm commonmod.scm dbmod.scm rmtmod.scm		\
+            debugprint.scm mtver.scm csv-xml.scm servermod.scm		\
+            hostinfo.scm adjutant.scm processmod.scm testsmod.scm	\
+            itemsmod.scm keysmod.scm mtmod.scm rmtmod.scm		\
+            tasksmod.scm pgdb.scm launchmod.scm runsmod.scm		\
+            http-transportmod.scm portloggermod.scm clientmod.scm	\
+            archivemod.scm ezstepsmod.scm subrunmod.scm bigmod.scm
 
 GUISRCF = dashboard-context-menu.scm dashboard-tests.scm		\
           dashboard-guimonitor.scm gutils.scm dcommon.scm tree.scm	\
           vg.scm
 
@@ -48,21 +50,61 @@
 MOIMPFILES = $(MSRCFILES:%.scm=%.import.o)
 
 %.import.o : %.import.scm
 	csc $(CSCOPTS) -unit $*.import -c $*.import.scm -o $*.import.o
 
-# I'm not sure the cp is a good idea, changed a lot of things and it may not have been necessary...
-# mofiles/%.o  %.import.scm : %.scm megatest-fossil-hash.scm
-#	@[ -e mofiles ] || mkdir -p mofiles
-#	csc $(CSCOPTS) -I mofiles -I $* -J -c $< -o $*.o
-#	cp $*.o mofiles/$*.o
-#	@touch $*.import.scm # ensure it is touched after the .o is made
-
 mofiles/%.o : %.scm
 	mkdir -p mofiles
 	csc $(CSCOPTS) -J -c $< -o mofiles/$*.o
 
+# module dependencies
+mofiles/apimod.o : mofiles/commonmod.o
+mofiles/apimod.o : mofiles/servermod.o
+mofiles/apimod.o : mofiles/tasksmod.o
+mofiles/archivemod.o : mofiles/launchmod.o
+mofiles/archivemod.o : mofiles/servermod.o
+mofiles/bigmod.o : mofiles/configfmod.o
+mofiles/bigmod.o : mofiles/rmtmod.o
+mofiles/bigmod.o : mofiles/dbmod.o
+mofiles/clientmod.o : mofiles/servermod.o
+mofiles/commonmod.o : mofiles/configfmod.o
+mofiles/commonmod.o : mofiles/debugprint.o
+mofiles/commonmod.o : mofiles/hostinfo.o
+mofiles/commonmod.o : mofiles/itemsmod.o
+mofiles/commonmod.o : mofiles/keysmod.o
+mofiles/commonmod.o : mofiles/mtargs.o
+mofiles/commonmod.o : mofiles/mtver.o
+mofiles/commonmod.o : mofiles/processmod.o
+mofiles/configfmod.o : mofiles/keysmod.o
+mofiles/dbimod.o : mofiles/autoload.o
+mofiles/dbmod.o : mofiles/commonmod.o
+mofiles/dbmod.o : mofiles/csv-xml.o
+mofiles/dbmod.o : mofiles/keysmod.o
+mofiles/dbmod.o : mofiles/mtmod.o
+mofiles/ezstepsmod.o : mofiles/rmtmod.o
+mofiles/ezstepsmod.o : mofiles/subrunmod.o
+mofiles/http-transportmod.o : mofiles/dbmod.o
+mofiles/http-transportmod.o : mofiles/portloggermod.o
+mofiles/keysmod.o : mofiles/debugprint.o
+mofiles/launchmod.o : mofiles/bigmod.o
+mofiles/launchmod.o : mofiles/ezstepsmod.o
+mofiles/launchmod.o : mofiles/rmtmod.o mofiles/servermod.o
+mofiles/mtmod.o : mofiles/debugprint.o
+mofiles/portloggermod.o : mofiles/tasksmod.o
+mofiles/rmtmod.o : mofiles/apimod.o
+mofiles/rmtmod.o : mofiles/commonmod.o mofiles/http-transportmod.o
+mofiles/rmtmod.o : mofiles/itemsmod.o mofiles/clientmod.o
+mofiles/runsmod.o : mofiles/rmtmod.o mofiles/archivemod.o
+mofiles/servermod.o : mofiles/commonmod.o
+mofiles/servermod.o : mofiles/http-transportmod.o
+mofiles/stml2.o : mofiles/cookie.o mofiles/dbi.o
+mofiles/tasksmod.o : mofiles/pgdb.o mofiles/dbmod.o
+mofiles/testsmod.o : mofiles/commonmod.o
+mofiles/testsmod.o : mofiles/itemsmod.o mofiles/rmtmod.o mofiles/tasksmod.o
+
+dashboard.o megatest.o : db_records.scm megatest-fossil-hash.scm
+
 ADTLSCR=mt_laststep mt_runstep mt_ezstep
 HELPERS=$(addprefix $(PREFIX)/bin/,$(ADTLSCR))
 DEPLOYHELPERS=$(addprefix deploytarg/,$(ADTLSCR))
 MTESTHASH=$(shell fossil info|grep checkout:| awk '{print $$2}')
 
@@ -78,23 +120,20 @@
 ARCHSTR=$(shell if [[ -e /usr/bin/sw_vers ]]; then /usr/bin/sw_vers -productVersion; else lsb_release -sr; fi)
 # ARCHSTR=$(shell bash -c "echo \$$MACHTYPE")
 
 PNGFILES = $(shell cd docs/manual;ls *png)
 
-# all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut ndboard
-all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut tcmt
-
-mtest: $(OFILES) readline-fix.scm megatest.o $(MOFILES) $(MOIMPFILES)  megatest-version.scm
-	csc $(CSCOPTS) $(OFILES) $(MOFILES) $(MOIMPFILES) megatest.o -o mtest
+mtest: readline-fix.scm megatest.scm $(MOFILES) $(MOIMPFILES)
+	csc $(CSCOPTS) $(OFILES) $(MOFILES) $(MOIMPFILES) megatest.scm -o mtest
 
 showmtesthash:
 	@echo $(MTESTHASH)
 
-dboard : $(OFILES) $(GOFILES) dashboard.scm $(MOFILES) $(MOIMPFILES) megatest-version.scm megatest-fossil-hash.scm
+dboard : $(OFILES) $(GOFILES) dashboard.scm $(MOFILES) $(MOIMPFILES) megatest-fossil-hash.scm
 	csc $(CSCOPTS) $(OFILES) dashboard.scm $(GOFILES) $(MOFILES) $(MOIMPFILES) -o dboard
 
-mtut: $(OFILES) $(MOFILES) megatest-fossil-hash.scm mtut.scm megatest-version.scm
+mtut: $(OFILES) $(MOFILES) megatest-fossil-hash.scm mtut.scm
 	csc $(CSCOPTS) $(OFILES) $(MOFILES) mtut.scm -o mtut
 
 # include makefile.inc
 
 TCMTOBJS = \
@@ -127,11 +166,11 @@
         ezsteps.o
 
 #        mofiles/rmtmod.o \
 #        mofiles/commonmod.o \
 
-tcmt : $(TCMTOBJS) tcmt.scm megatest-version.scm
+tcmt : $(TCMTOBJS) tcmt.scm
 	csc $(CSCOPTS) $(TCMTOBJS) $(MOFILES) $(MOIMPFILES) tcmt.scm -o tcmt
 
 # install documentation to $(PREFIX)/docs
 # DOES NOT REBUILD DOCS
 #
@@ -147,67 +186,14 @@
 
 $(PREFIX)/share/db/mt-pg.sql : mt-pg.sql
 	mkdir -p $(PREFIX)/share/db
 	$(INSTALL) mt-pg.sql $(PREFIX)/share/db/mt-pg.sql
 
-# Special dependencies for the includes
-$(MOFILE) $(MOIMPFILES) : megatest-fossil-hash.scm
-
-# common.o : mofiles/commonmod.o megatest-fossil-hash.scm
-mofiles/dbmod.o : mofiles/configfmod.o
-
-# commonmod.o dashboard.o megatest.o tcmt.o apimod.o : megatest-fossil-hash.scm
-
-tests.o db.o launch.o runs.o dashboard-tests.o				\
-dashboard-context-menu.o dashboard-guimonitor.o dashboard-main.o	\
-monitor.o dashboard.o archive.o megatest.o : db_records.scm megatest-fossil-hash.scm
-
-tests.o runs.o dashboard.o dashboard-tests.o dashboard-context-menu.o dashboard-main.o  : run_records.scm
-
-db.o ezsteps.o keys.o launch.o megatest.o monitor.o runs-for-ref.o runs.o tests.o : key_records.scm
-
-tests.o tasks.o dashboard-tasks.o : task_records.scm
-
-runs.o : test_records.scm
-
-megatest.o : megatest-fossil-hash.scm megatest-version.scm
-
-rmt.scm client.scm common.scm configf.scm dashboard-guimonitor.scm dashboard-tests.scm dashboard.scm db.scm dcommon.scm ezsteps.scm fs-transport.scm http-transport.scm index-tree.scm items.scm keys.scm launch.scm megatest.scm monitor.scm mt.scm newdashboard.scm runconfig.scm runs.scm server.scm tdb.scm tests.scm tree.scm : common_records.scm megatest-version.scm
-
-common_records.scm : altdb.scm
-
-# mofiles/stml2.o : mofiles/cookie.o
-# configf.o : mofiles/commonmod.o
-
-vg.o dashboard.o : vg_records.scm megatest-version.scm
-
-dcommon.o : run_records.scm
-
-mofiles/stml2.o : mofiles/cookie.o
-
-# # special include based modules
-# mofiles/pkts.o      : pkts/pkts.scm
-# mofiles/stml2.o     : cookie.o
-# # mofiles/mtargs.o    : mtargs/mtargs.scm
-# # mofiles/mtconfigf.o : mtconfigf/mtconfigf.scm
-# mofiles/ulex.o      : ulex/ulex.scm
-# mofiles/mutils.o    : mutils/mutils.scm
-# mofiles/cookie.o    : stml2/cookie.scm
-# mofiles/stml2.o     : stml2/stml2.scm
-
-# Temporary while transitioning to new routine
-# runs.o : run-tests-queue-classic.scm  run-tests-queue-new.scm
-
-# for the modularized stuff
-mofiles/rmtmod.o : mofiles/commonmod.o
-
 megatest-fossil-hash.scm : $(SRCFILES) megatest.scm *_records.scm
 	echo "(define megatest-fossil-hash \"$(MTESTHASH)\")" > megatest-fossil-hash.new
 	if ! diff -q megatest-fossil-hash.new megatest-fossil-hash.scm ; then echo copying .new to .scm;cp -f megatest-fossil-hash.new megatest-fossil-hash.scm;fi
 
-$(OFILES) $(GOFILES) : common_records.scm 
-
 %.o : %.scm $(MOFILES)
 	csc $(CSCOPTS) -c $< $(MOFILES)
 
 $(PREFIX)/bin/.$(ARCHSTR)/mtest : mtest utils/mk_wrapper
 	@echo Installing to PREFIX=$(PREFIX)
@@ -334,24 +320,26 @@
 	if [[ $(ARCHSTR) == 12.5 ]]; then \
 	mkdir -p $(PREFIX)/bin/.$(ARCHSTR)/lib; \
 	$(INSTALL) lib/libxcb-xlib.so.0 $(PREFIX)/bin/.$(ARCHSTR)/lib/libxcb-xlib.so.0; \
         fi
 
+# ADD BACK LATER:
+#    $(PREFIX)/bin/.$(ARCHSTR)/dboard $(PREFIX)/bin/dashboard 
+#          $(PREFIX)/bin/.$(ARCHSTR)/mtexec $(PREFIX)/bin/mtexec $(PREFIX)/bin/serialize-env \
+#  $(PREFIX)/bin/viewscreen  $(PREFIX)/bin/mtutil \
+#          $(PREFIX)/bin/.$(ARCHSTR)/lib/libpangox-1.0.so \
+#          $(PREFIX)/bin/.$(ARCHSTR)/lib/libpangox-1.0.so.0 \
+#          $(PREFIX)/bin/.$(ARCHSTR)/lib/libxcb-xlib.so.0
+#  $(PREFIX)/bin/tcmt
+
 install : $(PREFIX)/bin/.$(ARCHSTR) $(PREFIX)/bin/.$(ARCHSTR)/mtest $(PREFIX)/bin/megatest \
-          $(PREFIX)/bin/.$(ARCHSTR)/dboard $(PREFIX)/bin/dashboard $(HELPERS) $(PREFIX)/bin/nbfake \
-          $(PREFIX)/bin/.$(ARCHSTR)/mtexec $(PREFIX)/bin/mtexec $(PREFIX)/bin/serialize-env \
-	  $(PREFIX)/bin/nbfind $(PREFIX)/bin/mtrunner $(PREFIX)/bin/viewscreen $(PREFIX)/bin/mt_xterm \
+          $(HELPERS) $(PREFIX)/bin/nbfake \
+	  $(PREFIX)/bin/serialize-env \
+	  $(PREFIX)/bin/nbfind $(PREFIX)/bin/mtrunner $(PREFIX)/bin/mt_xterm \
 	  $(PREFIX)/share/docs/megatest_manual.html $(PREFIX)/bin/remrun \
-	  $(PREFIX)/share/docs/megatest_manual.html $(PREFIX)/bin/remrun $(PREFIX)/bin/mtutil \
-	  $(PREFIX)/bin/tcmt $(PREFIX)/share/db/mt-pg.sql \
-          $(PREFIX)/share/js/jquery-3.1.0.slim.min.js \
-          $(PREFIX)/bin/.$(ARCHSTR)/lib/libpangox-1.0.so \
-          $(PREFIX)/bin/.$(ARCHSTR)/lib/libpangox-1.0.so.0 \
-          $(PREFIX)/bin/.$(ARCHSTR)/lib/libxcb-xlib.so.0
-#         $(PREFIX)/bin/.$(ARCHSTR)/ndboard
-
-# $(PREFIX)/bin/newdashboard
+	  $(PREFIX)/share/db/mt-pg.sql \
+          $(PREFIX)/share/js/jquery-3.1.0.slim.min.js
 
 $(PREFIX)/bin/.$(ARCHSTR) : 
 	mkdir -p $(PREFIX)/bin/.$(ARCHSTR)
 	mkdir -p $(PREFIX)/bin/.$(ARCHSTR)/lib
 
@@ -385,32 +373,10 @@
 #======================================================================
 
 # vg_records.scm : records.sh
 #	./records.sh
 
-#======================================================================
-# Deploy section (not complete yet)
-#======================================================================
-
-$(DEPLOYHELPERS) : utils/mt_*
-	$(INSTALL) $< $@
-	chmod a+X $@
-
-deploytarg/apropos.so : Makefile
-	chicken-install -p deploytarg -deploy -keep-installed $(EGGS)
-
-deploy : deploytarg/mtest deploytarg/dboard $(DEPLOYHELPERS) deploytarg/nbfake deploytarg/remrun deploytarg/viewsceen deploytarg/nbfind deploytarg/apropos.so
-
-# puts deployed megatest in directory "megatest"
-deploytarg/mtest : $(OFILES) megatest.o deploytarg/apropos.so
-	csc -deploy $(CSCOPTS) $(OFILES) megatest.scm -o deploytarg
-	mv deploytarg/deploytarg deploytarg/mtest
-
-deploytarg/dboard :  $(OFILES) $(GOFILES) dashboard.scm deploytarg/apropos.so
-	csc -deploy $(OFILES) $(GOFILES) dashboard.scm -o deploytarg
-	mv deploytarg/deploytarg deploytarg/dboard
-
 datashare-testing/sd : datashare.scm $(OFILES)
 	csc $(CSCOPTS) datashare.scm $(OFILES) -o datashare-testing/sd
 
 datashare-testing/sdat: sharedat.scm $(OFILES)
 	csc $(CSCOPTS) sharedat.scm $(OFILES) -o datashare-testing/sdat
@@ -419,18 +385,18 @@
 	mkdir -p /tmp/$(USER)/datashare/disk1 /tmp/$(USER)/basepath
 
 xterm : sd
 	(export BASEPATH=/tmp/$(USER)/basepath ; export PATH="$(PWD)/datashare-testing:$(PATH)" ; xterm &)
 
-datashare-testing/spublish : spublish.scm $(OFILES) megatest-version.scm
+datashare-testing/spublish : spublish.scm $(OFILES)
 	csc $(CSCOPTS) spublish.scm margs.o process.o common.o  -o datashare-testing/spublish
 
-datashare-testing/sretrieve : sretrieve.scm $(OFILES) megatest-version.scm
+datashare-testing/sretrieve : sretrieve.scm $(OFILES) 
 	csc $(CSCOPTS) sretrieve.scm margs.o process.o common.o  -o datashare-testing/sretrieve
 
 
-datashare-testing/sauthorize : sauthorize.scm $(OFILES) megatest-version.scm
+datashare-testing/sauthorize : sauthorize.scm $(OFILES) 
 	 csc $(CSCOPTS) sauthorize.scm margs.o process.o common.o  -o datashare-testing/sauthorize
 
 sauth-init:
 	mkdir -p  datashare-testing
 	rm  datashare-testing/sauthorize
@@ -437,45 +403,43 @@
 	rm  datashare-testing/sretrieve 
 	rm  datashare-testing/spublish
 
 sauth : sauth-init datashare-testing/sauthorize datashare-testing/sretrieve datashare-testing/spublish 
 
-readline-fix.scm :
-	if [[ $(shell chicken-status | grep readline | awk '{print $4}' | cut -d. -f1) -gt 3 ]];then \
-	   echo "(define *use-new-readline* #f)" > readline-fix.scm; \
-	else \
-	   echo "(define *use-new-readline* #t)" > readline-fix.scm;\
-	fi
-
 altdb.scm :
 	echo ";; optional alternate db setup" > altdb.scm
 	echo "(define *available-db* (make-hash-table))" >> altdb.scm
-	if  csi -ne '(use mysql-client)';then \
-           echo "(use mysql-client)(hash-table-set! *available-db* 'mysql #t)" >> altdb.scm; \
+	if  csi -ne '(import mysql-client)';then \
+           echo "(import mysql-client)(hash-table-set! *available-db* 'mysql #t)" >> altdb.scm; \
 	fi
-	if csi -ne '(use postgresql)';then \
-	   echo "(use postgresql)(hash-table-set! *available-db* 'postgresql #t)" >> altdb.scm;\
+	if csi -ne '(import postgresql)';then \
+	   echo "(import postgresql)(hash-table-set! *available-db* 'postgresql #t)" >> altdb.scm;\
 	fi
 
 portlogger-example : portlogger-example.scm api.o archive.o client.o common.o configf.o dashboard-tests.o dashboard-context-menu.o db.o dcommon.o ezsteps.o filedb.o genexample.o gutils.o http-transport.o items.o keys.o launch.o lock-queue.o margs.o mt.o ods.o portlogger.o process.o rmt.o runconfig.o runs.o sdb.o server.o synchash.o tasks.o tdb.o tests.o tree.o
 	csc $(CSCOPTS) portlogger-example.scm api.o archive.o client.o common.o configf.o dashboard-tests.o dashboard-context-menu.o db.o dcommon.o ezsteps.o filedb.o genexample.o gutils.o http-transport.o items.o keys.o launch.o lock-queue.o margs.o mt.o ods.o portlogger.o process.o rmt.o runconfig.o runs.o sdb.o server.o synchash.o tasks.o tdb.o tests.o tree.o
 
-# create a pdf dot graphviz diagram from notations in rmt.scm
-rmt.pdf : rmt.scm
-	grep ';;DOT' rmt.scm | sed -e 's/.*;;DOT //' > rmt.dot;dot -Tpdf rmt.dot -o rmt.pdf
-
 buildmanual:
 	cd docs/manual && make
 
-wikipage=plan
-editwiki:
-	cd docs/manual && ../../utils/editwiki $(wikipage)
-
-viewmanual:
-	arora docs/manual/megatest_manual.html
-
 targets:
 	@grep : Makefile | perl -ne '/^([A-Za-z0-9_-]+):/ && print "$$1\n"'
 
-
 unit :
 	cd tests;make unit
+
+DEPSFILES=*mod.scm 
+
+# (MSRCFILES)
+# shell ls *.scm adjutant.scm cgisetup/models/pgdb.scm|sort -u|egrep -v '.import.|debugprint|mtargs|sretrieve|sauth|sharedat|tcmt')
+
+deps.pdf : $(DEPSFILES)
+	gendeps deps.inc $(DEPSFILES)
+	dot deps.dot -Tpdf -o deps.pdf
+
+mindeps.pdf :  $(DEPSFILES)
+	gendeps deps.inc $(DEPSFILES)
+	egrep -v 'debugprint|mtargs|mtver|hostinfo|stml2' deps.dot > mindeps.dot
+	dot mindeps.dot -Tpdf -o mindeps.pdf
+
+showdepfiles :
+	@echo $(DEPSFILES)

Index: adjutant.scm
==================================================================
--- adjutant.scm
+++ adjutant.scm
@@ -20,12 +20,12 @@
 
 (declare (unit adjutant))
 
 (module adjutant *
 
-(import scheme chicken data-structures extras files)
-(import (prefix sqlite3 sqlite3:) posix typed-records srfi-18 srfi-69
+(import scheme chicken.base)
+(import (prefix sqlite3 sqlite3:) typed-records srfi-18 srfi-69
 	md5 message-digest
 	regex srfi-1)
 
 (define (adjutant-run)
   (print "Running the adjutant!"))

ADDED   altdb-template.scm
Index: altdb-template.scm
==================================================================
--- /dev/null
+++ altdb-template.scm
@@ -0,0 +1,3 @@
+;; optional alternate db setup
+(define *available-db* (make-hash-table))
+(import postgresql)(hash-table-set! *available-db* 'postgresql #t)

DELETED api.scm
Index: api.scm
==================================================================
--- api.scm
+++ /dev/null
@@ -1,413 +0,0 @@
-
-
-;;======================================================================
-;; Copyright 2006-2013, Matthew Welland.
-;; 
-;; This file is part of Megatest.
-;; 
-;;     Megatest is free software: you can redistribute it and/or modify
-;;     it under the terms of the GNU General Public License as published by
-;;     the Free Software Foundation, either version 3 of the License, or
-;;     (at your option) any later version.
-;; 
-;;     Megatest is distributed in the hope that it will be useful,
-;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;     GNU General Public License for more details.
-;; 
-;;     You should have received a copy of the GNU General Public License
-;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
-;;
-;;======================================================================
-
-(use srfi-69 posix)
-
-(declare (unit api))
-(declare (uses rmt))
-(declare (uses db))
-(declare (uses tasks))
-
-;; allow these queries through without starting a server
-;;
-(define api:read-only-queries
-  '(get-key-val-pairs
-    get-var
-    get-keys
-    get-key-vals
-    test-toplevel-num-items
-    get-test-info-by-id
-    get-steps-info-by-id
-    get-data-info-by-id
-    test-get-rundir-from-test-id
-    get-count-tests-running-for-testname
-    get-count-tests-running
-    get-count-tests-running-in-jobgroup
-    get-previous-test-run-record
-    get-matching-previous-test-run-records
-    test-get-logfile-info
-    test-get-records-for-index-file
-    get-testinfo-state-status
-    test-get-top-process-pid
-    test-get-paths-matching-keynames-target-new
-    get-prereqs-not-met
-    get-count-tests-running-for-run-id
-    get-run-info
-    get-run-status
-    get-run-state
-    get-run-stats
-    get-run-times
-    get-targets
-    get-target
-    ;; register-run
-    get-tests-tags
-    get-test-times
-    get-tests-for-run
-    get-tests-for-run-state-status
-    get-test-id
-    get-tests-for-runs-mindata
-    get-tests-for-run-mindata
-    get-run-name-from-id
-    get-runs
-    simple-get-runs
-    get-num-runs
-    get-runs-cnt-by-patt
-    get-all-run-ids
-    get-prev-run-ids
-    get-run-ids-matching-target
-    get-runs-by-patt
-    get-steps-data
-    get-steps-for-test
-    read-test-data
-    read-test-data-varpatt
-    login
-    tasks-get-last
-    testmeta-get-record
-    have-incompletes?
-    ;; synchash-get
-    get-changed-record-ids
-    get-run-record-ids 
-    get-not-completed-cnt))
-
-(define api:write-queries
-  '(
-    get-keys-write ;; dummy "write" query to force server start
-
-    ;; SERVERS
-    start-server
-    kill-server
-
-    ;; TESTS
-    test-set-state-status-by-id
-    delete-test-records
-    delete-old-deleted-test-records
-    test-set-state-status
-    test-set-top-process-pid
-    set-state-status-and-roll-up-items
-    
-    update-pass-fail-counts
-    top-test-set-per-pf-counts ;; (db:top-test-set-per-pf-counts (db:get-db *db* 5) 5 "runfirst")
-
-    ;; RUNS
-    register-run
-    set-tests-state-status
-    delete-run
-    lock/unlock-run
-    update-run-event_time
-    mark-incomplete
-    set-state-status-and-roll-up-run
-    ;; STEPS
-    teststep-set-status!
-    delete-steps-for-test
-    ;; TEST DATA
-    test-data-rollup
-    csv->test-data
-
-    ;; MISC
-    sync-inmem->db
-    drop-all-triggers
-    create-all-triggers
-    update-tesdata-on-repilcate-db 
-
-    ;; TESTMETA
-    testmeta-add-record
-    testmeta-update-field
-
-    ;; TASKS
-    tasks-add
-    tasks-set-state-given-param-key
-    ))
-
-;; These are called by the server on recipt of /api calls
-;;    - keep it simple, only return the actual result of the call, i.e. no meta info here
-;;
-;;    - returns #( flag result )
-;;
-(define (api:execute-requests dbstruct dat)
-  (handle-exceptions
-   exn
-   (let ((call-chain (get-call-chain)))
-     (debug:print 0 *default-log-port* "WARNING: api:execute-requests received an exception from peer, dat=" dat ", exn=" exn)
-     (print-call-chain (current-error-port))
-     (debug:print 0 *default-log-port* " message: "  ((condition-property-accessor 'exn 'message) exn))       
-     (vector #f (vector exn call-chain dat))) ;; return some stuff for debug if an exception happens
-   (cond
-    ((not (vector? dat))                    ;; it is an error to not receive a vector
-     (vector #f (vector #f "remote must be called with a vector")))
-    ((> *api-process-request-count* 20) ;; 20)
-     (debug:print 0 *default-log-port* "WARNING: api:execute-requests received an overloaded message.")
-     (set! *server-overloaded* #t)
-     (vector #f (vector #f 'overloaded))) ;; the inner vector is what gets returned. nope, don't know why. please refactor!
-    (else  
-     (let* ((cmd-in            (vector-ref dat 0))
-            (cmd               (if (symbol? cmd-in)
-				   cmd-in
-				   (string->symbol cmd-in)))
-            (params            (vector-ref dat 1))
-            (start-t           (current-milliseconds))
-            (readonly-mode     (dbr:dbstruct-read-only dbstruct))
-            (readonly-command  (member cmd api:read-only-queries))
-            (writecmd-in-readonly-mode (and readonly-mode (not readonly-command)))
-            #;(foo               (begin
-                                 (common:telemetry-log (conc "api-in:"(->string cmd))
-                                                       payload: `((params . ,params)))
-                                 
-                                 #t))
-            (res    
-             (if writecmd-in-readonly-mode
-                 (conc "attempt to run write command "cmd" on a read-only database")
-                 (case cmd
-                   ;;===============================================
-                   ;; READ/WRITE QUERIES
-                   ;;===============================================
-
-                   ((get-keys-write)                        (db:get-keys dbstruct)) ;; force a dummy "write" query to force server; for debug in -repl
-                   
-                   ;; SERVERS
-                   ((start-server)                    (apply server:kind-run params))
-                   ((kill-server)                     (set! *server-run* #f))
-
-                   ;; TESTS
-
-                   ;;((test-set-state-status-by-id)     (apply mt:test-set-state-status-by-id dbstruct params))
-                   ;;BB - commented out above because it was calling below, eventually, incorrectly (dbstruct passed to mt:test-set-state-status-by-id, which previosly did more, but now only passes thru to db:set-state-status-and-roll-up-items.
-                   ((test-set-state-status-by-id)
-
-                    ;; (define (db:set-state-status-and-roll-up-items dbstruct run-id test-name item-path state status comment)
-                    (db:set-state-status-and-roll-up-items
-                     dbstruct
-                     (list-ref params 0) ; run-id
-                     (list-ref params 1) ; test-name
-                     #f                  ; item-path
-                     (list-ref params 2) ; state
-                     (list-ref params 3) ; status
-                     (list-ref params 4) ; comment
-                     ))
-                   
-                   ((delete-test-records)             (apply db:delete-test-records dbstruct params))
-                   ((delete-old-deleted-test-records) (apply db:delete-old-deleted-test-records dbstruct params))
-                   ((test-set-state-status)           (apply db:test-set-state-status dbstruct params))
-                   ((test-set-top-process-pid)        (apply db:test-set-top-process-pid dbstruct params))
-                   ((set-state-status-and-roll-up-items) (apply db:set-state-status-and-roll-up-items dbstruct params))
-                   ((set-state-status-and-roll-up-run) (apply db:set-state-status-and-roll-up-run dbstruct params)) 
-                   ((top-test-set-per-pf-counts)      (apply db:top-test-set-per-pf-counts dbstruct params))
-                   ((test-set-archive-block-id)       (apply db:test-set-archive-block-id dbstruct params))
-
-                   ;; RUNS
-                   ((register-run)                 (apply db:register-run dbstruct params))
-                   ((set-tests-state-status)       (apply db:set-tests-state-status dbstruct params))
-                   ((delete-run)                   (apply db:delete-run dbstruct params))
-                   ((lock/unlock-run)              (apply db:lock/unlock-run dbstruct params))
-                   ((update-run-event_time)        (apply db:update-run-event_time dbstruct params))
-                   ((update-run-stats)             (apply db:update-run-stats dbstruct params))
-                   ((set-var)                      (apply db:set-var dbstruct params))
-                   ((inc-var)                      (apply db:inc-var dbstruct params))
-		   ((dec-var)                      (apply db:dec-var dbstruct params))
-                   ((del-var)                      (apply db:del-var dbstruct params))
-		   ((add-var)                      (apply db:add-var dbstruct params))
-
-                   ;; STEPS
-                   ((teststep-set-status!)         (apply db:teststep-set-status! dbstruct params))
-                   ((delete-steps-for-test!)        (apply db:delete-steps-for-test! dbstruct params))
-                   
-                   ;; TEST DATA
-                   ((test-data-rollup)             (apply db:test-data-rollup dbstruct params))
-                   ((csv->test-data)               (apply db:csv->test-data dbstruct params))
-
-                   ;; MISC
-                   ((sync-inmem->db)               (let ((run-id (car params)))
-                                                     (db:sync-touched dbstruct run-id force-sync: #t)))
-                   ((mark-incomplete)              (apply db:find-and-mark-incomplete dbstruct params))
-                   ((create-all-triggers)          (db:create-all-triggers dbstruct))
-                   ((drop-all-triggers)            (db:drop-all-triggers dbstruct)) 
-
-                   ;; TESTMETA
-                   ((testmeta-add-record)       (apply db:testmeta-add-record dbstruct params))
-                   ((testmeta-update-field)     (apply db:testmeta-update-field dbstruct params))
-                   ((get-tests-tags)            (db:get-tests-tags dbstruct))
-
-                   ;; TASKS
-                   ((tasks-add)                 (apply tasks:add dbstruct params))   
-                   ((tasks-set-state-given-param-key) (apply tasks:set-state-given-param-key dbstruct params))
-                   ((tasks-get-last)            (apply tasks:get-last dbstruct params))
-
-		   ;; NO SYNC DB
-		   ((no-sync-set)               (apply db:no-sync-set         *no-sync-db* params))
-		   ((no-sync-get/default)       (apply db:no-sync-get/default *no-sync-db* params))
-		   ((no-sync-del!)              (apply db:no-sync-del!        *no-sync-db* params))
-		   ((no-sync-get-lock)          (apply db:no-sync-get-lock    *no-sync-db* params))
-		   
-                   ;; ARCHIVES
-                   ;; ((archive-get-allocations)   
-                   ((archive-register-disk)     (apply db:archive-register-disk dbstruct params))
-                   ((archive-register-block-name)(apply db:archive-register-block-name dbstruct params))
-                   ;; ((archive-allocate-testsuite/area-to-block)(apply db:archive-allocate-testsuite/area-to-block dbstruct block-id testsuite-name areakey))
-
-                   ;;======================================================================
-                   ;; READ ONLY QUERIES
-                   ;;======================================================================
-
-                   ;; KEYS
-                   ((get-key-val-pairs)               (apply db:get-key-val-pairs dbstruct params))
-                   ((get-keys)                        (db:get-keys dbstruct))
-                   ((get-key-vals)                    (apply db:get-key-vals dbstruct params))
-                   ((get-target)                      (apply db:get-target dbstruct params))
-                   ((get-targets)                     (db:get-targets dbstruct))
-
-                   ;; ARCHIVES
-                   ((test-get-archive-block-info)     (apply db:test-get-archive-block-info dbstruct params))
-                   
-                   ;; TESTS
-                   ((test-toplevel-num-items)         (apply db:test-toplevel-num-items dbstruct params))
-                   ((get-test-info-by-id)	       (apply db:get-test-info-by-id dbstruct params))
-                   ((test-get-rundir-from-test-id)    (apply db:test-get-rundir-from-test-id dbstruct params))
-                   ((get-count-tests-running-for-testname) (apply db:get-count-tests-running-for-testname dbstruct params))
-                   ((get-count-tests-running)         (apply db:get-count-tests-running dbstruct params))
-                   ((get-count-tests-running-in-jobgroup) (apply db:get-count-tests-running-in-jobgroup dbstruct params))
-                   ;; ((delete-test-step-records)        (apply db:delete-test-step-records dbstruct params))
-                   ;; ((get-previous-test-run-record)    (apply db:get-previous-test-run-record dbstruct params))
-                   ((get-matching-previous-test-run-records)(apply db:get-matching-previous-test-run-records dbstruct params))
-                   ((test-get-logfile-info)           (apply db:test-get-logfile-info dbstruct params))
-                   ((test-get-records-for-index-file)  (apply db:test-get-records-for-index-file dbstruct params))
-                   ((get-testinfo-state-status)       (apply db:get-testinfo-state-status dbstruct params))
-                   ((test-get-top-process-pid)        (apply db:test-get-top-process-pid dbstruct params))
-                   ((test-get-paths-matching-keynames-target-new) (apply db:test-get-paths-matching-keynames-target-new dbstruct params))
-                   ((get-prereqs-not-met)             (apply db:get-prereqs-not-met dbstruct params))
-                   ((get-count-tests-running-for-run-id) (apply db:get-count-tests-running-for-run-id dbstruct params))
-                   ((get-not-completed-cnt)           (apply db:get-not-completed-cnt  dbstruct params)) 
-                   ;; ((synchash-get)                    (apply synchash:server-get dbstruct params))
-                   ((get-raw-run-stats)               (apply db:get-raw-run-stats dbstruct params))
-		   ((get-test-times)                  (apply db:get-test-times dbstruct params))
-
-                   ;; RUNS
-                   ((get-run-info)                 (apply db:get-run-info dbstruct params))
-                   ((get-run-status)               (apply db:get-run-status dbstruct params))
-                   ((get-run-state)                (apply db:get-run-state dbstruct params))
-                   ((set-run-status)               (apply db:set-run-status dbstruct params))
-                   ((set-run-state-status)  			 (apply db:set-run-state-status dbstruct params))
-                   ((update-tesdata-on-repilcate-db) (apply db:update-tesdata-on-repilcate-db  dbstruct params)) 
-                   ((get-tests-for-run)            (apply db:get-tests-for-run dbstruct params))
-                   ((get-tests-for-run-state-status) (apply db:get-tests-for-run-state-status dbstruct params))
-                   ((get-test-id)                  (apply db:get-test-id dbstruct params))
-                   ((get-tests-for-run-mindata)    (apply db:get-tests-for-run-mindata dbstruct params))
-                   ;; ((get-tests-for-runs-mindata)   (apply db:get-tests-for-runs-mindata dbstruct params))
-                   ((get-runs)                     (apply db:get-runs dbstruct params))
-                   ((simple-get-runs)              (apply db:simple-get-runs dbstruct params))
-                   ((get-num-runs)                 (apply db:get-num-runs dbstruct params))
-                   ((get-runs-cnt-by-patt)         (apply db:get-runs-cnt-by-patt dbstruct params))
-                   ((get-all-run-ids)              (db:get-all-run-ids dbstruct))
-                   ((get-prev-run-ids)             (apply db:get-prev-run-ids dbstruct params))
-                   ((get-run-ids-matching-target)  (apply db:get-run-ids-matching-target dbstruct params))
-                   ((get-runs-by-patt)             (apply db:get-runs-by-patt dbstruct params))
-                   ((get-run-name-from-id)         (apply db:get-run-name-from-id dbstruct params))
-                   ((get-main-run-stats)           (apply db:get-main-run-stats dbstruct params))
-                   ((get-var)                      (apply db:get-var dbstruct params))
-                   ((get-run-stats)                (apply db:get-run-stats dbstruct params))
-                   ((get-run-times)                (apply db:get-run-times dbstruct params)) 
-
-                   ;; STEPS
-                   ((get-steps-data)               (apply db:get-steps-data dbstruct params))
-                   ((get-steps-for-test)           (apply db:get-steps-for-test dbstruct params))
-		   ((get-steps-info-by-id)         (apply db:get-steps-info-by-id dbstruct params))
-
-                   ;; TEST DATA
-                   ((read-test-data)               (apply db:read-test-data dbstruct params))
-                   ((read-test-data-varpatt)       (apply db:read-test-data-varpatt dbstruct params))
-                   ((get-data-info-by-id)          (apply db:get-data-info-by-id dbstruct params)) 
-
-                   ;; MISC
-                   ((get-latest-host-load)         (apply db:get-latest-host-load dbstruct params))
-                   ((have-incompletes?)            (apply db:have-incompletes? dbstruct params))
-                   ((login)                        (apply db:login dbstruct params))
-                   ((general-call)                 (let ((stmtname   (car params))
-                                                         (run-id     (cadr params))
-                                                         (realparams (cddr params)))
-                                                     (db:general-call dbstruct stmtname realparams)))
-                   ((sdb-qry)                      (apply sdb:qry params))
-                   ((ping)                         (current-process-id))
-		   ((get-changed-record-ids)       (apply db:get-changed-record-ids dbstruct params))
-		   ((get-run-record-ids) 	   (apply db:get-run-record-ids dbstruct params))	
-                   ;; TESTMETA
-                   ((testmeta-get-record)       (apply db:testmeta-get-record dbstruct params))
-
-                   ;; TASKS 
-                   ((find-task-queue-records)   (apply tasks:find-task-queue-records dbstruct params))
-		   (else
-		    (debug:print 0 *default-log-port* "ERROR: bad api call " cmd)
-		    (conc "ERROR: BAD api call " cmd))))))
-
-       
-       ;; save all stats
-       (let ((delta-t (- (current-milliseconds)
-			 start-t)))
-	 (hash-table-set! *db-api-call-time* cmd
-			  (cons delta-t (hash-table-ref/default *db-api-call-time* cmd '()))))
-       (if writecmd-in-readonly-mode
-           (begin
-             #;(common:telemetry-log (conc "api-out:"(->string cmd))
-                                   payload: `((params . ,params)
-                                              (ok-res . #t)))
-	     (vector #f res))
-           (begin
-             #;(common:telemetry-log (conc "api-out:"(->string cmd))
-                                   payload: `((params . ,params)
-                                              (ok-res . #f)))
-             (vector #t res))))))))
-
-;; http-server  send-response
-;;                 api:process-request
-;;                    db:*
-;;
-;; NB// Runs on the server as part of the server loop
-;;
-(define (api:process-request dbstruct $) ;; the $ is the request vars proc
-  (debug:print 4 *default-log-port* "server-id:"  *server-id*)
-  (let* ((cmd     ($ 'cmd))
-	 (paramsj ($ 'params))
-         (key     ($ 'key))   
-	 (params  (db:string->obj paramsj transport: 'http))) ;; incoming data from the POST (or is it a GET?)
-    (debug:print 4 *default-log-port* "cmd:" cmd " with params " params "key " key)
-    (if (equal? key *server-id*)
-      (begin
-        (set! *api-process-request-count* (+ *api-process-request-count* 1))
- 	(let* ((resdat  (api:execute-requests dbstruct (vector cmd params))) ;; process the request, resdat = #( flag result )
-	       (success (vector-ref resdat 0))
-	       (res     (vector-ref resdat 1))) ;; (vector flag payload), get the payload, ignore the flag (why?)
-	  (debug:print 4 *default-log-port* "res:" res)
-	  (if (not success)
-	      (debug:print 0 *default-log-port* "ERROR: success flag is #f for " cmd " with params " params))
-	  (if (> *api-process-request-count* *max-api-process-requests*)
-	      (set! *max-api-process-requests* *api-process-request-count*))
-	  (set! *api-process-request-count* (- *api-process-request-count* 1))
-	  ;; This can be here but needs controls to ensure it doesn't run more than every 4 seconds
-	  ;; (rmt:dat->json-str
-	  ;;  (if (or (string? res)
-	  ;;          (list?   res)
-	  ;;          (number? res)
-	  ;;          (boolean? res))
-	  ;;      res 
-	  ;;      (list "ERROR, not string, list, number or boolean" 1 cmd params res)))))
-	  (db:obj->string res transport: 'http)))
-	(begin
-	  (debug:print 0 *default-log-port*   "Server refused to process request. Sever id mismatch. recived " key " expected:  " *server-id* ".\nOther arguments recived: cmd=" cmd " params = " params) 
-	  (db:obj->string (conc "Server refused to process request server-id mismatch: " key ", " *server-id*) transport: 'http)))))
-

Index: apimod.scm
==================================================================
--- apimod.scm
+++ apimod.scm
@@ -18,17 +18,423 @@
 
 ;;======================================================================
 
 (declare (unit apimod))
 (declare (uses commonmod))
-(declare (uses ulex))
+(declare (uses dbmod))
+(declare (uses debugprint))
+(declare (uses tasksmod))
+(declare (uses servermod))
 
 (module apimod
 	*
 	
-(import scheme chicken data-structures extras)
-(import (prefix sqlite3 sqlite3:) posix typed-records srfi-18)
-(import commonmod)
-(import (prefix ulex ulex:))
+(import scheme
+	chicken.base
+	chicken.process-context.posix
+	chicken.string
+	chicken.time
+	chicken.condition
+	chicken.process
+	chicken.random
+	chicken.file
+	
+	;; (prefix sqlite3 sqlite3:)
+	typed-records
+	srfi-18
+	srfi-69
+
+	commonmod
+	dbmod
+	debugprint
+	tasksmod
+	servermod
+	matchable
+	
+	)
+;; allow these queries through without starting a server
+;;
+(define api:read-only-queries
+  '(get-key-val-pairs
+    get-var
+    get-keys
+    get-key-vals
+    test-toplevel-num-items
+    get-test-info-by-id
+    get-steps-info-by-id
+    get-data-info-by-id
+    test-get-rundir-from-test-id
+    get-count-tests-running-for-testname
+    get-count-tests-running
+    get-count-tests-running-in-jobgroup
+    get-previous-test-run-record
+    get-matching-previous-test-run-records
+    test-get-logfile-info
+    test-get-records-for-index-file
+    get-testinfo-state-status
+    test-get-top-process-pid
+    test-get-paths-matching-keynames-target-new
+    get-prereqs-not-met
+    get-count-tests-running-for-run-id
+    get-run-info
+    get-run-status
+    get-run-state
+    get-run-stats
+    get-run-times
+    get-targets
+    get-target
+    ;; register-run
+    get-tests-tags
+    get-test-times
+    get-tests-for-run
+    get-tests-for-run-state-status
+    get-test-id
+    get-tests-for-runs-mindata
+    get-tests-for-run-mindata
+    get-run-name-from-id
+    get-runs
+    simple-get-runs
+    get-num-runs
+    get-runs-cnt-by-patt
+    get-all-run-ids
+    get-prev-run-ids
+    get-run-ids-matching-target
+    get-runs-by-patt
+    get-steps-data
+    get-steps-for-test
+    read-test-data
+    read-test-data-varpatt
+    login
+    tasks-get-last
+    testmeta-get-record
+    have-incompletes?
+    ;; synchash-get
+    get-changed-record-ids
+    get-run-record-ids 
+    get-not-completed-cnt))
+
+(define api:write-queries
+  '(
+    get-keys-write ;; dummy "write" query to force server start
+
+    ;; SERVERS
+    start-server
+    kill-server
+
+    ;; TESTS
+    test-set-state-status-by-id
+    delete-test-records
+    delete-old-deleted-test-records
+    test-set-state-status
+    test-set-top-process-pid
+    set-state-status-and-roll-up-items
+    
+    update-pass-fail-counts
+    top-test-set-per-pf-counts ;; (db:top-test-set-per-pf-counts (db:get-db *db* 5) 5 "runfirst")
+
+    ;; RUNS
+    register-run
+    set-tests-state-status
+    delete-run
+    lock/unlock-run
+    update-run-event_time
+    mark-incomplete
+    set-state-status-and-roll-up-run
+    ;; STEPS
+    teststep-set-status!
+    delete-steps-for-test
+    ;; TEST DATA
+    test-data-rollup
+    csv->test-data
+
+    ;; MISC
+    sync-inmem->db
+    drop-all-triggers
+    create-all-triggers
+    update-tesdata-on-repilcate-db 
+
+    ;; TESTMETA
+    testmeta-add-record
+    testmeta-update-field
+
+    ;; TASKS
+    tasks-add
+    tasks-set-state-given-param-key
+    ))
+
+(define (api:run-server-process apath dbname)
+  (let* ((cmd  (conc "nbfake megatest -server - -area "apath
+		     " -db "dbname))
+	 (cleandbname (string-translate dbname "./" "_-"))
+	 (logd (conc apath "/logs")) 
+	 (logf (conc logd "/server-"(current-seconds)cleandbname".log")))
+    (if (not (directory-exists? logd))
+	(create-directory logd #t))
+    (system (conc "NBFAKE_LOG="logf" "cmd))))
+
+;; special function to get server
+;; look up in db
+;; if found -> return it
+;; if not found -> start server, return starting
+;;
+(define (api:start-server dbstruct params)
+  (let* ((res (apply db:get-server-info dbstruct params)))
+    (if res
+	res
+	(match params
+	  ((apath dbname)
+	   (api:run-server-process apath dbname)
+	   'server-started)
+	  (else
+	   (debug:print-info 0 *default-log-port* "api:start-server called with wrong params: "params)
+	   'bad-params)))))
+
+	
+(define (api:dispatch-cmd dbstruct cmd params)
+  (case cmd
+    ;;===============================================
+    ;; READ/WRITE QUERIES
+    ;;===============================================
+
+    ((get-keys-write)                        (db:get-keys dbstruct)) ;; force a dummy "write" query to force server; for debug in -repl
+    
+    ;; SERVERS
+    ;; ((start-server)                    (apply server:kind-run params))
+    ((kill-server)                       (set! *server-run* #f))
+    ((get-server)                        (api:start-server dbstruct params))
+
+    ;; TESTS
+
+    ;;((test-set-state-status-by-id)     (apply mt:test-set-state-status-by-id dbstruct params))
+    ;;BB - commented out above because it was calling below, eventually, incorrectly (dbstruct passed to mt:test-set-state-status-by-id, which previosly did more, but now only passes thru to db:set-state-status-and-roll-up-items.
+    ((test-set-state-status-by-id)
+
+     ;; (define (db:set-state-status-and-roll-up-items dbstruct run-id test-name item-path state status comment)
+     (db:set-state-status-and-roll-up-items
+      dbstruct
+      (list-ref params 0) ; run-id
+      (list-ref params 1) ; test-name
+      #f                  ; item-path
+      (list-ref params 2) ; state
+      (list-ref params 3) ; status
+      (list-ref params 4) ; comment
+      ))
+    
+    ((delete-test-records)             (apply db:delete-test-records dbstruct params))
+    ((delete-old-deleted-test-records) (apply db:delete-old-deleted-test-records dbstruct params))
+    ((test-set-state-status)           (apply db:test-set-state-status dbstruct params))
+    ((test-set-top-process-pid)        (apply db:test-set-top-process-pid dbstruct params))
+    ((set-state-status-and-roll-up-items) (apply db:set-state-status-and-roll-up-items dbstruct params))
+    ((set-state-status-and-roll-up-run) (apply db:set-state-status-and-roll-up-run dbstruct params)) 
+    ((top-test-set-per-pf-counts)      (apply db:top-test-set-per-pf-counts dbstruct params))
+    ((test-set-archive-block-id)       (apply db:test-set-archive-block-id dbstruct params))
+
+    ;; RUNS
+    ((register-run)                 (apply db:register-run dbstruct params))
+    ((set-tests-state-status)       (apply db:set-tests-state-status dbstruct params))
+    ((delete-run)                   (apply db:delete-run dbstruct params))
+    ((lock/unlock-run)              (apply db:lock/unlock-run dbstruct params))
+    ((update-run-event_time)        (apply db:update-run-event_time dbstruct params))
+    ((update-run-stats)             (apply db:update-run-stats dbstruct params))
+    ((set-var)                      (apply db:set-var dbstruct params))
+    ((inc-var)                      (apply db:inc-var dbstruct params))
+    ((dec-var)                      (apply db:dec-var dbstruct params))
+    ((del-var)                      (apply db:del-var dbstruct params))
+    ((add-var)                      (apply db:add-var dbstruct params))
+
+    ;; STEPS
+    ((teststep-set-status!)         (apply db:teststep-set-status! dbstruct params))
+    ((delete-steps-for-test!)        (apply db:delete-steps-for-test! dbstruct params))
+    
+    ;; TEST DATA
+    ((test-data-rollup)             (apply db:test-data-rollup dbstruct params))
+    ((csv->test-data)               (apply db:csv->test-data dbstruct params))
+
+    ;; MISC
+    ;;                    ((sync-inmem->db)               (let ((run-id (car params)))
+    ;;                                                      (db:sync-touched dbstruct run-id force-sync: #t)))
+    ;;                    ((mark-incomplete)              (apply db:find-and-mark-incomplete dbstruct params))
+    ;;                    ((create-all-triggers)          (db:create-all-triggers dbstruct))
+    ;;                    ((drop-all-triggers)            (db:drop-all-triggers dbstruct)) 
+
+    ;; TESTMETA
+    ((testmeta-add-record)       (apply db:testmeta-add-record dbstruct params))
+    ((testmeta-update-field)     (apply db:testmeta-update-field dbstruct params))
+    ((get-tests-tags)            (db:get-tests-tags dbstruct))
+
+    ;; TASKS
+    ((tasks-add)                 (apply tasks:add dbstruct params))   
+    ((tasks-set-state-given-param-key) (apply tasks:set-state-given-param-key dbstruct params))
+    ((tasks-get-last)            (apply tasks:get-last dbstruct params))
+
+    ;; NO SYNC DB
+    ((no-sync-set)               (apply db:no-sync-set         *no-sync-db* params))
+    ((no-sync-get/default)       (apply db:no-sync-get/default *no-sync-db* params))
+    ((no-sync-del!)              (apply db:no-sync-del!        *no-sync-db* params))
+    ((no-sync-get-lock)          (apply db:no-sync-get-lock    *no-sync-db* params))
+    
+    ;; ARCHIVES
+    ;; ((archive-get-allocations)   
+    ((archive-register-disk)     (apply db:archive-register-disk dbstruct params))
+    ((archive-register-block-name)(apply db:archive-register-block-name dbstruct params))
+    ;; ((archive-allocate-testsuite/area-to-block)(apply db:archive-allocate-testsuite/area-to-block dbstruct block-id testsuite-name areakey))
+
+    ;;======================================================================
+    ;; READ ONLY QUERIES
+    ;;======================================================================
+
+    ;; KEYS
+    ((get-key-val-pairs)               (apply db:get-key-val-pairs dbstruct params))
+    ((get-keys)                        (db:get-keys dbstruct))
+    ((get-key-vals)                    (apply db:get-key-vals dbstruct params))
+    ((get-target)                      (apply db:get-target dbstruct params))
+    ((get-targets)                     (db:get-targets dbstruct))
+
+    ;; ARCHIVES
+    ((test-get-archive-block-info)     (apply db:test-get-archive-block-info dbstruct params))
+    
+    ;; TESTS
+    ((test-toplevel-num-items)         (apply db:test-toplevel-num-items dbstruct params))
+    ((get-test-info-by-id)	       (apply db:get-test-info-by-id dbstruct params))
+    ((test-get-rundir-from-test-id)    (apply db:test-get-rundir-from-test-id dbstruct params))
+    ((get-count-tests-running-for-testname) (apply db:get-count-tests-running-for-testname dbstruct params))
+    ((get-count-tests-running)         (apply db:get-count-tests-running dbstruct params))
+    ((get-count-tests-running-in-jobgroup) (apply db:get-count-tests-running-in-jobgroup dbstruct params))
+    ;; ((delete-test-step-records)        (apply db:delete-test-step-records dbstruct params))
+    ;; ((get-previous-test-run-record)    (apply db:get-previous-test-run-record dbstruct params))
+    ((get-matching-previous-test-run-records)(apply db:get-matching-previous-test-run-records dbstruct params))
+    ((test-get-logfile-info)           (apply db:test-get-logfile-info dbstruct params))
+    ((test-get-records-for-index-file)  (apply db:test-get-records-for-index-file dbstruct params))
+    ((get-testinfo-state-status)       (apply db:get-testinfo-state-status dbstruct params))
+    ((test-get-top-process-pid)        (apply db:test-get-top-process-pid dbstruct params))
+    ((test-get-paths-matching-keynames-target-new) (apply db:test-get-paths-matching-keynames-target-new dbstruct params))
+    ((get-prereqs-not-met)             (apply db:get-prereqs-not-met dbstruct params))
+    ((get-count-tests-running-for-run-id) (apply db:get-count-tests-running-for-run-id dbstruct params))
+    ((get-not-completed-cnt)           (apply db:get-not-completed-cnt  dbstruct params)) 
+    ;; ((synchash-get)                    (apply synchash:server-get dbstruct params))
+    ((get-raw-run-stats)               (apply db:get-raw-run-stats dbstruct params))
+    ((get-test-times)                  (apply db:get-test-times dbstruct params))
+
+    ;; RUNS
+    ((get-run-info)                 (apply db:get-run-info dbstruct params))
+    ((get-run-status)               (apply db:get-run-status dbstruct params))
+    ((get-run-state)                (apply db:get-run-state dbstruct params))
+    ((set-run-status)               (apply db:set-run-status dbstruct params))
+    ((set-run-state-status)  			 (apply db:set-run-state-status dbstruct params))
+    ((update-tesdata-on-repilcate-db) (apply db:update-tesdata-on-repilcate-db  dbstruct params)) 
+    ((get-tests-for-run)            (apply db:get-tests-for-run dbstruct params))
+    ((get-tests-for-run-state-status) (apply db:get-tests-for-run-state-status dbstruct params))
+    ((get-test-id)                  (apply db:get-test-id dbstruct params))
+    ((get-tests-for-run-mindata)    (apply db:get-tests-for-run-mindata dbstruct params))
+    ;; ((get-tests-for-runs-mindata)   (apply db:get-tests-for-runs-mindata dbstruct params))
+    ((get-runs)                     (apply db:get-runs dbstruct params))
+    ((simple-get-runs)              (apply db:simple-get-runs dbstruct params))
+    ((get-num-runs)                 (apply db:get-num-runs dbstruct params))
+    ((get-runs-cnt-by-patt)         (apply db:get-runs-cnt-by-patt dbstruct params))
+    ((get-all-run-ids)              (db:get-all-run-ids dbstruct))
+    ((get-prev-run-ids)             (apply db:get-prev-run-ids dbstruct params))
+    ((get-run-ids-matching-target)  (apply db:get-run-ids-matching-target dbstruct params))
+    ((get-runs-by-patt)             (apply db:get-runs-by-patt dbstruct params))
+    ((get-run-name-from-id)         (apply db:get-run-name-from-id dbstruct params))
+    ((get-main-run-stats)           (apply db:get-main-run-stats dbstruct params))
+    ((get-var)                      (apply db:get-var dbstruct params))
+    ((get-run-stats)                (apply db:get-run-stats dbstruct params))
+    ((get-run-times)                (apply db:get-run-times dbstruct params)) 
+
+    ;; STEPS
+    ((get-steps-data)               (apply db:get-steps-data dbstruct params))
+    ((get-steps-for-test)           (apply db:get-steps-for-test dbstruct params))
+    ((get-steps-info-by-id)         (apply db:get-steps-info-by-id dbstruct params))
+
+    ;; TEST DATA
+    ((read-test-data)               (apply db:read-test-data dbstruct params))
+    ((read-test-data-varpatt)       (apply db:read-test-data-varpatt dbstruct params))
+    ((get-data-info-by-id)          (apply db:get-data-info-by-id dbstruct params)) 
+
+    ;; MISC
+    ((get-latest-host-load)         (apply db:get-latest-host-load dbstruct params))
+    ((have-incompletes?)            (apply db:have-incompletes? dbstruct params))
+    ((login)                        (apply db:login dbstruct params))
+    ((general-call)                 (let ((stmtname   (car params))
+					  (run-id     (cadr params))
+					  (realparams (cddr params)))
+				      (db:general-call dbstruct stmtname realparams)))
+    ((sdb-qry)                      (apply sdb:qry params))
+    ((ping)                         (current-process-id))
+    ((get-changed-record-ids)       (apply db:get-changed-record-ids dbstruct params))
+    ((get-run-record-ids) 	   (apply db:get-run-record-ids dbstruct params))	
+    ;; TESTMETA
+    ((testmeta-get-record)       (apply db:testmeta-get-record dbstruct params))
+
+    ;; TASKS 
+    ((find-task-queue-records)   (apply tasks:find-task-queue-records dbstruct params))
+    (else
+     (debug:print 0 *default-log-port* "ERROR: bad api call " cmd)
+     (conc "ERROR: BAD api call " cmd))))
+
+;; These are called by the server on recipt of /api calls
+;;    - keep it simple, only return the actual result of the call, i.e. no meta info here
+;;
+;;    - returns #( flag result )
+;;
+(define (api:execute-requests dbstruct cmd params)
+  (let* ((start-t           (current-milliseconds))
+	 ;; (readonly-mode     (dbr:dbstruct-read-only dbstruct))
+	 ;; (readonly-command  (member cmd api:read-only-queries))
+            ;; (writecmd-in-readonly-mode (and readonly-mode (not readonly-command)))
+	 (res        (api:dispatch-cmd dbstruct cmd params)))
+    
+    ;; (if writecmd-in-readonly-mode
+    ;; (conc "attempt to run write command "cmd" on a read-only database")
+
+    ;; save all stats
+    (let ((delta-t (- (current-milliseconds)
+		      start-t)))
+      (hash-table-set! *db-api-call-time* cmd
+		       (cons delta-t (hash-table-ref/default *db-api-call-time* cmd '()))))
+    res))
+
+;;     (if #f ;; writecmd-in-readonly-mode
+;; 	(begin
+;; 	  (vector #f res))
+;; 	(begin
+;;              (vector #t res))))))))
 
+;; http-server  send-response
+;;                 api:process-request
+;;                    db:*
+;;
+;; NB// Runs on the server as part of the server loop
+;;
+(define (api:process-request dbstruct $) ;; the $ is the request vars proc
+  (debug:print 0 *default-log-port* "server-id:"  *server-id*)
+  (let* ((cmd     ($ 'cmd))
+	 (params  (string->sexpr ($ 'params)))
+         (key     ($ 'key))    ;; TODO - add this back
+	 )
+    (debug:print 0 *default-log-port* "cmd:" cmd " with params " params "key " key)
+    (if (equal? key "nokey") ;; *server-id*) ;; TODO - get real key involved
+	(begin
+	  (set! *api-process-request-count* (+ *api-process-request-count* 1))
+	  (let* ((resdat  (api:execute-requests dbstruct (vector cmd params))) ;; process the request, resdat = #( flag result )
+		 (success (vector-ref resdat 0))
+		 (res     (vector-ref resdat 1))) ;; (vector flag payload), get the payload, ignore the flag (why?)
+	    (debug:print 4 *default-log-port* "res:" res)
+	    (if (not success)
+		(debug:print 0 *default-log-port* "ERROR: success flag is #f for " cmd " with params " params))
+	    (if (> *api-process-request-count* *max-api-process-requests*)
+		(set! *max-api-process-requests* *api-process-request-count*))
+	    (set! *api-process-request-count* (- *api-process-request-count* 1))
+	    ;; This can be here but needs controls to ensure it doesn't run more than every 4 seconds
+	    ;; (rmt:dat->json-str
+	    ;;  (if (or (string? res)
+	    ;;          (list?   res)
+	    ;;          (number? res)
+	    ;;          (boolean? res))
+	    ;;      res 
+	    ;;      (list "ERROR, not string, list, number or boolean" 1 cmd params res)))))
+	    (db:obj->string res transport: 'http)))
+	(begin
+	  (debug:print 0 *default-log-port*   "Server refused to process request. Sever id mismatch. recived " key " expected:  " *server-id* ".\nOther arguments recived: cmd=" cmd " params = " params) 
+	  (db:obj->string (conc "Server refused to process request server-id mismatch: " key ", " *server-id*) transport: 'http)))))
 
 )

DELETED archive.scm
Index: archive.scm
==================================================================
--- archive.scm
+++ /dev/null
@@ -1,635 +0,0 @@
-;; Copyright 2006-2014, Matthew Welland.
-;; 
-;; This file is part of Megatest.
-;; 
-;;     Megatest is free software: you can redistribute it and/or modify
-;;     it under the terms of the GNU General Public License as published by
-;;     the Free Software Foundation, either version 3 of the License, or
-;;     (at your option) any later version.
-;; 
-;;     Megatest is distributed in the hope that it will be useful,
-;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;     GNU General Public License for more details.
-;; 
-;;     You should have received a copy of the GNU General Public License
-;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
-;;
-
-;;  strftime('%m/%d/%Y %H:%M:%S','now','localtime')
-
-(use (prefix sqlite3 sqlite3:) srfi-1 posix regex regex-case srfi-69 format md5 message-digest srfi-18)
-
-(declare (unit archive))
-(declare (uses db))
-(declare (uses common))
-
-(include "common_records.scm")
-(include "db_records.scm")
-
-;;======================================================================
-;; 
-;;======================================================================
-
-;; NOT CURRENTLY USED
-;;
-(define (archive:main linktree target runname testname itempath options)
-  (let ((testdir (conc linktree "/" target "/" runname "/" testname "/" itempatt))
-	(flavor  'plain) ;; type of machine to run jobs on
-	(maxload 1.5)   ;; max allowed load for this work
-	(adisks  (archive:get-archive-disks)))
-    ;; get testdir size
-    ;;   - hand off du to job mgr
-    (if (and (common:file-exists? testdir)
-	     (file-is-writable? testdir))
-	(let* ((dused  (jobrunner:run-job 
-			flavor  ;; machine type
-			maxload ;; max allowed load
-			'()     ;; prevars - environment vars to set for the job
-			common:get-disk-space-used  ;; if a proc call it, if a string it is a unix command
-			(list testdir)))
-	       (apath  (archive:get-archive testname itempath dused)))
-	  (jobrunner:run-job
-	   flavor
-	   maxload
-	   '()
-	   archive:run-bup
-	   (list testdir apath))))))
-	  
-;; Get archive disks from megatest.config
-;;
-(define (archive:get-archive-disks)
-  (let ((section (configf:get-section *configdat* "archive-disks")))
-    (if section
-	section
-	'())))
-
-;; look for the best candidate archive area, else create new 
-;; area
-;;
-(define (archive:get-archive testname itempath dused)
-  ;; look up in archive_allocations if there is a pre-used archive
-  ;; with adequate diskspace
-  ;;
-  (let* ((existing-blocks (rmt:archive-get-allocations testname itempath dused))
-	 (candidate-disks (map (lambda (block)
-				 (list
-				  (vector-ref block 1)   ;; archive-area-name
-				  (vector-ref block 2))) ;; disk-path
-			       existing-blocks)))
-    (or (common:get-disk-with-most-free-space candidate-disks dused)
-	(archive:allocate-new-archive-block #f #f #f)))) ;; BROKEN. testname itempath))))
-
-;; allocate a new archive area
-;;
-(define (archive:allocate-new-archive-block blockid-cache run-area-home testsuite-name dneeded target run-name test-name)
-  (let ((key (conc testsuite-name "/" target "/" run-name "/" test-name)))
-    (if (hash-table-exists? blockid-cache key)
-	(hash-table-ref blockid-cache key)
-	(let* ((pscript     (configf:lookup *configdat* "archive" "pathscript"))
-	       (pscript-cmd (conc pscript " " testsuite-name " " target " " run-name " " test-name))
-	       (apath       (if pscript
-				(handle-exceptions
-				 exn
-				 (begin
-				   (debug:print 0 *default-log-port* "ERROR: script \"" pscript-cmd "\" failed to run properly. exn=" exn)
-				   (exit 1))
-				 (with-input-from-pipe
-				  pscript-cmd
-				  read-line))
-				#f)) ;; this is the user-calculated archive path
-	       (adisks    (archive:get-archive-disks))
-	       (best-disk (common:get-disk-with-most-free-space adisks dneeded)))
-	  (if best-disk
-	      (let* ((bdisk-name    (car best-disk))
-		     (bdisk-path    (cdr best-disk))
-		     (area-key      (substring (message-digest-string (md5-primitive) run-area-home) 0 5))
-		     (bdisk-id      (rmt:archive-register-disk bdisk-name bdisk-path (get-df bdisk-path)))
-		     (archive-name  (if apath
-					apath
-					(let ((sec (current-seconds)))
-					  (conc (time->string (seconds->local-time sec) "%Y")
-						"_q" (seconds->quarter sec) "/"
-						testsuite-name "_" area-key))))
-		     (archive-path  (conc bdisk-path "/" archive-name))
-		     (block-id      (rmt:archive-register-block-name bdisk-id archive-path)))
-		;;   (allocation-id (rmt:archive-allocate-testsuite/area-to-block block-id testsuite-name area-key)))
-		(if block-id ;; (and block-id allocation-id)
-		    (let ((res (cons block-id archive-path)))
-		      (hash-table-set! blockid-cache key res)
-		      res)
-		    (begin
-		      (debug:print 0 *default-log-port* "WARNING: no disk found for " target ", " run-name ", " test-name ",  archive-path=" archive-path)
-		      #f)))
-	      (begin
-		(debug:print 0 *default-log-port* "WARNING: no disk found for " target ", " run-name ", " test-name )
-		#f)))))) ;; no best disk found
-
-;; archive - run bup
-;;
-;; 1. create the bup dir if not exists
-;; 2. start the du of each directory
-;; 3. gen index
-;; 4. save
-;;
-(define (archive:run-bup archive-command run-id run-name tests rp-mutex bup-mutex)
-  ;; move the getting of archive space down into the below block so that a single run can 
-  ;; allocate as needed should a disk fill up
-  ;;
-  (let* ((blockid-cache  (make-hash-table))
-	 (tsname         (common:get-testsuite-name))
-         (target         (string-intersperse (map cadr (rmt:get-key-val-pairs run-id)) "/"))
-	 (min-space      (string->number (or (configf:lookup *configdat* "archive" "minspace") "1000")))
-	 (arch-groups    (make-hash-table)) ;; archive groups, each corrosponds to a bup area
-	 (disk-groups    (make-hash-table)) ;; 
-	 (test-groups    (make-hash-table)) ;; these two (disk and test groups) could be combined nicely
-	 (test-dirs      (make-hash-table))
-	 (bup-exe        (or (configf:lookup *configdat* "archive" "bup") "bup"))
-	 (compress       (or (configf:lookup *configdat* "archive" "compress") "9"))
-	 (linktree       (common:get-linktree)) ;; (configf:lookup *configdat* "setup" "linktree")))
-	 (archiver       (let ((s (configf:lookup *configdat* "archive" "archiver")))
-			   (if s (string->symbol s) 'bup)))
-	 (archiver-cmd   (case archiver
-			   ((tar) "tar cfj ARCHIVE_NAME.tar.bz2 ")
-			   ((7z)  " 7z u -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on ARCHIVE_NAME.7z ")
-			   (else #f)))
-         (src-archive-linktree (rmt:get-var "src-archive-linktree"))  
-	 (print-prefix      "Running: ") ;; change to #f to turn off printing
-	 (preclean-spec  (configf:get-section *configdat* "archive-preclean")))
-
-     (if (or (not src-archive-linktree) (not (equal? src-archive-linktree linktree)))      
-         (rmt:set-var "src-archive-linktree"  linktree))
-    ;;     (tests:match patt testname itempath)
-    
-    ;; from the test info bin the path to the test by stem
-    ;;
-    (for-each
-     (lambda (test-dat)
-       (let* ((item-path         (db:test-get-item-path test-dat))
-	      (test-name         (db:test-get-testname  test-dat))
-	      (test-id           (db:test-get-id        test-dat))
-	      (run-id            (db:test-get-run_id    test-dat))
-	      	      
-	      (toplevel/children (and (db:test-get-is-toplevel test-dat)
-				      (> (rmt:test-toplevel-num-items run-id test-name) 0)))
-	      (test-partial-path (conc target "/" run-name "/" (db:test-make-full-name test-name item-path)))
-	      ;; note the trailing slash to get the dir inspite of it being a link
-	      (test-path         (conc linktree "/" test-partial-path))
-	      (mutex-lock! rp-mutex)
-	      (test-physical-path (if (common:file-exists? test-path) 
-				      (common:real-path test-path)
-				      #f))
-	      (mutex-unlock! rp-mutex)
-	      (partial-path-index (if test-physical-path (substring-index test-partial-path test-physical-path) #f))
-	      (test-base         (if (and partial-path-index 
-					  test-physical-path )
-				     (substring test-physical-path
-						0
-						partial-path-index)
-				     #f))
-	      ;; we need our archive dir checked for every test to enable folks who want to store other ways.
-	      (archive-info (archive:allocate-new-archive-block blockid-cache *toppath* tsname min-space target run-name test-name))
-	      (archive-dir  (if archive-info (cdr archive-info) #f))
-	      (archive-id   (if archive-info (car archive-info) -1)))
-	 
-	 (if (not archive-dir) ;; no archive disk found, this is fatal
-	     (begin
-	       (debug:print 0 *default-log-port* "FATAL: No archive disks found. Please add disks with at least "
-			    min-space " MB space to the [archive-disks] section of megatest.config")
-	       (debug:print 0 *default-log-port* "       use [archive] minspace to specify minimum available space")
-	       (debug:print 0 *default-log-port* "   disks: "
-			    (string-intersperse (map cadr (archive:get-archive-disks)) "\n         "))
-	       (exit 1))
-	     (debug:print-info 0 *default-log-port* "Using path " archive-dir " for archiving test " test-path))
-
-	 ;; preclean the test directory per the spec if provided
-	 (if (not (null? preclean-spec)) ;; we've been asked to preclean before archiving
-	     (let loop ((spec (car preclean-spec))
-			(tail (cdr preclean-spec)))
-	       (if (> (length spec) 1)
-		   (let ((testspec (car spec))
-			 (rules    (cadr spec)))
-		     (if (tests:match testspec test-name item-path)
-			 (begin
-			   (debug:print 0 *default-log-port* "INFO: cleanup requested for " test-physical-path)
-			   (common:dir-clean-up test-physical-path rules remove-empty: #t))
-			 (if (not (null? tail))
-			     (loop (car tail)(cdr tail)))))
-		   (begin
-		     (debug:print 0 *default-log-port* "ERROR: bad spec line in [archive-preclean] section. \"" spec "\"")
-		     (if (not (null? tail))(loop (car tail)(cdr tail)))))))
-	 (cond
-	  (toplevel/children
-	   (debug:print 0 *default-log-port* "WARNING: cannot archive " test-name " with id " test-id
-			" as it is a toplevel test with children"))
-	  ((not (common:file-exists? test-path))
-	   (debug:print 0 *default-log-port* "WARNING: Cannot archive " test-name "/" item-path
-			" as path " test-path " does not exist"))
-	  (else
-	   (debug:print 2 *default-log-port*
-			"From test-dat=" test-dat " derived the following:\n"
-			"test-partial-path  = " test-partial-path "\n"
-			"test-path          = " test-path "\n"
-			"test-physical-path = " test-physical-path "\n"
-			"partial-path-index = " partial-path-index "\n"
-			"test-base          = " test-base)
-	   (hash-table-set! disk-groups test-base
-			    (cons test-physical-path (hash-table-ref/default disk-groups test-base '())))
-	   (hash-table-set! test-groups test-base
-			    (cons test-dat (hash-table-ref/default test-groups test-base '())))
-	   (hash-table-set! arch-groups test-base
-			    (cons archive-info (hash-table-ref/default arch-groups test-base '())))
-	   (hash-table-set! test-dirs test-id test-path)))))
-	   ;; test-path))))
-     tests)
-    (debug:print 0 *default-log-port* "INFO: DISK GROUPS=" (hash-table->alist disk-groups))
-    ;; for each disk-group, initialize the bup area if needed
-    (for-each 
-     (lambda (test-base)
-       (let* ((disk-group (hash-table-ref disk-groups test-base))
-	      (arch-group (hash-table-ref arch-groups test-base))
-	      (arch-info  (car arch-group)) ;; don't know yet how this will work, can I get more than one possibility?
-	      (archive-id    (car arch-info))
-	      (archive-dir   (cdr arch-info)))
-	 (debug:print 0 *default-log-port* "Processing disk-group " test-base)
-	 (let* ((test-paths-in (hash-table-ref disk-groups test-base))
-		(test-paths    (if (args:get-arg "-include")
-				   (let ((subpaths (string-split (args:get-arg "-include") ",")))
-				     (apply append
-					    (map (lambda (p)
-						   (map (lambda (subp)
-							  (conc p "/" subp))
-							subpaths))
-						 test-paths-in)))
-				   test-paths-in)))
-	   (if (not (common:file-exists? archive-dir))
-	       (create-directory archive-dir #t))
-	   (case archiver
-	     ((bup) ;; Archive using bup
-	      (let* ((bup-init-params  (list "-d" archive-dir "init"))
-		     (bup-index-params (append (list "-d" archive-dir "index") test-paths))
-		     (bup-save-params  (append (list "-d" archive-dir "save" ;; (conc "--strip-path=" linktree)
-						     (conc "-" compress) ;; or (conc "--compress=" compress)
-						     "-n" (conc (common:get-testsuite-name) "-"(string-substitute "/" "-" target " "))
-						     (conc "--strip-path=" (conc test-base target "/" )) ;; if we push to the directory do we need this?
-						     )
-					       test-paths)))
-		(if (not (common:file-exists? (conc archive-dir "/HEAD")))
-		    (begin
-		      ;; replace this with jobrunner stuff enventually
-		      (debug:print-info 2 *default-log-port* "Init bup in " archive-dir)
-		      ;; (mutex-lock! bup-mutex)
-		      (let-values (((pid-val exit-status exit-code) (run-n-wait bup-exe params: bup-init-params print-cmd: print-prefix)))
-                        (if (not (eq? exit-code 0))
-                              (begin    
-                              (debug:print-error 0 *default-log-port* "There was an error initializing bup. Archive failed.")
-                              (exit 1))))
-		      ;; (mutex-unlock! bup-mutex)
-		      ))
-		(debug:print-info 2 *default-log-port* "Indexing data to be archived")
-		;; (mutex-lock! bup-mutex)
-		(let-values (((pid-val exit-status exit-code) (run-n-wait bup-exe params: bup-index-params print-cmd: print-prefix)))
-                   (if (not (eq? exit-code 0))
-                              (begin    
-                              (debug:print-error 0 *default-log-port* "There was an error Indexing bup. Archive failed.")
-                              (exit 1))))
-		(debug:print-info 2 *default-log-port* "Archiving data with bup")
-		(let-values (((pid-val exit-status exit-code) (run-n-wait bup-exe params: bup-save-params print-cmd: print-prefix)))
-                     (if (not (eq? exit-code 0))
-                              (begin    
-                              (debug:print-error 0 *default-log-port* "There was an archiving data with bup. Archive failed.")
-                              (exit 1))))))
-	     ((7z tar)
-	      (for-each
-	       (lambda (test-dat)
-		 (let* ((test-id           (db:test-get-id        test-dat))
-			(test-name         (db:test-get-testname  test-dat))
-			(item-path         (db:test-get-item-path test-dat))
-			(test-full-name    (db:test-make-full-name test-name item-path))
-			(run-id            (db:test-get-run_id    test-dat))
-			(target            (string-intersperse (map cadr (rmt:get-key-val-pairs run-id)) "/"))
-			(run-name          (rmt:get-run-name-from-id run-id))
-			(source-dir        (hash-table-ref test-dirs test-id)) ;; (conc test-base "/" test-name "/" item-path))
-			(target-dir        (string-substitute "/$" "" (conc archive-dir "/" target "/" run-name "/" test-full-name))))
-		   ;; create the test and item-path levels under archive-dir
-		   (create-directory (pathname-directory target-dir) #t)
-		   (run-n-wait
-		    (conc
-		     (string-substitute "ARCHIVE_NAME" target-dir archiver-cmd) " "
-		     "."
-		     )
-		    print-cmd: print-prefix
-		    run-dir: source-dir)))
-	       (hash-table-ref test-groups test-base))))
-	   ;; (mutex-unlock! bup-mutex)
-	   (for-each
-	    (lambda (test-dat)
-	      (let ((test-id           (db:test-get-id        test-dat))
-		    (run-id            (db:test-get-run_id    test-dat)))
-		(rmt:test-set-archive-block-id run-id test-id archive-id)
-		(if (member (symbol->string archive-command) '("save-remove"))
-                    (begin 
-                     (debug:print-info 0 *default-log-port* "remove testdat")
-		    (runs:remove-test-directory test-dat 'archive-remove)))))
-	    (hash-table-ref test-groups test-base)))))
-       (hash-table-keys disk-groups))
-    #t))
-
-(define (archive:megatest-db target-patt run-patt)
- (let* ((blockid-cache  (make-hash-table))
-        (tsname         (common:get-testsuite-name))
-        (min-space      (string->number (or (configf:lookup *configdat* "archive" "minspace") "1000")))
-        (bup-exe        (or (configf:lookup *configdat* "archive" "bup") "bup"))
-	(compress       (or (configf:lookup *configdat* "archive" "compress") "9"))
-        (archiver       (let ((s (configf:lookup *configdat* "archive" "archiver")))
-			   (if s (string->symbol s) 'bup)))
-        (rsync-exe (or (configf:lookup *configdat* "archive" "rsync") "rsync"))   
-        (print-prefix      "Running: ") 
-        (archive-info (archive:allocate-new-archive-block blockid-cache *toppath* tsname min-space target-patt run-patt "megatest-db"))
-	(archive-dir  (if archive-info (cdr archive-info) #f))
-	(archive-id   (if archive-info (car archive-info) -1))
-        (home-host (common:get-homehost))
-        (archive-time (seconds->std-time-str (current-seconds)))
-        (archive-staging-db (conc *toppath* "/.db-snapshot/archive_" archive-time))
-        (tmp-db-path (conc (common:get-db-tmp-area) "/megatest.db"))
-        (dbfile             (conc  archive-staging-db "/megatest.db"))) 
-        (create-directory archive-staging-db #t)
-        (let-values (((pid-val exit-status exit-code) (run-n-wait rsync-exe params: (list "-v" (conc (car home-host) ":"tmp-db-path) archive-staging-db) print-cmd: print-prefix)))
-            (if (eq? exit-code 0)   
-              (case archiver
-	        ((bup) ;; Archive using bup
-	          (let* ((bup-init-params  (list "-d" archive-dir "init"))
-		         (bup-index-params (list "-d" archive-dir "index" archive-staging-db))
-		         (bup-save-params  (list "-d" archive-dir "save" ;; (conc "--strip-path=" linktree)
-						     (conc "-" compress) ;; or (conc "--compress=" compress)
-						     "-n" (conc tsname "-megatest-db" )
-						     (conc "--strip-path=" archive-staging-db ) ;; if we push to the directory do we need this?
-						     dbfile)))
-                    (if (not (common:file-exists? (conc archive-dir "/HEAD")))
-		      (begin
-		        ;; replace this with jobrunner stuff enventually
-		        (debug:print-info 2 *default-log-port* "Init bup in " archive-dir)
-		         (let-values (((pid-val exit-status exit-code)(run-n-wait bup-exe params: bup-init-params print-cmd: print-prefix)))
-                          (if (not (eq? exit-code 0))
-                              (begin    
-                              (debug:print-error 0 *default-log-port* "There was an error initializing bup. Archive failed.")
-                              (exit 1))))))
-		     (debug:print-info 2 *default-log-port* "Indexing data to be archived")
-		     (let-values (((pid-val exit-status exit-code) (run-n-wait bup-exe params: bup-index-params print-cmd: print-prefix)))
-                        (if (not (eq? exit-code 0))
-                              (begin    
-                              (debug:print-error 0 *default-log-port* "There was an error Indexing bup. Archive failed.")
-                              (exit 1))))
-		     (debug:print-info 2 *default-log-port* "Archiving data with bup")
-		     (let-values (((pid-val exit-status exit-code) (run-n-wait bup-exe params: bup-save-params print-cmd: print-prefix)))
-                         (if (not (eq? exit-code 0))
-                              (begin    
-                              (debug:print-error 0 *default-log-port* "There was an error archiving data with bup. Archive failed.")
-                              (exit 1))
-                             (debug:print-info 0 *default-log-port* "To restore megatest.db run megatest -archive replicacte-db -source archive-dir -time-stamp <ts>. Current timestamp: " (seconds->std-time-str (current-seconds))))))) 
-               (else
-                   (debug:print-info 0 *default-log-port* "No support for databse archiving with " archiver)))
-               (debug:print-error 0 *default-log-port* "There was an error rsyncing tmp database")))))
-
-(define (archive:restore-db archive-path ts)
-   (let* ((bup-exe               (or (configf:lookup *configdat* "archive" "bup") "bup"))
-         (archive-internal-path (conc (common:get-testsuite-name) "-megatest-db/" ts "/megatest.db" ))
-         (bup-restore-params  (list "-d" archive-path "restore" "-C" *toppath* archive-internal-path)))
-		 (debug:print-info 2 *default-log-port* "Restoring archived data to " *toppath* " from archive in " archive-path " ... " archive-internal-path)
-		 (run-n-wait bup-exe params: bup-restore-params print-cmd: "Running:"))
-      (sleep 2)
-      (db:multi-db-sync 
-       (db:setup #f)
-       'killservers
-       ;'dejunk
-       ;'adj-testids
-       'old2new
-       )
-      (debug:print-info 1 *default-log-port* "dropping triggers to update linktree") 
-      (rmt:drop-all-triggers)
-    (let* ((linktree       (common:get-linktree)) ;; (configf:lookup *configdat* "setup" "linktree")))
-	  (src-archive-linktree (rmt:get-var "src-archive-linktree")))
-        (if (not (equal? src-archive-linktree linktree))
-           (rmt:update-tesdata-on-repilcate-db src-archive-linktree linktree))
-              (debug:print-info 1 *default-log-port* "creating triggers after updating linktree")   
-       (rmt:create-all-triggers)
-))  
-
-(define (archive:ls->list  bup-exe archive-dir internal-path)
-  (let ((cmd (conc bup-exe " -d " archive-dir  " ls -l " internal-path "| awk '{print $6}' | sort"))
-        (res '()))
-    (debug:print-info 0 *default-log-port* cmd)
-    (handle-exceptions
-     exn
-     #f ;; anything goes wrong - assume the process in NOT running.
-     (with-input-from-pipe 
-      cmd
-      (lambda ()
-	(let* ((inl (read-lines)))
-	  (reverse inl)))))))
-
-(define (time-string->seconds tstr ds-flag)
- (let* ((atime (string->time tstr "%Y-%m-%d-%H%M%S")))
-       (vector-set! atime 8 ds-flag)
-     (local-time->seconds atime)))
-
-(define (seconds->std-time-str sec)
-  (time->string 
-   (seconds->local-time sec)
-   "%Y-%m-%d-%H%M%S"))
- 
-
-(define (archive:get-timestamp-dir bup-exe archive-dir testsuite-name target test-partial-path test-last-update)
-    (debug:print-info 0 *default-log-port* "Test last update time:" (seconds->std-time-str test-last-update)) 
-    (let* ((internal-path (conc testsuite-name "-" target))
-           (archive-update-delay (string->number (or (configf:lookup *configdat* "archive" "test-update-delay") "900" )))  
-           (ts-list (archive:ls->list  bup-exe archive-dir internal-path))
-           (ds-flag (vector-ref (seconds->local-time) 8)))
-           (let loop ((hed (car ts-list))
-                       (tail (cdr ts-list)))
-                   (if (and (null? tail) (equal? hed "latest"))
-                        #f
-                    (if (and (not (null? tail)) (equal? hed "latest"))
-                        (loop (car tail) (cdr tail))
-                  (let* ((archive-seconds (time-string->seconds hed ds-flag)))
-                    (if (< (abs (- archive-seconds test-last-update)) archive-update-delay)
-                    (let* ((test-list (archive:ls->list  bup-exe archive-dir (conc internal-path "/" hed "/" test-partial-path))))
-                           (if (> (length test-list) 0)
-                               hed
-                               (if (not (null? tail)) 
-                                 (loop (car tail) (cdr tail))
-                                 #f)))
-                       (if (null? tail)
-                          #f
-                          (loop (car tail) (cdr tail))))))))))
-
-(define (archive:bup-restore archive-command run-id run-name tests rp-mutex bup-mutex)  ;; move the getting of archive space down into the below block so that a single run can 
-  ;; allocate as needed should a disk fill up
-  ;;
-  (let* ((bup-exe      (or (configf:lookup *configdat* "archive" "bup") "bup"))
-	 (linktree     (common:get-linktree))) ;; (configf:lookup *configdat* "setup" "linktree")))
-
-    ;; from the test info bin the path to the test by stem
-    ;;
-    (for-each
-     (lambda (test-dat)
-       ;; When restoring test-dat will initially contain an old and invalid path to the test
-       (let* ((best-disk         (get-best-disk *configdat* #f)) ;; BUG: get the testconfig and use it here. Otherwise data pulled out of archive could end up on the wrong kind of disk.
-	      (item-path         (db:test-get-item-path test-dat))
-	      (test-name         (db:test-get-testname  test-dat))
-	      (test-id           (db:test-get-id        test-dat))
-	      (run-id            (db:test-get-run_id    test-dat))
-	      (keyvals           (rmt:get-key-val-pairs run-id))
-	      (target            (string-intersperse (map cadr keyvals) "/"))
-	      
-	      (toplevel/children (and (db:test-get-is-toplevel test-dat)
-				      (> (rmt:test-toplevel-num-items run-id test-name) 0)))
-	      (test-partial-path (conc  run-name "/" (db:test-make-full-name test-name item-path)))
-	      ;; note the trailing slash to get the dir inspite of it being a link
-	      (test-path         (conc linktree "/" test-partial-path))
-	      ;; if the old path was not deleted then prev-test-physical-path will end up pointing to a real directory
-	      (mutex-lock! rp-mutex)
-	      (prev-test-physical-path (if (common:file-exists? test-path)
-					   ;; (read-symbolic-link test-path #t)
-					   (common:real-path test-path)
-					   #f))
-	      (mutex-unlock! rp-mutex)
-	      (new-test-physical-path  (conc best-disk "/" test-partial-path))
-	      (archive-block-id        (db:test-get-archived test-dat))
-              (test-last-update        (db:test-get-last_update test-dat))
-	      (archive-block-info      (rmt:test-get-archive-block-info archive-block-id))
-	      (archive-path            (if (vector? archive-block-info)
-					   (vector-ref archive-block-info 2) ;; look in db.scm for test-get-archive-block-info for the vector record info
-					   #f)) ;; no archive found?
-              (archive-timestamp-dir   (if archive-path (archive:get-timestamp-dir bup-exe archive-path (common:get-testsuite-name) (string-substitute "/" "-" target " ") test-partial-path test-last-update) #f))  
-	      (archive-internal-path   (conc (common:get-testsuite-name) "-" (string-substitute "/" "-" target " ") "/" archive-timestamp-dir "/" test-partial-path))
-	      (include-paths           (args:get-arg "-include"))
-	      (exclude-pattern         (args:get-arg "-exclude-rx"))
-	      (exclude-file            (args:get-arg "-exclude-rx-from")))
-	 (if (not archive-timestamp-dir)
-               (debug:print-error 0 *default-log-port* "Archive not found for testsuite" (common:get-testsuite-name) " run/test/itempath" test-partial-path)
-         (begin    
-	 ;; some sanity checks, move an existing path out of the way - iif it is not a toplevel with children
-         (debug:print-info 0 *default-log-port* "Archive time: " archive-timestamp-dir)
-	 (if (and (not toplevel/children)  ;; special handling needed for toplevel with children
-		  prev-test-physical-path
-		  (common:file-exists? prev-test-physical-path)) ;; what to do? abort or clean up or link it in?
-	     (let* ((base (pathname-directory prev-test-physical-path))
-		    (dirn (pathname-file      prev-test-physical-path))
-		    (newn (conc base "/." dirn)))
-	       (debug:print-error 0 *default-log-port* "the old directory " prev-test-physical-path ", still exists! Moving it to " newn)
-	       (rename-file prev-test-physical-path newn)))
-
-	 (if (and archive-path ;; no point in proceeding if there is no actual archive
-		  (not toplevel/children))
-	     (begin
-	       ;; CREATE WORK AREA
-	       ;; test-src-path == #f     ==> don't copy in data from tests directory
-	       ;; itemdat       == string ==> use directly
-	       (create-work-area run-id run-name keyvals test-id #f best-disk test-name item-path) ;; #!key (remtries 2))
-	       ;; 1. Get the block id from the test info
-	       ;; 2. Get the block data given the block id
-	       ;; 3. Construct the paths etc. for the following command:
-	       ;; bup -d /tmp/matt/adisk1/2015_q1/fullrun_e1a40/ restore -C /tmp/seeme fullrun-30/latest/ubuntu/nfs/none/w02.1.20.54_b/
-	       ;; DO BUP RESTORE
-	       (let* ((new-test-dat        (rmt:get-test-info-by-id run-id test-id))
-		      (new-test-path       (if (vector? new-test-dat )
-					       (db:test-get-rundir new-test-dat)
-					       (begin
-						 (debug:print-error 0 *default-log-port* "unable to get data for run-id=" run-id ", test-id=" test-id)
-						 (exit 1))))
-		      ;; new-test-path won't work - must use best-disk instead? Nope, new-test-path but tack on /..
-		      (bup-restore-params  (list "-d" archive-path "restore" "-C" (conc new-test-path "/..") archive-internal-path)))
-		 (debug:print-info 0 *default-log-port* "Restoring archived data to " new-test-physical-path " from archive in " archive-path " ... " archive-internal-path)
-                 (debug:print-info 0 *default-log-port* bup-exe " " (string-join  bup-restore-params " "))
-		 ;; (mutex-lock! bup-mutex)
-		 (run-n-wait bup-exe params: bup-restore-params print-cmd: #f)
-		 ;; (mutex-unlock! bup-mutex)
-		 (mt:test-set-state-status-by-id run-id test-id "COMPLETED" #f #f)))
-	     (debug:print-error 0 *default-log-port* "No archive path in the record for run-id=" run-id " test-id=" test-id))))))
-     (filter vector? tests))))
-
-(define (common:get-youngest-test tests)
-  (if (null? tests)
-      #f
-      (let ((res #f))
-	(for-each
-	 (lambda (test-dat)
-	   (let ((event-time (db:test-get-event_time test-dat)))
-	     (if (or (not res)
-		     (> event-time (db:test-get-event_time res)))
-		 (set! res test-dat))))
-	 tests)
-	res)))
-	   
-;; from an archive get a specific path - works ONLY with bup for now
-;;
-(define (archive:bup-get-data archive-command run-id-in run-name-in tests rp-mutex bup-mutex)
-  (if (null? tests)
-      (debug:print-info 0 *default-log-port* "get-data called with no matching tests to operate on.")
-      
-      (let* ((bup-exe      (or (configf:lookup *configdat* "archive" "bup") "bup"))
-	     (linktree     (common:get-linktree)) ;; (configf:lookup *configdat* "setup" "linktree")))
-	     ;; (test-dat     (common:get-youngest-test tests))
-	     (destpath     (args:get-arg "-dest")))
-	(cond
-	 ((null? tests)
-	  (debug:print-error 0 *default-log-port*
-			     "No test matching provided target, runname pattern and test pattern found."))
-	 ((file-exists? destpath)
-	  (debug:print-error 0 *default-log-port*
-			     "Destination path alread exists! Please remove it before running get."))
-	 (else
-	  (let loop ((rem-tests tests))
-	    (let* ((test-dat          (common:get-youngest-test rem-tests))
-		   (item-path         (db:test-get-item-path test-dat))
-		   (test-name         (db:test-get-testname  test-dat))
-		   (test-id           (db:test-get-id        test-dat))
-		   (run-id            (db:test-get-run_id    test-dat))
-		   (run-name          (rmt:get-run-name-from-id run-id))
-		   (keyvals           (rmt:get-key-val-pairs run-id))
-		   (target            (string-intersperse (map cadr keyvals) "/"))
-		   
-		   (toplevel/children (and (db:test-get-is-toplevel test-dat)
-					   (> (rmt:test-toplevel-num-items run-id test-name) 0)))
-		   (test-partial-path (conc target "/" run-name "/"
-					    (db:test-make-full-name test-name item-path)))
-		   ;; note the trailing slash to get the dir inspite of it being a link
-		   (test-path         (conc linktree "/" test-partial-path))
-		   (archive-block-id        (db:test-get-archived test-dat))
-		   (archive-block-info      (rmt:test-get-archive-block-info archive-block-id))
-		   (archive-path            (if (vector? archive-block-info)
-						(vector-ref archive-block-info 2)
-						#f))
-		   (archive-internal-path   (conc (common:get-testsuite-name) "-" run-id
-						  "/latest/" test-partial-path))
-		   (include-paths           (args:get-arg "-include"))
-		   (exclude-pattern         (args:get-arg "-exclude-rx"))
-		   (exclude-file            (args:get-arg "-exclude-rx-from")))
-	      
-	      (if (and archive-path ;; no point in proceeding if there is no actual archive
-		       (not toplevel/children))
-		  (begin
-		    (let* ((bup-restore-params (append (list "-d" archive-path "restore" "-C" (or destpath "data"))
-						       ;; " " ;; What is the empty string for?
-						       (if include-paths
-							   (map (lambda (p)
-								  (conc archive-internal-path "/" p))
-								(string-split include-paths ","))
-							   (list archive-internal-path)))))
-		      (debug:print-info 0 *default-log-port* "Restoring archived data to " (or destpath "data")
-					" from archive in " archive-path " ... " archive-internal-path)
-		      (run-n-wait bup-exe params: bup-restore-params print-cmd: #t)))
-		  (let ((new-rem-tests (filter (lambda (tdat)
-						 (or (not (eq? (db:test-get-id tdat) test-id))
-						     (not (eq? (db:test-get-run_id tdat) run-id))))
-					       rem-tests) ))
-		    (debug:print-info 0 *default-log-port*
-				      "No archive path in the record for run-id=" run-id
-				      " test-id=" test-id ", skipping.")
-		    (if (null? new-rem-tests)
-			(begin
-			  (debug:print-info 0 *default-log-port* "No archives found for " target "/" run-name "...")
-			  #f)
-			(loop new-rem-tests)))))))))))
-  

ADDED   archivemod.scm
Index: archivemod.scm
==================================================================
--- /dev/null
+++ archivemod.scm
@@ -0,0 +1,713 @@
+
+;;======================================================================
+;; Copyright 2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
+
+;;======================================================================
+
+(declare (unit archivemod))
+(declare (uses debugprint))
+(declare (uses commonmod))
+(declare (uses configfmod))
+(declare (uses mtargs))
+(declare (uses mtver))
+;; (declare (uses csv-xml))
+;; (declare (uses keysmod))
+(declare (uses mtmod))
+(declare (uses dbmod))
+(declare (uses rmtmod))
+(declare (uses launchmod))
+(declare (uses processmod))
+(declare (uses servermod))
+
+(module archivemod
+	*
+	
+(import scheme
+	(prefix sqlite3 sqlite3:)
+	chicken.base
+	chicken.condition
+	chicken.file
+	chicken.file.posix
+	chicken.format
+	chicken.io
+	chicken.pathname
+	chicken.port
+	chicken.pretty-print
+	chicken.process
+	chicken.process-context
+	chicken.process-context.posix
+	chicken.sort
+	chicken.string
+	chicken.time
+	chicken.time.posix
+	system-information
+	
+	(prefix base64 base64:)
+;; 	csv-xml
+	directory-utils
+	matchable
+	regex
+	s11n
+	srfi-1
+	srfi-13
+	srfi-18
+	srfi-69
+	stack
+	typed-records
+	z3
+	md5
+	message-digest
+	
+	(prefix mtargs args:)
+	commonmod
+	configfmod
+	debugprint
+;; 	keysmod
+	mtmod
+	mtver
+	dbmod
+	rmtmod
+	launchmod
+	processmod
+	servermod
+	
+	)
+
+;;  strftime('%m/%d/%Y %H:%M:%S','now','localtime')
+;; 
+;; (use (prefix sqlite3 sqlite3:) srfi-1 posix regex regex-case srfi-69 format md5 message-digest srfi-18)
+;; 
+;; (declare (unit archive))
+;; (declare (uses db))
+;; (declare (uses common))
+;; 
+;; (include "common_records.scm")
+;; (include "db_records.scm")
+;; 
+;;======================================================================
+;; 
+;;======================================================================
+
+;; NOT CURRENTLY USED
+;;
+;; (define (archive:main linktree target runname testname itempath options)
+;;   (let ((testdir (conc linktree "/" target "/" runname "/" testname "/" itempath))
+;; 	(flavor  'plain) ;; type of machine to run jobs on
+;; 	(maxload 1.5)   ;; max allowed load for this work
+;; 	(adisks  (archive:get-archive-disks)))
+;;     ;; get testdir size
+;;     ;;   - hand off du to job mgr
+;;     (if (and (common:file-exists? testdir)
+;; 	     (file-writable? testdir))
+;; 	(let* ((dused  (jobrunner:run-job 
+;; 			flavor  ;; machine type
+;; 			maxload ;; max allowed load
+;; 			'()     ;; prevars - environment vars to set for the job
+;; 			common:get-disk-space-used  ;; if a proc call it, if a string it is a unix command
+;; 			(list testdir)))
+;; 	       (apath  (archive:get-archive testname itempath dused)))
+;; 	  (jobrunner:run-job
+;; 	   flavor
+;; 	   maxload
+;; 	   '()
+;; 	   archive:run-bup
+;; 	   (list testdir apath))))))
+	  
+;; Get archive disks from megatest.config
+;;
+(define (archive:get-archive-disks)
+  (let ((section (configf:get-section *configdat* "archive-disks")))
+    (if section
+	section
+	'())))
+
+;; look for the best candidate archive area, else create new 
+;; area
+;;
+(define (archive:get-archive testname itempath dused)
+  ;; look up in archive_allocations if there is a pre-used archive
+  ;; with adequate diskspace
+  ;;
+  (let* ((existing-blocks (rmt:archive-get-allocations testname itempath dused))
+	 (candidate-disks (map (lambda (block)
+				 (list
+				  (vector-ref block 1)   ;; archive-area-name
+				  (vector-ref block 2))) ;; disk-path
+			       existing-blocks)))
+    (or (common:get-disk-with-most-free-space candidate-disks dused)
+	(archive:allocate-new-archive-block #f #f #f)))) ;; BROKEN. testname itempath))))
+
+;; allocate a new archive area
+;;
+(define (archive:allocate-new-archive-block blockid-cache run-area-home testsuite-name dneeded target run-name test-name)
+  (let ((key (conc testsuite-name "/" target "/" run-name "/" test-name)))
+    (if (hash-table-exists? blockid-cache key)
+	(hash-table-ref blockid-cache key)
+	(let* ((pscript     (configf:lookup *configdat* "archive" "pathscript"))
+	       (pscript-cmd (conc pscript " " testsuite-name " " target " " run-name " " test-name))
+	       (apath       (if pscript
+				(handle-exceptions
+				 exn
+				 (begin
+				   (debug:print 0 *default-log-port* "ERROR: script \"" pscript-cmd "\" failed to run properly. exn=" exn)
+				   (exit 1))
+				 (with-input-from-pipe
+				  pscript-cmd
+				  read-line))
+				#f)) ;; this is the user-calculated archive path
+	       (adisks    (archive:get-archive-disks))
+	       (best-disk (common:get-disk-with-most-free-space adisks dneeded)))
+	  (if best-disk
+	      (let* ((bdisk-name    (car best-disk))
+		     (bdisk-path    (cdr best-disk))
+		     (area-key      (substring (message-digest-string (md5-primitive) run-area-home) 0 5))
+		     (bdisk-id      (rmt:archive-register-disk bdisk-name bdisk-path (get-df bdisk-path)))
+		     (archive-name  (if apath
+					apath
+					(let ((sec (current-seconds)))
+					  (conc (time->string (seconds->local-time sec) "%Y")
+						"_q" (seconds->quarter sec) "/"
+						testsuite-name "_" area-key))))
+		     (archive-path  (conc bdisk-path "/" archive-name))
+		     (block-id      (rmt:archive-register-block-name bdisk-id archive-path)))
+		;;   (allocation-id (rmt:archive-allocate-testsuite/area-to-block block-id testsuite-name area-key)))
+		(if block-id ;; (and block-id allocation-id)
+		    (let ((res (cons block-id archive-path)))
+		      (hash-table-set! blockid-cache key res)
+		      res)
+		    (begin
+		      (debug:print 0 *default-log-port* "WARNING: no disk found for " target ", " run-name ", " test-name ",  archive-path=" archive-path)
+		      #f)))
+	      (begin
+		(debug:print 0 *default-log-port* "WARNING: no disk found for " target ", " run-name ", " test-name )
+		#f)))))) ;; no best disk found
+
+;; archive - run bup
+;;
+;; 1. create the bup dir if not exists
+;; 2. start the du of each directory
+;; 3. gen index
+;; 4. save
+;;
+(define (archive:run-bup archive-command run-id run-name tests rp-mutex bup-mutex)
+  ;; move the getting of archive space down into the below block so that a single run can 
+  ;; allocate as needed should a disk fill up
+  ;;
+  (let* ((blockid-cache  (make-hash-table))
+	 (tsname         (common:get-area-name))
+         (target         (string-intersperse (map cadr (rmt:get-key-val-pairs run-id)) "/"))
+	 (min-space      (string->number (or (configf:lookup *configdat* "archive" "minspace") "1000")))
+	 (arch-groups    (make-hash-table)) ;; archive groups, each corrosponds to a bup area
+	 (disk-groups    (make-hash-table)) ;; 
+	 (test-groups    (make-hash-table)) ;; these two (disk and test groups) could be combined nicely
+	 (test-dirs      (make-hash-table))
+	 (bup-exe        (or (configf:lookup *configdat* "archive" "bup") "bup"))
+	 (compress       (or (configf:lookup *configdat* "archive" "compress") "9"))
+	 (linktree       (common:get-linktree)) ;; (configf:lookup *configdat* "setup" "linktree")))
+	 (archiver       (let ((s (configf:lookup *configdat* "archive" "archiver")))
+			   (if s (string->symbol s) 'bup)))
+	 (archiver-cmd   (case archiver
+			   ((tar) "tar cfj ARCHIVE_NAME.tar.bz2 ")
+			   ((7z)  " 7z u -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on ARCHIVE_NAME.7z ")
+			   (else #f)))
+         (src-archive-linktree (rmt:get-var "src-archive-linktree"))  
+	 (print-prefix      "Running: ") ;; change to #f to turn off printing
+	 (preclean-spec  (configf:get-section *configdat* "archive-preclean")))
+
+     (if (or (not src-archive-linktree) (not (equal? src-archive-linktree linktree)))      
+         (rmt:set-var "src-archive-linktree"  linktree))
+    ;;     (tests:match patt testname itempath)
+    
+    ;; from the test info bin the path to the test by stem
+    ;;
+    (for-each
+     (lambda (test-dat)
+       (let* ((item-path         (db:test-get-item-path test-dat))
+	      (test-name         (db:test-get-testname  test-dat))
+	      (test-id           (db:test-get-id        test-dat))
+	      (run-id            (db:test-get-run_id    test-dat))
+	      	      
+	      (toplevel/children (and (db:test-get-is-toplevel test-dat)
+				      (> (rmt:test-toplevel-num-items run-id test-name) 0)))
+	      (test-partial-path (conc target "/" run-name "/" (db:test-make-full-name test-name item-path)))
+	      ;; note the trailing slash to get the dir inspite of it being a link
+	      (test-path         (conc linktree "/" test-partial-path))
+	      (mutex-lock! rp-mutex)
+	      (test-physical-path (if (common:file-exists? test-path) 
+				      (common:real-path test-path)
+				      #f))
+	      (mutex-unlock! rp-mutex)
+	      (partial-path-index (if test-physical-path (substring-index test-partial-path test-physical-path) #f))
+	      (test-base         (if (and partial-path-index 
+					  test-physical-path )
+				     (substring test-physical-path
+						0
+						partial-path-index)
+				     #f))
+	      ;; we need our archive dir checked for every test to enable folks who want to store other ways.
+	      (archive-info (archive:allocate-new-archive-block blockid-cache *toppath* tsname min-space target run-name test-name))
+	      (archive-dir  (if archive-info (cdr archive-info) #f))
+	      (archive-id   (if archive-info (car archive-info) -1)))
+	 
+	 (if (not archive-dir) ;; no archive disk found, this is fatal
+	     (begin
+	       (debug:print 0 *default-log-port* "FATAL: No archive disks found. Please add disks with at least "
+			    min-space " MB space to the [archive-disks] section of megatest.config")
+	       (debug:print 0 *default-log-port* "       use [archive] minspace to specify minimum available space")
+	       (debug:print 0 *default-log-port* "   disks: "
+			    (string-intersperse (map cadr (archive:get-archive-disks)) "\n         "))
+	       (exit 1))
+	     (debug:print-info 0 *default-log-port* "Using path " archive-dir " for archiving test " test-path))
+
+	 ;; preclean the test directory per the spec if provided
+	 (if (not (null? preclean-spec)) ;; we've been asked to preclean before archiving
+	     (let loop ((spec (car preclean-spec))
+			(tail (cdr preclean-spec)))
+	       (if (> (length spec) 1)
+		   (let ((testspec (car spec))
+			 (rules    (cadr spec)))
+		     (if (tests:match testspec test-name item-path)
+			 (begin
+			   (debug:print 0 *default-log-port* "INFO: cleanup requested for " test-physical-path)
+			   (common:dir-clean-up test-physical-path rules remove-empty: #t))
+			 (if (not (null? tail))
+			     (loop (car tail)(cdr tail)))))
+		   (begin
+		     (debug:print 0 *default-log-port* "ERROR: bad spec line in [archive-preclean] section. \"" spec "\"")
+		     (if (not (null? tail))(loop (car tail)(cdr tail)))))))
+	 (cond
+	  (toplevel/children
+	   (debug:print 0 *default-log-port* "WARNING: cannot archive " test-name " with id " test-id
+			" as it is a toplevel test with children"))
+	  ((not (common:file-exists? test-path))
+	   (debug:print 0 *default-log-port* "WARNING: Cannot archive " test-name "/" item-path
+			" as path " test-path " does not exist"))
+	  (else
+	   (debug:print 2 *default-log-port*
+			"From test-dat=" test-dat " derived the following:\n"
+			"test-partial-path  = " test-partial-path "\n"
+			"test-path          = " test-path "\n"
+			"test-physical-path = " test-physical-path "\n"
+			"partial-path-index = " partial-path-index "\n"
+			"test-base          = " test-base)
+	   (hash-table-set! disk-groups test-base
+			    (cons test-physical-path (hash-table-ref/default disk-groups test-base '())))
+	   (hash-table-set! test-groups test-base
+			    (cons test-dat (hash-table-ref/default test-groups test-base '())))
+	   (hash-table-set! arch-groups test-base
+			    (cons archive-info (hash-table-ref/default arch-groups test-base '())))
+	   (hash-table-set! test-dirs test-id test-path)))))
+	   ;; test-path))))
+     tests)
+    (debug:print 0 *default-log-port* "INFO: DISK GROUPS=" (hash-table->alist disk-groups))
+    ;; for each disk-group, initialize the bup area if needed
+    (for-each 
+     (lambda (test-base)
+       (let* ((disk-group (hash-table-ref disk-groups test-base))
+	      (arch-group (hash-table-ref arch-groups test-base))
+	      (arch-info  (car arch-group)) ;; don't know yet how this will work, can I get more than one possibility?
+	      (archive-id    (car arch-info))
+	      (archive-dir   (cdr arch-info)))
+	 (debug:print 0 *default-log-port* "Processing disk-group " test-base)
+	 (let* ((test-paths-in (hash-table-ref disk-groups test-base))
+		(test-paths    (if (args:get-arg "-include")
+				   (let ((subpaths (string-split (args:get-arg "-include") ",")))
+				     (apply append
+					    (map (lambda (p)
+						   (map (lambda (subp)
+							  (conc p "/" subp))
+							subpaths))
+						 test-paths-in)))
+				   test-paths-in)))
+	   (if (not (common:file-exists? archive-dir))
+	       (create-directory archive-dir #t))
+	   (case archiver
+	     ((bup) ;; Archive using bup
+	      (let* ((bup-init-params  (list "-d" archive-dir "init"))
+		     (bup-index-params (append (list "-d" archive-dir "index") test-paths))
+		     (bup-save-params  (append (list "-d" archive-dir "save" ;; (conc "--strip-path=" linktree)
+						     (conc "-" compress) ;; or (conc "--compress=" compress)
+						     "-n" (conc (common:get-area-name) "-"(string-substitute "/" "-" target " "))
+						     (conc "--strip-path=" (conc test-base target "/" )) ;; if we push to the directory do we need this?
+						     )
+					       test-paths)))
+		(if (not (common:file-exists? (conc archive-dir "/HEAD")))
+		    (begin
+		      ;; replace this with jobrunner stuff enventually
+		      (debug:print-info 2 *default-log-port* "Init bup in " archive-dir)
+		      ;; (mutex-lock! bup-mutex)
+		      (let-values (((pid-val exit-status exit-code) (run-n-wait bup-exe params: bup-init-params print-cmd: print-prefix)))
+                        (if (not (eq? exit-code 0))
+                              (begin    
+                              (debug:print-error 0 *default-log-port* "There was an error initializing bup. Archive failed.")
+                              (exit 1))))
+		      ;; (mutex-unlock! bup-mutex)
+		      ))
+		(debug:print-info 2 *default-log-port* "Indexing data to be archived")
+		;; (mutex-lock! bup-mutex)
+		(let-values (((pid-val exit-status exit-code) (run-n-wait bup-exe params: bup-index-params print-cmd: print-prefix)))
+                   (if (not (eq? exit-code 0))
+                              (begin    
+                              (debug:print-error 0 *default-log-port* "There was an error Indexing bup. Archive failed.")
+                              (exit 1))))
+		(debug:print-info 2 *default-log-port* "Archiving data with bup")
+		(let-values (((pid-val exit-status exit-code) (run-n-wait bup-exe params: bup-save-params print-cmd: print-prefix)))
+                     (if (not (eq? exit-code 0))
+                              (begin    
+                              (debug:print-error 0 *default-log-port* "There was an archiving data with bup. Archive failed.")
+                              (exit 1))))))
+	     ((7z tar)
+	      (for-each
+	       (lambda (test-dat)
+		 (let* ((test-id           (db:test-get-id        test-dat))
+			(test-name         (db:test-get-testname  test-dat))
+			(item-path         (db:test-get-item-path test-dat))
+			(test-full-name    (db:test-make-full-name test-name item-path))
+			(run-id            (db:test-get-run_id    test-dat))
+			(target            (string-intersperse (map cadr (rmt:get-key-val-pairs run-id)) "/"))
+			(run-name          (rmt:get-run-name-from-id run-id))
+			(source-dir        (hash-table-ref test-dirs test-id)) ;; (conc test-base "/" test-name "/" item-path))
+			(target-dir        (string-substitute "/$" "" (conc archive-dir "/" target "/" run-name "/" test-full-name))))
+		   ;; create the test and item-path levels under archive-dir
+		   (create-directory (pathname-directory target-dir) #t)
+		   (run-n-wait
+		    (conc
+		     (string-substitute "ARCHIVE_NAME" target-dir archiver-cmd) " "
+		     "."
+		     )
+		    print-cmd: print-prefix
+		    run-dir: source-dir)))
+	       (hash-table-ref test-groups test-base))))
+	   ;; (mutex-unlock! bup-mutex)
+	   (for-each
+	    (lambda (test-dat)
+	      (let ((test-id           (db:test-get-id        test-dat))
+		    (run-id            (db:test-get-run_id    test-dat)))
+		(rmt:test-set-archive-block-id run-id test-id archive-id)
+		(if (member (symbol->string archive-command) '("save-remove"))
+                    (begin 
+                     (debug:print-info 0 *default-log-port* "remove testdat")
+		    (runs:remove-test-directory test-dat 'archive-remove)))))
+	    (hash-table-ref test-groups test-base)))))
+       (hash-table-keys disk-groups))
+    #t))
+
+(define (archive:megatest-db target-patt run-patt)
+ (let* ((blockid-cache  (make-hash-table))
+        (tsname         (common:get-area-name))
+        (min-space      (string->number (or (configf:lookup *configdat* "archive" "minspace") "1000")))
+        (bup-exe        (or (configf:lookup *configdat* "archive" "bup") "bup"))
+	(compress       (or (configf:lookup *configdat* "archive" "compress") "9"))
+        (archiver       (let ((s (configf:lookup *configdat* "archive" "archiver")))
+			   (if s (string->symbol s) 'bup)))
+        (rsync-exe (or (configf:lookup *configdat* "archive" "rsync") "rsync"))   
+        (print-prefix      "Running: ") 
+        (archive-info (archive:allocate-new-archive-block blockid-cache *toppath* tsname min-space target-patt run-patt "megatest-db"))
+	(archive-dir  (if archive-info (cdr archive-info) #f))
+	(archive-id   (if archive-info (car archive-info) -1))
+   (home-host (get-host-name)) ;; common:get-homehost)) ;; TODO: Fix this.
+        (archive-time (seconds->std-time-str (current-seconds)))
+        (archive-staging-db (conc *toppath* "/.db-snapshot/archive_" archive-time))
+        (tmp-db-path (conc (common:get-db-tmp-area) "/megatest.db"))
+        (dbfile             (conc  archive-staging-db "/megatest.db"))) 
+        (create-directory archive-staging-db #t)
+        (let-values (((pid-val exit-status exit-code) (run-n-wait rsync-exe params: (list "-v" (conc (car home-host) ":"tmp-db-path) archive-staging-db) print-cmd: print-prefix)))
+            (if (eq? exit-code 0)   
+              (case archiver
+	        ((bup) ;; Archive using bup
+	          (let* ((bup-init-params  (list "-d" archive-dir "init"))
+		         (bup-index-params (list "-d" archive-dir "index" archive-staging-db))
+		         (bup-save-params  (list "-d" archive-dir "save" ;; (conc "--strip-path=" linktree)
+						     (conc "-" compress) ;; or (conc "--compress=" compress)
+						     "-n" (conc tsname "-megatest-db" )
+						     (conc "--strip-path=" archive-staging-db ) ;; if we push to the directory do we need this?
+						     dbfile)))
+                    (if (not (common:file-exists? (conc archive-dir "/HEAD")))
+		      (begin
+		        ;; replace this with jobrunner stuff enventually
+		        (debug:print-info 2 *default-log-port* "Init bup in " archive-dir)
+		         (let-values (((pid-val exit-status exit-code)(run-n-wait bup-exe params: bup-init-params print-cmd: print-prefix)))
+                          (if (not (eq? exit-code 0))
+                              (begin    
+                              (debug:print-error 0 *default-log-port* "There was an error initializing bup. Archive failed.")
+                              (exit 1))))))
+		     (debug:print-info 2 *default-log-port* "Indexing data to be archived")
+		     (let-values (((pid-val exit-status exit-code) (run-n-wait bup-exe params: bup-index-params print-cmd: print-prefix)))
+                        (if (not (eq? exit-code 0))
+                              (begin    
+                              (debug:print-error 0 *default-log-port* "There was an error Indexing bup. Archive failed.")
+                              (exit 1))))
+		     (debug:print-info 2 *default-log-port* "Archiving data with bup")
+		     (let-values (((pid-val exit-status exit-code) (run-n-wait bup-exe params: bup-save-params print-cmd: print-prefix)))
+                         (if (not (eq? exit-code 0))
+                              (begin    
+                              (debug:print-error 0 *default-log-port* "There was an error archiving data with bup. Archive failed.")
+                              (exit 1))
+                             (debug:print-info 0 *default-log-port* "To restore megatest.db run megatest -archive replicacte-db -source archive-dir -time-stamp <ts>. Current timestamp: " (seconds->std-time-str (current-seconds))))))) 
+               (else
+                   (debug:print-info 0 *default-log-port* "No support for databse archiving with " archiver)))
+               (debug:print-error 0 *default-log-port* "There was an error rsyncing tmp database")))))
+
+(define (archive:restore-db archive-path ts)
+   (let* ((bup-exe               (or (configf:lookup *configdat* "archive" "bup") "bup"))
+         (archive-internal-path (conc (common:get-area-name) "-megatest-db/" ts "/megatest.db" ))
+         (bup-restore-params  (list "-d" archive-path "restore" "-C" *toppath* archive-internal-path)))
+		 (debug:print-info 2 *default-log-port* "Restoring archived data to " *toppath* " from archive in " archive-path " ... " archive-internal-path)
+		 (run-n-wait bup-exe params: bup-restore-params print-cmd: "Running:"))
+   (sleep 2)
+
+   ;; TODO: restore this functionality
+   
+      #;(db:multi-db-sync 
+       (db:setup #f)
+       'killservers
+       ;'dejunk
+       ;'adj-testids
+       'old2new
+       )
+      (debug:print-info 1 *default-log-port* "dropping triggers to update linktree") 
+      (rmt:drop-all-triggers)
+    (let* ((linktree       (common:get-linktree)) ;; (configf:lookup *configdat* "setup" "linktree")))
+	  (src-archive-linktree (rmt:get-var "src-archive-linktree")))
+        (if (not (equal? src-archive-linktree linktree))
+           (rmt:update-tesdata-on-repilcate-db src-archive-linktree linktree))
+              (debug:print-info 1 *default-log-port* "creating triggers after updating linktree")   
+       (rmt:create-all-triggers)
+))  
+
+(define (archive:ls->list  bup-exe archive-dir internal-path)
+  (let ((cmd (conc bup-exe " -d " archive-dir  " ls -l " internal-path "| awk '{print $6}' | sort"))
+        (res '()))
+    (debug:print-info 0 *default-log-port* cmd)
+    (handle-exceptions
+     exn
+     #f ;; anything goes wrong - assume the process in NOT running.
+     (with-input-from-pipe 
+      cmd
+      (lambda ()
+	(let* ((inl (read-lines)))
+	  (reverse inl)))))))
+
+(define (time-string->seconds tstr ds-flag)
+ (let* ((atime (string->time tstr "%Y-%m-%d-%H%M%S")))
+       (vector-set! atime 8 ds-flag)
+     (local-time->seconds atime)))
+
+(define (seconds->std-time-str sec)
+  (time->string 
+   (seconds->local-time sec)
+   "%Y-%m-%d-%H%M%S"))
+ 
+
+(define (archive:get-timestamp-dir bup-exe archive-dir testsuite-name target test-partial-path test-last-update)
+    (debug:print-info 0 *default-log-port* "Test last update time:" (seconds->std-time-str test-last-update)) 
+    (let* ((internal-path (conc testsuite-name "-" target))
+           (archive-update-delay (string->number (or (configf:lookup *configdat* "archive" "test-update-delay") "900" )))  
+           (ts-list (archive:ls->list  bup-exe archive-dir internal-path))
+           (ds-flag (vector-ref (seconds->local-time) 8)))
+           (let loop ((hed (car ts-list))
+                       (tail (cdr ts-list)))
+                   (if (and (null? tail) (equal? hed "latest"))
+                        #f
+                    (if (and (not (null? tail)) (equal? hed "latest"))
+                        (loop (car tail) (cdr tail))
+                  (let* ((archive-seconds (time-string->seconds hed ds-flag)))
+                    (if (< (abs (- archive-seconds test-last-update)) archive-update-delay)
+                    (let* ((test-list (archive:ls->list  bup-exe archive-dir (conc internal-path "/" hed "/" test-partial-path))))
+                           (if (> (length test-list) 0)
+                               hed
+                               (if (not (null? tail)) 
+                                 (loop (car tail) (cdr tail))
+                                 #f)))
+                       (if (null? tail)
+                          #f
+                          (loop (car tail) (cdr tail))))))))))
+
+(define (archive:bup-restore archive-command run-id run-name tests rp-mutex bup-mutex)  ;; move the getting of archive space down into the below block so that a single run can 
+  ;; allocate as needed should a disk fill up
+  ;;
+  (let* ((bup-exe      (or (configf:lookup *configdat* "archive" "bup") "bup"))
+	 (linktree     (common:get-linktree))) ;; (configf:lookup *configdat* "setup" "linktree")))
+
+    ;; from the test info bin the path to the test by stem
+    ;;
+    (for-each
+     (lambda (test-dat)
+       ;; When restoring test-dat will initially contain an old and invalid path to the test
+       (let* ((best-disk         (get-best-disk *configdat* #f)) ;; BUG: get the testconfig and use it here. Otherwise data pulled out of archive could end up on the wrong kind of disk.
+	      (item-path         (db:test-get-item-path test-dat))
+	      (test-name         (db:test-get-testname  test-dat))
+	      (test-id           (db:test-get-id        test-dat))
+	      (run-id            (db:test-get-run_id    test-dat))
+	      (keyvals           (rmt:get-key-val-pairs run-id))
+	      (target            (string-intersperse (map cadr keyvals) "/"))
+	      
+	      (toplevel/children (and (db:test-get-is-toplevel test-dat)
+				      (> (rmt:test-toplevel-num-items run-id test-name) 0)))
+	      (test-partial-path (conc  run-name "/" (db:test-make-full-name test-name item-path)))
+	      ;; note the trailing slash to get the dir inspite of it being a link
+	      (test-path         (conc linktree "/" test-partial-path))
+	      ;; if the old path was not deleted then prev-test-physical-path will end up pointing to a real directory
+	      (mutex-lock! rp-mutex)
+	      (prev-test-physical-path (if (common:file-exists? test-path)
+					   ;; (read-symbolic-link test-path #t)
+					   (common:real-path test-path)
+					   #f))
+	      (mutex-unlock! rp-mutex)
+	      (new-test-physical-path  (conc best-disk "/" test-partial-path))
+	      (archive-block-id        (db:test-get-archived test-dat))
+              (test-last-update        (db:test-get-last_update test-dat))
+	      (archive-block-info      (rmt:test-get-archive-block-info archive-block-id))
+	      (archive-path            (if (vector? archive-block-info)
+					   (vector-ref archive-block-info 2) ;; look in db.scm for test-get-archive-block-info for the vector record info
+					   #f)) ;; no archive found?
+              (archive-timestamp-dir   (if archive-path (archive:get-timestamp-dir bup-exe archive-path (common:get-area-name) (string-substitute "/" "-" target " ") test-partial-path test-last-update) #f))  
+	      (archive-internal-path   (conc (common:get-area-name) "-" (string-substitute "/" "-" target " ") "/" archive-timestamp-dir "/" test-partial-path))
+	      (include-paths           (args:get-arg "-include"))
+	      (exclude-pattern         (args:get-arg "-exclude-rx"))
+	      (exclude-file            (args:get-arg "-exclude-rx-from")))
+	 (if (not archive-timestamp-dir)
+               (debug:print-error 0 *default-log-port* "Archive not found for testsuite" (common:get-area-name) " run/test/itempath" test-partial-path)
+         (begin    
+	 ;; some sanity checks, move an existing path out of the way - iif it is not a toplevel with children
+         (debug:print-info 0 *default-log-port* "Archive time: " archive-timestamp-dir)
+	 (if (and (not toplevel/children)  ;; special handling needed for toplevel with children
+		  prev-test-physical-path
+		  (common:file-exists? prev-test-physical-path)) ;; what to do? abort or clean up or link it in?
+	     (let* ((base (pathname-directory prev-test-physical-path))
+		    (dirn (pathname-file      prev-test-physical-path))
+		    (newn (conc base "/." dirn)))
+	       (debug:print-error 0 *default-log-port* "the old directory " prev-test-physical-path ", still exists! Moving it to " newn)
+	       (rename-file prev-test-physical-path newn)))
+
+	 (if (and archive-path ;; no point in proceeding if there is no actual archive
+		  (not toplevel/children))
+	     (begin
+	       ;; CREATE WORK AREA
+	       ;; test-src-path == #f     ==> don't copy in data from tests directory
+	       ;; itemdat       == string ==> use directly
+	       (create-work-area run-id run-name keyvals test-id #f best-disk test-name item-path) ;; #!key (remtries 2))
+	       ;; 1. Get the block id from the test info
+	       ;; 2. Get the block data given the block id
+	       ;; 3. Construct the paths etc. for the following command:
+	       ;; bup -d /tmp/matt/adisk1/2015_q1/fullrun_e1a40/ restore -C /tmp/seeme fullrun-30/latest/ubuntu/nfs/none/w02.1.20.54_b/
+	       ;; DO BUP RESTORE
+	       (let* ((new-test-dat        (rmt:get-test-info-by-id run-id test-id))
+		      (new-test-path       (if (vector? new-test-dat )
+					       (db:test-get-rundir new-test-dat)
+					       (begin
+						 (debug:print-error 0 *default-log-port* "unable to get data for run-id=" run-id ", test-id=" test-id)
+						 (exit 1))))
+		      ;; new-test-path won't work - must use best-disk instead? Nope, new-test-path but tack on /..
+		      (bup-restore-params  (list "-d" archive-path "restore" "-C" (conc new-test-path "/..") archive-internal-path)))
+		 (debug:print-info 0 *default-log-port* "Restoring archived data to " new-test-physical-path " from archive in " archive-path " ... " archive-internal-path)
+                 (debug:print-info 0 *default-log-port* bup-exe " " (string-join  bup-restore-params " "))
+		 ;; (mutex-lock! bup-mutex)
+		 (run-n-wait bup-exe params: bup-restore-params print-cmd: #f)
+		 ;; (mutex-unlock! bup-mutex)
+		 (mt:test-set-state-status-by-id run-id test-id "COMPLETED" #f #f)))
+	     (debug:print-error 0 *default-log-port* "No archive path in the record for run-id=" run-id " test-id=" test-id))))))
+     (filter vector? tests))))
+
+(define (common:get-youngest-test tests)
+  (if (null? tests)
+      #f
+      (let ((res #f))
+	(for-each
+	 (lambda (test-dat)
+	   (let ((event-time (db:test-get-event_time test-dat)))
+	     (if (or (not res)
+		     (> event-time (db:test-get-event_time res)))
+		 (set! res test-dat))))
+	 tests)
+	res)))
+	   
+;; from an archive get a specific path - works ONLY with bup for now
+;;
+(define (archive:bup-get-data archive-command run-id-in run-name-in tests rp-mutex bup-mutex)
+  (if (null? tests)
+      (debug:print-info 0 *default-log-port* "get-data called with no matching tests to operate on.")
+      
+      (let* ((bup-exe      (or (configf:lookup *configdat* "archive" "bup") "bup"))
+	     (linktree     (common:get-linktree)) ;; (configf:lookup *configdat* "setup" "linktree")))
+	     ;; (test-dat     (common:get-youngest-test tests))
+	     (destpath     (args:get-arg "-dest")))
+	(cond
+	 ((null? tests)
+	  (debug:print-error 0 *default-log-port*
+			     "No test matching provided target, runname pattern and test pattern found."))
+	 ((file-exists? destpath)
+	  (debug:print-error 0 *default-log-port*
+			     "Destination path alread exists! Please remove it before running get."))
+	 (else
+	  (let loop ((rem-tests tests))
+	    (let* ((test-dat          (common:get-youngest-test rem-tests))
+		   (item-path         (db:test-get-item-path test-dat))
+		   (test-name         (db:test-get-testname  test-dat))
+		   (test-id           (db:test-get-id        test-dat))
+		   (run-id            (db:test-get-run_id    test-dat))
+		   (run-name          (rmt:get-run-name-from-id run-id))
+		   (keyvals           (rmt:get-key-val-pairs run-id))
+		   (target            (string-intersperse (map cadr keyvals) "/"))
+		   
+		   (toplevel/children (and (db:test-get-is-toplevel test-dat)
+					   (> (rmt:test-toplevel-num-items run-id test-name) 0)))
+		   (test-partial-path (conc target "/" run-name "/"
+					    (db:test-make-full-name test-name item-path)))
+		   ;; note the trailing slash to get the dir inspite of it being a link
+		   (test-path         (conc linktree "/" test-partial-path))
+		   (archive-block-id        (db:test-get-archived test-dat))
+		   (archive-block-info      (rmt:test-get-archive-block-info archive-block-id))
+		   (archive-path            (if (vector? archive-block-info)
+						(vector-ref archive-block-info 2)
+						#f))
+		   (archive-internal-path   (conc (common:get-area-name) "-" run-id
+						  "/latest/" test-partial-path))
+		   (include-paths           (args:get-arg "-include"))
+		   (exclude-pattern         (args:get-arg "-exclude-rx"))
+		   (exclude-file            (args:get-arg "-exclude-rx-from")))
+	      
+	      (if (and archive-path ;; no point in proceeding if there is no actual archive
+		       (not toplevel/children))
+		  (begin
+		    (let* ((bup-restore-params (append (list "-d" archive-path "restore" "-C" (or destpath "data"))
+						       ;; " " ;; What is the empty string for?
+						       (if include-paths
+							   (map (lambda (p)
+								  (conc archive-internal-path "/" p))
+								(string-split include-paths ","))
+							   (list archive-internal-path)))))
+		      (debug:print-info 0 *default-log-port* "Restoring archived data to " (or destpath "data")
+					" from archive in " archive-path " ... " archive-internal-path)
+		      (run-n-wait bup-exe params: bup-restore-params print-cmd: #t)))
+		  (let ((new-rem-tests (filter (lambda (tdat)
+						 (or (not (eq? (db:test-get-id tdat) test-id))
+						     (not (eq? (db:test-get-run_id tdat) run-id))))
+					       rem-tests) ))
+		    (debug:print-info 0 *default-log-port*
+				      "No archive path in the record for run-id=" run-id
+				      " test-id=" test-id ", skipping.")
+		    (if (null? new-rem-tests)
+			(begin
+			  (debug:print-info 0 *default-log-port* "No archives found for " target "/" run-name "...")
+			  #f)
+			(loop new-rem-tests)))))))))))
+  
+
+
+)

ADDED   attic/mockup-cached-writes.scm
Index: attic/mockup-cached-writes.scm
==================================================================
--- /dev/null
+++ attic/mockup-cached-writes.scm
@@ -0,0 +1,48 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
+;;
+
+
+(define (make-cached-writer the-db)
+  (let ((db    the-db)
+	(queue '()))
+    (lambda (cacheable . qry-params) ;; fn qry
+      (if cacheable
+	  (begin
+	    (set! queue (cons qry-params queue))
+	    (call/cc))
+	  (begin
+	    (print "Starting transaction")
+	    (for-each
+	     (lambda (queue-item)
+	       (let ((fn  (car queue-item))
+		     (qry (cdr queue-item)))
+		 (print "WRITE to " db ": " qry)
+		 )
+	     (reverse queue))
+	    (print "End transaction")
+	    (print "READ from " db ": " qry-params))))))
+
+(define *cw* (make-cached-writer "the db"))
+
+(define (dbcall cacheable query)
+  (*cw* cacheable query))
+
+(dbcall #t "insert abc")
+(dbcall #t "insert def")
+(dbcall #t "insert hij")
+(dbcall #f "select foo")

ADDED   attic/portlogger-example.scm
Index: attic/portlogger-example.scm
==================================================================
--- /dev/null
+++ attic/portlogger-example.scm
@@ -0,0 +1,21 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
+
+
+(declare (uses portlogger))
+
+(print (apply portlogger:main (cdr (argv))))

ADDED   attic/runs-launch-loop-test.scm
Index: attic/runs-launch-loop-test.scm
==================================================================
--- /dev/null
+++ attic/runs-launch-loop-test.scm
@@ -0,0 +1,76 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
+;;
+(use srfi-69)
+
+(define (runs:queue-next-hed tal reg n regful)
+  (if regful
+      (car reg)
+      (car tal)))
+
+(define (runs:queue-next-tal tal reg n regful)
+  (if regful
+      tal
+      (let ((newtal (cdr tal)))
+	(if (null? newtal)
+	    reg
+	    newtal
+	    ))))
+
+(define (runs:queue-next-reg tal reg n regful)
+  (if regful
+      (cdr reg)
+      (if (eq? (length tal) 1)
+	  '()
+	  reg)))
+
+(use trace)
+(trace runs:queue-next-hed
+       runs:queue-next-tal
+       runs:queue-next-reg)
+
+
+(define tests '(1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20))
+
+(define test-registry (make-hash-table))
+
+(define n 3)
+
+(let loop ((hed   (car tests))
+           (tal   (cdr tests))
+           (reg   '()))
+  (let* ((reglen (length reg))
+	 (regful (> reglen n)))
+    (print "hed=" hed ", length reg=" (length reg) ", (> lenreg n)=" (> (length reg) n))
+    (let ((newtal (append tal (list hed)))) ;; used if we are not done with this test
+      (cond
+       ((not (hash-table-ref/default test-registry hed #f))
+	(hash-table-set! test-registry hed #t)
+	(print "Registering #" hed)
+	(if (not (null? tal))
+          (loop (runs:queue-next-hed tal reg n regful)
+                (runs:queue-next-tal tal reg n regful)
+		(let ((newl (append reg (list hed))))
+		  (if regful
+		      (cdr newl)
+		      newl)))))
+       (else
+	(print "Running #" hed)
+	(if (not (null? tal))
+	    (loop (runs:queue-next-hed tal reg n regful)
+		  (runs:queue-next-tal tal reg n regful)
+		  (runs:queue-next-reg tal reg n regful))))))))

ADDED   attic/show-uncalled-procedures.scm
Index: attic/show-uncalled-procedures.scm
==================================================================
--- /dev/null
+++ attic/show-uncalled-procedures.scm
@@ -0,0 +1,30 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
+;;
+(include "codescanlib.scm")
+
+(define (show-danglers)
+  (let* ((all-scm-files (glob "*.scm"))
+         (xref (get-xref all-scm-files))
+         (dangling-procs
+          (map car (filter (lambda (x) (equal? 1 (length x))) xref))))
+    (for-each print dangling-procs) ;; our product.
+    ))
+
+(show-danglers)
+
+    

ADDED   attic/vg-test.scm
Index: attic/vg-test.scm
==================================================================
--- /dev/null
+++ attic/vg-test.scm
@@ -0,0 +1,119 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
+;;
+(use canvas-draw iup foof-loop)
+(import canvas-draw-iup)
+
+(load "vg.scm")
+
+(define numtorun 1000)
+;; (if (> (length (argv)) 1)
+;; 		     (string->number (cadr (argv)))
+;; 		     1000))
+
+ (use trace)
+ ;; (trace 
+ ;;  ;; vg:draw-rect
+ ;;  ;; vg:grow-rect
+ ;;  vg:get-extents-for-objs
+ ;;  vg:components-get-extents
+ ;;  vg:instances-get-extents
+ ;;  vg:get-extents-for-two-rects
+ ;;  canvas-line!)
+
+(define d1 (vg:drawing-new))
+(define l1 (vg:lib-new))
+(define c1 (vg:comp-new))
+(define c2 (vg:comp-new))
+(define bt1 (vg:make-rect-obj 10 40 20 50 text: "A long piece of text" font: "Helvetica, -10"))
+
+(let ((r1 (vg:make-rect-obj 20 20 30 30 text: "r1" font: "Helvetica, -20"))
+      (r2 (vg:make-rect-obj 30 30 60 60 text: "r2" font: "Helvetica, -10"))
+      (t1 (vg:make-text-obj 60 60 "The middle" font: "Helvetica, -10")))
+  (vg:add-objs-to-comp c1 r1 r2 t1 bt1))
+
+(loop ((for x (up-from 0 (to 20))))
+       (loop ((for y (up-from 0 (to 20))))
+	     (vg:add-objs-to-comp c1 (vg:make-rect-obj x y (+ x 5)(+ y 5)))))
+      
+(let ((start (current-seconds)))
+  (let loop ((i 0))
+    (vg:add-obj-to-comp c1 (vg:make-rect-obj 0 0 100 100))
+    (if (< i numtorun)(loop (+ i 1))))
+  (print "Run time: " (- (current-seconds) start)))
+
+(vg:add-obj-to-comp c1 (vg:make-line-obj 0 0 100 100))
+
+;; add the c1 component to lib l1 with name firstcomp
+(vg:add-comp-to-lib l1 "firstcomp" c1)
+(vg:add-comp-to-lib l1 "secondcomp" c2)
+
+;; add the l1 lib to drawing with name firstlib
+(vg:add-lib d1 "firstlib" l1)
+
+;; instantiate firstlib/firstcomp as inst1 in drawing d1 at 0,0
+(vg:instantiate d1 "firstlib" "firstcomp" "inst1" 0 0)
+(vg:instantiate d1 "firstlib" "firstcomp" "inst2" 200 200)
+
+
+;; (vg:drawing-scalex-set! d1 1.1)
+;; (vg:drawing-scaley-set! d1 0.5)
+
+;; (define xtnts (vg:scale-offset-xy 
+;; 	       (vg:component-get-extents c1)
+;; 	       1.1 1.1 -2 -2))
+
+;; get extents of c1 and put a rectange around it
+;;
+(define xtnts (apply vg:grow-rect 10 10 (vg:components-get-extents d1 c1)))
+(vg:add-objs-to-comp c1 (apply vg:make-rect-obj xtnts))
+
+(define bt1xt (vg:obj-get-extents d1 bt1))
+(print "bt1xt: " bt1xt)
+(vg:add-objs-to-comp c1 (apply vg:make-rect-obj bt1xt))
+
+;; get extents of all objects and put rectangle around it
+;;
+(define big-xtnts (vg:instances-get-extents d1))
+(vg:add-objs-to-comp c2 (apply vg:make-rect-obj big-xtnts))
+(vg:instantiate d1 "firstlib" "secondcomp" "inst3" 0 0)
+
+(vg:drawing-scalex-set! d1 1.5)
+(vg:drawing-scaley-set! d1 1.5)
+
+(define cnv #f)
+(define the-cnv (canvas 
+		 #:size "500x400"
+		 #:expand "YES"
+		 #:scrollbar "YES"
+		 #:posx "0.5"
+		 #:posy "0.5"
+		 #:action (make-canvas-action
+			   (lambda (c xadj yadj)
+			     (set! cnv c)))))
+
+(show
+ (dialog
+  (vbox
+   the-cnv)))
+
+(vg:drawing-cnv-set! d1 cnv)
+(vg:draw d1 #t)
+
+;; (canvas-rectangle! cnv  10 100 10 80)
+
+(main-loop)

ADDED   attic/widgets.scm
Index: attic/widgets.scm
==================================================================
--- /dev/null
+++ attic/widgets.scm
@@ -0,0 +1,208 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
+
+(require-library srfi-4 iup)
+(import srfi-4 iup
+	;; iup-pplot
+	iup-glcanvas) ;; iup-web
+
+(define (popup dlg . args)
+  (apply show dlg #:modal? 'yes args)
+  (destroy! dlg))
+
+(define (properties ih)
+  (popup (element-properties-dialog ih))
+  'default)
+
+(define dlg
+  (dialog
+    (vbox
+      (hbox ; headline
+        (fill)
+        (frame (label " Inspect control and dialog classes "
+                      fontsize: 15))
+        (fill)
+        margin: '0x0)
+
+      (label "") 
+      (label "Dialogs" fontsize: 12)
+      (hbox
+        (button "dialog"
+                action: (lambda (self) (properties (dialog (vbox)))))
+        (button "color-dialog"
+                action: (lambda (self) (properties (color-dialog))))
+        (button "file-dialog"
+                action: (lambda (self) (properties (file-dialog))))
+        (button "font-dialog"
+                action: (lambda (self) (properties (font-dialog))))
+        (button "message-dialog"
+                action: (lambda (self) (properties (message-dialog))))
+        (fill)
+        margin: '0x0)
+      (hbox
+        (button "layout-dialog"
+                action: (lambda (self) (properties (layout-dialog))))
+        (button "element-properties-dialog"
+                action: (lambda (self)
+                          (properties
+                            (element-properties-dialog (create 'user)))))
+        (fill)
+        margin: '0x0)
+
+      (label "") 
+      (label "Composition widgets" fontsize: 12)
+      (hbox
+        (button "fill"
+                action: (lambda (self) (properties (fill))))
+        (button "hbox"
+                action: (lambda (self) (properties (hbox))))
+        (button "vbox"
+                action: (lambda (self) (properties (vbox))))
+        (button "zbox"
+                action: (lambda (self) (properties (zbox))))
+        (button "radio"
+                action: (lambda (self) (properties (radio (vbox)))))
+        (button "normalizer"
+                action: (lambda (self) (properties (normalizer))))
+        (button "cbox"
+                action: (lambda (self) (properties (cbox))))
+        (button "sbox"
+                action: (lambda (self) (properties (sbox (vbox)))))
+        (button "split"
+                action: (lambda (self) (properties (split (vbox) (vbox)))))
+        (fill)
+        margin: '0x0)
+
+      (label "") 
+      (label "Standard widgets" fontsize: 12)
+      (hbox
+        (button "button"
+                action: (lambda (self) (properties (button))))
+        (button "canvas"
+                action: (lambda (self) (properties (canvas))))
+        (button "frame"
+                action: (lambda (self) (properties (frame))))
+        (button "label"
+                action: (lambda (self) (properties (label))))
+        (button "listbox"
+                action: (lambda (self) (properties (listbox))))
+        (button "progress-bar"
+                action: (lambda (self) (properties (progress-bar))))
+        (button "spin"
+                action: (lambda (self) (properties (spin))))
+        (fill)
+        margin: '0x0)
+      (hbox
+        (button "tabs"
+                action: (lambda (self) (properties (tabs))))
+        (button "textbox"
+                action: (lambda (self) (properties (textbox))))
+        (button "toggle"
+                action: (lambda (self) (properties (toggle))))
+        (button "treebox"
+                action: (lambda (self) (properties (treebox))))
+        (button "valuator"
+                action: (lambda (self) (properties (valuator ""))))
+        (fill)
+        margin: '0x0)
+
+      (label "") 
+      (label "Additional widgets" fontsize: 12)
+      (hbox
+        (button "cells"
+                action: (lambda (self) (properties (cells))))
+        (button "color-bar"
+                action: (lambda (self) (properties (color-bar))))
+        (button "color-browser"
+                action: (lambda (self) (properties (color-browser))))
+        (button "dial"
+                action: (lambda (self) (properties (dial ""))))
+        (button "matrix"
+                action: (lambda (self) (properties (matrix))))
+        (fill)
+        margin: '0x0)
+      (hbox
+        #;(button "pplot"
+                action: (lambda (self) (properties (pplot))))
+        (button "glcanvas"
+                action: (lambda (self) (properties (glcanvas))))
+        ;; (button "web-browser"
+        ;;         action: (lambda (self) (properties (web-browser))))
+        (fill)
+        margin: '0x0)
+
+      (label "") 
+      (label "Menu widgets" fontsize: 12)
+      (hbox
+        (button "menu"
+                action: (lambda (self) (properties (menu))))
+        (button "menu-item"
+                action: (lambda (self) (properties (menu-item))))
+        (button "menu-separator"
+                action: (lambda (self) (properties (menu-separator))))
+        (fill)
+        margin: '0x0)
+
+      (label "") 
+      (label "Images" fontsize: 12)
+      (hbox
+        (button "image/palette"
+                action: (lambda (self)
+                          (properties
+                            (image/palette 1 1 (u8vector->blob (u8vector 0))))))
+        (button "image/rgb"
+                action: (lambda (self)
+                          (properties
+                            (image/rgb 1 1 (u8vector->blob (u8vector 0))))))
+        (button "image/rgba"
+                action: (lambda (self)
+                          (properties
+                            (image/rgba 1 1 (u8vector->blob (u8vector 0))))))
+        (button "image/file"
+                action: (lambda (self)
+                          (properties
+                            ;; same attributes as image/palette
+                            (image/palette 1 1 (u8vector->blob (u8vector 0))))))
+                            ;; needs a file in current directory
+                            ;(image/file "chicken.ico")))) ; ok
+                            ;(image/file "chicken.png")))) ; doesn't work
+        (fill)
+        margin: '0x0)
+
+      (label "") 
+      (label "Other widgets" fontsize: 12)
+      (hbox
+        (button "clipboard"
+                action: (lambda (self) (properties (clipboard))))
+        (button "timer"
+                action: (lambda (self) (properties (timer))))
+        (button "spinbox"
+                action: (lambda (self) (properties (spinbox (vbox)))))
+        (fill)
+        margin: '0x0)
+
+      (fill)
+      (button "E&xit"
+              expand: 'horizontal
+              action: (lambda (self) 'close))
+      )
+    margin: '15x15
+    title: "Iup inspector"))
+
+(show dlg)
+(main-loop)
+(exit 0)

ADDED   autoload.scm
Index: autoload.scm
==================================================================
--- /dev/null
+++ autoload.scm
@@ -0,0 +1,23 @@
+;;======================================================================
+;; Copyright 2019, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
+
+;;======================================================================
+
+(declare (unit autoload))
+
+(include "autoload/autoload.scm")

ADDED   autoload/autoload.egg
Index: autoload/autoload.egg
==================================================================
--- /dev/null
+++ autoload/autoload.egg
@@ -0,0 +1,5 @@
+((license "BSD")
+ (category lang-exts)
+ (author "Alex Shinn")
+ (synopsis "Load modules lazily")
+ (components (extension autoload)))

ADDED   autoload/autoload.meta
Index: autoload/autoload.meta
==================================================================
--- /dev/null
+++ autoload/autoload.meta
@@ -0,0 +1,9 @@
+;;; autoload.meta -*- Hen -*-
+
+((egg "autoload.egg")
+ (synopsis "Load modules lazily")
+ (category lang-exts)
+ (license "BSD")
+ (author "Alex Shinn")
+ (doc-from-wiki)
+ (files "autoload.meta" "autoload.scm" "autoload.release-info" "autoload.setup"))

ADDED   autoload/autoload.scm
Index: autoload/autoload.scm
==================================================================
--- /dev/null
+++ autoload/autoload.scm
@@ -0,0 +1,93 @@
+;;;; autoload.scm -- load modules lazily
+;;
+;; Copyright (c) 2005-2009 Alex Shinn
+;; All rights reserved.
+;;
+;; BSD-style license: http://www.debian.org/misc/bsd.license
+
+;; Provides an Emacs-style autoload facility which takes the basic form
+;;
+;;   (autoload unit procedure-name ...)
+;;
+;; such that the first time procedure-name is called, it will perform a
+;; runtime require of 'unit and then apply the procedure from the newly
+;; loaded unit to the args it was passed.  Subsequent calls to
+;; procedure-name will thereafter refer to the new procedure and will
+;; thus not incur any overhead.
+;;
+;; You may also specify an alias for the procedure, and a default
+;; procedure if the library can't be loaded:
+;;
+;;   (autoload unit (name alias default) ...)
+;;
+;; In this case, although the procedure name from the unit is "name,"
+;; the form defines the autoload procedure as "alias."
+;;
+;; If the library can't be loaded then an error is signalled, unless
+;; default is given, in which case the values are passed to that.
+;;
+;; Examples:
+;;
+;; ;; load iconv procedures lazily
+;; (autoload iconv iconv iconv-open)
+;;
+;; ;; load some sqlite procedures lazily with "-" names
+;; (autoload sqlite (sqlite:open sqlite-open)
+;;                  (sqlite:execute sqlite-execute))
+;;
+;; ;; load md5 library, falling back on slower scheme version
+;; (autoload scheme-md5 (md5:digest scheme-md5:digest))
+;; (autoload md5 (md5:digest #f scheme-md5:digest))
+
+(module autoload (autoload)
+
+(import scheme (chicken base))
+
+(define-syntax autoload
+  (er-macro-transformer
+   (lambda (expr rename compare)
+     (let ((module (cadr expr))
+           (procs (cddr expr))
+           (_import (rename 'import))
+           (_define (rename 'define))
+           (_let (rename 'let))
+           (_set! (rename 'set!))
+           (_begin (rename 'begin))
+           (_apply (rename 'apply))
+           (_args (rename 'args))
+           (_tmp (rename 'tmp))
+           (_eval (rename 'eval))
+           (_condition-case (rename 'condition-case)))
+       `(,_begin
+         ,@(map
+            (lambda (x)
+              (let* ((x (if (pair? x) x (list x)))
+                     (name (car x))
+                     (full-name
+                      (string->symbol
+                       (string-append (symbol->string module) "#"
+                                      (symbol->string name))))
+                     (alias (or (and (pair? (cdr x)) (cadr x)) name))
+                     (default (and (pair? (cdr x)) (pair? (cddr x)) (caddr x))))
+                (if default
+                    `(,_define (,alias . ,_args)
+                       (,_let ((,_tmp (,_condition-case
+                                       (,_begin
+                                        (,_eval
+                                         (begin (require-library ,module)
+                                                #f))
+                                        (,_eval ',full-name))
+                                        (exn () ,default))))
+                           (,_set! ,alias ,_tmp)
+                           (,_apply ,_tmp ,_args)))
+                    `(,_define (,alias . ,_args)
+                       (,_let ((,_tmp (,_begin
+                                        (,_eval
+                                         (begin (require-library ,module)
+                                                 #f))
+                                        (,_eval ',full-name))))
+                         (,_set! ,alias ,_tmp)
+                         (,_apply ,_tmp ,_args))))))
+            procs))))))
+
+)

ADDED   autoload/autoload.setup
Index: autoload/autoload.setup
==================================================================
--- /dev/null
+++ autoload/autoload.setup
@@ -0,0 +1,7 @@
+
+(compile -s -O2 -j autoload autoload.scm)
+(compile -s -O2 autoload.import.scm)
+
+(install-extension 
+ 'autoload '("autoload.so" "autoload.import.so") 
+ '((version 3.0) (syntax)))

ADDED   bigmod.scm
Index: bigmod.scm
==================================================================
--- /dev/null
+++ bigmod.scm
@@ -0,0 +1,119 @@
+;;======================================================================
+;; Copyright 2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
+
+;;======================================================================
+
+(declare (unit bigmod))
+
+(declare (uses debugprint))
+(declare (uses mtargs))
+(declare (uses commonmod))
+(declare (uses configfmod))
+(declare (uses dbmod))
+(declare (uses rmtmod))
+
+(module bigmod
+	()
+(import scheme
+
+	chicken.base
+	chicken.condition
+	chicken.file
+	chicken.io
+	chicken.pathname
+	chicken.port
+	chicken.pretty-print
+	chicken.process
+	chicken.process-context
+	chicken.sort
+	chicken.string
+	chicken.time
+	chicken.module
+	
+	debugprint
+	(prefix mtargs args:)
+	commonmod
+	configfmod
+;; 	dbmod
+;;	rmtmod
+	
+	(prefix base64 base64:)
+	;; (prefix dbi dbi:)
+	(prefix sqlite3 sqlite3:)
+	(srfi 18)
+	directory-utils
+	format
+	matchable
+	md5
+	message-digest
+	regex
+	regex-case
+	sparse-vectors
+	srfi-1
+	srfi-13
+	srfi-69
+	stack
+	typed-records
+	z3
+	
+	)
+
+(reexport scheme
+
+	  chicken.base
+	  chicken.condition
+	  chicken.file
+	  chicken.io
+	  chicken.pathname
+	  chicken.port
+	  chicken.pretty-print
+	  chicken.process
+	  chicken.process-context
+	  chicken.sort
+	  chicken.string
+	  chicken.time
+	  chicken.module
+	  
+	  (prefix base64 base64:)
+	  ;; (prefix dbi dbi:)
+	  (prefix sqlite3 sqlite3:)
+	  (srfi 18)
+	  directory-utils
+	  format
+	  matchable
+	  md5
+	  message-digest
+	  regex
+	  regex-case
+	  sparse-vectors
+	  srfi-1
+	  srfi-13
+	  srfi-69
+	  stack
+	  typed-records
+	  z3
+
+	  commonmod
+	  configfmod
+	  ;; dbmod
+	  debugprint
+	  ;; rmtmod
+
+	  )
+
+)

DELETED bin/.11/lib/libpangox-1.0.so
Index: bin/.11/lib/libpangox-1.0.so
==================================================================
--- bin/.11/lib/libpangox-1.0.so
+++ /dev/null
cannot compute difference between binary files

DELETED bin/.11/lib/libpangox-1.0.so.0
Index: bin/.11/lib/libpangox-1.0.so.0
==================================================================
--- bin/.11/lib/libpangox-1.0.so.0
+++ /dev/null
cannot compute difference between binary files

DELETED bin/.11/lib/libxcb-xlib.so.0
Index: bin/.11/lib/libxcb-xlib.so.0
==================================================================
--- bin/.11/lib/libxcb-xlib.so.0
+++ /dev/null
cannot compute difference between binary files

ADDED   call-with-environment-variables/call-with-environment-variables-core.scm
Index: call-with-environment-variables/call-with-environment-variables-core.scm
==================================================================
--- /dev/null
+++ call-with-environment-variables/call-with-environment-variables-core.scm
@@ -0,0 +1,25 @@
+(define (call-with-environment-variables variables thunk)
+  @("Sets up environment variable via dynamic-wind which are taken down after thunk."
+    (variables "An alist of the form {{'((\"var\" . \"value\") ...)}}")
+    (thunk "The thunk to execute with a modified environment"))
+  (let ((pre-existing-variables
+         (map (lambda (var-value)
+                (let ((var (car var-value)))
+                  (cons var (get-environment-variable var))))
+              variables)))
+    (dynamic-wind
+        (lambda () (void))
+        (lambda ()
+;;           (use posix)
+          (for-each (lambda (var-value)
+                      (setenv (car var-value) (cdr var-value)))
+            variables)
+          (thunk))
+        (lambda ()
+          (for-each (lambda (var-value)
+                      (let ((var (car var-value))
+                            (value (cdr var-value)))
+                        (if value
+                            (setenv var value)
+                            (unsetenv var))))
+            pre-existing-variables)))))

ADDED   call-with-environment-variables/call-with-environment-variables.meta
Index: call-with-environment-variables/call-with-environment-variables.meta
==================================================================
--- /dev/null
+++ call-with-environment-variables/call-with-environment-variables.meta
@@ -0,0 +1,11 @@
+((synopsis "Set up and take down environment vars")
+ (author "Peter Danenberg")
+ (email "pcd@roxygen.org")
+ (user "klutometis")
+ (repo "https://github.com/klutometis/call-with-environment-variables")
+ (category os)
+ (license "BSD")
+ (depends (hahn "0.9.3")
+          setup-helper)
+ (test-depends test)
+ (foreign-depends))

ADDED   call-with-environment-variables/call-with-environment-variables.release-info
Index: call-with-environment-variables/call-with-environment-variables.release-info
==================================================================
--- /dev/null
+++ call-with-environment-variables/call-with-environment-variables.release-info
@@ -0,0 +1,10 @@
+(repo git "git://github.com/klutometis/{egg-name}.git")
+(uri targz "https://github.com/klutometis/{egg-name}/tarball/{egg-release}")
+(release "0.1")
+(release "0.1.1")
+(release "0.1.2")
+(release "0.1.3")
+(release "0.1.4")
+(release "0.1.5")
+(release "0.1.6")
+(release "0.1.7")

ADDED   call-with-environment-variables/call-with-environment-variables.scm
Index: call-with-environment-variables/call-with-environment-variables.scm
==================================================================
--- /dev/null
+++ call-with-environment-variables/call-with-environment-variables.scm
@@ -0,0 +1,10 @@
+(module
+ call-with-environment-variables
+ (call-with-environment-variables)
+
+ (import scheme
+	 chicken.base
+	 chicken.process-context
+	 )
+
+ (include "call-with-environment-variables/call-with-environment-variables-core.scm"))

ADDED   call-with-environment-variables/call-with-environment-variables.setup
Index: call-with-environment-variables/call-with-environment-variables.setup
==================================================================
--- /dev/null
+++ call-with-environment-variables/call-with-environment-variables.setup
@@ -0,0 +1,10 @@
+(use hahn setup-helper-mod)
+
+(verify-extension-name "call-with-environment-variables")
+
+(setup-shared-extension-module
+ 'call-with-environment-variables
+ (extension-version "0.1.6")
+ compile-options: '(-X hahn))
+
+(run-hahn -o call-with-environment-variables.wiki call-with-environment-variables-core.scm)

ADDED   call-with-environment-variables/call-with-environment-variables.wiki
Index: call-with-environment-variables/call-with-environment-variables.wiki
==================================================================
--- /dev/null
+++ call-with-environment-variables/call-with-environment-variables.wiki
@@ -0,0 +1,54 @@
+== call-with-environment-variables
+
+Set up and take down environment vars
+[[toc:]]
+=== {{call-with-environment-variables}}
+<procedure>(call-with-environment-variables variables thunk) → unspecified</procedure>
+Sets up environment variable via dynamic-wind which are taken down after thunk.
+; {{variables}} : An alist of the form {{'(("var" . "value") ...)}}
+; {{thunk}} : The thunk to execute with a modified environment
+<enscript highlight="scheme">(define (call-with-environment-variables variables thunk)
+  (let ((pre-existing-variables
+          (map (lambda (var-value)
+                 (let ((var (car var-value)))
+                   (cons var (get-environment-variable var))))
+               variables)))
+    (dynamic-wind
+      (lambda () (void))
+      (lambda ()
+        (use posix)
+        (for-each
+          (lambda (var-value) (setenv (car var-value) (cdr var-value)))
+          variables)
+        (thunk))
+      (lambda ()
+        (for-each
+          (lambda (var-value)
+            (let ((var (car var-value)) (value (cdr var-value)))
+              (if value (setenv var value) (unsetenv var))))
+          pre-existing-variables)))))
+</enscript>
+=== About this egg
+
+==== Author
+
+[[/users/klutometis|Peter Danenberg]]
+==== Repository
+[[https://github.com/klutometis/call-with-environment-variables]]
+==== License
+BSD
+==== Dependencies
+* [[(hahn 0.9.3)]]
+* [[setup-helper]]
+
+==== Versions
+; [[https://github.com/klutometis/call-with-environment-variables/releases/tag/0.1|0.1]] : Initial release
+; [[https://github.com/klutometis/call-with-environment-variables/releases/tag/0.1.1|0.1.1]] : Add the actual code.
+; [[https://github.com/klutometis/call-with-environment-variables/releases/tag/0.1.2|0.1.2]] : Fix versions.
+; [[https://github.com/klutometis/call-with-environment-variables/releases/tag/0.1.3|0.1.3]] : Update docs.
+; [[https://github.com/klutometis/call-with-environment-variables/releases/tag/0.1.4|0.1.4]] : With a note about cock-utils
+; [[https://github.com/klutometis/call-with-environment-variables/releases/tag/0.1.5|0.1.5]] : Docs
+; [[https://github.com/klutometis/call-with-environment-variables/releases/tag/0.1.6|0.1.6]] : Use hahn.
+==== Colophon
+
+Documented by [[/egg/hahn|hahn]].

Index: cgisetup/models/pgdb.scm
==================================================================
--- cgisetup/models/pgdb.scm
+++ cgisetup/models/pgdb.scm
@@ -16,25 +16,25 @@
 ;;     You should have received a copy of the GNU General Public License
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;======================================================================
 
-(declare (unit pgdb))
-(declare (uses configf))
-
-;; I don't know how to mix compilation units and modules, so no module here.
-;;
-;; (module pgdb
-;;     (
-;;      open-pgdb
-;;      )
-;; 
-;; (import scheme)
-;; (import data-structures)
-;; (import chicken)
-
-(use typed-records (prefix dbi dbi:))
+;; (declare (unit pgdb))
+;; (declare (uses configf))
+;; 
+;; ;; I don't know how to mix compilation units and modules, so no module here.
+;; ;;
+;; ;; (module pgdb
+;; ;;     (
+;; ;;      open-pgdb
+;; ;;      )
+;; ;; 
+;; ;; (import scheme)
+;; ;; (import data-structures)
+;; ;; (import chicken)
+;; 
+;; (use typed-records (prefix dbi dbi:))
 
 ;; given a configdat lookup the connection info and open the db
 ;;
 (define (pgdb:open configdat #!key (dbname #f)(dbispec #f))  
   (let ((pgconf (or dbispec

DELETED client.scm
Index: client.scm
==================================================================
--- client.scm
+++ /dev/null
@@ -1,130 +0,0 @@
-
-;; Copyright 2006-2012, Matthew Welland.
-;; 
-;; This file is part of Megatest.
-;; 
-;;     Megatest is free software: you can redistribute it and/or modify
-;;     it under the terms of the GNU General Public License as published by
-;;     the Free Software Foundation, either version 3 of the License, or
-;;     (at your option) any later version.
-;; 
-;;     Megatest is distributed in the hope that it will be useful,
-;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;     GNU General Public License for more details.
-;; 
-;;     You should have received a copy of the GNU General Public License
-;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
-
-;;======================================================================
-;; C L I E N T S
-;;======================================================================
-
-(use srfi-18 extras tcp s11n srfi-1 posix regex srfi-69 hostinfo md5
-     message-digest matchable spiffy uri-common intarweb http-client
-     spiffy-request-vars uri-common intarweb directory-utils)
-
-(declare (unit client))
-
-(declare (uses common))
-(declare (uses db))
-(declare (uses tasks)) ;; tasks are where stuff is maintained about what is running.
-
-(include "common_records.scm")
-(include "db_records.scm")
-
-;; client:get-signature
-(define (client:get-signature)
-  (if *my-client-signature* *my-client-signature*
-      (let ((sig (conc (get-host-name) " " (current-process-id))))
-	(set! *my-client-signature* sig)
-	*my-client-signature*)))
-
-;; Not currently used! But, I think it *should* be used!!!
-#;(define (client:logout serverdat)
-  (let ((ok (and (socket? serverdat)
-		 (cdb:logout serverdat *toppath* (client:get-signature)))))
-    ok))
-
-#;(define (client:connect iface port)
-  (http-transport:client-connect iface port)
-  #;(case (server:get-transport)
-    ((rpc)  (rpc:client-connect  iface port))
-    ((http) (http:client-connect iface port))
-    ((zmq)  (zmq:client-connect  iface port))
-    (else   (rpc:client-connect  iface port))))
-
-(define (client:setup areapath #!key (remaining-tries 100) (failed-connects 0))
-  (client:setup-http areapath remaining-tries: remaining-tries failed-connects: failed-connects)
-  #;(case (server:get-transport)
-    ((rpc) (rpc-transport:client-setup remaining-tries: remaining-tries failed-connects: failed-connects)) ;;(client:setup-rpc run-id))
-    ((http)(client:setup-http areapath remaining-tries: remaining-tries failed-connects: failed-connects))
-    (else  (rpc-transport:client-setup remaining-tries: remaining-tries failed-connects: failed-connects)))) ;; (client:setup-rpc run-id))))
-
-;; Do all the connection work, look up the transport type and set up the
-;; connection if required.
-;;
-;; There are two scenarios. 
-;;   1. We are a test manager and we received *transport-type* and *runremote* via cmdline
-;;   2. We are a run tests, list runs or other interactive process and we must figure out
-;;      *transport-type* and *runremote* from the monitor.db
-;;
-;; client:setup
-;;
-;; lookup_server, need to remove *runremote* stuff
-;;
-
-(define (client:setup-http areapath #!key (remaining-tries 100) (failed-connects 0)(area-dat #f))
-  (debug:print-info 2 *default-log-port* "client:setup remaining-tries=" remaining-tries)
-  (server:start-and-wait areapath)
-  (if (<= remaining-tries 0)
-      (begin
-	(debug:print-error 0 *default-log-port* "failed to start or connect to server")
-	(exit 1))
-      ;;
-      ;; Alternatively here, we can get the list of candidate servers and work our way
-      ;; through them searching for a good one.
-      ;;
-      (let* ((server-dat (server:get-rand-best areapath)) ;; (server:get-first-best areapath))
-	     (runremote  (or area-dat *runremote*)))
-	(if (not server-dat) ;; no server found
-	    (client:setup-http areapath remaining-tries: (- remaining-tries 1))
-	    (let ((host  (cadr  server-dat))
-		  (port  (caddr server-dat))
-                  (server-id (caddr (cddr server-dat))))
-	      (debug:print-info 4 *default-log-port* "client:setup server-dat=" server-dat ", remaining-tries=" remaining-tries)
-	      (if (and (not area-dat)
-		       (not *runremote*))
-                  (begin       
-		    (set! *runremote* (make-remote))
-                    (let* ((server-info (remote-server-info *runremote*))) 
-                      (if server-info
-                        (begin
-                          (remote-server-url-set! *runremote* (server:record->url server-info))
-                          (remote-server-id-set! *runremote* (server:record->id server-info)))))))
-	      (if (and host port server-id)
-		  (let* ((start-res (case *transport-type*
-				      ((http)(http-transport:client-connect host port server-id))))
-			 (ping-res  (case *transport-type* 
-				      ((http)(rmt:login-no-auto-client-setup start-res)))))
-		    (if (and start-res
-			     ping-res)
-			(let ((runremote (or area-dat *runremote*))) ;; it might have been generated only a few statements ago
-			  (remote-conndat-set! runremote start-res) ;; (hash-table-set! runremote run-id start-res)
-			  (debug:print-info 2 *default-log-port* "connected to " (http-transport:server-dat-make-url start-res))
-			  start-res)
-			(begin    ;; login failed but have a server record, clean out the record and try again
-			  (debug:print-info 0 *default-log-port* "client:setup, login unsuccessful, will attempt to start server ... start-res=" start-res ", server-dat=" server-dat) ;; had runid.  Fixes part of Randy;s ticket 1405717332
-			  (case *transport-type* 
-			    ((http)(http-transport:close-connections)))
-			  (remote-conndat-set! runremote #f)  ;; (hash-table-delete! runremote run-id)
-			  (thread-sleep! 1)
-			  (client:setup-http areapath remaining-tries: (- remaining-tries 1))
-			  )))
-		  (begin    ;; no server registered
-		    ;; (server:kind-run areapath)
-		    (server:start-and-wait areapath)
-		    (debug:print-info 0 *default-log-port* "client:setup, no server registered, remaining-tries=" remaining-tries)
-		    (thread-sleep! 1) ;; (+ 5 (random (- 20 remaining-tries))))  ;; give server a little time to start up, randomize a little to avoid start storms.
-		    (client:setup-http areapath remaining-tries: (- remaining-tries 1)))))))))
-

ADDED   clientmod.scm
Index: clientmod.scm
==================================================================
--- /dev/null
+++ clientmod.scm
@@ -0,0 +1,93 @@
+;;======================================================================
+;; Copyright 2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
+
+;;======================================================================
+
+(declare (unit clientmod))
+(declare (uses commonmod))
+(declare (uses debugprint))
+(declare (uses configfmod))
+(declare (uses http-transportmod))
+(declare (uses servermod))
+
+(module clientmod
+	*
+	
+(import scheme
+	chicken.base
+	chicken.string
+	chicken.process
+	chicken.io
+	chicken.time
+	chicken.condition
+	chicken.file
+	chicken.process-context
+	chicken.process-context.posix
+	chicken.random
+	chicken.file.posix
+	
+	system-information
+	(prefix sqlite3 sqlite3:)
+	typed-records
+	regex
+	directory-utils
+	matchable
+	
+	srfi-18
+	srfi-69
+
+	commonmod
+	debugprint
+	configfmod
+	http-transportmod
+	servermod
+	
+	)
+
+;;======================================================================
+;; C L I E N T S
+;;======================================================================
+
+;; (use srfi-18 extras tcp s11n srfi-1 posix regex srfi-69 hostinfo md5
+;;      message-digest matchable spiffy uri-common intarweb http-client
+;;      spiffy-request-vars uri-common intarweb directory-utils)
+;; 
+;; (declare (unit client))
+;; 
+;; (declare (uses common))
+;; (declare (uses db))
+;; (declare (uses tasks)) ;; tasks are where stuff is maintained about what is running.
+;; 
+;; (include "common_records.scm")
+;; (include "db_records.scm")
+
+;; client:get-signature
+(define (client:get-signature)
+  (if *my-client-signature* *my-client-signature*
+      (let ((sig (conc (get-host-name) " " (current-process-id))))
+	(set! *my-client-signature* sig)
+	*my-client-signature*)))
+
+;; Not currently used! But, I think it *should* be used!!!
+#;(define (client:logout serverdat)
+  (let ((ok (and (socket? serverdat)
+		 (cdb:logout serverdat *toppath* (client:get-signature)))))
+    ok))
+
+
+)

Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -16,24 +16,24 @@
 ;;     You should have received a copy of the GNU General Public License
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;======================================================================
 
-(use srfi-1 data-structures posix regex-case (prefix base64 base64:)
-     format dot-locking csv-xml z3 udp ;; sql-de-lite
-     hostinfo md5 message-digest typed-records directory-utils stack
-     matchable regex posix (srfi 18) extras ;; tcp 
-     (prefix nanomsg nmsg:)
-     (prefix sqlite3 sqlite3:)
-     pkts (prefix dbi dbi:)
-     )
-
-(declare (unit common))
-;; (declare (uses commonmod))
-;; (import commonmod)
-
-(include "common_records.scm")
+;; (use srfi-1 data-structures posix regex-case (prefix base64 base64:)
+;;      format dot-locking csv-xml z3 udp ;; sql-de-lite
+;;      hostinfo md5 message-digest typed-records directory-utils stack
+;;      matchable regex posix (srfi 18) extras ;; tcp 
+;;      (prefix nanomsg nmsg:)
+;;      (prefix sqlite3 sqlite3:)
+;;      pkts (prefix dbi dbi:)
+;;      )
+;; 
+;; (declare (unit common))
+;; ;; (declare (uses commonmod))
+;; ;; (import commonmod)
+;; 
+;; (include "common_records.scm")
 
 
 ;; (require-library margs)
 ;; (include "margs.scm")
 
@@ -42,3638 +42,5 @@
 ;; (define (exit . code)
 ;;   (if (null? code)
 ;;       (old-exit)
 ;;       (old-exit code)))
 
-
-;; execute thunk, return value.  If exception thrown, trap exception, return #f, and emit nonfatal condition note to *default-log-port* .
-;; arguments - thunk, message
-(define (common:fail-safe thunk warning-message-on-exception)
-  (handle-exceptions
-   exn
-   (begin
-     (debug:print-info 0 *default-log-port* "notable but nonfatal condition - "warning-message-on-exception", exn=" exn)
-     (debug:print-info 0 *default-log-port*
-                       (string-substitute "\n?Error:" "nonfatal condition:"
-                                          (with-output-to-string
-                                            (lambda ()
-                                              (print-error-message exn) ))))
-     (debug:print-info 0 *default-log-port* "    -- continuing after nonfatal condition...")
-     #f)
-   (thunk)))
-
-(define getenv get-environment-variable)
-(define (safe-setenv key val)
-  (if (or (substring-index "!" key)
-	  (substring-index ":" key)  ;; variables containing : are for internal use and cannot be environment variables.
-	  (substring-index "." key)) ;; periods are not allowed in environment variables
-      (debug:print-error 4 *default-log-port* "skip setting internal use only variables containing \":\" or starting with \"!\"")
-      (if (and (string? val)
-	       (string? key))
-	  (handle-exceptions
-	      exn
-	      (debug:print-error 0 *default-log-port* "bad value for setenv, key=" key ", value=" val ", exn=" exn)
-	    (setenv key val))
-	  (debug:print-error 0 *default-log-port* "bad value for setenv, key=" key ", value=" val))))
-
-(define home (getenv "HOME"))
-(define user (getenv "USER"))
-
-
-;; returns list of fd count, socket count
-(define (get-file-descriptor-count #!key  (pid (current-process-id )))
-  (list
-    (length (glob (conc "/proc/" pid "/fd/*")))
-    (length  (filter identity (map socket? (glob (conc "/proc/" pid "/fd/*")))))
-  )
-)
-
-  
-
-;; GLOBALS
-
-;; CONTEXTS
-(defstruct cxt
-  (taskdb #f)
-  (cmutex (make-mutex)))
-;; (define *contexts* (make-hash-table))
-;; (define *context-mutex* (make-mutex))
-
-;; ;; safe method for accessing a context given a toppath
-;; ;;
-;; (define (common:with-cxt toppath proc)
-;;   (mutex-lock! *context-mutex*)
-;;   (let ((cxt (hash-table-ref/default *contexts* toppath #f)))
-;;     (if (not cxt)
-;;         (set! cxt (let ((x (make-cxt)))(hash-table-set! *contexts* toppath x) x)))
-;;     (let ((cxt-mutex (cxt-mutex cxt)))
-;;       (mutex-unlock! *context-mutex*)
-;;       (mutex-lock! cxt-mutex)
-;;       (let ((res (proc cxt)))
-;;         (mutex-unlock! cxt-mutex)
-;;         res))))
-        
-;; A hash table that can be accessed by #{scheme ...} calls in
-;; config files. Allows communicating between confgs
-;;
-(define *user-hash-data* (make-hash-table))
-
-(define *db-keys* #f)
-
-(define *pkts-info*    (make-hash-table)) ;; store stuff like the last parent here
-(define *configinfo*   #f)   ;; raw results from setup, includes toppath and table from megatest.config
-(define *runconfigdat* #f)   ;; run configs data
-(define *configdat*    #f)   ;; megatest.config data
-(define *configstatus* #f)   ;; status of data; 'fulldata : all processing done, #f : no data yet, 'partialdata : partial read done
-(define *toppath*      #f)
-(define *already-seen-runconfig-info* #f)
-
-(define *test-meta-updated* (make-hash-table))
-(define *globalexitstatus*  0) ;; attempt to work around possible thread issues
-(define *passnum*           0) ;; when running track calls to run-tests or similar
-;; (define *alt-log-file* #f)  ;; used by -log
-(define *common:denoise*    (make-hash-table)) ;; for low noise printing
-(define *default-log-port*  (current-error-port))
-(define *time-zero* (current-seconds)) ;; for the watchdog
-(define *default-area-tag* "local")
-
-;; DATABASE
-(define *dbstruct-db*         #f) ;; used to cache the dbstruct in db:setup. Goal is to remove this.
-;; db stats
-(define *db-stats*            (make-hash-table)) ;; hash of vectors < count duration-total >
-(define *db-stats-mutex*      (make-mutex))
-;; db access
-(define *db-last-access*      (current-seconds)) ;; last db access, used in server
-(define *db-write-access*     #t)
-;; db sync
-(define *db-last-sync*        0)                 ;; last time the sync to megatest.db happened
-(define *db-sync-in-progress* #f)                ;; if there is a sync in progress do not try to start another
-(define *db-multi-sync-mutex* (make-mutex))      ;; protect access to *db-sync-in-progress*, *db-last-sync*
-;; task db
-(define *task-db*             #f) ;; (vector db path-to-db)
-(define *db-access-allowed*   #t) ;; flag to allow access
-(define *db-access-mutex*     (make-mutex))
-(define *db-transaction-mutex* (make-mutex))
-(define *db-cache-path*       #f)
-(define *db-with-db-mutex*    (make-mutex))
-(define *db-api-call-time*    (make-hash-table)) ;; hash of command => (list of times)
-;; no sync db
-(define *no-sync-db*          #f)
-
-;; SERVER
-(define *my-client-signature* #f)
-(define *transport-type*    'http)             ;; override with [server] transport http|rpc|nmsg
-(define *runremote*         #f)                ;; if set up for server communication this will hold <host port>
-;; (define *max-cache-size*    0)
-(define *logged-in-clients* (make-hash-table))
-(define *server-id*         #f)
-(define *server-info*       #f)  ;; good candidate for easily convert to non-global
-(define *time-to-exit*      #f)
-(define *server-run*        #t)
-(define *run-id*            #f)
-(define *server-kind-run*   (make-hash-table))
-(define *home-host*         #f)
-;; (define *total-non-write-delay* 0)
-(define *heartbeat-mutex*   (make-mutex))
-(define *api-process-request-count* 0)
-(define *max-api-process-requests* 0)
-(define *server-overloaded*  #f)
-
-;; client
-(define *rmt-mutex*         (make-mutex))     ;; remote access calls mutex 
-
-;; RPC transport
-(define *rpc:listener*      #f)
-
-;; KEY info
-(define *target*            (make-hash-table)) ;; cache the target here; target is keyval1/keyval2/.../keyvalN
-(define *keys*              (make-hash-table)) ;; cache the keys here
-(define *keyvals*           (make-hash-table))
-(define *toptest-paths*     (make-hash-table)) ;; cache toptest path settings here
-(define *test-paths*        (make-hash-table)) ;; cache test-id to test run paths here
-(define *test-ids*          (make-hash-table)) ;; cache run-id, testname, and item-path => test-id
-(define *test-info*         (make-hash-table)) ;; cache the test info records, update the state, status, run_duration etc. from testdat.db
-
-(define *run-info-cache*     (make-hash-table)) ;; run info is stable, no need to reget
-(define *launch-setup-mutex* (make-mutex))     ;; need to be able to call launch:setup often so mutex it and re-call the real deal only if *toppath* not set
-(define *homehost-mutex*     (make-mutex))
-
-;; Miscellaneous
-(define *triggers-mutex*     (make-mutex))     ;; block overlapping processing of triggers
-(define *numcpus-cache* (make-hash-table))
-
-(use posix-extras pathname-expand files)
-
-;; this plugs a hole in posix-extras in recent chicken versions > 4.9)
-(let-values (( (chicken-release-number chicken-major-version)
-               (apply values
-                      (map string->number
-                           (take
-                            (string-split (chicken-version) ".")
-                            2)))))
-  (let ((resolve-pathname-broken?
-         (or (> chicken-release-number 4)
-             (and (eq? 4 chicken-release-number) (> chicken-major-version 9)))))
-    (if resolve-pathname-broken?
-        (define ##sys#expand-home-path pathname-expand))))
-      
-(define (realpath x) (resolve-pathname  (pathname-expand (or x "/dev/null")) ))
-
-(define (common:get-this-exe-fullpath #!key (argv (argv)))
-  (let* ((this-script
-          (cond
-           ((and (> (length argv) 2)
-                 (string-match "^(.*/csi|csi)$" (car argv))
-                 (string-match "^-(s|ss|sx|script)$" (cadr argv)))
-            (caddr argv))
-           (else (car argv))))
-         (fullpath (realpath this-script)))
-    fullpath))
-
-;;======================================================================
-
-(define *common:this-exe-fullpath* (common:get-this-exe-fullpath))
-(define *common:this-exe-dir*      (pathname-directory *common:this-exe-fullpath*))
-(define *common:this-exe-name*     (pathname-strip-directory *common:this-exe-fullpath*))
-
-(define (common:get-sync-lock-filepath)
-  (let* ((tmp-area     (common:get-db-tmp-area))
-         (lockfile     (conc tmp-area "/megatest.db.sync-lock")))
-    lockfile))
-
-;;======================================================================
-;; when called from a wrapper I need sometimes to find the calling
-;; wrapper, this is for dashboard to find the correct megatest.
-;;
-(define (common:find-local-megatest #!optional (progname "megatest"))
-  (let ((res (filter file-exists?
-		     (map (lambda (updir)
-			    (let* ((lm  (car (argv)))
-				   (dir (pathname-directory lm))
-				   (exe (pathname-strip-directory lm)))
-			      (conc (if dir (conc dir "/") "")
-				    (case (string->symbol exe)
-				      ((dboard)    (conc updir progname))
-				      ((mtest)     (conc updir progname))
-				      ((dashboard) progname)
-				      (else exe)))))
-			  '("../../" "../")))))
-    (if (null? res)
-	(begin
-	  (debug:print 0 *default-log-port* "Failed to find this executable! Using what can be found on the path")
-	  progname)
-	(car res))))
-
-(define *common:logpro-exit-code->status-sym-alist*
-  '( ( 0 . pass )
-     ( 1 . fail )
-     ( 2 . warn )
-     ( 3 . check )
-     ( 4 . waived )
-     ( 5 . abort )
-     ( 6 . skip )))
-
-(define (common:logpro-exit-code->status-sym exit-code)
-  (or (alist-ref exit-code *common:logpro-exit-code->status-sym-alist*) 'fail))
-
-(define (common:worse-status-sym ss1 ss2)
-  (let loop ((status-syms-remaining '(abort fail check skip warn waived pass)))
-    (cond
-     ((null? status-syms-remaining)
-      'fail)
-     ((eq? (car status-syms-remaining) ss1)
-      ss1)
-     ((eq? (car status-syms-remaining) ss2)
-      ss2)
-     (else
-      (loop (cdr status-syms-remaining))))))
-
-(define (common:steps-can-proceed-given-status-sym status-sym)
-  (if (member status-sym '(warn waived pass))
-      #t
-      #f))
-
-(define (status-sym->string status-sym)
-  (case status-sym
-      ((pass) "PASS")
-    ((fail) "FAIL")
-    ((warn) "WARN")
-    ((check) "CHECK")
-    ((waived) "WAIVED")
-    ((abort) "ABORT")
-    ((skip) "SKIP")
-    (else "FAIL")))
-
-(define (common:logpro-exit-code->test-status exit-code)
-  (status-sym->string (common:logpro-exit-code->status-sym exit-code)))
-
-(defstruct remote
-  (hh-dat            (common:get-homehost)) ;; homehost record ( addr . hhflag )
-  (server-url        #f) ;; (server:check-if-running *toppath*) #f))
-  (server-id         #f)
-  (server-info       (if *toppath* (server:check-if-running *toppath*) #f))
-  (last-server-check 0)  ;; last time we checked to see if the server was alive
-  (conndat           #f)
-  (transport         *transport-type*)
-  (server-timeout    (server:expiration-timeout))
-  (force-server      #f)
-  (ro-mode           #f)  
-  (ro-mode-checked   #f)) ;; flag that indicates we have checked for ro-mode
-
-;; launching and hosts
-(defstruct host
-  (reachable    #f)
-  (last-update  0)
-  (last-used    0)
-  (last-cpuload 1))
-
-(define *host-loads*         (make-hash-table))
-
-;; cache environment vars for each run here
-(define *env-vars-by-run-id* (make-hash-table))
-
-;; Testconfig and runconfig caches. 
-(define *testconfigs*        (make-hash-table)) ;; test-name => testconfig
-(define *runconfigs*         (make-hash-table)) ;; target    => runconfig
-
-;; This is a cache of pre-reqs met, don't re-calc in cases where called with same params less than
-;; five seconds ago
-(define *pre-reqs-met-cache* (make-hash-table))
-
-;; cache of verbosity given string
-;;
-(define *verbosity-cache*    (make-hash-table))
-
-(define (common:clear-caches)
-  (set! *target*             (make-hash-table))
-  (set! *keys*               (make-hash-table))
-  (set! *keyvals*            (make-hash-table))
-  (set! *toptest-paths*      (make-hash-table))
-  (set! *test-paths*         (make-hash-table))
-  (set! *test-ids*           (make-hash-table))
-  (set! *test-info*          (make-hash-table))
-  (set! *run-info-cache*     (make-hash-table))
-  (set! *env-vars-by-run-id* (make-hash-table))
-  (set! *test-id-cache*      (make-hash-table)))
-
-;; Generic string database
-(define sdb:qry #f) ;; (make-sdb:qry)) ;;  'init #f)
-;; Generic path database
-(define *fdb* #f)
-
-(define *last-launch* (current-seconds)) ;; use for throttling the launch rate. Would be better to use the db and last time of a test in LAUNCHED state.
-
-;;======================================================================
-;; V E R S I O N
-;;======================================================================
-
-(define (common:get-full-version)
-  (conc megatest-version "-" megatest-fossil-hash))
-
-(define (common:version-signature)
-  (conc megatest-version "-" (substring megatest-fossil-hash 0 4)))
-
-;;======================================================================
-;; from metadat lookup MEGATEST_VERSION
-;;
-(define (common:get-last-run-version) ;; RADT => How does this work in send-receive function??; assume it is the value saved in some DB
-  (rmt:get-var "MEGATEST_VERSION"))
-
-(define (common:get-last-run-version-number)
-  (string->number 
-   (substring (common:get-last-run-version) 0 6)))
-
-(define (common:set-last-run-version)
-  (rmt:set-var "MEGATEST_VERSION" (common:version-signature)))
-
-;;======================================================================
-;; postive number if megatest version > db version
-;; negative number if megatest version < db version
-(define (common:version-db-delta)
-  (- megatest-version (common:get-last-run-version-number)))
-
-(define (common:version-changed?)
-  (not (equal? (common:get-last-run-version)
-               (common:version-signature))))
-
-(define (common:api-changed?)
-  (not (equal? (substring (->string megatest-version) 0 4)
-               (substring (conc (common:get-last-run-version)) 0 4))))
-
-;;======================================================================
-;; Move me elsewhere ...
-;; RADT => Why do we meed the version check here, this is called only if version misma
-;;
-(define (common:cleanup-db dbstruct #!key (full #f))
-  (apply db:multi-db-sync 
-   dbstruct
-   'schema
-   ;; 'new2old
-   'killservers
-   'adj-target
-   ;; 'old2new
-   'new2old
-   ;; (if full
-       '(dejunk)
-       ;; '())
-       )
-  (if (common:api-changed?)
-      (common:set-last-run-version)))
-
-(define (common:snapshot-file filepath #!key (subdir  ".") )
-  (if (file-exists? filepath)
-      (let* ((age-sec  (lambda (file)
-                         (if (file-exists? file)
-                             (- (current-seconds) (file-modification-time file))
-                             1000000000))) ;; return really old value if file doesn't exist.  we want to clobber it if old or not exist.
-             (ok-flag  #t)
-             (age-mins (lambda (file) (/ (age-sec   file) 60)))
-             (age-hrs  (lambda (file) (/ (age-mins file) 60)))
-             (age-days (lambda (file) (/ (age-hrs   file) 24)))
-             (age-wks  (lambda (file) (/ (age-days  file) 7)))
-             (docmd    (lambda (cmd)
-                         (cond
-                          (ok-flag
-                           (let ((res (system cmd)))
-                             (cond
-                              ((eq? 0 res)
-                               #t)
-                              (else
-                               (set! ok-flag #f)
-                               (debug:print 0 *default-log-port* "ERROR: ["(common:human-time)"] Command failed with exit code "
-                                            (if (< res 0)
-                                                res
-                                                (/ res 8)) " ["cmd"]" )
-                               #f))))
-                          (else
-                           (debug:print 0 *default-log-port* "ERROR: ["(common:human-time)"] Not runnining command due to prior error. ["cmd"]")
-                           #f))))
-             (copy     (lambda (src dest) (docmd (conc "/bin/cp '"src"' '"dest"'"))))
-             (copy+zip (lambda (src dest) (docmd (conc "gzip -c - < '"src"' > '"dest"'"))))
-             (fullpath (realpath filepath))
-             (basedir  (pathname-directory fullpath))
-             (basefile (pathname-strip-directory fullpath))
-             ;;(prevfile (conc filepath ".prev.gz"))
-             (minsfile (conc basedir "/" subdir "/" basefile ".mins.gz"))
-             (hrsfile  (conc basedir "/" subdir "/" basefile ".hrs.gz"))
-             (daysfile (conc basedir "/" subdir "/" basefile ".days.gz"))
-             (wksfile  (conc basedir "/" subdir "/" basefile ".weeks.gz")))
-
-        ;; create subdir it not exists
-        (if (not (directory-exists? (conc basedir "/" subdir)))
-            (docmd (conc "/bin/mkdir -p '"(conc basedir "/" subdir)"'")))
-        
-        ;; copy&zip <file> to <file>.mins if not exists
-        (if (not (file-exists? minsfile))
-            (copy+zip filepath minsfile))
-        ;; copy <file>.mins to <file>.hrs if not exists
-        (if (not (file-exists? hrsfile))
-            (copy minsfile hrsfile))
-        ;; copy <file>.hrs to <file>.days if not exists
-        (if (not (file-exists? daysfile))
-            (copy hrsfile daysfile))
-        ;; copy <file>.days to <file>.weeks if not exists
-        (if (not (file-exists? wksfile))
-            (copy daysfile wksfile))
-
-
-        ;; if age(<file>.mins.gz) >= 1h:
-        ;;     copy <file>.mins.gz <file>.hrs.gz
-        ;;     copy <prev file> <file>.mins.gz
-        (when (>= (age-mins minsfile) 1)
-          (copy minsfile hrsfile)
-          (copy+zip filepath  minsfile))
-        
-        ;; if age(<file>.hrs.gz) >= 1d:
-        ;;     copy <file>.hrs.gz <file>.days.gz
-        ;;     copy <file>.mins.gz <file>.hrs.gz
-        (when (>= (age-days hrsfile) 1)
-          (copy hrsfile daysfile)
-          (copy minsfile hrsfile))
-        
-        ;; if age(<file>.days.gz) >= 1w:
-        ;;     copy <file>.days.gz <file>.weeks.gz
-        ;;     copy <file>.hrs.gz <file>.days.gz
-        (when (>= (age-wks daysfile) 1)
-          (copy daysfile wksfile)
-          (copy hrsfile daysfile))
-        #t)
-      #f))
-
-;;======================================================================
-;; Rotate logs, logic: 
-;;                 if > 500k and older than 1 week:
-;;                     remove previous compressed log and compress this log
-;; WARNING: This proc operates assuming that it is in the directory above the
-;;          logs directory you wish to log-rotate.
-;;
-(define (common:rotate-logs)
-  (let* ((all-files (make-hash-table))
-	 (stats     (make-hash-table))
-	 (inc-stat  (lambda (key)
-		      (hash-table-set! stats key (+ (hash-table-ref/default stats key 0) 1))))
-	(max-allowed (string->number (or (configf:lookup *configdat* "setup" "max-logfiles") "300")))) ;; name -> age
-    (if (not (directory-exists? "logs"))(create-directory "logs"))
-    (directory-fold 
-     (lambda (file rem)
-       (handle-exceptions
-	exn
-	(begin
-	  (debug:print-info 2 *default-log-port* "unable to rotate log " file ", probably handled by another process, this is safe to ignore. exn=" exn)
-	  (debug:print 2 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
-	  ;; (print-call-chain (current-error-port)) ;; 
-	  )
-	(let* ((fullname  (conc "logs/" file))
-	       (mod-time  (file-modification-time fullname))
-	       (file-age  (- (current-seconds) mod-time))
-	       (file-old  (> file-age (* 48 60 60)))
-	       (file-big  (> (file-size fullname) 200000)))
-	  (hash-table-set! all-files file mod-time)
-	  (if (or (and (string-match "^.*.log" file)
-		       file-old
-		       file-big)
-		  (and (string-match "^server-.*.log" file)
-		       file-old))
-	      (let ((gzfile (conc fullname ".gz")))
-		(if (common:file-exists? gzfile)
-		    (begin
-		      (debug:print-info 0 *default-log-port* "removing " gzfile)
-		      (delete-file* gzfile)
-		      (hash-table-delete!  all-files gzfile) ;; needed?
-		      ))
-		(debug:print-info 0 *default-log-port* "compressing " file)
-		(system (conc "gzip " fullname))
-		(inc-stat "gzipped")
-		(hash-table-set! all-files (conc file ".gz") file-age)  ;; add the .gz file and remove the base file
-		(hash-table-delete! all-files file)
-		)
-	      (if (and (> file-age (* (string->number (or (configf:lookup *configdat* "setup" "log-expire-days") "30")) 24 3600))
-		       (file-exists? fullname)) ;; just in case it was gzipped - will get it next time
-		  (handle-exceptions
-		   exn
-		   #f
-		   (if (directory? fullname)
-		       (begin
-			 (debug:print-info 0 *default-log-port* fullname " in logs directory is a directory! Cannot rotate it, it is best to not put subdirectories in the logs dir.")
-			 (inc-stat "directories"))
-		       (begin
-			 (delete-file* fullname)
-			 (inc-stat "deleted")))
-		   (hash-table-delete! all-files file)))))))
-     '()
-     "logs")
-    (for-each
-     (lambda (category)
-       (let ((quant (hash-table-ref/default stats category 0)))
-	 (if (> quant 0)
-	     (debug:print-info 0 *default-log-port* category " log files: " quant))))
-     `("deleted" "gzipped" "directories"))
-    (let ((num-logs (hash-table-size all-files)))
-      (if (> num-logs max-allowed) ;; because NFS => don't let number of logs exceed 300
-	  (let ((files (take (sort (hash-table-keys all-files)
-				   (lambda (a b)
-				     (< (hash-table-ref all-files a)(hash-table-ref all-files b))))
-			     (- num-logs max-allowed))))
-	    (for-each
-	     (lambda (file)
-	       (let* ((fullname (conc "logs/" file)))
-		 (if (directory? fullname)
-		     (debug:print-info 0 *default-log-port* fullname " in logs directory is a directory! Cannot rotate it, it is best to not put subdirectories in the logs dir.")
-		     (handle-exceptions
-		      exn
-		      (debug:print-error 0 *default-log-port* "failed to remove " fullname ", exn=" exn)
-		      (delete-file* fullname)))))
-	     files)
-	    (debug:print-info 0 *default-log-port* "Deleted " (length files) " files from logs, keeping " max-allowed " files."))))))
-
-;;======================================================================
-;; Force a megatest cleanup-db if version is changed and skip-version-check not specified
-;; Do NOT check if not on homehost!
-;;
-(define (common:exit-on-version-changed)
-  (if (common:on-homehost?)
-      (if (common:api-changed?)
-	  (let* ((mtconf (conc (get-environment-variable "MT_RUN_AREA_HOME") "/megatest.config"))
-                (dbfile  (conc (get-environment-variable "MT_RUN_AREA_HOME") "/megatest.db"))
-                (read-only (not (file-write-access? dbfile)))
-                (dbstruct (db:setup #t)))
-	    (debug:print 0 *default-log-port*
-			 "WARNING: Version mismatch!\n"
-			 "   expected: " (common:version-signature) "\n"
-			 "   got:      " (common:get-last-run-version))
-            (cond
-             ((get-environment-variable "MT_SKIP_DB_MIGRATE") #t)
-             ((and (common:file-exists? mtconf) (common:file-exists? dbfile) (not read-only)
-                   (eq? (current-user-id)(file-owner mtconf))) ;; safe to run -cleanup-db
-              (debug:print 0 *default-log-port* "   I see you are the owner of megatest.config, attempting to cleanup and reset to new version")
-              (handle-exceptions
-               exn
-               (begin
-                 (debug:print 0 *default-log-port* "Failed to switch versions. exn=" exn)
-                 (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
-                 (print-call-chain (current-error-port))
-                 (exit 1))
-               (common:cleanup-db dbstruct)))
-             ((not (common:file-exists? mtconf))
-              (debug:print 0 *default-log-port* "   megatest.config does not exist in this area.  Cannot proceed with megatest version migration.")
-              (exit 1))
-             ((not (common:file-exists? dbfile))
-              (debug:print 0 *default-log-port* "   megatest.db does not exist in this area.  Cannot proceed with megatest version migration.")
-              (exit 1))
-             ((not (eq? (current-user-id)(file-owner mtconf)))
-              (debug:print 0 *default-log-port* "   You do not own megatest.db in this area.  Cannot proceed with megatest version migration.")
-              (exit 1))
-             (read-only
-              (debug:print 0 *default-log-port* "   You have read-only access to this area.  Cannot proceed with megatest version migration.")
-              (exit 1))
-             (else
-              (debug:print 0 *default-log-port* " to switch versions you can run: \"megatest -cleanup-db\"")
-              (exit 1)))))))
-;;======================================================================
-;;      (begin
-;;	(debug:print 0 *default-log-port* "ERROR: cannot migrate version unless on homehost. Exiting.")
-;;	(exit 1))))
-
-;;======================================================================
-;; S P A R S E   A R R A Y S
-;;======================================================================
-
-(define (make-sparse-array)
-  (let ((a (make-sparse-vector)))
-    (sparse-vector-set! a 0 (make-sparse-vector))
-    a))
-
-(define (sparse-array? a)
-  (and (sparse-vector? a)
-       (sparse-vector? (sparse-vector-ref a 0))))
-
-(define (sparse-array-ref a x y)
-  (let ((row (sparse-vector-ref a x)))
-    (if row
-	(sparse-vector-ref row y)
-	#f)))
-
-(define (sparse-array-set! a x y val)
-  (let ((row (sparse-vector-ref a x)))
-    (if row
-	(sparse-vector-set! row y val)
-	(let ((new-row (make-sparse-vector)))
-	  (sparse-vector-set! a x new-row)
-	  (sparse-vector-set! new-row y val)))))
-
-;;======================================================================
-;; L O C K E R S   A N D   B L O C K E R S 
-;;======================================================================
-
-;; block further accesses to databases. Call this before shutting db down
-(define (common:db-block-further-queries)
-  (mutex-lock! *db-access-mutex*)
-  (set! *db-access-allowed* #f)
-  (mutex-unlock! *db-access-mutex*))
-
-(define (common:db-access-allowed?)
-  (let ((val (begin
-	       (mutex-lock! *db-access-mutex*)
-	       *db-access-allowed*
-	       (mutex-unlock! *db-access-mutex*))))
-    val))
-
-;;======================================================================
-;; U S E F U L   S T U F F
-;;======================================================================
-
-;; convert things to an alist or assoc list, #f gets converted to ""
-;;
-(define (common:to-alist dat)
-  (cond
-   ((list? dat)   (map common:to-alist dat))
-   ((vector? dat)
-    (map common:to-alist (vector->list dat)))
-   ((pair? dat)
-    (cons (common:to-alist (car dat))
-	  (common:to-alist (cdr dat))))
-   ((hash-table? dat)
-    (map common:to-alist (hash-table->alist dat)))
-   (else
-    (if dat
-	dat
-	""))))
-
-(define (common:alist-ref/default key alist default)
-  (or (alist-ref key alist) default))
-
-(define (common:low-noise-print waitval . keys)
-  (let* ((key      (string-intersperse (map conc keys) "-" ))
-	 (lasttime (hash-table-ref/default *common:denoise* key 0))
-	 (currtime (current-seconds)))
-    (if (> (- currtime lasttime) waitval)
-	(begin
-	  (hash-table-set! *common:denoise* key currtime)
-	  #t)
-	#f)))
-
-(define (common:get-megatest-exe)
-  (or (getenv "MT_MEGATEST") "megatest"))
-
-(define (common:read-encoded-string instr)
-  (handle-exceptions
-   exn
-   (handle-exceptions
-    exn
-    (begin
-      (debug:print-error 0 *default-log-port* "received bad encoded string \"" instr "\", message: " ((condition-property-accessor 'exn 'message) exn) ", exn=" exn)
-      (print-call-chain (current-error-port))
-      #f)
-    (read (open-input-string (base64:base64-decode instr))))
-   (read (open-input-string (z3:decode-buffer (base64:base64-decode instr))))))
-
-;; dot-locking egg seems not to work, using this for now
-;; if lock is older than expire-time then remove it and try again
-;; to get the lock
-;;
-(define (common:simple-file-lock fname #!key (expire-time 300))
-  (let ((fmod-time (handle-exceptions
-		       ext
-		     (current-seconds)
-		     (file-modification-time fname))))
-    (if (common:file-exists? fname)
-	(if (> (- (current-seconds) fmod-time) expire-time)
-	    (begin
-	      (handle-exceptions exn #f (delete-file* fname))	
-	      (common:simple-file-lock fname expire-time: expire-time))
-	    #f)
-	(let ((key-string (conc (get-host-name) "-" (current-process-id))))
-	  (with-output-to-file fname
-	    (lambda ()
-	      (print key-string)))
-	  (thread-sleep! 0.25)
-	  (if (common:file-exists? fname)
-	      (handle-exceptions exn
-                #f 
-                (with-input-from-file fname
-	  	  (lambda ()
-		    (equal? key-string (read-line)))))
-	      #f)))))
-
-(define (common:simple-file-lock-and-wait fname #!key (expire-time 300))
-  (let ((end-time (+ expire-time (current-seconds))))
-    (let loop ((got-lock (common:simple-file-lock fname expire-time: expire-time)))
-      (if got-lock
-	  #t
-	  (if (> end-time (current-seconds))
-	      (begin
-		(thread-sleep! 3)
-		(loop (common:simple-file-lock fname expire-time: expire-time)))
-	      #f)))))
-
-(define (common:simple-file-release-lock fname)
-  (handle-exceptions
-      exn
-      #f ;; I don't really care why this failed (at least for now)
-    (delete-file* fname)))
-
-;;======================================================================
-;; S T A T E S   A N D   S T A T U S E S
-;;======================================================================
-
-;; BBnote: *common:std-states* - dashboard filter control and test control state buttons defined here; used in set-fields-panel and dboard:make-controls
-(define *common:std-states*   ;; for toggle buttons in dashboard
-  '(
-    (0 "ARCHIVED")
-    (1 "STUCK")
-    (2 "KILLREQ")
-    (3 "KILLED")
-    (4 "NOT_STARTED")
-    (5 "COMPLETED")
-    (6 "LAUNCHED")
-    (7 "REMOTEHOSTSTART")
-    (8 "RUNNING")
-    ))
-
-(define *common:dont-roll-up-states*
-  '("DELETED"
-    "REMOVING"
-    "CLEANING"
-    "ARCHIVE_REMOVING"
-    ))
-
-;;======================================================================
-;; BBnote: *common:std-statuses* dashboard filter control and test control status buttons defined here; used in set-fields-panel and dboard:make-controls
-;; note these statuses are sorted from better to worse.
-;; This sort order is important to dcommon:status-compare3 and db:set-state-status-and-roll-up-items
-(define *common:std-statuses*
-  '(;; (0 "DELETED")  
-    (1 "n/a")
-    (2 "PASS")
-    (3 "SKIP")
-    (4 "WARN")
-    (5 "WAIVED")
-    (6 "CHECK")
-    (7 "STUCK/DEAD")
-    (8 "DEAD")
-    (9 "FAIL")
-    (10 "PREQ_FAIL")
-    (11 "PREQ_DISCARDED")
-    (12 "ABORT")))
-
-(define *common:ended-states*       ;; states which indicate the test is stopped and will not proceed
-  '("COMPLETED" "ARCHIVED" "KILLED" "KILLREQ" "STUCK" "INCOMPLETE" ))
-
-(define *common:badly-ended-states* ;; these roll up as CHECK, i.e. results need to be checked
-  '("KILLED" "KILLREQ" "STUCK" "INCOMPLETE" "DEAD"))
-
-(define *common:well-ended-states* ;; an item's prereq in this state allows item to proceed
-  '("PASS" "WARN" "CHECK" "WAIVED" "SKIP"))
-
-;; BBnote: *common:running-states* used from db:set-state-status-and-roll-up-items
-(define *common:running-states*     ;; test is either running or can be run
-  '("RUNNING" "REMOTEHOSTSTART" "LAUNCHED" "STARTED"))
-
-(define *common:cant-run-states*    ;; These are stopping conditions that prevent a test from being run
-  '("COMPLETED" "KILLED" "UNKNOWN" "INCOMPLETE" "ARCHIVED"))
-
-(define *common:not-started-ok-statuses* ;; if not one of these statuses when in not_started state treat as dead
-  '("n/a" "na" "PASS" "FAIL" "WARN" "CHECK" "WAIVED" "DEAD" "SKIP"))
-
-;;======================================================================
-;; group tests into buckets corresponding to rollup
-;;; Running, completed-pass,  completed-non-pass + worst status, not started.
-;; filter out 
-;(define (common:categorize-items-for-rollup in-tests)
-;  (
-
-(define (common:special-sort items order comp)
-  (let ((items-order (map reverse order))
-        (acomp       (or comp >)))
-    (sort items
-        (lambda (a b)
-          (let ((a-num (cadr (or (assoc a items-order) '(0 0))))
-                (b-num (cadr (or (assoc b items-order) '(0 0)))))
-            (acomp a-num b-num))))))
-
-;;======================================================================
-;; ;; given a toplevel with currstate, currstatus apply state and status
-;; ;;  => (newstate . newstatus)
-;; (define (common:apply-state-status currstate currstatus state status)
-;;   (let* ((cstate  (string->symbol (string-downcase currstate)))
-;;          (cstatus (string->symbol (string-downcase currstatus)))
-;;          (sstate  (string->symbol (string-downcase state)))
-;;          (sstatus (string->symbol (string-downcase status)))
-;;          (nstate  #f)
-;;          (nstatus #f))
-;;     (set! nstate
-;;           (case cstate
-;;             ((completed not_started killed killreq stuck archived) 
-;;              (case sstate ;; completed -> sstate
-;;                ((completed killed killreq stuck archived) completed)
-;;                ((running remotehoststart launched)        running)
-;;                (else                                      unknown-error-1)))
-;;             ((running remotehoststart launched)
-;;              (case sstate
-;;                ((completed killed killreq stuck archived) #f) ;; need to look at all items
-;;                ((running remotehoststart launched)        running)
-;;                (else                                      unknown-error-2)))
-;;             (else unknown-error-3)))
-;;     (set! nstatus
-;;           (case sstatus
-;;             ((pass)
-;;              (case nstate
-;;                ((pass n/a deleted)     pass)
-;;                ((warn)                 warn)
-;;                ((fail)                 fail)
-;;                ((check)               check)
-;;                ((waived)             waived)
-;;                ((skip)                 skip)
-;;                ((stuck/dead)          stuck)
-;;                ((abort)               abort)
-;;                (else        unknown-error-4)))
-;;             ((warn)
-;;              (case nstate
-;;                ((pass warn n/a skip deleted)   warn)
-;;                ((fail)                         fail)
-;;                ((check)                       check)
-;;                ((waived)                     waived)
-;;                ((stuck/dead)                  stuck)
-;;                (else                unknown-error-5)))
-;;             ((fail)
-;;              (case nstate
-;;                ((pass warn fail check n/a waived skip deleted stuck/dead stuck)  fail)
-;;                ((abort)                                                         abort)
-;;                (else                                                  unknown-error-6)))
-;;             (else    unknown-error-7)))
-;;     (cons 
-;;      (if nstate  (symbol->string nstate)  nstate)
-;;      (if nstatus (symbol->string nstatus) nstatus))))
-               
-;;======================================================================
-;; D E B U G G I N G   S T U F F 
-;;======================================================================
-
-(define *verbosity*         1)
-(define *logging*           #f)
-
-(define (get-with-default val default)
-  (let ((val (args:get-arg val)))
-    (if val val default)))
-
-(define (assoc/default key lst . default)
-  (let ((res (assoc key lst)))
-    (if res (cadr res)(if (null? default) #f (car default)))))
-
-(define (common:get-testsuite-name)
-  (or (configf:lookup *configdat* "setup" "area-name") ;; megatest is a flexible tool, testsuite is too limiting a description.
-      (configf:lookup *configdat* "setup" "testsuite" )
-      (getenv "MT_TESTSUITE_NAME")
-      (pathname-file (or (if (string? *toppath* )
-			     (pathname-file *toppath*)
-			     #f)
-			 (common:get-toppath #f)))
-      "please-set-setup-area-name")) ;; (pathname-file (current-directory)))))
-
-;;======================================================================
-;; safe getting of toppath
-(define (common:get-toppath areapath)
-  (or *toppath*
-      (if areapath
-	  (begin
-	    (set! *toppath* areapath)
-	    (setenv "MT_RUN_AREA_HOME" areapath)
-	    areapath)
-	  #f)
-      (if (getenv "MT_RUN_AREA_HOME")
-	  (begin
-	    (set! *toppath* (getenv "MT_RUN_AREA_HOME"))
-	    *toppath*)
-	  #f)
-      ;; last resort, look for megatest.config
-      (let loop ((thepath (realpath ".")))
-	(if (file-exists? (conc thepath "/megatest.config"))
-	    thepath
-	    (if (equal? thepath "/")
-		(begin
-		  (debug:print-error 0 *default-log-port* "Unable to find megatest home directory.")
-		  #f)
-		(loop (pathname-directory thepath)))))
-      ))
-
-;;======================================================================
-;; redefine for future cleanup (converge on area-name, the more generic
-;;
-(define common:get-area-name common:get-testsuite-name)
-
-(define (common:get-db-tmp-area . junk)
-  (if *db-cache-path*
-      *db-cache-path*
-      (if *toppath* ;; common:get-create-writeable-dir
-	  (handle-exceptions
-	      exn
-	      (begin
-		(debug:print-error 0 *default-log-port* "Couldn't create path to " *db-cache-path* ", exn=" exn)
-		(exit 1))
-	      (let* ((tsname (common:get-testsuite-name))
-		     (dbpath (common:get-create-writeable-dir
-			      (list (conc "/tmp/" (current-user-name)
-					  "/megatest_localdb/"
-					  tsname "/"
-					  (string-translate *toppath* "/" "."))
-				    (conc "/tmp/" (current-process-id) ;; just in case we have an issue with the dir by own user name
-					  "/megatest_localdb/"
-					  tsname
-					  (string-translate *toppath* "/" "."))
-				    ))))
-		(set! *db-cache-path* dbpath)
-		dbpath))
-	  #f)))
-
-(define (common:get-area-path-signature)
-  (message-digest-string (md5-primitive) *toppath*))
-
-(define (common:get-signature str)
-  (message-digest-string (md5-primitive) str))
-
-;;======================================================================
-;; E X I T   H A N D L I N G
-;;======================================================================
-
-(define (common:run-sync?)
-    (and (common:on-homehost?)
-	 (args:get-arg "-server")))
-
-(define (common:human-time)
-  (time->string (seconds->local-time (current-seconds)) "%Y-%m-%d %H:%M:%S"))
-
-;;======================================================================
-;; currently the primary job of the watchdog is to run the sync back to megatest.db from the db in /tmp
-;; if we are on the homehost and we are a server (by definition we are on the homehost if we are a server)
-;;
-(define (common:readonly-watchdog dbstruct)
-  (thread-sleep! 0.05) ;; delay for startup
-  (debug:print-info 13 *default-log-port* "common:readonly-watchdog entered.")
-  ;; sync megatest.db to /tmp/.../megatst.db
-  (let* ((sync-cool-off-duration   3)
-        (golden-mtdb     (dbr:dbstruct-mtdb dbstruct))
-        (golden-mtpath   (db:dbdat-get-path golden-mtdb))
-        (tmp-mtdb        (dbr:dbstruct-tmpdb dbstruct))
-        (tmp-mtpath      (db:dbdat-get-path tmp-mtdb)))
-    (debug:print-info 0 *default-log-port* "Read-only periodic sync thread started.")
-    (let loop ((last-sync-time 0))
-      (debug:print-info 13 *default-log-port* "loop top tmp-mtpath="tmp-mtpath" golden-mtpath="golden-mtpath)
-      (let* ((duration-since-last-sync (- (current-seconds) last-sync-time)))
-        (debug:print-info 13 *default-log-port* "duration-since-last-sync="duration-since-last-sync)
-        (if (and (not *time-to-exit*)
-                 (< duration-since-last-sync sync-cool-off-duration))
-            (thread-sleep! (- sync-cool-off-duration duration-since-last-sync)))
-        (if (not *time-to-exit*)
-            (let ((golden-mtdb-mtime (file-modification-time golden-mtpath))
-                  (tmp-mtdb-mtime    (file-modification-time tmp-mtpath)))
-	      (if (> golden-mtdb-mtime tmp-mtdb-mtime)
-		  (if (< golden-mtdb-mtime (- (current-seconds) 3)) ;; file has NOT been touched in past three seconds, this way multiple servers won't fight to sync back
-		      (let ((res (db:multi-db-sync dbstruct 'old2new)))
-			(debug:print-info 13 *default-log-port* "rosync called, " res " records transferred."))))
-              (loop (current-seconds)))
-            #t)))
-    (debug:print-info 0 *default-log-port* "Exiting readonly-watchdog timer, *time-to-exit* = " *time-to-exit*" pid="(current-process-id)" mtpath="golden-mtpath)))
-
-;;======================================================================
-;; TODO: for multiple areas, we will have multiple watchdogs; and multiple threads to manage
-(define (common:watchdog)
-  (debug:print-info 13 *default-log-port* "common:watchdog entered.")
-  (if (launch:setup)
-      (if (common:on-homehost?)
-	  (let ((dbstruct (db:setup #t)))
-	    (debug:print-info 13 *default-log-port* "after db:setup with dbstruct=" dbstruct)
-	    (cond
-	     ((dbr:dbstruct-read-only dbstruct)
-	      (debug:print-info 13 *default-log-port* "loading read-only watchdog")
-	      (common:readonly-watchdog dbstruct))
-	     (else
-	      (debug:print-info 13 *default-log-port* "loading writable-watchdog.")
-              (let* ((syncer (or (configf:lookup *configdat* "server" "sync-method") "brute-force-sync")))
-                (cond
-                 ((equal? syncer "brute-force-sync")
-                  (server:writable-watchdog-bruteforce dbstruct))
-                 ((equal? syncer "delta-sync")
-                  (server:writable-watchdog-deltasync dbstruct))
-                 (else
-                  (debug:print-error 0 *default-log-port* "Unknown server/sync-method specified ("syncer") - valid values are brute-force-sync and delta-sync.")
-                  (exit 1)))
-                ;;(debug:print 1 *default-log-port* "INFO: ["(common:human-time)"] Syncer started (method="syncer")")
-                )))
-	    (debug:print-info 13 *default-log-port* "watchdog done."))
-	  (debug:print-info 13 *default-log-port* "no need for watchdog on non-homehost"))))
-
-
-(define (std-exit-procedure)
-  ;;(common:telemetry-log-close)
-  (on-exit (lambda () 0))
-  ;;(debug:print-info 13 *default-log-port* "std-exit-procedure called; *time-to-exit*="*time-to-exit*)
-  (let ((no-hurry  (if *time-to-exit* ;; hurry up
-		       #f
-		       (begin
-			 (set! *time-to-exit* #t)
-			 #t))))
-    (debug:print-info 4 *default-log-port* "starting exit process, finalizing databases.")
-    (if (and no-hurry (debug:debug-mode 18))
-	(rmt:print-db-stats))
-    (let ((th1 (make-thread (lambda () ;; thread for cleaning up, give it five seconds
-                              (if *dbstruct-db* (db:close-all *dbstruct-db*)) ;; one second allocated
-			      (if *task-db*    
-				  (let ((db (cdr *task-db*)))
-				    (if (sqlite3:database? db)
-					(begin
-					  (sqlite3:interrupt! db)
-					  (sqlite3:finalize! db #t)
-					  ;; (vector-set! *task-db* 0 #f)
-					  (set! *task-db* #f)))))
-                              (http-client#close-all-connections!)
-                              ;; (if (and *runremote*
-                              ;;          (remote-conndat *runremote*))
-                              ;;     (begin
-                              ;;       (http-client#close-all-connections!))) ;; for http-client
-                              (if (not (eq? *default-log-port* (current-error-port)))
-                                  (close-output-port *default-log-port*))
-			      (set! *default-log-port* (current-error-port))) "Cleanup db exit thread"))
-	  (th2 (make-thread (lambda ()
-			      (debug:print 4 *default-log-port* "Attempting clean exit. Please be patient and wait a few seconds...")
-			      (if no-hurry
-                                  (begin
-                                    (thread-sleep! 5)) ;; give the clean up few seconds to do it's stuff
-                                  (begin
-      				  (thread-sleep! 2)))
-      			      (debug:print 4 *default-log-port* " ... done")
-      			      )
-			    "clean exit")))
-      (thread-start! th1)
-      (thread-start! th2)
-      (thread-join! th1)
-      )
-    )
-
-  0)
-
-(define (std-signal-handler signum)
-  ;; (signal-mask! signum)
-  (set! *time-to-exit* #t) 
-  ;;(debug:print-info 13 *default-log-port* "got signal "signum)
-  (debug:print-error 0 *default-log-port* "Received signal " signum " aaa exiting promptly")
-  ;; (std-exit-procedure) ;; shouldn't need this since we are exiting and it will be called anyway
-  (exit))
-
-(define (special-signal-handler signum)
-  ;; (signal-mask! signum)
-  (set! *time-to-exit* #t)
-  ;;(debug:print-info 13 *default-log-port* "got signal "signum)
-  (debug:print-error 0 *default-log-port* "Received signal " signum " sending email befor exiting!!")
-  ;;TODO send email to notify admin contact listed in the config that the lisner got killed
-  ;; (std-exit-procedure) ;; shouldn't need this since we are exiting and it will be called anyway
-  (exit))
-
-
-(set-signal-handler! signal/int  std-signal-handler)  ;; ^C
-(set-signal-handler! signal/term std-signal-handler)
-
-;; (set-signal-handler! signal/stop std-signal-handler)  ;; ^Z NO, do NOT handle ^Z!
-
-;;======================================================================
-;; M I S C   U T I L S
-;;======================================================================
-
-;;======================================================================
-;; convert stuff to a number if possible
-(define (any->number val)
-  (cond 
-   ((number? val) val)
-   ((string? val) (string->number val))
-   ((symbol? val) (any->number (symbol->string val)))
-   (else #f)))
-
-(define (any->number-if-possible val)
-  (let ((num (any->number val)))
-    (if num num val)))
-
-(define (patt-list-match item patts)
-  (debug:print-info 8 *default-log-port* "patt-list-match item=" item " patts=" patts)
-  (if (and item patts)  ;; here we are filtering for matches with item patterns
-      (let ((res #f))   ;; look through all the item-patts if defined, format is patt1,patt2,patt3 ... wildcard is %
-	(for-each 
-	 (lambda (patt)
-	   (let ((modpatt (string-substitute "%" ".*" patt #t)))
-	     (debug:print-info 10 *default-log-port* "patt " patt " modpatt " modpatt)
-	     (if (string-match (regexp modpatt) item)
-		 (set! res #t))))
-	 (string-split patts ","))
-	res)
-      #t))
-
-;;======================================================================
-;; '(print (string-intersperse (map cadr (hash-table-ref/default (read-config "megatest.config" \#f \#t) "disks" '"'"'("none" ""))) "\n"))'
-(define (common:get-disks #!key (configf #f))
-  (hash-table-ref/default 
-   (or configf (read-config "megatest.config" #f #t))
-   "disks" '("none" "")))
-
-;;======================================================================
-;; return first command that exists, else #f
-;;
-(define (common:which cmds)
-  (if (null? cmds)
-      #f
-      (let loop ((hed (car cmds))
-		 (tal (cdr cmds)))
-	(let ((res (with-input-from-pipe (conc "which " hed) read-line)))
-	  (if (and (string? res)
-		   (common:file-exists? res))
-	      res
-	      (if (null? tal)
-		  #f
-		  (loop (car tal)(cdr tal))))))))
-  
-(define (common:get-install-area)
-  (let ((exe-path (car (argv))))
-    (if (common:file-exists? exe-path)
-	(handle-exceptions
-	 exn
-	 #f
-	 (pathname-directory
-	  (pathname-directory 
-	   (pathname-directory exe-path))))
-	#f)))
-
-;;======================================================================
-;; return first path that can be created or already exists and is writable
-;;
-(define (common:get-create-writeable-dir dirs)
-  (if (null? dirs)
-      #f
-      (let loop ((hed (car dirs))
-		 (tal (cdr dirs)))
-	(let ((res (or (and (directory? hed)
-			    (file-write-access? hed)
-			    hed)
-		       (handle-exceptions
-			   exn
-			   (begin
-			     (debug:print-info 0 *default-log-port* "could not create " hed
-					       ", this might cause problems down the road. exn=" exn)
-			     #f)
-			(create-directory hed #t)))))
-	  (if (and (string? res)
-		   (directory? res))
-	      res
-	      (if (null? tal)
-		  #f
-		  (loop (car tal)(cdr tal))))))))
-
-;;======================================================================
-;; return the youngest timestamp . filename
-;;
-(define (common:get-youngest glob-list)
-  (let ((all-files (apply append
-			  (map (lambda (patt)
-				 (handle-exceptions
-				     exn
-				     '()
-				   (glob patt)))
-			       glob-list))))
-    (fold (lambda (fname res)
-	    (let ((last-mod (car res))
-		  (curmod   (handle-exceptions
-				exn
-				0
-			      (file-modification-time fname))))
-	      (if (> curmod last-mod)
-		  (list curmod fname)
-		  res)))
-	  '(0 "n/a")
-	  all-files)))
-
-;;======================================================================
-;; use bash to expand a glob. Does NOT handle paths with spaces!
-;;
-(define (common:bash-glob instr)
-  (string-split
-   (with-input-from-pipe
-       (conc "/bin/bash -c \"echo " instr "\"")
-       read-line)))
-
-;;======================================================================
-;; Some safety net stuff
-;;======================================================================
-
-;;======================================================================
-;; return input if it is a list or return null
-(define (common:list-or-null inlst #!key (ovrd #f)(message #f))
-  (if (list? inlst)
-      inlst
-      (begin
-	(if message (debug:print-error 0 *default-log-port* message))
-	(or ovrd '()))))
-  
-;;======================================================================
-;; T A R G E T S  ,   S T A T E ,   S T A T U S ,   
-;;                    R U N N A M E    A N D   T E S T P A T T
-;;======================================================================
-
-;;======================================================================
-;; (map print (map car (hash-table->alist (read-config "runconfigs.config" #f #t))))
-;;
-(define (common:get-runconfig-targets #!key (configf #f))
-  (let ((targs       (sort (map car (hash-table->alist
-				     (or configf ;; NOTE: There is no value in using runconfig:read here.
-					 (read-config (conc *toppath* "/runconfigs.config")
-						      #f #t)
-					 (make-hash-table))))
-			   string<?))
-	(target-patt (args:get-arg "-target")))
-    (if target-patt
-	(filter (lambda (x)
-		  (patt-list-match x target-patt))
-		targs)
-	targs)))
-
-;;======================================================================
-;; Lookup a value in runconfigs based on -reqtarg or -target
-;; 
-(define (runconfigs-get config var)
-  (let ((targ (common:args-get-target))) ;; (or (args:get-arg "-reqtarg")(args:get-arg "-target")(getenv "MT_TARGET"))))
-    (if targ
-	(or (configf:lookup config targ var)
-	    (configf:lookup config "default" var))
-	(configf:lookup config "default" var))))
-
-(define (common:args-get-state)
-  (or (args:get-arg "-state")(args:get-arg ":state")))
-
-(define (common:args-get-status)
-  (or (args:get-arg "-status")(args:get-arg ":status")))
-
-(define (common:args-get-testpatt rconf)
-  (let* (;; (tagexpr       (args:get-arg "-tagexpr"))
-         ;; (tags-testpatt (if tagexpr (string-join (runs:get-tests-matching-tags tagexpr) ",") #f))
-         (testpatt-key  (or (args:get-arg "-modepatt") (args:get-arg "--modepatt") "TESTPATT"))
-         (args-testpatt (or (args:get-arg "-testpatt") (args:get-arg "-runtests") "%"))
-         (rtestpatt     (if rconf (runconfigs-get rconf testpatt-key) #f)))
-    (cond
-     ((or (args:get-arg "--modepatt") (args:get-arg "-modepatt")) ;; modepatt is a forced setting, when set it MUST refer to an existing PATT in the runconfig
-      (if rconf
-	  (let* ((patts-from-mode-patt	  (runconfigs-get rconf testpatt-key)))
-	    (debug:print-info 0 *default-log-port* "modepatt defined is: "testpatt-key" runconfigs values for  " testpatt-key " "  patts-from-mode-patt)
-	    patts-from-mode-patt)
-	  (begin
-	    (debug:print-info 0 *default-log-port* " modepatt defined is: "testpatt-key" runconfigs values for  " testpatt-key) ;;  " " patts-from-mode-patt)
-	    #f)))     ;; We do NOT fall back to "%"
-     ;; (tags-testpatt
-     ;;  (debug:print-info 0 *default-log-port* "-tagexpr "tagexpr" selects testpatt "tags-testpatt)
-     ;;  tags-testpatt)
-     ((and (equal? args-testpatt "%") rtestpatt)
-      (debug:print-info 0 *default-log-port* "testpatt defined in "testpatt-key" from runconfigs: " rtestpatt)
-      rtestpatt)
-     (else 
-      (debug:print-info 0 *default-log-port* "using testpatt " args-testpatt " rtestpatt:" rtestpatt)
-      args-testpatt))))
-
-(define (common:false-on-exception thunk #!key (message #f))
-  (handle-exceptions exn
-                     (begin
-                       (if message
-                           (debug:print-info 0 *default-log-port* message))
-                       #f) (thunk) ))
-
-(define (common:file-exists? path-string #!key (silent #f))
-  ;;;; TODO: catch permission denied exceptions and emit appropriate warnings. Might be able to get rid of with chicken 5?
-  (common:false-on-exception (lambda () (file-exists? path-string))
-                             message: (if (not silent)
-                                          (conc "Unable to access path: " path-string)
-                                          #f)
-                             ))
-
-(define (common:directory-exists? path-string)
-  ;;;; TODO: catch permission denied exceptions and emit appropriate warnings
-  (common:false-on-exception (lambda () (directory-exists? path-string))
-                             message: (conc "Unable to access path: " path-string)
-                             ))
-
-;;======================================================================
-;; does the directory exist and do we have write access?
-;;
-;;    returns the directory or #f
-;;
-(define (common:directory-writable? path-string)
-  (handle-exceptions
-      exn
-    (begin
-      (debug:print 0 *default-log-port* "Failed to identify access to " path-string ", exn=" exn)
-      #f)
-   (if (and (directory-exists? path-string)
-            (file-write-access? path-string))
-       path-string
-       #f)))
-
-(define (common:get-linktree)
-  (or (getenv "MT_LINKTREE")
-      (if *configdat*
-	  (configf:lookup *configdat* "setup" "linktree")
-	  #f)
-      (if (or *toppath* (getenv "MT_RUN_AREA_HOME"))
-	  (conc (or *toppath* (getenv "MT_RUN_AREA_HOME")) "/lt")
-	  #f)
-      (let* ((tp (common:get-toppath #f))
-	     (lt (conc tp "/lt")))
-	(if (not tp)(debug:print 0 *default-log-port* "WARNING: cannot calculate best path for linktree, using " lt))
-	lt)))
-
-(define (common:args-get-runname)
-  (let ((res (or (args:get-arg "-runname")
-		 (args:get-arg ":runname")
-		 (getenv "MT_RUNNAME"))))
-    ;; (if res (set-environment-variable "MT_RUNNAME" res)) ;; not sure if this is a good idea. side effect and all ...
-    res))
-
-(define (common:get-fields cfgdat)
-  (let ((fields (hash-table-ref/default cfgdat "fields" '())))
-    (map car fields)))
-
-(define (common:args-get-target #!key (split #f)(exit-if-bad #f))
-  (let* ((keys    (if (hash-table? *configdat*) (common:get-fields *configdat*) '()))
-	 (numkeys (length keys))
-	 (target  (or (args:get-arg "-reqtarg")
-		      (args:get-arg "-target")
-		      (getenv "MT_TARGET")))
-	 (tlist   (if target (string-split target "/" #t) '()))
-	 (valid   (if target
-		      (or (null? keys) ;; probably don't know our keys yet
-			  (and (not (null? tlist))
-			       (eq? numkeys (length tlist))
-			       (null? (filter string-null? tlist))))
-		      #f)))
-    (if valid
-	(if split
-	    tlist
-	    target)
-	(if target
-	    (begin
-	      (debug:print-error 0 *default-log-port* "Invalid target, spaces or blanks not allowed \"" target "\", target should be: " (string-intersperse keys "/") ", have " tlist " for elements")
-	      (if exit-if-bad (exit 1))
-	      #f)
-	    #f))))
-
-;;======================================================================
-;; looking only (at least for now) at the MT_ variables craft the full testname
-;;
-(define (common:get-full-test-name)
-  (if (getenv "MT_TEST_NAME")
-      (if (and (getenv "MT_ITEMPATH")
-               (not (equal? (getenv "MT_ITEMPATH") "")))
-          (getenv "MT_TEST_NAME")
-          (conc (getenv "MT_TEST_NAME") "/" (getenv "MT_ITEMPATH")))
-      #f))
-
-;;======================================================================
-;; logic for getting homehost. Returns (host . at-home)
-;; IF *toppath* is not set, wait up to five seconds trying every two seconds
-;; (this is to accomodate the watchdog)
-;;
-(define (common:get-homehost #!key (trynum 5))
-  ;; called often especially at start up. use mutex to eliminate collisions
-  (mutex-lock! *homehost-mutex*)
-  (cond
-   (*home-host*
-    (mutex-unlock! *homehost-mutex*)
-    *home-host*)
-   ((not *toppath*)
-    (mutex-unlock! *homehost-mutex*)
-    (launch:setup) ;; safely mutexed now
-    (if (> trynum 0)
-	(begin
-	  (thread-sleep! 2)
-	  (common:get-homehost trynum: (- trynum 1)))
-	#f))
-   (else
-    (let* ((currhost (get-host-name))
-	   (bestadrs (server:get-best-guess-address currhost))
-	   ;; first look in config, then look in file .homehost, create it if not found
-	   (homehost (or (configf:lookup *configdat* "server" "homehost" )
-			 (handle-exceptions
-			     exn
-			     (if (> trynum 0)
-				 (let ((delay-time (* (- 5 trynum) 5)))
-				   (mutex-unlock! *homehost-mutex*)
-				   (debug:print 0 *default-log-port* "ERROR: ["(common:human-time)"] Failed to read .homehost file, delaying "
-						delay-time " seconds and trying again, message: "  ((condition-property-accessor 'exn 'message) exn)
-						", exn=" exn)
-				   (thread-sleep! delay-time)
-				   (common:get-homehost trynum: (- trynum 1)))
-				 (begin
-				   (mutex-unlock! *homehost-mutex*)
-				   (debug:print 0 *default-log-port* "ERROR: ["(common:human-time)
-						"] Failed to read .homehost file after trying five times. Giving up and exiting, message: "
-						((condition-property-accessor 'exn 'message) exn))
-				   (exit 1)))
-			   (let ((hhf (conc *toppath* "/.homehost")))
-			     (if (common:file-exists? hhf)
-				 (with-input-from-file hhf read-line)
-				 (if (file-write-access? *toppath*)
-				     (begin
-				       (with-output-to-file hhf
-					 (lambda ()
-					   (print bestadrs)))
-				       (begin
-					 (mutex-unlock! *homehost-mutex*)
-					 (car (common:get-homehost))))
-				     #f))))))
-	   (at-home  (or (equal? homehost currhost)
-			 (equal? homehost bestadrs))))
-      (set! *home-host* (cons homehost at-home))
-      (mutex-unlock! *homehost-mutex*)
-      *home-host*))))
-
-;;======================================================================
-;; am I on the homehost?
-;;
-(define (common:on-homehost?)
-  (let ((hh (common:get-homehost)))
-    (if hh
-	(cdr hh)
-	#f)))
-
-;;======================================================================
-;; do we honor the caches of the config files?
-;;
-(define (common:use-cache?)
-  (let ((res #t)) ;; priority by order of evaluation
-    (if *configdat* ;; sillyness here. can't use setup/use-cache to know if we can use the cached files!
-	(if (equal? (configf:lookup *configdat* "setup" "use-cache") "no")
-	    (set! res #f)
-	    (if (equal? (configf:lookup *configdat* "setup" "use-cache") "yes")
-		(set! res #t))))
-    (if (args:get-arg "-no-cache")(set! res #f)) ;; overrides setting in "setup"
-    (if (getenv "MT_USE_CACHE")
-	(if (equal? (getenv "MT_USE_CACHE") "yes")
-	    (set! res #t)
-	    (if (equal? (getenv "MT_USE_CACHE") "no")
-		(set! res #f))))    ;; overrides -no-cache switch
-    res))
-  
-;;======================================================================
-;; force use of server?
-;;
-(define (common:force-server?)
-  (let* ((force-setting (configf:lookup *configdat* "server" "force"))
-	 (force-type    (if force-setting (string->symbol force-setting) #f))
-	 (force-result  (case force-type
-			  ((#f)     #f)
-			  ((always) #t)
-			  ((test)   (if (args:get-arg "-execute") ;; we are in a test
-					#t
-					#f))
-			  (else
-			   (debug:print 0 *default-log-port* "ERROR: Bad server force setting " force-setting ", forcing server.")
-			   #t)))) ;; default to requiring server
-    (if force-result
-	(begin
-	  (debug:print-info 0 *default-log-port* "forcing use of server, force setting is \"" force-setting "\".")
-	  #t)
-	#f)))
-
-;;======================================================================
-;; M I S C   L I S T S
-;;======================================================================
-
-;;======================================================================
-;; items in lista are matched value and position in listb
-;; return the remaining items in listb or #f
-;;
-(define (common:list-is-sublist lista listb)
-  (if (null? lista)
-      listb ;; all items in listb are "remaining"
-      (if (> (length lista)(length listb)) 
-	  #f
-	  (let loop ((heda (car lista))
-		     (tala (cdr lista))
-		     (hedb (car listb))
-		     (talb (cdr listb)))
-	    (if (equal? heda hedb)
-		(if (null? tala) ;; we are done
-		    talb
-		    (loop (car tala)
-			  (cdr tala)
-			  (car talb)
-			  
-			  (cdr talb)))
-		#f)))))
-
-;;======================================================================
-;; Needed for long lists to be sorted where (apply max ... ) dies
-;;
-(define (common:max inlst)
-  (let loop ((max-val (car inlst))
-	     (hed     (car inlst))
-	     (tal     (cdr inlst)))
-    (if (not (null? tal))
-	(loop (max hed max-val)
-	      (car tal)
-	      (cdr tal))
-	(max hed max-val))))
-
-;;======================================================================
-;; get min or max, use > for max and < for min, this works around the limits on apply
-;;
-(define (common:min-max comp lst)
-  (if (null? lst)
-      #f ;; better than an exception for my needs
-      (fold (lambda (a b)
-	      (if (comp a b) a b))
-	    (car lst)
-	    lst)))
-
-;;======================================================================
-;; get min or max, use > for max and < for min, this works around the limits on apply
-;;
-(define (common:sum lst)
-  (if (null? lst)
-      0
-      (fold (lambda (a b)
-	      (+ a b))
-	    (car lst)
-	    lst)))
-
-;;======================================================================
-;; path list to hash-table tree
-;;   ((a b c)(a b d)(e b c)) => ((a (b (d) (c))) (e (b (c))))
-;;
-(define (common:list->htree lst)
-  (let ((resh (make-hash-table)))
-    (for-each
-     (lambda (inlst)
-       (let loop ((ht  resh)
-		  (hed (car inlst))
-		  (tal (cdr inlst)))
-	 (if (hash-table-ref/default ht hed #f)
-	     (if (not (null? tal))
-		 (loop (hash-table-ref ht hed)
-		       (car tal)
-		       (cdr tal)))
-	     (begin
-	       (hash-table-set! ht hed (make-hash-table))
-	       (loop ht hed tal)))))
-     lst)
-    resh))
-
-;;======================================================================
-;; hash-table tree to html list tree
-;;
-;;   tipfunc takes two parameters: y the tip value and path the path to that point
-;;
-(define (common:htree->html ht path tipfunc)
-  (let ((datlist 	(sort (hash-table->alist ht)
-                              (lambda (a b)
-                                (string< (car a)(car b))))))
-    (if (null? datlist)
-    	(tipfunc #f path) ;; really shouldn't get here
-	(s:ul
-	 (map (lambda (x)
-		(let* ((levelname (car x))
-		       (y         (cdr x))
-		       (newpath   (append path (list levelname)))
-		       (leaf      (or (not (hash-table? y))
-				      (null? (hash-table-keys y)))))
-		  (if leaf
-		      (s:li (tipfunc y newpath))
-		      (s:li
-		       (list 
-			levelname
-			(common:htree->html y newpath tipfunc))))))
-	      datlist)))))
-
-;;======================================================================
-;; hash-table tree to alist tree
-;;
-(define (common:htree->atree ht)
-  (map (lambda (x)
-	 (cons (car x)
-	       (let ((y (cdr x)))
-		 (if (hash-table? y)
-		     (common:htree->atree y)
-		     y))))
-       (hash-table->alist ht)))
-
-;;======================================================================
-;; M U N G E   D A T A   I N T O   N I C E   F O R M S
-;;======================================================================
-
-;;======================================================================
-;; Generate an index for a sparse list of key values
-;;   ( (rowname1 colname1 val1)(rowname2 colname2 val2) )
-;;
-;; => 
-;;
-;;   ( (rowname1 0)(rowname2 1))    ;; rownames -> num
-;;     (colname1 0)(colname2 1)) )  ;; colnames -> num
-;; 
-;; optional apply proc to rownum colnum value
-(define (common:sparse-list-generate-index data #!key (proc #f))
-  (if (null? data)
-      (list '() '())
-      (let loop ((hed (car data))
-		 (tal (cdr data))
-		 (rownames '())
-		 (colnames '())
-		 (rownum   0)
-		 (colnum   0))
-	(let* ((rowkey          (car   hed))
-	       (colkey          (cadr  hed))
-	       (value           (caddr hed))
-	       (existing-rowdat (assoc rowkey rownames))
-	       (existing-coldat (assoc colkey colnames))
-	       (curr-rownum     (if existing-rowdat rownum (+ rownum 1)))
-	       (curr-colnum     (if existing-coldat colnum (+ colnum 1)))
-	       (new-rownames    (if existing-rowdat rownames (cons (list rowkey curr-rownum) rownames)))
-	       (new-colnames    (if existing-coldat colnames (cons (list colkey curr-colnum) colnames))))
-	  ;; (debug:print-info 0 *default-log-port* "Processing record: " hed )
-	  (if proc (proc curr-rownum curr-colnum rowkey colkey value))
-	  (if (null? tal)
-	      (list new-rownames new-colnames)
-	      (loop (car tal)
-		    (cdr tal)
-		    new-rownames
-		    new-colnames
-		    (if (> curr-rownum rownum) curr-rownum rownum)
-		    (if (> curr-colnum colnum) curr-colnum colnum)
-		    ))))))
-
-;;======================================================================
-;; if it looks like a number -> convert it to a number, else return it
-;;
-(define (common:lazy-convert inval)
-  (let* ((as-num (if (string? inval)(string->number inval) #f)))
-    (or as-num inval)))
-
-;;======================================================================
-;; convert string a=1; b=2; c=a silly thing; d=
-;; to '((a . 1)(b . 2)(c . "a silly thing")(d . ""))
-;;
-(define (common:val->alist val #!key (convert #f))
-  (let ((val-list (string-split-fields ";\\s*" val #:infix)))
-    (if val-list
-	(map (lambda (x)
-	       (let ((f (string-split-fields "\\s*=\\s*" x #:infix)))
-		 (case (length f)
-		   ((0) `(,#f))  ;; null string case
-		   ((1) `(,(string->symbol (car f))))
-		   ((2) `(,(string->symbol (car f)) . ,(let ((inval (cadr f)))
-							 (if convert (common:lazy-convert inval) inval))))
-		   (else f))))
-	     val-list)
-	'())))
-
-;;======================================================================
-;; S Y S T E M   S T U F F
-;;======================================================================
-
-;;======================================================================
-;; lazy-safe get file mod time. on any error (file not existing etc.) return 0
-;;
-(define (common:lazy-modification-time fpath)
-  (handle-exceptions
-      exn
-    (begin
-      (debug:print 0 *default-log-port* "Failed to get modifcation time for " fpath ", treating it as zero. exn=" exn)
-      0)
-    (if (file-exists? fpath)
-	(file-modification-time fpath)
-	0)))
-
-;;======================================================================
-;; find timestamp of newest file associated with a sqlite db file
-(define (common:lazy-sqlite-db-modification-time fpath)
-  (let* ((glob-list (handle-exceptions
-			exn
-		      (begin
-			(debug:print 0 *default-log-port* "Failed to glob " fpath "*, exn=" exn)
-			`(,(conc "/no/such/file, message: " ((condition-property-accessor 'exn 'message) exn))))
-		      (glob (conc fpath "*"))))
-         (file-list (if (eq? 0 (length glob-list))
-			'("/no/such/file")
-			glob-list)))
-  (apply max
-	 (map
-	  common:lazy-modification-time 
-	  file-list))))
-
-;;======================================================================
-;; return a nice clean pathname made absolute
-(define (common:nice-path dir)
-  (let ((match (string-match "^(~[^\\/]*)(\\/.*|)$" dir)))
-    (if match ;; using ~ for home?
-	(common:nice-path (conc (common:read-link-f (cadr match)) "/" (caddr match)))
-	(normalize-pathname (if (absolute-pathname? dir)
-				dir
-				(conc (current-directory) "/" dir))))))
-
-;;======================================================================
-;; make "nice-path" available in config files and the repl
-(define nice-path common:nice-path)
-
-(define (common:read-link-f path)
-  (handle-exceptions
-      exn
-      (begin
-	(debug:print-error 0 *default-log-port* "command \"/bin/readlink -f " path "\" failed. exn=" exn)
-	path) ;; just give up
-    (with-input-from-pipe
-	(conc "/bin/readlink -f " path)
-      (lambda ()
-	(read-line)))))
-
-;;======================================================================
-;; returns *effective load* (not normalized)
-;;
-(define (common:get-intercept onemin fivemin)
-  (if (< onemin fivemin) ;; load is decreasing, just use the onemin load
-      onemin
-      (let* ((load-change (- onemin fivemin))
-	     (tchange     (- 300 60)))
-	(max (+ onemin (* 60 (/ load-change tchange))) 0))))
-
-;;======================================================================
-;; calculate a delay number based on a droop curve
-;;    inputs are:
-;;      - load-in, load as from uptime, NOT normalized
-;;      - numcpus, number of cpus, ideally use the real cpus, not threads
-;;
-(define (common:get-delay load-in numcpus)
-  (let* ((ratio (/ load-in numcpus))
-         (new-option (configf:lookup *configdat* "load" "new-load-method"))
-	 (paramstr   (or (configf:lookup *configdat* "load" "exp-params")
-			 "15 12 1281453987.9543 0.75")) ;; 5 4 10 1"))
-	 (paramlst   (map string->number (string-split paramstr))))
-    (if new-option
-	(begin
-          (cond ((and (>= ratio 0) (< ratio .5))
-		 0)
-		((and (>= ratio 0.5) (<= ratio .9))
-		 (* ratio (/ 5 .9)))
-		((and (> ratio .9) (<= ratio 1.1))
-		 (+ 5 (* (- ratio .9) (/ 55 .2)))) 
-		((> ratio 1.1)
-		 60)))
-	(match paramlst
-	  ((r1 r2 s1 s2)
-	   (debug:print 3 *default-log-port* "Using params r1=" r1 " r2=" r2 " s1=" s1 " s2=" s2)
-	   (min (max (/ (expt r1 (* r2 s2 ratio)) s1) 0) 30))
-	  (else
-	   (debug:print 0 *default-log-port* "BAD exp-params, should be \"r1 r2 s1 s2\" but got " paramstr)
-	   30)))))
-
-(define (common:print-delay-table)
-  (let loop ((x 0))
-    (print x "," (common:get-delay x 1))
-    (if (< x 2)
-	(loop (+ x 0.1)))))
-
-(define (get-cpu-load #!key (remote-host #f))
-  (car (common:get-cpu-load remote-host)))
-
-;;======================================================================
-;;   (let* ((load-res (process:cmd-run->list "uptime"))
-;; 	 (load-rx  (regexp "load average:\\s+(\\d+)"))
-;; 	 (cpu-load #f))
-;;     (for-each (lambda (l)
-;; 		(let ((match (string-search load-rx l)))
-;; 		  (if match
-;; 		      (let ((newval (string->number (cadr match))))
-;; 			(if (number? newval)
-;; 			    (set! cpu-load newval))))))
-;; 	      (car load-res))
-;;     cpu-load))
-
-;;======================================================================
-;; get values from cached info from dropping file in logs dir
-;;  e.g. key is host and dtype is normalized-load
-;;
-(define (common:get-cached-info key dtype #!key (age 10))
-  (if *toppath*
-      (let* ((fullpath (conc *toppath* "/.sysdata/" key "-" dtype ".log"))
-	     (delfile  (lambda (exn)
-			 (debug:print-info 1 *default-log-port* " removing bad file " fullpath ", exn=" exn)
-			 (delete-file* fullpath)
-			 #f)))
-	(if (and (file-exists? fullpath)
-		 (file-read-access? fullpath))
-	    (handle-exceptions
-		exn
-	      (begin
-		(debug:print 0 *default-log-port* "failed to get cached info from " fullpath ", exn=" exn)
-		#f)
-	     (debug:print 2 *default-log-port* "reading file " fullpath)
-	     (let ((real-age (- (current-seconds)
-				(handle-exceptions
-				    exn
-				  (begin
-				    (debug:print 1 *default-log-port* "Failed to read mod time on file "
-						 fullpath ", using 0, exn=" exn)
-				    0)
-				  (file-change-time fullpath)))))
-	       (if (< real-age age)
-		   (handle-exceptions
-		       exn
-		     (delfile exn)
-		     (let* ((res (with-input-from-file fullpath read)))
-		       (if (eof-object? res)
-			   (begin
-			     (delfile "n/a")
-			     #f)
-			   res)))
-		   (begin
-		     (debug:print-info 2 *default-log-port* "file " fullpath
-				       " is too old (" real-age" seconds) to trust, skipping reading it")
-		     #f))))
-	    (begin
-	      (debug:print 2 *default-log-port* "not reading file " fullpath)
-	      #f)))
-      #f))
- 
-(define (common:write-cached-info key dtype dat)
-  (if *toppath*
-      (let* ((fulldir  (conc *toppath* "/.sysdata"))
-	     (fullpath (conc fulldir "/" key "-" dtype ".log")))
-	(if (not (file-exists? fulldir))(create-directory fulldir #t))
-	(handle-exceptions
-	    exn
-	  (begin
-	    (debug:print 0 *default-log-port* "failed to write file " fullpath ", exn=" exn)
-	    #f)
-	  (with-output-to-file fullpath (lambda ()(pp dat)))))
-      #f))
-
-(define (common:raw-get-remote-host-load remote-host)
-  (handle-exceptions
-      exn
-    (begin
-      (debug:print 0 *default-log-port* "failed to ssh to " remote-host " and get loadavg. exn=" exn)
-      #f) ;; more specific handling of errors needed
-    (with-input-from-pipe 
-     (conc "ssh " remote-host " cat /proc/loadavg")
-     (lambda ()(list (read)(read)(read))))))
-
-;;======================================================================
-;; get cpu load by reading from /proc/loadavg, return all three values
-;;
-(define (common:get-cpu-load remote-host)
-  (handle-exceptions
-      exn
-    (begin
-      (debug:print 0 *default-log-port* "failed to ssh or read loadavg from host " remote-host ", exn=" exn)
-      '(-99 -99 -99))
-    (let* ((actual-hostname (or remote-host (get-host-name) "localhost")))
-      (or (common:get-cached-info actual-hostname "cpu-load")
-	  (let ((result (if remote-host
-			    (map (lambda (res)
-				   (if (eof-object? res) 9e99 res))
-			         (with-input-from-pipe 
-				  (conc "ssh " remote-host " cat /proc/loadavg")
-				  (lambda ()(list (read)(read)(read)))))
-			    (with-input-from-file "/proc/loadavg" 
-			      (lambda ()(list (read)(read)(read)))))))
-	    (match
-		result
-	      ((l1 l2 l3)
-	       (if (and (number? l1)
-		      (number? l2)
-		      (number? l3))
-		   (begin
-		     (common:write-cached-info actual-hostname "cpu-load" result)
-		     result)
-		   '(-1 -1 -1))) ;; -1 is bad result
-	      (else '(-2 -2 -2))))))))
-
-;;======================================================================
-;; get normalized cpu load by reading from /proc/loadavg and /proc/cpuinfo return all three values and the number of real cpus and the number of threads
-;; returns alist '((adj-cpu-load . normalized-proc-load) ... etc.
-;;  keys: adj-proc-load, adj-core-load, 1m-load, 5m-load, 15m-load
-;;
-(define (common:get-normalized-cpu-load remote-host)
-  (let ((res (common:get-normalized-cpu-load-raw remote-host))
-	(default `((adj-proc-load . 2) ;; there is no right answer
-		   (adj-core-load . 2)
-		   (1m-load       . 2)
-		   (5m-load       . 0) ;; causes a large delta - thus causing default of throttling if stuff goes wrong
-		   (15m-load      . 0)
-		   (proc          . 1)
-		   (core          . 1)
-		   (phys          . 1)
-		   (error         . #t))))
-    (cond
-     ((and (list? res)
-	   (> (length res) 2))
-      res)
-     ((eq? res #f)   default) ;; add messages?
-     ((eq? res #f) default)   ;; this would be the #eof
-     (else default))))
-
-(define (common:get-normalized-cpu-load-raw remote-host)
-  (let* ((actual-host (or remote-host (get-host-name)))) ;; #f is localhost
-    (or (common:get-cached-info actual-host "normalized-load")
-	(let ((data (if remote-host
-			(with-input-from-pipe 
-			    (conc "ssh " remote-host " \"cat /proc/loadavg;cat /proc/cpuinfo;echo end\"")
-			  read-lines)
-			(append 
-			 (with-input-from-file "/proc/loadavg" 
-			   read-lines)
-			 (with-input-from-file "/proc/cpuinfo"
-			   read-lines)
-			 (list "end"))))
-	      (load-rx  (regexp "^([\\d\\.]+)\\s+([\\d\\.]+)\\s+([\\d\\.]+)\\s+.*$"))
-	      (proc-rx  (regexp "^processor\\s+:\\s+(\\d+)\\s*$"))
-	      (core-rx  (regexp "^core id\\s+:\\s+(\\d+)\\s*$"))
-	      (phys-rx  (regexp "^physical id\\s+:\\s+(\\d+)\\s*$"))
-	      (max-num  (lambda (p n)(max (string->number p) n))))
-	  ;; (print "data=" data)
-	  (if (null? data) ;; something went wrong
-	      #f
-	      (let loop ((hed      (car data))
-			 (tal      (cdr data))
-			 (loads    #f)
-			 (proc-num 0)  ;; processor includes threads
-			 (phys-num 0)  ;; physical chip on motherboard
-			 (core-num 0)) ;; core
-		;;; (print hed ", " loads ", " proc-num ", " phys-num ", " core-num)
-		(if (null? tal) ;; have all our data, calculate normalized load and return result
-		    (let* ((act-proc (+ proc-num 1))
-			   (act-phys (+ phys-num 1))
-			   (act-core (+ core-num 1))
-			   (adj-proc-load (/ (car loads) act-proc))
-			   (adj-core-load (/ (car loads) act-core))
-			   (result
-			    (append (list (cons 'adj-proc-load adj-proc-load)
-					  (cons 'adj-core-load adj-core-load))
-				    (list (cons '1m-load (car loads))
-					  (cons '5m-load (cadr loads))
-					  (cons '15m-load (caddr loads)))
-				    (list (cons 'proc act-proc)
-					  (cons 'core act-core)
-					  (cons 'phys act-phys)))))
-		      (common:write-cached-info actual-host "normalized-load" result)
-		      result)
-		  (regex-case
-		   hed
-		   (load-rx  ( x l1 l5 l15 ) (loop (car tal)(cdr tal)(map string->number (list l1 l5 l15)) proc-num phys-num core-num))
-		   (proc-rx  ( x p         ) (loop (car tal)(cdr tal) loads           (max-num p proc-num) phys-num core-num))
-		   (phys-rx  ( x p         ) (loop (car tal)(cdr tal) loads           proc-num (max-num p phys-num) core-num))
-		   (core-rx  ( x c         ) (loop (car tal)(cdr tal) loads           proc-num phys-num (max-num c core-num)))
-		   (else 
-		    (begin
-		      ;; (print "NO MATCH: " hed)
-		      (loop (car tal)(cdr tal) loads proc-num phys-num core-num)))))))))))
-
-(define (common:unix-ping hostname)
-  (let ((res (system (conc "ping -c 1 " hostname " > /dev/null"))))
-    (eq? res 0)))
-
-;;======================================================================
-;; ideally put all this info into the db, no need to preserve it across moving homehost
-;;
-;; return list of
-;;  ( reachable? cpuload update-time )
-(define (common:get-host-info hostname)
-  (let* ((loadinfo                         (rmt:get-latest-host-load hostname)) ;; if this host happens to have been recently used by a test reuse the load data
-         (load                             (car loadinfo))
-         (load-sample-time                 (cdr loadinfo))
-         (load-sample-age                  (- (current-seconds) load-sample-time))
-         (loadinfo-timeout-seconds         6) ;; this was 20 seconds, seems way too lax. Switch to 6 seconds
-         (host-last-update-timeout-seconds 4)
-         (host-rec (hash-table-ref/default *host-loads* hostname #f))
-         )
-    (cond
-     ((< load-sample-age loadinfo-timeout-seconds)
-      (list #t
-            load-sample-time
-            load))
-     ((and host-rec
-           (< (current-seconds) (+ (host-last-update host-rec) host-last-update-timeout-seconds)))
-      (list #t
-            (host-last-update host-rec)
-            (host-last-cpuload host-rec )))
-     ((common:unix-ping hostname)
-      (list #t
-            (current-seconds)
-            (alist-ref 'adj-core-load (common:get-normalized-cpu-load hostname)))) ;; this is cheaper than you might think. get-normalized-cpu-load is cached for up to 5 seconds
-     (else
-      (list #f 0 -1) ;; bad host, don't use!
-      ))))
-
-;;======================================================================
-;; see defstruct host at top of file.
-;;    host: reachable last-update last-used last-cpuload
-;;
-(define (common:update-host-loads-table hosts-raw)
-  (let* ((hosts (filter (lambda (x)
-                          (string-match (regexp "^\\S+$") x))
-                        hosts-raw)))
-    (for-each
-     (lambda (hostname)
-       (let* ((rec       (let ((h (hash-table-ref/default *host-loads* hostname #f)))
-                          (if h
-                              h
-                              (let ((h (make-host)))
-                                (hash-table-set! *host-loads* hostname h)
-                                h))))
-              (host-info         (common:get-host-info hostname))
-              (is-reachable      (car host-info))
-              (last-reached-time (cadr host-info))
-              (load              (caddr host-info)))
-         (host-reachable-set!    rec is-reachable)
-         (host-last-update-set!  rec last-reached-time)
-         (host-last-cpuload-set! rec load)))
-     hosts)))
-
-;;======================================================================
-;; go through the hosts from least recently used to most recently used, pick the first that meets the load criteral from the
-;; [host-rules] section.
-;;
-(define (common:get-least-loaded-host hosts-raw host-type configdat)
-  (let* ((rdat       (configf:lookup configdat "host-rules" host-type))
-	 (rules      (common:val->alist (or rdat "") convert: #t))   ;; maxnload, maxnjobs, maxjobrate
-	 (maxnload   (common:alist-ref/default 'maxnload rules 1.5)) ;; max normalized load
-	 (maxnjobs   (common:alist-ref/default 'maxnjobs rules 1.5)) ;; max normalized number of jobs
-	 (maxjobrate (common:alist-ref/default 'maxjobrate rules (/ 1 6))) ;; max rate of submitting jobs to a given host in jobs/second
-	 (hosts      (filter (lambda (x)
-			       (string-match (regexp "^\\S+$") x))
-			     hosts-raw))
-         ;; (best-host #f)
-	 (get-rec    (lambda (hostname)
-		       ;; (print "get-rec hostname=" hostname)
-		       (let ((h (hash-table-ref/default *host-loads* hostname #f)))
-			 (if h
-			     h
-			     (let ((h (make-host)))
-			       (hash-table-set! *host-loads* hostname h)
-			       h)))))
-         (best-load 99999)
-         (curr-time (current-seconds))
-	 (get-hosts-sorted (lambda (hosts)
-			     (sort hosts (lambda (a b)
-					   (let ((a-rec (get-rec a))
-						 (b-rec (get-rec b)))
-					     ;; (print "a=" a " a-rec=" a-rec " host-last-used=" (host-last-used a-rec))
-					     ;; (print "b=" b " b-rec=" b-rec " host-last-used=" (host-last-used b-rec))
-					     (< (host-last-used a-rec)
-						(host-last-used b-rec))))))))
-    (debug:print 0 *default-log-port* "INFO: hosts-sorted=" (get-hosts-sorted hosts))
-    (if (null? hosts)
-	#f ;; no hosts to select from. All done and giving up now.
-	(let ((hosts-sorted (get-hosts-sorted hosts)))
-	  (common:update-host-loads-table hosts)
-	  (let loop ((hostname  (car hosts-sorted))
-		     (tal       (cdr hosts-sorted))
-		     (best-host #f))
-	    (let* ((rec       (get-rec hostname))
-		   (reachable (host-reachable     rec))
-		   (load      (host-last-cpuload  rec))
-		   (last-used (host-last-used     rec))
-		   (delta     (- curr-time last-used))
-		   (job-rate  (if (> delta 0)
-				  (/ 1 delta)
-				  999)) ;; jobs per second
-		   (new-best  
-		    (cond
-		     ((not reachable)
-		      (debug:print 0 *default-log-port* "Skipping host " hostname " as it cannot be reached.")
-		      best-host)
-		     ((and (< load maxnload)        ;; load is acceptable
-			   (< job-rate maxjobrate)) ;; job rate is acceptable
-		      (set! best-load load)
-		      hostname)
-		     (else best-host))))
-	      (debug:print 0 *default-log-port* "INFO: Trying host " hostname " with load " load ", last used " delta " seconds ago, with job-rate " job-rate " for running a test." )
-	      (if new-best
-		  (begin ;; found a host, return it
-		    (debug:print 0 *default-log-port* "INFO: Found host: " new-best " load: " load " last-used: " delta " seconds ago, with job-rate: " job-rate)
-		    (host-last-used-set! rec curr-time)
-		    new-best)
-		  (if (null? tal) #f (loop (car tal)(cdr tal) best-host)))))))))
-
-(define (common:wait-for-homehost-load maxnormload msg)
-  (let* ((hh-dat (if (common:on-homehost?) ;; if we are on the homehost then pass in #f so the calls are local.
-                     #f
-                     (common:get-homehost)))
-         (hh     (if hh-dat (car hh-dat) #f)))
-    (common:wait-for-normalized-load maxnormload msg hh)))
-
-(define (common:get-num-cpus remote-host)
-  (let* ((actual-host (or remote-host (get-host-name))))
-    ;; hosts had better not be changing the number of cpus too often!
-    (or (hash-table-ref/default *numcpus-cache* actual-host #f)
-	(let* ((numcpus (or (common:get-cached-info actual-host "num-cpus" age: (+ 2592000 (random 3600)))
-			    (let* ((proc   (lambda ()
-					     (let loop ((numcpu 0)
-							(inl    (read-line)))
-					       (if (eof-object? inl)
-						   (if (> numcpu 0)
-						       numcpu
-						       #f) ;; if zero return #f so caller knows that things are not working
-						   (loop (if (string-match "^processor\\s+:\\s+\\d+$" inl)
-							     (+ numcpu 1)
-							     numcpu)
-							 (read-line))))))
-				   (result (if remote-host
-					       (with-input-from-pipe 
-						(conc "ssh " remote-host " cat /proc/cpuinfo")
-						proc)
-					       (with-input-from-file "/proc/cpuinfo" proc))))
-			      (if (and (number? result)
-				       (> result 0))
-				  (common:write-cached-info actual-host "num-cpus" result))
-			      result))))
-	  (hash-table-set! *numcpus-cache* actual-host numcpus)
-	  numcpus))))
-
-;;======================================================================
-;; wait for normalized cpu load to drop below maxload
-;;
-(define (common:wait-for-normalized-load maxnormload msg remote-host #!optional (rem-tries 5))
-  (let ((num-cpus (common:get-num-cpus remote-host)))
-    (if num-cpus
-	(common:wait-for-cpuload maxnormload num-cpus 15 msg: msg remote-host: remote-host)
-	(begin
-	  (thread-sleep! (random 60)) ;; we failed to get num cpus. wait a bit and try again
-	  (if (> rem-tries 0)
-	      (common:wait-for-normalized-load maxnormload msg remote-host (- rem-tries 1))
-	      #f)))))
-
-;;======================================================================
-;; DO NOT CALL THIS DIRECTLY. It is called from common:wait-for-normalized-load
-;;   count     - count down to zero, at some point we'd give up if the load never drops
-;;   num-tries - count down to zero number tries to get numcpus
-;;
-(define (common:wait-for-cpuload maxnormload numcpus-in
-				 #!key (count 1000)
-				 (msg #f)(remote-host #f)(num-tries 5))
-  (let* ((loadavg     (common:get-cpu-load remote-host))
-	  ;; not possible to have zero.  If we get 1, it's possible that we got the previous default, and we should check again
-	 (numcpus     (if (<= 1 numcpus-in)
-			  (common:get-num-cpus remote-host)
-			  numcpus-in))
-	 (first       (car loadavg))
-	 (next        (cadr loadavg))
-	 (adjmaxload  (* maxnormload (max 1 numcpus))) ;; possible bug
-						   ;; where numcpus
-						   ;; (or could be
-						   ;; maxload) is
-						   ;; zero, crude
-						   ;; fallback is to
-						   ;; at least use 1
-	 ;; effective load accounts for load jumps, this should elminate all the first-next-avg, adjwait, load-jump-limit
-	 ;; etc.
-	 (effective-load    (common:get-intercept first next))
-	 (recommended-delay (common:get-delay effective-load numcpus))
-	 (effective-host    (or remote-host "localhost"))
-	 (normalized-effective-load (/ effective-load numcpus))
-	 (will-wait                 (> normalized-effective-load maxnormload)))
-    (if (> recommended-delay 1) 
-	(let* ((actual-delay (min recommended-delay 30)))
-	  (if (common:low-noise-print 30 (conc (round actual-delay) "-safe-load"))
-	      (debug:print-info 0 *default-log-port* "Load control, delaying "
-				actual-delay " seconds to maintain safe load. current normalized effective load is "
-				normalized-effective-load". maxnormload = " maxnormload " numcpus = " numcpus " loadavg = " loadavg " effective-load = " effective-load))
-	  (thread-sleep! actual-delay)))
-    
-    (cond
-     ;; bad data, try again to get the data
-     ((not will-wait)
-      (if (common:low-noise-print 3600 (conc (round normalized-effective-load) "-load-acceptable-" effective-host))
-      	  (debug:print 0 *default-log-port* "Effective load on " effective-host " is acceptable at " effective-load " continuing.")))
-
-     ((and (< first 0) ;; this indicates the loadavg data is bad - machine may not be reachable
-	   (> num-tries 0))
-      (debug:print 0 *default-log-port* "WARNING: received bad data from get-cpu-load "
-		   first ", we'll sleep 10s and try " num-tries " more times.")
-      (thread-sleep! 10)
-      (common:wait-for-cpuload maxnormload numcpus-in
-			       count: count remote-host: remote-host num-tries: (- num-tries 1)))
-
-     ;; need to wait for load to drop
-     ((and will-wait ;; (> first adjmaxload)
-	   (> count 0))
-      (debug:print-info 0 *default-log-port*
-			"Delaying 15" ;; adjwait
-			" seconds due to normalized effective load " normalized-effective-load ;; first
-			" exceeding max of " adjmaxload
-			" on server " (or remote-host (get-host-name))
-			" (normalized load-limit: " maxnormload ") " (if msg msg ""))
-      (thread-sleep! 15) ;; adjwait)
-      (common:wait-for-cpuload maxnormload numcpus count: (- count 1) msg: msg remote-host: remote-host)
-      ;; put the message here to indicate came out of waiting
-      (debug:print-info 1 *default-log-port*
-			"On host: " effective-host
-			", effective load: " effective-load
-			", numcpus: " numcpus
-			", normalized effective load: " normalized-effective-load
-			))
-     ;; overloaded and count expired (i.e. went to zero)
-     (else
-      (if (> num-tries 0) ;; should be "num-tries-left". 
-	  (if (common:low-noise-print 30 (conc (round effective-load) "-load-acceptable-" effective-host))
-	      (debug:print 0 *default-log-port* "Load on " effective-host " is acceptable at effective normalized load of "
-			   effective-normalized-load "  continuing."))
-	  (debug:print 0 *default-log-port* "Load on " effective-host ", "
-		       first" could not be retrieved. Giving up and continuing."))))))
-
-;;======================================================================
-;; DO NOT CALL THIS DIRECTLY. It is called from common:wait-for-normalized-load
-;;
-;; (define (common:wait-for-cpuload maxload-in numcpus-in waitdelay #!key (count 1000) (msg #f)(remote-host #f)(force-maxload #f)(num-tries 5))
-;;   (let* ((loadavg (common:get-cpu-load remote-host))
-;; 	 (numcpus (if (<= 1 numcpus-in) ;; not possible to have zero.  If we get 1, it's possible that we got the previous default, and we should check again
-;; 		      (common:get-num-cpus remote-host)
-;; 		      numcpus-in))
-;; 	 (maxload (if force-maxload
-;; 		      maxload-in
-;; 		      (if (number? maxload-in)
-;; 			  (max maxload-in 0.5)
-;; 			  0.5))) ;; so maxload must be greater than 0.5 for now BUG - FIXME?
-;; 	 (first   (car loadavg))
-;; 	 (next    (cadr loadavg))
-;; 	 (adjmaxload (* maxload (max 1 numcpus))) ;; possible bug where
-;; 					       ;; numcpus (or could be
-;; 					       ;; maxload) is zero,
-;; 					       ;; crude fallback is to
-;; 					       ;; at least use 1
-;; 	 (loadjmp (- first (if (> next (* numcpus 0.7)) ;; could do something with average of first and next?
-;; 			       0
-;; 			       next))) ;; we will force a conservative calculation any time next is large.
-;; 	 (first-next-avg    (/ (+ first next) 2))
-;; 	 ;; add some randomness to the time to break any alignment
-;; 	 ;; where netbatch dumps many jobs to machines simultaneously
-;;          (adjwait           (min (+ 300 (random 10)) (abs (* (+ (random 10)
-;; 								(/ (- 1000 count) 10)
-;; 								waitdelay)
-;; 							     (- first adjmaxload) ))))
-;; 	 (load-jump-limit   (configf:lookup-number *configdat* "setup" "load-jump-limit"))
-;; 	 ;; effective load accounts for load jumps, this should elminate all the first-next-avg, adjwait, load-jump-limit
-;; 	 ;; etc.
-;; 	 (effective-load    (common:get-intercept first next))
-;; 	 (effective-host    (or remote-host "localhost"))
-;; 	 (normalized-effective-load (/ effective-load numcpus))
-;; 	 (will-wait                 (> normalized-effective-load maxload)))
-;; 	 
-;;     ;; let's let the user know once in a long while that load checking
-;;     ;; is happening but not constantly report it
-;;     #;(if (common:low-noise-print 30 (conc "cpuload" (or remote-host "localhost"))) ;; (> (random 100) 75) ;; about 25% of the time
-;; 	(debug:print-info 1 *default-log-port* "Checking cpuload on " (or remote-host "localhost") ", maxload: " maxload
-;;     ", load: " first ", adjmaxload: " adjmaxload ", loadjmp: " loadjmp))
-;; 
-;;     (debug:print-info 1 *default-log-port*
-;; 		      "On host: " effective-host
-;; 		      ", effective load: " effective-load
-;; 		      ", numcpus: " numcpus
-;; 		      ", normalized effective load: " normalized-effective-load
-;; 		      )
-;;     
-;;     (cond
-;;      ;; bad data, try again to get the data
-;;      ((and (< first 0) ;; this indicates the loadavg data is bad - machine may not be reachable
-;; 	   (> num-tries 0))
-;;       (debug:print 0 *default-log-port* "WARNING: received bad data from get-cpu-load " first ", we'll sleep 10s and try " num-tries " more times.")
-;;       (thread-sleep! 10)
-;;       (common:wait-for-cpuload maxload-in numcpus-in waitdelay
-;; 			       count: count remote-host: remote-host force-maxload: force-maxload num-tries: (- num-tries 1)))
-;;      ;; need to wait for load to drop
-;;      ((and will-wait ;; (> first adjmaxload)
-;; 	   (> count 0))
-;;       (debug:print-info 0 *default-log-port*
-;; 			"Delaying " 15 ;; adjwait
-;; 			" seconds due to normalized effective load " normalized-effective-load ;; first
-;; 			" exceeding max of " adjmaxload
-;; 			" on server " (or remote-host (get-host-name))
-;; 			" (normalized load-limit: " maxload ") " (if msg msg ""))
-;;       (thread-sleep! 15) ;; adjwait)
-;;       (common:wait-for-cpuload maxload numcpus waitdelay count: (- count 1) msg: msg remote-host: remote-host))
-;;      ((and (> loadjmp (cond
-;; 		       (load-jump-limit load-jump-limit)
-;; 		       ((> numcpus 8)(/ numcpus 2))
-;; 		       ((> numcpus 4)(/ numcpus 1.2))
-;; 		       (else 0.5)))
-;; 	   (> count 0))
-;;       (debug:print-info 0 *default-log-port* "waiting " adjwait " seconds due to possible load jump " loadjmp ". "
-;; 			(if msg msg ""))
-;;       (thread-sleep! adjwait)
-;;       (common:wait-for-cpuload maxload numcpus waitdelay count: (- count 1) msg: msg remote-host: remote-host))
-;;      (else
-;;       (if (> num-tries 0)
-;; 	  (if (common:low-noise-print 30 (conc (round first) "-load-acceptable-" (or remote-host "localhost")))
-;; 	      (debug:print 0 *default-log-port* "Load on " (or remote-host "localhost") " is acceptable at " first " continuing."))
-;; 	  (debug:print 0 *default-log-port* "Load on " (or remote-host "localhost") ", "first" could not be retrieved. Giving up and continuing."))))))
-;; 
-(define (get-uname . params)
-  (let* ((uname-res (process:cmd-run->list (conc "uname " (if (null? params) "-a" (car params)))))
-	 (uname #f))
-    (if (null? (car uname-res))
-	"unknown"
-	(caar uname-res))))
-
-;; for reasons I don't understand multiple calls to real-path in parallel threads
-;; must be protected by mutexes
-;;
-(define (common:real-path inpath)
-  ;; (process:cmd-run-with-stderr->list "readlink" "-f" inpath)) ;; cmd . params)
-  ;; (let-values 
-  ;;  (((inp oup pid) (process "readlink" (list "-f" inpath))))
-  ;;  (with-input-from-port inp
-  ;;    (let loop ((inl (read-line))
-  ;;       	(res #f))
-  ;;      (print "inl=" inl)
-  ;;      (if (eof-object? inl)
-  ;;          (begin
-  ;;            (close-input-port inp)
-  ;;            (close-output-port oup)
-  ;;            ;; (process-wait pid)
-  ;;            res)
-  ;;          (loop (read-line) inl))))))
-  (with-input-from-pipe (conc "readlink -f " inpath) read-line))
-
-;;======================================================================
-;; D I S K   S P A C E 
-;;======================================================================
-
-(define (common:get-disk-space-used fpath)
-  (with-input-from-pipe (conc "/usr/bin/du -s " fpath) read))
-
-;;======================================================================
-;; given path get free space, allows override in [setup]
-;; with free-space-script /path/to/some/script.sh
-;;
-(define (get-df path)
-  (if (configf:lookup *configdat* "setup" "free-space-script")
-      (with-input-from-pipe 
-       (conc (configf:lookup *configdat* "setup" "free-space-script") " " path)
-       (lambda ()
-	 (let ((res (read-line)))
-	   (if (string? res)
-	       (string->number res)))))
-      (get-unix-df path)))
-
-(define (get-free-inodes path)
-  (if (configf:lookup *configdat* "setup" "free-inodes-script")
-      (with-input-from-pipe 
-	  (conc (configf:lookup *configdat* "setup" "free-inodes-script") " " path)
-	(lambda ()
-	  (let ((res (read-line)))
-	    (if (string? res)
-		(string->number res)))))
-      (get-unix-inodes path)))
-
-(define (get-unix-df path)
-  (let* ((df-results (process:cmd-run->list (conc "df " path)))
-	 (space-rx   (regexp "([0-9]+)\\s+([0-9]+)%"))
-	 (freespc    #f))
-    ;; (write df-results)
-    (for-each (lambda (l)
-		(let ((match (string-search space-rx l)))
-		  (if match 
-		      (let ((newval (string->number (cadr match))))
-			(if (number? newval)
-			    (set! freespc newval))))))
-	      (car df-results))
-    freespc))
-
-(define (get-unix-inodes path)
-  (let* ((df-results (process:cmd-run->list (conc "df -i " path)))
-	 (space-rx   (regexp "([0-9]+)\\s+([0-9]+)%"))
-	 (freenodes    0)) ;; 0 is a better failsafe than #f here.
-    ;; (write df-results)
-    (for-each (lambda (l)
-		(let ((match (string-search space-rx l)))
-		  (if match 
-		      (let ((newval (string->number (cadr match))))
-			(if (number? newval)
-			    (set! freenodes newval))))))
-	      (car df-results))
-    freenodes))
-
-(define (common:check-space-in-dir dirpath required)
-  (let* ((dbspace  (if (directory? dirpath)
-		       (get-df dirpath)
-		       0)))
-    (list (> dbspace required)
-	  dbspace
-	  required
-	  dirpath)))
-
-;;======================================================================
-;; check space in dbdir and in megatest dir
-;; returns: ok/not dbspace required-space
-;;
-(define (common:check-db-dir-space)
-  (let* ((required (string->number 
-                    ;; default is 1GB (or actually a billion bytes) This is the number of 1 kB blocks.
-		    (or (configf:lookup *configdat* "setup" "dbdir-space-required")
-			"1000000")))
-	 (dbdir    (common:get-db-tmp-area)) ;; (db:get-dbdir))
-	 (tdbspace (common:check-space-in-dir dbdir required))
-	 (mdbspace (common:check-space-in-dir *toppath* required)))
-    (sort (list tdbspace mdbspace) (lambda (a b)
-				     (< (cadr a)(cadr b))))))
-
-;;======================================================================
-;; check available space in dbdir, exit if insufficient
-;;
-(define (common:check-db-dir-and-exit-if-insufficient)
-  (let* ((spacedat (car (common:check-db-dir-space))) ;; look only at worst for now
-	 (is-ok    (car spacedat))
-	 (dbspace  (cadr spacedat))
-	 (required (caddr spacedat))
-	 (dbdir    (cadddr spacedat)))
-    (if (not is-ok)
-	(begin
-	  (debug:print-error 0 *default-log-port* "Insufficient space in " dbdir ", require " required ", have " dbspace  ", exiting now.")
-	  (exit 1)))))
-
-;;======================================================================
-;; paths is list of lists ((name path) ... )
-;;
-(define (common:get-disk-with-most-free-space disks minsize)
-  (let* ((best     #f)
-	(bestsize 0)
-        (default-min-inodes-string "1000000")
-        (default-min-inodes (string->number default-min-inodes-string))
-        (min-inodes (or (string->number (if (configf:lookup *configdat* "setup" "min_inodes") (configf:lookup *configdat* "setup" "min_inodes") default-min-inodes-string)) default-min-inodes)))
-
-    (for-each 
-     (lambda (disk-num)
-       (let* ((dirpath    (cadr (assoc disk-num disks)))
-	      (freespc    (cond
-			   ((not (directory? dirpath))
-			    (if (common:low-noise-print 300 "disks not a dir " disk-num)
-				(debug:print 0 *default-log-port* "WARNING: disk " disk-num " at path \"" dirpath "\" is not a directory - ignoring it."))
-			    -1)
-			   ((not (file-write-access? dirpath))
-			    (if (common:low-noise-print 300 "disks not writeable " disk-num)
-				(debug:print 0 *default-log-port* "WARNING: disk " disk-num " at path \"" dirpath "\" is not writeable - ignoring it."))
-			    -1)
-			   ((not (eq? (string-ref dirpath 0) #\/))
-			    (if (common:low-noise-print 300 "disks not a proper path " disk-num)
-				(debug:print 0 *default-log-port* "WARNING: disk " disk-num " at path \"" dirpath "\" is not a fully qualified path - ignoring it."))
-			    -1)
-			   (else
-			    (get-df dirpath))))
-	      (free-inodes (cond
-			   ((not (directory? dirpath))
-			    (if (common:low-noise-print 300 "disks not a dir " disk-num)
-				(debug:print 0 *default-log-port* "WARNING: disk " disk-num " at path \"" dirpath "\" is not a directory - ignoring it."))
-			    -1)
-			   ((not (file-write-access? dirpath))
-			    (if (common:low-noise-print 300 "disks not writeable " disk-num)
-				(debug:print 0 *default-log-port* "WARNING: disk " disk-num " at path \"" dirpath "\" is not writeable - ignoring it."))
-			    -1)
-			   ((not (eq? (string-ref dirpath 0) #\/))
-			    (if (common:low-noise-print 300 "disks not a proper path " disk-num)
-				(debug:print 0 *default-log-port* "WARNING: disk " disk-num " at path \"" dirpath "\" is not a fully qualified path - ignoring it."))
-			    -1)
-			   (else
-			    (get-free-inodes dirpath))))
-             ;;(free-inodes (get-free-inodes dirpath))
-             )
-             (debug:print 2 *default-log-port* "INFO: disk " disk-num " path " dirpath " free space " freespc " free inodes " free-inodes)
-	 (if (and (> freespc bestsize)(> free-inodes min-inodes ))
-	     (begin
-	       (set! best     (cons disk-num dirpath))
-	       (set! bestsize freespc)))
-        ;;(print "Processing: " disk-num " bestsize: " bestsize " best: " best " freespc: " freespc " min-inodes: " min-inodes " free-inodes: " free-inodes)
-      ))
-     (map car disks))
-    (if (and best (> bestsize minsize))
-	best
-	#f))) ;; #f means no disk candidate found
-
-;;======================================================================
-;; convert a spec string to a list of vectors #( rx  action rx-string )
-(define (common:spec-string->list-of-specs spec-string actions)
-  (let ((spec-strings  (string-split-fields "\\s*;\\s*" spec-string #:infix))
-	(actions-regex (regexp (conc "^(.*)\\s+(" (string-intersperse (map conc actions) "|") ")"))))
-    (filter
-     (lambda (x) x)
-     (map (lambda (s)
-	    (let ((m (string-match actions-regex s)))
-	      (if m
-		  (vector (regexp (cadr m))(string->symbol (caddr m))(cadr m))
-		  (begin
-		    (debug:print 0 *default-log-port* "WARNING: Unrecognised rule \"" s "\" in clean-up specification.")
-		    #f))))
-	  spec-strings))))
-  
-;;======================================================================
-;; given a list of specs rx . rule and a file return the first matching rule
-;; 
-(define (common:file-find-rule fname rules) ;; rule is vector #( rx action rx-string)
-  (let loop ((rule   (car rules))
-	     (tail   (cdr rules)))
-    (let ((rx (vector-ref rule 0))
-	  (rn (vector-ref rule 1))) ;; rule name
-      (if (string-match rx fname)
-	  rule ;; return the whole rule so regex can be printed etc.
-	  (if (null? tail)
-	      #f
-	      (loop (car tail)(cdr tail)))))))
-
-;;======================================================================
-;; given a spec apply some rules to a directory
-;;
-;;  WARNING: This function will REMOVE files - be sure your spec and path is correct!
-;;
-;; spec format:
-;;   file-regex1 action; file-regex2 action; ...
-;; e.g.
-;;   .*\.log$ keep; .* remove
-;;   --> keep all .log files, remove everything else
-;; limitations:
-;;   cannot have a rule with ; as part of the spec
-;;   not very flexible, would be nice to return binned file names?
-;; supported rules:
-;;   keep     - keep this file
-;;   remove   - remove this file
-;;   compress - compress this file
-;;
-(define (common:dir-clean-up path spec-string #!key (compress "gzip")(actions '(keep remove compress))(remove-empty #f))
-  (let* ((specs         (common:spec-string->list-of-specs spec-string actions))
-	 (keepers       (make-hash-table))
-	 (directories   (make-hash-table)))
-    (find-files 
-     path
-     action: (lambda (p res)
-	       (let ((rule  (common:file-find-rule p specs)))
-		 (cond
-		  ((directory? p)(hash-table-set! directories p #t))
-		  (else
-		   (case (vector-ref rule 1)
-		     ((keep)(hash-table-set! keepers p rule))
-		     ((remove)
-		      (print "Removing file " p)
-		      (delete-file p))
-		     ((compress)
-		      (print "Compressing file " p)
-		      (system (conc compress " " p)))
-		     (else
-		      (print "No match for file " p))))))))
-    (if remove-empty
-	(for-each
-	 (lambda (d)
-	   (if (null? (glob (conc d "/.*")(conc d "/*")))
-	       (begin
-		 (print "Removing empty directory " d)
-		 (delete-directory d))))
-	 (sort (hash-table-keys directories) (lambda (a b)(> (string-length a)(string-length b))))))
-    ))
-
-;;======================================================================
-;; E N V I R O N M E N T   V A R S
-;;======================================================================
-
-(define (bb-check-path #!key (msg "check-path: "))
-  (let ((path (or (get-environment-variable "PATH") "none")))
-    (debug:print-info 0 *default-log-port* (conc msg" : $PATH="path))
-    (if (string-match "^.*/isoenv-core/.*" path)
-        (debug:print-error 0 *default-log-port* (conc msg" : !!ISOENV PRESENT!!")) ;; remove for prod
-        (debug:print-info 1 *default-log-port* (conc msg" : **no isoenv present**")))))
-	      
-(define (save-environment-as-files fname #!key (ignorevars (list "USER" "HOME" "DISPLAY" "LS_COLORS" "XKEYSYMDB" "EDITOR" "MAKEFLAGS" "MAKEF" "MAKEOVERRIDES")))
-  ;;(bb-check-path msg: "save-environment-as-files entry")
-  (let ((envvars (get-environment-variables))
-        (whitesp (regexp "[^a-zA-Z0-9_\\-:,\\.\\/%$]"))
-	(mungeval (lambda (val)
-		    (cond
-		     ((eq? val #t) "") ;; convert #t to empty string
-		     ((eq? val #f) #f) ;; convert #f to itself (still thinking about this one
-		     (else val)))))
-    (with-output-to-file (conc fname ".csh")
-       (lambda ()
-          (for-each (lambda (keyval)
-		      (let* ((key   (car keyval))
-			     (val   (cdr keyval))
-			     (delim (if (string-search whitesp val) 
-					"\""
-					"")))
-			(print (if (or (member key ignorevars)
-				       (string-search whitesp key))
-				   "# setenv "
-				   "setenv ")
-			       key " " delim (mungeval val) delim)))
-		    envvars)))
-     (with-output-to-file (conc fname ".sh")
-       (lambda ()
-          (for-each (lambda (keyval)
-		      (let* ((key (car keyval))
-			     (val (cdr keyval))
-			     (delim (if (string-search whitesp val) 
-					"\""
-					"")))
-			(print (if (or (member key ignorevars)
-				       (string-search whitesp key)
-				       (string-search ":" key)) ;; internal only values to be skipped.
-				   "# export "
-				   "export ")
-			       key "=" delim (mungeval val) delim)))
-                    envvars)))))
-
-(define (common:get-param-mapping #!key (flavor #f))
-  "returns alist mapping string keys in testconfig/subrun to megatest command line switches; if flavor is switch-symbol, maps tcmt symbolic switches to megatest switches"
-  (let ((default '(("tag-expr"  . "-tagexpr")
-                   ("mode-patt" . "-modepatt")
-                   ("run-name"  . "-runname")
-                   ("contour"   . "-contour")
-                   ("target"    . "-target")
-                   ("test-patt" . "-testpatt")
-                   ("msg"       . "-m")
-                   ("log"       . "-log")
-                   ("start-dir" . "-start-dir")
-                   ("new"       . "-set-state-status"))))
-    (if (eq? flavor 'switch-symbol)
-        (map (lambda (x)
-               (cons (string->symbol (conc "-" (car x))) (cdr x)))
-             default)
-        default)))
-
-;;======================================================================
-;; set some env vars from an alist, return an alist with original values
-;; (("VAR" "value") ...)
-;; a value of #f means "unset this var"
-;;
-(define (alist->env-vars lst)
-  (if (list? lst)
-      (let ((res '()))
-	(for-each (lambda (p)
-		    (let* ((var (car  p))
-			   (val (cadr p))
-			   (prv (get-environment-variable var)))
-		      (set! res (cons (list var prv) res))
-		      (if val 
-			  (safe-setenv var (->string val))
-			  (unsetenv var))))
-		  lst)
-	res)
-      '()))
-
-;;======================================================================
-;; clear vars matching pattern, run proc, set vars back
-;; if proc is a string run that string as a command with
-;; system.
-;;
-(define *common:orig-env*
-  (let ((envvars (get-environment-variables)))
-    (if (get-environment-variable "MT_ORIG_ENV")
-        (with-input-from-string
-            (z3:decode-buffer (base64:base64-decode (get-environment-variable "MT_ORIG_ENV")))
-          read)
-        (filter-map (lambda (x)
-                      (if (string-match "^MT_.*" (car x))
-                          #f
-                          x))
-                    envvars))))
-
-(define (common:with-orig-env proc)
-  (let  ((current-env (get-environment-variables)))
-    (for-each (lambda (x) (unsetenv (car x)))             current-env)
-    (for-each (lambda (x) (setenv (car x) (cdr x))) *common:orig-env*)
-    (let ((rv (cond
-               ((string? proc)(system proc))
-               (proc          (proc)))))
-      (for-each (lambda (x) (unsetenv (car x))) *common:orig-env*)
-      (for-each (lambda (x) (setenv (car x) (cdr x))) current-env)
-      rv)))
-
-(define (common:without-vars proc . var-patts)
-  (let ((vars (make-hash-table)))
-    (for-each
-     (lambda (vardat) ;; each env var
-       (for-each
-	(lambda (var-patt)
-	  (if (string-match var-patt (car vardat))
-	      (let ((var (car vardat))
-		    (val (cdr vardat)))
-		(hash-table-set! vars var val)
-		(unsetenv var))))
-	var-patts))
-     (get-environment-variables))
-    (cond
-     ((string? proc)(system proc))
-     (proc          (proc)))
-    (hash-table-for-each
-     vars
-     (lambda (var val)
-       (setenv var val)))
-    vars))
-
-(define (common:run-a-command cmd #!key (with-vars #f) (with-orig-env #f))
-  (let* ((pre-cmd  (dtests:get-pre-command))
-         (post-cmd (dtests:get-post-command))
-         (fullcmd  (if (or pre-cmd post-cmd)
-                       (conc pre-cmd cmd post-cmd)
-                       (conc "viewscreen " cmd))))
-    (debug:print-info 02 *default-log-port* "Running command: " fullcmd)
-    (cond
-     (with-vars     (common:without-vars  fullcmd))
-     (with-orig-env (common:with-orig-env fullcmd))
-     (else          (common:without-vars  fullcmd "MT_.*")))))
-		  
-;;======================================================================
-;; T I M E   A N D   D A T E
-;;======================================================================
-
-;;======================================================================
-;; Convert strings like "5s 2h 3m" => 60x60x2 + 3x60 + 5
-(define (common:hms-string->seconds tstr)
-  (let ((parts     (string-split-fields "\\w+" tstr))
-	(time-secs 0)
-	;; s=seconds, m=minutes, h=hours, d=days, M=months, y=years, w=weeks
-	(trx       (regexp "(\\d+)([smhdMyw])")))
-    (for-each (lambda (part)
-		(let ((match  (string-match trx part)))
-		  (if match
-		      (let ((val (string->number (cadr match)))
-			    (unt (caddr match)))
-			(if val 
-			    (set! time-secs (+ time-secs (* val
-							    (case (string->symbol unt)
-							      ((s) 1)
-							      ((m) 60) ;; minutes
-							      ((h) 3600)
-							      ((d) 86400)
-							      ((w) 604800)
-							      ((M) 2628000) ;; aproximately one month
-							      ((y) 31536000)
-							      (else #f))))))))))
-	      parts)
-    time-secs))
-		       
-(define (seconds->hr-min-sec secs)
-  (let* ((hrs (quotient secs 3600))
-	 (min (quotient (- secs (* hrs 3600)) 60))
-	 (sec (- secs (* hrs 3600)(* min 60))))
-    (conc (if (> hrs 0)(conc hrs "hr ") "")
-	  (if (> min 0)(conc min "m ")  "")
-	  sec "s")))
-
-(define (seconds->time-string sec)
-  (time->string 
-   (seconds->local-time sec) "%H:%M:%S"))
-
-(define (seconds->work-week/day-time sec)
-  (time->string
-   (seconds->local-time sec) "ww%V.%u %H:%M"))
-
-(define (seconds->work-week/day sec)
-  (time->string
-   (seconds->local-time sec) "ww%V.%u"))
-
-(define (seconds->year-work-week/day sec)
-  (time->string
-   (seconds->local-time sec) "%yww%V.%w"))
-
-(define (seconds->year-work-week/day-time sec)
-  (time->string
-   (seconds->local-time sec) "%Yww%V.%w %H:%M"))
-
-(define (seconds->year-week/day-time sec)
-  (time->string
-   (seconds->local-time sec) "%Yw%V.%w %H:%M"))
-
-(define (seconds->quarter sec)
-  (case (string->number
-	 (time->string 
-	  (seconds->local-time sec)
-	  "%m"))
-    ((1 2 3) 1)
-    ((4 5 6) 2)
-    ((7 8 9) 3)
-    ((10 11 12) 4)
-    (else #f)))
-
-;;======================================================================
-;; basic ISO8601 format (e.g. "2017-02-28 06:02:54") date time => Unix epoch
-;;
-(define (common:date-time->seconds datetime)
-  (local-time->seconds (string->time datetime "%Y-%m-%d %H:%M:%S")))
-
-;;======================================================================
-;; given span of seconds tstart to tend
-;; find start time to mark and mark delta
-;;
-(define (common:find-start-mark-and-mark-delta tstart tend)
-  (let* ((deltat   (- (max tend (+ tend 10)) tstart)) ;; can't handle runs of less than 4 seconds. Pad it to 10 seconds ...
-	 (result   #f)
-	 (min      60)
-	 (hr       (* 60 60))
-	 (day      (* 24 hr))
-	 (yr       (* 365 day)) ;; year
-	 (mo       (/ yr 12))
-	 (wk       (* day 7)))
-    (for-each
-     (lambda (max-blks)
-       (for-each
-	(lambda (span) ;; 5 2 1
-	  (if (not result)
-	      (for-each 
-	       (lambda (timeunit timesym) ;; year month day hr min sec
-		 (if (not result)
-		     (let* ((time-blk (* span timeunit))
-			    (num-blks (quotient deltat time-blk)))
-		       (if (and (> num-blks 4)(< num-blks max-blks))
-			   (let ((first (* (quotient tstart time-blk) time-blk)))
-			     (set! result (list span timeunit time-blk first timesym))
-			     )))))
-	       (list yr mo wk day hr min 1)
-	       '(     y  mo w  d   h  m   s))))
-	(list 8 6 5 2 1)))
-     '(5 10 15 20 30 40 50 500))
-    (if values
-	(apply values result)
-	(values 0 day 1 0 'd))))
-
-;;======================================================================
-;; given x y lim return the cron expansion
-;;
-(define (common:expand-cron-slash x y lim)
-  (let loop ((curr x)
-	     (res  `()))
-    (if (< curr lim)
-	(loop (+ curr y) (cons curr res))
-	(reverse res))))
-
-;;======================================================================
-;; expand a complex cron string to a list of cron strings
-;;
-;;  x/y   => x, x+y, x+2y, x+3y while x+Ny<max_for_field
-;;  a,b,c => a, b ,c
-;;
-;;   NOTE: with flatten a lot of the crud below can be factored down.
-;;
-(define (common:cron-expand cron-str)
-  (if (list? cron-str)
-      (flatten
-       (fold (lambda (x res)
-	       (if (list? x)
-		   (let ((newres (map common:cron-expand x)))
-		     (append x newres))
-		   (cons x res)))
-	     '()
-	     cron-str)) ;; (map common:cron-expand cron-str))
-      (let ((cron-items (string-split cron-str))
-	    (slash-rx   (regexp "(\\d+)/(\\d+)"))
-	    (comma-rx   (regexp ".*,.*"))
-	    (max-vals   '((min        . 60)
-			  (hour       . 24)
-			  (dayofmonth . 28) ;;; BUG!!!! This will be a bug for some combinations
-			  (month      . 12)
-			  (dayofweek  . 7))))
-	(if (< (length cron-items) 5) ;; bad spec
-	    cron-str ;; `(,cron-str)              ;; just return the string, something downstream will fix it
-	    (let loop ((hed  (car cron-items))
-		       (tal  (cdr cron-items))
-		       (type 'min)
-		       (type-tal '(hour dayofmonth month dayofweek))
-		       (res  '()))
-	      (regex-case
-		  hed
-		(slash-rx ( _ base incr ) (let* ((basen          (string->number base))
-						 (incrn          (string->number incr))
-						 (expanded-vals  (common:expand-cron-slash basen incrn (alist-ref type max-vals)))
-						 (new-list-crons (fold (lambda (x myres)
-									 (cons (conc (if (null? res)
-											 ""
-											 (conc (string-intersperse res " ") " "))
-										     x " " (string-intersperse tal " "))
-									       myres))
-								       '() expanded-vals)))
-					    ;; (print "new-list-crons: " new-list-crons)
-					    ;; (fold (lambda (x res)
-					    ;; 	    (if (list? x)
-					    ;; 		(let ((newres (map common:cron-expand x)))
-					    ;; 		  (append x newres))
-					    ;; 		(cons x res)))
-					    ;; 	  '()
-					    (flatten (map common:cron-expand new-list-crons))))
-		;;					    (map common:cron-expand (map common:cron-expand new-list-crons))))
-		(else (if (null? tal)
-			  cron-str
-			  (loop (car tal)(cdr tal)(car type-tal)(cdr type-tal)(append res (list hed)))))))))))
-
-;;======================================================================
-;; given a cron string and the last time event was processed return #t to run or #f to not run
-;;
-;;  min    hour   dayofmonth month  dayofweek
-;; 0-59    0-23   1-31       1-12   0-6          ### NOTE: dayofweek does not include 7
-;;
-;;  #t => yes, run the job
-;;  #f => no, do not run the job
-;;
-(define (common:cron-event cron-str now-seconds-in last-done) ;; ref-seconds = #f is NOW.
-  (let* ((cron-items     (map string->number (string-split cron-str)))
-	 (now-seconds    (or now-seconds-in (current-seconds)))
-	 (now-time       (seconds->local-time now-seconds))
-	 (last-done-time (seconds->local-time last-done))
-	 (all-times      (make-hash-table)))
-    ;; (print "cron-items: " cron-items "(length cron-items): " (length cron-items))
-    (if (not (eq? (length cron-items) 5)) ;; don't even try to figure out junk strings
-	#f
-	(match-let (((     cmin chour cdayofmonth cmonth    cdayofweek)
-		     cron-items)
-		    ;; 0     1    2        3         4    5      6
-		    ((nsec nmin nhour ndayofmonth nmonth nyr ndayofweek n7 n8 n9)
-		     (vector->list now-time))
-		    ((lsec lmin lhour ldayofmonth lmonth lyr ldayofweek l7 l8 l9)
-		     (vector->list last-done-time)))
-	  ;; create all possible time slots
-	  ;; remove invalid slots due to (for example) day of week
-	  ;; get the start and end entries for the ref-seconds (current) time
-	  ;; if last-done > ref-seconds => this is an ERROR!
-	  ;; does the last-done time fall in the legit region?
-	  ;;    yes => #f  do not run again this command
-	  ;;    no  => #t  ok to run the command
-	  (for-each ;; month
-	   (lambda (month)
-	     (for-each ;; dayofmonth
-	      (lambda (dom)
-		(for-each
-		 (lambda (hr) ;; hour
-		   (for-each
-		    (lambda (minute) ;; minute
-		      (let ((copy-now (apply vector (vector->list now-time))))
-			(vector-set! copy-now 0 0) ;; force seconds to zero
-			(vector-set! copy-now 1 minute)
-			(vector-set! copy-now 2 hr)
-			(vector-set! copy-now 3 dom)  ;; dom is already corrected for zero referenced
-			(vector-set! copy-now 4 month)
-			(let* ((copy-now-secs (local-time->seconds copy-now))
-			       (new-copy      (seconds->local-time copy-now-secs))) ;; remake the time vector
-			  (if (or (not cdayofweek)
-				  (equal? (vector-ref new-copy 6)
-					  cdayofweek)) ;; if the day is specified and a match OR if the day is NOT specified
-			      (if (or (not cdayofmonth)
-				      (equal? (vector-ref new-copy 3)
-					      (+ 1 cdayofmonth))) ;; if the month is specified and a match OR if the month is NOT specified
-				  (hash-table-set! all-times copy-now-secs new-copy))))))
-		    (if cmin
-			`(,cmin)  ;; if given cmin, have to use it
-			(list (- nmin 1) nmin (+ nmin 1))))) ;; minute
-		 (if chour
-		     `(,chour)
-		     (list (- nhour 1) nhour (+ nhour 1))))) ;; hour
-	      (if cdayofmonth
-		  `(,cdayofmonth)
-		  (list (- ndayofmonth 1) ndayofmonth (+ ndayofmonth 1)))))
-	   (if cmonth
-	       `(,cmonth)
-	       (list (- nmonth 1) nmonth (+ nmonth 1))))
-	  (let ((before #f)
-		(is-in  #f))
-	    (for-each
-	     (lambda (moment)
-	       (if (and before
-			(<= before now-seconds)
-			(>= moment now-seconds))
-		   (begin
-		     ;; (print)
-		     ;; (print "Before: " (time->string (seconds->local-time before)))
-		     ;; (print "Now:    " (time->string (seconds->local-time now-seconds)))
-		     ;; (print "After:  " (time->string (seconds->local-time moment)))
-		     ;; (print "Last:   " (time->string (seconds->local-time last-done)))
-		     (if (<  last-done before)
-			 (set! is-in before))
-		     ))
-	       (set! before moment))
-	     (sort (hash-table-keys all-times) <))
-	    is-in)))))
-
-(define (common:extended-cron  cron-str now-seconds-in last-done)
-  (let ((expanded-cron (common:cron-expand cron-str)))
-    (if (string? expanded-cron)
-	(common:cron-event expanded-cron now-seconds-in last-done)
-	(let loop ((hed (car expanded-cron))
-		   (tal (cdr expanded-cron)))
-	  (if (common:cron-event hed now-seconds-in last-done)
-	      #t
-	      (if (null? tal)
-		  #f
-		  (loop (car tal)(cdr tal))))))))
-
-;;======================================================================
-;; C O L O R S
-;;======================================================================
-      
-(define (common:name->iup-color name)
-  (case (string->symbol (string-downcase name))
-    ((red)    "223 33 49")
-    ((grey)   "192 192 192")
-    ((orange) "255 172 13")
-    ((purple) "This is unfinished ...")))
-
-;;======================================================================
-;; (define (common:get-color-for-state-status state status)
-;;   (case (string->symbol state)
-;;     ((COMPLETED)
-;;      (case (string->symbol status)
-;;        ((PASS)        "70  249 73")
-;;        ((WARN WAIVED) "255 172 13")
-;;        ((SKIP)        "230 230 0")
-;;        (else "223 33 49")))
-;;     ((LAUNCHED)         "101 123 142")
-;;     ((CHECK)            "255 100 50")
-;;     ((REMOTEHOSTSTART)  "50  130 195")
-;;     ((RUNNING)          "9   131 232")
-;;     ((KILLREQ)          "39  82  206")
-;;     ((KILLED)           "234 101 17")
-;;     ((NOT_STARTED)      "240 240 240")
-;;     (else               "192 192 192")))
-
-(define (common:iup-color->rgb-hex instr)
-  (string-intersperse 
-   (map (lambda (x)
-          (number->string x 16))
-        (map string->number
-             (string-split instr)))
-   "/"))
-
-;;======================================================================
-;; L O C K I N G   M E C H A N I S M S 
-;;======================================================================
-
-;;======================================================================
-;; faux-lock is deprecated. Please use simple-lock below
-;;
-(define (common:faux-lock keyname #!key (wait-time 8)(allow-lock-steal #t))
-  (if (rmt:no-sync-get/default keyname #f) ;; do not be tempted to compare to pid. locking is a one-shot action, if already locked for this pid it doesn't actually count
-      (if (> wait-time 0)
-	  (begin
-	    (thread-sleep! 1)
-	    (if (eq? wait-time 1) ;; only one second left, steal the lock
-		(begin
-		  (debug:print-info 0 *default-log-port* "stealing lock for " keyname)
-		  (common:faux-unlock keyname force: #t)))
-	    (common:faux-lock keyname wait-time: (- wait-time 1)))
-	  #f)
-      (begin
-        (rmt:no-sync-set keyname (conc (current-process-id)))
-        (equal? (conc (current-process-id)) (conc (rmt:no-sync-get/default keyname #f))))))
-
-(define (common:faux-unlock keyname #!key (force #f))
-  (if (or force (equal? (conc (current-process-id)) (conc (rmt:no-sync-get/default keyname #f))))
-      (begin
-        (if (rmt:no-sync-get/default keyname #f) (rmt:no-sync-del! keyname))
-        #t)
-      #f))
-
-;;======================================================================
-;; simple lock. improve and converge on this one.
-;;
-(define (common:simple-lock keyname)
-  (rmt:no-sync-get-lock keyname))
-
-(define (common:simple-unlock keyname #!key (force #f))
-  (rmt:no-sync-del! keyname))
-
-;;======================================================================
-;;
-;;======================================================================
-
-(define (common:in-running-test?)
-  (and (args:get-arg "-execute") (get-environment-variable "MT_CMDINFO")))
-
-(define (common:get-color-from-status status)
-  (cond
-   ((equal? status "PASS")    "green")
-   ((equal? status "FAIL")    "red")
-   ((equal? status "WARN")    "orange")
-   ((equal? status "KILLED")  "orange")
-   ((equal? status "KILLREQ") "purple")
-   ((equal? status "RUNNING") "blue")
-   ((equal? status "ABORT")   "brown")
-   (else "black")))
-
-;;======================================================================
-;; N A N O M S G   C L I E N T
-;;======================================================================
-;; 
-;; 
-;; 
-;; (define (common:send-dboard-main-changed)
-;;   (let* ((dashboard-ips (mddb:get-dashboards)))
-;;     (for-each
-;;      (lambda (ipadr)
-;;        (let* ((soc (common:open-nm-req (conc "tcp://" ipadr)))
-;; 	      (msg (conc "main " *toppath*))
-;; 	      (res (common:nm-send-receive-timeout soc msg)))
-;; 	 (if (not res) ;; couldn't reach that dashboard - remove it from db
-;; 	     (print "ERROR: couldn't reach dashboard " ipadr))
-;; 	 res))
-;;      dashboard-ips)))
-;;     
-;;     
-;; ;;======================================================================
-;; ;; D A S H B O A R D   D B 
-;; ;;======================================================================
-;; 
-;; (define (mddb:open-db)
-;;   (let* ((db (open-database (conc (get-environment-variable "HOME") "/.dashboard.db"))))
-;;     (set-busy-handler! db (busy-timeout 10000))
-;;     (for-each
-;;      (lambda (qry)
-;;        (exec (sql db qry)))
-;;      (list 
-;;       "CREATE TABLE IF NOT EXISTS vars       (id INTEGER PRIMARY KEY,key TEXT, val TEXT, CONSTRAINT varsconstraint UNIQUE (key));"
-;;       "CREATE TABLE IF NOT EXISTS dashboards (
-;;           id         INTEGER PRIMARY KEY,
-;;           pid        INTEGER,
-;;           username   TEXT,
-;;           hostname   TEXT,
-;;           ipaddr     TEXT,
-;;           portnum    INTEGER,
-;;           start_time TIMESTAMP DEFAULT (strftime('%s','now')),
-;;              CONSTRAINT hostport UNIQUE (hostname,portnum)
-;;         );"
-;;       ))
-;;     db))
-;; 
-;; ;; register a dashboard 
-;; ;;
-;; (define (mddb:register-dashboard port)
-;;   (let* ((pid      (current-process-id))
-;; 	 (hostname (get-host-name))
-;; 	 (ipaddr   (server:get-best-guess-address hostname))
-;; 	 (username (current-user-name)) ;; (car userinfo)))
-;; 	 (db      (mddb:open-db)))
-;;     (print "Register monitor, pid: " pid ", hostname: " hostname ", port: " port ", username: " username)
-;;     (exec (sql db "INSERT OR REPLACE INTO dashboards (pid,username,hostname,ipaddr,portnum) VALUES (?,?,?,?,?);")
-;; 	   pid username hostname ipaddr port)
-;;     (close-database db)))
-;; 
-;; ;; unregister a monitor
-;; ;;
-;; (define (mddb:unregister-dashboard host port)
-;;   (let* ((db      (mddb:open-db)))
-;;     (print "Register unregister monitor, host:port=" host ":" port)
-;;     (exec (sql db "DELETE FROM dashboards WHERE hostname=? AND portnum=?;") host port)
-;;     (close-database db)))
-;; 
-;; ;; get registered dashboards
-;; ;;
-;; (define (mddb:get-dashboards)
-;;   (let ((db (mddb:open-db)))
-;;     (query fetch-column
-;; 	   (sql db "SELECT ipaddr || ':' || portnum FROM dashboards;"))))
-    
-;;======================================================================
-;;  T E S T   L A U N C H I N G   P E R   I T E M   W I T H   H O S T   T Y P E S
-;;======================================================================
-;; 
-;; [hosts]
-;; arm cubie01 cubie02
-;; x86_64 zeus xena myth01
-;; allhosts #{g hosts arm} #{g hosts x86_64}
-;; 
-;; [host-types]
-;; general #MTLOWESTLOAD #{g hosts allhosts}
-;; arm     #MTLOWESTLOAD #{g hosts arm}
-;; nbgeneral nbjob run JOBCOMMAND -log $MT_LINKTREE/$MT_TARGET/$MT_RUNNAME.$MT_TESTNAME-$MT_ITEM_PATH.lgo
-;;
-;; [host-rules]
-;; # maxnload   => max normalized load
-;; # maxnjobs   => max jobs per cpu
-;; # maxjobrate => max jobs per second
-;; general maxnload=1.1; maxnjobs=1.2; maxjobrate=0.1 
-;; 
-;; [launchers]
-;; envsetup general
-;; xor/%/n 4C16G
-;; % nbgeneral
-;; 
-;; [jobtools]
-;; # if defined and not "no" flexi-launcher will bypass "launcher" unless no match.
-;; flexi-launcher yes  
-;; launcher nbfake
-;;
-(define (common:get-launcher configdat testname itempath)
-  (let ((fallback-launcher (configf:lookup configdat "jobtools" "launcher")))
-    (if (and (configf:lookup configdat "jobtools" "flexi-launcher") ;; overrides launcher
-	     (not (equal? (configf:lookup configdat "jobtools" "flexi-launcher") "no")))
-	(let* ((launchers         (hash-table-ref/default configdat "launchers" '())))
-	  (if (null? launchers)
-	      fallback-launcher
-	      (let loop ((hed (car launchers))
-			 (tal (cdr launchers)))
-		(let ((patt      (car hed))
-		      (host-type (cadr hed)))
-		  (if (tests:match patt testname itempath)
-		      (begin
-			(debug:print-info 2 *default-log-port* "Have flexi-launcher match for " testname "/" itempath " = " host-type)
-			(let ((launcher (configf:lookup configdat "host-types" host-type)))
-			  (if launcher
-			      (let* ((launcher-parts (string-split launcher))
-				     (launcher-exe   (car launcher-parts)))
-				(if (equal? launcher-exe "#MTLOWESTLOAD") ;; this is our special case, we will find the lowest load and craft a nbfake commandline
-				    (let host-loop ((targ-host (common:get-least-loaded-host (cdr launcher-parts) host-type configdat))
-						    (count     100))
-				      (if targ-host
-					  (conc "remrun " targ-host)
-					  (if (> count 0)
-					      (begin
-						(debug:print 0 *default-log-port* "INFO: Waiting for a host for host-type " host-type)
-						(thread-sleep! (- 101 count))
-						(host-loop (common:get-least-loaded-host (cdr launcher-parts) host-type configdat)
-							   (- count 1)))
-					      (begin
-						(debug:print 0 *default-log-port* "FATAL: Failed to find a host from #MTLOWESTLOAD for host-type " host-type)
-						(exit)))))
-				    launcher))
-			      (begin
-				(debug:print-info 0 *default-log-port* "WARNING: no launcher found for host-type " host-type)
-				(if (null? tal)
-				    fallback-launcher
-				    (loop (car tal)(cdr tal)))))))
-		      ;; no match, try again
-		      (if (null? tal)
-			  fallback-launcher
-			  (loop (car tal)(cdr tal))))))))
-	fallback-launcher)))
-
-;;======================================================================
-;; NMSG AND NEW API
-;;======================================================================
-;; 
-;; ;;======================================================================
-;; ;; nm based server experiment, keep around for now.
-;; ;;
-;; (define (nm:start-server dbconn #!key (given-host-name #f))
-;;   (let* ((srvdat    (start-raw-server given-host-name: given-host-name))
-;; 	 (host-name (srvdat-host srvdat))
-;; 	 (soc       (srvdat-soc srvdat)))
-;;     
-;;     ;; start the queue processor (save for second round of development)
-;;     ;;
-;;     (thread-start! (make-thread! (lambda ()(queue-processor dbconn) "Queue processor")))
-;;     ;; msg is an alist
-;;     ;;  'r host:port  <== where to return the data
-;;     ;;  'p params     <== data to apply the command to
-;;     ;;  'e j|s|l      <== encoding of the params. default is s (sexp), if not specified is assumed to be default
-;;     ;;  'c command    <== look up the function to call using this key
-;;     ;;
-;;     (let loop ((msg-in (nn-recv soc)))
-;;       (if (not (equal? msg-in "quit"))
-;; 	  (let* ((dat        (decode msg-in))
-;; 		 (host-port  (alist-ref 'r dat)) ;; this is for the reverse req rep where the server is a client of the original client
-;; 		 (params     (alist-ref 'p dat))
-;; 		 (command    (let ((c (alist-ref 'c dat)))(if c (string->symbol c) #f)))
-;; 		 (all-good   (and host-port params command (hash-table-exists? *commands* command))))
-;; 	    (if all-good
-;; 		(let ((cmddat (make-qitem
-;; 			       command:   command
-;; 			       host-port: host-port
-;; 			       params:    params)))
-;; 		  (queue-push cmddat) 		;; put request into the queue
-;; 		  (nn-send soc "queued"))         ;; reply with "queued"
-;; 		(print "ERROR: ["(common:human-time)"] BAD request " dat))
-;; 	    (loop (nn-recv soc)))))
-;;     (nn-close soc)))
-
-;;======================================================================
-;; D A S H B O A R D   U S E R   V I E W S
-;;======================================================================
-
-;;======================================================================
-;; first read ~/views.config if it exists, then read $MTRAH/views.config if it exists
-;;
-(define (common:load-views-config)
-  (let* ((view-cfgdat    (make-hash-table))
-	 (home-cfgfile   (conc (get-environment-variable "HOME") "/.mtviews.config"))
-	 (mthome-cfgfile (conc *toppath* "/.mtviews.config")))
-    (if (common:file-exists? mthome-cfgfile)
-	(read-config mthome-cfgfile view-cfgdat #t))
-    ;; we load the home dir file AFTER the MTRAH file so the user can clobber settings when running the dashboard in read-only areas
-    (if (common:file-exists? home-cfgfile)
-	(read-config home-cfgfile view-cfgdat #t))
-    view-cfgdat))
-
-;;======================================================================
-;; H I E R A R C H I C A L   H A S H   T A B L E S
-;;======================================================================
-;;
-;; Every element including top element is a vector:
-;;   <vector subhash value>
-
-(define (hh:make-hh #!key (ht #f)(value #f))
-  (vector (or ht    (make-hash-table)) value))
-
-;;======================================================================
-;; used internally
-(define-inline (hh:set-ht! hh ht)       (vector-set! hh 0 ht))
-(define-inline (hh:get-ht hh)           (vector-ref  hh 0))
-(define-inline (hh:set-value! hh value) (vector-set! hh 1 value))
-(define-inline (hh:get-value  hh value) (vector-ref  hh 1))
-
-;;======================================================================
-;; given a hierarchial hash and some keys look up the value ...
-;;
-(define (hh:get hh . keys)
-  (if (null? keys)
-      (vector-ref hh 1) ;; we have reached the end of the line, return the value sought
-      (let ((sub-ht (hh:get-ht hh)))
-	(if sub-ht ;; yes, there is more hierarchy
-	    (let ((sub-hh (hash-table-ref/default sub-ht (car keys) #f)))
-	      (if sub-hh
-		  (apply hh:get sub-hh (cdr keys))
-		  #f))
-	    #f))))
-
-;;======================================================================
-;; given a hierarchial hash, a value and some keys, add needed hierarcy and insert the value
-;;
-(define (hh:set! hh value . keys)
-  (if (null? keys)
-      (hh:set-value! hh value) ;; we have reached the end of the line, store the value
-      (let ((sub-ht (hh:get-ht hh)))
-	(if sub-ht ;; yes, there is more hierarchy
-	    (let ((sub-hh (hash-table-ref/default sub-ht (car keys) #f)))
-	      (if (not sub-hh) ;; we'll need to add the next level of hierarchy
-		  (let ((new-sub-hh (hh:make-hh)))
-		    (hash-table-set! sub-ht (car keys) new-sub-hh)
-		    (apply hh:set! new-sub-hh value (cdr keys)))
-		  (apply hh:set! sub-hh value (cdr keys))))    ;; call the sub-hierhash with remaining keys
-	    (begin
-	      (hh:set-ht! hh (make-hash-table))
-	      (apply hh:set! hh value keys))))))
-
-;;======================================================================
-;; Manage pkts, used in servers, tests and likely other contexts so put
-;; in common
-;;======================================================================
-
-(define common:pkts-spec
-  '((default . ((parent    . P)
-                (action    . a)
-                (filename  . f)))
-    (configf . ((parent    . P)
-                (action    . a)
-                (filename  . f)))
-    (server  . ((action    . a)
-		(pid       . d)
-		(ipaddr    . i)
-		(port      . p)
-		(parent    . P)))
-    			  
-    (test    . ((cpuuse    . c)
-		(diskuse   . d)
-		(item-path . i)
-		(runname   . r)
-		(state     . s)
-		(target    . t)
-		(status    . u)
-		(parent    . P)))))
-
-(define (common:get-pkts-dirs mtconf use-lt)
-  (let* ((pktsdirs-str (or (configf:lookup mtconf "setup"  "pktsdirs")
-			   (and use-lt
-				(conc (or *toppath*
-					  (current-directory))
-				      "/lt/.pkts"))))
-	 (pktsdirs  (if pktsdirs-str
-			(string-split pktsdirs-str " ")
-			#f)))
-    pktsdirs))
-
-;;======================================================================
-;; use-lt is use linktree "lt" link to find pkts dir
-(define (common:save-pkt pktalist-in mtconf use-lt #!key (add-only #f)) ;; add-only saves the pkt only if there is a parent already
-  (if (or add-only
-	  (hash-table-exists? *pkts-info* 'last-parent))
-      (let* ((parent   (hash-table-ref/default *pkts-info* 'last-parent #f))
-	     (pktalist (if parent
-			   (cons `(parent . ,parent)
-				 pktalist-in)
-			   pktalist-in)))
-	(let-values (((uuid pkt)
-		      (alist->pkt pktalist common:pkts-spec)))
-	  (hash-table-set! *pkts-info* 'last-parent uuid)
-	  (let ((pktsdir (or (hash-table-ref/default *pkts-info* 'pkts-dir #f)
-			     (let* ((pktsdirs (common:get-pkts-dirs mtconf use-lt))
-				    (pktsdir   (car pktsdirs))) ;; assume it is there
-			       (hash-table-set! *pkts-info* 'pkts-dir pktsdir)
-			       pktsdir))))
-            (handle-exceptions
-             exn
-             (debug:print-info 0 "failed to write out packet to " pktsdir ", exn=" exn) ;; don't care if this failed for now but MUST FIX - BUG!!
-             (if (not (file-exists? pktsdir))
-                 (create-directory pktsdir #t))
-             (with-output-to-file
-                 (conc pktsdir "/" uuid ".pkt")
-               (lambda ()
-                 (print pkt)))))))))
-	
-(define (common:with-queue-db mtconf proc #!key (use-lt #f)(toppath-in #f))
-  (let* ((pktsdirs (common:get-pkts-dirs mtconf use-lt))
-	 (pktsdir  (if pktsdirs (car pktsdirs) #f))
-	 (toppath  (or (configf:lookup mtconf "scratchdat" "toppath")
-		       toppath-in))
-	 (pdbpath  (or (configf:lookup mtconf "setup"  "pdbpath") pktsdir)))
-    (cond
-     ((not (and  pktsdir toppath pdbpath))
-      (debug:print 0 *default-log-port* "ERROR: settings are missing in your megatest.config for area management.")
-      (debug:print  0 *default-log-port* "  you need to have pktsdirs in the [setup] section."))
-     ((not (common:file-exists? pktsdir))
-      (debug:print 0 *default-log-port* "ERROR: pkts directory not found " pktsdir))
-     ((not (equal? (file-owner pktsdir)(current-effective-user-id)))
-      (debug:print 0 *default-log-port* "ERROR: directory " pktsdir " is not owned by " (current-effective-user-name)))
-     (else
-	(let* ((pdb  (open-queue-db pdbpath "pkts.db"
-				    schema: '("CREATE TABLE groups (id INTEGER PRIMARY KEY,groupname TEXT, CONSTRAINT group_constraint UNIQUE (groupname));"))))
-	  (proc pktsdirs pktsdir pdb)
-	  (dbi:close pdb))))))
-
-(define (common:load-pkts-to-db mtconf #!key (use-lt #f))
-  (common:with-queue-db
-   mtconf
-   (lambda (pktsdirs pktsdir pdb)
-     (for-each
-      (lambda (pktsdir) ;; look at all
-	(cond
-	 ((not (common:file-exists? pktsdir))
-	  (debug:print 0 *default-log-port* "ERROR: packets directory " pktsdir " does not exist."))
-	 ((not (directory? pktsdir))
-	  (debug:print 0 *default-log-port* "ERROR: packets directory path " pktsdir " is not a directory."))
-	 ((not (file-read-access? pktsdir))
-	  (debug:print 0 *default-log-port* "ERROR: packets directory path " pktsdir " is not readable."))
-	 (else
-	  (debug:print-info 0 *default-log-port* "Loading packets found in " pktsdir)
-	  (let ((pkts (glob (conc pktsdir "/*.pkt"))))
-	    (for-each
-	     (lambda (pkt)
-	       (let* ((uuid    (cadr (string-match ".*/([0-9a-f]+).pkt" pkt)))
-		      (exists  (lookup-by-uuid pdb uuid #f)))
-		 (if (not exists)
-		     (let* ((pktdat (string-intersperse
-				     (with-input-from-file pkt read-lines)
-				     "\n"))
-			    (apkt   (pkt->alist pktdat))
-			    (ptype  (alist-ref 'T apkt)))
-		       (add-to-queue pdb pktdat uuid (or ptype 'cmd) #f 0)
-		       (debug:print 4 *default-log-port* "Added " uuid " of type " ptype " to queue"))
-		     (debug:print 4 *default-log-port* "pkt: " uuid " exists, skipping...")
-		     )))
-	     pkts)))))
-      pktsdirs))
-   use-lt: use-lt))
-
-(define (common:get-pkt-alists pkts)
-  (map (lambda (x)
-	 (alist-ref 'apkt x)) ;; 'pkta pulls out the alist from the read pkt
-       pkts))
-
-;;======================================================================
-;; given list of pkts (alist mode) return list of D cards as Unix epoch, sorted descending
-;; also delete duplicates by target i.e. (car pkt)
-;;
-(define (common:get-pkt-times pkts)
-  (delete-duplicates
-   (sort 
-    (map (lambda (x)
-	   `(,(alist-ref 't x) . ,(string->number (alist-ref 'D x))))
-	 pkts)
-    (lambda (a b)(> (cdr a)(cdr b))))      ;; sort descending
-   (lambda (a b)(equal? (car a)(car b))))) ;; remove duplicates by target
-
-;;======================================================================
-;; accept an alist or hash table containing envvar/env value pairs (value of #f causes unset) 
-;;   execute thunk in context of environment modified as per this list
-;;   restore env to prior state then return value of eval'd thunk.
-;;   ** this is not thread safe **
-(define (common:with-env-vars delta-env-alist-or-hash-table thunk)
-  (let* ((delta-env-alist (if (hash-table? delta-env-alist-or-hash-table)
-                              (hash-table->alist delta-env-alist-or-hash-table)
-                              delta-env-alist-or-hash-table))
-         (restore-thunks
-          (filter
-           identity
-           (map (lambda (env-pair)
-                  (let* ((env-var     (car env-pair))
-                         (new-val     (let ((tmp (cdr env-pair)))
-                                        (if (list? tmp) (car tmp) tmp)))
-                         (current-val (get-environment-variable env-var))
-                         (restore-thunk
-                          (cond
-                           ((not current-val) (lambda () (unsetenv env-var)))
-                           ((not (string? new-val)) #f)
-                           ((eq? current-val new-val) #f)
-                           (else 
-                            (lambda () (setenv env-var current-val))))))
-                    ;;(when (not (string? new-val))
-                    ;;    (debug:print 0 *default-log-port* " PROBLEM: not a string: "new-val"\n from env-alist:\n"delta-env-alist)
-                    ;;    (pp delta-env-alist)
-                    ;;    (exit 1))
-                        
-                    
-                    (cond
-                     ((not new-val)  ;; modify env here
-                      (unsetenv env-var))
-                     ((string? new-val)
-                      (setenv env-var new-val)))
-                    restore-thunk))
-                delta-env-alist))))
-    (let ((rv (thunk)))
-      (for-each (lambda (x) (x)) restore-thunks) ;; restore env to original state
-      rv)))
-
-(define *common:thread-punchlist* (make-hash-table))
-(define (common:send-thunk-to-background-thread thunk #!key (name #f))
-  ;;(BB> "launched thread " name)
-  ;; we need a unique name for the thread.
-  (let* ((realname (if name
-                       (if (not (hash-table-ref/default *common:thread-punchlist* name #f))
-                           name
-                           (conc name"-" (symbol->string (gensym))))
-                       (conc "anonymous-"(symbol->string (gensym)))))
-         (realthunk (lambda ()
-                      (let ((res (thunk)))
-                        (hash-table-delete! *common:thread-punchlist* realname)
-                        res)))
-         (thread   (make-thread realthunk realname)))
-    (hash-table-set! *common:thread-punchlist* realname thread)
-    (thread-start! thread)
-    ))
-
-(define (common:join-backgrounded-threads)
-  ;; may need to trap and ignore exceptions -- dunno how atomic threads are...
-  (for-each
-   (lambda (thread-name)
-     (let* ((thread (hash-table-ref/default *common:thread-punchlist* thread-name #f)))
-       (if thread
-           (handle-exceptions
-               exn
-	     (begin
-	       (debug:print 0 *default-log-port* "joining threads failed. exn=" exn)
-               #t) ;; just ignore it, it might have died in the meantime so joining it will throw an exception
-             (thread-join! thread))
-           )))
-   (hash-table-keys *common:thread-punchlist*)))
-
-;;======================================================================
-;; (define *common:telemetry-log-state* 'startup)
-;; (define *common:telemetry-log-socket* #f)
-;; 
-;; (define (common:telemetry-log-open)
-;;   (if (eq? *common:telemetry-log-state* 'startup)
-;;       (let* ((serverhost (configf:lookup *configdat* "telemetry" "host"))
-;;              (serverport (configf:lookup-number *configdat* "telemetry" "port"))
-;;              (user (or (get-environment-variable "USER") "unknown"))
-;;              (host (or (get-environment-variable "HOST") "unknown")))
-;;         (set! *common:telemetry-log-state*
-;;               (handle-exceptions
-;;                exn
-;;                (begin
-;;                  (debug:print-info 0 *default-log-port* "common-telemetry-log open udp port failure")
-;;                  'broken)
-;;                (if (and serverhost serverport user host)
-;;                    (let* ((s (udp-open-socket)))
-;;                      ;;(udp-bind! s #f 0)
-;;                      (udp-connect! s serverhost serverport)
-;;                      (set! *common:telemetry-log-socket* s)
-;;                      'open)
-;;                    'not-needed))))))
-;;   
-;; (define (common:telemetry-log event #!key (payload '()))
-;;   (if (eq? *common:telemetry-log-state* 'startup)
-;;       (common:telemetry-log-open))
-;; 
-;;   (if (eq? 'open *common:telemetry-log-state*)
-;;       (handle-exceptions
-;;        exn
-;;        (begin
-;;          (debug:print-info 0 *default-log-port* "common-telemetry-log comms failure ; disabled (no server?)")
-;;          ;;(define *common:telemetry-log-state* 'broken-or-no-server-preclose)
-;;          ;;(common:telemetry-log-close)
-;;          (define *common:telemetry-log-state* 'broken-or-no-server)
-;;          (set! *common:telemetry-log-socket* #f)
-;;          )
-;;        (if (and *common:telemetry-log-socket* event) ;; TODO - filter on event against telemetry.want-events
-;;            (let* ((user (or (get-environment-variable "USER") "unknown"))
-;;                   (host (or (get-environment-variable "HOST") "unknown"))
-;;                   (start (conc "[megatest "event"]"))
-;;                   (toppath (or *toppath* "/dev/null"))
-;;                   (payload-serialized
-;;                    (base64:base64-encode
-;;                     (z3:encode-buffer
-;;                      (with-output-to-string (lambda () (pp payload))))))
-;;                   (msg     (conc user":"host":"start":"(current-process-id)":"(car (argv))":"
-;;                                  toppath":"payload-serialized)))
-;;              (udp-send *common:telemetry-log-socket* msg))))))
-;;   
-;; (define (common:telemetry-log-close)
-;;   (when (or (member *common:telemetry-log-state* '(broken-or-no-server-preclose open)) *common:telemetry-log-socket*)
-;;     (handle-exceptions
-;;      exn
-;;      (begin
-;;        (define *common:telemetry-log-state* 'closed-fail)
-;;        (debug:print-info 0 *default-log-port* "common-telemetry-log closure failure")
-;;        )
-;;      (begin
-;;        (define *common:telemetry-log-state* 'closed)
-;;        (udp-close-socket *common:telemetry-log-socket*)
-;;        (set! *common:telemetry-log-socket* #f)))))
-

Index: common_records.scm
==================================================================
--- common_records.scm
+++ common_records.scm
@@ -67,188 +67,5 @@
        (lambda ()
 	 (print ((condition-property-accessor 'exn 'message) exn))
 	 (print "Callback error in " procname)
 	 (print "Full condition info:\n" (condition->list exn)))))
    (proc)))
-
-;; Need a mutex protected way to get and set values
-;; or use (define-simple-syntax ??
-;;
-(define-inline (with-mutex mtx accessor record . val)
-  (mutex-lock! mtx)
-  (let ((res (apply accessor record val)))
-    (mutex-unlock! mtx)
-    res))
-
-;; this was cached based on results from profiling but it turned out the profiling
-;; somehow went wrong - perhaps too many processes writing to it. Leaving the caching
-;; in for now but can probably take it out later.
-;;
-(define (debug:calc-verbosity vstr)
-  (or (hash-table-ref/default *verbosity-cache* vstr #f)
-      (let ((res (cond
-                  ((number? vstr) vstr)
-                  ((not (string?  vstr))   1)
-                  ;; ((string-match  "^\\s*$" vstr) 1)
-                  (vstr           (let ((debugvals  (filter number? (map string->number (string-split vstr ",")))))
-                                    (cond
-                                     ((> (length debugvals) 1) debugvals)
-                                     ((> (length debugvals) 0)(car debugvals))
-                                     (else 1))))
-                  ((args:get-arg "-v")   2)
-                  ((args:get-arg "-q")    0)
-                  (else                   1))))
-        (hash-table-set! *verbosity-cache* vstr res)
-        res)))
-
-;; check verbosity, #t is ok
-(define (debug:check-verbosity verbosity vstr)
-  (if (not (or (number? verbosity)
-	       (list?   verbosity)))
-      (begin
-	(print "ERROR: Invalid debug value \"" vstr "\"")
-	#f)
-      #t))
-
-(define (debug:debug-mode n)
-  (cond
-   ((and (number? *verbosity*)   ;; number number
-	 (number? n))
-    (<= n *verbosity*))
-   ((and (list? *verbosity*)     ;; list   number
-	 (number? n))
-    (member n *verbosity*))
-   ((and (list? *verbosity*)     ;; list   list
-	 (list? n))
-    (not (null? (lset-intersection! eq? *verbosity* n))))
-   ((and (number? *verbosity*)
-	 (list? n))
-    (member *verbosity* n))))
-
-(define (debug:setup)
-  (let ((debugstr (or (args:get-arg "-debug")
-		      (args:get-arg "-debug-noprop")
-		      (getenv "MT_DEBUG_MODE"))))
-    (set! *verbosity* (debug:calc-verbosity debugstr))
-    (debug:check-verbosity *verbosity* debugstr)
-    ;; if we were handed a bad verbosity rule then we will override it with 1 and continue
-    (if (not *verbosity*)(set! *verbosity* 1))
-    (if (and (not (args:get-arg "-debug-noprop"))
-	     (or (args:get-arg "-debug")
-		 (not (getenv "MT_DEBUG_MODE"))))
-	(setenv "MT_DEBUG_MODE" (if (list? *verbosity*)
-				    (string-intersperse (map conc *verbosity*) ",")
-				    (conc *verbosity*))))))
-  
-(define (debug:print n e . params)
-  (if (debug:debug-mode n)
-      (with-output-to-port (or e (current-error-port))
-	(lambda ()
-	  (if *logging*
-	      (db:log-event (apply conc params))
-	      (apply print params)
-	      )))))
-
-;; Brandon's debug printer shortcut (indulge me :)
-(define *BB-process-starttime* (current-milliseconds))
-(define (BB> . in-args)
-  (let* ((stack (get-call-chain))
-         (location "??"))
-    (for-each
-     (lambda (frame)
-       (let* ((this-loc (vector-ref frame 0))
-              (temp     (string-split (->string this-loc) " "))
-              (this-func (if (and (list? temp) (> (length temp) 1)) (cadr temp) "???")))
-         (if (equal? this-func "BB>")
-             (set! location this-loc))))
-     stack)
-    (let* ((color-on "\x1b[1m")
-           (color-off "\x1b[0m")
-           (dp-args
-            (append
-             (list 0 *default-log-port*
-                   (conc color-on location "@"(/ (- (current-milliseconds) *BB-process-starttime*) 1000) color-off "   ")  )
-             in-args)))
-      (apply debug:print dp-args))))
-
-(define *BBpp_custom_expanders_list* (make-hash-table))
-
-
-
-;; register hash tables with BBpp.
-(hash-table-set! *BBpp_custom_expanders_list* HASH_TABLE:
-                 (cons hash-table? hash-table->alist))
-
-;; test name converter
-(define (BBpp_custom_converter arg)
-  (let ((res #f))
-    (for-each
-     (lambda (custom-type-name)
-       (let* ((custom-type-info      (hash-table-ref *BBpp_custom_expanders_list* custom-type-name))
-              (custom-type-test      (car custom-type-info))
-              (custom-type-converter (cdr custom-type-info)))
-         (when (and (not res) (custom-type-test arg))
-           (set! res (custom-type-converter arg)))))
-     (hash-table-keys *BBpp_custom_expanders_list*))
-    (if res (BBpp_ res) arg)))
-
-(define (BBpp_ arg)
-  (cond
-   ;;((SOMESTRUCT? arg) (cons SOMESTRUCT: (SOMESTRUCT->alist arg)))
-   ;;((dboard:tabdat? arg) (cons dboard:tabdat: (dboard:tabdat->alist arg)))
-   ((hash-table? arg)
-    (let ((al (hash-table->alist arg)))
-      (BBpp_ (cons HASH_TABLE: al))))
-   ((null? arg) '())
-   ;;((list? arg) (cons (BBpp_ (car arg)) (BBpp_ (cdr arg))))
-   ((pair? arg) (cons (BBpp_ (car arg)) (BBpp_ (cdr arg))))
-   (else (BBpp_custom_converter arg))))
-
-;; Brandon's pretty printer.  It expands hashes and custom types in addition to regular pp
-(define (BBpp arg)
-  (pp (BBpp_ arg)))
-
-;(use define-macro)
-(define-syntax inspect
-  (syntax-rules ()
-    [(_ x)
-    ;; (with-output-to-port (current-error-port)
-       (printf "~a is: ~a\n" 'x (with-output-to-string (lambda () (BBpp x))))
-     ;;  )
-     ]
-    [(_ x y ...) (begin (inspect x) (inspect y ...))]))
-
-(define (debug:print-error n e . params)
-  ;; normal print
-  (if (debug:debug-mode n)
-      (with-output-to-port (if (port? e) e (current-error-port))
-	(lambda ()
-	  (if *logging*
-	      (db:log-event (apply conc params))
-	      ;; (apply print "pid:" (current-process-id) " " params)
-	      (apply print "ERROR: " params)
-	      ))))
-  ;; pass important messages to stderr
-  (if (and (eq? n 0)(not (eq? e (current-error-port)))) 
-      (with-output-to-port (current-error-port)
-	(lambda ()
-	  (apply print "ERROR: " params)
-	  ))))
-
-(define (debug:print-info n e . params)
-  (if (debug:debug-mode n)
-      (with-output-to-port (if (port? e) e (current-error-port))
-	(lambda ()
-	  (if *logging*
-	      (let ((res (format#format #f "INFO: (~a) ~a" n (apply conc params))))
-		(db:log-event res))
-	      ;; (apply print "pid:" (current-process-id) " " "INFO: (" n ") " params) ;; res)
-	      (apply print "INFO: (" n ") " params) ;; res)
-	      )))))
-
-
-
-;; if a value is printable (i.e. string or number) return the value
-;; else return an empty string
-(define-inline (printable val)
-  (if (or (number? val)(string? val)) val ""))
-

Index: commonmod.scm
==================================================================
--- commonmod.scm
+++ commonmod.scm
@@ -17,18 +17,74 @@
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;======================================================================
 
 (declare (unit commonmod))
+(declare (uses mtver))
+(declare (uses debugprint))
+(declare (uses stml2))
+(declare (uses pkts))
+(declare (uses processmod))
+(declare (uses mtargs))
+(declare (uses configfmod))
+(declare (uses hostinfo))
+(declare (uses keysmod))
+
+;; odd but it works?
+(declare (uses itemsmod))
 
 (module commonmod
 	*
 	
-(import scheme chicken data-structures extras files)
-(import (prefix sqlite3 sqlite3:) posix typed-records srfi-18 srfi-69
-	md5 message-digest
-	regex srfi-1)
+(import scheme
+	chicken.base
+	chicken.condition
+	chicken.file
+	chicken.time
+	chicken.file.posix
+	chicken.pathname
+	chicken.port
+	chicken.process
+	chicken.process-context
+	chicken.process-context.posix
+	chicken.process.signal
+	chicken.pretty-print
+	chicken.random
+	chicken.io
+	chicken.string
+	chicken.sort
+	chicken.time.posix
+	
+	(prefix base64 base64:)
+	(prefix sqlite3 sqlite3:)
+	directory-utils
+	matchable
+	md5
+	message-digest
+	regex
+	regex-case
+	sparse-vectors
+	srfi-1
+	srfi-4
+	srfi-13
+	srfi-18
+	srfi-69
+	system-information
+	typed-records
+	z3
+
+	mtver
+	debugprint
+	stml2
+	pkts
+	processmod
+	(prefix mtargs args:)
+	configfmod
+	keysmod
+	itemsmod
+	hostinfo
+	)
 
 ;;======================================================================
 ;; CONTENTS
 ;;
 ;;  config file utils
@@ -35,128 +91,3698 @@
 ;;  misc conversion, data manipulation functions
 ;;  testsuite and area utilites
 ;;
 ;;======================================================================
 
-(include "megatest-version.scm")
 (include "megatest-fossil-hash.scm")
+(include "db_records.scm")
 
-(define (get-full-version)
+;; these come from processmod
+;;
+;; (define setenv set-environment-variable!)
+;; (define unsetenv unset-environment-variable!)
+;; (define getenv get-environment-variable)
+
+;; move all the miscellanea into this struct
+;;
+(defstruct runs:gendat inc-results inc-results-last-update inc-results-fmt run-info runname target)
+
+
+(define *bdat* #f) ;; the one and only (someday) global?
+
+(defstruct bdat
+  (home                   (getenv "HOME"))
+  (user                   (getenv "USER"))
+  (watchdog               #f)
+  (time-to-exit           #f)
+  (task-db                #f)
+  (target                 #f)
+  (this-exe-fullpath      #f)
+  (this-exe-dir           #f)
+  (this-exe-name          #f)
+  (orig-env               #f)
+
+  ;; runs stuff
+  (runs-data              #f) ;; was runs:general-data
+  ;; (server-loop-heart-beat (current-seconds))
+  )
+
+;; move all needed initialization into here
+;; break it into pieces if need be later
+;;
+(define (make-and-init-bigdata)
+  (let* ((bdat 	(make-bdat))
+	 (fullp (common:get-this-exe-fullpath)))
+    ;; bdat stuff
+    (bdat-this-exe-fullpath-set! bdat fullp)
+    (bdat-this-exe-dir-set! bdat (pathname-directory fullp))
+    (bdat-this-exe-name-set! bdat (pathname-strip-directory fullp))
+    (bdat-orig-env-set! bdat (get-the-original-environment))
+    ;; setup runs-data
+    (bdat-runs-data-set! bdat  (make-runs:gendat
+				inc-results: (make-hash-table)
+				inc-results-last-update: 0
+				;;               state status time duration test-name item-path
+				inc-results-fmt: "~12a~12a~20a~12a~40a\n"
+				run-info: #f
+				runname: #f
+				target: #f))
+    
+    (set! *bdat* bdat)
+    ;; set up signal handlers
+    (set-signal-handler! signal/int  std-signal-handler)  ;; ^C
+    (set-signal-handler! signal/term std-signal-handler)
+    ;; (set-signal-handler! signal/stop std-signal-handler)  ;; ^Z NO, do NOT handle ^Z!
+    bdat))
+
+  
+;; (define home (getenv "HOME"))
+;; (define user (getenv "USER"))
+(define keys:config-get-fields common:get-fields)
+
+;; Globals
+;;
+;;(define  *server-loop-heart-beat* (current-seconds))
+;; (define *watchdog* #f)
+;; A hash table that can be accessed by #{scheme ...} calls in
+;; config files. Allows communicating between confgs
+;;
+(define *user-hash-data* (make-hash-table))
+
+(define *db-keys* #f)
+
+(define *pkts-info*    (make-hash-table)) ;; store stuff like the last parent here
+(define *configinfo*   #f)   ;; raw results from setup, includes toppath and table from megatest.config
+(define *runconfigdat* #f)   ;; run configs data
+;; (define *configdat*    #f)   ;; megatest.config data ==> moved to configfmod
+(define *configstatus* #f)   ;; status of data; 'fulldata : all processing done, #f : no data yet, 'partialdata : partial read done
+(define *toppath*      #f)
+(define *already-seen-runconfig-info* #f)
+
+(define *test-meta-updated* (make-hash-table))
+(define *globalexitstatus*  0) ;; attempt to work around possible thread issues
+(define *passnum*           0) ;; when running track calls to run-tests or similar
+;; (define *alt-log-file* #f)  ;; used by -log
+(define *common:denoise*    (make-hash-table)) ;; for low noise printing
+;; (define *default-log-port*  (current-error-port)) ;; comes from debugprint
+(define *time-zero* (current-seconds)) ;; for the watchdog
+(define *default-area-tag* "local")
+
+;; DATABASE
+(define *dbstruct-db*         #f) ;; used to cache the dbstruct in db:setup. Goal is to remove this.
+;; db stats
+(define *db-stats*            (make-hash-table)) ;; hash of vectors < count duration-total >
+(define *db-stats-mutex*      (make-mutex))
+;; db access
+(define *db-last-access*      (current-seconds)) ;; last db access, used in server
+(define *db-write-access*     #t)
+;; db sync
+(define *db-last-sync*        0)                 ;; last time the sync to megatest.db happened
+(define *db-sync-in-progress* #f)                ;; if there is a sync in progress do not try to start another
+(define *db-multi-sync-mutex* (make-mutex))      ;; protect access to *db-sync-in-progress*, *db-last-sync*
+;; task db
+(define *task-db*             #f) ;; (vector db path-to-db)
+(define *db-access-allowed*   #t) ;; flag to allow access
+(define *db-access-mutex*     (make-mutex))
+(define *db-transaction-mutex* (make-mutex))
+(define *db-cache-path*       #f)
+(define *db-with-db-mutex*    (make-mutex))
+(define *db-api-call-time*    (make-hash-table)) ;; hash of command => (list of times)
+;; no sync db
+(define *no-sync-db*          #f)
+
+;; SERVER
+(define *my-client-signature* #f)
+(define *transport-type*    'http)             ;; override with [server] transport http|rpc|nmsg
+;; replaced by *rmt:remote*
+;; (define *runremote*         #f)                ;; if set up for server communication this will hold <host port>
+;; (define *max-cache-size*    0)
+(define *logged-in-clients* (make-hash-table))
+(define *server-id*         #f)
+(define *server-info*       #f)  ;; good candidate for easily convert to non-global
+;; (define *time-to-exit*      #f)
+(define *server-run*        #t)
+(define *run-id*            #f)
+(define *server-kind-run*   (make-hash-table))
+(define *home-host*         #f)
+;; (define *total-non-write-delay* 0)
+(define *heartbeat-mutex*   (make-mutex))
+(define *api-process-request-count* 0)
+(define *max-api-process-requests* 0)
+(define *server-overloaded*  #f)
+(define *writes-total-delay*  0)
+
+;; client
+(define *rmt-mutex*         (make-mutex))     ;; remote access calls mutex 
+
+;; RPC transport
+(define *rpc:listener*      #f)
+
+;; KEY info
+;; (define *target*            (make-hash-table)) ;; cache the target here; target is keyval1/keyval2/.../keyvalN
+(define *keys*              (make-hash-table)) ;; cache the keys here
+(define *keyvals*           (make-hash-table))
+(define *toptest-paths*     (make-hash-table)) ;; cache toptest path settings here
+(define *test-paths*        (make-hash-table)) ;; cache test-id to test run paths here
+(define *test-ids*          (make-hash-table)) ;; cache run-id, testname, and item-path => test-id
+(define *test-info*         (make-hash-table)) ;; cache the test info records, update the state, status, run_duration etc. from testdat.db
+
+(define *run-info-cache*     (make-hash-table)) ;; run info is stable, no need to reget
+(define *launch-setup-mutex* (make-mutex))     ;; need to be able to call launch:setup often so mutex it and re-call the real deal only if *toppath* not set
+(define *homehost-mutex*     (make-mutex))
+
+;; Miscellaneous
+(define *triggers-mutex*     (make-mutex))     ;; block overlapping processing of triggers
+(define *numcpus-cache* (make-hash-table))
+(define *host-loads*         (make-hash-table))
+
+;; cache environment vars for each run here
+(define *env-vars-by-run-id* (make-hash-table))
+
+;; Testconfig and runconfig caches. 
+(define *testconfigs*        (make-hash-table)) ;; test-name => testconfig
+(define *runconfigs*         (make-hash-table)) ;; target    => runconfig
+
+;; This is a cache of pre-reqs met, don't re-calc in cases where called with same params less than
+;; five seconds ago
+(define *pre-reqs-met-cache* (make-hash-table))
+
+;; cache of verbosity given string
+;;
+(define *verbosity-cache*    (make-hash-table))
+
+;; Generic string database
+(define sdb:qry #f) ;; (make-sdb:qry)) ;;  'init #f)
+;; Generic path database
+(define *fdb* #f)
+
+(define *last-launch* (current-seconds)) ;; use for throttling the launch rate. Would be better to use the db and last time of a test in LAUNCHED state.
+
+;;======================================================================
+;; S T A T E S   A N D   S T A T U S E S
+;;======================================================================
+
+;; BBnote: *common:std-states* - dashboard filter control and test control state buttons defined here; used in set-fields-panel and dboard:make-controls
+(define *common:std-states*   ;; for toggle buttons in dashboard
+  '(
+    (0 "ARCHIVED")
+    (1 "STUCK")
+    (2 "KILLREQ")
+    (3 "KILLED")
+    (4 "NOT_STARTED")
+    (5 "COMPLETED")
+    (6 "LAUNCHED")
+    (7 "REMOTEHOSTSTART")
+    (8 "RUNNING")
+    ))
+
+(define *common:dont-roll-up-states*
+  '("DELETED"
+    "REMOVING"
+    "CLEANING"
+    "ARCHIVE_REMOVING"
+    ))
+
+;;======================================================================
+;; BBnote: *common:std-statuses* dashboard filter control and test control status buttons defined here; used in set-fields-panel and dboard:make-controls
+;; note these statuses are sorted from better to worse.
+;; This sort order is important to dcommon:status-compare3 and db:set-state-status-and-roll-up-items
+(define *common:std-statuses*
+  '(;; (0 "DELETED")  
+    (1 "n/a")
+    (2 "PASS")
+    (3 "SKIP")
+    (4 "WARN")
+    (5 "WAIVED")
+    (6 "CHECK")
+    (7 "STUCK/DEAD")
+    (8 "DEAD")
+    (9 "FAIL")
+    (10 "PREQ_FAIL")
+    (11 "PREQ_DISCARDED")
+    (12 "ABORT")))
+
+(define *common:ended-states*       ;; states which indicate the test is stopped and will not proceed
+  '("COMPLETED" "ARCHIVED" "KILLED" "KILLREQ" "STUCK" "INCOMPLETE" ))
+
+(define *common:badly-ended-states* ;; these roll up as CHECK, i.e. results need to be checked
+  '("KILLED" "KILLREQ" "STUCK" "INCOMPLETE" "DEAD"))
+
+(define *common:well-ended-states* ;; an item's prereq in this state allows item to proceed
+  '("PASS" "WARN" "CHECK" "WAIVED" "SKIP"))
+
+;; BBnote: *common:running-states* used from db:set-state-status-and-roll-up-items
+(define *common:running-states*     ;; test is either running or can be run
+  '("RUNNING" "REMOTEHOSTSTART" "LAUNCHED" "STARTED"))
+
+(define *common:cant-run-states*    ;; These are stopping conditions that prevent a test from being run
+  '("COMPLETED" "KILLED" "UNKNOWN" "INCOMPLETE" "ARCHIVED"))
+
+(define *common:not-started-ok-statuses* ;; if not one of these statuses when in not_started state treat as dead
+  '("n/a" "na" "PASS" "FAIL" "WARN" "CHECK" "WAIVED" "DEAD" "SKIP"))
+
+;;======================================================================
+;; group tests into buckets corresponding to rollup
+;;; Running, completed-pass,  completed-non-pass + worst status, not started.
+;; filter out 
+
+;;======================================================================
+;; D E B U G G I N G   S T U F F 
+;;======================================================================
+
+(define *verbosity*         1)
+(define *logging*           #f)
+
+(define *common:thread-punchlist* (make-hash-table))
+
+(define *last-num-running-tests* 0)
+(define *seen-cant-run-tests* (make-hash-table)) ;; use to track tests that we suspect cannot be run
+(define *runs:denoise* (make-hash-table)) ;; key => last-time-ran
+
+(define runs:nothing-left-in-queue-count 0)
+
+(define *max-tries-hash* (make-hash-table))
+
+(define *send-receive-mutex* (make-mutex)) ;; should have separate mutex per run-id
+
+(define *db:process-queue-mutex* (make-mutex))
+(define *http-functions* (make-hash-table))
+(define *http-mutex* (make-mutex))
+
+;; NOTE: Large block of code from 32436b426188080f72fceb6894af541fbad9921e removed here
+;;       I'm pretty sure it is defunct.
+
+;; This next block all imported en-mass from the api branch
+(define *http-requests-in-progress* 0)
+(define *http-connections-next-cleanup* (current-seconds))
+
+(define *number-of-writes* 0)
+(define *number-non-write-queries* 0)
+
+;; NB// #f => return dbdir only
+;;      (was planned to be;  zeroth db with name=main.db)
+;; 
+;; If run-id is #f return to create and retrieve the path where the db will live.
+;;
+;; (define db:dbfile-path common:get-db-tmp-area)
+(define *global-db-store* (make-hash-table))
+
+
+;;======================================================================
+;; end globals
+;;======================================================================
+
+;;                       0           1              2              3
+(defstruct launch:einf (pid #t)(exit-status #t)(exit-code #t)(rollup-status 0))
+
+;; copied from egg call-with-environment-variables
+;;
+(define (call-with-environment-variables variables thunk)
+  ;; @("Sets up environment variable via dynamic-wind which are taken down after thunk."
+  ;;   (variables "An alist of the form {{'((\"var\" . \"value\") ...)}}")
+  ;;   (thunk "The thunk to execute with a modified environment"))
+  (let ((pre-existing-variables
+         (map (lambda (var-value)
+                (let ((var (car var-value)))
+                  (cons var (get-environment-variable var))))
+              variables)))
+    (dynamic-wind
+        (lambda () (void))
+        (lambda ()
+;;           (use posix)
+          (for-each (lambda (var-value)
+                      (setenv (car var-value) (cdr var-value)))
+            variables)
+          (thunk))
+        (lambda ()
+          (for-each (lambda (var-value)
+                      (let ((var (car var-value))
+                            (value (cdr var-value)))
+                        (if value
+                            (setenv var value)
+                            (unsetenv var))))
+            pre-existing-variables)))))
+     
+;; dot-locking egg seems not to work, using this for now
+;; if lock is older than expire-time then remove it and try again
+;; to get the lock
+;;
+(define (common:simple-file-lock fname #!key (expire-time 300))
+  (let ((fmod-time (handle-exceptions
+		       ext
+		     (current-seconds)
+		     (file-modification-time fname))))
+    (if (file-exists? fname)
+	(if (> (- (current-seconds) fmod-time) expire-time)
+	    (begin
+	      (handle-exceptions exn #f (delete-file* fname))	
+	      (common:simple-file-lock fname expire-time: expire-time))
+	    #f)
+	(let ((key-string (conc (get-host-name) "-" (current-process-id))))
+	  (with-output-to-file fname
+	    (lambda ()
+	      (print key-string)))
+	  (thread-sleep! 0.251)
+	  (if (file-exists? fname)
+	      (handle-exceptions exn
+                #f 
+                (with-input-from-file fname
+	  	  (lambda ()
+		    (equal? key-string (read-line)))))
+	      #f)))))
+
+(define (common:simple-file-lock-and-wait fname #!key (expire-time 300))
+  (let ((end-time (+ expire-time (current-seconds))))
+    (let loop ((got-lock (common:simple-file-lock fname expire-time: expire-time)))
+      (if got-lock
+	  #t
+	  (if (> end-time (current-seconds))
+	      (begin
+		(thread-sleep! 3)
+		(loop (common:simple-file-lock fname expire-time: expire-time)))
+	      #f)))))
+
+(define (common:simple-file-release-lock fname)
+  (handle-exceptions
+      exn
+      #f ;; I don't really care why this failed (at least for now)
+    (delete-file* fname)))
+
+;;======================================================================
+;; PUlled below from common.scm
+;;======================================================================
+
+;; execute thunk, return value.  If exception thrown, trap exception, return #f, and emit nonfatal condition note to *default-log-port* .
+;; arguments - thunk, message
+(define (common:fail-safe thunk warning-message-on-exception)
+  (handle-exceptions
+   exn
+   (begin
+     (debug:print-info 0 *default-log-port* "notable but nonfatal condition - "warning-message-on-exception", exn=" exn)
+     (debug:print-info 0 *default-log-port*
+                       (string-substitute "\n?Error:" "nonfatal condition:"
+                                          (with-output-to-string
+                                            (lambda ()
+                                              (print-error-message exn) ))))
+     (debug:print-info 0 *default-log-port* "    -- continuing after nonfatal condition...")
+     #f)
+   (thunk)))
+
+;; defined in configfmod
+;;
+#;(define (safe-setenv key val)
+  (if (or (substring-index "!" key)
+	  (substring-index ":" key)  ;; variables containing : are for internal use and cannot be environment variables.
+	  (substring-index "." key)) ;; periods are not allowed in environment variables
+      (debug:print-error 4 *default-log-port* "skip setting internal use only variables containing \":\" or starting with \"!\"")
+      (if (and (string? val)
+	       (string? key))
+	  (handle-exceptions
+	      exn
+	      (debug:print-error 0 *default-log-port* "bad value for setenv, key=" key ", value=" val ", exn=" exn)
+	    (setenv key val))
+	  (debug:print-error 0 *default-log-port* "bad value for setenv, key=" key ", value=" val))))
+
+
+;; returns list of fd count, socket count
+(define (get-file-descriptor-count #!key  (pid (current-process-id )))
+  (list
+    (length (glob (conc "/proc/" pid "/fd/*")))
+    (length  (filter identity (map socket? (glob (conc "/proc/" pid "/fd/*")))))
+  )
+)
+
+;; CONTEXTS
+(defstruct cxt
+  (taskdb #f)
+  (cmutex (make-mutex)))
+
+;; ;; safe method for accessing a context given a toppath
+;; ;;
+;; (define (common:with-cxt toppath proc)
+;;   (mutex-lock! *context-mutex*)
+;;   (let ((cxt (hash-table-ref/default *contexts* toppath #f)))
+;;     (if (not cxt)
+;;         (set! cxt (let ((x (make-cxt)))(hash-table-set! *contexts* toppath x) x)))
+;;     (let ((cxt-mutex (cxt-mutex cxt)))
+;;       (mutex-unlock! *context-mutex*)
+;;       (mutex-lock! cxt-mutex)
+;;       (let ((res (proc cxt)))
+;;         (mutex-unlock! cxt-mutex)
+;;         res))))
+        
+(define (common:get-this-exe-fullpath #!key (argv (argv)))
+  (let* ((this-script
+          (cond
+           ((and (> (length argv) 2)
+                 (string-match "^(.*/csi|csi)$" (car argv))
+                 (string-match "^-(s|ss|sx|script)$" (cadr argv)))
+            (caddr argv))
+           (else (car argv))))
+         (fullpath (realpath this-script)))
+    fullpath))
+
+;;======================================================================
+
+(define (common:get-sync-lock-filepath)
+  (let* ((tmp-area     (common:get-db-tmp-area))
+         (lockfile     (conc tmp-area "/megatest.db.sync-lock")))
+    lockfile))
+
+;;======================================================================
+;; when called from a wrapper I need sometimes to find the calling
+;; wrapper, this is for dashboard to find the correct megatest.
+;;
+(define (common:find-local-megatest #!optional (progname "megatest"))
+  (let ((res (filter file-exists?
+		     (map (lambda (updir)
+			    (let* ((lm  (car (argv)))
+				   (dir (pathname-directory lm))
+				   (exe (pathname-strip-directory lm)))
+			      (conc (if dir (conc dir "/") "")
+				    (case (string->symbol exe)
+				      ((dboard)    (conc updir progname))
+				      ((mtest)     (conc updir progname))
+				      ((dashboard) progname)
+				      (else exe)))))
+			  '("../../" "../")))))
+    (if (null? res)
+	(begin
+	  (debug:print 0 *default-log-port* "Failed to find this executable! Using what can be found on the path")
+	  progname)
+	(car res))))
+
+(define *common:logpro-exit-code->status-sym-alist*
+  '( ( 0 . pass )
+     ( 1 . fail )
+     ( 2 . warn )
+     ( 3 . check )
+     ( 4 . waived )
+     ( 5 . abort )
+     ( 6 . skip )))
+
+(define (common:logpro-exit-code->status-sym exit-code)
+  (or (alist-ref exit-code *common:logpro-exit-code->status-sym-alist*) 'fail))
+
+(define (common:worse-status-sym ss1 ss2)
+  (let loop ((status-syms-remaining '(abort fail check skip warn waived pass)))
+    (cond
+     ((null? status-syms-remaining)
+      'fail)
+     ((eq? (car status-syms-remaining) ss1)
+      ss1)
+     ((eq? (car status-syms-remaining) ss2)
+      ss2)
+     (else
+      (loop (cdr status-syms-remaining))))))
+
+(define (common:steps-can-proceed-given-status-sym status-sym)
+  (if (member status-sym '(warn waived pass))
+      #t
+      #f))
+
+(define (status-sym->string status-sym)
+  (case status-sym
+      ((pass) "PASS")
+    ((fail) "FAIL")
+    ((warn) "WARN")
+    ((check) "CHECK")
+    ((waived) "WAIVED")
+    ((abort) "ABORT")
+    ((skip) "SKIP")
+    (else "FAIL")))
+
+(define (common:logpro-exit-code->test-status exit-code)
+  (status-sym->string (common:logpro-exit-code->status-sym exit-code)))
+
+;; REPLACED BY rmt:remote in rmtmod.scm
+;;
+;; (defstruct remote
+;;   (hh-dat            #f) ;; (common:get-homehost)) ;; homehost record ( addr . hhflag )
+;;   (server-url        #f) ;; (server:check-if-running *toppath*) #f))
+;;   (server-id         #f)
+;;   (server-info       #f) ;; (if *toppath* (server:check-if-running *toppath*) #f))
+;;   (last-server-check 0)  ;; last time we checked to see if the server was alive
+;;   (conndat           #f)
+;;   ;; (transport         *transport-type*)
+;;   (server-timeout    #f) ;; (server:expiration-timeout))
+;;   (force-server      #f)
+;;   (ro-mode           #f)  
+;;   (ro-mode-checked   #f)) ;; flag that indicates we have checked for ro-mode
+
+;; launching and hosts
+(defstruct host
+  (reachable    #f)
+  (last-update  0)
+  (last-used    0)
+  (last-cpuload 1))
+
+(define (common:clear-caches)
+  (bdat-target-set! *bdat*   (make-hash-table))
+  (set! *keys*               (make-hash-table))
+  (set! *keyvals*            (make-hash-table))
+  (set! *toptest-paths*      (make-hash-table))
+  (set! *test-paths*         (make-hash-table))
+  (set! *test-ids*           (make-hash-table))
+  (set! *test-info*          (make-hash-table))
+  (set! *run-info-cache*     (make-hash-table))
+  (set! *env-vars-by-run-id* (make-hash-table))
+  (set! *test-id-cache*      (make-hash-table)))
+
+;;======================================================================
+;; V E R S I O N
+;;======================================================================
+
+(define (common:get-full-version)
   (conc megatest-version "-" megatest-fossil-hash))
 
-(define (version-signature)
+(define (common:version-signature)
   (conc megatest-version "-" (substring megatest-fossil-hash 0 4)))
 
-
-;;======================================================================
-;; config file utils
-;;======================================================================
-
-(define (lookup cfgdat section var)
-  (if (hash-table? cfgdat)
-      (let ((sectdat (hash-table-ref/default cfgdat section '())))
-	(if (null? sectdat)
-	    #f
-	    (let ((match (assoc var sectdat)))
-	      (if match ;; (and match (list? match)(> (length match) 1))
-		  (cadr match)
-		  #f))
-	    ))
-      #f))
-
-;; returns var key1=val1; key2=val2 ... as alist
-(define (get-key-list cfgdat section var)
-  ;; convert string a=1; b=2; c=a silly thing; d=
-  (let ((valstr (lookup cfgdat section var)))
-    (if valstr
-	(val->alist valstr)
-	'()))) ;; should it return empty list or #f to indicate not set?
-
-
-(define (get-section cfgdat section)
-  (hash-table-ref/default cfgdat section '()))
-
-;;======================================================================
-;; misc conversion, data manipulation functions
-;;======================================================================
-
-;; if it looks like a number -> convert it to a number, else return it
-;;
-(define (lazy-convert inval)
+(define (common:snapshot-file filepath #!key (subdir  ".") )
+  (if (file-exists? filepath)
+      (let* ((age-sec  (lambda (file)
+                         (if (file-exists? file)
+                             (- (current-seconds) (file-modification-time file))
+                             1000000000))) ;; return really old value if file doesn't exist.  we want to clobber it if old or not exist.
+             (ok-flag  #t)
+             (age-mins (lambda (file) (/ (age-sec   file) 60)))
+             (age-hrs  (lambda (file) (/ (age-mins file) 60)))
+             (age-days (lambda (file) (/ (age-hrs   file) 24)))
+             (age-wks  (lambda (file) (/ (age-days  file) 7)))
+             (docmd    (lambda (cmd)
+                         (cond
+                          (ok-flag
+                           (let ((res (system cmd)))
+                             (cond
+                              ((eq? 0 res)
+                               #t)
+                              (else
+                               (set! ok-flag #f)
+                               (debug:print 0 *default-log-port* "ERROR: ["(common:human-time)"] Command failed with exit code "
+                                            (if (< res 0)
+                                                res
+                                                (/ res 8)) " ["cmd"]" )
+                               #f))))
+                          (else
+                           (debug:print 0 *default-log-port* "ERROR: ["(common:human-time)"] Not runnining command due to prior error. ["cmd"]")
+                           #f))))
+             (copy     (lambda (src dest) (docmd (conc "/bin/cp '"src"' '"dest"'"))))
+             (copy+zip (lambda (src dest) (docmd (conc "gzip -c - < '"src"' > '"dest"'"))))
+             (fullpath (realpath filepath))
+             (basedir  (pathname-directory fullpath))
+             (basefile (pathname-strip-directory fullpath))
+             ;;(prevfile (conc filepath ".prev.gz"))
+             (minsfile (conc basedir "/" subdir "/" basefile ".mins.gz"))
+             (hrsfile  (conc basedir "/" subdir "/" basefile ".hrs.gz"))
+             (daysfile (conc basedir "/" subdir "/" basefile ".days.gz"))
+             (wksfile  (conc basedir "/" subdir "/" basefile ".weeks.gz")))
+
+        ;; create subdir it not exists
+        (if (not (directory-exists? (conc basedir "/" subdir)))
+            (docmd (conc "/bin/mkdir -p '"(conc basedir "/" subdir)"'")))
+        
+        ;; copy&zip <file> to <file>.mins if not exists
+        (if (not (file-exists? minsfile))
+            (copy+zip filepath minsfile))
+        ;; copy <file>.mins to <file>.hrs if not exists
+        (if (not (file-exists? hrsfile))
+            (copy minsfile hrsfile))
+        ;; copy <file>.hrs to <file>.days if not exists
+        (if (not (file-exists? daysfile))
+            (copy hrsfile daysfile))
+        ;; copy <file>.days to <file>.weeks if not exists
+        (if (not (file-exists? wksfile))
+            (copy daysfile wksfile))
+
+
+        ;; if age(<file>.mins.gz) >= 1h:
+        ;;     copy <file>.mins.gz <file>.hrs.gz
+        ;;     copy <prev file> <file>.mins.gz
+        (when (>= (age-mins minsfile) 1)
+          (copy minsfile hrsfile)
+          (copy+zip filepath  minsfile))
+        
+        ;; if age(<file>.hrs.gz) >= 1d:
+        ;;     copy <file>.hrs.gz <file>.days.gz
+        ;;     copy <file>.mins.gz <file>.hrs.gz
+        (when (>= (age-days hrsfile) 1)
+          (copy hrsfile daysfile)
+          (copy minsfile hrsfile))
+        
+        ;; if age(<file>.days.gz) >= 1w:
+        ;;     copy <file>.days.gz <file>.weeks.gz
+        ;;     copy <file>.hrs.gz <file>.days.gz
+        (when (>= (age-wks daysfile) 1)
+          (copy daysfile wksfile)
+          (copy hrsfile daysfile))
+        #t)
+      #f))
+
+;;======================================================================
+;; Rotate logs, logic: 
+;;                 if > 500k and older than 1 week:
+;;                     remove previous compressed log and compress this log
+;; WARNING: This proc operates assuming that it is in the directory above the
+;;          logs directory you wish to log-rotate.
+;;
+(define (common:rotate-logs)
+  (let* ((all-files (make-hash-table))
+	 (stats     (make-hash-table))
+	 (inc-stat  (lambda (key)
+		      (hash-table-set! stats key (+ (hash-table-ref/default stats key 0) 1))))
+	(max-allowed (string->number (or (configf:lookup *configdat* "setup" "max-logfiles") "300")))) ;; name -> age
+    (if (not (directory-exists? "logs"))(create-directory "logs"))
+    (directory-fold 
+     (lambda (file rem)
+       (handle-exceptions
+	exn
+	(begin
+	  (debug:print-info 2 *default-log-port* "unable to rotate log " file ", probably handled by another process, this is safe to ignore. exn=" exn)
+	  (debug:print 2 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
+	  ;; (print-call-chain (current-error-port)) ;; 
+	  )
+	(let* ((fullname  (conc "logs/" file))
+	       (mod-time  (file-modification-time fullname))
+	       (file-age  (- (current-seconds) mod-time))
+	       (file-old  (> file-age (* 48 60 60)))
+	       (file-big  (> (file-size fullname) 200000)))
+	  (hash-table-set! all-files file mod-time)
+	  (if (or (and (string-match "^.*.log" file)
+		       file-old
+		       file-big)
+		  (and (string-match "^server-.*.log" file)
+		       file-old))
+	      (let ((gzfile (conc fullname ".gz")))
+		(if (common:file-exists? gzfile)
+		    (begin
+		      (debug:print-info 0 *default-log-port* "removing " gzfile)
+		      (delete-file* gzfile)
+		      (hash-table-delete!  all-files gzfile) ;; needed?
+		      ))
+		(debug:print-info 0 *default-log-port* "compressing " file)
+		(system (conc "gzip " fullname))
+		(inc-stat "gzipped")
+		(hash-table-set! all-files (conc file ".gz") file-age)  ;; add the .gz file and remove the base file
+		(hash-table-delete! all-files file)
+		)
+	      (if (and (> file-age (* (string->number (or (configf:lookup *configdat* "setup" "log-expire-days") "30")) 24 3600))
+		       (file-exists? fullname)) ;; just in case it was gzipped - will get it next time
+		  (handle-exceptions
+		   exn
+		   #f
+		   (if (directory? fullname)
+		       (begin
+			 (debug:print-info 0 *default-log-port* fullname " in logs directory is a directory! Cannot rotate it, it is best to not put subdirectories in the logs dir.")
+			 (inc-stat "directories"))
+		       (begin
+			 (delete-file* fullname)
+			 (inc-stat "deleted")))
+		   (hash-table-delete! all-files file)))))))
+     '()
+     "logs")
+    (for-each
+     (lambda (category)
+       (let ((quant (hash-table-ref/default stats category 0)))
+	 (if (> quant 0)
+	     (debug:print-info 0 *default-log-port* category " log files: " quant))))
+     `("deleted" "gzipped" "directories"))
+    (let ((num-logs (hash-table-size all-files)))
+      (if (> num-logs max-allowed) ;; because NFS => don't let number of logs exceed 300
+	  (let ((files (take (sort (hash-table-keys all-files)
+				   (lambda (a b)
+				     (< (hash-table-ref all-files a)(hash-table-ref all-files b))))
+			     (- num-logs max-allowed))))
+	    (for-each
+	     (lambda (file)
+	       (let* ((fullname (conc "logs/" file)))
+		 (if (directory? fullname)
+		     (debug:print-info 0 *default-log-port* fullname " in logs directory is a directory! Cannot rotate it, it is best to not put subdirectories in the logs dir.")
+		     (handle-exceptions
+		      exn
+		      (debug:print-error 0 *default-log-port* "failed to remove " fullname ", exn=" exn)
+		      (delete-file* fullname)))))
+	     files)
+	    (debug:print-info 0 *default-log-port* "Deleted " (length files) " files from logs, keeping " max-allowed " files."))))))
+
+
+;;======================================================================
+;; S P A R S E   A R R A Y S
+;;======================================================================
+
+(define (make-sparse-array)
+  (let ((a (make-sparse-vector)))
+    (sparse-vector-set! a 0 (make-sparse-vector))
+    a))
+
+(define (sparse-array? a)
+  (and (sparse-vector? a)
+       (sparse-vector? (sparse-vector-ref a 0))))
+
+(define (sparse-array-ref a x y)
+  (let ((row (sparse-vector-ref a x)))
+    (if row
+	(sparse-vector-ref row y)
+	#f)))
+
+(define (sparse-array-set! a x y val)
+  (let ((row (sparse-vector-ref a x)))
+    (if row
+	(sparse-vector-set! row y val)
+	(let ((new-row (make-sparse-vector)))
+	  (sparse-vector-set! a x new-row)
+	  (sparse-vector-set! new-row y val)))))
+
+;;======================================================================
+;; L O C K E R S   A N D   B L O C K E R S 
+;;======================================================================
+
+;; block further accesses to databases. Call this before shutting db down
+(define (common:db-block-further-queries)
+  (mutex-lock! *db-access-mutex*)
+  (set! *db-access-allowed* #f)
+  (mutex-unlock! *db-access-mutex*))
+
+(define (common:db-access-allowed?)
+  (let ((val (begin
+	       (mutex-lock! *db-access-mutex*)
+	       *db-access-allowed*
+	       (mutex-unlock! *db-access-mutex*))))
+    val))
+
+;;======================================================================
+;; U S E F U L   S T U F F
+;;======================================================================
+
+;; convert things to an alist or assoc list, #f gets converted to ""
+;;
+(define (common:to-alist dat)
+  (cond
+   ((list? dat)   (map common:to-alist dat))
+   ((vector? dat)
+    (map common:to-alist (vector->list dat)))
+   ((pair? dat)
+    (cons (common:to-alist (car dat))
+	  (common:to-alist (cdr dat))))
+   ((hash-table? dat)
+    (map common:to-alist (hash-table->alist dat)))
+   (else
+    (if dat
+	dat
+	""))))
+
+(define (common:alist-ref/default key alist default)
+  (or (alist-ref key alist) default))
+
+(define (common:low-noise-print waitval . keys)
+  (let* ((key      (string-intersperse (map conc keys) "-" ))
+	 (lasttime (hash-table-ref/default *common:denoise* key 0))
+	 (currtime (current-seconds)))
+    (if (> (- currtime lasttime) waitval)
+	(begin
+	  (hash-table-set! *common:denoise* key currtime)
+	  #t)
+	#f)))
+
+(define (common:get-megatest-exe)
+  (or (getenv "MT_MEGATEST") "megatest"))
+
+(define (common:read-encoded-string instr)
+  (handle-exceptions
+   exn
+   (handle-exceptions
+    exn
+    (begin
+      (debug:print-error 0 *default-log-port* "received bad encoded string \"" instr "\", message: " ((condition-property-accessor 'exn 'message) exn) ", exn=" exn)
+      (print-call-chain (current-error-port))
+      #f)
+    (read (open-input-string (base64:base64-decode instr))))
+   (read (open-input-string (z3:decode-buffer (base64:base64-decode instr))))))
+
+
+(define (common:special-sort items order comp)
+  (let ((items-order (map reverse order))
+        (acomp       (or comp >)))
+    (sort items
+        (lambda (a b)
+          (let ((a-num (cadr (or (assoc a items-order) '(0 0))))
+                (b-num (cadr (or (assoc b items-order) '(0 0)))))
+            (acomp a-num b-num))))))
+
+;;======================================================================
+;; ;; given a toplevel with currstate, currstatus apply state and status
+;; ;;  => (newstate . newstatus)
+;; (define (common:apply-state-status currstate currstatus state status)
+;;   (let* ((cstate  (string->symbol (string-downcase currstate)))
+;;          (cstatus (string->symbol (string-downcase currstatus)))
+;;          (sstate  (string->symbol (string-downcase state)))
+;;          (sstatus (string->symbol (string-downcase status)))
+;;          (nstate  #f)
+;;          (nstatus #f))
+;;     (set! nstate
+;;           (case cstate
+;;             ((completed not_started killed killreq stuck archived) 
+;;              (case sstate ;; completed -> sstate
+;;                ((completed killed killreq stuck archived) completed)
+;;                ((running remotehoststart launched)        running)
+;;                (else                                      unknown-error-1)))
+;;             ((running remotehoststart launched)
+;;              (case sstate
+;;                ((completed killed killreq stuck archived) #f) ;; need to look at all items
+;;                ((running remotehoststart launched)        running)
+;;                (else                                      unknown-error-2)))
+;;             (else unknown-error-3)))
+;;     (set! nstatus
+;;           (case sstatus
+;;             ((pass)
+;;              (case nstate
+;;                ((pass n/a deleted)     pass)
+;;                ((warn)                 warn)
+;;                ((fail)                 fail)
+;;                ((check)               check)
+;;                ((waived)             waived)
+;;                ((skip)                 skip)
+;;                ((stuck/dead)          stuck)
+;;                ((abort)               abort)
+;;                (else        unknown-error-4)))
+;;             ((warn)
+;;              (case nstate
+;;                ((pass warn n/a skip deleted)   warn)
+;;                ((fail)                         fail)
+;;                ((check)                       check)
+;;                ((waived)                     waived)
+;;                ((stuck/dead)                  stuck)
+;;                (else                unknown-error-5)))
+;;             ((fail)
+;;              (case nstate
+;;                ((pass warn fail check n/a waived skip deleted stuck/dead stuck)  fail)
+;;                ((abort)                                                         abort)
+;;                (else                                                  unknown-error-6)))
+;;             (else    unknown-error-7)))
+;;     (cons 
+;;      (if nstate  (symbol->string nstate)  nstate)
+;;      (if nstatus (symbol->string nstatus) nstatus))))
+               
+(define (get-with-default val default)
+  (let ((val (args:get-arg val)))
+    (if val val default)))
+
+(define (assoc/default key lst . default)
+  (let ((res (assoc key lst)))
+    (if res (cadr res)(if (null? default) #f (car default)))))
+
+(define (common:get-area-name)
+  (or (configf:lookup *configdat* "setup" "area-name") ;; megatest is a flexible tool, testsuite is too limiting a description.
+      (configf:lookup *configdat* "setup" "testsuite" )
+      (getenv "MT_TESTSUITE_NAME")
+      (pathname-file (or (if (string? *toppath* )
+			     (pathname-file *toppath*)
+			     #f)
+			 (common:get-toppath #f)))
+      "please-set-setup-area-name")) ;; (pathname-file (current-directory)))))
+
+;;======================================================================
+;; safe getting of toppath
+(define (common:get-toppath areapath)
+  (or *toppath*
+      (if areapath
+	  (begin
+	    (set! *toppath* areapath)
+	    (setenv "MT_RUN_AREA_HOME" areapath)
+	    areapath)
+	  #f)
+      (if (getenv "MT_RUN_AREA_HOME")
+	  (begin
+	    (set! *toppath* (getenv "MT_RUN_AREA_HOME"))
+	    *toppath*)
+	  #f)
+      ;; last resort, look for megatest.config
+      (let loop ((thepath (realpath ".")))
+	(if (file-exists? (conc thepath "/megatest.config"))
+	    thepath
+	    (if (equal? thepath "/")
+		(begin
+		  (debug:print-error 0 *default-log-port* "Unable to find megatest home directory.")
+		  #f)
+		(loop (pathname-directory thepath)))))
+      ))
+
+;;======================================================================
+;; redefine for future cleanup (converge on area-name, the more generic
+;;
+;; (define common:get-area-name common:get-area-name)
+
+(define (common:get-db-tmp-area . junk)
+  (if *db-cache-path*
+      *db-cache-path*
+      (if *toppath* ;; common:get-create-writeable-dir
+	  (handle-exceptions
+	      exn
+	      (begin
+		(debug:print-error 0 *default-log-port* "Couldn't create path to " *db-cache-path* ", exn=" exn)
+		(exit 1))
+	      (let* ((tsname (common:get-area-name))
+		     (dbpath (common:get-create-writeable-dir
+			      (list (conc "/tmp/" (current-user-name)
+					  "/megatest_localdb/"
+					  tsname "/"
+					  (string-translate *toppath* "/" "."))
+				    (conc "/tmp/" (current-process-id) ;; just in case we have an issue with the dir by own user name
+					  "/megatest_localdb/"
+					  tsname
+					  (string-translate *toppath* "/" "."))
+				    ))))
+		(set! *db-cache-path* dbpath)
+		dbpath))
+	  #f)))
+
+(define (common:get-signature str)
+  (message-digest-string (md5-primitive) str))
+
+;;======================================================================
+;; TOPPATH/AREA
+;;======================================================================
+
+;; deprecate this one
+(define (common:get-area-path-signature)
+  (message-digest-string (md5-primitive) *toppath*))
+
+(define (common:calc-area-key area-path #!optional (full #f))
+  (let* ((top-dir-name (pathname-directory area-path))
+	 (area-name    (pathname-strip-directory area-path))
+	 (top-dir-key  (common:get-signature top-dir-name))
+	 (short-key    (substring top-dir-key 0 6)))
+    (conc (if full top-dir-key short-key) "-" area-name)))
+
+(define (common:get-area-key)
+  (common:calc-area-key *toppath*))
+
+;;======================================================================
+;; E X I T   H A N D L I N G
+;;======================================================================
+
+(define (common:human-time)
+  (time->string (seconds->local-time (current-seconds)) "%Y-%m-%d %H:%M:%S"))
+
+;; common:readonly-watchdo
+;; common:watchdog
+;; std-exit-procedure was here
+
+(define (std-signal-handler signum)
+  ;; (signal-mask! signum)
+  (bdat-time-to-exit-set! *bdat* #t) 
+  ;;(debug:print-info 13 *default-log-port* "got signal "signum)
+  (debug:print-error 0 *default-log-port* "Received signal " signum " aaa exiting promptly")
+  ;; (std-exit-procedure) ;; shouldn't need this since we are exiting and it will be called anyway
+  (exit))
+
+(define (special-signal-handler signum)
+  ;; (signal-mask! signum)
+  (bdat-time-to-exit-set! *bdat*  #t)
+  ;;(debug:print-info 13 *default-log-port* "got signal "signum)
+  (debug:print-error 0 *default-log-port* "Received signal " signum " sending email befor exiting!!")
+  ;;TODO send email to notify admin contact listed in the config that the lisner got killed
+  ;; (std-exit-procedure) ;; shouldn't need this since we are exiting and it will be called anyway
+  (exit))
+
+;;======================================================================
+;; M I S C   U T I L S
+;;======================================================================
+
+;;======================================================================
+;; convert stuff to a number if possible
+(define (any->number val)
+  (cond 
+   ((number? val) val)
+   ((string? val) (string->number val))
+   ((symbol? val) (any->number (symbol->string val)))
+   (else #f)))
+
+(define (any->number-if-possible val)
+  (let ((num (any->number val)))
+    (if num num val)))
+
+(define (patt-list-match item patts)
+  (debug:print-info 8 *default-log-port* "patt-list-match item=" item " patts=" patts)
+  (if (and item patts)  ;; here we are filtering for matches with item patterns
+      (let ((res #f))   ;; look through all the item-patts if defined, format is patt1,patt2,patt3 ... wildcard is %
+	(for-each 
+	 (lambda (patt)
+	   (let ((modpatt (string-substitute "%" ".*" patt #t)))
+	     (debug:print-info 10 *default-log-port* "patt " patt " modpatt " modpatt)
+	     (if (string-match (regexp modpatt) item)
+		 (set! res #t))))
+	 (string-split patts ","))
+	res)
+      #t))
+
+;;======================================================================
+;; '(print (string-intersperse (map cadr (hash-table-ref/default (configf:read-config "megatest.config" \#f \#t) "disks" '"'"'("none" ""))) "\n"))'
+(define (common:get-disks configf)
+  (hash-table-ref/default 
+   configf ;; (or configf (configf:read-config "megatest.config" #f #t))
+   "disks" '("none" "")))
+
+;;======================================================================
+;; return first command that exists, else #f
+;;
+(define (common:which cmds)
+  (if (null? cmds)
+      #f
+      (let loop ((hed (car cmds))
+		 (tal (cdr cmds)))
+	(let ((res (with-input-from-pipe (conc "which " hed) read-line)))
+	  (if (and (string? res)
+		   (common:file-exists? res))
+	      res
+	      (if (null? tal)
+		  #f
+		  (loop (car tal)(cdr tal))))))))
+  
+(define (common:get-install-area)
+  (let ((exe-path (car (argv))))
+    (if (common:file-exists? exe-path)
+	(handle-exceptions
+	 exn
+	 #f
+	 (pathname-directory
+	  (pathname-directory 
+	   (pathname-directory exe-path))))
+	#f)))
+
+;;======================================================================
+;; return first path that can be created or already exists and is writable
+;;
+(define (common:get-create-writeable-dir dirs)
+  (if (null? dirs)
+      #f
+      (let loop ((hed (car dirs))
+		 (tal (cdr dirs)))
+	(let ((res (or (and (directory? hed)
+			    (file-writable? hed)
+			    hed)
+		       (handle-exceptions
+			   exn
+			   (begin
+			     (debug:print-info 0 *default-log-port* "could not create " hed
+					       ", this might cause problems down the road. exn=" exn)
+			     #f)
+			(create-directory hed #t)))))
+	  (if (and (string? res)
+		   (directory? res))
+	      res
+	      (if (null? tal)
+		  #f
+		  (loop (car tal)(cdr tal))))))))
+
+;;======================================================================
+;; return the youngest timestamp . filename
+;;
+(define (common:get-youngest glob-list)
+  (let ((all-files (apply append
+			  (map (lambda (patt)
+				 (handle-exceptions
+				     exn
+				     '()
+				   (glob patt)))
+			       glob-list))))
+    (fold (lambda (fname res)
+	    (let ((last-mod (car res))
+		  (curmod   (handle-exceptions
+				exn
+				0
+			      (file-modification-time fname))))
+	      (if (> curmod last-mod)
+		  (list curmod fname)
+		  res)))
+	  '(0 "n/a")
+	  all-files)))
+
+;;======================================================================
+;; use bash to expand a glob. Does NOT handle paths with spaces!
+;;
+(define (common:bash-glob instr)
+  (string-split
+   (with-input-from-pipe
+       (conc "/bin/bash -c \"echo " instr "\"")
+       read-line)))
+
+;;======================================================================
+;; Some safety net stuff
+;;======================================================================
+
+;;======================================================================
+;; return input if it is a list or return null
+(define (common:list-or-null inlst #!key (ovrd #f)(message #f))
+  (if (list? inlst)
+      inlst
+      (begin
+	(if message (debug:print-error 0 *default-log-port* message))
+	(or ovrd '()))))
+  
+;;======================================================================
+;; T A R G E T S  ,   S T A T E ,   S T A T U S ,   
+;;                    R U N N A M E    A N D   T E S T P A T T
+;;======================================================================
+
+;;======================================================================
+;; (map print (map car (hash-table->alist (configf:read-config "runconfigs.config" #f #t))))
+;;
+(define (common:get-runconfig-targets configf) ;; #!key (configf #f))
+  (let ((targs       (sort (map car (hash-table->alist configf
+						       #;(or configf ;; NOTE: There is no value in using runconfig:read here.
+					 (configf:read-config (conc *toppath* "/runconfigs.config")
+						      #f #t)
+						       (make-hash-table))
+						       ))
+			   string<?))
+	(target-patt (args:get-arg "-target")))
+    (if target-patt
+	(filter (lambda (x)
+		  (patt-list-match x target-patt))
+		targs)
+	targs)))
+
+;;======================================================================
+;; Lookup a value in runconfigs based on -reqtarg or -target
+;; 
+(define (runconfigs-get config var)
+  (let ((targ (common:args-get-target))) ;; (or (args:get-arg "-reqtarg")(args:get-arg "-target")(getenv "MT_TARGET"))))
+    (if targ
+	(or (configf:lookup config targ var)
+	    (configf:lookup config "default" var))
+	(configf:lookup config "default" var))))
+
+(define (common:args-get-state)
+  (or (args:get-arg "-state")(args:get-arg ":state")))
+
+(define (common:args-get-status)
+  (or (args:get-arg "-status")(args:get-arg ":status")))
+
+(define (common:args-get-testpatt rconf)
+  (let* (;; (tagexpr       (args:get-arg "-tagexpr"))
+         ;; (tags-testpatt (if tagexpr (string-join (runs:get-tests-matching-tags tagexpr) ",") #f))
+         (testpatt-key  (or (args:get-arg "-modepatt") (args:get-arg "--modepatt") "TESTPATT"))
+         (args-testpatt (or (args:get-arg "-testpatt") (args:get-arg "-runtests") "%"))
+         (rtestpatt     (if rconf (runconfigs-get rconf testpatt-key) #f)))
+    (cond
+     ((or (args:get-arg "--modepatt") (args:get-arg "-modepatt")) ;; modepatt is a forced setting, when set it MUST refer to an existing PATT in the runconfig
+      (if rconf
+	  (let* ((patts-from-mode-patt	  (runconfigs-get rconf testpatt-key)))
+	    (debug:print-info 0 *default-log-port* "modepatt defined is: "testpatt-key" runconfigs values for  " testpatt-key " "  patts-from-mode-patt)
+	    patts-from-mode-patt)
+	  (begin
+	    (debug:print-info 0 *default-log-port* " modepatt defined is: "testpatt-key" runconfigs values for  " testpatt-key) ;;  " " patts-from-mode-patt)
+	    #f)))     ;; We do NOT fall back to "%"
+     ;; (tags-testpatt
+     ;;  (debug:print-info 0 *default-log-port* "-tagexpr "tagexpr" selects testpatt "tags-testpatt)
+     ;;  tags-testpatt)
+     ((and (equal? args-testpatt "%") rtestpatt)
+      (debug:print-info 0 *default-log-port* "testpatt defined in "testpatt-key" from runconfigs: " rtestpatt)
+      rtestpatt)
+     (else 
+      (debug:print-info 0 *default-log-port* "using testpatt " args-testpatt " rtestpatt:" rtestpatt)
+      args-testpatt))))
+
+(define (common:false-on-exception thunk #!key (message #f))
+  (handle-exceptions exn
+                     (begin
+                       (if message
+                           (debug:print-info 0 *default-log-port* message))
+                       #f) (thunk) ))
+
+(define (common:file-exists? path-string #!key (silent #f))
+  ;;;; TODO: catch permission denied exceptions and emit appropriate warnings. Might be able to get rid of with chicken 5?
+  (common:false-on-exception (lambda () (file-exists? path-string))
+                             message: (if (not silent)
+                                          (conc "Unable to access path: " path-string)
+                                          #f)
+                             ))
+
+(define (common:directory-exists? path-string)
+  ;;;; TODO: catch permission denied exceptions and emit appropriate warnings
+  (common:false-on-exception (lambda () (directory-exists? path-string))
+                             message: (conc "Unable to access path: " path-string)
+                             ))
+
+;;======================================================================
+;; does the directory exist and do we have write access?
+;;
+;;    returns the directory or #f
+;;
+(define (common:directory-writable? path-string)
+  (handle-exceptions
+      exn
+    (begin
+      (debug:print 0 *default-log-port* "Failed to identify access to " path-string ", exn=" exn)
+      #f)
+   (if (and (directory-exists? path-string)
+            (file-writable? path-string))
+       path-string
+       #f)))
+
+(define (common:get-linktree)
+  (or (getenv "MT_LINKTREE")
+      (if *configdat*
+	  (configf:lookup *configdat* "setup" "linktree")
+	  #f)
+      (if (or *toppath* (getenv "MT_RUN_AREA_HOME"))
+	  (conc (or *toppath* (getenv "MT_RUN_AREA_HOME")) "/lt")
+	  #f)
+      (let* ((tp (common:get-toppath #f))
+	     (lt (conc tp "/lt")))
+	(if (not tp)(debug:print 0 *default-log-port* "WARNING: cannot calculate best path for linktree, using " lt))
+	lt)))
+
+(define (common:args-get-runname)
+  (let ((res (or (args:get-arg "-runname")
+		 (args:get-arg ":runname")
+		 (getenv "MT_RUNNAME"))))
+    ;; (if res (set-environment-variable "MT_RUNNAME" res)) ;; not sure if this is a good idea. side effect and all ...
+    res))
+
+(define (common:args-get-target #!key (split #f)(exit-if-bad #f))
+  (let* ((keys    (if (hash-table? *configdat*) (common:get-fields *configdat*) '()))
+	 (numkeys (length keys))
+	 (target  (or (args:get-arg "-reqtarg")
+		      (args:get-arg "-target")
+		      (getenv "MT_TARGET")))
+	 (tlist   (if target (string-split target "/" #t) '()))
+	 (valid   (if target
+		      (or (null? keys) ;; probably don't know our keys yet
+			  (and (not (null? tlist))
+			       (eq? numkeys (length tlist))
+			       (null? (filter string-null? tlist))))
+		      #f)))
+    (if valid
+	(if split
+	    tlist
+	    target)
+	(if target
+	    (begin
+	      (debug:print-error 0 *default-log-port* "Invalid target, spaces or blanks not allowed \"" target "\", target should be: " (string-intersperse keys "/") ", have " tlist " for elements")
+	      (if exit-if-bad (exit 1))
+	      #f)
+	    #f))))
+
+;;======================================================================
+;; looking only (at least for now) at the MT_ variables craft the full testname
+;;
+(define (common:get-full-test-name)
+  (if (getenv "MT_TEST_NAME")
+      (if (and (getenv "MT_ITEMPATH")
+               (not (equal? (getenv "MT_ITEMPATH") "")))
+          (getenv "MT_TEST_NAME")
+          (conc (getenv "MT_TEST_NAME") "/" (getenv "MT_ITEMPATH")))
+      #f))
+
+;;======================================================================
+;; do we honor the caches of the config files?
+;;
+(define (common:use-cache?)
+  (let ((res #t)) ;; priority by order of evaluation
+    (if *configdat* ;; sillyness here. can't use setup/use-cache to know if we can use the cached files!
+	(if (equal? (configf:lookup *configdat* "setup" "use-cache") "no")
+	    (set! res #f)
+	    (if (equal? (configf:lookup *configdat* "setup" "use-cache") "yes")
+		(set! res #t))))
+    (if (args:get-arg "-no-cache")(set! res #f)) ;; overrides setting in "setup"
+    (if (getenv "MT_USE_CACHE")
+	(if (equal? (getenv "MT_USE_CACHE") "yes")
+	    (set! res #t)
+	    (if (equal? (getenv "MT_USE_CACHE") "no")
+		(set! res #f))))    ;; overrides -no-cache switch
+    res))
+  
+;;======================================================================
+;; force use of server?
+;;
+(define (common:force-server?)
+  (let* ((force-setting (configf:lookup *configdat* "server" "force"))
+	 (force-type    (if force-setting (string->symbol force-setting) #f))
+	 (force-result  (case force-type
+			  ((#f)     #f)
+			  ((always) #t)
+			  ((test)   (if (args:get-arg "-execute") ;; we are in a test
+					#t
+					#f))
+			  (else
+			   (debug:print 0 *default-log-port* "ERROR: Bad server force setting " force-setting ", forcing server.")
+			   #t)))) ;; default to requiring server
+    (if force-result
+	(begin
+	  (debug:print-info 0 *default-log-port* "forcing use of server, force setting is \"" force-setting "\".")
+	  #t)
+	#f)))
+
+;;======================================================================
+;; M I S C   L I S T S
+;;======================================================================
+
+;;======================================================================
+;; items in lista are matched value and position in listb
+;; return the remaining items in listb or #f
+;;
+(define (common:list-is-sublist lista listb)
+  (if (null? lista)
+      listb ;; all items in listb are "remaining"
+      (if (> (length lista)(length listb)) 
+	  #f
+	  (let loop ((heda (car lista))
+		     (tala (cdr lista))
+		     (hedb (car listb))
+		     (talb (cdr listb)))
+	    (if (equal? heda hedb)
+		(if (null? tala) ;; we are done
+		    talb
+		    (loop (car tala)
+			  (cdr tala)
+			  (car talb)
+			  
+			  (cdr talb)))
+		#f)))))
+
+;;======================================================================
+;; Needed for long lists to be sorted where (apply max ... ) dies
+;;
+(define (common:max inlst)
+  (let loop ((max-val (car inlst))
+	     (hed     (car inlst))
+	     (tal     (cdr inlst)))
+    (if (not (null? tal))
+	(loop (max hed max-val)
+	      (car tal)
+	      (cdr tal))
+	(max hed max-val))))
+
+;;======================================================================
+;; get min or max, use > for max and < for min, this works around the limits on apply
+;;
+(define (common:min-max comp lst)
+  (if (null? lst)
+      #f ;; better than an exception for my needs
+      (fold (lambda (a b)
+	      (if (comp a b) a b))
+	    (car lst)
+	    lst)))
+
+;;======================================================================
+;; get min or max, use > for max and < for min, this works around the limits on apply
+;;
+(define (common:sum lst)
+  (if (null? lst)
+      0
+      (fold (lambda (a b)
+	      (+ a b))
+	    (car lst)
+	    lst)))
+
+;;======================================================================
+;; path list to hash-table tree
+;;   ((a b c)(a b d)(e b c)) => ((a (b (d) (c))) (e (b (c))))
+;;
+(define (common:list->htree lst)
+  (let ((resh (make-hash-table)))
+    (for-each
+     (lambda (inlst)
+       (let loop ((ht  resh)
+		  (hed (car inlst))
+		  (tal (cdr inlst)))
+	 (if (hash-table-ref/default ht hed #f)
+	     (if (not (null? tal))
+		 (loop (hash-table-ref ht hed)
+		       (car tal)
+		       (cdr tal)))
+	     (begin
+	       (hash-table-set! ht hed (make-hash-table))
+	       (loop ht hed tal)))))
+     lst)
+    resh))
+
+;;======================================================================
+;; hash-table tree to html list tree
+;;
+;;   tipfunc takes two parameters: y the tip value and path the path to that point
+;;
+(define (common:htree->html ht path tipfunc)
+  (let ((datlist 	(sort (hash-table->alist ht)
+                              (lambda (a b)
+                                (string< (car a)(car b))))))
+    (if (null? datlist)
+    	(tipfunc #f path) ;; really shouldn't get here
+	(s:ul
+	 (map (lambda (x)
+		(let* ((levelname (car x))
+		       (y         (cdr x))
+		       (newpath   (append path (list levelname)))
+		       (leaf      (or (not (hash-table? y))
+				      (null? (hash-table-keys y)))))
+		  (if leaf
+		      (s:li (tipfunc y newpath))
+		      (s:li
+		       (list 
+			levelname
+			(common:htree->html y newpath tipfunc))))))
+	      datlist)))))
+
+;;======================================================================
+;; hash-table tree to alist tree
+;;
+(define (common:htree->atree ht)
+  (map (lambda (x)
+	 (cons (car x)
+	       (let ((y (cdr x)))
+		 (if (hash-table? y)
+		     (common:htree->atree y)
+		     y))))
+       (hash-table->alist ht)))
+
+;;======================================================================
+;; M U N G E   D A T A   I N T O   N I C E   F O R M S
+;;======================================================================
+
+;;======================================================================
+;; Generate an index for a sparse list of key values
+;;   ( (rowname1 colname1 val1)(rowname2 colname2 val2) )
+;;
+;; => 
+;;
+;;   ( (rowname1 0)(rowname2 1))    ;; rownames -> num
+;;     (colname1 0)(colname2 1)) )  ;; colnames -> num
+;; 
+;; optional apply proc to rownum colnum value
+(define (common:sparse-list-generate-index data #!key (proc #f))
+  (if (null? data)
+      (list '() '())
+      (let loop ((hed (car data))
+		 (tal (cdr data))
+		 (rownames '())
+		 (colnames '())
+		 (rownum   0)
+		 (colnum   0))
+	(let* ((rowkey          (car   hed))
+	       (colkey          (cadr  hed))
+	       (value           (caddr hed))
+	       (existing-rowdat (assoc rowkey rownames))
+	       (existing-coldat (assoc colkey colnames))
+	       (curr-rownum     (if existing-rowdat rownum (+ rownum 1)))
+	       (curr-colnum     (if existing-coldat colnum (+ colnum 1)))
+	       (new-rownames    (if existing-rowdat rownames (cons (list rowkey curr-rownum) rownames)))
+	       (new-colnames    (if existing-coldat colnames (cons (list colkey curr-colnum) colnames))))
+	  ;; (debug:print-info 0 *default-log-port* "Processing record: " hed )
+	  (if proc (proc curr-rownum curr-colnum rowkey colkey value))
+	  (if (null? tal)
+	      (list new-rownames new-colnames)
+	      (loop (car tal)
+		    (cdr tal)
+		    new-rownames
+		    new-colnames
+		    (if (> curr-rownum rownum) curr-rownum rownum)
+		    (if (> curr-colnum colnum) curr-colnum colnum)
+		    ))))))
+
+;;======================================================================
+;; if it looks like a number -> convert it to a number, else return it
+;;
+(define (common:lazy-convert inval)
   (let* ((as-num (if (string? inval)(string->number inval) #f)))
     (or as-num inval)))
 
+;;======================================================================
+;; convert string a=1; b=2; c=a silly thing; d=
 ;; to '((a . 1)(b . 2)(c . "a silly thing")(d . ""))
 ;;
-(define (val->alist val #!key (convert #f))
+(define (common:val->alist val #!key (convert #f))
   (let ((val-list (string-split-fields ";\\s*" val #:infix)))
     (if val-list
 	(map (lambda (x)
 	       (let ((f (string-split-fields "\\s*=\\s*" x #:infix)))
 		 (case (length f)
 		   ((0) `(,#f))  ;; null string case
 		   ((1) `(,(string->symbol (car f))))
-		   ((2) `(,(string->symbol (car f)) .
-			  ,(let ((inval (cadr f)))
-			     (if convert (lazy-convert inval) inval))))
+		   ((2) `(,(string->symbol (car f)) . ,(let ((inval (cadr f)))
+							 (if convert (common:lazy-convert inval) inval))))
 		   (else f))))
-	     (filter (lambda (x)
-		       (not (string-match "^\\s*" x)))
-		     val-list))
+	     val-list)
 	'())))
 
 ;;======================================================================
-;; testsuite and area utilites
+;; S Y S T E M   S T U F F
+;;======================================================================
+
+;;======================================================================
+;; lazy-safe get file mod time. on any error (file not existing etc.) return 0
+;;
+(define (common:lazy-modification-time fpath)
+  (handle-exceptions
+      exn
+    (begin
+      (debug:print 0 *default-log-port* "Failed to get modifcation time for " fpath ", treating it as zero. exn=" exn)
+      0)
+    (if (file-exists? fpath)
+	(file-modification-time fpath)
+	0)))
+
+;;======================================================================
+;; find timestamp of newest file associated with a sqlite db file
+(define (common:lazy-sqlite-db-modification-time fpath)
+  (let* ((glob-list (handle-exceptions
+			exn
+		      (begin
+			(debug:print 0 *default-log-port* "Failed to glob " fpath "*, exn=" exn)
+			`(,(conc "/no/such/file, message: " ((condition-property-accessor 'exn 'message) exn))))
+		      (glob (conc fpath "*"))))
+         (file-list (if (eq? 0 (length glob-list))
+			'("/no/such/file")
+			glob-list)))
+  (apply max
+	 (map
+	  common:lazy-modification-time 
+	  file-list))))
+
+;;======================================================================
+;; return a nice clean pathname made absolute
+;;
+;; defined in configfmod
+;;
+#;(define (common:nice-path dir)
+  (let ((match (string-match "^(~[^\\/]*)(\\/.*|)$" dir)))
+    (if match ;; using ~ for home?
+	(common:nice-path (conc (common:read-link-f (cadr match)) "/" (caddr match)))
+	(normalize-pathname (if (absolute-pathname? dir)
+				dir
+				(conc (current-directory) "/" dir))))))
+
+;; defined in configfmod
+
+#;(define (common:read-link-f path)
+  (handle-exceptions
+      exn
+      (begin
+	(debug:print-error 0 *default-log-port* "command \"/bin/readlink -f " path "\" failed. exn=" exn)
+	path) ;; just give up
+    (with-input-from-pipe
+	(conc "/bin/readlink -f " path)
+      (lambda ()
+	(read-line)))))
+
+;;======================================================================
+;; returns *effective load* (not normalized)
+;;
+(define (common:get-intercept onemin fivemin)
+  (if (< onemin fivemin) ;; load is decreasing, just use the onemin load
+      onemin
+      (let* ((load-change (- onemin fivemin))
+	     (tchange     (- 300 60)))
+	(max (+ onemin (* 60 (/ load-change tchange))) 0))))
+
+;;======================================================================
+;; calculate a delay number based on a droop curve
+;;    inputs are:
+;;      - load-in, load as from uptime, NOT normalized
+;;      - numcpus, number of cpus, ideally use the real cpus, not threads
+;;
+(define (common:get-delay load-in numcpus)
+  (let* ((ratio (/ load-in numcpus))
+         (new-option (configf:lookup *configdat* "load" "new-load-method"))
+	 (paramstr   (or (configf:lookup *configdat* "load" "exp-params")
+			 "15 12 1281453987.9543 0.75")) ;; 5 4 10 1"))
+	 (paramlst   (map string->number (string-split paramstr))))
+    (if new-option
+	(begin
+          (cond ((and (>= ratio 0) (< ratio .5))
+		 0)
+		((and (>= ratio 0.5) (<= ratio .9))
+		 (* ratio (/ 5 .9)))
+		((and (> ratio .9) (<= ratio 1.1))
+		 (+ 5 (* (- ratio .9) (/ 55 .2)))) 
+		((> ratio 1.1)
+		 60)))
+	(match paramlst
+	  ((r1 r2 s1 s2)
+	   (debug:print 3 *default-log-port* "Using params r1=" r1 " r2=" r2 " s1=" s1 " s2=" s2)
+	   (min (max (/ (expt r1 (* r2 s2 ratio)) s1) 0) 30))
+	  (else
+	   (debug:print 0 *default-log-port* "BAD exp-params, should be \"r1 r2 s1 s2\" but got " paramstr)
+	   30)))))
+
+(define (common:print-delay-table)
+  (let loop ((x 0))
+    (print x "," (common:get-delay x 1))
+    (if (< x 2)
+	(loop (+ x 0.1)))))
+
+(define (get-cpu-load #!key (remote-host #f))
+  (car (common:get-cpu-load remote-host)))
+
+;;======================================================================
+;;   (let* ((load-res (process:cmd-run->list "uptime"))
+;; 	 (load-rx  (regexp "load average:\\s+(\\d+)"))
+;; 	 (cpu-load #f))
+;;     (for-each (lambda (l)
+;; 		(let ((match (string-search load-rx l)))
+;; 		  (if match
+;; 		      (let ((newval (string->number (cadr match))))
+;; 			(if (number? newval)
+;; 			    (set! cpu-load newval))))))
+;; 	      (car load-res))
+;;     cpu-load))
+
+;;======================================================================
+;; get values from cached info from dropping file in logs dir
+;;  e.g. key is host and dtype is normalized-load
+;;
+(define (common:get-cached-info key dtype #!key (age 10))
+  (if *toppath*
+      (let* ((fullpath (conc *toppath* "/.sysdata/" key "-" dtype ".log"))
+	     (delfile  (lambda (exn)
+			 (debug:print-info 1 *default-log-port* " removing bad file " fullpath ", exn=" exn)
+			 (delete-file* fullpath)
+			 #f)))
+	(if (and (file-exists? fullpath)
+		 (file-readable? fullpath))
+	    (handle-exceptions
+		exn
+	      (begin
+		(debug:print 0 *default-log-port* "failed to get cached info from " fullpath ", exn=" exn)
+		#f)
+	     (debug:print 2 *default-log-port* "reading file " fullpath)
+	     (let ((real-age (- (current-seconds)
+				(handle-exceptions
+				    exn
+				  (begin
+				    (debug:print 1 *default-log-port* "Failed to read mod time on file "
+						 fullpath ", using 0, exn=" exn)
+				    0)
+				  (file-change-time fullpath)))))
+	       (if (< real-age age)
+		   (handle-exceptions
+		       exn
+		     (delfile exn)
+		     (let* ((res (with-input-from-file fullpath read)))
+		       (if (eof-object? res)
+			   (begin
+			     (delfile "n/a")
+			     #f)
+			   res)))
+		   (begin
+		     (debug:print-info 2 *default-log-port* "file " fullpath
+				       " is too old (" real-age" seconds) to trust, skipping reading it")
+		     #f))))
+	    (begin
+	      (debug:print 2 *default-log-port* "not reading file " fullpath)
+	      #f)))
+      #f))
+ 
+(define (common:write-cached-info key dtype dat)
+  (if *toppath*
+      (let* ((fulldir  (conc *toppath* "/.sysdata"))
+	     (fullpath (conc fulldir "/" key "-" dtype ".log")))
+	(if (not (file-exists? fulldir))(create-directory fulldir #t))
+	(handle-exceptions
+	    exn
+	  (begin
+	    (debug:print 0 *default-log-port* "failed to write file " fullpath ", exn=" exn)
+	    #f)
+	  (with-output-to-file fullpath (lambda ()(pp dat)))))
+      #f))
+
+(define (common:raw-get-remote-host-load remote-host)
+  (handle-exceptions
+      exn
+    (begin
+      (debug:print 0 *default-log-port* "failed to ssh to " remote-host " and get loadavg. exn=" exn)
+      #f) ;; more specific handling of errors needed
+    (with-input-from-pipe 
+     (conc "ssh " remote-host " cat /proc/loadavg")
+     (lambda ()(list (read)(read)(read))))))
+
+;;======================================================================
+;; get cpu load by reading from /proc/loadavg, return all three values
+;;
+(define (common:get-cpu-load remote-host)
+  (handle-exceptions
+      exn
+    (begin
+      (debug:print 0 *default-log-port* "failed to ssh or read loadavg from host " remote-host ", exn=" exn)
+      '(-99 -99 -99))
+    (let* ((actual-hostname (or remote-host (get-host-name) "localhost")))
+      (or (common:get-cached-info actual-hostname "cpu-load")
+	  (let ((result (if remote-host
+			    (map (lambda (res)
+				   (if (eof-object? res) 9e99 res))
+			         (with-input-from-pipe 
+				  (conc "ssh " remote-host " cat /proc/loadavg")
+				  (lambda ()(list (read)(read)(read)))))
+			    (with-input-from-file "/proc/loadavg" 
+			      (lambda ()(list (read)(read)(read)))))))
+	    (match
+		result
+	      ((l1 l2 l3)
+	       (if (and (number? l1)
+		      (number? l2)
+		      (number? l3))
+		   (begin
+		     (common:write-cached-info actual-hostname "cpu-load" result)
+		     result)
+		   '(-1 -1 -1))) ;; -1 is bad result
+	      (else '(-2 -2 -2))))))))
+
+;;======================================================================
+;; get normalized cpu load by reading from /proc/loadavg and /proc/cpuinfo return all three values and the number of real cpus and the number of threads
+;; returns alist '((adj-cpu-load . normalized-proc-load) ... etc.
+;;  keys: adj-proc-load, adj-core-load, 1m-load, 5m-load, 15m-load
+;;
+(define (common:get-normalized-cpu-load remote-host)
+  (let ((res (common:get-normalized-cpu-load-raw remote-host))
+	(default `((adj-proc-load . 2) ;; there is no right answer
+		   (adj-core-load . 2)
+		   (1m-load       . 2)
+		   (5m-load       . 0) ;; causes a large delta - thus causing default of throttling if stuff goes wrong
+		   (15m-load      . 0)
+		   (proc          . 1)
+		   (core          . 1)
+		   (phys          . 1)
+		   (error         . #t))))
+    (cond
+     ((and (list? res)
+	   (> (length res) 2))
+      res)
+     ((eq? res #f)   default) ;; add messages?
+     ((eq? res #f) default)   ;; this would be the #eof
+     (else default))))
+
+(define (common:get-normalized-cpu-load-raw remote-host)
+  (let* ((actual-host (or remote-host (get-host-name)))) ;; #f is localhost
+    (or (common:get-cached-info actual-host "normalized-load")
+	(let ((data (if remote-host
+			(with-input-from-pipe 
+			    (conc "ssh " remote-host " \"cat /proc/loadavg;cat /proc/cpuinfo;echo end\"")
+			  read-lines)
+			(append 
+			 (with-input-from-file "/proc/loadavg" 
+			   read-lines)
+			 (with-input-from-file "/proc/cpuinfo"
+			   read-lines)
+			 (list "end"))))
+	      (load-rx  (regexp "^([\\d\\.]+)\\s+([\\d\\.]+)\\s+([\\d\\.]+)\\s+.*$"))
+	      (proc-rx  (regexp "^processor\\s+:\\s+(\\d+)\\s*$"))
+	      (core-rx  (regexp "^core id\\s+:\\s+(\\d+)\\s*$"))
+	      (phys-rx  (regexp "^physical id\\s+:\\s+(\\d+)\\s*$"))
+	      (max-num  (lambda (p n)(max (string->number p) n))))
+	  ;; (print "data=" data)
+	  (if (null? data) ;; something went wrong
+	      #f
+	      (let loop ((hed      (car data))
+			 (tal      (cdr data))
+			 (loads    #f)
+			 (proc-num 0)  ;; processor includes threads
+			 (phys-num 0)  ;; physical chip on motherboard
+			 (core-num 0)) ;; core
+		;;; (print hed ", " loads ", " proc-num ", " phys-num ", " core-num)
+		(if (null? tal) ;; have all our data, calculate normalized load and return result
+		    (let* ((act-proc (+ proc-num 1))
+			   (act-phys (+ phys-num 1))
+			   (act-core (+ core-num 1))
+			   (adj-proc-load (/ (car loads) act-proc))
+			   (adj-core-load (/ (car loads) act-core))
+			   (result
+			    (append (list (cons 'adj-proc-load adj-proc-load)
+					  (cons 'adj-core-load adj-core-load))
+				    (list (cons '1m-load (car loads))
+					  (cons '5m-load (cadr loads))
+					  (cons '15m-load (caddr loads)))
+				    (list (cons 'proc act-proc)
+					  (cons 'core act-core)
+					  (cons 'phys act-phys)))))
+		      (common:write-cached-info actual-host "normalized-load" result)
+		      result)
+		  (regex-case
+		   hed
+		   (load-rx  ( x l1 l5 l15 ) (loop (car tal)(cdr tal)(map string->number (list l1 l5 l15)) proc-num phys-num core-num))
+		   (proc-rx  ( x p         ) (loop (car tal)(cdr tal) loads           (max-num p proc-num) phys-num core-num))
+		   (phys-rx  ( x p         ) (loop (car tal)(cdr tal) loads           proc-num (max-num p phys-num) core-num))
+		   (core-rx  ( x c         ) (loop (car tal)(cdr tal) loads           proc-num phys-num (max-num c core-num)))
+		   (else 
+		    (begin
+		      ;; (print "NO MATCH: " hed)
+		      (loop (car tal)(cdr tal) loads proc-num phys-num core-num)))))))))))
+
+(define (common:unix-ping hostname)
+  (let ((res (system (conc "ping -c 1 " hostname " > /dev/null"))))
+    (eq? res 0)))
+
+(define (launch:is-test-alive host pid)
+  (if (and host pid (not (equal? host "n/a")))
+      (let* ((cmd (conc "ssh " host " pstree -A " pid))
+	     (output (with-input-from-pipe cmd read-lines)))
+	(debug:print 2 *default-log-port* "Running " cmd " received " output)
+	(if (eq? (length output) 0)
+	   #f
+	   #t))
+      #t))
+
+(define (common:get-num-cpus remote-host)
+  (let* ((actual-host (or remote-host (get-host-name))))
+    ;; hosts had better not be changing the number of cpus too often!
+    (or (hash-table-ref/default *numcpus-cache* actual-host #f)
+	(let* ((numcpus (or (common:get-cached-info actual-host "num-cpus" age: (+ 2592000 (pseudo-random-integer 3600)))
+			    (let* ((proc   (lambda ()
+					     (let loop ((numcpu 0)
+							(inl    (read-line)))
+					       (if (eof-object? inl)
+						   (if (> numcpu 0)
+						       numcpu
+						       #f) ;; if zero return #f so caller knows that things are not working
+						   (loop (if (string-match "^processor\\s+:\\s+\\d+$" inl)
+							     (+ numcpu 1)
+							     numcpu)
+							 (read-line))))))
+				   (result (if remote-host
+					       (with-input-from-pipe 
+						(conc "ssh " remote-host " cat /proc/cpuinfo")
+						proc)
+					       (with-input-from-file "/proc/cpuinfo" proc))))
+			      (if (and (number? result)
+				       (> result 0))
+				  (common:write-cached-info actual-host "num-cpus" result))
+			      result))))
+	  (hash-table-set! *numcpus-cache* actual-host numcpus)
+	  numcpus))))
+
+;;======================================================================
+;; wait for normalized cpu load to drop below maxload
+;;
+(define (common:wait-for-normalized-load maxnormload msg remote-host #!optional (rem-tries 5))
+  (let ((num-cpus (common:get-num-cpus remote-host)))
+    (if num-cpus
+	(common:wait-for-cpuload maxnormload num-cpus 15 msg: msg remote-host: remote-host)
+	(begin
+	  (thread-sleep! (pseudo-random-integer 60)) ;; we failed to get num cpus. wait a bit and try again
+	  (if (> rem-tries 0)
+	      (common:wait-for-normalized-load maxnormload msg remote-host (- rem-tries 1))
+	      #f)))))
+
+;;======================================================================
+;; DO NOT CALL THIS DIRECTLY. It is called from common:wait-for-normalized-load
+;;   count     - count down to zero, at some point we'd give up if the load never drops
+;;   num-tries - count down to zero number tries to get numcpus
+;;
+(define (common:wait-for-cpuload maxnormload numcpus-in
+				 #!key (count 1000)
+				 (msg #f)(remote-host #f)(num-tries 5))
+  (let* ((loadavg     (common:get-cpu-load remote-host))
+	  ;; not possible to have zero.  If we get 1, it's possible that we got the previous default, and we should check again
+	 (numcpus     (if (<= 1 numcpus-in)
+			  (common:get-num-cpus remote-host)
+			  numcpus-in))
+	 (first       (car loadavg))
+	 (next        (cadr loadavg))
+	 (adjmaxload  (* maxnormload (max 1 numcpus))) ;; possible bug
+						   ;; where numcpus
+						   ;; (or could be
+						   ;; maxload) is
+						   ;; zero, crude
+						   ;; fallback is to
+						   ;; at least use 1
+	 ;; effective load accounts for load jumps, this should elminate all the first-next-avg, adjwait, load-jump-limit
+	 ;; etc.
+	 (effective-load    (common:get-intercept first next))
+	 (recommended-delay (common:get-delay effective-load numcpus))
+	 (effective-host    (or remote-host "localhost"))
+	 (normalized-effective-load (/ effective-load numcpus))
+	 (will-wait                 (> normalized-effective-load maxnormload)))
+    (if (> recommended-delay 1) 
+	(let* ((actual-delay (min recommended-delay 30)))
+	  (if (common:low-noise-print 30 (conc (round actual-delay) "-safe-load"))
+	      (debug:print-info 0 *default-log-port* "Load control, delaying "
+				actual-delay " seconds to maintain safe load. current normalized effective load is "
+				normalized-effective-load". maxnormload = " maxnormload " numcpus = " numcpus " loadavg = " loadavg " effective-load = " effective-load))
+	  (thread-sleep! actual-delay)))
+    
+    (cond
+     ;; bad data, try again to get the data
+     ((not will-wait)
+      (if (common:low-noise-print 3600 (conc (round normalized-effective-load) "-load-acceptable-" effective-host))
+      	  (debug:print 0 *default-log-port* "Effective load on " effective-host " is acceptable at " effective-load " continuing.")))
+
+     ((and (< first 0) ;; this indicates the loadavg data is bad - machine may not be reachable
+	   (> num-tries 0))
+      (debug:print 0 *default-log-port* "WARNING: received bad data from get-cpu-load "
+		   first ", we'll sleep 10s and try " num-tries " more times.")
+      (thread-sleep! 10)
+      (common:wait-for-cpuload maxnormload numcpus-in
+			       count: count remote-host: remote-host num-tries: (- num-tries 1)))
+
+     ;; need to wait for load to drop
+     ((and will-wait ;; (> first adjmaxload)
+	   (> count 0))
+      (debug:print-info 0 *default-log-port*
+			"Delaying 15" ;; adjwait
+			" seconds due to normalized effective load " normalized-effective-load ;; first
+			" exceeding max of " adjmaxload
+			" on server " (or remote-host (get-host-name))
+			" (normalized load-limit: " maxnormload ") " (if msg msg ""))
+      (thread-sleep! 15) ;; adjwait)
+      (common:wait-for-cpuload maxnormload numcpus count: (- count 1) msg: msg remote-host: remote-host)
+      ;; put the message here to indicate came out of waiting
+      (debug:print-info 1 *default-log-port*
+			"On host: " effective-host
+			", effective load: " effective-load
+			", numcpus: " numcpus
+			", normalized effective load: " normalized-effective-load
+			))
+     ;; overloaded and count expired (i.e. went to zero)
+     (else
+      (if (> num-tries 0) ;; should be "num-tries-left". 
+	  (if (common:low-noise-print 30 (conc (round effective-load) "-load-acceptable-" effective-host))
+	      (debug:print 0 *default-log-port* "Load on " effective-host " is acceptable at effective normalized load of "
+			   normalized-effective-load "  continuing."))
+	  (debug:print 0 *default-log-port* "Load on " effective-host ", "
+		       first" could not be retrieved. Giving up and continuing."))))))
+
+;;======================================================================
+;; server process management
+;;======================================================================
+
+;; no elegance here ...
+;;
+(define (tasks:kill-server hostname pid #!key (kill-switch ""))
+  (debug:print-info 0 *default-log-port* "Attempting to kill server process " pid " on host " hostname)
+  (setenv "TARGETHOST" hostname)
+  (let* ((logdir (if (directory-exists? "logs")
+                    "logs/"
+                    ""))
+         (logfile (if logdir (conc "logs/server-"pid"-"hostname".log") #f))
+         (gzfile  (if logfile (conc logfile ".gz"))))
+    (setenv "TARGETHOST_LOGF" (conc logdir "server-kills.log"))
+
+    (system (conc "nbfake kill "kill-switch" "pid))
+
+    (when logfile
+      (thread-sleep! 0.5)
+      (if (file-exists? gzfile) (delete-file gzfile))
+      (system (conc "gzip " logfile))
+      
+      (unsetenv "TARGETHOST_LOGF")
+      (unsetenv "TARGETHOST"))))
+
+(define (server:get-logs-list area-path)
+  (let* (;; (server-logs-cmd  (conc "grep -iL exiting " area-path "/logs/server-*-*.log"))
+	 ;; (server-logs   (string-split (string-chomp (with-input-from-pipe server-logs-cmd read-string))))
+	 (server-logs      (glob (conc area-path"/logs/server-*-*.log")))
+	 )
+    server-logs))
+  
+;; get a list of servers with all relevant data
+;; ( mod-time host port start-time pid )
+;;
+(define (server:get-list areapath #!key (limit #f))
+  (let ((fname-rx    (regexp "^(|.*/)server-(\\d+)-(\\S+).log$"))
+	(day-seconds (* 24 60 60)))
+    ;; if the directory exists continue to get the list
+    ;; otherwise attempt to create the logs dir and then
+    ;; continue
+    (if (if (directory-exists? (conc areapath "/logs"))
+	    '()
+	    (if (file-writable? areapath)
+		(begin
+		  (condition-case
+		   (create-directory (conc areapath "/logs") #t)
+		   (exn (i/o file)(debug:print 0 *default-log-port* "ERROR: Cannot create directory at " (conc areapath "/logs")))
+		   (exn ()(debug:print 0 *default-log-port* "ERROR: Unknown error attemtping to get server list. exn=" exn)))
+		  (directory-exists? (conc areapath "/logs")))
+		'()))
+
+        ;; Get the list of server logs that do not contain "exiting". Ignore logs for servers that have exited.
+	(let* ((server-logs   (server:get-logs-list areapath))
+	       (num-serv-logs (length server-logs)))
+	  (if (or (null? server-logs) (= num-serv-logs 0))
+              (let ()
+                 (debug:print 1  *default-log-port* "There are no servers running")
+	         '()
+              )
+	      (let loop ((hed  (string-chomp (car server-logs)))
+			 (tal  (cdr server-logs))
+			 (res '()))
+		(let* ((mod-time  (handle-exceptions
+				   exn
+				   (begin
+				     (debug:print 0 *default-log-port* "failed to get modification time on " hed ", exn=" exn)
+				     (current-seconds)) ;; 0
+				   (file-modification-time hed))) ;; default to *very* old so log gets ignored if deleted
+		       (down-time (- (current-seconds) mod-time))
+		       (serv-dat  (if (or (< num-serv-logs 10)
+				  	  (< down-time 900)) ;; day-seconds))
+				      (server:logf-get-start-info hed)
+				      '())) ;; don't waste time processing server files not touched in the 15 minutes if there are more than ten servers to look at
+		       (serv-rec (cons mod-time serv-dat))
+		       (fmatch   (string-match fname-rx hed))
+		       (pid      (if fmatch (string->number (list-ref fmatch 2)) #f))
+		       (new-res  (if (null? serv-dat)
+				     res
+				     (cons (append serv-rec (list pid)) res)))) ;; any changes to number of elements in new-res will dirctly affect server:record->url,server:record->id,server:kill,server:get-num-alive which uses match let 
+		  (if (null? tal)
+		      (if (and limit
+			       (> (length new-res) limit))
+			  new-res ;; (take new-res limit)  <= need intelligent sorting before this will work
+			  new-res)
+		      (loop (string-chomp (car tal)) (cdr tal) new-res)))))))))
+
+(define (server:get-num-alive srvlst)
+  (let ((num-alive 0))
+    (for-each
+     (lambda (server)
+        (handle-exceptions
+          exn
+         (begin 
+          (debug:print-info 0 *default-log-port*  "Unable to get server start-time and/or mod-time from " server ", exn=" exn))
+       (match-let (((mod-time host port start-time server-id pid)
+		    server))
+	 (let* ((uptime  (- (current-seconds) mod-time))
+		(runtime (if start-time
+			     (- mod-time start-time)
+			     0)))
+	   (if (< uptime 5)(set! num-alive (+ num-alive 1)))))))
+     srvlst)
+    num-alive))
+
+;; given a list of servers get a list of valid servers, i.e. at least
+;; 10 seconds old, has started and is less than 1 hour old and is
+;; active (i.e. mod-time < 10 seconds
+;;
+;; mod-time host port start-time pid
+;;
+;; sort by start-time descending. I.e. get the oldest first. Young servers will thus drop off
+;; and servers should stick around for about two hours or so.
+;;
+(define (server:get-best srvlst)
+  (let* ((nums (server:get-num-servers))
+	 (now  (current-seconds))
+	 (slst (sort
+		(filter (lambda (rec)
+			  (if (and (list? rec)
+				   (> (length rec) 2))
+			      (let ((start-time (list-ref rec 3))
+				    (mod-time   (list-ref rec 0)))
+				;; (print "start-time: " start-time " mod-time: " mod-time)
+				(and start-time mod-time
+				     (> (- now start-time) 0)    ;; been running at least 0 seconds
+				     (< (- now mod-time)   16)   ;; still alive - file touched in last 16 seconds
+				     (or (not (configf:lookup *configdat* "server" "runtime")) ;; skip if not set
+					 (< (- now start-time)       
+					    (+ (- (string->number (configf:lookup *configdat* "server" "runtime"))
+					       180)
+					    (pseudo-random-integer 360)))) ;; under one hour running time +/- 180
+				     ))
+			      #f))
+			srvlst)
+		(lambda (a b)
+		  (< (list-ref a 3)
+		     (list-ref b 3))))))
+    (if (> (length slst) nums)
+	(take slst nums)
+	slst)))
+
+(define (server:get-first-best areapath)
+  (let ((srvrs (server:get-best (server:get-list areapath))))
+    (if (and srvrs
+	     (not (null? srvrs)))
+	(car srvrs)
+	#f)))
+
+(define (server:get-rand-best areapath)
+  (let ((srvrs (server:get-best (server:get-list areapath))))
+    (if (and (list? srvrs)
+	     (not (null? srvrs)))
+	(let* ((len (length srvrs))
+	       (idx (pseudo-random-integer len)))
+	  (list-ref srvrs idx))
+	#f)))
+
+(define (server:record->id servr)
+  (handle-exceptions
+   exn
+   (begin 
+     (debug:print-info 0 *default-log-port*  "Unable to get server id from " servr ", exn=" exn)     
+   #f)
+  (match-let (((mod-time host port start-time server-id pid)
+	       servr))
+    (if server-id
+	server-id
+	#f))))
+
+(define (server:get-num-servers #!key (numservers 2))
+  (let ((ns (string->number
+	     (or (configf:lookup *configdat* "server" "numservers") "notanumber"))))
+    (or ns numservers)))
+
+;; given a path to a server log return: host port startseconds
+;; any changes to number of elements returned by this fuction will dirctly affect server:record->url,server:record->id,server:kill,server:get-num-alive which uses match let 
+
+(define (server:logf-get-start-info logf)
+  (let ((server-rx (regexp "^SERVER STARTED: (\\S+):(\\d+) AT ([\\d\\.]+) server-id: (\\S+)")) ;; SERVER STARTED: host:port AT timesecs server id
+        (dbprep-rx     (regexp "^SERVER: dbprep"))
+	(exiting-rx    (regexp ".*exiting promptly.*"))
+        (dbprep-found  #f)
+	(exiting-found #f))
+    (handle-exceptions
+	exn
+      (begin
+	(debug:print-info 0 *default-log-port* "Unable to get server info from " logf ", exn=" exn)
+	(list #f #f #f #f)) ;; no idea what went wrong, call it a bad server
+      (with-input-from-file
+	  logf
+	(lambda ()
+	  (let loop ((inl  (read-line))
+		     (lnum 0))
+	    (if (not (eof-object? inl))
+		(let ((mlst    (string-match server-rx inl))
+                      (dbprep  (string-match dbprep-rx inl))
+		      (exiting (string-match exiting-rx inl)))
+                  (if dbprep  (set! dbprep-found #t))
+		  (if exiting (set! exiting-found #t))
+		  (if (not mlst)
+		      (if (< lnum 500) ;; give up if more than 500 lines of server log read
+			  (loop (read-line)(+ lnum 1))
+			  (begin 
+			    (debug:print-info 0 *default-log-port* "Unable to get server info from first 500 lines of " logf )
+			    (list #f #f #f #f)))
+		      (let ((dat  (cdr mlst)))
+			(list (car dat) ;; host
+			      (string->number (cadr dat)) ;; port
+			      (string->number (caddr dat))
+                              (cadr (cddr dat))))))
+		(begin
+		  (cond
+		   (dbprep-found
+		    (debug:print-info 0 *default-log-port* "Server is in dbprep at " (current-seconds))
+		    (thread-sleep! 25))
+		   (exiting-found
+		    (debug:print-info 0 *default-log-port* "Removing server log "logf" as the server exited due to signal")
+		    (delete-file* logf)
+		    (thread-sleep! 1))
+		   (else
+		    (debug:print-info 0 *default-log-port* "Unable to get server info from " logf " at " (current-seconds))))
+		  (list #f #f #f #f)))))))))
+
+
+;;======================================================================
+;; DO NOT CALL THIS DIRECTLY. It is called from common:wait-for-normalized-load
+;;
+;; (define (common:wait-for-cpuload maxload-in numcpus-in waitdelay #!key (count 1000) (msg #f)(remote-host #f)(force-maxload #f)(num-tries 5))
+;;   (let* ((loadavg (common:get-cpu-load remote-host))
+;; 	 (numcpus (if (<= 1 numcpus-in) ;; not possible to have zero.  If we get 1, it's possible that we got the previous default, and we should check again
+;; 		      (common:get-num-cpus remote-host)
+;; 		      numcpus-in))
+;; 	 (maxload (if force-maxload
+;; 		      maxload-in
+;; 		      (if (number? maxload-in)
+;; 			  (max maxload-in 0.5)
+;; 			  0.5))) ;; so maxload must be greater than 0.5 for now BUG - FIXME?
+;; 	 (first   (car loadavg))
+;; 	 (next    (cadr loadavg))
+;; 	 (adjmaxload (* maxload (max 1 numcpus))) ;; possible bug where
+;; 					       ;; numcpus (or could be
+;; 					       ;; maxload) is zero,
+;; 					       ;; crude fallback is to
+;; 					       ;; at least use 1
+;; 	 (loadjmp (- first (if (> next (* numcpus 0.7)) ;; could do something with average of first and next?
+;; 			       0
+;; 			       next))) ;; we will force a conservative calculation any time next is large.
+;; 	 (first-next-avg    (/ (+ first next) 2))
+;; 	 ;; add some randomness to the time to break any alignment
+;; 	 ;; where netbatch dumps many jobs to machines simultaneously
+;;          (adjwait           (min (+ 300 (pseudo-random-integer 10)) (abs (* (+ (pseudo-random-integer 10)
+;; 								(/ (- 1000 count) 10)
+;; 								waitdelay)
+;; 							     (- first adjmaxload) ))))
+;; 	 (load-jump-limit   (configf:lookup-number *configdat* "setup" "load-jump-limit"))
+;; 	 ;; effective load accounts for load jumps, this should elminate all the first-next-avg, adjwait, load-jump-limit
+;; 	 ;; etc.
+;; 	 (effective-load    (common:get-intercept first next))
+;; 	 (effective-host    (or remote-host "localhost"))
+;; 	 (normalized-effective-load (/ effective-load numcpus))
+;; 	 (will-wait                 (> normalized-effective-load maxload)))
+;; 	 
+;;     ;; let's let the user know once in a long while that load checking
+;;     ;; is happening but not constantly report it
+;;     #;(if (common:low-noise-print 30 (conc "cpuload" (or remote-host "localhost"))) ;; (> (pseudo-random-integer 100) 75) ;; about 25% of the time
+;; 	(debug:print-info 1 *default-log-port* "Checking cpuload on " (or remote-host "localhost") ", maxload: " maxload
+;;     ", load: " first ", adjmaxload: " adjmaxload ", loadjmp: " loadjmp))
+;; 
+;;     (debug:print-info 1 *default-log-port*
+;; 		      "On host: " effective-host
+;; 		      ", effective load: " effective-load
+;; 		      ", numcpus: " numcpus
+;; 		      ", normalized effective load: " normalized-effective-load
+;; 		      )
+;;     
+;;     (cond
+;;      ;; bad data, try again to get the data
+;;      ((and (< first 0) ;; this indicates the loadavg data is bad - machine may not be reachable
+;; 	   (> num-tries 0))
+;;       (debug:print 0 *default-log-port* "WARNING: received bad data from get-cpu-load " first ", we'll sleep 10s and try " num-tries " more times.")
+;;       (thread-sleep! 10)
+;;       (common:wait-for-cpuload maxload-in numcpus-in waitdelay
+;; 			       count: count remote-host: remote-host force-maxload: force-maxload num-tries: (- num-tries 1)))
+;;      ;; need to wait for load to drop
+;;      ((and will-wait ;; (> first adjmaxload)
+;; 	   (> count 0))
+;;       (debug:print-info 0 *default-log-port*
+;; 			"Delaying " 15 ;; adjwait
+;; 			" seconds due to normalized effective load " normalized-effective-load ;; first
+;; 			" exceeding max of " adjmaxload
+;; 			" on server " (or remote-host (get-host-name))
+;; 			" (normalized load-limit: " maxload ") " (if msg msg ""))
+;;       (thread-sleep! 15) ;; adjwait)
+;;       (common:wait-for-cpuload maxload numcpus waitdelay count: (- count 1) msg: msg remote-host: remote-host))
+;;      ((and (> loadjmp (cond
+;; 		       (load-jump-limit load-jump-limit)
+;; 		       ((> numcpus 8)(/ numcpus 2))
+;; 		       ((> numcpus 4)(/ numcpus 1.2))
+;; 		       (else 0.5)))
+;; 	   (> count 0))
+;;       (debug:print-info 0 *default-log-port* "waiting " adjwait " seconds due to possible load jump " loadjmp ". "
+;; 			(if msg msg ""))
+;;       (thread-sleep! adjwait)
+;;       (common:wait-for-cpuload maxload numcpus waitdelay count: (- count 1) msg: msg remote-host: remote-host))
+;;      (else
+;;       (if (> num-tries 0)
+;; 	  (if (common:low-noise-print 30 (conc (round first) "-load-acceptable-" (or remote-host "localhost")))
+;; 	      (debug:print 0 *default-log-port* "Load on " (or remote-host "localhost") " is acceptable at " first " continuing."))
+;; 	  (debug:print 0 *default-log-port* "Load on " (or remote-host "localhost") ", "first" could not be retrieved. Giving up and continuing."))))))
+;; 
+(define (get-uname . params)
+  (let* ((uname-res (process:cmd-run->list (conc "uname " (if (null? params) "-a" (car params)))))
+	 (uname #f))
+    (if (null? (car uname-res))
+	"unknown"
+	(caar uname-res))))
+
+(define (realpath x)
+  (with-input-from-pipe
+   (string-append "readlink -f \""x"\"")
+   read-line))
+
+;; for reasons I don't understand multiple calls to real-path in parallel threads
+;; must be protected by mutexes
+;;
+(define (common:real-path inpath)
+  ;; (process:cmd-run-with-stderr->list "readlink" "-f" inpath)) ;; cmd . params)
+  ;; (let-values 
+  ;;  (((inp oup pid) (process "readlink" (list "-f" inpath))))
+  ;;  (with-input-from-port inp
+  ;;    (let loop ((inl (read-line))
+  ;;       	(res #f))
+  ;;      (print "inl=" inl)
+  ;;      (if (eof-object? inl)
+  ;;          (begin
+  ;;            (close-input-port inp)
+  ;;            (close-output-port oup)
+  ;;            ;; (process-wait pid)
+  ;;            res)
+  ;;          (loop (read-line) inl))))))
+  (with-input-from-pipe (conc "readlink -f " inpath) read-line))
+
+;;======================================================================
+;; D I S K   S P A C E 
+;;======================================================================
+
+(define (common:get-disk-space-used fpath)
+  (with-input-from-pipe (conc "/usr/bin/du -s " fpath) read))
+
+;;======================================================================
+;; given path get free space, allows override in [setup]
+;; with free-space-script /path/to/some/script.sh
+;;
+(define (get-df path)
+  (if (configf:lookup *configdat* "setup" "free-space-script")
+      (with-input-from-pipe 
+       (conc (configf:lookup *configdat* "setup" "free-space-script") " " path)
+       (lambda ()
+	 (let ((res (read-line)))
+	   (if (string? res)
+	       (string->number res)))))
+      (get-unix-df path)))
+
+(define (get-free-inodes path)
+  (if (configf:lookup *configdat* "setup" "free-inodes-script")
+      (with-input-from-pipe 
+	  (conc (configf:lookup *configdat* "setup" "free-inodes-script") " " path)
+	(lambda ()
+	  (let ((res (read-line)))
+	    (if (string? res)
+		(string->number res)))))
+      (get-unix-inodes path)))
+
+(define (get-unix-df path)
+  (let* ((df-results (process:cmd-run->list (conc "df " path)))
+	 (space-rx   (regexp "([0-9]+)\\s+([0-9]+)%"))
+	 (freespc    #f))
+    ;; (write df-results)
+    (for-each (lambda (l)
+		(let ((match (string-search space-rx l)))
+		  (if match 
+		      (let ((newval (string->number (cadr match))))
+			(if (number? newval)
+			    (set! freespc newval))))))
+	      (car df-results))
+    freespc))
+
+(define (get-unix-inodes path)
+  (let* ((df-results (process:cmd-run->list (conc "df -i " path)))
+	 (space-rx   (regexp "([0-9]+)\\s+([0-9]+)%"))
+	 (freenodes    0)) ;; 0 is a better failsafe than #f here.
+    ;; (write df-results)
+    (for-each (lambda (l)
+		(let ((match (string-search space-rx l)))
+		  (if match 
+		      (let ((newval (string->number (cadr match))))
+			(if (number? newval)
+			    (set! freenodes newval))))))
+	      (car df-results))
+    freenodes))
+
+(define (common:check-space-in-dir dirpath required)
+  (let* ((dbspace  (if (directory? dirpath)
+		       (get-df dirpath)
+		       0)))
+    (list (> dbspace required)
+	  dbspace
+	  required
+	  dirpath)))
+
+;;======================================================================
+;; check space in dbdir and in megatest dir
+;; returns: ok/not dbspace required-space
+;;
+(define (common:check-db-dir-space)
+  (let* ((required (string->number 
+                    ;; default is 1GB (or actually a billion bytes) This is the number of 1 kB blocks.
+		    (or (configf:lookup *configdat* "setup" "dbdir-space-required")
+			"1000000")))
+	 (dbdir    (common:get-db-tmp-area)) ;; (db:get-dbdir))
+	 (tdbspace (common:check-space-in-dir dbdir required))
+	 (mdbspace (common:check-space-in-dir *toppath* required)))
+    (sort (list tdbspace mdbspace) (lambda (a b)
+				     (< (cadr a)(cadr b))))))
+
+;;======================================================================
+;; check available space in dbdir, exit if insufficient
+;;
+(define (common:check-db-dir-and-exit-if-insufficient)
+  (let* ((spacedat (car (common:check-db-dir-space))) ;; look only at worst for now
+	 (is-ok    (car spacedat))
+	 (dbspace  (cadr spacedat))
+	 (required (caddr spacedat))
+	 (dbdir    (cadddr spacedat)))
+    (if (not is-ok)
+	(begin
+	  (debug:print-error 0 *default-log-port* "Insufficient space in " dbdir ", require " required ", have " dbspace  ", exiting now.")
+	  (exit 1)))))
+
+;;======================================================================
+;; paths is list of lists ((name path) ... )
+;;
+(define (common:get-disk-with-most-free-space disks minsize)
+  (let* ((best     #f)
+	(bestsize 0)
+        (default-min-inodes-string "1000000")
+        (default-min-inodes (string->number default-min-inodes-string))
+        (min-inodes (or (string->number (if (configf:lookup *configdat* "setup" "min_inodes") (configf:lookup *configdat* "setup" "min_inodes") default-min-inodes-string)) default-min-inodes)))
+
+    (for-each 
+     (lambda (disk-num)
+       (let* ((dirpath    (cadr (assoc disk-num disks)))
+	      (freespc    (cond
+			   ((not (directory? dirpath))
+			    (if (common:low-noise-print 300 "disks not a dir " disk-num)
+				(debug:print 0 *default-log-port* "WARNING: disk " disk-num " at path \"" dirpath "\" is not a directory - ignoring it."))
+			    -1)
+			   ((not (file-writable? dirpath))
+			    (if (common:low-noise-print 300 "disks not writeable " disk-num)
+				(debug:print 0 *default-log-port* "WARNING: disk " disk-num " at path \"" dirpath "\" is not writeable - ignoring it."))
+			    -1)
+			   ((not (eq? (string-ref dirpath 0) #\/))
+			    (if (common:low-noise-print 300 "disks not a proper path " disk-num)
+				(debug:print 0 *default-log-port* "WARNING: disk " disk-num " at path \"" dirpath "\" is not a fully qualified path - ignoring it."))
+			    -1)
+			   (else
+			    (get-df dirpath))))
+	      (free-inodes (cond
+			   ((not (directory? dirpath))
+			    (if (common:low-noise-print 300 "disks not a dir " disk-num)
+				(debug:print 0 *default-log-port* "WARNING: disk " disk-num " at path \"" dirpath "\" is not a directory - ignoring it."))
+			    -1)
+			   ((not (file-writable? dirpath))
+			    (if (common:low-noise-print 300 "disks not writeable " disk-num)
+				(debug:print 0 *default-log-port* "WARNING: disk " disk-num " at path \"" dirpath "\" is not writeable - ignoring it."))
+			    -1)
+			   ((not (eq? (string-ref dirpath 0) #\/))
+			    (if (common:low-noise-print 300 "disks not a proper path " disk-num)
+				(debug:print 0 *default-log-port* "WARNING: disk " disk-num " at path \"" dirpath "\" is not a fully qualified path - ignoring it."))
+			    -1)
+			   (else
+			    (get-free-inodes dirpath))))
+             ;;(free-inodes (get-free-inodes dirpath))
+             )
+             (debug:print 2 *default-log-port* "INFO: disk " disk-num " path " dirpath " free space " freespc " free inodes " free-inodes)
+	 (if (and (> freespc bestsize)(> free-inodes min-inodes ))
+	     (begin
+	       (set! best     (cons disk-num dirpath))
+	       (set! bestsize freespc)))
+        ;;(print "Processing: " disk-num " bestsize: " bestsize " best: " best " freespc: " freespc " min-inodes: " min-inodes " free-inodes: " free-inodes)
+      ))
+     (map car disks))
+    (if (and best (> bestsize minsize))
+	best
+	#f))) ;; #f means no disk candidate found
+
+;;======================================================================
+;; convert a spec string to a list of vectors #( rx  action rx-string )
+(define (common:spec-string->list-of-specs spec-string actions)
+  (let ((spec-strings  (string-split-fields "\\s*;\\s*" spec-string #:infix))
+	(actions-regex (regexp (conc "^(.*)\\s+(" (string-intersperse (map conc actions) "|") ")"))))
+    (filter
+     (lambda (x) x)
+     (map (lambda (s)
+	    (let ((m (string-match actions-regex s)))
+	      (if m
+		  (vector (regexp (cadr m))(string->symbol (caddr m))(cadr m))
+		  (begin
+		    (debug:print 0 *default-log-port* "WARNING: Unrecognised rule \"" s "\" in clean-up specification.")
+		    #f))))
+	  spec-strings))))
+  
+;;======================================================================
+;; given a list of specs rx . rule and a file return the first matching rule
+;; 
+(define (common:file-find-rule fname rules) ;; rule is vector #( rx action rx-string)
+  (let loop ((rule   (car rules))
+	     (tail   (cdr rules)))
+    (let ((rx (vector-ref rule 0))
+	  (rn (vector-ref rule 1))) ;; rule name
+      (if (string-match rx fname)
+	  rule ;; return the whole rule so regex can be printed etc.
+	  (if (null? tail)
+	      #f
+	      (loop (car tail)(cdr tail)))))))
+
+;;======================================================================
+;; given a spec apply some rules to a directory
+;;
+;;  WARNING: This function will REMOVE files - be sure your spec and path is correct!
+;;
+;; spec format:
+;;   file-regex1 action; file-regex2 action; ...
+;; e.g.
+;;   .*\.log$ keep; .* remove
+;;   --> keep all .log files, remove everything else
+;; limitations:
+;;   cannot have a rule with ; as part of the spec
+;;   not very flexible, would be nice to return binned file names?
+;; supported rules:
+;;   keep     - keep this file
+;;   remove   - remove this file
+;;   compress - compress this file
+;;
+(define (common:dir-clean-up path spec-string #!key (compress "gzip")(actions '(keep remove compress))(remove-empty #f))
+  (let* ((specs         (common:spec-string->list-of-specs spec-string actions))
+	 (keepers       (make-hash-table))
+	 (directories   (make-hash-table)))
+    (find-files 
+     path
+     action: (lambda (p res)
+	       (let ((rule  (common:file-find-rule p specs)))
+		 (cond
+		  ((directory? p)(hash-table-set! directories p #t))
+		  (else
+		   (case (vector-ref rule 1)
+		     ((keep)(hash-table-set! keepers p rule))
+		     ((remove)
+		      (print "Removing file " p)
+		      (delete-file p))
+		     ((compress)
+		      (print "Compressing file " p)
+		      (system (conc compress " " p)))
+		     (else
+		      (print "No match for file " p))))))))
+    (if remove-empty
+	(for-each
+	 (lambda (d)
+	   (if (null? (glob (conc d "/.*")(conc d "/*")))
+	       (begin
+		 (print "Removing empty directory " d)
+		 (delete-directory d))))
+	 (sort (hash-table-keys directories) (lambda (a b)(> (string-length a)(string-length b))))))
+    ))
+
+;;======================================================================
+;; E N V I R O N M E N T   V A R S
+;;======================================================================
+
+(define (bb-check-path #!key (msg "check-path: "))
+  (let ((path (or (get-environment-variable "PATH") "none")))
+    (debug:print-info 0 *default-log-port* (conc msg" : $PATH="path))
+    (if (string-match "^.*/isoenv-core/.*" path)
+        (debug:print-error 0 *default-log-port* (conc msg" : !!ISOENV PRESENT!!")) ;; remove for prod
+        (debug:print-info 1 *default-log-port* (conc msg" : **no isoenv present**")))))
+	      
+(define (save-environment-as-files fname #!key (ignorevars (list "USER" "HOME" "DISPLAY" "LS_COLORS" "XKEYSYMDB" "EDITOR" "MAKEFLAGS" "MAKEF" "MAKEOVERRIDES")))
+  ;;(bb-check-path msg: "save-environment-as-files entry")
+  (let ((envvars (get-environment-variables))
+        (whitesp (regexp "[^a-zA-Z0-9_\\-:,\\.\\/%$]"))
+	(mungeval (lambda (val)
+		    (cond
+		     ((eq? val #t) "") ;; convert #t to empty string
+		     ((eq? val #f) #f) ;; convert #f to itself (still thinking about this one
+		     (else val)))))
+    (with-output-to-file (conc fname ".csh")
+       (lambda ()
+          (for-each (lambda (keyval)
+		      (let* ((key   (car keyval))
+			     (val   (cdr keyval))
+			     (delim (if (string-search whitesp val) 
+					"\""
+					"")))
+			(print (if (or (member key ignorevars)
+				       (string-search whitesp key))
+				   "# setenv "
+				   "setenv ")
+			       key " " delim (mungeval val) delim)))
+		    envvars)))
+     (with-output-to-file (conc fname ".sh")
+       (lambda ()
+          (for-each (lambda (keyval)
+		      (let* ((key (car keyval))
+			     (val (cdr keyval))
+			     (delim (if (string-search whitesp val) 
+					"\""
+					"")))
+			(print (if (or (member key ignorevars)
+				       (string-search whitesp key)
+				       (string-search ":" key)) ;; internal only values to be skipped.
+				   "# export "
+				   "export ")
+			       key "=" delim (mungeval val) delim)))
+                    envvars)))))
+
+(define (common:get-param-mapping #!key (flavor #f))
+  "returns alist mapping string keys in testconfig/subrun to megatest command line switches; if flavor is switch-symbol, maps tcmt symbolic switches to megatest switches"
+  (let ((default '(("tag-expr"  . "-tagexpr")
+                   ("mode-patt" . "-modepatt")
+                   ("run-name"  . "-runname")
+                   ("contour"   . "-contour")
+                   ("target"    . "-target")
+                   ("test-patt" . "-testpatt")
+                   ("msg"       . "-m")
+                   ("log"       . "-log")
+                   ("start-dir" . "-start-dir")
+                   ("new"       . "-set-state-status"))))
+    (if (eq? flavor 'switch-symbol)
+        (map (lambda (x)
+               (cons (string->symbol (conc "-" (car x))) (cdr x)))
+             default)
+        default)))
+
+;;======================================================================
+;; set some env vars from an alist, return an alist with original values
+;; (("VAR" "value") ...)
+;; a value of #f means "unset this var"
+;;
+(define (alist->env-vars lst)
+  (if (list? lst)
+      (let ((res '()))
+	(for-each (lambda (p)
+		    (let* ((var (car  p))
+			   (val (cadr p))
+			   (prv (get-environment-variable var)))
+		      (set! res (cons (list var prv) res))
+		      (if val 
+			  (safe-setenv var (->string val))
+			  (unsetenv var))))
+		  lst)
+	res)
+      '()))
+
+;;======================================================================
+;; clear vars matching pattern, run proc, set vars back
+;; if proc is a string run that string as a command with
+;; system.
+;;
+(define (get-the-original-environment) ;; *common:orig-env*
+  (let ((envvars (get-environment-variables)))
+    (if (get-environment-variable "MT_ORIG_ENV")
+        (with-input-from-string
+            (z3:decode-buffer (base64:base64-decode (get-environment-variable "MT_ORIG_ENV")))
+          read)
+        (filter-map (lambda (x)
+                      (if (string-match "^MT_.*" (car x))
+                          #f
+                          x))
+                    envvars))))
+
+(define (common:with-orig-env proc)
+  (let  ((current-env (get-environment-variables)))
+    (for-each (lambda (x) (unsetenv (car x)))             current-env)
+    (for-each (lambda (x) (setenv (car x) (cdr x))) (bdat-orig-env *bdat*)) 
+    (let ((rv (cond
+               ((string? proc)(system proc))
+               (proc          (proc)))))
+      (for-each (lambda (x) (unsetenv (car x))) (bdat-orig-env *bdat*))
+      (for-each (lambda (x) (setenv (car x) (cdr x))) current-env)
+      rv)))
+
+(define (common:without-vars proc . var-patts)
+  (let ((vars (make-hash-table)))
+    (for-each
+     (lambda (vardat) ;; each env var
+       (for-each
+	(lambda (var-patt)
+	  (if (string-match var-patt (car vardat))
+	      (let ((var (car vardat))
+		    (val (cdr vardat)))
+		(hash-table-set! vars var val)
+		(unsetenv var))))
+	var-patts))
+     (get-environment-variables))
+    (cond
+     ((string? proc)(system proc))
+     (proc          (proc)))
+    (hash-table-for-each
+     vars
+     (lambda (var val)
+       (setenv var val)))
+    vars))
+
+(define (common:run-a-command cmd #!key (with-vars #f) (with-orig-env #f))
+  (let* ((pre-cmd  (dtests:get-pre-command))
+         (post-cmd (dtests:get-post-command))
+         (fullcmd  (if (or pre-cmd post-cmd)
+                       (conc pre-cmd cmd post-cmd)
+                       (conc "viewscreen " cmd))))
+    (debug:print-info 02 *default-log-port* "Running command: " fullcmd)
+    (cond
+     (with-vars     (common:without-vars  fullcmd))
+     (with-orig-env (common:with-orig-env fullcmd))
+     (else          (common:without-vars  fullcmd "MT_.*")))))
+		  
+;;======================================================================
+;; T I M E   A N D   D A T E
+;;======================================================================
+
+;;======================================================================
+;; Convert strings like "5s 2h 3m" => 60x60x2 + 3x60 + 5
+(define (common:hms-string->seconds tstr)
+  (let ((parts     (string-split-fields "\\w+" tstr))
+	(time-secs 0)
+	;; s=seconds, m=minutes, h=hours, d=days, M=months, y=years, w=weeks
+	(trx       (regexp "(\\d+)([smhdMyw])")))
+    (for-each (lambda (part)
+		(let ((match  (string-match trx part)))
+		  (if match
+		      (let ((val (string->number (cadr match)))
+			    (unt (caddr match)))
+			(if val 
+			    (set! time-secs (+ time-secs (* val
+							    (case (string->symbol unt)
+							      ((s) 1)
+							      ((m) 60) ;; minutes
+							      ((h) 3600)
+							      ((d) 86400)
+							      ((w) 604800)
+							      ((M) 2628000) ;; aproximately one month
+							      ((y) 31536000)
+							      (else #f))))))))))
+	      parts)
+    time-secs))
+		       
+(define (seconds->hr-min-sec secs)
+  (let* ((hrs (quotient secs 3600))
+	 (min (quotient (- secs (* hrs 3600)) 60))
+	 (sec (- secs (* hrs 3600)(* min 60))))
+    (conc (if (> hrs 0)(conc hrs "hr ") "")
+	  (if (> min 0)(conc min "m ")  "")
+	  sec "s")))
+
+(define (seconds->time-string sec)
+  (time->string 
+   (seconds->local-time sec) "%H:%M:%S"))
+
+(define (seconds->work-week/day-time sec)
+  (time->string
+   (seconds->local-time sec) "ww%V.%u %H:%M"))
+
+(define (seconds->work-week/day sec)
+  (time->string
+   (seconds->local-time sec) "ww%V.%u"))
+
+(define (seconds->year-work-week/day sec)
+  (time->string
+   (seconds->local-time sec) "%yww%V.%w"))
+
+(define (seconds->year-work-week/day-time sec)
+  (time->string
+   (seconds->local-time sec) "%Yww%V.%w %H:%M"))
+
+(define (seconds->year-week/day-time sec)
+  (time->string
+   (seconds->local-time sec) "%Yw%V.%w %H:%M"))
+
+(define (seconds->quarter sec)
+  (case (string->number
+	 (time->string 
+	  (seconds->local-time sec)
+	  "%m"))
+    ((1 2 3) 1)
+    ((4 5 6) 2)
+    ((7 8 9) 3)
+    ((10 11 12) 4)
+    (else #f)))
+
+;;======================================================================
+;; basic ISO8601 format (e.g. "2017-02-28 06:02:54") date time => Unix epoch
+;;
+(define (common:date-time->seconds datetime)
+  (local-time->seconds (string->time datetime "%Y-%m-%d %H:%M:%S")))
+
+;;======================================================================
+;; given span of seconds tstart to tend
+;; find start time to mark and mark delta
+;;
+(define (common:find-start-mark-and-mark-delta tstart tend)
+  (let* ((deltat   (- (max tend (+ tend 10)) tstart)) ;; can't handle runs of less than 4 seconds. Pad it to 10 seconds ...
+	 (result   #f)
+	 (min      60)
+	 (hr       (* 60 60))
+	 (day      (* 24 hr))
+	 (yr       (* 365 day)) ;; year
+	 (mo       (/ yr 12))
+	 (wk       (* day 7)))
+    (for-each
+     (lambda (max-blks)
+       (for-each
+	(lambda (span) ;; 5 2 1
+	  (if (not result)
+	      (for-each 
+	       (lambda (timeunit timesym) ;; year month day hr min sec
+		 (if (not result)
+		     (let* ((time-blk (* span timeunit))
+			    (num-blks (quotient deltat time-blk)))
+		       (if (and (> num-blks 4)(< num-blks max-blks))
+			   (let ((first (* (quotient tstart time-blk) time-blk)))
+			     (set! result (list span timeunit time-blk first timesym))
+			     )))))
+	       (list yr mo wk day hr min 1)
+	       '(     y  mo w  d   h  m   s))))
+	(list 8 6 5 2 1)))
+     '(5 10 15 20 30 40 50 500))
+    (if values
+	(apply values result)
+	(values 0 day 1 0 'd))))
+
+;;======================================================================
+;; given x y lim return the cron expansion
+;;
+(define (common:expand-cron-slash x y lim)
+  (let loop ((curr x)
+	     (res  `()))
+    (if (< curr lim)
+	(loop (+ curr y) (cons curr res))
+	(reverse res))))
+
+;;======================================================================
+;; expand a complex cron string to a list of cron strings
+;;
+;;  x/y   => x, x+y, x+2y, x+3y while x+Ny<max_for_field
+;;  a,b,c => a, b ,c
+;;
+;;   NOTE: with flatten a lot of the crud below can be factored down.
+;;
+(define (common:cron-expand cron-str)
+  (if (list? cron-str)
+      (flatten
+       (fold (lambda (x res)
+	       (if (list? x)
+		   (let ((newres (map common:cron-expand x)))
+		     (append x newres))
+		   (cons x res)))
+	     '()
+	     cron-str)) ;; (map common:cron-expand cron-str))
+      (let ((cron-items (string-split cron-str))
+	    (slash-rx   (regexp "(\\d+)/(\\d+)"))
+	    (comma-rx   (regexp ".*,.*"))
+	    (max-vals   '((min        . 60)
+			  (hour       . 24)
+			  (dayofmonth . 28) ;;; BUG!!!! This will be a bug for some combinations
+			  (month      . 12)
+			  (dayofweek  . 7))))
+	(if (< (length cron-items) 5) ;; bad spec
+	    cron-str ;; `(,cron-str)              ;; just return the string, something downstream will fix it
+	    (let loop ((hed  (car cron-items))
+		       (tal  (cdr cron-items))
+		       (type 'min)
+		       (type-tal '(hour dayofmonth month dayofweek))
+		       (res  '()))
+	      (regex-case
+		  hed
+		(slash-rx ( _ base incr ) (let* ((basen          (string->number base))
+						 (incrn          (string->number incr))
+						 (expanded-vals  (common:expand-cron-slash basen incrn (alist-ref type max-vals)))
+						 (new-list-crons (fold (lambda (x myres)
+									 (cons (conc (if (null? res)
+											 ""
+											 (conc (string-intersperse res " ") " "))
+										     x " " (string-intersperse tal " "))
+									       myres))
+								       '() expanded-vals)))
+					    ;; (print "new-list-crons: " new-list-crons)
+					    ;; (fold (lambda (x res)
+					    ;; 	    (if (list? x)
+					    ;; 		(let ((newres (map common:cron-expand x)))
+					    ;; 		  (append x newres))
+					    ;; 		(cons x res)))
+					    ;; 	  '()
+					    (flatten (map common:cron-expand new-list-crons))))
+		;;					    (map common:cron-expand (map common:cron-expand new-list-crons))))
+		(else (if (null? tal)
+			  cron-str
+			  (loop (car tal)(cdr tal)(car type-tal)(cdr type-tal)(append res (list hed)))))))))))
+
+;;======================================================================
+;; given a cron string and the last time event was processed return #t to run or #f to not run
+;;
+;;  min    hour   dayofmonth month  dayofweek
+;; 0-59    0-23   1-31       1-12   0-6          ### NOTE: dayofweek does not include 7
+;;
+;;  #t => yes, run the job
+;;  #f => no, do not run the job
+;;
+(define (common:cron-event cron-str now-seconds-in last-done) ;; ref-seconds = #f is NOW.
+  (let* ((cron-items     (map string->number (string-split cron-str)))
+	 (now-seconds    (or now-seconds-in (current-seconds)))
+	 (now-time       (seconds->local-time now-seconds))
+	 (last-done-time (seconds->local-time last-done))
+	 (all-times      (make-hash-table)))
+    ;; (print "cron-items: " cron-items "(length cron-items): " (length cron-items))
+    (if (not (eq? (length cron-items) 5)) ;; don't even try to figure out junk strings
+	#f
+	(match-let (((     cmin chour cdayofmonth cmonth    cdayofweek)
+		     cron-items)
+		    ;; 0     1    2        3         4    5      6
+		    ((nsec nmin nhour ndayofmonth nmonth nyr ndayofweek n7 n8 n9)
+		     (vector->list now-time))
+		    ((lsec lmin lhour ldayofmonth lmonth lyr ldayofweek l7 l8 l9)
+		     (vector->list last-done-time)))
+	  ;; create all possible time slots
+	  ;; remove invalid slots due to (for example) day of week
+	  ;; get the start and end entries for the ref-seconds (current) time
+	  ;; if last-done > ref-seconds => this is an ERROR!
+	  ;; does the last-done time fall in the legit region?
+	  ;;    yes => #f  do not run again this command
+	  ;;    no  => #t  ok to run the command
+	  (for-each ;; month
+	   (lambda (month)
+	     (for-each ;; dayofmonth
+	      (lambda (dom)
+		(for-each
+		 (lambda (hr) ;; hour
+		   (for-each
+		    (lambda (minute) ;; minute
+		      (let ((copy-now (apply vector (vector->list now-time))))
+			(vector-set! copy-now 0 0) ;; force seconds to zero
+			(vector-set! copy-now 1 minute)
+			(vector-set! copy-now 2 hr)
+			(vector-set! copy-now 3 dom)  ;; dom is already corrected for zero referenced
+			(vector-set! copy-now 4 month)
+			(let* ((copy-now-secs (local-time->seconds copy-now))
+			       (new-copy      (seconds->local-time copy-now-secs))) ;; remake the time vector
+			  (if (or (not cdayofweek)
+				  (equal? (vector-ref new-copy 6)
+					  cdayofweek)) ;; if the day is specified and a match OR if the day is NOT specified
+			      (if (or (not cdayofmonth)
+				      (equal? (vector-ref new-copy 3)
+					      (+ 1 cdayofmonth))) ;; if the month is specified and a match OR if the month is NOT specified
+				  (hash-table-set! all-times copy-now-secs new-copy))))))
+		    (if cmin
+			`(,cmin)  ;; if given cmin, have to use it
+			(list (- nmin 1) nmin (+ nmin 1))))) ;; minute
+		 (if chour
+		     `(,chour)
+		     (list (- nhour 1) nhour (+ nhour 1))))) ;; hour
+	      (if cdayofmonth
+		  `(,cdayofmonth)
+		  (list (- ndayofmonth 1) ndayofmonth (+ ndayofmonth 1)))))
+	   (if cmonth
+	       `(,cmonth)
+	       (list (- nmonth 1) nmonth (+ nmonth 1))))
+	  (let ((before #f)
+		(is-in  #f))
+	    (for-each
+	     (lambda (moment)
+	       (if (and before
+			(<= before now-seconds)
+			(>= moment now-seconds))
+		   (begin
+		     ;; (print)
+		     ;; (print "Before: " (time->string (seconds->local-time before)))
+		     ;; (print "Now:    " (time->string (seconds->local-time now-seconds)))
+		     ;; (print "After:  " (time->string (seconds->local-time moment)))
+		     ;; (print "Last:   " (time->string (seconds->local-time last-done)))
+		     (if (<  last-done before)
+			 (set! is-in before))
+		     ))
+	       (set! before moment))
+	     (sort (hash-table-keys all-times) <))
+	    is-in)))))
+
+(define (common:extended-cron  cron-str now-seconds-in last-done)
+  (let ((expanded-cron (common:cron-expand cron-str)))
+    (if (string? expanded-cron)
+	(common:cron-event expanded-cron now-seconds-in last-done)
+	(let loop ((hed (car expanded-cron))
+		   (tal (cdr expanded-cron)))
+	  (if (common:cron-event hed now-seconds-in last-done)
+	      #t
+	      (if (null? tal)
+		  #f
+		  (loop (car tal)(cdr tal))))))))
+
+;;======================================================================
+;; C O L O R S
+;;======================================================================
+      
+(define (common:name->iup-color name)
+  (case (string->symbol (string-downcase name))
+    ((red)    "223 33 49")
+    ((grey)   "192 192 192")
+    ((orange) "255 172 13")
+    ((purple) "This is unfinished ...")))
+
+;;======================================================================
+;; (define (common:get-color-for-state-status state status)
+;;   (case (string->symbol state)
+;;     ((COMPLETED)
+;;      (case (string->symbol status)
+;;        ((PASS)        "70  249 73")
+;;        ((WARN WAIVED) "255 172 13")
+;;        ((SKIP)        "230 230 0")
+;;        (else "223 33 49")))
+;;     ((LAUNCHED)         "101 123 142")
+;;     ((CHECK)            "255 100 50")
+;;     ((REMOTEHOSTSTART)  "50  130 195")
+;;     ((RUNNING)          "9   131 232")
+;;     ((KILLREQ)          "39  82  206")
+;;     ((KILLED)           "234 101 17")
+;;     ((NOT_STARTED)      "240 240 240")
+;;     (else               "192 192 192")))
+
+(define (common:iup-color->rgb-hex instr)
+  (string-intersperse 
+   (map (lambda (x)
+          (number->string x 16))
+        (map string->number
+             (string-split instr)))
+   "/"))
+
+;;======================================================================
+;; L O C K I N G   M E C H A N I S M S 
+;;======================================================================
+
+;; common:faux-lock was here
+
+;; common:simple-lock was here
+
+;;======================================================================
+;;
+;;======================================================================
+
+(define (common:in-running-test?)
+  (and (args:get-arg "-execute") (get-environment-variable "MT_CMDINFO")))
+
+(define (common:get-color-from-status status)
+  (cond
+   ((equal? status "PASS")    "green")
+   ((equal? status "FAIL")    "red")
+   ((equal? status "WARN")    "orange")
+   ((equal? status "KILLED")  "orange")
+   ((equal? status "KILLREQ") "purple")
+   ((equal? status "RUNNING") "blue")
+   ((equal? status "ABORT")   "brown")
+   (else "black")))
+
+;; common:get-launcher was here
+
+;;======================================================================
+;; NMSG AND NEW API
+;;======================================================================
+;; 
+;; ;;======================================================================
+;; ;; nm based server experiment, keep around for now.
+;; ;;
+;; (define (nm:start-server dbconn #!key (given-host-name #f))
+;;   (let* ((srvdat    (start-raw-server given-host-name: given-host-name))
+;; 	 (host-name (srvdat-host srvdat))
+;; 	 (soc       (srvdat-soc srvdat)))
+;;     
+;;     ;; start the queue processor (save for second round of development)
+;;     ;;
+;;     (thread-start! (make-thread! (lambda ()(queue-processor dbconn) "Queue processor")))
+;;     ;; msg is an alist
+;;     ;;  'r host:port  <== where to return the data
+;;     ;;  'p params     <== data to apply the command to
+;;     ;;  'e j|s|l      <== encoding of the params. default is s (sexp), if not specified is assumed to be default
+;;     ;;  'c command    <== look up the function to call using this key
+;;     ;;
+;;     (let loop ((msg-in (nn-recv soc)))
+;;       (if (not (equal? msg-in "quit"))
+;; 	  (let* ((dat        (decode msg-in))
+;; 		 (host-port  (alist-ref 'r dat)) ;; this is for the reverse req rep where the server is a client of the original client
+;; 		 (params     (alist-ref 'p dat))
+;; 		 (command    (let ((c (alist-ref 'c dat)))(if c (string->symbol c) #f)))
+;; 		 (all-good   (and host-port params command (hash-table-exists? *commands* command))))
+;; 	    (if all-good
+;; 		(let ((cmddat (make-qitem
+;; 			       command:   command
+;; 			       host-port: host-port
+;; 			       params:    params)))
+;; 		  (queue-push cmddat) 		;; put request into the queue
+;; 		  (nn-send soc "queued"))         ;; reply with "queued"
+;; 		(print "ERROR: ["(common:human-time)"] BAD request " dat))
+;; 	    (loop (nn-recv soc)))))
+;;     (nn-close soc)))
+
+;;======================================================================
+;; D A S H B O A R D   U S E R   V I E W S
+;;======================================================================
+
+;;======================================================================
+;; first read ~/views.config if it exists, then read $MTRAH/views.config if it exists
+;;
+(define (common:load-views-config)
+  (let* ((view-cfgdat    (make-hash-table))
+	 (home-cfgfile   (conc (get-environment-variable "HOME") "/.mtviews.config"))
+	 (mthome-cfgfile (conc *toppath* "/.mtviews.config")))
+    (if (common:file-exists? mthome-cfgfile)
+	(configf:read-config mthome-cfgfile view-cfgdat))
+    ;; we load the home dir file AFTER the MTRAH file so the user can clobber settings when running the dashboard in read-only areas
+    (if (common:file-exists? home-cfgfile)
+	(configf:read-config home-cfgfile view-cfgdat #t))
+    view-cfgdat))
+
+;;======================================================================
+;; H I E R A R C H I C A L   H A S H   T A B L E S
+;;======================================================================
+;;
+;; Every element including top element is a vector:
+;;   <vector subhash value>
+
+(define (hh:make-hh #!key (ht #f)(value #f))
+  (vector (or ht    (make-hash-table)) value))
+
+;;======================================================================
+;; used internally
+(define-inline (hh:set-ht! hh ht)       (vector-set! hh 0 ht))
+(define-inline (hh:get-ht hh)           (vector-ref  hh 0))
+(define-inline (hh:set-value! hh value) (vector-set! hh 1 value))
+(define-inline (hh:get-value  hh value) (vector-ref  hh 1))
+
+;;======================================================================
+;; given a hierarchial hash and some keys look up the value ...
+;;
+(define (hh:get hh . keys)
+  (if (null? keys)
+      (vector-ref hh 1) ;; we have reached the end of the line, return the value sought
+      (let ((sub-ht (hh:get-ht hh)))
+	(if sub-ht ;; yes, there is more hierarchy
+	    (let ((sub-hh (hash-table-ref/default sub-ht (car keys) #f)))
+	      (if sub-hh
+		  (apply hh:get sub-hh (cdr keys))
+		  #f))
+	    #f))))
+
+;;======================================================================
+;; given a hierarchial hash, a value and some keys, add needed hierarcy and insert the value
+;;
+(define (hh:set! hh value . keys)
+  (if (null? keys)
+      (hh:set-value! hh value) ;; we have reached the end of the line, store the value
+      (let ((sub-ht (hh:get-ht hh)))
+	(if sub-ht ;; yes, there is more hierarchy
+	    (let ((sub-hh (hash-table-ref/default sub-ht (car keys) #f)))
+	      (if (not sub-hh) ;; we'll need to add the next level of hierarchy
+		  (let ((new-sub-hh (hh:make-hh)))
+		    (hash-table-set! sub-ht (car keys) new-sub-hh)
+		    (apply hh:set! new-sub-hh value (cdr keys)))
+		  (apply hh:set! sub-hh value (cdr keys))))    ;; call the sub-hierhash with remaining keys
+	    (begin
+	      (hh:set-ht! hh (make-hash-table))
+	      (apply hh:set! hh value keys))))))
+
+;;======================================================================
+;; Manage pkts, used in servers, tests and likely other contexts so put
+;; in common
+;;======================================================================
+
+(define common:pkts-spec
+  '((default . ((parent    . P)
+                (action    . a)
+                (filename  . f)))
+    (configf . ((parent    . P)
+                (action    . a)
+                (filename  . f)))
+    (server  . ((action    . a)
+		(pid       . d)
+		(ipaddr    . i)
+		(port      . p)
+		(parent    . P)))
+    			  
+    (test    . ((cpuuse    . c)
+		(diskuse   . d)
+		(item-path . i)
+		(runname   . r)
+		(state     . s)
+		(target    . t)
+		(status    . u)
+		(parent    . P)))))
+
+(define (common:get-pkts-dirs mtconf use-lt)
+  (let* ((pktsdirs-str (or (configf:lookup mtconf "setup"  "pktsdirs")
+			   (and use-lt
+				(conc (or *toppath*
+					  (current-directory))
+				      "/lt/.pkts"))))
+	 (pktsdirs  (if pktsdirs-str
+			(string-split pktsdirs-str " ")
+			#f)))
+    pktsdirs))
+
+;;======================================================================
+;; use-lt is use linktree "lt" link to find pkts dir
+(define (common:save-pkt pktalist-in mtconf use-lt #!key (add-only #f)) ;; add-only saves the pkt only if there is a parent already
+  (if (or add-only
+	  (hash-table-exists? *pkts-info* 'last-parent))
+      (let* ((parent   (hash-table-ref/default *pkts-info* 'last-parent #f))
+	     (pktalist (if parent
+			   (cons `(parent . ,parent)
+				 pktalist-in)
+			   pktalist-in)))
+	(let-values (((uuid pkt)
+		      (alist->pkt pktalist common:pkts-spec)))
+	  (hash-table-set! *pkts-info* 'last-parent uuid)
+	  (let ((pktsdir (or (hash-table-ref/default *pkts-info* 'pkts-dir #f)
+			     (let* ((pktsdirs (common:get-pkts-dirs mtconf use-lt))
+				    (pktsdir   (car pktsdirs))) ;; assume it is there
+			       (hash-table-set! *pkts-info* 'pkts-dir pktsdir)
+			       pktsdir))))
+            (handle-exceptions
+             exn
+             (debug:print-info 0 "failed to write out packet to " pktsdir ", exn=" exn) ;; don't care if this failed for now but MUST FIX - BUG!!
+             (if (not (file-exists? pktsdir))
+                 (create-directory pktsdir #t))
+             (with-output-to-file
+                 (conc pktsdir "/" uuid ".pkt")
+               (lambda ()
+                 (print pkt)))))))))
+
+;;======================================================================
+;; use-lt is use linktree "lt" link to find pkts dir
+(define (common:minimal-save-pkt pktalist pktsdir)
+  (let-values (((uuid pkt)
+		(alist->pkt pktalist common:pkts-spec)))
+    (handle-exceptions
+     exn
+     (debug:print-info 0 "failed to write out packet to " pktsdir ", exn=" exn) ;; don't care if this failed for now but MUST FIX - BUG!!
+     (if (not (file-exists? pktsdir))
+	 (create-directory pktsdir #t))
+     (with-output-to-file
+	 (conc pktsdir "/" uuid ".pkt")
+       (lambda ()
+	 (print pkt))))))
+
+;; common:with-queue-db was here
+;; common:load-pkts-to-db was here
+
+(define (common:get-pkt-alists pkts)
+  (map (lambda (x)
+	 (alist-ref 'apkt x)) ;; 'pkta pulls out the alist from the read pkt
+       pkts))
+
+;;======================================================================
+;; given list of pkts (alist mode) return list of D cards as Unix epoch, sorted descending
+;; also delete duplicates by target i.e. (car pkt)
+;;
+(define (common:get-pkt-times pkts)
+  (delete-duplicates
+   (sort 
+    (map (lambda (x)
+	   `(,(alist-ref 't x) . ,(string->number (alist-ref 'D x))))
+	 pkts)
+    (lambda (a b)(> (cdr a)(cdr b))))      ;; sort descending
+   (lambda (a b)(equal? (car a)(car b))))) ;; remove duplicates by target
+
+;; common:with-env-vars was here
+
+(define (common:send-thunk-to-background-thread thunk #!key (name #f))
+  ;;(BB> "launched thread " name)
+  ;; we need a unique name for the thread.
+  (let* ((realname (if name
+                       (if (not (hash-table-ref/default *common:thread-punchlist* name #f))
+                           name
+                           (conc name"-" (symbol->string (gensym))))
+                       (conc "anonymous-"(symbol->string (gensym)))))
+         (realthunk (lambda ()
+                      (let ((res (thunk)))
+                        (hash-table-delete! *common:thread-punchlist* realname)
+                        res)))
+         (thread   (make-thread realthunk realname)))
+    (hash-table-set! *common:thread-punchlist* realname thread)
+    (thread-start! thread)
+    ))
+
+(define (common:join-backgrounded-threads)
+  ;; may need to trap and ignore exceptions -- dunno how atomic threads are...
+  (for-each
+   (lambda (thread-name)
+     (let* ((thread (hash-table-ref/default *common:thread-punchlist* thread-name #f)))
+       (if thread
+           (handle-exceptions
+               exn
+	     (begin
+	       (debug:print 0 *default-log-port* "joining threads failed. exn=" exn)
+               #t) ;; just ignore it, it might have died in the meantime so joining it will throw an exception
+             (thread-join! thread))
+           )))
+   (hash-table-keys *common:thread-punchlist*)))
+
+(define (dtests:get-pre-command #!key (default-override #f))
+  (let* ((orig-pre-command "export CMD='")
+         (viewscreen-pre-command  "viewscreen ")
+         (use-viewscreen (configf:lookup *configdat* "dashboard" "use-viewscreen"))
+         (default-pre-command (if use-viewscreen viewscreen-pre-command orig-pre-command))
+         (cfg-ovrd (configf:lookup *configdat* "dashboard" "pre-command")))
+    (or cfg-ovrd default-override default-pre-command))) ;; "xterm -geometry 180x20 -e \""))
+
+  
+(define (dtests:get-post-command #!key (default-override #f))
+  (let* ((orig-post-command (conc "';xterm -geometry 180x20 -e \"(echo; echo -n START:;date +ww%U.%w-$H:%M:%S;echo;echo $CMD;echo;$CMD)|&"
+                                 "tee -a runlog-`date +ww%U.%w-%H:%M`.log;echo Press any key to continue;bash -c 'read -n 1 -s'\" &"))
+         (viewscreen-post-command  "")
+         (use-viewscreen (configf:lookup *configdat* "dashboard" "use-viewscreen"))
+         (default-post-command (if use-viewscreen viewscreen-post-command orig-post-command))
+         (cfg-ovrd (configf:lookup *configdat* "dashboard" "post-command")))
+    (or cfg-ovrd default-override default-post-command))) ;; ";echo Press any key to continue;bash -c 'read -n 1 -s'\" &")))
+
+;;======================================================================
+;; (define *common:telemetry-log-state* 'startup)
+;; (define *common:telemetry-log-socket* #f)
+;; 
+;; (define (common:telemetry-log-open)
+;;   (if (eq? *common:telemetry-log-state* 'startup)
+;;       (let* ((serverhost (configf:lookup *configdat* "telemetry" "host"))
+;;              (serverport (configf:lookup-number *configdat* "telemetry" "port"))
+;;              (user (or (get-environment-variable "USER") "unknown"))
+;;              (host (or (get-environment-variable "HOST") "unknown")))
+;;         (set! *common:telemetry-log-state*
+;;               (handle-exceptions
+;;                exn
+;;                (begin
+;;                  (debug:print-info 0 *default-log-port* "common-telemetry-log open udp port failure")
+;;                  'broken)
+;;                (if (and serverhost serverport user host)
+;;                    (let* ((s (udp-open-socket)))
+;;                      ;;(udp-bind! s #f 0)
+;;                      (udp-connect! s serverhost serverport)
+;;                      (set! *common:telemetry-log-socket* s)
+;;                      'open)
+;;                    'not-needed))))))
+;;   
+;; (define (common:telemetry-log event #!key (payload '()))
+;;   (if (eq? *common:telemetry-log-state* 'startup)
+;;       (common:telemetry-log-open))
+;; 
+;;   (if (eq? 'open *common:telemetry-log-state*)
+;;       (handle-exceptions
+;;        exn
+;;        (begin
+;;          (debug:print-info 0 *default-log-port* "common-telemetry-log comms failure ; disabled (no server?)")
+;;          ;;(define *common:telemetry-log-state* 'broken-or-no-server-preclose)
+;;          ;;(common:telemetry-log-close)
+;;          (define *common:telemetry-log-state* 'broken-or-no-server)
+;;          (set! *common:telemetry-log-socket* #f)
+;;          )
+;;        (if (and *common:telemetry-log-socket* event) ;; TODO - filter on event against telemetry.want-events
+;;            (let* ((user (or (get-environment-variable "USER") "unknown"))
+;;                   (host (or (get-environment-variable "HOST") "unknown"))
+;;                   (start (conc "[megatest "event"]"))
+;;                   (toppath (or *toppath* "/dev/null"))
+;;                   (payload-serialized
+;;                    (base64:base64-encode
+;;                     (z3:encode-buffer
+;;                      (with-output-to-string (lambda () (pp payload))))))
+;;                   (msg     (conc user":"host":"start":"(current-process-id)":"(car (argv))":"
+;;                                  toppath":"payload-serialized)))
+;;              (udp-send *common:telemetry-log-socket* msg))))))
+;;   
+;; (define (common:telemetry-log-close)
+;;   (when (or (member *common:telemetry-log-state* '(broken-or-no-server-preclose open)) *common:telemetry-log-socket*)
+;;     (handle-exceptions
+;;      exn
+;;      (begin
+;;        (define *common:telemetry-log-state* 'closed-fail)
+;;        (debug:print-info 0 *default-log-port* "common-telemetry-log closure failure")
+;;        )
+;;      (begin
+;;        (define *common:telemetry-log-state* 'closed)
+;;        (udp-close-socket *common:telemetry-log-socket*)
+;;        (set! *common:telemetry-log-socket* #f)))))
+
+;;======================================================================
+;; test patt stuff
 ;;======================================================================
 
-(define (get-testsuite-name toppath configdat)
-  (or (lookup configdat "setup" "area-name")
-      (lookup configdat "setup" "testsuite")
-      (get-environment-variable "MT_TESTSUITE_NAME")
-      (if (string? toppath)
-          (pathname-file toppath)
-          #f)))
-
-(define (get-area-path-signature toppath #!optional (short #f))
-  (let ((res (message-digest-string (md5-primitive) toppath)))
-    (if short
-	(substring res 0 4)
-	res)))
-
-(define (get-area-name configdat toppath #!optional (short #f))
-  ;; look up my area name in areas table (future)
-  ;; generate auto name
-  (conc (get-area-path-signature toppath short)
-	"-"
-	(get-testsuite-name toppath configdat)))
-
-;; need generic find-record-with-var-nmatching-val
+;; make a query (fieldname like 'patt1' OR fieldname 
+(define (db:patt->like fieldname pattstr #!key (comparator " OR "))
+  (let ((patts (if (string? pattstr)
+		   (string-split pattstr ",")
+		   '("%"))))
+    (string-intersperse (map (lambda (patt)
+			       (let ((wildtype (if (substring-index "%" patt) "LIKE" "GLOB")))
+				 (conc fieldname " " wildtype " '" patt "'")))
+			     (if (null? patts)
+				 '("")
+				 patts))
+			comparator)))
+
+(define *glob-like-match-cache* (make-hash-table))
+(define (tests:cache-regexp str-in flag)
+  (let* ((key (conc str-in flag)))
+    (or (hash-table-ref/default *glob-like-match-cache* key #f)
+	(let* ((newrx (regexp str-in flag)))
+	  (hash-table-set! *glob-like-match-cache* key newrx)
+	  newrx))))
+
+;; tests:glob-like-match 
+(define (tests:glob-like-match patt str) 
+  (let* ((like     (substring-index "%" patt))
+	 (notpatt  (equal? (substring-index "~" patt) 0))
+	 (newpatt  (if notpatt (substring patt 1) patt))
+	 (finpatt  (if like
+		       (string-substitute (regexp "%") ".*" newpatt #f)
+		       (string-substitute (regexp "\\*") ".*" newpatt #f)))
+	 (rx       (tests:cache-regexp finpatt (if like #t #f)))
+	 (res      (string-match rx str)))
+    (if notpatt (not res) res)))
+
+;; if itempath is #f then look only at the testname part
+;;
+(define (tests:match patterns testname itempath #!key (required '()))
+  (if (string? patterns)
+      (let ((patts (append (string-split patterns ",") required)))
+	(if (null? patts) ;;; no pattern(s) means no match
+	    #f
+	    (let loop ((patt (car patts))
+		       (tal  (cdr patts)))
+	      ;; (print "loop: patt: " patt ", tal " tal)
+	      (if (string=? patt "")
+		  #f ;; nothing ever matches empty string - policy
+		  (let* ((patt-parts (string-match (regexp "^([^\\/]*)(\\/(.*)|)$") patt))
+			 (test-patt  (cadr patt-parts))
+			 (item-patt  (cadddr patt-parts)))
+		    ;; special case: test vs. test/
+		    ;;   test  => "test" "%"
+		    ;;   test/ => "test" ""
+		    (if (and (not (substring-index "/" patt)) ;; no slash in the original
+			     (or (not item-patt)
+				 (equal? item-patt "")))      ;; should always be true that item-patt is ""
+			(set! item-patt "%"))
+		    ;; (print "tests:match => patt-parts: " patt-parts ", test-patt: " test-patt ", item-patt: " item-patt)
+		    (if (and (tests:glob-like-match test-patt testname)
+			     (or (not itempath)
+				 (tests:glob-like-match (if item-patt item-patt "") itempath)))
+			#t
+			(if (null? tal)
+			    #f
+			    (loop (car tal)(cdr tal)))))))))))
+
+;; if itempath is #f then look only at the testname part
+;;
+(define (tests:match->sqlqry patterns)
+  (if (string? patterns)
+      (let ((patts (string-split patterns ",")))
+	(if (null? patts) ;;; no pattern(s) means no match, we will do no query
+	    #f
+	    (let loop ((patt (car patts))
+		       (tal  (cdr patts))
+		       (res  '()))
+	      ;; (print "loop: patt: " patt ", tal " tal)
+	      (let* ((patt-parts (string-match (regexp "^([^\\/]*)(\\/(.*)|)$") patt))
+		     (test-patt  (cadr patt-parts))
+		     (item-patt  (cadddr patt-parts))
+		     (test-qry   (db:patt->like "testname" test-patt))
+		     (item-qry   (db:patt->like "item_path" item-patt))
+		     (qry        (conc "(" test-qry " AND " item-qry ")")))
+		;; (print "tests:match => patt-parts: " patt-parts ", test-patt: " test-patt ", item-patt: " item-patt)
+		(if (null? tal)
+		    (string-intersperse (append (reverse res)(list qry)) " OR ")
+		    (loop (car tal)(cdr tal)(cons qry res)))))))
+      #f))
+
+;; itemmap is a list of testname patterns to maps
+;;     test1 .*/bar/(\d+) foo/\1
+;;     %     foo/([^/]+)  \1/bar
+;;
+;; # NOTE: the line with the single % could be the result of
+;; #       itemmap entry in requirements (legacy). The itemmap
+;; #       requirements entry is deprecated
+;;
+(define (tests:get-itemmaps tconfig)
+  (let ((base-itemmap  (configf:lookup tconfig "requirements" "itemmap"))
+	(itemmap-table (configf:get-section tconfig "itemmap")))
+    (append (if base-itemmap
+		(list (list "%" base-itemmap))
+		'())
+	    (if itemmap-table
+		itemmap-table
+		'()))))
+
+;; given a list of itemmaps (testname . map), return the first match
 ;;
-(define (path->area-record cfgdat path)
-  (let* ((areadat (get-cfg-areas cfgdat))
-	 (all     (filter (lambda (x)
-			    (let* ((keyvals (cdr x))
-				   (pth     (alist-ref 'path keyvals)))
-			      (equal? path pth)))
-			  areadat)))
-    (if (null? all)
+(define (tests:lookup-itemmap itemmaps testname)
+  (let ((best-matches (filter (lambda (itemmap)
+				(tests:match (car itemmap) testname #f))
+			      itemmaps)))
+    (if (null? best-matches)
 	#f
-	(car all)))) ;; return first match
-
-;; given a config return an alist of alists
-;;   area-name => data
-;;
-(define (get-cfg-areas cfgdat)
-  (let ((adat (get-section cfgdat "areas")))
-    (map (lambda (entry)
-	   `(,(car entry) . 
-	     ,(val->alist (cadr entry))))
-	 adat)))
-	 
-;; (define (debug:print . params) #f)
-;; (define (debug:print-info . params) #f)
-;; 
-;; (define (set-functions dbgp dbgpinfo)
-;;   (set! debug:print dbgp)
-;;   (set! debug:print-info dbgpinfo))
+	(let ((res (car best-matches)))
+	  ;; (debug:print 0 *default-log-port* "res=" res)
+	  (cond
+	   ((string? res) res) ;;; FIX THE ROOT CAUSE HERE ....
+	   ((null? res)   #f)
+	   ((string? (cdr res)) (cdr res))  ;; it is a pair
+	   ((string? (cadr res))(cadr res)) ;; it is a list
+	   (else cadr res))))))
+
+;; return items given config
+;;
+(define (tests:get-items tconfig)
+  (let ((items      (hash-table-ref/default tconfig "items" #f)) ;; items 4
+	(itemstable (hash-table-ref/default tconfig "itemstable" #f))) 
+    ;; if either items or items table is a proc return it so test running
+    ;; process can know to call items:get-items-from-config
+    ;; if either is a list and none is a proc go ahead and call get-items
+    ;; otherwise return #f - this is not an iterated test
+    (cond
+     ((procedure? items)      
+      (debug:print-info 4 *default-log-port* "items is a procedure, will calc later")
+      items)            ;; calc later
+     ((procedure? itemstable)
+      (debug:print-info 4 *default-log-port* "itemstable is a procedure, will calc later")
+      itemstable)       ;; calc later
+     ((filter (lambda (x)
+		(let ((val (car x)))
+		  (if (procedure? val) val #f)))
+	      (append (if (list? items) items '())
+		      (if (list? itemstable) itemstable '())))
+      'have-procedure)
+     ((or (list? items)(list? itemstable)) ;; calc now
+      (debug:print-info 4 *default-log-port* "items and itemstable are lists, calc now\n"
+			"    items: " items " itemstable: " itemstable)
+      (items:get-items-from-config tconfig))
+     (else #f))))                           ;; not iterated
+
+(define (tests:get-tests-search-path cfgdat)
+  (let ((paths (let ((section (if cfgdat
+				  (configf:get-section cfgdat "tests-paths")
+				  #f)))
+		 (if section
+		     (map cadr section)
+		     '()))))
+    (filter (lambda (d)
+	      (if (directory-exists? d)
+		  d
+		  (begin
+		    ;; (if (common:low-noise-print 60 "tests:get-tests-search-path" d)
+		    ;;	(debug:print 0 *default-log-port* "WARNING: problem with directory " d ", dropping it from tests path"))
+		    #f)))
+	    (append paths (list (conc *toppath* "/tests"))))))
+
+(define (server:get-best-guess-address hostname)
+  (let ((res #f))
+    (for-each 
+     (lambda (adr)
+       (if (not (eq? (u8vector-ref adr 0) 127))
+	   (set! res adr)))
+     ;; NOTE: This can fail when there is no mention of the host in /etc/hosts. FIXME
+     (vector->list (hostinfo-addresses (hostname->hostinfo hostname))))
+    (string-intersperse 
+     (map number->string
+	  (u8vector->list
+	   (if res res (hostname->ip hostname)))) ".")))
+
+(define (tests:readlines filename)
+  (call-with-input-file filename
+    (lambda (p)
+      (let loop ((line (read-line p))
+                 (result '()))
+        (if (eof-object? line)
+            (reverse result)
+            (loop (read-line p) (cons line result)))))))
+
+;; timeout is hms string: 1h 5m 3s, default is 1 minute
+;;
+(define (server:expiration-timeout)
+  (let ((tmo (configf:lookup *configdat* "server" "timeout")))
+    (if (and (string? tmo)
+	     (common:hms-string->seconds tmo)) ;; BUG: hms-string->seconds is broken, if given "10" returns 0. Also, it doesn't belong in this logic unless the string->number is changed below
+        (* 3600 (string->number tmo))
+	60)))
+
+(define (runs:get-mt-env-alist run-id runname target testname itempath)
+  ;;(bb-check-path msg: "runs:set-megatest-env-vars entry")
+  `(("MT_TEST_NAME"     . ,testname)
+    
+    ("MT_ITEMPATH"      . ,itempath)
+
+    ("MT_TARGET"        . ,target)
+    
+    ("MT_RUNNAME"       . ,runname)
+    
+    ("MT_RUN_AREA_HOME" . ,*toppath*)
+    
+    ,@(let* ((link-tree (common:get-linktree))) ;; (configf:lookup *configdat* "setup" "linktree")))
+        (if link-tree
+            (list (cons "MT_LINKTREE" link-tree)
+                  
+                  (cons "MT_TEST_RUN_DIR"
+                        (conc link-tree  "/" target "/" runname "/" testname
+                              (if (and (string? itempath) (not (equal? itempath "")))
+                                  (conc "/" itempath)
+                                  "")))
+                  )
+            '()))
+    
+    ,@(map
+       (lambda (key)
+         (cons  (car key) (cadr key)))
+       (keys:target->keyval (common:get-fields *configdat*) #;(rmt:get-keys) target))
+    
+    ,@(map (lambda (var)
+             (let ((val (configf:lookup *configdat* "env-override" var)))
+               (cons var val)))
+           (configf:section-vars *configdat* "env-override"))))
+    
+;;======================================================================
+;; config file related routines
+;;======================================================================
+
+(define (keys:make-key/field-string confdat)
+  (let ((fields (configf:get-section confdat "fields")))
+    (string-join
+     (map (lambda (field)(conc (car field) " " (cadr field)))
+	  fields)
+     ",")))
+
+
+;;======================================================================
+;; N A N O M S G   C L I E N T
+;;======================================================================
+;; 
+;; 
+;; 
+;; (define (common:send-dboard-main-changed)
+;;   (let* ((dashboard-ips (mddb:get-dashboards)))
+;;     (for-each
+;;      (lambda (ipadr)
+;;        (let* ((soc (common:open-nm-req (conc "tcp://" ipadr)))
+;; 	      (msg (conc "main " *toppath*))
+;; 	      (res (common:nm-send-receive-timeout soc msg)))
+;; 	 (if (not res) ;; couldn't reach that dashboard - remove it from db
+;; 	     (print "ERROR: couldn't reach dashboard " ipadr))
+;; 	 res))
+;;      dashboard-ips)))
+;;     
+;;     
+;; ;;======================================================================
+;; ;; D A S H B O A R D   D B 
+;; ;;======================================================================
+;; 
+;; (define (mddb:open-db)
+;;   (let* ((db (open-database (conc (get-environment-variable "HOME") "/.dashboard.db"))))
+;;     (set-busy-handler! db (busy-timeout 10000))
+;;     (for-each
+;;      (lambda (qry)
+;;        (exec (sql db qry)))
+;;      (list 
+;;       "CREATE TABLE IF NOT EXISTS vars       (id INTEGER PRIMARY KEY,key TEXT, val TEXT, CONSTRAINT varsconstraint UNIQUE (key));"
+;;       "CREATE TABLE IF NOT EXISTS dashboards (
+;;           id         INTEGER PRIMARY KEY,
+;;           pid        INTEGER,
+;;           username   TEXT,
+;;           hostname   TEXT,
+;;           ipaddr     TEXT,
+;;           portnum    INTEGER,
+;;           start_time TIMESTAMP DEFAULT (strftime('%s','now')),
+;;              CONSTRAINT hostport UNIQUE (hostname,portnum)
+;;         );"
+;;       ))
+;;     db))
+;; 
+;; ;; register a dashboard 
+;; ;;
+;; (define (mddb:register-dashboard port)
+;;   (let* ((pid      (current-process-id))
+;; 	 (hostname (get-host-name))
+;; 	 (ipaddr   (server:get-best-guess-address hostname))
+;; 	 (username (current-user-name)) ;; (car userinfo)))
+;; 	 (db      (mddb:open-db)))
+;;     (print "Register monitor, pid: " pid ", hostname: " hostname ", port: " port ", username: " username)
+;;     (exec (sql db "INSERT OR REPLACE INTO dashboards (pid,username,hostname,ipaddr,portnum) VALUES (?,?,?,?,?);")
+;; 	   pid username hostname ipaddr port)
+;;     (close-database db)))
+;; 
+;; ;; unregister a monitor
+;; ;;
+;; (define (mddb:unregister-dashboard host port)
+;;   (let* ((db      (mddb:open-db)))
+;;     (print "Register unregister monitor, host:port=" host ":" port)
+;;     (exec (sql db "DELETE FROM dashboards WHERE hostname=? AND portnum=?;") host port)
+;;     (close-database db)))
+;; 
+;; ;; get registered dashboards
+;; ;;
+;; (define (mddb:get-dashboards)
+;;   (let ((db (mddb:open-db)))
+;;     (query fetch-column
+;; 	   (sql db "SELECT ipaddr || ':' || portnum FROM dashboards;"))))
+    
+
+(define (sexpr->string data)
+  (with-output-to-string
+    (lambda ()(write data))))
+
+(define (string->sexpr instr)
+  (with-input-from-string instr
+      (lambda ()(read))))
 
 )

DELETED configf.scm
Index: configf.scm
==================================================================
--- configf.scm
+++ /dev/null
@@ -1,834 +0,0 @@
-;;======================================================================
-;; Copyright 2006-2012, Matthew Welland.
-;; 
-;; This file is part of Megatest.
-;; 
-;;     Megatest is free software: you can redistribute it and/or modify
-;;     it under the terms of the GNU General Public License as published by
-;;     the Free Software Foundation, either version 3 of the License, or
-;;     (at your option) any later version.
-;; 
-;;     Megatest is distributed in the hope that it will be useful,
-;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;     GNU General Public License for more details.
-;; 
-;;     You should have received a copy of the GNU General Public License
-;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
-
-;;======================================================================
-
-;;======================================================================
-;; Config file handling
-;;======================================================================
-
-(use regex regex-case matchable) ;;  directory-utils)
-(declare (unit configf))
-(declare (uses process))
-(declare (uses env))
-(declare (uses keys))
-
-(include "common_records.scm")
-
-;; return list (path fullpath configname)
-(define (find-config configname #!key (toppath #f))
-  (if toppath
-      (let ((cfname (conc toppath "/" configname)))
-	(if (common:file-exists? cfname)
-	    (list toppath cfname configname)
-	    (list #f      #f     #f)))
-      (let* ((cwd (string-split (current-directory) "/")))
-	(let loop ((dir cwd))
-	  (let* ((path     (conc "/" (string-intersperse dir "/")))
-		 (fullpath (conc path "/" configname)))
-	    (if (common:file-exists? fullpath)
-		(list path fullpath configname)
-		(let ((remcwd (take dir (- (length dir) 1))))
-		  (if (null? remcwd)
-		      (list #f #f #f) ;;  #f #f) 
-		  (loop remcwd)))))))))
-
-(define (configf:assoc-safe-add alist key val #!key (metadata #f))
-  (let ((newalist (filter (lambda (x)(not (equal? key (car x)))) alist)))
-    (append newalist (list (if metadata
-			       (list key val metadata)
-			       (list key val))))))
-
-(define (configf:section-var-set! cfgdat section-name var value #!key (metadata #f))
-  (hash-table-set! cfgdat section-name
-		   (configf:assoc-safe-add
-		    (hash-table-ref/default cfgdat section-name '())
-		    var value metadata: metadata)))
-
-(define (configf:eval-string-in-environment str)
-  ;; (if (or (string-null? str)
-  ;;	  (equal? "!" (substring str 0 1))) ;; null string or starts with ! are preserved but NOT set in the environment
-      str
-      (handle-exceptions
-       exn
-       (begin
-	 (debug:print-error 0 *default-log-port* "problem evaluating \"" str "\" in the shell environment, exn=" exn)
-	 #f)
-       (let ((cmdres (process:cmd-run->list (conc "echo " str))))
-	 (if (null? cmdres) ""
-	     (caar cmdres))))) ;; )
-
-;;======================================================================
-;; Make the regexp's needed globally available
-;;======================================================================
-
-(define configf:include-rx (regexp "^\\[include\\s+(.*)\\]\\s*$"))
-(define configf:script-rx  (regexp "^\\[scriptinc\\s+(\\S+)([^\\]]*)\\]\\s*$")) ;; include output from a script
-(define configf:section-rx (regexp "^\\[(.*)\\]\\s*$"))
-(define configf:blank-l-rx (regexp "^\\s*$"))
-(define configf:key-sys-pr (regexp "^(\\S+)\\s+\\[system\\s+(\\S+.*)\\]\\s*$"))
-(define configf:key-val-pr (regexp "^(\\S+)(\\s+(.*)|())$"))
-(define configf:key-no-val (regexp "^(\\S+)(\\s*)$"))
-(define configf:comment-rx (regexp "^\\s*#.*"))
-(define configf:cont-ln-rx (regexp "^(\\s+)(\\S+.*)$"))
-(define configf:settings   (regexp "^\\[configf:settings\\s+(\\S+)\\s+(\\S+)]\\s*$"))
-
-;; read a line and process any #{ ... } constructs
-
-(define configf:var-expand-regex (regexp "^(.*)#\\{(scheme|system|shell|getenv|get|runconfigs-get|rget|scm|sh|rp|gv|g|mtrah)\\s+([^\\}\\{]*)\\}(.*)"))
-
-(define (configf:system ht cmd)
-  (system cmd)
-  )
-
-(define (configf:process-line l ht allow-system #!key (linenum #f))
-  (let loop ((res l))
-    (if (string? res)
-	(let ((matchdat (string-search configf:var-expand-regex res)))
-	  (if matchdat
-	      (let* ((prestr  (list-ref matchdat 1))
-		     (cmdtype (list-ref matchdat 2)) ;; eval, system, shell, getenv
-		     (cmd     (list-ref matchdat 3))
-		     (poststr (list-ref matchdat 4))
-		     (result  #f)
-		     (start-time (current-seconds))
-		     (cmdsym  (string->symbol cmdtype))
-		     (fullcmd (case cmdsym
-				((scheme scm) (conc "(lambda (ht)" cmd ")"))
-				((system)     (conc "(lambda (ht)(configf:system ht \"" cmd "\"))"))
-				((shell sh)   (conc "(lambda (ht)(string-translate (shell \""  cmd "\") \"\n\" \" \"))"))
-				((realpath rp)(conc "(lambda (ht)(common:nice-path \"" cmd "\"))"))
-				((getenv gv)  (conc "(lambda (ht)(get-environment-variable \"" cmd "\"))"))
-				((mtrah)      (conc "(lambda (ht)"
-                                                    "    (let ((extra \"" cmd "\"))"
-						    "       (conc (or *toppath* (get-environment-variable \"MT_RUN_AREA_HOME\"))"
-						    "             (if (string-null? extra) \"\" \"/\")"
-						    "             extra)))"))
-				((get g)   
-				 (match (string-split cmd)
-					((sect var)(conc "(lambda (ht)(configf:lookup ht \"" sect "\" \"" var "\"))"))
-					(else
-					 (debug:print-error 0 *default-log-port* "#{get ...} used with only one parameter, \"" cmd "\", two needed.")
-					 "(lambda (ht) #f)")))
-				((runconfigs-get rget) (conc "(lambda (ht)(runconfigs-get ht \"" cmd "\"))"))
-				;; ((rget)           (conc "(lambda (ht)(runconfigs-get ht \"" cmd "\"))"))
-				(else "(lambda (ht)(print \"ERROR\") \"ERROR\")"))))
-		;; (print "fullcmd=" fullcmd)
-		(handle-exceptions
-		 exn
-		 (begin
-		   (debug:print 0 *default-log-port* "WARNING: failed to process config input \"" l "\", exn=" exn)
-		   (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
-		   ;; (print "exn=" (condition->list exn))
-		   (set! result (conc "#{( " cmdtype ") " cmd "}, full expansion: " fullcmd)))
-		 (if (or allow-system
-			 (not (member cmdtype '("system" "shell" "sh"))))
-		     (with-input-from-string fullcmd
-		       (lambda ()
-			 (set! result ((eval (read)) ht))))
-		     (set! result (conc "#{(" cmdtype ") "  cmd "}"))))
-		(case cmdsym
-		  ((system shell scheme)
-		   (let ((delta (- (current-seconds) start-time)))
-		     (if (> delta 2)
-			 (debug:print-info 0 *default-log-port* "for line \"" l "\"\n command:  " cmd " took " delta " seconds to run with output:\n   " result)
-			 (debug:print-info 9 *default-log-port* "for line \"" l "\"\n command:  " cmd " took " delta " seconds to run with output:\n   " result)))))
-		(loop (conc prestr result poststr)))
-	      res))
-	res)))
-
-;; Run a shell command and return the output as a string
-(define (shell cmd)
-  (let* ((output (process:cmd-run->list cmd))
-	 (res    (car output))
-	 (status (cadr output)))
-    (if (equal? status 0)
-	(let ((outres (string-intersperse 
-		       res
-		       "\n")))
-	  (debug:print-info 4 *default-log-port* "shell result:\n" outres)
-	  outres)
-	(begin
-	  (with-output-to-port (current-error-port)
-	    (lambda ()
-	      (print "ERROR: " cmd " returned bad exit code " status)))
-	  ""))))
-
-;; this was inline but I'm pretty sure that is a hold over from when it was *very* simple ...
-;;
-(define (configf:read-line p ht allow-processing settings)
-  (let loop ((inl (read-line p)))
-    (let ((cont-line (and (string? inl)
-			  (not (string-null? inl))
-			  (equal? "\\" (string-take-right inl 1)))))
-      (if cont-line ;; last character is \ 
-	  (let ((nextl (read-line p)))
-	    (if (not (eof-object? nextl))
-		(loop (string-append (if cont-line 
-					 (string-take inl (- (string-length inl) 1))
-					 inl)
-				     nextl))))
-	  (let ((res (case allow-processing ;; if (and allow-processing 
-		       ;;	   (not (eq? allow-processing 'return-string)))
-		       ((#t #f)
-			(configf:process-line inl ht allow-processing))
-		       ((return-string)
-			inl)
-		       (else
-			(configf:process-line inl ht allow-processing)))))
-	    (if (and (string? res)  ;; must set to "no" to force NOT trimming trailing spaces
-		     (not (equal? (hash-table-ref/default settings "trim-trailing-spaces" "yes") "no")))
-		(string-substitute "\\s+$" "" res)
-		res))))))
-
-(define (configf:cfgdat->env-alist section cfgdat-ht allow-system)
-  (filter
-   (lambda (pair)
-     (let* ((var (car pair))
-            (val (cdr pair)))
-       (cons var
-             (cond
-              ((and allow-system (procedure? val)) ;; if we decided to use something other than #t or #f for allow-system ('return-procs or 'return-string) , this may become problematic
-               (val))
-              ((procedure? val) #f)
-              ((string? val) val)
-              (else "#f")))))
-   (append
-    (hash-table-ref/default cfgdat-ht "default" '())
-    (if (equal? section "default") '() (hash-table-ref/default cfgdat-ht section '())))))
-
-(define (calc-allow-system allow-system section sections)
-  (if sections
-      (and (or (equal? "default" section)
-	       (member section sections))
-	   allow-system) ;; account for sections and return allow-system as it might be a symbol such as return-strings
-      allow-system))
-    
-;; given a config hash and a section name, apply that section to all matching sections (using wildcard % or regex if /..../)
-;; remove the section when done so that there is no downstream clobbering
-;;
-(define (configf:apply-wildcards ht section-name)
-  (if (hash-table-exists? ht section-name)
-      (let* ((vars  (hash-table-ref ht section-name))
-	     (rxstr (if (string-contains section-name "%")
-			(string-substitute (regexp "%") ".*" section-name)
-			(string-substitute (regexp "^/(.*)/$") "\\1" section-name)))
-	     (rx    (regexp rxstr)))
-	;; (print "\nsection-name: " section-name " rxstr: " rxstr)
-        (for-each
-         (lambda (section)
-	   (if section
-	       (let ((same-section (string=? section-name section))
-		     (rx-match     (string-match rx section)))
-		 ;; (print "section: " section " vars: " vars " same-section: " same-section " rx-match: " rx-match)
-		 (if (and (not same-section) rx-match)
-		     (for-each
-		      (lambda (bundle)
-			;; (print "bundle: " bundle)
-			(let ((key  (car bundle))
-			      (val  (cadr bundle))
-			      (meta (if (> (length bundle) 2)(caddr bundle) #f)))
-			  (hash-table-set! ht section (configf:assoc-safe-add (hash-table-ref ht section) key val metadata: meta))))
-		      vars)))))
-         (hash-table-keys ht))))
-  ht)
-
-;; read a config file, returns hash table of alists
-
-;; read a config file, returns hash table of alists
-;; adds to ht if given (must be #f otherwise)
-;; allow-system:
-;;    #f - do not evaluate [system
-;;    #t - immediately evaluate [system and store result as string
-;;    'return-procs -- return a proc taking ht as an argument that may be evaulated at some future time
-;;    'return-string -- return a string representing a proc taking ht as an argument that may be evaulated at some future time
-;; envion-patt is a regex spec that identifies sections that will be eval'd
-;; in the environment on the fly
-;; sections: #f => get all, else list of sections to gather
-;; post-section-procs alist of section-pattern => proc, where: (proc section-name next-section-name ht curr-path)
-;; apply-wildcards: #t/#f - apply vars from targets with % wildcards to all matching sections
-;;
-(define (read-config path ht allow-system #!key (environ-patt #f)            (curr-section #f)   
-		     (sections #f)              (settings (make-hash-table)) (keep-filenames #f)
-		     (post-section-procs '())   (apply-wildcards #t) )
-  (debug:print 9 *default-log-port* "START: " path)
-;; (if *configdat*
-;;     (common:save-pkt `((action . read-config)
-;;       		 (f      . ,(cond ((string? path) path)
-;;       				  ((port?   path) "port")
-;;       				  (else (conc path))))
-;;                        (T      . configf))
-;;       	       *configdat* #t add-only: #t))
-  (if (and (not (port? path))
-	   (not (common:file-exists? path))) ;; for case where we are handed a port
-      (begin 
-	(debug:print-info 1 *default-log-port* "read-config - file not found " path " current path: " (current-directory))
-	;; WARNING: This is a risky change but really, we should not return an empty hash table if no file read?
-	#f) ;; (if (not ht)(make-hash-table) ht))
-      (let ((inp        (if (string? path)
-			    (open-input-file path)
-			      path)) ;; we can be handed a port
-	    (res        (if (not ht)(make-hash-table) ht))
-	    (metapath   (if (or (debug:debug-mode 9)
-				keep-filenames)
-			    path #f))
-            (process-wildcards  (lambda (res curr-section-name)
-                                  (if (and apply-wildcards
-                                           (or (string-contains curr-section-name "%")   ;; wildcard
-                                               (string-match "/.*/" curr-section-name))) ;; regex
-                                      (begin
-                                        (configf:apply-wildcards res curr-section-name)
-                                        (hash-table-delete! res curr-section-name))))))  ;; NOTE: if the section is a wild card it will be REMOVED from res 
-	(let loop ((inl               (configf:read-line inp res (calc-allow-system allow-system curr-section sections) settings)) ;; (read-line inp))
-		   (curr-section-name (if curr-section curr-section "default"))
-		   (var-flag #f);; turn on for key-var-pr and cont-ln-rx, turn off elsewhere
-		   (lead     #f))
-	  (debug:print-info 8 *default-log-port* "curr-section-name: " curr-section-name " var-flag: " var-flag "\n   inl: \"" inl "\"")
-	  (if (eof-object? inl) 
-	      (begin
-                ;; process last section for wildcards
-                (process-wildcards res curr-section-name)
-		(if (string? path) ;; we received a path, not a port, thus we are responsible for closing it.
-		    (close-input-port inp))
-		(if (list? sections) ;; delete all sections except given when sections is provided
-		    (for-each
-		     (lambda (section)
-		       (if (not (member section sections))
-			   (hash-table-delete! res section))) ;; we are using "" as a dumping ground and must remove it before returning the ht
-		     (hash-table-keys res)))
-		(debug:print 9 *default-log-port* "END: " path)
-                res
-                ) ;; retval
-	      (regex-case 
-	       inl 
-	       (configf:comment-rx _                  (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings)
-                                                            curr-section-name #f #f))
-               
-	       (configf:blank-l-rx _                  (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings)
-                                                            curr-section-name #f #f))
-	       (configf:settings   ( x setting val  )
-                                   (begin
-                                     (hash-table-set! settings setting val)
-                                     (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings)
-                                           curr-section-name #f #f)))
-               
-	       (configf:include-rx ( x include-file )
-                                   (let* ((curr-conf-dir (pathname-directory path))
-                                          (full-conf     (if (and (absolute-pathname? include-file) (file-exists? include-file))
-                                                             include-file
-                                                             (common:nice-path 
-                                                              (conc (if curr-conf-dir
-                                                                        curr-conf-dir
-                                                                        ".")
-                                                                    "/" include-file)))))
-				     (let ((all-matches (sort (handle-exceptions exn
-								(begin
-								 (debug:print '(2 9) *default-log-port* "glob of " full-conf " gave no match. , exn=" exn)
-								 (list))
-								(glob full-conf)) string<=?)))
-				       (if (null? all-matches)
-					   (begin
-					     (debug:print '(2 9) #f "INFO: include file(s) matching " include-file " not found (called from " path ")")
-					     (debug:print 2 *default-log-port* "        " full-conf))
-					   (for-each
-					    (lambda (fpath)
-					      ;; (push-directory conf-dir)
-					      (debug:print 9 *default-log-port* "Including: " full-conf)
-					      (read-config fpath res allow-system environ-patt: environ-patt
-							   curr-section: curr-section-name sections: sections settings: settings
-							   keep-filenames: keep-filenames))
-					    all-matches))
-				       (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings)
-					     curr-section-name #f #f))))
-	       (configf:script-rx ( x include-script params);; handle-exceptions
-                                  ;;    exn
-                                  ;;    (begin
-                                  ;;      (debug:print '(0 2 9) #f "INFO: include from script " include-script " failed.")
-                                  ;;      (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f))
-                                  (if (and (common:file-exists? include-script)(file-execute-access? include-script))
-                                      (let* ((local-allow-system  (calc-allow-system allow-system curr-section-name sections))
-                                             (env-delta  (configf:cfgdat->env-alist curr-section-name res local-allow-system))
-                                             (new-inp-port
-                                              (common:with-env-vars
-                                               env-delta
-                                               (lambda ()
-                                                 (open-input-pipe (conc include-script " " params))))))
-                                        (debug:print '(2 9) *default-log-port* "Including from script output: " include-script)
-                                        ;;  (print "We got here, calling read-config next. Port is: " new-inp-port)
-                                        (read-config new-inp-port res allow-system environ-patt: environ-patt curr-section: curr-section-name sections: sections settings: settings keep-filenames: keep-filenames)
-                                        (close-input-port new-inp-port)
-                                        (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f))
-                                      (begin
-                                        (debug:print 0 *default-log-port* "Script not found or not exectutable: " include-script)
-                                        (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f)))
-                                  ) ;; )
-	       (configf:section-rx ( x section-name )
-                                   (begin
-                                     ;; call post-section-procs
-                                     (for-each 
-                                      (lambda (dat)
-                                        (let ((patt (car dat))
-                                              (proc (cdr dat)))
-                                          (if (string-match patt curr-section-name)
-                                              (proc curr-section-name section-name res path))))
-                                      post-section-procs)
-                                     ;; after gathering the vars for a section and if apply-wildcards is true and if there is a wildcard in the section name process wildcards
-                                     ;; NOTE: we are processing the curr-section-name, NOT section-name.
-                                     (process-wildcards res curr-section-name)
-                                     (if (not (hash-table-ref/default res section-name #f))(hash-table-set! res section-name '())) ;; ensure that mere mention of a section is not lost
-                                     (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings)
-                                           ;; if we have the sections list then force all settings into "" and delete it later?
-                                           ;; (if (or (not sections) 
-                                           ;;	      (member section-name sections))
-                                           ;;	  section-name "") ;; stick everything into "". NOPE: We need new strategy. Put stuff in correct sections and then delete all sections later.
-                                           section-name
-                                           #f #f)))
-	       (configf:key-sys-pr ( x key cmd      )
-                                   (if (calc-allow-system allow-system curr-section-name sections)
-                                       (let ((alist    (hash-table-ref/default res curr-section-name '()))
-                                             (val-proc (lambda ()
-                                                         (let* ((start-time (current-seconds))
-                                                                (local-allow-system  (calc-allow-system allow-system curr-section-name sections))
-                                                                (env-delta  (configf:cfgdat->env-alist curr-section-name res local-allow-system))
-                                                                (cmdres     (process:cmd-run->list cmd delta-env-alist-or-hash-table: env-delta)) ;; BB: here is where [system is exec'd.  needs to have env from other vars!
-                                                                (delta      (- (current-seconds) start-time))
-                                                                (status     (cadr cmdres))
-                                                                (res        (car  cmdres)))
-                                                           (debug:print-info 4 *default-log-port* "" inl "\n => " (string-intersperse res "\n"))
-                                                           (if (not (eq? status 0))
-                                                               (begin
-                                                                 (debug:print-error 0 *default-log-port* "problem with " inl ", return code " status
-                                                                                    " output: " cmdres)))
-                                                           (if (> delta 2)
-                                                               (debug:print-info 0 *default-log-port* "for line \"" inl "\"\n  command: " cmd " took " delta " seconds to run with output:\n   " res)
-                                                               (debug:print-info 9 *default-log-port* "for line \"" inl "\"\n  command: " cmd " took " delta " seconds to run with output:\n   " res))
-                                                           (if (null? res)
-                                                               ""
-                                                               (string-intersperse res " "))))))
-                                         (hash-table-set! res curr-section-name 
-                                                          (configf:assoc-safe-add alist
-                                                                                 key 
-                                                                                 (case (calc-allow-system allow-system curr-section-name sections)
-                                                                                   ((return-procs) val-proc)
-                                                                                   ((return-string) cmd)
-                                                                                   (else (val-proc)))
-                                                                                 metadata: metapath))
-                                         (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f))
-                                       (loop (configf:read-line inp res
-                                                                (calc-allow-system allow-system curr-section-name sections)
-                                                                settings)
-                                             curr-section-name #f #f)))
-               
-	       (configf:key-no-val ( x key val)
-                                   (let* ((alist   (hash-table-ref/default res curr-section-name '()))
-                                          (fval    (or (if (string? val) val #f) ""))) ;; fval should be either "" or " " (one or more spaces)
-                                     (debug:print 10 *default-log-port* "   setting: [" curr-section-name "] " key " = #t")
-                                     (safe-setenv key fval)
-                                     (hash-table-set! res curr-section-name 
-                                                      (configf:assoc-safe-add alist key fval metadata: metapath))
-                                     (loop (configf:read-line inp res
-                                                              (calc-allow-system allow-system curr-section-name sections)
-                                                              settings)
-                                           curr-section-name key #f)))
-               
-	       (configf:key-val-pr ( x key unk1 val unk2 )
-                                   (let* ((alist   (hash-table-ref/default res curr-section-name '()))
-                                          (envar   (and environ-patt
-							(string-search (regexp environ-patt) curr-section-name) ;; does the section match the envionpatt?
-							(and (not (string-null? key))
-							     (not (equal? "!" (substring key 0 1)))) ;; ! as leading character is a signature to NOT export to the environment
-							;; (string-match "^.*:.*:.*$" key) ;; ;; something:something:something reserved for triggers in runconfigs
-							)) 
-                                          (realval (if envar
-                                                       (configf:eval-string-in-environment val)
-                                                       val)))
-                                     (debug:print-info 6 *default-log-port* "read-config env setting, envar: " envar " realval: " realval " val: " val " key: " key " curr-section-name: " curr-section-name)
-                                     (if envar (safe-setenv key realval))
-                                     (debug:print 10 *default-log-port* "   setting: [" curr-section-name "] " key " = " val)
-                                     (hash-table-set! res curr-section-name 
-                                                      (configf:assoc-safe-add alist key realval metadata: metapath))
-                                     (loop (configf:read-line inp res
-                                                              (calc-allow-system allow-system curr-section-name sections) settings)
-                                           curr-section-name key #f)))
-	       ;; if a continued line
-	       (configf:cont-ln-rx ( x whsp val     )
-                                   (let ((alist (hash-table-ref/default res curr-section-name '())))
-                                     (if var-flag             ;; if set to a string then we have a continued var
-                                         (let ((newval (conc 
-                                                        (configf:lookup res curr-section-name var-flag) "\n"
-                                                        ;; trim lead from the incoming whsp to support some indenting.
-                                                        (if lead
-                                                            (string-substitute (regexp lead) "" whsp)
-                                                            "")
-                                                        val)))
-                                           ;; (print "val: " val "\nnewval: \"" newval "\"\nvarflag: " var-flag)
-                                           (hash-table-set! res curr-section-name 
-                                                            (configf:assoc-safe-add alist var-flag newval metadata: metapath))
-                                           (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name var-flag (if lead lead whsp)))
-                                         (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f))))
-	       (else (debug:print-error 0 *default-log-port* "problem parsing " path ",\n   \"" inl "\"")
-		     (set! var-flag #f)
-		     (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f))))
-          ) ;; end loop
-        )))
-  
-;; pathenvvar will set the named var to the path of the config
-(define (find-and-read-config fname #!key (environ-patt #f)(given-toppath #f)(pathenvvar #f))
-  (let* ((curr-dir   (current-directory))
-         (configinfo (find-config fname toppath: given-toppath))
-	 (toppath    (car configinfo))
-	 (configfile (cadr configinfo))
-	 (set-fields (lambda (curr-section next-section ht path)
-		       (let ((field-names (if ht (common:get-fields ht) '()))
-			     (target      (or (getenv "MT_TARGET")(args:get-arg "-reqtarg")(args:get-arg "-target"))))
-			 (debug:print-info 9 *default-log-port* "set-fields with field-names=" field-names " target=" target " curr-section=" curr-section " next-section=" next-section " path=" path " ht=" ht)
-			 (if (not (null? field-names))(keys:target-set-args field-names target #f))))))
-    (if toppath (change-directory toppath)) 
-    (if (and toppath pathenvvar)(setenv pathenvvar toppath))
-    (let ((configdat  (if configfile 
-			  (read-config configfile #f #t environ-patt: environ-patt post-section-procs: (list (cons "^fields$" set-fields)) #f))))
-      (if toppath (change-directory curr-dir))
-      (list configdat toppath configfile fname))))
-
-(define (configf:lookup cfgdat section var)
-  (if (hash-table? cfgdat)
-      (let ((sectdat (hash-table-ref/default cfgdat section '())))
-	(if (null? sectdat)
-	    #f
-	    (let ((match (assoc var sectdat)))
-	      (if match ;; (and match (list? match)(> (length match) 1))
-		  (cadr match)
-		  #f))
-	    ))
-      #f))
-
-;; use to have definitive setting:
-;;  [foo]
-;;  var yes
-;;
-;;  (configf:var-is? cfgdat "foo" "var" "yes") => #t
-;;
-(define (configf:var-is? cfgdat section var expected-val)
-  (equal? (configf:lookup cfgdat section var) expected-val))
-
-;; redefines
-(define config-lookup configf:lookup)
-(define configf:read-file read-config)
-
-;; safely look up a value that is expected to be a number, return
-;; a default (#f unless provided)
-;;
-(define (configf:lookup-number cfdat section varname #!key (default #f))
-  (let* ((val (configf:lookup *configdat* section varname))
-         (res (if val
-                  (string->number (string-substitute "\\s+" "" val #t))
-                  #f)))
-    (cond
-     (res  res)
-     (val  (debug:print 0 *default-log-port* "ERROR: no number found for [" section "], " varname ", got: " val))
-     (else default))))
-
-(define (configf:section-vars cfgdat section)
-  (let ((sectdat (hash-table-ref/default cfgdat section '())))
-    (if (null? sectdat)
-	'()
-	(map car sectdat))))
-
-(define (configf:get-section cfgdat section)
-  (hash-table-ref/default cfgdat section '()))
-
-(define (configf:set-section-var cfgdat section var val)
-  (let ((sectdat (configf:get-section cfgdat section)))
-    (hash-table-set! cfgdat section
-                     (configf:assoc-safe-add sectdat var val))))
-
-;;======================================================================
-;;(append (filter (lambda (x)(not (assoc var sectdat))) sectdat)
-;;	    (list var val))))
-
-(define (setup)
-  (let* ((configf (find-config "megatest.config"))
-	 (config  (if configf (read-config configf #f #t) #f)))
-    (if config
-	(setenv "RUN_AREA_HOME" (pathname-directory configf)))
-    config))
-
-;;======================================================================
-;; Non destructive writing of config file
-;;======================================================================
-
-(define (configf:compress-multi-lines fdat)
-  ;; step 1.5 - compress any continued lines
-  (if (null? fdat) fdat
-	(let loop ((hed (car fdat))
-		   (tal (cdr fdat))
-		   (cur "")
-		   (led #f)
-		   (res '()))
-	  ;; ALL WHITESPACE LEADING LINES ARE TACKED ON!!
-	  ;;  1. remove led whitespace
-	  ;;  2. tack on to hed with "\n"
-	  (let ((match (string-match configf:cont-ln-rx hed)))
-	    (if match ;; blast! have to deal with a multiline
-		(let* ((lead (cadr match))
-		       (lval (caddr match))
-		       (newl (conc cur "\n" lval)))
-		  (if (not led)(set! led lead))
-		  (if (null? tal) 
-		      (set! fdat (append fdat (list newl)))
-		      (loop (car tal)(cdr tal) newl led res))) ;; NB// not tacking newl onto res
-		(let ((newres (if led 
-				  (append res (list cur hed))
-				  (append res (list hed)))))
-		  ;; prev was a multiline
-		  (if (null? tal)
-		      newres
-		      (loop (car tal)(cdr tal) "" #f newres))))))))
-
-;; note: I'm cheating a little here. I merely replace "\n" with "\n         "
-(define (configf:expand-multi-lines fdat)
-  ;; step 1.5 - compress any continued lines
-  (if (null? fdat) fdat
-      (let loop ((hed (car fdat))
-		 (tal (cdr fdat))
-		 (res '()))
-	(let ((newres (append res (list (string-substitute (regexp "\n") "\n         " hed #t)))))
-	  (if (null? tal)
-	      newres
-	      (loop (car tal)(cdr tal) newres))))))
-
-(define (configf:file->list fname)
-  (if (common:file-exists? fname)
-      (let ((inp (open-input-file fname)))
-	(let loop ((inl (read-line inp))
-		   (res '()))
-	  (if (eof-object? inl)
-	      (begin
-		(close-input-port inp)
-		(reverse res))
-	      (loop (read-line inp)(cons inl res)))))
-      '()))
-
-;;======================================================================
-;; Write a config
-;;   0. Given a refererence data structure "indat"
-;;   1. Open the output file and read it into a list
-;;   2. Flatten any multiline entries
-;;   3. Modify values per contents of "indat" and remove absent values
-;;   4. Append new values to the section (immediately after last legit entry)
-;;   5. Write out the new list 
-;;======================================================================
-
-(define (configf:write-config indat fname #!key (required-sections '()))
-  (let* (;; step 1: Open the output file and read it into a list
-	 (fdat       (configf:file->list fname))
-	 (refdat  (make-hash-table))
-	 (sechash (make-hash-table)) ;; current section hash, init with hash for "default" section
-	 (new     #f) ;; put the line to be used in new, if it is to be deleted the set new to #f
-	 (secname #f))
-
-    ;; step 2: Flatten multiline entries
-    (if (not (null? fdat))(set! fdat (configf:compress-multi-lines fdat)))
-
-    ;; step 3: Modify values per contents of "indat" and remove absent values
-    (if (not (null? fdat))
-	(let loop ((hed  (car fdat))
-		   (tal  (cadr fdat))
-		   (res  '())
-		   (lnum 0))
-	  (regex-case 
-	   hed
-	   (configf:comment-rx _                  (set! res (append res (list hed)))) ;; (loop (read-line inp) curr-section-name #f #f))
-	   (configf:blank-l-rx _                  (set! res (append res (list hed)))) ;; (loop (read-line inp) curr-section-name #f #f))
-	   (configf:section-rx ( x section-name ) (let ((section-hash (hash-table-ref/default refdat section-name #f)))
-					    (if (not section-hash)
-						(let ((newhash (make-hash-table)))
-						  (hash-table-set! refdat section-name newhash) ;; was refhash - not sure that refdat is correct here
-						  (set! sechash newhash))
-						(set! sechash section-hash))
-					    (set! new hed) ;; will append this at the bottom of the loop
-					    (set! secname section-name)
-					    ))
-	   ;; No need to process key cmd, let it fall though to key val
-	   (configf:key-val-pr ( x key val      )
-		       (let ((newval (configf:lookup indat secname key))) ;; was sec, bug or correct?
-			 ;; can handle newval == #f here => that means key is removed
-			 (cond 
-			  ((equal? newval val)
-			   (set! res (append res (list hed))))
-			  ((not newval) ;; key has been removed
-			   (set! new #f))
-			  ((not (equal? newval val))
-			     (hash-table-set! sechash key newval)
-			     (set! new (conc key " " newval)))
-			  (else
-			   (debug:print-error 0 *default-log-port* "problem parsing line number " lnum "\"" hed "\"")))))
-	   (else
-	    (debug:print-error 0 *default-log-port* "Problem parsing line num " lnum " :\n   " hed )))
-	  (if (not (null? tal))
-	      (loop (car tal)(cdr tal)(if new (append res (list new)) res)(+ lnum 1)))
-	  ;; drop to here when done processing, res contains modified list of lines
-	  (set! fdat res)))
-
-    ;; step 4: Append new values to the section
-    (for-each 
-     (lambda (section)
-       (let ((sdat   '()) ;; append needed bits here
-	     (svars  (configf:section-vars indat section)))
-	 (for-each 
-	  (lambda (var)
-	    (let ((val (configf:lookup refdat section var)))
-	      (if (not val) ;; this one is new
-		  (begin
-		    (if (null? sdat)(set! sdat (list (conc "[" section "]"))))
-		    (set! sdat (append sdat (list (conc var " " val))))))))
-	  svars)
-	 (set! fdat (append fdat sdat))))
-     (delete-duplicates (append required-sections (hash-table-keys indat))))
-
-    ;; step 5: Write out new file
-    (with-output-to-file fname 
-      (lambda ()
-	(for-each 
-	 (lambda (line)
-	   (print line))
-	 (configf:expand-multi-lines fdat))))))
-
-;;======================================================================
-;; refdb
-;;======================================================================
-
-;; reads a refdb into an assoc array of assoc arrays
-;;   returns (list dat msg)
-(define (configf:read-refdb refdb-path)
-  (let ((sheets-file  (conc refdb-path "/sheet-names.cfg")))
-    (if (not (common:file-exists? sheets-file))
-	(list #f (conc "ERROR: no refdb found at " refdb-path))
-	(if (not (file-read-access? sheets-file))
-	    (list #f (conc "ERROR: refdb file not readable at " refdb-path))
-	    (let* ((sheets (with-input-from-file sheets-file
-			     (lambda ()
-			       (let loop ((inl (read-line))
-					  (res '()))
-				 (if (eof-object? inl)
-				     (reverse res)
-				     (loop (read-line)(cons inl res)))))))
-		   (data   '()))
-	      (for-each 
-	       (lambda (sheet-name)
-		 (let* ((dat-path  (conc refdb-path "/" sheet-name ".dat"))
-			(ref-dat   (configf:read-file dat-path #f #t))
-			(ref-assoc (map (lambda (key)
-					  (list key (hash-table-ref ref-dat key)))
-					(hash-table-keys ref-dat))))
-				   ;; (hash-table->alist ref-dat)))
-		   ;; (set! data (append data (list (list sheet-name ref-assoc))))))
-		   (set! data (cons (list sheet-name ref-assoc) data))))
-	       sheets)
-	      (list data "NO ERRORS"))))))
-
-;; map over all pairs in a three level hierarchial alist and apply a function to the keys/val
-;;
-(define (configf:map-all-hier-alist data proc #!key (initproc1 #f)(initproc2 #f)(initproc3 #f))
-  (for-each 
-   (lambda (sheetname)
-     (let* ((sheettmp  (assoc sheetname data))
-	    (sheetdat  (if sheettmp (cadr sheettmp) '())))
-       (if initproc1 (initproc1 sheetname))
-       (for-each 
-	(lambda (sectionname)
-	  (let* ((sectiontmp  (assoc sectionname sheetdat))
-		 (sectiondat  (if sectiontmp (cadr sectiontmp) '())))
-	    (if initproc2 (initproc2 sheetname sectionname))
-	    (for-each
-	     (lambda (varname)
-	       (let* ((valtmp (assoc varname sectiondat))
-		      (val    (if valtmp (cadr valtmp) "")))
-		 (proc sheetname sectionname varname val)))
-	     (map car sectiondat))))
-	(map car sheetdat))))
-   (map car data))
-  data)
-
-;;======================================================================
-;;  C O N F I G   T O / F R O M   A L I S T
-;;======================================================================
-
-(define (configf:config->alist cfgdat)
-  (hash-table->alist cfgdat))
-
-(define (configf:alist->config adat)
-  (let ((ht (make-hash-table)))
-    (for-each
-     (lambda (section)
-       (hash-table-set! ht (car section)(cdr section)))
-     adat)
-    ht))
-
-;; if 
-(define (configf:read-alist fname)
-  (handle-exceptions
-      exn
-    (begin
-      (debug:print 0 *default-log-port* "read of alist " fname " failed. exn=" exn)
-      #f)
-    (configf:alist->config
-     (with-input-from-file fname read))))
-
-(define (configf:write-alist cdat fname)
-  (if (not (common:faux-lock fname))
-      (debug:print 0 *default-log-port* "INFO: Could not get lock on " fname))
-  (let* ((dat  (configf:config->alist cdat))
-         (res
-          (begin
-            (with-output-to-file fname ;; first write out the file
-              (lambda ()
-                (pp dat)))
-            
-            (if (common:file-exists? fname)   ;; now verify it is readable
-                (if (configf:read-alist fname)
-                    #t ;; data is good.
-                    (begin
-                      (handle-exceptions
-			  exn
-			(begin
-			  (debug:print 0 *default-log-port* "deleting " fname " failed, exn=" exn)
-			  #f)
-			(debug:print 0 *default-log-port* "WARNING: content " dat " for cache " fname " is not readable. Deleting generated file.")
-			(delete-file fname))
-                      #f))
-                #f))))
-    (common:faux-unlock fname)
-    res))
-  
-;; convert hierarchial list to ini format
-;;
-(define (configf:config->ini data)
-  (map 
-   (lambda (section)
-     (let ((section-name (car section))
-	   (section-dat  (cdr section)))
-       (print "\n[" section-name "]")
-       (map (lambda (dat-pair)
-	      (let* ((var (car dat-pair))
-		     (val (cadr dat-pair))
-		     (fname (if (> (length dat-pair) 2)(caddr dat-pair) #f)))
-		(if fname (print "# " var "=>" fname))
-		(print var " " val)))
-	    section-dat))) ;;       (print "section-dat: " section-dat))
-   (hash-table->alist data)))

ADDED   configfmod.scm
Index: configfmod.scm
==================================================================
--- /dev/null
+++ configfmod.scm
@@ -0,0 +1,1087 @@
+;;======================================================================
+;; Copyright 2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
+
+;;======================================================================
+
+(declare (unit configfmod))
+(declare (uses mtargs))
+(declare (uses debugprint))
+(declare (uses keysmod))
+
+(module configfmod
+	*
+	
+(import scheme
+
+	chicken.base
+	chicken.condition
+	chicken.file
+	chicken.io
+	chicken.pathname
+	chicken.port
+	chicken.pretty-print
+	chicken.process
+	chicken.process-context
+	chicken.sort
+	chicken.string
+	chicken.time
+	chicken.eval
+	
+	debugprint
+	(prefix mtargs args:)
+	pkts
+	keysmod
+
+	(prefix base64 base64:)
+	(prefix dbi dbi:)
+	(prefix sqlite3 sqlite3:)
+	(srfi 18)
+	directory-utils
+	format
+	matchable
+	md5
+	message-digest
+	regex
+	regex-case
+	sparse-vectors
+	srfi-1
+	srfi-13
+	srfi-69
+	stack
+	typed-records
+	z3
+	
+	)
+
+(define *configdat*    #f) 
+
+(define getenv get-environment-variable)
+(define setenv set-environment-variable!)
+(define unsetenv unset-environment-variable!)
+
+;;======================================================================
+;; move debug stuff to separate module then put these back where they belong
+;;======================================================================
+;;======================================================================
+;; lookup routines - replicated from configf
+;;======================================================================
+
+(define (configf:lookup cfgdat section var)
+  (if (hash-table? cfgdat)
+      (let ((sectdat (hash-table-ref/default cfgdat section '())))
+	(if (null? sectdat)
+	    #f
+	    (let ((match (assoc var sectdat)))
+	      (if match ;; (and match (list? match)(> (length match) 1))
+		  (cadr match)
+		  #f))
+	    ))
+      #f))
+
+(define (configf:assoc-safe-add alist key val #!key (metadata #f))
+  (let ((newalist (filter (lambda (x)(not (equal? key (car x)))) alist)))
+    (append newalist (list (if metadata
+			       (list key val metadata)
+			       (list key val))))))
+
+(define (configf:section-var-set! cfgdat section-name var value #!key (metadata #f))
+  (hash-table-set! cfgdat section-name
+		   (configf:assoc-safe-add
+		    (hash-table-ref/default cfgdat section-name '())
+		    var value metadata: metadata)))
+
+;; use to have definitive setting:
+;;  [foo]
+;;  var yes
+;;
+;;  (configf:var-is? cfgdat "foo" "var" "yes") => #t
+;;
+(define (configf:var-is? cfgdat section var expected-val)
+  (equal? (configf:lookup cfgdat section var) expected-val))
+
+;; redefines
+(define config-lookup configf:lookup)
+;; (define configf:read-file read-config)
+
+;; safely look up a value that is expected to be a number, return
+;; a default (#f unless provided)
+;;
+(define (configf:lookup-number cfdat section varname #!key (default #f))
+  (let* ((val (configf:lookup cfdat section varname))
+         (res (if val
+                  (string->number (string-substitute "\\s+" "" val #t))
+                  #f)))
+    (cond
+     (res  res)
+     (val  (debug:print 0 *default-log-port* "ERROR: no number found for [" section "], " varname ", got: " val))
+     (else default))))
+
+(define (configf:section-vars cfgdat section)
+  (let ((sectdat (hash-table-ref/default cfgdat section '())))
+    (if (null? sectdat)
+	'()
+	(map car sectdat))))
+
+(define (configf:get-section cfgdat section)
+  (hash-table-ref/default cfgdat section '()))
+
+(define (configf:set-section-var cfgdat section var val)
+  (let ((sectdat (configf:get-section cfgdat section)))
+    (hash-table-set! cfgdat section
+                     (configf:assoc-safe-add sectdat var val))))
+
+;;======================================================================the end
+
+;; return list (path fullpath configname)
+(define (find-config configname #!key (toppath #f))
+  (if toppath
+      (let ((cfname (conc toppath "/" configname)))
+	(if (file-exists? cfname)
+	    (list toppath cfname configname)
+	    (list #f      #f     #f)))
+      (let* ((cwd (string-split (current-directory) "/")))
+	(let loop ((dir cwd))
+	  (let* ((path     (conc "/" (string-intersperse dir "/")))
+		 (fullpath (conc path "/" configname)))
+	    (if (file-exists? fullpath)
+		(list path fullpath configname)
+		(let ((remcwd (take dir (- (length dir) 1))))
+		  (if (null? remcwd)
+		      (list #f #f #f) ;;  #f #f) 
+		  (loop remcwd)))))))))
+
+;; SOMETHING WRONG HERE -- BUG!
+;;
+(define (configf:eval-string-in-environment str)
+  ;; (if (or (string-null? str)
+  ;;	  (equal? "!" (substring str 0 1))) ;; null string or starts with ! are preserved but NOT set in the environment
+      str
+      (handle-exceptions
+       exn
+       (begin
+	 (debug:print-error 0 *default-log-port* "problem evaluating \"" str "\" in the shell environment, exn=" exn)
+	 #f)
+       (let ((cmdres (process:cmd-run->list (conc "echo " str))))
+	 (if (null? cmdres) ""
+	     (caar cmdres))))) ;; )
+
+;;======================================================================
+;; Make the regexp's needed globally available
+;;======================================================================
+
+(define configf:include-rx (regexp "^\\[include\\s+(.*)\\]\\s*$"))
+(define configf:script-rx  (regexp "^\\[scriptinc\\s+(\\S+)([^\\]]*)\\]\\s*$")) ;; include output from a script
+(define configf:section-rx (regexp "^\\[(.*)\\]\\s*$"))
+(define configf:blank-l-rx (regexp "^\\s*$"))
+(define configf:key-sys-pr (regexp "^(\\S+)\\s+\\[system\\s+(\\S+.*)\\]\\s*$"))
+(define configf:key-val-pr (regexp "^(\\S+)(\\s+(.*)|())$"))
+(define configf:key-no-val (regexp "^(\\S+)(\\s*)$"))
+(define configf:comment-rx (regexp "^\\s*#.*"))
+(define configf:cont-ln-rx (regexp "^(\\s+)(\\S+.*)$"))
+(define configf:settings   (regexp "^\\[configf:settings\\s+(\\S+)\\s+(\\S+)]\\s*$"))
+
+;; read a line and process any #{ ... } constructs
+
+(define configf:var-expand-regex (regexp "^(.*)#\\{(scheme|system|shell|getenv|get|runconfigs-get|rget|scm|sh|rp|gv|g|mtrah)\\s+([^\\}\\{]*)\\}(.*)"))
+
+(define (configf:system ht cmd)
+  (system cmd)
+  )
+
+;; Run a shell command and return the output as a string
+(define (shell cmd)
+  (let* ((output (process:cmd-run->list cmd))
+	 (res    (car output))
+	 (status (cadr output)))
+    (if (equal? status 0)
+	(let ((outres (string-intersperse 
+		       res
+		       "\n")))
+	  (debug:print-info 4 *default-log-port* "shell result:\n" outres)
+	  outres)
+	(begin
+	  (with-output-to-port (current-error-port)
+	    (lambda ()
+	      (print "ERROR: " cmd " returned bad exit code " status)))
+	  ""))))
+
+;; this was inline but I'm pretty sure that is a hold over from when it was *very* simple ...
+;;
+(define (configf:read-line p ht allow-processing settings env-to-use)
+  (let loop ((inl (read-line p)))
+    (let ((cont-line (and (string? inl)
+			  (not (string-null? inl))
+			  (equal? "\\" (string-take-right inl 1)))))
+      (if cont-line ;; last character is \ 
+	  (let ((nextl (read-line p)))
+	    (if (not (eof-object? nextl))
+		(loop (string-append (if cont-line 
+					 (string-take inl (- (string-length inl) 1))
+					 inl)
+				     nextl))))
+	  (let ((res (case allow-processing ;; if (and allow-processing 
+		       ;;	   (not (eq? allow-processing 'return-string)))
+		       ((#t #f)
+			(configf:process-line inl ht allow-processing env-to-use))
+		       ((return-string)
+			inl)
+		       (else
+			(configf:process-line inl ht allow-processing env-to-use)))))
+	    (if (and (string? res)  ;; must set to "no" to force NOT trimming trailing spaces
+		     (not (equal? (hash-table-ref/default settings "trim-trailing-spaces" "yes") "no")))
+		(string-substitute "\\s+$" "" res)
+		res))))))
+
+(define (configf:cfgdat->env-alist section cfgdat-ht allow-system)
+  (filter
+   (lambda (pair)
+     (let* ((var (car pair))
+            (val (cdr pair)))
+       (cons var
+             (cond
+              ((and allow-system (procedure? val)) ;; if we decided to use something other than #t or #f for allow-system ('return-procs or 'return-string) , this may become problematic
+               (val))
+              ((procedure? val) #f)
+              ((string? val) val)
+              (else "#f")))))
+   (append
+    (hash-table-ref/default cfgdat-ht "default" '())
+    (if (equal? section "default") '() (hash-table-ref/default cfgdat-ht section '())))))
+
+(define (calc-allow-system allow-system section sections)
+  (if sections
+      (and (or (equal? "default" section)
+	       (member section sections))
+	   allow-system) ;; account for sections and return allow-system as it might be a symbol such as return-strings
+      allow-system))
+    
+;; given a config hash and a section name, apply that section to all matching sections (using wildcard % or regex if /..../)
+;; remove the section when done so that there is no downstream clobbering
+;;
+(define (configf:apply-wildcards ht section-name)
+  (if (hash-table-exists? ht section-name)
+      (let* ((vars  (hash-table-ref ht section-name))
+	     (rxstr (if (string-contains section-name "%")
+			(string-substitute (regexp "%") ".*" section-name)
+			(string-substitute (regexp "^/(.*)/$") "\\1" section-name)))
+	     (rx    (regexp rxstr)))
+	;; (print "\nsection-name: " section-name " rxstr: " rxstr)
+        (for-each
+         (lambda (section)
+	   (if section
+	       (let ((same-section (string=? section-name section))
+		     (rx-match     (string-match rx section)))
+		 ;; (print "section: " section " vars: " vars " same-section: " same-section " rx-match: " rx-match)
+		 (if (and (not same-section) rx-match)
+		     (for-each
+		      (lambda (bundle)
+			;; (print "bundle: " bundle)
+			(let ((key  (car bundle))
+			      (val  (cadr bundle))
+			      (meta (if (> (length bundle) 2)(caddr bundle) #f)))
+			  (hash-table-set! ht section (configf:assoc-safe-add (hash-table-ref ht section) key val metadata: meta))))
+		      vars)))))
+         (hash-table-keys ht))))
+  ht)
+
+;; read a config file, returns hash table of alists
+
+;; read a config file, returns hash table of alists
+;; adds to ht if given (must be #f otherwise)
+;; allow-system:
+;;    #f - do not evaluate [system
+;;    #t - immediately evaluate [system and store result as string
+;;    'return-procs -- return a proc taking ht as an argument that may be evaulated at some future time
+;;    'return-string -- return a string representing a proc taking ht as an argument that may be evaulated at some future time
+;; envion-patt is a regex spec that identifies sections that will be eval'd
+;; in the environment on the fly
+;; sections: #f => get all, else list of sections to gather
+;; post-section-procs alist of section-pattern => proc, where: (proc section-name next-section-name ht curr-path)
+;; apply-wildcards: #t/#f - apply vars from targets with % wildcards to all matching sections
+;;
+(define (configf:read-config path ht allow-system #!key (environ-patt #f)            (curr-section #f)   
+		     (sections #f)              (settings (make-hash-table)) (keep-filenames #f)
+		     (post-section-procs '())   (apply-wildcards #t) (env-to-use #f))
+  (debug:print 9 *default-log-port* "START: " path)
+;; (if *configdat*
+;;     (common:save-pkt `((action . read-config)
+;;       		 (f      . ,(cond ((string? path) path)
+;;       				  ((port?   path) "port")
+;;       				  (else (conc path))))
+;;                        (T      . configf))
+;;       	       *configdat* #t add-only: #t))
+  (if (and (not (port? path))
+	   (not (file-exists? path))) ;; for case where we are handed a port
+      (begin 
+	(debug:print-info 1 *default-log-port* "configf:read-config - file not found " path " current path: " (current-directory))
+	;; WARNING: This is a risky change but really, we should not return an empty hash table if no file read?
+	#f) ;; (if (not ht)(make-hash-table) ht))
+      (let (;; (env-to-use (if env-to-use env-to-use (module-environment 'configfmod)))
+	    (inp        (if (string? path)
+			    (open-input-file path)
+			      path)) ;; we can be handed a port
+	    (res        (if (not ht)(make-hash-table) ht))
+	    (metapath   (if (or (debug:debug-mode 9)
+				keep-filenames)
+			    path #f))
+            (process-wildcards  (lambda (res curr-section-name)
+                                  (if (and apply-wildcards
+                                           (or (string-contains curr-section-name "%")   ;; wildcard
+                                               (string-match "/.*/" curr-section-name))) ;; regex
+                                      (begin
+                                        (configf:apply-wildcards res curr-section-name)
+                                        (hash-table-delete! res curr-section-name))))))  ;; NOTE: if the section is a wild card it will be REMOVED from res 
+	(let loop ((inl               (configf:read-line inp res (calc-allow-system allow-system curr-section sections) settings env-to-use)) ;; (read-line inp))
+		   (curr-section-name (if curr-section curr-section "default"))
+		   (var-flag #f);; turn on for key-var-pr and cont-ln-rx, turn off elsewhere
+		   (lead     #f))
+	  (debug:print-info 8 *default-log-port* "curr-section-name: " curr-section-name " var-flag: " var-flag "\n   inl: \"" inl "\"")
+	  (if (eof-object? inl) 
+	      (begin
+                ;; process last section for wildcards
+                (process-wildcards res curr-section-name)
+		(if (string? path) ;; we received a path, not a port, thus we are responsible for closing it.
+		    (close-input-port inp))
+		(if (list? sections) ;; delete all sections except given when sections is provided
+		    (for-each
+		     (lambda (section)
+		       (if (not (member section sections))
+			   (hash-table-delete! res section))) ;; we are using "" as a dumping ground and must remove it before returning the ht
+		     (hash-table-keys res)))
+		(debug:print 9 *default-log-port* "END: " path)
+                res
+                ) ;; retval
+	      (regex-case 
+	       inl 
+	       (configf:comment-rx _                  (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings env-to-use)
+                                                            curr-section-name #f #f))
+               
+	       (configf:blank-l-rx _                  (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings env-to-use)
+                                                            curr-section-name #f #f))
+	       (configf:settings   ( x setting val  )
+                                   (begin
+                                     (hash-table-set! settings setting val)
+                                     (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings env-to-use)
+                                           curr-section-name #f #f)))
+               
+	       (configf:include-rx ( x include-file )
+                                   (let* ((curr-conf-dir (pathname-directory path))
+                                          (full-conf     (if (and (absolute-pathname? include-file) (file-exists? include-file))
+                                                             include-file
+                                                             (common:nice-path 
+                                                              (conc (if curr-conf-dir
+                                                                        curr-conf-dir
+                                                                        ".")
+                                                                    "/" include-file)))))
+				     (let ((all-matches (sort (handle-exceptions exn
+								(begin
+								 (debug:print '(2 9) *default-log-port* "glob of " full-conf " gave no match. , exn=" exn)
+								 (list))
+								(glob full-conf)) string<=?)))
+				       (if (null? all-matches)
+					   (begin
+					     (debug:print '(2 9) #f "INFO: include file(s) matching " include-file " not found (called from " path ")")
+					     (debug:print 2 *default-log-port* "        " full-conf))
+					   (for-each
+					    (lambda (fpath)
+					      ;; (push-directory conf-dir)
+					      (debug:print 9 *default-log-port* "Including: " full-conf)
+					      (configf:read-config fpath res allow-system environ-patt: environ-patt
+							   curr-section: curr-section-name sections: sections settings: settings
+							   keep-filenames: keep-filenames env-to-use: env-to-use))
+					    all-matches))
+				       (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings env-to-use)
+					     curr-section-name #f #f))))
+	       (configf:script-rx ( x include-script params);; handle-exceptions
+                                  ;;    exn
+                                  ;;    (begin
+                                  ;;      (debug:print '(0 2 9) #f "INFO: include from script " include-script " failed.")
+                                  ;;      (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f))
+                                  (if (and (file-exists? include-script)(file-executable? include-script))
+                                      (let* ((local-allow-system  (calc-allow-system allow-system curr-section-name sections))
+                                             (env-delta  (configf:cfgdat->env-alist curr-section-name res local-allow-system))
+                                             (new-inp-port
+                                              (common:with-env-vars
+                                               env-delta
+                                               (lambda ()
+                                                 (open-input-pipe (conc include-script " " params))))))
+                                        (debug:print '(2 9) *default-log-port* "Including from script output: " include-script)
+                                        ;;  (print "We got here, calling configf:read-config next. Port is: " new-inp-port)
+                                        (configf:read-config new-inp-port res allow-system environ-patt: environ-patt curr-section: curr-section-name sections: sections settings: settings keep-filenames: keep-filenames env-to-use: env-to-use)
+                                        (close-input-port new-inp-port)
+                                        (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings env-to-use) curr-section-name #f #f))
+                                      (begin
+                                        (debug:print 0 *default-log-port* "Script not found or not exectutable: " include-script)
+                                        (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings env-to-use) curr-section-name #f #f)))
+                                  ) ;; )
+	       (configf:section-rx ( x section-name )
+                                   (begin
+                                     ;; call post-section-procs
+                                     (for-each 
+                                      (lambda (dat)
+                                        (let ((patt (car dat))
+                                              (proc (cdr dat)))
+                                          (if (string-match patt curr-section-name)
+                                              (proc curr-section-name section-name res path))))
+                                      post-section-procs)
+                                     ;; after gathering the vars for a section and if apply-wildcards is true and if there is a wildcard in the section name process wildcards
+                                     ;; NOTE: we are processing the curr-section-name, NOT section-name.
+                                     (process-wildcards res curr-section-name)
+                                     (if (not (hash-table-ref/default res section-name #f))(hash-table-set! res section-name '())) ;; ensure that mere mention of a section is not lost
+                                     (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings env-to-use)
+                                           ;; if we have the sections list then force all settings into "" and delete it later?
+                                           ;; (if (or (not sections) 
+                                           ;;	      (member section-name sections))
+                                           ;;	  section-name "") ;; stick everything into "". NOPE: We need new strategy. Put stuff in correct sections and then delete all sections later.
+                                           section-name
+                                           #f #f)))
+	       (configf:key-sys-pr ( x key cmd      )
+                                   (if (calc-allow-system allow-system curr-section-name sections)
+                                       (let ((alist    (hash-table-ref/default res curr-section-name '()))
+                                             (val-proc (lambda ()
+                                                         (let* ((start-time (current-seconds))
+                                                                (local-allow-system  (calc-allow-system allow-system curr-section-name sections))
+                                                                (env-delta  (configf:cfgdat->env-alist curr-section-name res local-allow-system))
+                                                                (cmdres     (process:cmd-run->list cmd delta-env-alist-or-hash-table: env-delta)) ;; BB: here is where [system is exec'd.  needs to have env from other vars!
+                                                                (delta      (- (current-seconds) start-time))
+                                                                (status     (cadr cmdres))
+                                                                (res        (car  cmdres)))
+                                                           (debug:print-info 4 *default-log-port* "" inl "\n => " (string-intersperse res "\n"))
+                                                           (if (not (eq? status 0))
+                                                               (begin
+                                                                 (debug:print-error 0 *default-log-port* "problem with " inl ", return code " status
+                                                                                    " output: " cmdres)))
+                                                           (if (> delta 2)
+                                                               (debug:print-info 0 *default-log-port* "for line \"" inl "\"\n  command: " cmd " took " delta " seconds to run with output:\n   " res)
+                                                               (debug:print-info 9 *default-log-port* "for line \"" inl "\"\n  command: " cmd " took " delta " seconds to run with output:\n   " res))
+                                                           (if (null? res)
+                                                               ""
+                                                               (string-intersperse res " "))))))
+                                         (hash-table-set! res curr-section-name 
+                                                          (configf:assoc-safe-add alist
+                                                                                 key 
+                                                                                 (case (calc-allow-system allow-system curr-section-name sections)
+                                                                                   ((return-procs) val-proc)
+                                                                                   ((return-string) cmd)
+                                                                                   (else (val-proc)))
+                                                                                 metadata: metapath))
+                                         (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings env-to-use) curr-section-name #f #f))
+                                       (loop (configf:read-line inp res
+                                                                (calc-allow-system allow-system curr-section-name sections)
+                                                                settings env-to-use)
+                                             curr-section-name #f #f)))
+               
+	       (configf:key-no-val ( x key val)
+                                   (let* ((alist   (hash-table-ref/default res curr-section-name '()))
+                                          (fval    (or (if (string? val) val #f) ""))) ;; fval should be either "" or " " (one or more spaces)
+                                     (debug:print 10 *default-log-port* "   setting: [" curr-section-name "] " key " = #t")
+                                     (safe-setenv key fval)
+                                     (hash-table-set! res curr-section-name 
+                                                      (configf:assoc-safe-add alist key fval metadata: metapath))
+                                     (loop (configf:read-line inp res
+                                                              (calc-allow-system allow-system curr-section-name sections)
+                                                              settings env-to-use)
+                                           curr-section-name key #f)))
+               
+	       (configf:key-val-pr ( x key unk1 val unk2 )
+                                   (let* ((alist   (hash-table-ref/default res curr-section-name '()))
+                                          (envar   (and environ-patt
+							(string-search (regexp environ-patt) curr-section-name) ;; does the section match the envionpatt?
+							(and (not (string-null? key))
+							     (not (equal? "!" (substring key 0 1)))) ;; ! as leading character is a signature to NOT export to the environment
+							;; (string-match "^.*:.*:.*$" key) ;; ;; something:something:something reserved for triggers in runconfigs
+							)) 
+                                          (realval (if envar
+                                                       (configf:eval-string-in-environment val)
+                                                       val)))
+                                     (debug:print-info 6 *default-log-port* "configf:read-config env setting, envar: " envar " realval: " realval " val: " val " key: " key " curr-section-name: " curr-section-name)
+                                     (if envar (safe-setenv key realval))
+                                     (debug:print 10 *default-log-port* "   setting: [" curr-section-name "] " key " = " val)
+                                     (hash-table-set! res curr-section-name 
+                                                      (configf:assoc-safe-add alist key realval metadata: metapath))
+                                     (loop (configf:read-line inp res
+                                                              (calc-allow-system allow-system curr-section-name sections) settings env-to-use)
+                                           curr-section-name key #f)))
+	       ;; if a continued line
+	       (configf:cont-ln-rx ( x whsp val     )
+                                   (let ((alist (hash-table-ref/default res curr-section-name '())))
+                                     (if var-flag             ;; if set to a string then we have a continued var
+                                         (let ((newval (conc 
+                                                        (configf:lookup res curr-section-name var-flag) "\n"
+                                                        ;; trim lead from the incoming whsp to support some indenting.
+                                                        (if lead
+                                                            (string-substitute (regexp lead) "" whsp)
+                                                            "")
+                                                        val)))
+                                           ;; (print "val: " val "\nnewval: \"" newval "\"\nvarflag: " var-flag)
+                                           (hash-table-set! res curr-section-name 
+                                                            (configf:assoc-safe-add alist var-flag newval metadata: metapath))
+                                           (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings env-to-use) curr-section-name var-flag (if lead lead whsp)))
+                                         (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings env-to-use) curr-section-name #f #f))))
+	       (else (debug:print-error 0 *default-log-port* "problem parsing " path ",\n   \"" inl "\"")
+		     (set! var-flag #f)
+		     (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings env-to-use) curr-section-name #f #f))))
+          ) ;; end loop
+        )))
+  
+;;======================================================================
+;; lookup and manipulation routines
+;;======================================================================
+
+;; (define (configf:assoc-safe-add alist key val #!key (metadata #f))
+;;   (let ((newalist (filter (lambda (x)(not (equal? key (car x)))) alist)))
+;;     (append newalist (list (if metadata
+;; 			       (list key val metadata)
+;; 			       (list key val))))))
+;; 
+;; (define (configf:section-var-set! cfgdat section-name var value #!key (metadata #f))
+;;   (hash-table-set! cfgdat section-name
+;; 		   (configf:assoc-safe-add
+;; 		    (hash-table-ref/default cfgdat section-name '())
+;; 		    var value metadata: metadata)))
+;; 
+;; (define (configf:lookup cfgdat section var)
+;;   (if (hash-table? cfgdat)
+;;       (let ((sectdat (hash-table-ref/default cfgdat section '())))
+;; 	(if (null? sectdat)
+;; 	    #f
+;; 	    (let ((match (assoc var sectdat)))
+;; 	      (if match ;; (and match (list? match)(> (length match) 1))
+;; 		  (cadr match)
+;; 		  #f))
+;; 	    ))
+;;       #f))
+;; 
+;; ;; use to have definitive setting:
+;; ;;  [foo]
+;; ;;  var yes
+;; ;;
+;; ;;  (configf:var-is? cfgdat "foo" "var" "yes") => #t
+;; ;;
+;; (define (configf:var-is? cfgdat section var expected-val)
+;;   (equal? (configf:lookup cfgdat section var) expected-val))
+;; 
+
+;; ;; safely look up a value that is expected to be a number, return
+;; ;; a default (#f unless provided)
+;; ;;
+;; (define (configf:lookup-number cfdat section varname #!key (default #f))
+;;   (let* ((val (configf:lookup *configdat* section varname))
+;;          (res (if val
+;;                   (string->number (string-substitute "\\s+" "" val #t))
+;;                   #f)))
+;;     (cond
+;;      (res  res)
+;;      (val  (debug:print 0 *default-log-port* "ERROR: no number found for [" section "], " varname ", got: " val))
+;;      (else default))))
+;; 
+;; (define (configf:section-vars cfgdat section)
+;;   (let ((sectdat (hash-table-ref/default cfgdat section '())))
+;;     (if (null? sectdat)
+;; 	'()
+;; 	(map car sectdat))))
+;; 
+;; (define (configf:get-section cfgdat section)
+;;   (hash-table-ref/default cfgdat section '()))
+;; 
+;; (define (configf:set-section-var cfgdat section var val)
+;;   (let ((sectdat (configf:get-section cfgdat section)))
+;;     (hash-table-set! cfgdat section
+;;                      (configf:assoc-safe-add sectdat var val))))
+;; 
+;;     ;;(append (filter (lambda (x)(not (assoc var sectdat))) sectdat)
+;;     ;;	    (list var val))))
+;; 
+;;======================================================================
+;; setup
+;;======================================================================
+;;======================================================================
+
+;; This should not be here.
+#;(define (setup)
+  (let* ((configf (find-config "megatest.config"))
+	 (config  (if configf (configf:read-config configf #f #t) #f)))
+    (if config
+	(setenv "RUN_AREA_HOME" (pathname-directory configf)))
+    config))
+
+(define (safe-setenv key val)
+  (if (or (substring-index "!" key)
+	  (substring-index ":" key)  ;; variables containing : are for internal use and cannot be environment variables.
+	  (substring-index "." key)) ;; periods are not allowed in environment variables
+      (debug:print-error 4 *default-log-port* "skip setting internal use only variables containing \":\" or starting with \"!\"")
+      (if (and (string? val)
+	       (string? key))
+	  (handle-exceptions
+	      exn
+	      (debug:print-error 0 *default-log-port* "bad value for setenv, key=" key ", value=" val ", exn=" exn)
+	    (setenv key val))
+	  (debug:print-error 0 *default-log-port* "bad value for setenv, key=" key ", value=" val))))
+
+;;======================================================================
+;; accept an alist or hash table containing envvar/env value pairs (value of #f causes unset) 
+;;   execute thunk in context of environment modified as per this list
+;;   restore env to prior state then return value of eval'd thunk.
+;;   ** this is not thread safe **
+(define (common:with-env-vars delta-env-alist-or-hash-table thunk)
+  (let* ((delta-env-alist (if (hash-table? delta-env-alist-or-hash-table)
+                              (hash-table->alist delta-env-alist-or-hash-table)
+                              delta-env-alist-or-hash-table))
+         (restore-thunks
+          (filter
+           identity
+           (map (lambda (env-pair)
+                  (let* ((env-var     (car env-pair))
+                         (new-val     (let ((tmp (cdr env-pair)))
+                                        (if (list? tmp) (car tmp) tmp)))
+                         (current-val (get-environment-variable env-var))
+                         (restore-thunk
+                          (cond
+                           ((not current-val) (lambda () (unsetenv env-var)))
+                           ((not (string? new-val)) #f)
+                           ((eq? current-val new-val) #f)
+                           (else 
+                            (lambda () (setenv env-var current-val))))))
+                    ;;(when (not (string? new-val))
+                    ;;    (debug:print 0 *default-log-port* " PROBLEM: not a string: "new-val"\n from env-alist:\n"delta-env-alist)
+                    ;;    (pp delta-env-alist)
+                    ;;    (exit 1))
+                        
+                    
+                    (cond
+                     ((not new-val)  ;; modify env here
+                      (unsetenv env-var))
+                     ((string? new-val)
+                      (setenv env-var new-val)))
+                    restore-thunk))
+                delta-env-alist))))
+    (let ((rv (thunk)))
+      (for-each (lambda (x) (x)) restore-thunks) ;; restore env to original state
+      rv)))
+
+;; return a nice clean pathname made absolute
+(define (common:nice-path dir)
+  (let ((match (string-match "^(~[^\\/]*)(\\/.*|)$" dir)))
+    (if match ;; using ~ for home?
+	(common:nice-path (conc (common:read-link-f (cadr match)) "/" (caddr match)))
+	(normalize-pathname (if (absolute-pathname? dir)
+				dir
+				(conc (current-directory) "/" dir))))))
+
+;; make "nice-path" available in config files and the repl
+(define nice-path common:nice-path)
+
+(define (common:read-link-f path)
+  (handle-exceptions
+      exn
+      (begin
+	(debug:print-error 0 *default-log-port* "command \"/bin/readlink -f " path "\" failed. exn=" exn)
+	path) ;; just give up
+    (with-input-from-pipe
+	(conc "/bin/readlink -f " path)
+      (lambda ()
+	(read-line)))))
+
+
+;;======================================================================
+;; Non destructive writing of config file
+;;======================================================================
+
+(define (configf:compress-multi-lines fdat)
+  ;; step 1.5 - compress any continued lines
+  (if (null? fdat) fdat
+	(let loop ((hed (car fdat))
+		   (tal (cdr fdat))
+		   (cur "")
+		   (led #f)
+		   (res '()))
+	  ;; ALL WHITESPACE LEADING LINES ARE TACKED ON!!
+	  ;;  1. remove led whitespace
+	  ;;  2. tack on to hed with "\n"
+	  (let ((match (string-match configf:cont-ln-rx hed)))
+	    (if match ;; blast! have to deal with a multiline
+		(let* ((lead (cadr match))
+		       (lval (caddr match))
+		       (newl (conc cur "\n" lval)))
+		  (if (not led)(set! led lead))
+		  (if (null? tal) 
+		      (set! fdat (append fdat (list newl)))
+		      (loop (car tal)(cdr tal) newl led res))) ;; NB// not tacking newl onto res
+		(let ((newres (if led 
+				  (append res (list cur hed))
+				  (append res (list hed)))))
+		  ;; prev was a multiline
+		  (if (null? tal)
+		      newres
+		      (loop (car tal)(cdr tal) "" #f newres))))))))
+
+;; note: I'm cheating a little here. I merely replace "\n" with "\n         "
+(define (configf:expand-multi-lines fdat)
+  ;; step 1.5 - compress any continued lines
+  (if (null? fdat) fdat
+      (let loop ((hed (car fdat))
+		 (tal (cdr fdat))
+		 (res '()))
+	(let ((newres (append res (list (string-substitute (regexp "\n") "\n         " hed #t)))))
+	  (if (null? tal)
+	      newres
+	      (loop (car tal)(cdr tal) newres))))))
+
+(define (configf:file->list fname)
+  (if (file-exists? fname)
+      (let ((inp (open-input-file fname)))
+	(let loop ((inl (read-line inp))
+		   (res '()))
+	  (if (eof-object? inl)
+	      (begin
+		(close-input-port inp)
+		(reverse res))
+	      (loop (read-line inp)(cons inl res)))))
+      '()))
+
+;;======================================================================
+;; Write a config
+;;   0. Given a refererence data structure "indat"
+;;   1. Open the output file and read it into a list
+;;   2. Flatten any multiline entries
+;;   3. Modify values per contents of "indat" and remove absent values
+;;   4. Append new values to the section (immediately after last legit entry)
+;;   5. Write out the new list 
+;;======================================================================
+
+(define (configf:write-config indat fname #!key (required-sections '()))
+  (let* (;; step 1: Open the output file and read it into a list
+	 (fdat       (configf:file->list fname))
+	 (refdat  (make-hash-table))
+	 (sechash (make-hash-table)) ;; current section hash, init with hash for "default" section
+	 (new     #f) ;; put the line to be used in new, if it is to be deleted the set new to #f
+	 (secname #f))
+
+    ;; step 2: Flatten multiline entries
+    (if (not (null? fdat))(set! fdat (configf:compress-multi-lines fdat)))
+
+    ;; step 3: Modify values per contents of "indat" and remove absent values
+    (if (not (null? fdat))
+	(let loop ((hed  (car fdat))
+		   (tal  (cadr fdat))
+		   (res  '())
+		   (lnum 0))
+	  (regex-case 
+	   hed
+	   (configf:comment-rx _                  (set! res (append res (list hed)))) ;; (loop (read-line inp) curr-section-name #f #f))
+	   (configf:blank-l-rx _                  (set! res (append res (list hed)))) ;; (loop (read-line inp) curr-section-name #f #f))
+	   (configf:section-rx ( x section-name ) (let ((section-hash (hash-table-ref/default refdat section-name #f)))
+					    (if (not section-hash)
+						(let ((newhash (make-hash-table)))
+						  (hash-table-set! refdat section-name newhash) ;; was refhash - not sure that refdat is correct here
+						  (set! sechash newhash))
+						(set! sechash section-hash))
+					    (set! new hed) ;; will append this at the bottom of the loop
+					    (set! secname section-name)
+					    ))
+	   ;; No need to process key cmd, let it fall though to key val
+	   (configf:key-val-pr ( x key val      )
+		       (let ((newval (configf:lookup indat secname key))) ;; was sec, bug or correct?
+			 ;; can handle newval == #f here => that means key is removed
+			 (cond 
+			  ((equal? newval val)
+			   (set! res (append res (list hed))))
+			  ((not newval) ;; key has been removed
+			   (set! new #f))
+			  ((not (equal? newval val))
+			     (hash-table-set! sechash key newval)
+			     (set! new (conc key " " newval)))
+			  (else
+			   (debug:print-error 0 *default-log-port* "problem parsing line number " lnum "\"" hed "\"")))))
+	   (else
+	    (debug:print-error 0 *default-log-port* "Problem parsing line num " lnum " :\n   " hed )))
+	  (if (not (null? tal))
+	      (loop (car tal)(cdr tal)(if new (append res (list new)) res)(+ lnum 1)))
+	  ;; drop to here when done processing, res contains modified list of lines
+	  (set! fdat res)))
+
+    ;; step 4: Append new values to the section
+    (for-each 
+     (lambda (section)
+       (let ((sdat   '()) ;; append needed bits here
+	     (svars  (configf:section-vars indat section)))
+	 (for-each 
+	  (lambda (var)
+	    (let ((val (configf:lookup refdat section var)))
+	      (if (not val) ;; this one is new
+		  (begin
+		    (if (null? sdat)(set! sdat (list (conc "[" section "]"))))
+		    (set! sdat (append sdat (list (conc var " " val))))))))
+	  svars)
+	 (set! fdat (append fdat sdat))))
+     (delete-duplicates (append required-sections (hash-table-keys indat))))
+
+    ;; step 5: Write out new file
+    (with-output-to-file fname 
+      (lambda ()
+	(for-each 
+	 (lambda (line)
+	   (print line))
+	 (configf:expand-multi-lines fdat))))))
+
+(define (process:cmd-run->list cmd #!key (delta-env-alist-or-hash-table '()))
+  (common:with-env-vars
+   delta-env-alist-or-hash-table
+   (lambda ()
+     (let* ((fh (open-input-pipe cmd))
+            (res (port->list fh))
+            (status (close-input-pipe fh)))
+       (list res status)))))
+
+(define (port->list fh)
+  (if (eof-object? fh) #f
+      (let loop ((curr (read-line fh))
+                 (result '()))
+        (if (not (eof-object? curr))
+            (loop (read-line fh)
+                  (append result (list curr)))
+            result))))
+
+;;======================================================================
+;; refdb
+;;======================================================================
+
+;; reads a refdb into an assoc array of assoc arrays
+;;   returns (list dat msg)
+(define (configf:read-refdb refdb-path)
+  (let ((sheets-file  (conc refdb-path "/sheet-names.cfg")))
+    (if (not (file-exists? sheets-file))
+	(list #f (conc "ERROR: no refdb found at " refdb-path))
+	(if (not (file-readable? sheets-file))
+	    (list #f (conc "ERROR: refdb file not readable at " refdb-path))
+	    (let* ((sheets (with-input-from-file sheets-file
+			     (lambda ()
+			       (let loop ((inl (read-line))
+					  (res '()))
+				 (if (eof-object? inl)
+				     (reverse res)
+				     (loop (read-line)(cons inl res)))))))
+		   (data   '()))
+	      (for-each 
+	       (lambda (sheet-name)
+		 (let* ((dat-path  (conc refdb-path "/" sheet-name ".dat"))
+			(ref-dat   (configf:read-config dat-path #f #t))
+			(ref-assoc (map (lambda (key)
+					  (list key (hash-table-ref ref-dat key)))
+					(hash-table-keys ref-dat))))
+				   ;; (hash-table->alist ref-dat)))
+		   ;; (set! data (append data (list (list sheet-name ref-assoc))))))
+		   (set! data (cons (list sheet-name ref-assoc) data))))
+	       sheets)
+	      (list data "NO ERRORS"))))))
+
+;; map over all pairs in a three level hierarchial alist and apply a function to the keys/val
+;;
+(define (configf:map-all-hier-alist data proc #!key (initproc1 #f)(initproc2 #f)(initproc3 #f))
+  (for-each 
+   (lambda (sheetname)
+     (let* ((sheettmp  (assoc sheetname data))
+	    (sheetdat  (if sheettmp (cadr sheettmp) '())))
+       (if initproc1 (initproc1 sheetname))
+       (for-each 
+	(lambda (sectionname)
+	  (let* ((sectiontmp  (assoc sectionname sheetdat))
+		 (sectiondat  (if sectiontmp (cadr sectiontmp) '())))
+	    (if initproc2 (initproc2 sheetname sectionname))
+	    (for-each
+	     (lambda (varname)
+	       (let* ((valtmp (assoc varname sectiondat))
+		      (val    (if valtmp (cadr valtmp) "")))
+		 (proc sheetname sectionname varname val)))
+	     (map car sectiondat))))
+	(map car sheetdat))))
+   (map car data))
+  data)
+
+;;======================================================================
+;;  C O N F I G   T O / F R O M   A L I S T
+;;======================================================================
+
+(define (configf:config->alist cfgdat)
+  (hash-table->alist cfgdat))
+
+(define (configf:alist->config adat)
+  (let ((ht (make-hash-table)))
+    (for-each
+     (lambda (section)
+       (hash-table-set! ht (car section)(cdr section)))
+     adat)
+    ht))
+
+;; convert hierarchial list to ini format
+;;
+(define (configf:config->ini data)
+  (map 
+   (lambda (section)
+     (let ((section-name (car section))
+	   (section-dat  (cdr section)))
+       (print "\n[" section-name "]")
+       (map (lambda (dat-pair)
+	      (let* ((var (car dat-pair))
+		     (val (cadr dat-pair))
+		     (fname (if (> (length dat-pair) 2)(caddr dat-pair) #f)))
+		(if fname (print "# " var "=>" fname))
+		(print var " " val)))
+	    section-dat))) ;;       (print "section-dat: " section-dat))
+   (hash-table->alist data)))
+
+(define (runconfig:read fname target environ-patt)
+  (let ((ht (make-hash-table)))
+    (if target (hash-table-set! ht target '()))
+    (configf:read-config fname ht #t environ-patt: environ-patt sections: (if target (list "default" target) #f))))
+
+;;======================================================================
+;; Config file handling
+;;======================================================================
+
+;; convert to param?
+(define configf:std-imports "") ;;(import configfmod commonmod)")
+
+(define (configf:process-line l ht allow-system env-to-use #!key (linenum #f))
+  (let loop ((res l))
+    (if (string? res)
+	(let ((matchdat (string-search configf:var-expand-regex res)))
+	  (if matchdat
+	      (let* ((prestr  (list-ref matchdat 1))
+		     (cmdtype (list-ref matchdat 2)) ;; eval, system, shell, getenv
+		     (cmd     (list-ref matchdat 3))
+		     (poststr (list-ref matchdat 4))
+		     (result  #f)
+		     (start-time (current-seconds))
+		     (cmdsym  (string->symbol cmdtype))
+		     (fullcmd
+		      (conc  configf:std-imports
+			     (case cmdsym
+			       ((scheme scm) (conc "(lambda (ht)" cmd ")"))
+			       ((system)     (conc "(lambda (ht)(configf:system ht \"" cmd "\"))"))
+			       ((shell sh)   (conc "(lambda (ht)(string-translate (shell \""  cmd "\") \"\n\" \" \"))"))
+			       ((realpath rp)(conc "(lambda (ht)(common:nice-path \"" cmd "\"))"))
+			       ((getenv gv)  (conc "(lambda (ht)(get-environment-variable \"" cmd "\"))"))
+			       ((mtrah)      (conc "(lambda (ht)"
+						   "    (let ((extra \"" cmd "\"))"
+						   "       (conc (or *toppath* (get-environment-variable \"MT_RUN_AREA_HOME\"))"
+						   "             (if (string-null? extra) \"\" \"/\")"
+						   "             extra)))"))
+			       ((get g)   
+				(match (string-split cmd)
+				       ((sect var)(conc "(lambda (ht)(configf:lookup ht \"" sect "\" \"" var "\"))"))
+				       (else
+					(debug:print-error 0 *default-log-port* "#{get ...} used with only one parameter, \"" cmd "\", two needed.")
+					"(lambda (ht) #f)")))
+			       ((runconfigs-get rget) (conc "(lambda (ht)(runconfigs-get ht \"" cmd "\"))"))
+			       ;; ((rget)           (conc "(lambda (ht)(runconfigs-get ht \"" cmd "\"))"))
+			       (else "(lambda (ht)(print \"ERROR\") \"ERROR\")")))))
+		;; (print "fullcmd=" fullcmd)
+		(handle-exceptions
+		 exn
+		 (begin
+		   (debug:print 0 *default-log-port* "WARNING: failed to process config input \"" l "\", exn=" exn)
+		   (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
+		   ;; (print "exn=" (condition->list exn))
+		   (set! result (conc "#{( " cmdtype ") " cmd "}, full expansion: " fullcmd)))
+		 (if (or allow-system
+			 (not (member cmdtype '("system" "shell" "sh"))))
+		     (with-input-from-string fullcmd
+		       (lambda ()
+			 (set! result (if env-to-use
+					  ((eval (read) env-to-use) ht)
+					  ((eval (read)) ht)
+					  ))))
+		     (set! result (conc "#{(" cmdtype ") "  cmd "}"))))
+		(case cmdsym
+		  ((system shell scheme)
+		   (let ((delta (- (current-seconds) start-time)))
+		     (if (> delta 2)
+			 (debug:print-info 0 *default-log-port* "for line \"" l "\"\n command:  " cmd " took " delta " seconds to run with output:\n   " result)
+			 (debug:print-info 9 *default-log-port* "for line \"" l "\"\n command:  " cmd " took " delta " seconds to run with output:\n   " result)))))
+		(loop (conc prestr result poststr)))
+	      res))
+	res)))
+
+  
+;; pathenvvar will set the named var to the path of the config
+(define (configf:find-and-read-config fname #!key (environ-patt #f)(given-toppath #f)(pathenvvar #f)(env-to-use #f))
+  (let* ((curr-dir   (current-directory))
+         (configinfo (find-config fname toppath: given-toppath))
+	 (toppath    (car configinfo))
+	 (configfile (cadr configinfo))
+	 (set-fields (lambda (curr-section next-section ht path)
+		       (let ((field-names (if ht (common:get-fields ht) '()))
+			     (target      (or (getenv "MT_TARGET")(args:get-arg "-reqtarg")(args:get-arg "-target"))))
+			 (debug:print-info 9 *default-log-port* "set-fields with field-names=" field-names " target=" target " curr-section=" curr-section " next-section=" next-section " path=" path " ht=" ht)
+			 (if (not (null? field-names))(keys:target-set-args field-names target #f))))))
+    (if toppath (change-directory toppath)) 
+    (if (and toppath pathenvvar)(setenv pathenvvar toppath))
+    (let ((configdat  (if configfile 
+			  (configf:read-config configfile #f #t environ-patt: environ-patt post-section-procs: (list (cons "^fields$" set-fields)) #f env-to-use: env-to-use))))
+      (if toppath (change-directory curr-dir))
+      (list configdat toppath configfile fname))))
+
+;;======================================================================
+;; Non destructive writing of config file
+;;======================================================================
+
+(define (configf:read-alist fname)
+  (handle-exceptions
+      exn
+    (begin
+      (debug:print 0 *default-log-port* "read of alist " fname " failed. exn=" exn)
+      #f)
+    (configf:alist->config
+     (with-input-from-file fname read))))
+
+;;======================================================================
+;; DO THE LOCKING AROUND THE CALL
+;;======================================================================
+;;
+(define (configf:write-alist cdat fname)
+  ;; (if (not (common:faux-lock fname))
+  (debug:print 0 *default-log-port* "INFO: NEED LOCKING ADDED HERE " fname)
+  (let* ((dat  (configf:config->alist cdat))
+         (res
+          (begin
+            (with-output-to-file fname ;; first write out the file
+              (lambda ()
+                (pp dat)))
+            
+            (if (file-exists? fname)   ;; now verify it is readable
+                (if (configf:read-alist fname)
+                    #t ;; data is good.
+                    (begin
+                      (handle-exceptions
+			  exn
+			(begin
+			  (debug:print 0 *default-log-port* "deleting " fname " failed, exn=" exn)
+			  #f)
+			(debug:print 0 *default-log-port* "WARNING: content " dat " for cache " fname " is not readable. Deleting generated file.")
+			(delete-file fname))
+                      #f))
+                #f))))
+    ;; (common:faux-unlock fname)
+    res))
+  
+(define (common:get-fields cfgdat)
+  (let ((fields (hash-table-ref/default cfgdat "fields" '())))
+    (map car fields)))
+
+)

ADDED   csv-xml.scm
Index: csv-xml.scm
==================================================================
--- /dev/null
+++ csv-xml.scm
@@ -0,0 +1,24 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
+
+;; Always use two or four digit decimal
+;; 1.01, 1.02...1.10,1.11,1.1101 ... 1.99,2.00..
+
+(declare (unit csv-xml))
+
+(include "csv-xml/csv-xml.scm")
+

ADDED   csv-xml/csv-out.impl
Index: csv-xml/csv-out.impl
==================================================================
--- /dev/null
+++ csv-xml/csv-out.impl
@@ -0,0 +1,261 @@
+;;;; cvs-out.impl  -*- Hen -*-
+;;;; Kon Lovett, Jun '17
+
+;;;; *** included source file ***
+
+;;Issues
+;;
+;;- missing explicit types for exports; too much '*' type
+
+;;
+
+(define-constant CRLF-STR "\r\n")
+(define-constant LF-STR "\n")
+(define-constant CR-STR "\r") ;old MacOS
+
+(define *system-newline*
+  (cond-expand
+    (windows
+      CRLF-STR )
+    (unix
+      LF-STR )
+    (else
+      LF-STR ) ) )
+
+(define-constant +newline-char-default+ #t)               ;#t - <system> | #\n | ...
+(define-constant +separator-char-default+ #\,)
+(define-constant +quote-char-default+ #\")                ;#f | #\" | ...
+(define-constant +comment-char-default+ #\#)              ;#f | #\# | ...
+(define-constant +quote-doubling-escapes?-default+ #t)
+(define-constant +quote-controls?-default+ #t)
+(define-constant +always-quote?-default+ #t)
+
+#|
+(define-constant +sxml-top-symbol+ '|*TOP*|)
+(define-constant +sxml-row-element-default+ 'row)
+(define-constant +sxml-col-elements-limit-default+ 32) ; arbitrary (see csv.ss)
+|#
+
+;;
+
+;very loose : newline-char | separator-char | quote-char
+;see "csv-xml.scm"
+(define csv-writer-spec? alist?)
+(define-check+error-type csv-writer-spec)
+
+(define csv-writer? procedure?)
+(define-check+error-type csv-writer)
+
+;;
+
+(define *default-writer-spec* (writer-spec-with-defaults '()))
+
+(define (list->csv ls #!optional (writer-or-out (current-output-port)))
+  (let (
+      (writer
+        (cond
+          ((csv-writer? writer-or-out)
+            writer-or-out )
+          ((output-port? writer-or-out)
+            (make-csv-line-writer 'list->csv writer-or-out *default-writer-spec*) )
+          (else
+            (error 'list->csv "invalid csv-writer or output-port" writer-or-out) ) ) ) )
+    (for-each writer ls) ) )
+
+#|
+;;
+
+(define (list->sxml ls
+          #!optional
+          (row-element (sxml-row-element-default))
+          (column-elements (sxml-col-elements-default))
+          (writer-spec *default-writer-spec*))
+  (append!
+    `(,(sxml-top-symbol))
+    (map (cut list->sxml-element <> row-element column-elements writer-spec) ls)) )
+|#
+
+;;
+
+(define (writer-spec
+          #!key
+          (newline-char +newline-char-default+)
+          (separator-char +separator-char-default+)
+          (quote-char +quote-char-default+)
+          (comment-char +comment-char-default+)
+          (quote-doubling-escapes? +quote-doubling-escapes?-default+)
+          (quote-controls? +quote-controls?-default+)
+          (always-quote? +always-quote?-default+))
+  ;FIXME checking the input types
+  `((newline-char . ,newline-char)
+    (separator-char . ,separator-char)
+    (quote-char . ,quote-char)
+    (comment-char . ,comment-char)
+    (quote-doubling-escapes? . ,quote-doubling-escapes?)
+    (quote-controls? . ,quote-controls?)
+    (always-quote? . ,always-quote?)) )
+
+;;
+
+(define (make-csv-writer out-or-str #!optional (writer-spec '()))
+  (let ((make-spec-csv-writer (make-csv-writer-maker writer-spec)))
+    (make-spec-csv-writer out-or-str) ) )
+
+(define (make-csv-writer-maker #!optional (writer-spec '()))
+  (let ((writer-spec
+          (writer-spec-with-defaults
+            (check-csv-writer-spec 'make-csv-writer-maker writer-spec)) ) )
+    (lambda (out-or-str)
+      (let (
+          (out
+            (cond
+              ((string? out-or-str)
+                (open-output-file out-or-str) )
+              ((output-port? out-or-str)
+                out-or-str )
+              (else
+                (error
+                  'csv-writer-maker
+                  "invalid output-port or string" out-or-str) ) ) ) )
+        (make-csv-line-writer 'csv-writer-maker out writer-spec) ) ) ) )
+
+;;
+
+(define (make-csv-line-writer loc out writer-spec)
+  (let (
+    (writer-spec
+      (check-csv-writer-spec loc writer-spec) )
+    (newline-obj
+      (select-newline-object loc (alist-ref 'newline-char writer-spec eq?)) )
+    (separator-char
+      (alist-ref 'separator-char writer-spec eq?) )
+    (quote-char
+      (alist-ref 'quote-char writer-spec eq?) )
+    (comment-char
+      (alist-ref 'comment-char writer-spec eq?) )
+    (quote-doubling-escapes?
+      (alist-ref 'quote-doubling-escapes? writer-spec eq?) )
+    (quote-controls?
+      (alist-ref 'quote-controls? writer-spec eq?) )
+    (always-quote?
+      (alist-ref 'always-quote? writer-spec eq?) ) )
+    ;
+    (let* (
+      (quote-char-str (unicode-char->string quote-char) )
+      (quote-char-str-2 (string-append quote-char-str quote-char-str)) )
+      ;
+      (define (csv-line-object->string obj)
+        ;
+        (define (quote-doubling? str)
+          (and quote-doubling-escapes? (string-index str quote-char)) )
+        ;
+        (define (quoting? str)
+          (or
+            always-quote?
+            (quote-doubling? str)
+            (and separator-char (string-index str separator-char))
+            (and quote-controls? (string-index str char-set:iso-control))) )
+        ;
+        (type-case obj
+          ((char)
+            (csv-line-object->string (unicode-char->string obj)) )
+          ((symbol)
+            (csv-line-object->string (symbol->string obj)) )
+          ((string)
+            (if (and quote-char (quoting? obj))
+              (let (
+                (str
+                  (if (quote-doubling? obj)
+                    (string-translate* obj `((,quote-char-str . ,quote-char-str-2)))
+                    obj ) ) )
+                ;
+                (conc quote-char str quote-char) )
+              obj ) )
+          (number
+            (csv-line-object->string (number->string obj)) )
+          (else
+            (csv-line-object->string (->string obj)) ) ) )
+      ;
+      (lambda (obj)
+        (let (
+          ;build row to output as a string with a line-ending sequence
+          (lin
+            ;comment desired?
+            (if (list? obj)
+              ;row data
+              (let ((qstrs (map csv-line-object->string (check-list loc obj))))
+                (apply
+                  conc
+                  (append!
+                    (intersperse qstrs separator-char)
+                    `(,newline-obj))) )
+              ;are we supposed to do comments?
+              (if comment-char
+                (conc comment-char obj newline-obj)
+                obj
+                #;
+                (begin
+                  (warning loc "comments not active" obj writer-spec)
+                  "" ) ) ) ) )
+            ;
+            (display lin out) ) ) ) ) )
+
+;;
+
+(define (select-newline-object loc spec)
+  (case spec
+    ((cr)
+      #\return )
+    ((lf)
+      #\newline )
+    ((crlf)
+      CRLF-STR )
+    (else
+      *system-newline* ) ) )
+
+;;
+
+(define (writer-spec-with-defaults writer-spec)
+  `((newline-char . ,(alist-ref 'newline-char writer-spec eq? +newline-char-default+))
+    (separator-char . ,(alist-ref 'separator-char writer-spec eq? +separator-char-default+))
+    (quote-char . ,(alist-ref 'quote-char writer-spec eq? +quote-char-default+))
+    (comment-char . ,(alist-ref 'comment-char writer-spec eq? +comment-char-default+))
+    (quote-doubling-escapes? . ,(alist-ref 'quote-doubling-escapes? writer-spec eq? +quote-doubling-escapes?-default+))
+    (quote-controls? . ,(alist-ref 'quote-controls? writer-spec eq? +quote-controls?-default+))
+    (always-quote? . ,(alist-ref 'always-quote? writer-spec eq? +always-quote?-default+))) )
+
+#|
+;;
+
+(define (list->sxml-element ls row-element col-elements writer-spec)
+  (if (list? ls)
+    ;row data
+    `(,row-element ,@(map list col-elements (map ->string ls)))
+    ;are we supposed to do comments?
+    (if (alist-ref 'comment-char writer-spec eq?)
+      `(*COMMENT* ,(->string ls))
+      ls ) ) )
+
+(define (make-sxml-col-symbol n)
+  (string->symbol (string-append "col-" (number->string n))) )
+
+(define +sxml-col-elements-default+
+  (map make-sxml-col-symbol (sxml-col-iota)) )
+
+(define (sxml-top-symbol)
+  +sxml-top-symbol+ )
+
+(define (sxml-row-element-default)
+  +sxml-row-element-default+ )
+
+(define (sxml-col-elements-default)
+  +sxml-col-elements-default+ )
+
+(define (sxml-col-iota)
+  (iota +sxml-col-elements-limit-default+) )
+#;
+(define (sxml-col-iota)
+  (do ((i 0 add1)
+       (ls '() (cons (make-sxml-col-symbol i) ls)) )
+      ((= i +sxml-col-elements-limit-default+) ls) ) )
+|#

ADDED   csv-xml/csv-xml.meta
Index: csv-xml/csv-xml.meta
==================================================================
--- /dev/null
+++ csv-xml/csv-xml.meta
@@ -0,0 +1,19 @@
+;;;; csv-xml.meta  -*- Hen -*-
+
+((egg "csv-xml.egg")
+ (date "2011-07-02")
+ (category parsing)
+ (author "Neil van Dyke")
+ (license "LGPL 3")
+ (doc-from-wiki)
+ (synopsis "Parsing comma-separated values")
+ (depends
+  (setup-helper "1.5.2")
+  (check-errors "2.0.2")
+  (moremacros "1.4.2")
+  (string-utils "1.5.5"))
+ (test-depends testeez test)
+ (files
+  "csv-xml.meta" "csv-xml.setup"
+  "csv-xml.scm" "csv-out.impl" "csv.ss"
+  "test/run.scm" "test/test-csv.ss") )

ADDED   csv-xml/csv-xml.scm
Index: csv-xml/csv-xml.scm
==================================================================
--- /dev/null
+++ csv-xml/csv-xml.scm
@@ -0,0 +1,118 @@
+;;;; csv-xml.scm  -*- Hen -*-
+;;;; Kon Lovett, Jun '17
+;;;; Kon Lovett, ??? '??
+
+(module csv-xml
+
+(;export
+  ;
+  reader-spec
+  ;
+  make-csv-reader
+  make-csv-reader-maker
+  ;
+  csv->list
+  csv->sxml
+  csv-for-each
+  csv-map
+  ;
+  csv-reader? check-csv-reader error-csv-reader
+  csv-reader-spec? check-csv-reader-spec error-csv-reader-spec
+  ;
+  writer-spec
+  ;
+  make-csv-writer-maker
+  make-csv-writer
+  ;
+  list->csv
+  #;list->sxml
+  ;
+  csv-writer? check-csv-writer error-csv-writer
+  csv-writer-spec? check-csv-writer-spec error-csv-writer-spec)
+
+(import scheme
+	chicken.base
+	chicken.string
+	
+	moremacros
+	srfi-1
+	srfi-13
+	srfi-14
+	type-checks
+	unicode-utils
+	)
+
+#;(import (except chicken provide))
+;; (import chicken)
+
+;;;
+
+;Need to process `#lang' as well. So just "commented out" the "offending"
+;sections in the source.
+#;(define-syntax provide (syntax-rules () ((_ ?x0 ...) (begin))))
+(define null '())
+
+(include "csv-xml/csv.ss")
+
+;;;
+
+;; (import (only data-structures conc intersperse ->string alist-ref string-translate*))
+;; (require-library data-structures)
+;; 
+;; #;(import (only list-utils alist?))
+;; (import (only (srfi 1) every iota append! map))
+;; (require-library (srfi 1))
+;; 
+;; (import (only (srfi 13) string-index))
+;; (require-library (srfi 13))
+;; 
+;; (import (only (srfi 14) char-set:iso-control))
+;; (require-library (srfi 14))
+;; 
+;; (import (only type-checks define-check+error-type check-string check-list))
+;; (require-library type-checks)
+;; 
+;; (import (only unicode-utils unicode-char->string))
+;; (require-library unicode-utils)
+;; 
+;; (require-extension moremacros)
+
+;(from list-utils egg)
+(define (alist? obj)
+  (if (pair? obj)
+    (every pair? obj)
+    (null? obj) ) )
+
+;very loose ...
+(define csv-reader-spec? alist?)
+(define-check+error-type csv-reader-spec)
+
+(define csv-reader? procedure?)
+(define-check+error-type csv-reader)
+
+(define (reader-spec
+          #!key
+          (newline-type 'lax)
+          (separator-chars '(#\,))
+          (quote-char #\")
+          (quote-doubling-escapes? #t)
+          (comment-chars '())
+          (whitespace-chars '(#\space))
+          (strip-leading-whitespace? #f)
+          (strip-trailing-whitespace? #f)
+          (newlines-in-quotes? #t))
+  `((newline-type . ,newline-type)
+    (separator-chars . ,separator-chars)
+    (quote-char . ,quote-char)
+    (quote-doubling-escapes? . ,quote-doubling-escapes?)
+    (comment-chars . ,comment-chars)
+    (whitespace-chars . ,whitespace-chars)
+    (strip-leading-whitespace? . ,strip-leading-whitespace?)
+    (strip-trailing-whitespace? . ,strip-trailing-whitespace?)
+    (newlines-in-quotes? . ,newlines-in-quotes?)) )
+
+;;;
+
+(include "csv-xml/csv-out.impl")
+
+) ;csv-xml

ADDED   csv-xml/csv-xml.setup
Index: csv-xml/csv-xml.setup
==================================================================
--- /dev/null
+++ csv-xml/csv-xml.setup
@@ -0,0 +1,12 @@
+;;;; csv-xml.setup  -*- Hen -*-
+
+(use setup-helper-mod)
+
+(verify-extension-name "csv-xml")
+
+(setup-shared+static-extension-module (extension-name) (extension-version "0.12.1")
+  #:types? #t
+  #:inline? #t
+  #:compile-options '(
+    -optimize-level 3 -debug-level 2
+    -no-procedure-checks-for-toplevel-bindings -no-procedure-checks-for-usual-bindings))

ADDED   csv-xml/csv.ss
Index: csv-xml/csv.ss
==================================================================
--- /dev/null
+++ csv-xml/csv.ss
@@ -0,0 +1,969 @@
+;;; @Package     csv
+;;; @Subtitle    Comma-Separated Value (CSV) Utilities in Scheme
+;;; @HomePage    http://www.neilvandyke.org/csv-scheme/
+;;; @Author      Neil Van Dyke
+;;; @Version     0.10
+;;; @Date        2010-04-13
+;;; @PLaneT      neil/csv:1:6
+
+;; $Id: csv.ss,v 1.199 2010/04/13 17:56:20 neilpair Exp $
+
+;;; @legal
+;;; Copyright @copyright{} 2004--2009 Neil Van Dyke.  This program is Free
+;;; Software; you can redistribute it and/or modify it under the terms of the
+;;; GNU Lesser General Public License as published by the Free Software
+;;; Foundation; either version 3 of the License (LGPL 3), or (at your option)
+;;; any later version.  This program is distributed in the hope that it will be
+;;; useful, but without any warranty; without even the implied warranty of
+;;; merchantability or fitness for a particular purpose.  See
+;;; @indicateurl{http://www.gnu.org/licenses/} for details.  For other licenses
+;;; and consulting, please contact the author.
+;;; @end legal
+
+;#lang scheme/base
+
+;;; @section Introduction
+
+;;; The @b{csv} Scheme library provides utilities for reading various kinds of
+;;; what are commonly known as ``comma-separated value'' (CSV) files.  Since
+;;; there is no standard CSV format, this library permits CSV readers to be
+;;; constructed from a specification of the peculiarities of a given variant.
+;;; A default reader handles the majority of formats.
+;;;
+;;; One of the main uses of this library is to import data from old crusty
+;;; legacy applications into Scheme for data conversion and other processing.
+;;; To that end, this library includes various conveniences for iterating over
+;;; parsed CSV rows, and for converting CSV input to the
+;;; @uref{http://pobox.com/~oleg/ftp/Scheme/SXML.html, SXML 3.0} Scheme XML
+;;; format.
+;;;
+;;; This library requires R5RS, SRFI-6, SRFI-23, and an @code{integer->char}
+;;; procedure that accepts ASCII values.
+;;;
+;;; Other implementations of some kind of CSV reading for Scheme include
+;;; Gauche's @code{text.csv} module, and Scsh's @code{record-reader} and
+;;; related procedures.  This library intends to be portable and more
+;;; comprehensive.
+
+;; TODO: Briefly introduce terms "row", "column", and "field".
+
+(define-syntax %csv:error
+  (syntax-rules () ((_ p m o)
+                    (error (string-append p " : " m) o)
+                    ;; Bigloo: (error p m o)
+                    )))
+
+(define-syntax %csv:type-error
+  (syntax-rules ()
+    ((_ proc-str expected-str got-value)
+     (%csv:error proc-str
+                 (string-append "expected " expected-str ", received:")
+                 got-value))))
+
+(define %csv:a2c integer->char)
+
+(define %csv:cr (%csv:a2c 13))
+(define %csv:lf (%csv:a2c 10))
+
+(define-syntax %csv:gosc
+  (syntax-rules ()
+    ((_ os-stx)
+     (let* ((os  os-stx)
+            (str (get-output-string os)))
+       (close-output-port os)
+       str))))
+
+(define (%csv:in-arg proc-name in)
+  (cond ((input-port? in) in)
+        ((string?     in) (open-input-string in))
+        (else (%csv:type-error proc-name "input port or string" in))))
+
+(define (%csv:reader-or-in-arg proc-name reader-or-in)
+  (cond ((procedure?  reader-or-in) reader-or-in)
+        ((input-port? reader-or-in) (make-csv-reader reader-or-in))
+        ((string?     reader-or-in) (make-csv-reader (open-input-string
+                                                      reader-or-in)))
+        (else (%csv:type-error proc-name
+                               "csv reader or input port or string"
+                               reader-or-in))))
+
+;;; @section Reader Specs
+
+;;; CSV readers are constructed using @dfn{reader specs}, which are sets of
+;;; attribute-value pairs, represented in Scheme as association lists keyed on
+;;; symbols.  Each attribute has a default value if not specified otherwise.
+;;; The attributes are:
+
+;;; @table @code
+;;;
+;;; @item newline-type
+;;; Symbol representing the newline, or record-terminator, convention.  The
+;;; convention can be a fixed character sequence (@code{lf}, @code{crlf}, or
+;;; @code{cr}, corresponding to combinations of line-feed and carriage-return),
+;;; any string of one or more line-feed and carriage-return characters
+;;; (@code{lax}), or adaptive (@code{adapt}).  @code{adapt} attempts to detect
+;;; the newline convention at the start of the input and assume that convention
+;;; for the remainder of the input.  Default: @code{lax}
+;;;
+;;; @item separator-chars
+;;; Non-null list of characters that serve as field separators.  Normally, this
+;;; will be a list of one character.  Default: @code{(#\,)} (list of the comma
+;;; character)
+;;;
+;;; @item quote-char
+;;; Character that should be treated as the quoted field delimiter character,
+;;; or @code{#f} if fields cannot be quoted.  Note that there can be only one
+;;; quote character.  Default: @code{#\"} (double-quote)
+;;;
+;;; @item quote-doubling-escapes?
+;;; Boolean for whether or not a sequence of two @code{quote-char} quote
+;;; characters within a quoted field constitute an escape sequence for
+;;; including a single @code{quote-char} within the string.  Default: @code{#t}
+;;;
+;;; @item comment-chars
+;;; List of characters, possibly null, which comment out the entire line of
+;;; input when they appear as the first character in a line.  Default:
+;;; @code{()} (null list)
+;;;
+;;; @item whitespace-chars
+;;; List of characters, possibly null, that are considered @dfn{whitespace}
+;;; constituents for purposes of the @code{strip-leading-whitespace?} and
+;;; @code{strip-trailing-whitespace?} attributes described below.
+;;; Default: @code{(#\space)} (list of the space character)
+;;;
+;;; @item strip-leading-whitespace?
+;;; Boolean for whether or not leading whitespace in fields should be
+;;; stripped.  Note that whitespace within a quoted field is never stripped.
+;;; Default: @code{#f}
+;;;
+;;; @item strip-trailing-whitespace?
+;;; Boolean for whether or not trailing whitespace in fields should be
+;;; stripped.  Note that whitespace within a quoted field is never stripped.
+;;; Default: @code{#f}
+;;;
+;;; @item newlines-in-quotes?
+;;; Boolean for whether or not newline sequences are permitted within quoted
+;;; fields.  If true, then the newline characters are included as part of the
+;;; field value; if false, then the newline sequence is treated as a premature
+;;; record termination.  Default: @code{#t}
+;;;
+;;; @end table
+
+;; TODO: Do not expose this procedure for now.  We expect it to go away and be
+;; replaced with two other procedures.
+;;
+;; @defproc %csv:csv-spec-derive orig-spec changes
+;;
+;; Yields a new CSV spec that is derived from @var{orig-spec} by applying spec
+;; @var{changes} as attribute substitions and additions to the original.  For
+;; example, given an original CSV reader spec:
+;;
+;; @lisp
+;; (define my-first-csv-spec
+;;   '((newline-type            . lax)
+;;     (separator-chars         . (#\,))
+;;     (quote-char              . #\")
+;;     (quote-doubling-escapes? . #t)
+;;     (whitespace-chars        . (#\space))))
+;; @end lisp
+;;
+;; a derived spec with a different @code{separator-chars} attribute and an
+;; added @code{comment-chars} attribute can be created like:
+;;
+;; @lisp
+;; (%csv:csv-spec-derive my-first-csv-spec
+;;                  '((separator-chars . (#\%))
+;;                    (comment-chars   . (#\#))))
+;; @result{}
+;; ((separator-chars         . (#\%))
+;;  (comment-chars           . (#\#))
+;;  (newline-type            . lax)
+;;  (quote-char              . #\")
+;;  (quote-doubling-escapes? . #t)
+;;  (whitespace-chars        . (#\space)))
+;; @end lisp
+;;
+;; In that the yielded spec might share some structure with @var{orig-spec}
+;; and/or @var{changes}.  Most applications will not use this procedure
+;; directly.
+
+(define (%csv:csv-spec-derive orig-spec changes)
+  ;; TODO: Make this not share structure.  Error-check and normalize at the
+  ;; same time we clone.
+  (let ((new-spec '()))
+    (let ((add-to-new-spec
+           (lambda (alist)
+             (for-each (lambda (cell)
+                         (or (assq (car cell) new-spec)
+                             (set! new-spec (cons cell new-spec))))
+                       alist))))
+      (add-to-new-spec changes)
+      (add-to-new-spec orig-spec)
+      (reverse new-spec))))
+
+;;; @section Making Reader Makers
+
+;;; CSV readers are procedures that are constructed dynamically to close over a
+;;; particular CSV input and yield a parsed row value each time the procedure
+;;; is applied.  For efficiency reasons, the reader procedures are themselves
+;;; constructed by another procedure, @code{make-csv-reader-maker}, for
+;;; particular CSV reader specs.
+
+(define (%csv:csv-error code extra)
+  ;; TODO: Maybe make the CSV error handler user-specifiable, or allow user to
+  ;; specify some errors that should be disregarded.
+  ;;
+  ;; TODO: Add position information.  Keep track of character position while
+  ;; reading.
+  (%csv:error
+   "[csv-reader]"
+   (string-append "Erroneous CSV format: "
+                  (case code
+                    ((junk-after-quote-close)
+                     "Junk after close of quoted field:")
+                    (else (string-append "INTERNAL ERROR: Unknown code: "
+                                         (symbol->string code)))))
+   extra))
+
+(define (%csv:newline-check-step0 newline-type c port)
+  ;; (display "*DEBUG* (equal? newline-type 'lax) = ")
+  ;; (write (equal? newline-type 'lax))
+  ;; (newline)
+  ;; (display "*DEBUG* (eqv? newline-type 'lax) = ")
+  ;; (write (eqv? newline-type 'lax))
+  ;; (newline)
+  (case newline-type
+    ((cr)   (eqv? c %csv:cr))
+    ((lf)   (eqv? c %csv:lf))
+    ((crlf) (if (eqv? c %csv:cr)
+                (let ((c2 (peek-char port)))
+                  (cond ((eof-object? c2)
+                         ;; Note: This is a CR-EOF in an input that uses CR-LF
+                         ;; for terminating records.  We are discarding the CR,
+                         ;; so it will not be added to the field string.  We
+                         ;; might want to signal an error.
+                         #t)
+                        ((eqv? c2 %csv:lf)
+                         (read-char port)
+                         #t)
+                        (else #f)))
+                #f))
+    ((lax detect) (cond ((eqv? c %csv:cr)
+                         (let ((c2 (peek-char port)))
+                           (cond ((eof-object? c2) #t)
+                                 ((eqv? c2 %csv:lf)
+                                  (read-char port)
+                                  'crlf)
+                                 (else 'cr))))
+                        ((eqv? c %csv:lf) 'lf)
+                        (else #f)))
+    (else (%csv:error
+           "%csv:make-portreader/positional"
+           "unrecognized newline-type"
+           newline-type))))
+
+(define %csv:make-portreader/positional
+  (letrec-syntax
+      ((newline-check
+        (syntax-rules ()
+          ((_ newline-type c port detected-newline-type)
+           ;; Note: "port" and "detected-newline-type" must be identifiers.
+           ;; "newline-type" and "c" must be identifiers or self-evals.
+           (if (eqv? newline-type 'detect)
+               (begin (set! detected-newline-type
+                            (%csv:newline-check-step0 newline-type c port))
+                      detected-newline-type)
+               (%csv:newline-check-step0 newline-type c port)))))
+       (gosc-cons
+        ;; Note: This is to ensure the output string is gotten and closed
+        ;; before consing it with the result of a recursive call.
+        (syntax-rules ()
+          ((_ os b) (let ((s (%csv:gosc os))) (cons s b))))))
+    (lambda (newline-type
+             separator-chars
+             quote-char
+             quote-doubling-escapes?
+             comment-chars
+             whitespace-chars
+             strip-leading-whitespace?
+             strip-trailing-whitespace?
+             newlines-in-quotes?)
+      (lambda (port)
+        (let ((dnlt #f)
+              (escape-char #\\))
+          (let read-fields-or-eof ((c (read-char port)))
+            (cond
+             ((eof-object? c) '())
+             ((and strip-leading-whitespace? (memv c whitespace-chars))
+              ;; It's leading whitespace char when we're ignoring leading
+              ;; whitespace in fields, and there might just be whitespace and
+              ;; then an EOF, which should probably be considered just an EOF
+              ;; rather than a row with one empty field, so just skip this
+              ;; whitespace char.
+              (read-fields-or-eof (read-char port)))
+             ((and (not (null? comment-chars)) (memv c comment-chars))
+              ;; It's a comment char in the first column (or in the first
+              ;; non-whitespace column, if "strip-leading-whitespace?" is
+              ;; true), so skip to end of line.
+              (let ((fake-dnlt #f))
+                (let loop ((c (read-char port)))
+                  (cond ((eof-object? c) '())
+                        ((newline-check newline-type c port fake-dnlt)
+                         (read-fields-or-eof (read-char port)))
+                        (else (loop (read-char port)))))))
+             (else
+              ;; It's not going to be just an EOF, so try to read a row.
+              (let ((row
+                     (let read-fields ((c c))
+                       (cond
+                        ;; If an EOF or newline in an unquoted field, consider
+                        ;; the field and row finished.  (We don't consider EOF
+                        ;; before newline to be an error, although perhaps that
+                        ;; would be a useful check for a freak premature
+                        ;; end-of-input when dealing with "well-formed" CSV).
+                        ((or (eof-object? c)
+                             (newline-check newline-type c port dnlt))
+                         (list ""))
+                        ;; If a field separator, finish this field and cons
+                        ;; with value of recursive call to get the next field.
+                        ((memv c separator-chars)
+                         (cons "" (read-fields (read-char port))))
+                        ;; If we're ignoring leading whitespace, and it's a
+                        ;; whitespace-chars character, then recurse to keep
+                        ;; finding the field start.
+                        ((and strip-leading-whitespace?
+                              (memv c whitespace-chars))
+                         (read-fields (read-char port)))
+                        ;; If a quote, read a quoted field.
+                        ((and quote-char (eqv? c quote-char))
+                         (let ((os (open-output-string)))
+                           (let loop ((c (read-char port)))
+                             (cond
+                              ((or (eof-object? c)
+                                   (and (not newlines-in-quotes?)
+                                        (newline-check newline-type
+                                                       c port dnlt)))
+                               (list (%csv:gosc os)))
+                              ((and escape-char (eqv? c escape-char))
+                               ;FIXME can become unsynchronized
+                               (write-char (read-char port) os)
+                               (loop (read-char port)))
+                              ((and quote-char (eqv? c quote-char))
+                               (if quote-doubling-escapes?
+                                   (let ((c2 (read-char port)))
+                                     (if (eqv? c2 quote-char)
+                                         (begin (write-char c2 os)
+                                                (loop (read-char port)))
+                                         (gosc-cons
+                                          os
+                                          (let skip-after ((c c2))
+                                            (cond
+                                             ((or (eof-object? c)
+                                                  (newline-check
+                                                   newline-type c port dnlt))
+                                              '())
+                                             ((memv c separator-chars)
+                                              (read-fields (read-char port)))
+                                             ((memv c whitespace-chars)
+                                              ;; Note: We tolerate
+                                              ;; whitespace after field
+                                              ;; close quote even if
+                                              ;; skip-trailing-whitespace?
+                                              ;; is false.
+                                              (skip-after (read-char port)))
+                                             (else (%csv:csv-error
+                                                    'junk-after-quote-close
+                                                    c)))))))
+                                   (gosc-cons os
+                                              (read-fields (read-char port)))))
+                              (else (write-char c os)
+                                    (loop (read-char port)))))))
+                        ;; It's the start of an unquoted field.
+                        (else
+                         (let ((os (open-output-string)))
+                           (write-char c os)
+                           (let loop ((c (read-char port)))
+                             (cond
+                              ((or (eof-object? c)
+                                   (newline-check newline-type c port dnlt))
+                               (list (get-output-string os)))
+                              ((memv c separator-chars)
+                               (gosc-cons os (read-fields (read-char port))))
+                              ((and strip-trailing-whitespace?
+                                    (memv c whitespace-chars))
+                               ;; TODO: Maybe optimize to avoid creating a new
+                               ;; output string every time we see whitespace.
+                               ;; We could use a string collector with unwrite.
+                               ;; And/or do lookahead to see whether whitespace
+                               ;; is only one character.  Do this after we have
+                               ;; a better regression test suite.
+                               (let ((ws-os (open-output-string)))
+                                 (write-char c ws-os)
+                                 (let ws-loop ((c (read-char port)))
+                                   (cond
+                                    ((or (eof-object? c)
+                                         (newline-check
+                                          newline-type c port dnlt))
+                                     (close-output-port ws-os)
+                                     (list (%csv:gosc os)))
+                                    ((memv c separator-chars)
+                                     (close-output-port ws-os)
+                                     (gosc-cons os (read-fields (read-char
+                                                                 port))))
+                                    ((memv c whitespace-chars)
+                                     (write-char c ws-os)
+                                     (ws-loop (read-char port)))
+                                    (else
+                                     (display (%csv:gosc ws-os) os)
+                                     (write-char c os)
+                                     (loop (read-char port)))))))
+                              (else (write-char c os)
+                                    (loop (read-char port)))))))))))
+                (if (null? row)
+                    row
+                    (if (eq? newline-type 'detect)
+                        (cons dnlt row)
+                        row)))))))))))
+
+(define %csv:make-portreader
+  ;; TODO: Make a macro for the three times we list the spec attributes.
+  (letrec ((pb (lambda (x) (if x #t #f)))
+           (pc (lambda (x)
+                 (cond ((char?   x) x)
+                       ((string? x) (case (string-length x)
+                                      ((1)  (string-ref  x 0))
+                                      (else (%csv:type-error
+                                             "make-csv-reader-maker"
+                                             "character"
+                                             x))))
+                       (else (%csv:type-error "make-csv-reader-maker"
+                                              "character"
+                                              x)))))
+           (pc-f (lambda (x)
+                   (cond ((not     x) x)
+                         ((char?   x) x)
+                         ((string? x) (case (string-length x)
+                                        ((0)  #f)
+                                        ((1)  (string-ref  x 0))
+                                        (else (%csv:type-error
+                                               "make-csv-reader-maker"
+                                               "character or #f"
+                                               x))))
+                         (else (%csv:type-error "make-csv-reader-maker"
+                                                "character or #f"
+                                                x)))))
+           (pe (lambda (x acceptable)
+                 (if (memq x acceptable)
+                     x
+                     (%csv:type-error
+                      "make-csv-reader-maker"
+                      (let ((os (open-output-string)))
+                        (display "symbol from the set " os)
+                        (write acceptable os)
+                        (%csv:gosc os))
+                      x))))
+           (plc-n (lambda (x)
+                    (or (list? x)
+                        (%csv:type-error "make-csv-reader-maker"
+                                         "list of characters"
+                                         x))
+                    (map pc x)))
+           (plc (lambda (x)
+                  (let ((result (plc-n x)))
+                    (if (null? result)
+                        (%csv:type-error "make-csv-reader-maker"
+                                         "non-null list of characters"
+                                         x)
+                        result)))))
+    (lambda (reader-spec)
+      (let ((newline-type               'lax)
+            (separator-chars            '(#\,))
+            (quote-char                 #\")
+            (quote-doubling-escapes?    #t)
+            (comment-chars              '())
+            (whitespace-chars           '(#\space))
+            (strip-leading-whitespace?  #f)
+            (strip-trailing-whitespace? #f)
+            (newlines-in-quotes?        #t))
+        ;; TODO: It's erroneous to have two entries for the same attribute in a
+        ;; spec.  However, it would be nice if we error-detected duplicate
+        ;; entries, or at least had assq semantics (first, rather than last,
+        ;; wins).  Use csv-spec-derive's descendants for that.
+        (for-each
+         (lambda (item)
+           (let ((v (cdr item)))
+             (case (car item)
+               ((newline-type)
+                (set! newline-type (pe v '(cr crlf detect lax lf))))
+               ((separator-chars)
+                (set! separator-chars (plc v)))
+               ((quote-char)
+                (set! quote-char (pc-f v)))
+               ((quote-doubling-escapes?)
+                (set! quote-doubling-escapes? (pb v)))
+               ((comment-chars)
+                (set! comment-chars (plc-n v)))
+               ((whitespace-chars)
+                (set! whitespace-chars (plc-n v)))
+               ((strip-leading-whitespace?)
+                (set! strip-leading-whitespace?  (pb v)))
+               ((strip-trailing-whitespace?)
+                (set! strip-trailing-whitespace? (pb v)))
+               ((newlines-in-quotes?)
+                (set! newlines-in-quotes? (pb v))))))
+         reader-spec)
+        (%csv:make-portreader/positional
+         newline-type
+         separator-chars
+         quote-char
+         quote-doubling-escapes?
+         comment-chars
+         whitespace-chars
+         strip-leading-whitespace?
+         strip-trailing-whitespace?
+         newlines-in-quotes?)))))
+
+;;; @defproc make-csv-reader-maker reader-spec
+;;;
+;;; Constructs a CSV reader constructor procedure from the @var{reader-spec},
+;;; with unspecified attributes having their default values.
+;;;
+;;; For example, given the input file @code{fruits.csv} with the content:
+;;;
+;;; @example
+;;; apples  |  2 |  0.42
+;;; bananas | 20 | 13.69
+;;; @end example
+;;;
+;;; a reader for the file's apparent format can be constructed like:
+;;;
+;;; @lisp
+;;; (define make-food-csv-reader
+;;;   (make-csv-reader-maker
+;;;    '((separator-chars            . (#\|))
+;;;      (strip-leading-whitespace?  . #t)
+;;;      (strip-trailing-whitespace? . #t))))
+;;; @end lisp
+;;;
+;;; The resulting @code{make-food-csv-reader} procedure accepts one argument,
+;;; which is either an input port from which to read, or a string from which to
+;;; read.  Our example input file then can be be read by opening an input port
+;;; on a file and using our new procedure to construct a reader on it:
+;;;
+;;; @lisp
+;;; (define next-row
+;;;   (make-food-csv-reader (open-input-file "fruits.csv")))
+;;; @end lisp
+;;;
+;;; This reader, @code{next-row}, can then be called repeatedly to yield a
+;;; parsed representation of each subsequent row.  The parsed format is a list
+;;; of strings, one string for each column.  The null list is yielded to
+;;; indicate that all rows have already been yielded.
+;;;
+;;; @lisp
+;;; (next-row) @result{} ("apples" "2" "0.42")
+;;; (next-row) @result{} ("bananas" "20" "13.69")
+;;; (next-row) @result{} ()
+;;; @end lisp
+
+(define (make-csv-reader-maker reader-spec)
+  (let ((make-portread
+         (if (let ((p (assq 'newline-type reader-spec))) (and p (cdr p)))
+             ;; Newline-adapting portreader-maker.
+             (letrec
+                 ((detect-portread
+                   (%csv:make-portreader
+                    (%csv:csv-spec-derive reader-spec
+                                          '((newline-type . detect)))))
+                  ;; TODO: The set of cr/crlf/lf newline-type portreaders are
+                  ;; constructed optimistically right now for two reasons:
+                  ;; 1. we don't yet sanitize reader-specs of shared structure
+                  ;; that can be mutated behind our backs; 2. eventually, we
+                  ;; want to add a "lots-o-shots?" argument that, when true,
+                  ;; would do this anyway.  Consider.
+                  (cr-portread
+                   (%csv:make-portreader
+                    (%csv:csv-spec-derive reader-spec
+                                          '((newline-type . cr)))))
+                  (crlf-portread
+                   (%csv:make-portreader
+                    (%csv:csv-spec-derive reader-spec
+                                          '((newline-type . crlf)))))
+                  (lf-portread
+                   (%csv:make-portreader
+                    (%csv:csv-spec-derive reader-spec
+                                          '((newline-type . lf))))))
+               (lambda ()
+                 (let ((actual-portread #f))
+                   (let ((adapt-portread
+                          (lambda (port)
+                            (let ((dnlt-row (detect-portread port)))
+                              (if (null? dnlt-row)
+                                  dnlt-row
+                                  (begin (set! actual-portread
+                                               (case (car dnlt-row)
+                                                 ((cr)   cr-portread)
+                                                 ((crlf) crlf-portread)
+                                                 ((lf)   lf-portread)
+                                                 (else   actual-portread)))
+                                         (cdr dnlt-row)))))))
+                     (set! actual-portread adapt-portread)
+                     (lambda (port) (actual-portread port))))))
+             ;; Stateless portreader-maker.
+             (let ((reusable-portread
+                    (%csv:make-portreader reader-spec)))
+               (lambda () reusable-portread)))))
+    (lambda (in)
+      (let ((port     (%csv:in-arg "[csv-reader]" in))
+            (portread (make-portread)))
+        (lambda () (portread port))))))
+
+;;; @section Making Readers
+
+;;; In addition to being constructed from the result of
+;;; @code{make-csv-reader-maker}, CSV readers can also be constructed using
+;;; @code{make-csv-reader}.
+
+;;; @defproc make-csv-reader in [reader-spec]
+;;;
+;;; Construct a CSV reader on the input @var{in}, which is an input port or a
+;;; string.  If @var{reader-spec} is given, and is not the null list, then a
+;;; ``one-shot'' reader constructor is constructed with that spec and used.  If
+;;; @var{reader-spec} is not given, or is the null list, then the default CSV
+;;; reader constructor is used.  For example, the reader from the
+;;; @code{make-csv-reader-maker} example could alternatively have been
+;;; constructed like:
+;;;
+;;; @lisp
+;;; (define next-row
+;;;   (make-csv-reader
+;;;    (open-input-file "fruits.csv")
+;;;    '((separator-chars            . (#\|))
+;;;      (strip-leading-whitespace?  . #t)
+;;;      (strip-trailing-whitespace? . #t))))
+;;; @end lisp
+
+(define make-csv-reader
+  (let ((default-maker (make-csv-reader-maker '())))
+    (lambda (in . rest)
+      (let ((spec (cond ((null? rest)       '())
+                        ((null? (cdr rest)) (car rest))
+                        (else (%csv:error "make-csv-reader"
+                                          "extraneous arguments"
+                                          (cdr rest))))))
+        ((if (null? spec)
+             default-maker
+             (make-csv-reader-maker spec))
+         (%csv:in-arg "make-csv-reader" in))))))
+
+;;; @section High-Level Conveniences
+
+;;; Several convenience procedures are provided for iterating over the CSV rows
+;;; and for converting the CSV to a list.
+;;;
+;;; To the dismay of some Scheme purists, each of these procedures accepts a
+;;; @var{reader-or-in} argument, which can be a CSV reader, an input port, or a
+;;; string.  If not a CSV reader, then the default reader constructor is used.
+;;; For example, all three of the following are equivalent:
+;;;
+;;; @lisp
+;;; (csv->list                                     STRING  )
+;;; @equiv{}
+;;; (csv->list (make-csv-reader                    STRING ))
+;;; @equiv{}
+;;; (csv->list (make-csv-reader (open-input-string STRING )))
+;;; @end lisp
+
+;;; @defproc csv-for-each proc reader-or-in
+;;;
+;;; Similar to Scheme's @code{for-each}, applies @var{proc}, a procedure of one
+;;; argument, to each parsed CSV row in series.  @var{reader-or-in} is the CSV
+;;; reader, input port, or string.  The return value is undefined.
+
+;; TODO: Doc an example for this.
+
+(define (csv-for-each proc reader-or-in)
+  (let ((reader (%csv:reader-or-in-arg "csv-for-each" reader-or-in)))
+    (let loop ((row (reader)))
+      (or (null? row)
+          (begin (proc row)
+                 (loop (reader)))))))
+
+;;; @defproc csv-map proc reader-or-in
+;;;
+;;; Similar to Scheme's @code{map}, applies @var{proc}, a procedure of one
+;;; argument, to each parsed CSV row in series, and yields a list of the values
+;;; of each application of @var{proc}, in order.  @var{reader-or-in} is the CSV
+;;; reader, input port, or string.
+
+;; TODO: Doc an example for this.
+
+;; (define (csv-map proc reader-or-in)
+;;   (let ((reader (%csv:reader-or-in-arg "csv-for-each" reader-or-in)))
+;;     (let ((head '()))
+;;       (let ((row (reader)))
+;;         (if (null? row)
+;;             head
+;;             (let ((pair (cons (proc row) '())))
+;;               (set! head pair)
+;;               (let loop ((prior pair))
+;;                 (let ((row (reader)))
+;;                   (if (null? row)
+;;                       head
+;;                       (let ((pair (cons (proc row) '())))
+;;                         (set-cdr! prior pair)
+;;                         (loop pair)))))))))))
+
+(define (csv-map proc reader-or-in)
+  (let ((reader (%csv:reader-or-in-arg "csv-for-each" reader-or-in)))
+    (let loop ((row (reader)) (ret null))
+      (if (null? row)
+          (reverse ret)
+          (let ((ret (cons (proc row) ret)))
+            (loop (reader) ret))))))
+
+;;; @defproc csv->list reader-or-in
+;;;
+;;; Yields a list of CSV row lists from input @var{reader-or-in}, which is a
+;;; CSV reader, input port, or string.
+
+;; TODO: Doc an example for this.
+
+;; (define (csv->list reader-or-in)
+;;   (let ((reader (%csv:reader-or-in-arg "csv->list" reader-or-in)))
+;;     (let ((head '()))
+;;       (let ((row (reader)))
+;;         (if (null? row)
+;;             head
+;;             (let ((pair (cons row '())))
+;;               (set! head pair)
+;;               (let loop ((prior pair))
+;;                 (let ((row (reader)))
+;;                   (if (null? row)
+;;                       head
+;;                       (let ((pair (cons row '())))
+;;                         (set-cdr! prior pair)
+;;                         (loop pair)))))))))))
+
+(define (csv->list reader-or-in)
+  (csv-map values reader-or-in))
+
+;;; @section Converting CSV to SXML
+
+;;; The @code{csv->sxml} procedure can be used to convert CSV to SXML format,
+;;; for processing with various XML tools.
+
+;;; @defproc csv->sxml reader-or-in [row-element [col-elements]]
+;;;
+;;; Reads CSV from input @var{reader-or-in} (which is a CSV reader, input port,
+;;; or string), and yields an SXML representation.  If given, @var{row-element}
+;;; is a symbol for the XML row element.  If @var{row-element} is not given,
+;;; the default is the symbol @code{row}.  If given @var{col-elements} is a
+;;; list of symbols for the XML column elements.  If not given, or there are
+;;; more columns in a row than given symbols, column element symbols are of the
+;;; format @code{col-@var{n}}, where @var{n} is the column number (the first
+;;; column being number 0, not 1).
+;;;
+;;; For example, given a CSV-format file @code{friends.csv} that has the
+;;; contents:
+;;;
+;;; @example
+;;; Binoche,Ste. Brune,33-1-2-3
+;;; Posey,Main St.,555-5309
+;;; Ryder,Cellblock 9,
+;;; @end example
+;;;
+;;; with elements not given, the result is:
+;;;
+;;; @lisp
+;;; (csv->sxml (open-input-file "friends.csv"))
+;;; @result{}
+;;; (*TOP*
+;;;  (row (col-0 "Binoche") (col-1 "Ste. Brune")  (col-2 "33-1-2-3"))
+;;;  (row (col-0 "Posey")   (col-1 "Main St.")    (col-2 "555-5309"))
+;;;  (row (col-0 "Ryder")   (col-1 "Cellblock 9") (col-2 "")))
+;;; @end lisp
+;;;
+;;; With elements given, the result is like:
+;;;
+;;; @lisp
+;;; (csv->sxml (open-input-file "friends.csv")
+;;;            'friend
+;;;            '(name address phone))
+;;; @result{}
+;;; (*TOP* (friend (name    "Binoche")
+;;;                (address "Ste. Brune")
+;;;                (phone   "33-1-2-3"))
+;;;        (friend (name    "Posey")
+;;;                (address "Main St.")
+;;;                (phone   "555-5309"))
+;;;        (friend (name    "Ryder")
+;;;                (address "Cellblock 9")
+;;;                (phone   "")))
+;;; @end lisp
+
+(define csv->sxml
+  (let* ((top-symbol
+          (string->symbol "*TOP*"))
+         (make-col-symbol
+          (lambda (n)
+            (string->symbol (string-append "col-" (number->string n)))))
+         (default-col-elements
+           (let loop ((i 0))
+             (if (= i 32) ; arbitrary magic number
+                 '()
+                 (cons (make-col-symbol i) (loop (+ 1 i)))))))
+    ;; TODO: Have option to error when columns count doesn't match provided
+    ;; column name list.
+    (lambda (reader-or-in . rest)
+      (let ((reader       (%csv:reader-or-in-arg "csv->sxml"
+                                                 reader-or-in))
+            (row-element  'row)
+            (col-elements #f))
+        ;; TODO: Maybe use case-lambda.
+        (or (null? rest)
+            (begin (set! row-element (car rest))
+                   (let ((rest (cdr rest)))
+                     (or (null? rest)
+                         (begin (set! col-elements (car rest))
+                                (let ((rest (cdr rest)))
+                                  (or (null? rest)
+                                      (%csv:error
+                                       "csv->sxml"
+                                       "extraneous arguments"
+                                       rest))))))))
+        ;; TODO: We could clone and grow default-col-elements for the duration
+        ;; of this procedure.
+        (cons top-symbol
+              (csv-map (lambda (row)
+                         (cons row-element
+                               (let loop ((vals  row)
+                                          (i     0)
+                                          (names (or col-elements
+                                                     default-col-elements)))
+                                 (if (null? vals)
+                                     '()
+                                     (cons (list (if (null? names)
+                                                     (make-col-symbol i)
+                                                     (car names))
+                                                 (car vals))
+                                           (loop (cdr vals)
+                                                 (+ 1 i)
+                                                 (if (null? names)
+                                                     '()
+                                                     (cdr names))))))))
+                       reader))))))
+
+;; TODO: Make a define-csv-reader/positional, for great constant-folding.
+;; That's part of the reason some things are done the way they are.
+
+;; TODO: Make a csv-bind, as a newbie convenience for people without advanced
+;; match forms, which looks good in examples.  This is better than a
+;; csv-map/bind and a csv-for-each/bind.
+;;
+;; (csv-for-each/bind ((column-binding ...) body ...)
+;;               { (else => closure) | (else body ...) | }
+;;               input-port
+;;               [ csv-reader ])
+;;
+;; (csv-for-each/bind
+;;  ((lastname firstname email)
+;;   ...)
+;;  (else => (lambda (row) (error "CSV row didn't match pattern" row)))
+;;  my-input-port
+;;  my-csv-reader)
+
+;; TODO: Handle escapes, once we find an actual example or specification of any
+;; flavor of escapes in CSV other than quote-doubling inside a quoted field.
+
+;; TODO: Add a spec attribute for treating adjacent separators as one, or
+;; skipping empty fields.  This would probably only be used in practice for
+;; parsing whitespace-separated input.
+
+;; TODO: Get access to MS Excel or documentation, and make this correct.
+;;
+;; (define msexcel-csv-reader-spec
+;;   '((newline-type               . crlf)
+;;     (separator-chars            . (#\,))
+;;     (quote-char                 . #\")
+;;     (quote-doubling-escapes?    . #t)
+;;     (comment-chars              . ())
+;;     (whitespace-chars           . (#\space))
+;;     (strip-leading-whitespace?  . #f)
+;;     (strip-trailing-whitespace? . #f)
+;;     (newlines-in-quotes?        . #t)))
+
+;; TODO: Maybe put this back in.
+;;
+;; (define default-csv-reader-spec
+;;   '((newline-type               . lax)
+;;     (separator-chars            . (#\,))
+;;     (quote-char                 . #\")
+;;     (quote-doubling-escapes?    . #t)
+;;     (comment-chars              . ())
+;;     (whitespace-chars           . (#\space))
+;;     (strip-leading-whitespace?  . #f)
+;;     (strip-trailing-whitespace? . #f)
+;;     (newlines-in-quotes?        . #t)))
+
+;; TODO: Implement CSV writing, after CSV reading is field-tested and polished.
+
+;; TODO: Call "close-input-port" once eof-object is hit, but make sure we still
+;; can return an empty list on subsequent calls to the CSV reader.
+
+;; TODO: Consider switching back to returning eof-object at the end of input.
+;; We originally changed to returning the null list because we might want to
+;; synthesize the EOF, and there is no R5RS binding for the eof-object.
+
+;; TODO: [2005-12-09] In one test, Guile has a stack overflow when parsing a
+;; row with 425 columns.  Wouldn't hurt to see if we can make things more
+;; tail-recursive.
+
+;;; @unnumberedsec History
+
+;;; @table @asis
+;;;
+;;; @item Version 0.10 -- 2010-04-13 -- PLaneT @code{(1 6)}
+;;; Documentation fix.
+;;;
+;;; @item Version 0.9 -- 2009-03-14 -- PLaneT @code{(1 5)}
+;;; Documentation fix.
+;;;
+;;; @item Version 0.8 -- 2009-02-23 -- PLaneT @code{(1 4)}
+;;; Documentation changes.
+;;;
+;;; @item Version 0.7 -- 2009-02-22 -- PLaneT @code{(1 3)}
+;;; License is now LGPL 3.  Moved to author's new Scheme administration system.
+;;;
+;;; @item Version 0.6 -- 2008-08-12 -- PLaneT @code{(1 2)}
+;;; For PLT 4 compatibility, new versions of @code{csv-map} and
+;;; @code{csv->list} that don't use @code{set-cdr!} (courtesy of Doug
+;;; Orleans). PLT 4 @code{if} compatibility change.  Minor documentation fixes.
+;;;
+;;; @item Version 0.5 --- 2005-12-09
+;;; Changed a non-R5RS use of @code{letrec} to @code{let*}, caught by Guile and
+;;; David Pirotte.
+;;;
+;;; @item Version 0.4 --- 2005-06-07
+;;; Converted to Testeez.  Minor documentation changes.
+;;;
+;;; @item Version 0.3 --- 2004-07-21
+;;; Minor documentation changes.  Test suite now disabled by default.
+;;;
+;;; @item Version 0.2 --- 2004-06-01
+;;; Work-around for @code{case}-related bug observed in Gauche 0.8 and 0.7.4.2
+;;; that was tickled by @code{csv-internal:make-portreader/positional}.  Thanks
+;;; to Grzegorz Chrupa@l{}a for reporting.
+;;;
+;;; @item Version 0.1 --- 2004-05-31
+;;; First release, for testing with real-world input.
+;;;
+;;; @end table
+
+#;(provide
+ csv->list
+ csv->sxml
+ csv-for-each
+ csv-map
+ make-csv-reader
+ make-csv-reader-maker)

Index: dashboard-tests.scm
==================================================================
--- dashboard-tests.scm
+++ dashboard-tests.scm
@@ -55,29 +55,29 @@
   (iup:show
    (iup:dialog
     (iup:vbox 
      (iup:label msg #:margin "40x40")))))
 
-(define (dtests:get-pre-command #!key (default-override #f))
-  (let* ((orig-pre-command "export CMD='")
-         (viewscreen-pre-command  "viewscreen ")
-         (use-viewscreen (configf:lookup *configdat* "dashboard" "use-viewscreen"))
-         (default-pre-command (if use-viewscreen viewscreen-pre-command orig-pre-command))
-         (cfg-ovrd (configf:lookup *configdat* "dashboard" "pre-command")))
-    (or cfg-ovrd default-override default-pre-command))) ;; "xterm -geometry 180x20 -e \""))
-
-  
-(define (dtests:get-post-command #!key (default-override #f))
-  (let* ((orig-post-command (conc "';xterm -geometry 180x20 -e \"(echo; echo -n START:;date +ww%U.%w-$H:%M:%S;echo;echo $CMD;echo;$CMD)|&"
-                                 "tee -a runlog-`date +ww%U.%w-%H:%M`.log;echo Press any key to continue;bash -c 'read -n 1 -s'\" &"))
-         (viewscreen-post-command  "")
-         (use-viewscreen (configf:lookup *configdat* "dashboard" "use-viewscreen"))
-         (default-post-command (if use-viewscreen viewscreen-post-command orig-post-command))
-         (cfg-ovrd (configf:lookup *configdat* "dashboard" "post-command")))
-    (or cfg-ovrd default-override default-post-command))) ;; ";echo Press any key to continue;bash -c 'read -n 1 -s'\" &")))
-
-
+;; (define (dtests:get-pre-command #!key (default-override #f))
+;;   (let* ((orig-pre-command "export CMD='")
+;;          (viewscreen-pre-command  "viewscreen ")
+;;          (use-viewscreen (configf:lookup *configdat* "dashboard" "use-viewscreen"))
+;;          (default-pre-command (if use-viewscreen viewscreen-pre-command orig-pre-command))
+;;          (cfg-ovrd (configf:lookup *configdat* "dashboard" "pre-command")))
+;;     (or cfg-ovrd default-override default-pre-command))) ;; "xterm -geometry 180x20 -e \""))
+;; 
+;;   
+;; (define (dtests:get-post-command #!key (default-override #f))
+;;   (let* ((orig-post-command (conc "';xterm -geometry 180x20 -e \"(echo; echo -n START:;date +ww%U.%w-$H:%M:%S;echo;echo $CMD;echo;$CMD)|&"
+;;                                  "tee -a runlog-`date +ww%U.%w-%H:%M`.log;echo Press any key to continue;bash -c 'read -n 1 -s'\" &"))
+;;          (viewscreen-post-command  "")
+;;          (use-viewscreen (configf:lookup *configdat* "dashboard" "use-viewscreen"))
+;;          (default-post-command (if use-viewscreen viewscreen-post-command orig-post-command))
+;;          (cfg-ovrd (configf:lookup *configdat* "dashboard" "post-command")))
+;;     (or cfg-ovrd default-override default-post-command))) ;; ";echo Press any key to continue;bash -c 'read -n 1 -s'\" &")))
+;; 
+;; 
 (define (test-info-panel testdat store-label widgets)
   (iup:frame 
    #:title "Test Info" ; #:expand "YES"
    (iup:hbox ; #:expand "YES"
     (apply iup:vbox ; #:expand "YES"

Index: datashare.scm
==================================================================
--- datashare.scm
+++ datashare.scm
@@ -253,11 +253,11 @@
 	(print "ERROR: invalid path for storing database: " path))))
 
 (define (open-run-close-exception-handling proc idb . params)
   (handle-exceptions
    exn
-   (let ((sleep-time (random 30))
+   (let ((sleep-time (pseudo-random-integer 30))
          (err-status ((condition-property-accessor 'sqlite3 'status #f) exn)))
      (case err-status
        ((busy)
         (thread-sleep! sleep-time))
        (else

Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -15,4880 +15,30 @@
 ;; 
 ;;     You should have received a copy of the GNU General Public License
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 ;;
 ;;======================================================================
-
-;;======================================================================
-;; Database access
-;;======================================================================
-
-;; dbstruct vector containing all the relevant dbs like main.db, megatest.db, run.db etc
-
-(use (srfi 18) extras tcp stack)
-(use sqlite3 srfi-1 posix regex regex-case srfi-69 csv-xml s11n md5 message-digest base64 format dot-locking z3 typed-records matchable)
-(import (prefix sqlite3 sqlite3:))
-(import (prefix base64 base64:))
-
-(declare (unit db))
-(declare (uses common))
-(declare (uses keys))
-(declare (uses ods))
-(declare (uses client))
-(declare (uses mt))
-
-(include "common_records.scm")
-(include "db_records.scm")
-(include "key_records.scm")
-(include "run_records.scm")
-
-(define *number-of-writes* 0)
-(define *number-non-write-queries* 0)
-
-;;======================================================================
-;;  R E C O R D S
-;;======================================================================
-
-;; each db entry is a pair ( db . dbfilepath )
-;; I propose this record evolves into the area record
-;;
-(defstruct dbr:dbstruct 
-  (tmpdb       #f)
-  (dbstack     #f) ;; stack for tmp db handles, do not initialize with a stack
-  (mtdb        #f)
-  (refndb      #f)
-  (homehost    #f) ;; not used yet
-  (on-homehost #f) ;; not used yet
-  (read-only   #f)
-  (stmt-cache  (make-hash-table))
-  )                ;; goal is to converge on one struct for an area but for now it is too confusing
-  
-
-;; record for keeping state,status and count for doing roll-ups in
-;; iterated tests
-;;
-(defstruct dbr:counts
-  (state #f)
-  (status #f)
-  (count  0)) 
-
-;;======================================================================
-;; alist-of-alists
-;;======================================================================
-;; 
-;; (define (db:aa-set! dat key1 key2 val)
-;;   (let loop ((
-
-;;======================================================================
-;; hash of hashs
-;;======================================================================
-
-
-(define (db:hoh-set! dat key1 key2 val)
-  (let* ((subhash (hash-table-ref/default dat key1 #f)))
-    (if subhash
-	(hash-table-set! subhash key2 val)
-	(begin
-	  (hash-table-set! dat key1 (make-hash-table))
-	  (db:hoh-set! dat key1 key2 val)))))
-
-(define (db:hoh-get dat key1 key2)
-  (let* ((subhash (hash-table-ref/default dat key1 #f)))
-    (and subhash
-	 (hash-table-ref/default subhash key2 #f))))
-
-(define (db:get-cache-stmth dbstruct db stmt)
-  (let* ((stmt-cache        (dbr:dbstruct-stmt-cache dbstruct))
-	 (stmth             (db:hoh-get stmt-cache db stmt)))
-    (or stmth
-	(let* ((newstmth (sqlite3:prepare db stmt)))
-	  (db:hoh-set! stmt-cache db stmt newstmth)
-	  newstmth))))
-
-;;======================================================================
-;; SQLITE3 HELPERS
-;;======================================================================
-
-(define (db:general-sqlite-error-dump exn stmt . params)
-  (let ((err-status ((condition-property-accessor 'sqlite3 'status #f) exn))) ;; RADT ... how does this work?
-    ;; check for (exn sqlite3) ((condition-property-accessor 'exn 'message) exn)
-    ;; (print "err-status: " err-status)
-    (debug:print-error 0 *default-log-port* " query " stmt " failed, params: " params ", error: " ((condition-property-accessor 'exn 'message) exn))
-    (print-call-chain (current-error-port))))
-
-;; convert to -inline 
-;;
-(define (db:first-result-default db stmt default . params)
-  (handle-exceptions
-   exn
-   (let ((err-status ((condition-property-accessor 'sqlite3 'status #f) exn)))
-     ;; check for (exn sqlite3) ((condition-property-accessor 'exn 'message) exn)
-     (if (eq? err-status 'done)
-	 default
-	 (begin
-	   (debug:print-error 0 *default-log-port* " query " stmt " failed, params: " params ", error: " ((condition-property-accessor 'exn 'message) exn) ", exn=" exn)
-	   (print-call-chain (current-error-port))
-	   default)))
-   (apply sqlite3:first-result db stmt params)))
-
-;; Get/open a database
-;;    if run-id => get run specific db
-;;    if #f     => get main db
-;;    if db already open - return inmem
-;;    if db not open, open inmem, rundb and sync then return inmem
-;;    inuse gets set automatically for rundb's
-;;
-(define (db:get-db dbstruct) ;;  run-id) 
-  (if (stack? (dbr:dbstruct-dbstack dbstruct))
-      (if (stack-empty? (dbr:dbstruct-dbstack dbstruct))
-          (let ((newdb (db:open-megatest-db path: (db:dbfile-path))))
-            ;; (stack-push! (dbr:dbstruct-dbstack dbstruct) newdb)
-            newdb)
-          (stack-pop! (dbr:dbstruct-dbstack dbstruct)))
-      (db:open-db dbstruct)))
-
-;; ;; legacy handling of structure for managing db's. Refactor this into dbr:?
-(define (db:dbdat-get-db dbdat)
-  (if (pair? dbdat)
-      (car dbdat)
-      dbdat))
-
-(define (db:dbdat-get-path dbdat)
-  (if (pair? dbdat)
-      (cdr dbdat)
-      #f))
-
-(define-inline (db:generic-error-printout exn . message)
-  (print-call-chain (current-error-port))
-  (apply debug:print-error 0 *default-log-port* message)
-  (debug:print-error 0 *default-log-port* "   params: " params
-		     ", error: "     ((condition-property-accessor 'exn 'message)   exn)
-		     ", arguments: " ((condition-property-accessor 'exn 'arguments) exn)
-		     ", location: "  ((condition-property-accessor 'exn 'location)  exn)
-		     ))
-
-;; (db:with-db dbstruct run-id sqlite3:exec "select blah fgrom blaz;")
-;; r/w is a flag to indicate if the db is modified by this query #t = yes, #f = no
-;;
-(define (db:with-db dbstruct run-id r/w proc . params)
-  (let* ((have-struct (dbr:dbstruct? dbstruct))
-         (dbdat     (if have-struct 
-			(db:get-db dbstruct)
-			#f))
-	 (db        (if have-struct
-			(db:dbdat-get-db dbdat)
-			dbstruct))
-	 (fname     (db:dbdat-get-path dbdat))
-	 (use-mutex (> *api-process-request-count* 25))) ;; was 25
-    (if (and use-mutex
-	     (common:low-noise-print 120 "over-50-parallel-api-requests"))
-	(debug:print-info 0 *default-log-port* *api-process-request-count* " parallel api requests being processed in process " (current-process-id) ", throttling access"))
-    (if (common:low-noise-print 600 (conc "parallel-api-requests" *max-api-process-requests*))
-	(debug:print-info 2 *default-log-port* "Parallel api request count: " *api-process-request-count* " max parallel requests: " *max-api-process-requests*))
-    (condition-case
-     (begin
-       (if use-mutex (mutex-lock! *db-with-db-mutex*))
-       (let ((res (apply proc db params)))
-	 (if use-mutex (mutex-unlock! *db-with-db-mutex*))
-	 ;; (if (vector? dbstruct)(db:done-with dbstruct run-id r/w))
-	 (if dbdat (stack-push! (dbr:dbstruct-dbstack dbstruct) dbdat))
-	 res))
-     (exn (io-error)
-	  (db:generic-error-printout exn "ERROR: i/o error with " fname ". Check permissions, disk space etc. and try again."))
-     (exn (corrupt)
-	  (db:generic-error-printout exn "ERROR: database " fname " is corrupt. Repair it to proceed."))
-     (exn (busy)
-	  (db:generic-error-printout exn "ERROR: database " fname
-				     " is locked. Try copying to another location, remove original and copy back."))
-     (exn (permission)(db:generic-error-printout exn "ERROR: database " fname " has some permissions problem."))
-     (exn ()
-	  (db:generic-error-printout exn "ERROR: Unknown error with database " fname " message: "
-		       ((condition-property-accessor 'exn 'message) exn))))))
-      
-;;======================================================================
-;; K E E P   F I L E D B   I N   dbstruct
-;;======================================================================
-
-;; (define (db:get-filedb dbstruct run-id)
-;;   (let ((db (vector-ref dbstruct 2)))
-;;     (if db
-;; 	db
-;; 	(let ((fdb (filedb:open-db (conc *toplevel* "/db/files.db"))))
-;; 	  (vector-set! dbstruct 2 fdb)
-;; 	  fdb))))
-;; 
-;; ;; Can also be used to save arbitrary strings
-;; ;;
-;; (define (db:save-path dbstruct path)
-;;   (let ((fdb (db:get-filedb dbstruct)))b
-;;     (filedb:register-path fdb path)))
-;; 
-;; ;; Use to get a path. To get an arbitrary string see next define
-;; ;;
-;; (define (db:get-path dbstruct id)
-;;   (let ((fdb (db:get-filedb dbstruct)))
-;;     (filedb:get-path db id)))
-
-;; NB// #f => return dbdir only
-;;      (was planned to be;  zeroth db with name=main.db)
-;; 
-;; If run-id is #f return to create and retrieve the path where the db will live.
-;;
-(define db:dbfile-path common:get-db-tmp-area)
-
-(define (db:set-sync db)
-  (let ((syncprag (configf:lookup *configdat* "setup" "sychronous")))
-    (sqlite3:execute db (conc "PRAGMA synchronous = " (or syncprag 0) ";")))) 
-
-;; open an sql database inside a file lock
-;; returns: db existed-prior-to-opening
-;; RA => Returns a db handler; sets the lock if opened in writable mode
-;;
-;; (define *db-open-mutex* (make-mutex))
-
-(define (db:lock-create-open fname initproc)
-  (let* ((parent-dir   (or (pathname-directory fname)(current-directory))) ;; no parent? go local
-         (raw-fname    (pathname-file fname))
-	 (dir-writable (file-write-access? parent-dir))
-	 (file-exists  (common:file-exists? fname))
-	 (file-write   (if file-exists
-			   (file-write-access? fname)
-			   dir-writable )))
-    ;; (mutex-lock! *db-open-mutex*) ;; tried this mutex, not clear it helped.
-    (if file-write ;; dir-writable
-	(condition-case
-         (let* ((lockfname   (conc fname ".lock"))
-                (readyfname  (conc parent-dir "/.ready-" raw-fname))
-                (readyexists (common:file-exists? readyfname)))
-           (if (not readyexists)
-               (common:simple-file-lock-and-wait lockfname))
-           (let ((db      (sqlite3:open-database fname)))
-             (sqlite3:set-busy-handler! db (sqlite3:make-busy-timeout 136000))
-             (sqlite3:execute db "PRAGMA synchronous = 0;")
-             (if (and (configf:lookup *configdat* "setup" "tmp_mode") (string-match "^/tmp/.*" fname))
-                 (begin
-                   ;;(print "DEBUG: Setting tmp_mode for " fname) 
-                   (sqlite3:execute db (configf:lookup *configdat* "setup" "tmp_mode"))
-                   )
-                 )  
-             (if (and (configf:lookup *configdat* "setup" "nfs_mode") (not (string-match "^/tmp/.*" fname)))
-                 (begin
-                   ;;(print "DEBUG: Setting nfs_mode for " fname)
-                   (sqlite3:execute db (configf:lookup *configdat* "setup" "nfs_mode"))
-                   )
-                 )  
-             (if (and (not (or (configf:lookup *configdat* "setup" "tmp_mode") (configf:lookup *configdat* "setup" "nfs_mode")))  
-                      (configf:lookup *configdat* "setup" "use-wal")
-                      (string-match "^/tmp/.*" fname)) ;; this is a file in /tmp
-                 (sqlite3:execute db "PRAGMA journal_mode=WAL;")
-                 (debug:print 2 *default-log-port* "Creating " fname " in NON-WAL mode."))
-             (if (not file-exists)
-                 (initproc db))
-             (if (not readyexists)
-                 (begin
-                   (common:simple-file-release-lock lockfname)
-                   (with-output-to-file
-                       readyfname
-                     (lambda ()
-                       (print "Ready at " 
-                              (seconds->year-work-week/day-time 
-                               (current-seconds)))))))
-             db))
-         (exn (io-error)  (debug:print 0 *default-log-port* "ERROR: i/o error with " fname ". Check permissions, disk space etc. and try again."))
-         (exn (corrupt)   (debug:print 0 *default-log-port* "ERROR: database " fname " is corrupt. Repair it to proceed."))
-         (exn (busy)      (debug:print 0 *default-log-port* "ERROR: database " fname " is locked. Try copying to another location, remove original and copy back."))
-         (exn (permission)(debug:print 0 *default-log-port* "ERROR: database " fname " has some permissions problem."))
-         (exn () (debug:print 0 *default-log-port* "ERROR: Unknown error with database " fname " message: " ((condition-property-accessor 'exn 'message) exn))))
-        
-	(condition-case
-         (begin
-           (debug:print 2 *default-log-port* "WARNING: opening db in non-writable dir " fname)
-           (let ((db (sqlite3:open-database fname)))
-             (sqlite3:set-busy-handler! db (sqlite3:make-busy-timeout 136000))
-             (sqlite3:execute db "PRAGMA synchronous = 0;")
-	     ;; (mutex-unlock! *db-open-mutex*)
-             db))
-         (exn (io-error)  (debug:print 0 *default-log-port* "ERROR: i/o error with " fname ". Check permissions, disk space etc. and try again."))
-         (exn (corrupt)   (debug:print 0 *default-log-port* "ERROR: database " fname " is corrupt. Repair it to proceed."))
-         (exn (busy)      (debug:print 0 *default-log-port* "ERROR: database " fname " is locked. Try copying to another location, remove original and copy back."))
-         (exn (permission)(debug:print 0 *default-log-port* "ERROR: database " fname " has some permissions problem."))
-         (exn () (debug:print 0 *default-log-port* "ERROR: Unknown error with database " fname " message: " ((condition-property-accessor 'exn 'message) exn))))
-	)))
-
-
-;; This routine creates the db if not already present. It is only called if the db is not already opened
-;;
-(define (db:open-db dbstruct #!key (areapath #f)(do-sync #t)) ;; TODO: actually use areapath
-  (let ((tmpdb-stack (dbr:dbstruct-dbstack dbstruct))) ;; RA => Returns the first reference in dbstruct
-    (if (stack? tmpdb-stack)
-	(db:get-db tmpdb-stack) ;; get previously opened db (will create new db handle if all in the stack are already used
-        (let* ((max-stale-tmp (configf:lookup-number *configdat* "server" "filling-db-max-stale-seconds" default: 10))
-               (dbpath       (db:dbfile-path ))      ;; path to tmp db area
-               (dbexists     (common:file-exists? dbpath))
-	       (tmpdbfname   (conc dbpath "/megatest.db"))
-	       (dbfexists    (common:file-exists? tmpdbfname))  ;; (conc dbpath "/megatest.db")))
-               (mtdbexists   (common:file-exists? (conc *toppath* "/megatest.db")))
-							 
-               (mtdbmodtime  (if mtdbexists (common:lazy-sqlite-db-modification-time (conc *toppath* "/megatest.db"))   #f))
-	        		 (tmpdbmodtime (if dbfexists  (common:lazy-sqlite-db-modification-time tmpdbfname) #f)) 
-               (mtdb         (db:open-megatest-db))
-               (mtdbpath     (db:dbdat-get-path mtdb))
-               (tmpdb        (db:open-megatest-db path: dbpath)) ;; lock-create-open dbpath db:initialize-main-db))
-               (refndb       (db:open-megatest-db path: dbpath name: "megatest_ref.db"))
-               (write-access (file-write-access? mtdbpath))
-	       ;(mtdbmodtime  (if mtdbexists (common:lazy-sqlite-db-modification-time mtdbpath)   #f)) ; moving this before db:open-megatest-db is called. if wal mode is on -WAL and -shm file get created with causing the  tmpdbmodtime timestamp always greater than mtdbmodtime
-	       ;(tmpdbmodtime (if dbfexists  (common:lazy-sqlite-db-modification-time tmpdbfname) #f)) 
-					;if wal mode is on -WAL and -shm file get created when db:open-megatest-db is called. modtimedelta will always be < 10 so db in tmp not get synced
-          ;(tmpdbmodtime (if dbfexists (db:get-last-update-time (car tmpdb)) #f))    
-          ;(fmt (file-modification-time tmpdbfname))
-	       (modtimedelta (and mtdbmodtime tmpdbmodtime (- mtdbmodtime tmpdbmodtime))))
-
-          (when write-access
-            (sqlite3:execute (car mtdb) "drop trigger if exists update_tests_trigger")
-            (sqlite3:execute (car mtdb) "drop trigger if exists update_runs_trigger"))
-          
-         ;(print "mtdbmodtime " mtdbmodtime " tmpdbmodtime " tmpdbmodtime " mtdbpath " mtdbpath " " (conc *toppath* "/megatest.db"))
-	        ;;(debug:print-info 13 *default-log-port* "db:open-db>> mtdbpath="mtdbpath" mtdbexists="mtdbexists" and write-access="write-access)
-          (if (and dbexists (not write-access))
-              (begin
-                (set! *db-write-access* #f)
-                (dbr:dbstruct-read-only-set! dbstruct #t)))
-          (dbr:dbstruct-mtdb-set!   dbstruct mtdb)
-          (dbr:dbstruct-tmpdb-set!  dbstruct tmpdb)
-          (dbr:dbstruct-dbstack-set! dbstruct (make-stack)) ;; BB: why a stack?  Why would the number of db's be indeterminate?  Is this a legacy of 1.db 2.db .. ?
-          (stack-push! (dbr:dbstruct-dbstack dbstruct) tmpdb) ;; olddb is already a (cons db path)
-          (dbr:dbstruct-refndb-set! dbstruct refndb)
-          (if (and  (or (not dbfexists)
-			(and modtimedelta
-			     (> modtimedelta max-stale-tmp))) ;; if db in tmp is over ten seconds older than the file in MTRA then do a sync back
-		    do-sync)
-	      (begin
-		(debug:print 1 *default-log-port* "filling db " (db:dbdat-get-path tmpdb) " with data \n    from " (db:dbdat-get-path mtdb) " mod time delta: " modtimedelta)
-		(db:sync-tables (db:sync-all-tables-list dbstruct) #f mtdb refndb tmpdb)
-    ;touch tmp db to avoid wal mode wierdness  
-     (set! (file-modification-time tmpdbfname) (current-seconds))  
-                (debug:print-info 13 *default-log-port* "db:sync-all-tables-list done.")
-                )
-	      (debug:print 4 *default-log-port* " db, " (db:dbdat-get-path tmpdb) " already exists or fresh enough, not propogating data from\n     " (db:dbdat-get-path mtdb) " mod time delta: " modtimedelta) )
-	  ;; (db:multi-db-sync dbstruct 'old2new))  ;; migrate data from megatest.db automatically
-          tmpdb))))
-
-
-(define (db:get-last-update-time db)
-;	(db:with-db
-;   dbstruct #f #f 
-;    (lambda (db)
-			(let ((last-update-time #f))
-      	(sqlite3:for-each-row 
-          (lambda (lup) 
-             (set! last-update-time lup))     
-          db    
-					"select max(lup) from ( select max(last_update) as lup  from tests union select max(last_update) as lup from runs);")
-        last-update-time))
-;))
-
-;; Make the dbstruct, setup up auxillary db's and call for main db at least once
-;;
-;; called in http-transport and replicated in rmt.scm for *local* access. 
-;;
-(define (db:setup do-sync #!key (areapath #f))
-  ;;
-  (cond
-   (*dbstruct-db* *dbstruct-db*);; TODO: when multiple areas are supported, this optimization will be a hazard
-   (else ;;(common:on-homehost?)
-    (debug:print-info 13 *default-log-port* "db:setup entered (first time, not cached.)")
-    (let* ((dbstruct (make-dbr:dbstruct)))
-      (when (not *toppath*)
-        (debug:print-info 13 *default-log-port* "in db:setup, *toppath* not set; calling launch:setup")
-        (launch:setup areapath: areapath))
-      (debug:print-info 13 *default-log-port* "Begin db:open-db")
-      (db:open-db dbstruct areapath: areapath do-sync: do-sync)
-      (debug:print-info 13 *default-log-port* "Done db:open-db")
-      (set! *dbstruct-db* dbstruct)
-      ;;(debug:print-info 13 *default-log-port* "new dbstruct = "(dbr:dbstruct->alist dbstruct))
-      dbstruct))))
-   ;; (else
-   ;;  (debug:print 0 *default-log-port* "ERROR: attempt to open database when not on homehost. Exiting. Homehost: " (common:get-homehost))
-   ;;  (exit 1))))
-
-;; Open the classic megatest.db file (defaults to open in toppath)
-;;
-;;   NOTE: returns a dbdat not a dbstruct!
-;;
-
-;;(define (db:reopen-megatest-db
-
-(define (db:open-megatest-db #!key (path #f)(name #f))
-  (let* ((dbdir        (or path *toppath*))
-         (dbpath       (conc  dbdir "/" (or name "megatest.db")))
-	 (dbexists     (common:file-exists? dbpath))
-	 (db           (db:lock-create-open dbpath
-					    (lambda (db)
-                                              (db:initialize-main-db db)
-					      ;;(db:initialize-run-id-db db)
-					      )))
-	 (write-access (file-write-access? dbpath)))
-    (debug:print-info 13 *default-log-port* "db:open-megatest-db "dbpath)
-    (if (and dbexists (not write-access))
-	(set! *db-write-access* #f))
-    (cons db dbpath)))
-
-;; sync run to disk if touched
-;;
-(define (db:sync-touched dbstruct run-id #!key (force-sync #f))
-  (let ((tmpdb   (db:get-db dbstruct))
-	(mtdb    (dbr:dbstruct-mtdb   dbstruct))
-        (refndb  (dbr:dbstruct-refndb dbstruct))
-	(start-t (current-seconds)))
-    (debug:print-info 4 *default-log-port* "Syncing for run-id: " run-id)
-    (mutex-lock! *db-multi-sync-mutex*)
-    (let ((update_info (cons (if force-sync 0 *db-last-sync*) "last_update")))
-      (mutex-unlock! *db-multi-sync-mutex*)
-      (db:sync-tables (db:sync-all-tables-list dbstruct) update_info tmpdb refndb mtdb))
-    (mutex-lock! *db-multi-sync-mutex*)
-    (set! *db-last-sync* start-t)
-    (set! *db-last-access* start-t)
-    (mutex-unlock! *db-multi-sync-mutex*)
-    (stack-push! (dbr:dbstruct-dbstack dbstruct) tmpdb)))
-
-(define (db:safely-close-sqlite3-db db stmt-cache #!key (try-num 3))
-  (if (<= try-num 0)
-      #f
-      (handle-exceptions
-	  exn
-	(begin
-	  (print "Attempt to safely close sqlite3 db failed. Trying again. exn=" exn)
-	  (thread-sleep! 3)
-	  (sqlite3:interrupt! db)
-	  (db:safely-close-sqlite3-db db stmt-cache try-num: (- try-num 1)))
-	(if (sqlite3:database? db)
-	    (let* ((stmts (and stmt-cache (hash-table-ref/default stmt-cache db #f))))
-	      (if stmts (map sqlite3:finalize! (hash-table-values stmts)))
-	      (sqlite3:finalize! db)
-	      #t)
-	    #f))))
-
-;; close all opened run-id dbs
-(define (db:close-all dbstruct)
-  (if (dbr:dbstruct? dbstruct)
-      (handle-exceptions
-	  exn
-	  (begin
-	    (debug:print 0 *default-log-port* "WARNING: Finalizing failed, "  ((condition-property-accessor 'exn 'message) exn) ", note - exn=" exn)
-	    (print-call-chain *default-log-port*))
-	;; (db:sync-touched dbstruct 0 force-sync: #t) ;; NO. Do not do this here. Instead we rely on a server to be started when there are writes, even if the server itself is not going to be used as a server.
-        (let ((tdbs       (map db:dbdat-get-db 
-			       (stack->list (dbr:dbstruct-dbstack dbstruct))))
-              (mdb        (db:dbdat-get-db (dbr:dbstruct-mtdb   dbstruct)))
-              (rdb        (db:dbdat-get-db (dbr:dbstruct-refndb dbstruct)))
-	      (stmt-cache (dbr:dbstruct-stmt-cache dbstruct)))
-          (map (lambda (db)
-		 (db:safely-close-sqlite3-db db stmt-cache))
-	       tdbs)
-          (db:safely-close-sqlite3-db mdb stmt-cache)     ;; (if (sqlite3:database? mdb) (sqlite3:finalize! mdb))
-          (db:safely-close-sqlite3-db rdb stmt-cache))))) ;; (if (sqlite3:database? rdb) (sqlite3:finalize! rdb))))))
-
-;;   (let ((locdbs (dbr:dbstruct-locdbs dbstruct)))
-;;     (if (hash-table? locdbs)
-;; 	(for-each (lambda (run-id)
-;; 		    (db:close-run-db dbstruct run-id))
-;; 		  (hash-table-keys locdbs)))))
-
-;; (define (db:open-inmem-db)
-;;   (let* ((db      (sqlite3:open-database ":memory:"))
-;; 	 (handler (make-busy-timeout 3600)))
-;;     (sqlite3:set-busy-handler! db handler)
-;;     (db:initialize-run-id-db db)
-;;     (cons db #f)))
-
-;; just tests, test_steps and test_data tables
-(define db:sync-tests-only
-  (list
-   ;; (list "strs"
-   ;;       '("id"             #f)
-   ;;       '("str"            #f))
-   (list "tests" 
-	 '("id"             #f)
-	 '("run_id"         #f)
-	 '("testname"       #f)
-	 '("host"           #f)
-	 '("cpuload"        #f)
-	 '("diskfree"       #f)
-	 '("uname"          #f)
-	 '("rundir"         #f)
-	 '("shortdir"       #f)
-	 '("item_path"      #f)
-	 '("state"          #f)
-	 '("status"         #f)
-	 '("attemptnum"     #f)
-	 '("final_logf"     #f)
-	 '("logdat"         #f)
-	 '("run_duration"   #f)
-	 '("comment"        #f)
-	 '("event_time"     #f)
-	 '("fail_count"     #f)
-	 '("pass_count"     #f)
-	 '("archived"       #f)
-         '("last_update"    #f))
-  (list "test_steps"
-	 '("id"             #f)
-	 '("test_id"        #f)
-	 '("stepname"       #f)
-	 '("state"          #f)
-	 '("status"         #f)
-	 '("event_time"     #f)
-	 '("comment"        #f)
-	 '("logfile"        #f)
-         '("last_update"    #f))
-   (list "test_data"
-	 '("id"             #f)
-	 '("test_id"        #f)
-	 '("category"       #f)
-	 '("variable"       #f)
-	 '("value"          #f)
-	 '("expected"       #f)
-	 '("tol"            #f)
-	 '("units"          #f)
-	 '("comment"        #f)
-	 '("status"         #f)
-	 '("type"           #f)
-         '("last_update"    #f))))
-
-;; needs db to get keys, this is for syncing all tables
-;;
-(define (db:sync-main-list dbstruct)
-  (let ((keys  (db:get-keys dbstruct)))
-    (list
-     (list "keys"
-	   '("id"        #f)
-	   '("fieldname" #f)
-	   '("fieldtype" #f))
-     (list "metadat" '("var" #f) '("val" #f))
-     (append (list "runs" 
-		   '("id"  #f))
-	     (map (lambda (k)(list k #f))
-		  (append keys
-			  (list "runname" "state" "status" "owner" "event_time" "comment" "fail_count" "pass_count" "contour" "last_update"))))
-     (list "archive_disks"
-           '("id" #f)
-           '("archive_area_name" #f) 
-           '("disk_path" #f)
-           '("last_df" #f)
-           '("last_df_time" #f)
-           '("creation_time" #f)) 
-
-     (list "archive_blocks"
-           '("id" #f)
-           '("archive_disk_id" #f) 
-           '("disk_path" #f)
-           '("last_du" #f)
-           '("last_du_time" #f)
-           '("creation_time" #f)) 
-
-     (list "test_meta"
-	   '("id"             #f)
-	   '("testname"       #f)
-	   '("owner"          #f)
-	   '("description"    #f)
-	   '("reviewed"       #f)
-	   '("iterated"       #f)
-	   '("avg_runtime"    #f)
-	   '("avg_disk"       #f)
-	   '("tags"           #f)
-	   '("jobgroup"       #f)))))
-
-(define (db:sync-all-tables-list dbstruct)
-  (append (db:sync-main-list dbstruct)
-	  db:sync-tests-only))
-
-;; use bunch of Unix commands to try to break the lock and recreate the db
-;;
-(define (db:move-and-recreate-db dbdat)
-  (let* ((dbpath   (db:dbdat-get-path        dbdat))
-	 (dbdir    (pathname-directory       dbpath))
-	 (fname    (pathname-strip-directory dbpath))
-	 (fnamejnl (conc fname "-journal"))
-	 (tmpname  (conc fname "." (current-process-id)))
-	 (tmpjnl   (conc fnamejnl "." (current-process-id))))
-    (debug:print-error 0 *default-log-port* "" fname " appears corrupted. Making backup \"old/" fname "\"")
-    (system (conc "cd " dbdir ";mkdir -p old;cat " fname " > old/" tmpname))
-    (system (conc "rm -f " dbpath))
-    (if (common:file-exists? fnamejnl)
-	(begin
-	  (debug:print-error 0 *default-log-port* "" fnamejnl " found, moving it to old dir as " tmpjnl)
-	  (system (conc "cd " dbdir ";mkdir -p old;cat " fnamejnl " > old/" tmpjnl))
-	  (system (conc "rm -f " dbdir "/" fnamejnl))))
-    ;; attempt to recreate database
-    (system (conc "cd " dbdir ";sqlite3 old/" tmpname " .dump | sqlite3 " fname))))
-    
-;; return #f to indicate the dbdat should be closed/reopened
-;; else return dbdat
-;;
-(define (db:repair-db dbdat #!key (numtries 1))
-  (let* ((dbpath   (db:dbdat-get-path        dbdat))
-	 (dbdir    (pathname-directory       dbpath))
-	 (fname    (pathname-strip-directory dbpath)))
-    (debug:print-info 0 *default-log-port* "Checking db " dbpath " for errors.")
-    (cond
-     ((not (file-write-access? dbdir))
-      (debug:print 0 *default-log-port* "WARNING: can't write to " dbdir ", can't fix " fname)
-      #f)
-
-     ;; handle special cases, megatest.db and monitor.db
-     ;; 
-     ;;  NOPE: apply this same approach to all db files
-     ;;
-     (else ;; ((equal? fname "megatest.db") ;; this file can be regenerated if needed
-      (handle-exceptions
-       exn
-       (begin
-	 (print "Problems trying to repair the db, exn=" exn)
-	 ;; (db:move-and-recreate-db dbdat)
-	 (if (> numtries 0)
-	     (db:repair-db dbdat numtries: (- numtries 1))
-	     #f)
-	 (debug:print 0 *default-log-port* "FATAL: file " dbpath " was found corrupted, an attempt to fix has been made but you must start over.")
-	 (debug:print 0 *default-log-port*
-		      "   check the following:\n"
-		      "      1. full directories, look in ~/ /tmp and " dbdir "\n"
-		      "      2. write access to " dbdir "\n\n"
-		      "   if the automatic recovery failed you may be able to recover data by doing \"" 
-		      (if (member fname '("megatest.db" "monitor.db"))
-			  "megatest -cleanup-db"
-			  "megatest -import-megatest.db;megatest -cleanup-db")
-		      "\"\n")
-	 (exit) ;; we can not safely continue when a db was corrupted - even if fixed.
-	 )
-       ;; test read/write access to the database
-       (let ((db (sqlite3:open-database dbpath)))
-	 (sqlite3:set-busy-handler! db (sqlite3:make-busy-timeout 136000))
-	 (sqlite3:execute db "PRAGMA synchronous = 0;")
-	 (cond
-	  ((equal? fname "megatest.db")
-	   (sqlite3:execute db "DELETE FROM tests WHERE state='DELETED';"))
-	  ((equal? fname "main.db")
-	   (sqlite3:execute db "DELETE FROM runs WHERE state='deleted';"))
-	  ((string-match "\\d.db" fname)
-	   (sqlite3:execute db "UPDATE tests SET state='DELETED' WHERE state='DELETED';"))
-	  ((equal? fname "monitor.db")
-	   (sqlite3:execute "DELETE FROM servers WHERE state LIKE 'defunct%';"))
-	  (else
-	   (sqlite3:execute db "vacuum;")))
-	 
-	 (sqlite3:finalize! db)
-	 #t))))))
-    
-;; tbls is ( ("tablename" ( "field1" [#f|proc1] ) ( "field2" [#f|proc2] ) .... ) )
-;; db's are dbdat's
-;;
-;; if last-update specified ("field-name" . time-in-seconds)
-;;    then sync only records where field-name >= time-in-seconds
-;;    IFF field-name exists
-;;
-(define (db:sync-tables tbls last-update fromdb todb . slave-dbs)
-  (handle-exceptions
-   exn
-   (begin
-     (debug:print 0 *default-log-port* "EXCEPTION: database probably overloaded or unreadable in db:sync-tables.")
-     (print-call-chain (current-error-port))
-     (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
-     (debug:print 5 *default-log-port* "exn=" (condition->list exn))
-     (debug:print 0 *default-log-port* " status:  " ((condition-property-accessor 'sqlite3 'status) exn))
-     (debug:print 0 *default-log-port* " src db:  " (db:dbdat-get-path fromdb))
-     (for-each (lambda (dbdat)
-		 (let ((dbpath (db:dbdat-get-path dbdat)))
-		   (debug:print 0 *default-log-port* " dbpath:  " dbpath)
-		   (if (not (db:repair-db dbdat))
-		       (begin
-			 (debug:print-error 0 *default-log-port* "Failed to rebuild " dbpath ", exiting now.")
-			 (exit)))))
-	       (cons todb slave-dbs))
-     
-     0)
-   ;; this is the work to be done
-   (cond
-    ((not fromdb) (debug:print 3 *default-log-port* "WARNING: db:sync-tables called with fromdb missing")
-     -1)
-    ((not todb)   (debug:print 3 *default-log-port* "WARNING: db:sync-tables called with todb missing")
-     -2)
-    ((not (sqlite3:database? (db:dbdat-get-db fromdb)))
-     (debug:print-error 0 *default-log-port* "db:sync-tables called with fromdb not a database " fromdb)
-     -3)
-    ((not (sqlite3:database? (db:dbdat-get-db todb)))
-     (debug:print-error 0 *default-log-port* "db:sync-tables called with todb not a database " todb)
-     -4)
-
-    ((not (file-write-access? (db:dbdat-get-path todb)))
-     (debug:print-error 0 *default-log-port* "db:sync-tables called with todb not a read-only database " todb)
-     -5)
-    ((not (null? (let ((readonly-slave-dbs
-                        (filter
-                         (lambda (dbdat)
-                           (not (file-write-access? (db:dbdat-get-path todb))))
-                         slave-dbs)))
-                   (for-each
-                    (lambda (bad-dbdat)
-                      (debug:print-error
-                       0 *default-log-port* "db:sync-tables called with todb not a read-only database " bad-dbdat))
-                    readonly-slave-dbs)
-                   readonly-slave-dbs))) -6)
-    (else
-     (let ((stmts       (make-hash-table)) ;; table-field => stmt
-	   (all-stmts   '())              ;; ( ( stmt1 value1 ) ( stml2 value2 ))
-	   (numrecs     (make-hash-table))
-	   (start-time  (current-milliseconds))
-	   (tot-count   0))
-       (for-each ;; table
-	(lambda (tabledat)
-	  (let* ((tablename        (car tabledat))
-		 (fields           (cdr tabledat))
-		 (has-last-update  (member "last_update" fields))
-		 (use-last-update  (cond
-				    ((and has-last-update
-					  (member "last_update" fields))
-				     #t) ;; if given a number, just use it for all fields
-				    ((number? last-update) #f) ;; if not matched first entry then ignore last-update for this table
-				    ((and (pair? last-update)
-					  (member (car last-update)    ;; last-update field name
-						  (map car fields)))
-                                        #t)
-				    (last-update
-				     (debug:print 0 *default-log-port* "ERROR: parameter last-update for db:sync-tables must be a pair or a number, received: " last-update);; found in fields
-				     #f)
-				    (else
-				     #f)))
-		 (last-update-value (if use-last-update ;; no need to check for has-last-update - it is already accounted for
-					(if (number? last-update)
-					    last-update
-					    (cdr last-update))
-					#f))
-		 (last-update-field (if use-last-update
-					(if (number? last-update)
-					    "last_update"
-					    (car last-update))
-					#f))
-		 (num-fields (length fields))
-		 (field->num (make-hash-table))
-		 (num->field (apply vector (map car fields))) ;; BBHERE
-		 (full-sel   (conc "SELECT " (string-intersperse (map car fields) ",") 
-				   " FROM " tablename (if use-last-update ;; apply last-update criteria
-							  (conc " WHERE " last-update-field " >= " last-update-value)
-							  "")
-				   ";"))
-		 (full-ins   (conc "INSERT OR REPLACE INTO " tablename " ( " (string-intersperse (map car fields) ",") " ) "
-				   " VALUES ( " (string-intersperse (make-list num-fields "?") ",") " );"))
-		 (fromdat    '())
-		 (fromdats   '())
-		 (totrecords 0)
-		 (batch-len  (string->number (or (configf:lookup *configdat* "sync" "batchsize") "100")))
-		 (todat      (make-hash-table))
-		 (count      0)
-                 (field-names (map car fields))
-                 (delay-handicap  (string->number (or (configf:lookup *configdat* "sync" "delay-handicap") "0")))
-                 )
-
-	    ;; set up the field->num table
-	    (for-each
-	     (lambda (field)
-	       (hash-table-set! field->num field count)
-	       (set! count (+ count 1)))
-	     fields)
-
-	    ;; read the source table
-	    (sqlite3:for-each-row
-	     (lambda (a . b)
-	       (set! fromdat (cons (apply vector a b) fromdat))
-	       (if (> (length fromdat) batch-len)
-		   (begin
-		     (set! fromdats (cons fromdat fromdats))
-		     (set! fromdat  '())
-		     (set! totrecords (+ totrecords 1)))))
-	     (db:dbdat-get-db fromdb)
-	     full-sel)
-	    
-	    ;; tack on remaining records in fromdat
-	    (if (not (null? fromdat))
-		(set! fromdats (cons fromdat fromdats)))
-
-	    (if (common:low-noise-print 120 "sync-records")
-		(debug:print-info 4 *default-log-port* "found " totrecords " records to sync"))
-
-	    ;; read the target table; BBHERE
-	    (sqlite3:for-each-row
-	     (lambda (a . b)
-	       (hash-table-set! todat a (apply vector a b)))
-	     (db:dbdat-get-db todb)
-	     full-sel)
-
-            (when (and delay-handicap (> delay-handicap 0))
-              (debug:print-info 0 *default-log-port* "imposing synthetic sync delay of "delay-handicap" seconds since sync/delay-handicap is configured")
-              (thread-sleep! delay-handicap)
-              (debug:print-info 0 *default-log-port* "synthetic sync delay of "delay-handicap" seconds completed")
-              )
-            
-	    ;; first pass implementation, just insert all changed rows
-	    (for-each 
-	     (lambda (targdb)
-	       (let* ((db                 (db:dbdat-get-db targdb))
-                      (drp-trigger        (if (member "last_update" field-names)
-					      (db:drop-trigger db tablename) 
-					      #f))
-                      (is-trigger-dropped (if (member "last_update" field-names)
-                                              (db:is-trigger-dropped db tablename)
-					      #f)) 
-		      (stmth  (sqlite3:prepare db full-ins)))
-		 ;; (db:delay-if-busy targdb) ;; NO WAITING
-                 (if (member "last_update" field-names)
-                     (debug:print-info 3 *default-log-port* "is-trigger-dropped: " is-trigger-dropped)) 
-		 (for-each
-		  (lambda (fromdat-lst)
-		    (sqlite3:with-transaction
-		     db
-		     (lambda ()
-		       (for-each ;; 
-			(lambda (fromrow)
-			  (let* ((a    (vector-ref fromrow 0))
-				 (curr (hash-table-ref/default todat a #f))
-				 (same #t))
-			    (let loop ((i 0))
-			      (if (or (not curr)
-				      (not (equal? (vector-ref fromrow i)(vector-ref curr i))))
-				  (set! same #f))
-			      (if (and same
-				       (< i (- num-fields 1)))
-				  (loop (+ i 1))))
-			    (if (not same)
-				(begin
-				  (apply sqlite3:execute stmth (vector->list fromrow))
-				  (hash-table-set! numrecs tablename (+ 1 (hash-table-ref/default numrecs tablename 0)))))))
-			fromdat-lst))))
-		  fromdats)
-		 (sqlite3:finalize! stmth)
-                 (if (member "last_update" field-names)
-                    (db:create-trigger db tablename))))
-	     (append (list todb) slave-dbs))))
-	tbls)
-       (let* ((runtime      (- (current-milliseconds) start-time))
-	      (should-print (or (debug:debug-mode 12)
-				(common:low-noise-print 120 "db sync" (> runtime 500))))) ;; low and high sync times treated as separate.
-	 (if should-print (debug:print 3 *default-log-port* "INFO: db sync, total run time " runtime " ms"))
-	 (for-each 
-	  (lambda (dat)
-	    (let ((tblname (car dat))
-		  (count   (cdr dat)))
-	      (set! tot-count (+ tot-count count))
-	      (if (> count 0)
-		  (if should-print (debug:print 0 *default-log-port* (format #f "    ~10a ~5a" tblname count))))))
-	  (sort (hash-table->alist numrecs)(lambda (a b)(> (cdr a)(cdr b))))))
-       tot-count)))))
-
-(define (db:patch-schema-rundb frundb)
-  ;;
-  ;; remove this some time after September 2016 (added in version v1.6031
-  ;;
-  (for-each
-   (lambda (table-name)
-     (handle-exceptions
-      exn
-      (if (string-match ".*duplicate.*" ((condition-property-accessor 'exn 'message) exn))
-          (debug:print 0 *default-log-port* "Column last_update already added to " table-name " table")
-          (db:general-sqlite-error-dump exn "alter table " table-name " ..." #f "none"))
-      (sqlite3:execute
-       frundb
-       (conc "ALTER TABLE " table-name " ADD COLUMN last_update INTEGER DEFAULT 0")))
-     (sqlite3:execute
-      frundb
-      (conc "DROP TRIGGER IF EXISTS update_" table-name "_trigger;"))
-     (sqlite3:execute
-      frundb
-      (conc "CREATE TRIGGER IF NOT EXISTS update_" table-name "_trigger AFTER UPDATE ON " table-name "
-                             FOR EACH ROW
-                               BEGIN 
-                                 UPDATE " table-name " SET last_update=(strftime('%s','now'))
-                                   WHERE id=old.id;
-                               END;"))
-     )
-   '("tests" "test_steps" "test_data")))
-
-(define (db:patch-schema-maindb maindb)
-  ;;
-  ;; remove all these some time after september 2016 (added in v1.6031
-  ;;
-  (for-each
-   (lambda (column type default)
-     (handle-exceptions
-	 exn
-	 (if (string-match ".*duplicate.*" ((condition-property-accessor 'exn 'message) exn))
-	     (debug:print 0 *default-log-port* "Column " column " already added to runs table")
-	     (db:general-sqlite-error-dump exn "alter table runs ..." #f "none"))
-       (sqlite3:execute
-	maindb
-	(conc "ALTER TABLE runs ADD COLUMN " column " " type " DEFAULT " default))))
-   (list "last_update" "contour")
-   (list "INTEGER"     "TEXT"   )
-   (list "0"           "''"   ))
-  ;; these schema changes don't need exception handling
-  (sqlite3:execute
-   maindb
-   "CREATE TRIGGER IF NOT EXISTS update_runs_trigger AFTER UPDATE ON runs
-                             FOR EACH ROW
-                               BEGIN 
-                                 UPDATE runs SET last_update=(strftime('%s','now'))
-                                   WHERE id=old.id;
-                               END;")
-  (sqlite3:execute maindb "CREATE TABLE IF NOT EXISTS run_stats (
-                              id     INTEGER PRIMARY KEY,
-                              run_id INTEGER,
-                              state  TEXT,
-                              status TEXT,
-                              count  INTEGER,
-                              last_update INTEGER DEFAULT (strftime('%s','now')))")
-  (sqlite3:execute maindb "CREATE TRIGGER  IF NOT EXISTS update_run_stats_trigger AFTER UPDATE ON run_stats
-                             FOR EACH ROW
-                               BEGIN 
-                                 UPDATE run_stats SET last_update=(strftime('%s','now'))
-                                   WHERE id=old.id;
-                               END;")
-  (sqlite3:execute maindb "CREATE TABLE IF NOT EXISTS test_rundat (
-                              id           INTEGER PRIMARY KEY,
-                              test_id      INTEGER,
-                              update_time  TIMESTAMP,
-                              cpuload      INTEGER DEFAULT -1,
-                              diskfree     INTEGER DEFAULT -1,
-                              diskusage    INTGER DEFAULT -1,
-                              run_duration INTEGER DEFAULT 0);"))
-
-(define (db:adj-target db)
-  (let ((fields    (configf:get-section *configdat* "fields"))
-	(field-num 0))
-    ;; because we will be refreshing the keys table it is best to clear it here
-    (sqlite3:execute db "DELETE FROM keys;")
-    (for-each
-     (lambda (field)
-       (let ((column (car field))
-	     (spec   (cadr field)))
-	 (handle-exceptions
-	  exn
-	  (if (string-match ".*duplicate.*" ((condition-property-accessor 'exn 'message) exn))
-	      (debug:print 0 *default-log-port* "Target field " column " already exists in the runs table")
-	      (db:general-sqlite-error-dump exn "alter table runs ..." #f "none"))
-	  ;; Add the column if needed
-	  (sqlite3:execute
-	   db
-	   (conc "ALTER TABLE runs ADD COLUMN " column " " spec)))
-	 ;; correct the entry in the keys column
-	 (sqlite3:execute
-	  db
-	  "INSERT INTO keys (id,fieldname,fieldtype) VALUES (?,?,?);"
-	  field-num column spec)
-	 ;; fill in blanks (not allowed as it would be part of the path
-	 (sqlite3:execute
-	  db
-	  (conc "UPDATE runs SET " column "='x' WHERE " column "='';"))
-	 (set! field-num (+ field-num 1))))
-     fields)))
-  
-(define *global-db-store* (make-hash-table))
-
-(define (db:get-access-mode)
-  (if (args:get-arg "-use-db-cache") 'cached 'rmt))
-
-;; Add db direct
-;;
-(define (db:dispatch-query access-mode rmt-cmd db-cmd . params)
-  (if (eq? access-mode 'cached)
-      (debug:print 2 *default-log-port* "not doing cached calls right now"))
-;;      (apply db:call-with-cached-db db-cmd params)
-      (apply rmt-cmd params))
-;;)
-
-;; return the target db handle so it can be used
-;;
-(define (db:cache-for-read-only source target #!key (use-last-update #f))
-  (if (and (hash-table-ref/default *global-db-store* target #f)
-	   (>= (file-modification-time target)(file-modification-time source)))
-      (hash-table-ref *global-db-store* target)
-      (let* ((toppath   (launch:setup))
-	     (targ-db-last-mod (if (common:file-exists? target)
-				   (file-modification-time target)
-				   0))
-	     (cache-db  (or (hash-table-ref/default *global-db-store* target #f)
-			    (db:open-megatest-db path: target)))
-	     (source-db (db:open-megatest-db path: source))
-	     (curr-time (current-seconds))
-	     (res      '())
-	     (last-update (if use-last-update (cons "last_update" targ-db-last-mod) #f)))
-	(db:sync-tables (db:sync-main-list source-db) last-update source-db cache-db)
-	(db:sync-tables db:sync-tests-only last-update source-db cache-db)
-	(hash-table-set! *global-db-store* target cache-db)
-	cache-db)))
-
-;; ;; call a proc with a cached db
-;; ;;
-;; (define (db:call-with-cached-db proc . params)
-;;   ;; first cache the db in /tmp
-;;   (let* ((cname-part (conc "megatest_cache/" (common:get-testsuite-name)))
-;; 	 (fname      (conc  (common:get-area-path-signature) ".db"))
-;; 	 (cache-dir  (common:get-create-writeable-dir
-;; 		      (list (conc "/tmp/" (current-user-name) "/" cname-part)
-;; 			    (conc "/tmp/" (current-user-name) "-" cname-part)
-;; 			     (conc "/tmp/" (current-user-name) "_" cname-part))))
-;; 	 (megatest-db (conc *toppath* "/megatest.db")))
-;;     ;; (debug:print-info 0 *default-log-port* "Using cache dir " cache-dir)
-;;     (if (not cache-dir)
-;; 	(begin
-;; 	  (debug:print 0 *default-log-port* "ERROR: Failed to find an area to write the cache db")
-;; 	  (exit 1))
-;; 	(let* ((th1      (make-thread
-;; 			  (lambda ()
-;; 			    (if (and (common:file-exists? megatest-db)
-;; 				     (file-write-access? megatest-db))
-;; 				(begin
-;; 				  (db:sync-to-megatest.db dbstruct 'timestamps) ;; internally mutexes on *db-local-sync*
-;; 				  (debug:print-info 2 *default-log-port* "Done syncing to megatest.db"))))
-;; 			  "call-with-cached-db sync-to-megatest.db"))
-;; 	       (cache-db (db:cache-for-read-only
-;; 			  megatest-db
-;; 			  (conc cache-dir "/" fname)
-;; 			  use-last-update: #t)))
-;; 	  (thread-start! th1)
-;; 	  (apply proc cache-db params)
-;; 	  ))))
-
-;; options:
-;;
-;;  'killservers  - kills all servers
-;;  'dejunk       - removes junk records
-;;  'adj-testids  - move test-ids into correct ranges
-;;  'old2new      - sync megatest.db to /tmp/.../megatest.db and /tmp/.../megatest_ref.db
-;;  'new2old      - sync /tmp/.../megatest.db to megatest.db and /tmp/.../megatest_ref.db (and update data_synced)
-;;  'closeall     - close all opened dbs
-;;  'schema       - attempt to apply schema changes
-;;  run-ids: '(1 2 3 ...) or #f (for all)
-;;
-(define (db:multi-db-sync dbstruct . options)
-  ;; (if (not (launch:setup))
-  ;;    (debug:print 0 *default-log-port* "ERROR: not able to setup up for megatest.")
-  (let* ((mtdb     (dbr:dbstruct-mtdb dbstruct))
-	 (tmpdb    (db:get-db dbstruct))
-	 (refndb   (dbr:dbstruct-refndb dbstruct))
-	 (allow-cleanup #t) ;; (if run-ids #f #t))
-	 (servers (server:get-list *toppath*)) ;; (tasks:get-all-servers (db:delay-if-busy tdbdat)))
-	 (data-synced 0)) ;; count of changed records (I hope)
-    
-    (for-each
-     (lambda (option)
-       
-       (case option
-	 ;; kill servers
-	 ((killservers)
-	  (for-each
-	   (lambda (server)
-             (handle-exceptions
-             exn
-             (begin 
-               (debug:print-info 0 *default-log-port*  "Unable to get host and/or port from " server ", exn=" exn)     
-               #f)
-	     (match-let (((mod-time host port start-time server-id pid) server))
-	       (if (and host pid)
-		   (tasks:kill-server host pid)))))
-	   servers)
-
-          ;; /tmp/bjbarcla/megatest_localdb/fullrun/.nfs.pdx.disks.icf_env_disk001.bjbarcla.gwa.issues.mtdev.matt-bisect.megatest.ext-tests.runs.all.v1.65.1.6524.dev.bb-24-justrollup-f8.rollup.fullrun/megatest.db.lock
-          (delete-file* (common:get-sync-lock-filepath))
-          )
-	 
-	 ;; clear out junk records
-	 ;;
-	 ((dejunk)
-	  ;; (db:delay-if-busy mtdb) ;; ok to delay on mtdb
-	  (when (file-write-access? (db:dbdat-get-path mtdb)) (db:clean-up mtdb))
-	  (db:clean-up tmpdb)
-	  (db:clean-up refndb))
-
-	 ;; sync runs, test_meta etc.
-	 ;;
-	 ((old2new)
-	  (set! data-synced
-	    (+ (db:sync-tables (db:sync-all-tables-list dbstruct) #f mtdb tmpdb refndb)
-	       data-synced)))
-	 
-	 ;; now ensure all newdb data are synced to megatest.db
-	 ;; do not use the run-ids list passed in to the function
-	 ;;
-	 ((new2old)
-	  (set! data-synced
-	    (+ (db:sync-tables (db:sync-all-tables-list dbstruct) #f tmpdb refndb mtdb)
-	       data-synced)))
-
-	 ((adj-target)
-	  (db:adj-target (db:dbdat-get-db mtdb))
-	  (db:adj-target (db:dbdat-get-db tmpdb))
-	  (db:adj-target (db:dbdat-get-db refndb)))
-	 
-	 ((schema)
-	  (db:patch-schema-maindb (db:dbdat-get-db mtdb))
-	  (db:patch-schema-maindb (db:dbdat-get-db tmpdb))
-	  (db:patch-schema-maindb (db:dbdat-get-db refndb))
-	  (db:patch-schema-rundb  (db:dbdat-get-db mtdb))
-	  (db:patch-schema-rundb  (db:dbdat-get-db tmpdb))
-	  (db:patch-schema-rundb  (db:dbdat-get-db refndb))))
-       
-       (stack-push! (dbr:dbstruct-dbstack dbstruct) tmpdb))
-     options)
-    data-synced))
-
-(define (db:tmp->megatest.db-sync dbstruct last-update)
-  (let* ((mtdb        (dbr:dbstruct-mtdb dbstruct))
-	 (tmpdb       (db:get-db dbstruct))
-	 (refndb      (dbr:dbstruct-refndb dbstruct))
-	 (res         (db:sync-tables (db:sync-all-tables-list dbstruct) last-update tmpdb refndb mtdb)))
-    (stack-push! (dbr:dbstruct-dbstack dbstruct) tmpdb)
-    res))
-
-;;;; run-ids
-;;    if #f use *db-local-sync* : or 'local-sync-flags
-;;    if #t use timestamps      : or 'timestamps
-;;
-;;  NB// no-sync-db is the db handle, not a flag!
-;;
-(define (db:sync-to-megatest.db dbstruct #!key (no-sync-db #f)) 
-  (let* ((start-time         (current-seconds))
-	 (last-full-update   (if no-sync-db
-				 (db:no-sync-get/default no-sync-db "LAST_FULL_UPDATE" 0)
-				 0))
-	 (full-sync-needed   (> (- start-time last-full-update) 3600)) ;; every hour do a full sync
-	 (last-update        (if full-sync-needed
-				 0
-				 (if no-sync-db
-				     (db:no-sync-get/default no-sync-db "LAST_UPDATE" 0)
-				     0))) ;; (or (db:get-var dbstruct "LAST_UPDATE") 0))
-	 (sync-needed        (> (- start-time last-update) 6))
-	 (res                (if (or sync-needed ;; don't sync if a sync already occurred in the past 6 seconds
-				     full-sync-needed)
-				 (begin
-				   (if no-sync-db
-				       (begin
-					 (if full-sync-needed (db:no-sync-set no-sync-db "LAST_FULL_UPDATE" start-time))
-					 (db:no-sync-set no-sync-db "LAST_UPDATE" start-time)))
-				   (db:tmp->megatest.db-sync dbstruct last-update))
-				 0))
-	 (sync-time           (- (current-seconds) start-time)))
-      (debug:print-info 3 *default-log-port* "Sync of newdb to olddb completed in " sync-time " seconds pid="(current-process-id))
-      (if (common:low-noise-print 30 "sync new to old")
-          (if sync-needed
-              (debug:print-info 0 *default-log-port* "Sync of " res " records from newdb to olddb completed in " sync-time " seconds pid="(current-process-id))
-              (debug:print-info 0 *default-log-port* "No sync needed, last updated " (- start-time last-update) " seconds ago")))
-      res))
-
-;; keeping it around for debugging purposes only
-#;(define (open-run-close-no-exception-handling  proc idb . params)
-  (debug:print-info 11 *default-log-port* "open-run-close-no-exception-handling START given a db=" (if idb "yes " "no ") ", params=" params)
-  (print "I don't work anymore. open-run-close-no-exception-handling needs fixing or removing...")
-  (exit)
-  (if (or *db-write-access*
-	  (not #t)) ;; was: (member proc * db:all-write-procs *)))
-      (let* ((db (cond
-		  ((pair? idb)                 (db:dbdat-get-db idb))
-		  ((sqlite3:database? idb)     idb)
-		  ((not idb)                   (debug:print-error 0 *default-log-port* "cannot open-run-close with #f anymore"))
-		  ((procedure? idb)            (idb))
-		  (else   	               (debug:print-error 0 *default-log-port* "cannot open-run-close with #f anymore"))))
-	     (res #f))
-	(set! res (apply proc db params))
-	(if (not idb)(sqlite3:finalize! dbstruct))
-	(debug:print-info 11 *default-log-port* "open-run-close-no-exception-handling END" )
-	res)
-      #f))
-
-#;(define (open-run-close-exception-handling proc idb . params)
-  (handle-exceptions
-   exn
-   (let ((sleep-time (random 30))
-	 (err-status ((condition-property-accessor 'sqlite3 'status #f) exn)))
-     (case err-status
-       ((busy)
-	(thread-sleep! sleep-time))
-       (else
-	(debug:print 0 *default-log-port* "EXCEPTION: database probably overloaded or unreadable.")
-	(debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
-	(debug:print 5 *default-log-port* "exn=" (condition->list exn))
-	(debug:print 0 *default-log-port* " status:  " ((condition-property-accessor 'sqlite3 'status) exn))
-	(print-call-chain (current-error-port))
-	(thread-sleep! sleep-time)
-	(debug:print-info 0 *default-log-port* "trying db call one more time....this may never recover, if necessary kill process " (current-process-id) " on host " (get-host-name) " to clean up")))
-     (apply open-run-close-exception-handling proc idb params))
-   (apply open-run-close-no-exception-handling proc idb params)))
-
-;; (define open-run-close 
-#;(define open-run-close open-run-close-exception-handling)
-		;;	   open-run-close-no-exception-handling
-;;			   open-run-close-exception-handling)
-;;)
-
-(define db:trigger-list 
-     (list (list "update_runs_trigger"  "CREATE TRIGGER IF NOT EXISTS update_runs_trigger AFTER UPDATE ON runs
-                             FOR EACH ROW
-                               BEGIN 
-                                 UPDATE runs SET last_update=(strftime('%s','now'))
-                                   WHERE id=old.id;
-                               END;" ) 
-	   (list "update_run_stats_trigger"  "CREATE TRIGGER  IF NOT EXISTS update_run_stats_trigger AFTER UPDATE ON run_stats
-                             FOR EACH ROW
-                               BEGIN 
-                                 UPDATE run_stats SET last_update=(strftime('%s','now'))
-                                   WHERE id=old.id;
-                               END;" )
-	   (list "update_tests_trigger"  "CREATE TRIGGER  IF NOT EXISTS update_tests_trigger AFTER UPDATE ON tests
-                             FOR EACH ROW
-                               BEGIN 
-                                 UPDATE tests SET last_update=(strftime('%s','now'))
-                                   WHERE id=old.id;
-                               END;" )
-	   (list "update_teststeps_trigger"  "CREATE TRIGGER  IF NOT EXISTS update_teststeps_trigger AFTER UPDATE ON test_steps
-                             FOR EACH ROW
-                               BEGIN 
-                                 UPDATE test_steps SET last_update=(strftime('%s','now'))
-                                   WHERE id=old.id;
-                               END;" )
-	   (list "update_test_data_trigger"  "CREATE TRIGGER  IF NOT EXISTS update_test_data_trigger AFTER UPDATE ON test_data
-                             FOR EACH ROW
-                               BEGIN 
-                                 UPDATE test_data SET last_update=(strftime('%s','now'))
-                                   WHERE id=old.id;
-                               END;" )))
-
-(define (db:create-all-triggers dbstruct)
-(db:with-db
-   dbstruct #f #f
-   (lambda (db)
-(db:create-triggers db))))
-
-(define (db:create-triggers db)
-    (for-each (lambda (key)
-              (sqlite3:execute db (cadr key)))
-          db:trigger-list))
-
-(define (db:drop-all-triggers dbstruct)
-  (db:with-db
-   dbstruct #f #f
-   (lambda (db)
-     (db:drop-triggers db))))
-
-(define (db:is-trigger-dropped db tbl-name)
-  (let* ((trigger-name (if (equal? tbl-name "test_steps")
-			   "update_teststeps_trigger" 
-                           (conc "update_" tbl-name "_trigger")))
-	 (res          #f))
-    (sqlite3:for-each-row
-     (lambda (name)
-       (if (equal? name trigger-name)
-	   (set! res #t)))
-     db 
-     "SELECT name FROM sqlite_master WHERE type = 'trigger' ;" 
-     )))
-
-(define (db:drop-triggers db)
-  (for-each
-   (lambda (key) 
-     (sqlite3:execute db (conc "drop trigger if exists " (car key))))
-   db:trigger-list))
-
-(define  (db:drop-trigger db tbl-name)
-  (let* ((trigger-name (if (equal? tbl-name "test_steps")
-			   "update_teststeps_trigger" 
-                           (conc "update_" tbl-name "_trigger"))))
-    (for-each
-     (lambda (key) 
-       (if (equal? (car key) trigger-name)
-           (sqlite3:execute db (conc "drop trigger if exists " trigger-name))))
-     db:trigger-list)))
-
-(define  (db:create-trigger db tbl-name)
-      (let* ((trigger-name (if (equal? tbl-name "test_steps")
-                              "update_teststeps_trigger" 
-                              (conc "update_" tbl-name "_trigger"))))
-       (for-each (lambda (key) 
-             (if (equal? (car key) trigger-name)
-             (sqlite3:execute db (cadr key))))
-      db:trigger-list))) 
-
-
-(define (db:initialize-main-db dbdat)
-  (when (not *configinfo*)
-           (launch:setup)) ;; added because Elena was getting stack dump because *configinfo* below was #f.
-  (let* ((configdat (car *configinfo*))  ;; tut tut, global warning...
-	 (keys     (keys:config-get-fields configdat))
-	 (havekeys (> (length keys) 0))
-	 (keystr   (keys->keystr keys))
-	 (fieldstr (keys:make-key/field-string configdat))
-	 (db       (db:dbdat-get-db dbdat)))
-    (for-each (lambda (key)
-		(let ((keyn key))
-		  (if (member (string-downcase keyn)
-			      (list "runname" "state" "status" "owner" "event_time" "comment" "fail_count"
-				    "pass_count" "contour"))
-		      (begin
-			(print "ERROR: your key cannot be named " keyn " as this conflicts with the same named field in the runs table, you must remove your megatest.db and <linktree>/.db before trying again.")
-			(exit 1)))))
-	      keys)
-    (sqlite3:with-transaction
-     db
-     (lambda ()
-      ;; handle-exceptions
-      ;; exn
-      ;; (begin
-      ;;   (debug:print 0 "ERROR: Failed to create tables. Look at your [fields] section, should be: fieldname TEXT DEFAULT 'yourdefault'")
-      ;;   (exit))
-	(sqlite3:execute db "CREATE TABLE IF NOT EXISTS keys (id INTEGER PRIMARY KEY, fieldname TEXT, fieldtype TEXT, CONSTRAINT keyconstraint UNIQUE (fieldname));")
-	(for-each (lambda (key)
-		    (sqlite3:execute db "INSERT OR REPLACE INTO keys (fieldname,fieldtype) VALUES (?,?);" key "TEXT"))
-		  keys)
-	(sqlite3:execute db (conc 
-			     "CREATE TABLE IF NOT EXISTS runs (id INTEGER PRIMARY KEY, \n			 " 
-			     fieldstr (if havekeys "," "") "
-			 runname    TEXT DEFAULT 'norun',
-                         contour    TEXT DEFAULT '',
-			 state      TEXT DEFAULT '',
-			 status     TEXT DEFAULT '',
-			 owner      TEXT DEFAULT '',
-			 event_time TIMESTAMP DEFAULT (strftime('%s','now')),
-			 comment    TEXT DEFAULT '',
-			 fail_count INTEGER DEFAULT 0,
-			 pass_count INTEGER DEFAULT 0,
-                         last_update INTEGER DEFAULT (strftime('%s','now')),
-			 CONSTRAINT runsconstraint UNIQUE (runname" (if havekeys "," "") keystr "));"))
-        ;; All triggers created at once in end
-	;;(sqlite3:execute db "CREATE TRIGGER IF NOT EXISTS update_runs_trigger AFTER UPDATE ON runs
-        ;;                    FOR EACH ROW
-        ;;                       BEGIN 
-        ;;                         UPDATE runs SET last_update=(strftime('%s','now'))
-        ;;                           WHERE id=old.id;
-        ;;                       END;")
-	(sqlite3:execute db "CREATE TABLE IF NOT EXISTS run_stats (
-                              id     INTEGER PRIMARY KEY,
-                              run_id INTEGER,
-                              state  TEXT,
-                              status TEXT,
-                              count  INTEGER,
-                              last_update INTEGER DEFAULT (strftime('%s','now')))")
-         ;; All triggers created at once in end
-         ;; (sqlite3:execute db "CREATE TRIGGER  IF NOT EXISTS update_run_stats_trigger AFTER UPDATE ON run_stats
-         ;;                   FOR EACH ROW
-         ;;                     BEGIN 
-         ;;                       UPDATE run_stats SET last_update=(strftime('%s','now'))
-         ;;                         WHERE id=old.id;
-         ;;                      END;")
-	(sqlite3:execute db "CREATE TABLE IF NOT EXISTS test_meta (
-                                     id          INTEGER PRIMARY KEY,
-                                     testname    TEXT DEFAULT '',
-                                     author      TEXT DEFAULT '',
-                                     owner       TEXT DEFAULT '',
-                                     description TEXT DEFAULT '',
-                                     reviewed    TIMESTAMP,
-                                     iterated    TEXT DEFAULT '',
-                                     avg_runtime REAL,
-                                     avg_disk    REAL,
-                                     tags        TEXT DEFAULT '',
-                                     jobgroup    TEXT DEFAULT 'default',
-                                CONSTRAINT test_meta_constraint UNIQUE (testname));")
-	(sqlite3:execute db "CREATE TABLE IF NOT EXISTS tasks_queue (id INTEGER PRIMARY KEY,
-                                action TEXT DEFAULT '',
-                                owner TEXT,
-                                state TEXT DEFAULT 'new',
-                                target TEXT DEFAULT '',
-                                name TEXT DEFAULT '',
-                                testpatt TEXT DEFAULT '',
-                                keylock TEXT,
-                                params TEXT,
-                                creation_time TIMESTAMP DEFAULT (strftime('%s','now')),
-                                execution_time TIMESTAMP);")
-	;; archive disk areas, cached info from [archive-disks]
-	(sqlite3:execute db "CREATE TABLE IF NOT EXISTS archive_disks (
-                                id INTEGER PRIMARY KEY,
-                                archive_area_name TEXT,
-                                disk_path TEXT,
-                                last_df INTEGER DEFAULT -1,
-                                last_df_time TIMESTAMP DEFAULT (strftime('%s','now')),
-                                creation_time TIMESTAMP DEFAULT (strftime('%s','now')));")
-	;; individual bup (or tar) data chunks
-	(sqlite3:execute db "CREATE TABLE IF NOT EXISTS archive_blocks (
-                                id INTEGER PRIMARY KEY,
-                                archive_disk_id INTEGER,
-                                disk_path TEXT,
-                                last_du INTEGER DEFAULT -1,
-                                last_du_time TIMESTAMP DEFAULT (strftime('%s','now')),
-                                creation_time TIMESTAMP DEFAULT (strftime('%s','now')));")
-	;; tests allocated to what chunks. reusing a chunk for a test/item_path is very efficient
-	;; NB// the per run/test recording of where the archive is stored is done in the test
-	;;      record. 
-	(sqlite3:execute db "CREATE TABLE IF NOT EXISTS archive_allocations (
-                                id INTEGER PRIMARY KEY,
-                                archive_block_id INTEGER,
-                                testname TEXT,
-                                item_path TEXT,
-                                creation_time TIMESTAMP DEFAULT (strftime('%s','now')));")
-	;; move this clean up call somewhere else
-	(sqlite3:execute db "DELETE FROM tasks_queue WHERE state='done' AND creation_time < ?;" (- (current-seconds)(* 24 60 60))) ;; remove older than 24 hrs
-	(sqlite3:execute db (conc "CREATE INDEX IF NOT EXISTS runs_index ON runs (runname" (if havekeys "," "") keystr ");"))
-	;; (sqlite3:execute db "CREATE VIEW runs_tests AS SELECT * FROM runs INNER JOIN tests ON runs.id=tests.run_id;")
-	(sqlite3:execute db "CREATE TABLE IF NOT EXISTS extradat (id INTEGER PRIMARY KEY, run_id INTEGER, key TEXT, val TEXT);")
-	(sqlite3:execute db "CREATE TABLE IF NOT EXISTS metadat (id INTEGER PRIMARY KEY, var TEXT, val TEXT,
-                                  CONSTRAINT metadat_constraint UNIQUE (var));")
-	(sqlite3:execute db "CREATE TABLE IF NOT EXISTS access_log (id INTEGER PRIMARY KEY, user TEXT, accessed TIMESTAMP, args TEXT);")
-	;; Must do this *after* running patch db !! No more. 
-	;; cannot use db:set-var since it will deadlock, hardwire the code here
-	(sqlite3:execute db "INSERT OR REPLACE INTO metadat (var,val) VALUES (?,?);" "MEGATEST_VERSION" (common:version-signature))
-	(debug:print-info 11 *default-log-port* "db:initialize END") ;; ))))
-
-	;;======================================================================
-	;; R U N   S P E C I F I C   D B 
-	;;======================================================================
-	
-	;; (define (db:initialize-run-id-db db)
-	;;   (sqlite3:with-transaction 
-	;;    db
-	;;    (lambda ()
-	(sqlite3:execute db "CREATE TABLE IF NOT EXISTS tests 
-                    (id INTEGER PRIMARY KEY,
-                     run_id       INTEGER   DEFAULT -1,
-                     testname     TEXT      DEFAULT 'noname',
-                     host         TEXT      DEFAULT 'n/a',
-                     cpuload      REAL      DEFAULT -1,
-                     diskfree     INTEGER   DEFAULT -1,
-                     uname        TEXT      DEFAULT 'n/a', 
-                     rundir       TEXT      DEFAULT '/tmp/badname',
-                     shortdir     TEXT      DEFAULT '/tmp/badname',
-                     item_path    TEXT      DEFAULT '',
-                     state        TEXT      DEFAULT 'NOT_STARTED',
-                     status       TEXT      DEFAULT 'FAIL',
-                     attemptnum   INTEGER   DEFAULT 0,
-                     final_logf   TEXT      DEFAULT 'logs/final.log',
-                     logdat       TEXT      DEFAULT '', 
-                     run_duration INTEGER   DEFAULT 0,
-                     comment      TEXT      DEFAULT '',
-                     event_time   TIMESTAMP DEFAULT (strftime('%s','now')),
-                     fail_count   INTEGER   DEFAULT 0,
-                     pass_count   INTEGER   DEFAULT 0,
-                     archived     INTEGER   DEFAULT 0, -- 0=no, > 1=archive block id where test data can be found
-                     last_update  INTEGER DEFAULT (strftime('%s','now')),
-                        CONSTRAINT testsconstraint UNIQUE (run_id, testname, item_path));")
-	;; deprecated -- (sqlite3:execute db "CREATE INDEX IF NOT EXISTS tests_index ON tests (run_id, testname, item_path, uname);")
-        
-        (sqlite3:execute db "CREATE INDEX IF NOT EXISTS tests_run_id_index ON tests (run_id);")  ;; new
-        (sqlite3:execute db "CREATE INDEX IF NOT EXISTS tests_testname_index ON tests (testname,item_path);") ;; new
-        (sqlite3:execute db "CREATE INDEX IF NOT EXISTS tests_state_status_index ON tests (state, status); ") ;; new
-
-         ;; All triggers created at once in end
-	;;(sqlite3:execute db "CREATE TRIGGER  IF NOT EXISTS update_tests_trigger AFTER UPDATE ON tests
-        ;;                     FOR EACH ROW
-        ;;                       BEGIN 
-        ;;                         UPDATE tests SET last_update=(strftime('%s','now'))
-        ;;                           WHERE id=old.id;
-        ;;                       END;")
-	(sqlite3:execute db "CREATE TABLE IF NOT EXISTS test_steps 
-                              (id INTEGER PRIMARY KEY,
-                               test_id INTEGER, 
-                               stepname TEXT, 
-                               state TEXT DEFAULT 'NOT_STARTED', 
-                               status TEXT DEFAULT 'n/a',
-                               event_time TIMESTAMP,
-                               comment TEXT DEFAULT '',
-                               logfile TEXT DEFAULT '',
-                               last_update  INTEGER DEFAULT (strftime('%s','now')),
-                               CONSTRAINT test_steps_constraint UNIQUE (test_id,stepname,state));")
-	(sqlite3:execute db "CREATE INDEX IF NOT EXISTS teststeps_index ON tests (run_id, testname, item_path);")
-        ;; All triggers created at once in end
-	;;(sqlite3:execute db "CREATE TRIGGER  IF NOT EXISTS update_teststeps_trigger AFTER UPDATE ON test_steps
-        ;;                     FOR EACH ROW
-        ;;                       BEGIN 
-        ;;                         UPDATE test_steps SET last_update=(strftime('%s','now'))
-        ;;                           WHERE id=old.id;
-        ;;                       END;")
-	(sqlite3:execute db "CREATE TABLE IF NOT EXISTS test_data (id INTEGER PRIMARY KEY,
-                                test_id INTEGER,
-                                category TEXT DEFAULT '',
-                                variable TEXT,
-	                        value REAL,
-	                        expected REAL,
-	                        tol REAL,
-                                units TEXT,
-                                comment TEXT DEFAULT '',
-                                status TEXT DEFAULT 'n/a',
-                                type TEXT DEFAULT '',
-                                last_update  INTEGER DEFAULT (strftime('%s','now')),
-                              CONSTRAINT test_data_constraint UNIQUE (test_id,category,variable));")
-	(sqlite3:execute db "CREATE INDEX IF NOT EXISTS test_data_index ON test_data (test_id);")
-        ;; All triggers created at once in end
-	;;(sqlite3:execute db "CREATE TRIGGER  IF NOT EXISTS update_test_data_trigger AFTER UPDATE ON test_data
-        ;;                     FOR EACH ROW
-        ;;                       BEGIN 
-        ;;                         UPDATE test_data SET last_update=(strftime('%s','now'))
-        ;;                           WHERE id=old.id;
-        ;;                       END;")
-	(sqlite3:execute db "CREATE TABLE IF NOT EXISTS test_rundat (
-                              id           INTEGER PRIMARY KEY,
-                              test_id      INTEGER,
-                              update_time  TIMESTAMP,
-                              cpuload      INTEGER DEFAULT -1,
-                              diskfree     INTEGER DEFAULT -1,
-                              diskusage    INTGER DEFAULT -1,
-                              run_duration INTEGER DEFAULT 0);")
-	(sqlite3:execute db "CREATE TABLE IF NOT EXISTS archives (
-                              id           INTEGER PRIMARY KEY,
-                              test_id      INTEGER,
-                              state        TEXT DEFAULT 'new',
-                              status       TEXT DEFAULT 'n/a',
-                              archive_type TEXT DEFAULT 'bup',
-                              du           INTEGER,
-                              archive_path TEXT);")))
-         (print "creating triggers from init") 
-        (db:create-triggers db)    
-     db)) ;; )
-
-;;======================================================================
-;; A R C H I V E S
-;;======================================================================
-
-;; dneeded is minimum space needed, scan for existing archives that 
-;; are on disks with adequate space and already have this test/itempath
-;; archived
-;;
-(define (db:archive-get-allocations dbstruct testname itempath dneeded)
-  (let* ((dbdat        (db:get-db dbstruct)) ;; archive tables are in main.db
-	 (db           (db:dbdat-get-db dbdat))
-	 (res          '())
-	 (blocks       '())) ;; a block is an archive chunck that can be added too if there is space
-    (sqlite3:for-each-row
-     (lambda (id archive-disk-id disk-path last-du last-du-time)
-       (set! res (cons (vector id archive-disk-id disk-path last-du last-du-time) res)))
-     db
-     "SELECT b.id,b.archive_disk_id,b.disk_path,b.last_du,b.last_du_time FROM archive_blocks AS b
-        INNER JOIN archive_allocations AS a ON a.archive_block_id=b.id
-        WHERE a.testname=? AND a.item_path=?;" 
-     testname itempath)
-    ;; Now res has list of candidate paths, look in archive_disks for candidate with potential free space
-    (if (null? res)
-	'()
-	(sqlite3:for-each-row
-	 (lambda (id archive-area-name disk-path last-df last-df-time)
-	   (set! blocks (cons (vector id archive-area-name disk-path last-df last-df-time) blocks)))
-	 db 
-	 (conc
-	  "SELECT d.id,d.archive_area_name,disk_path,last_df,last_df_time FROM archive_disks AS d
-             INNER JOIN archive_blocks AS b ON d.id=b.archive_disk_id
-             WHERE b.id IN (" (string-intersperse (map conc res) ",") ") AND
-         last_df > ?;")
-	 dneeded))
-    (stack-push! (dbr:dbstruct-dbstack dbstruct) dbdat)
-    blocks))
-    
-;; returns id of the record, register a disk allocated to archiving and record it's last known
-;; available space
-;;
-(define (db:archive-register-disk dbstruct bdisk-name bdisk-path df)
-  (let* ((dbdat        (db:get-db dbstruct)) ;; archive tables are in main.db
-	 (db           (db:dbdat-get-db dbdat))
-	 (res          #f))
-    (sqlite3:for-each-row
-     (lambda (id)
-       (set! res id))
-     db
-     "SELECT id FROM archive_disks WHERE archive_area_name=? AND disk_path=?;"
-     bdisk-name bdisk-path)
-    (if res ;; record exists, update df and return id
-	(begin
-	  (sqlite3:execute db "UPDATE archive_disks SET last_df=?,last_df_time=(strftime('%s','now'))
-                                  WHERE archive_area_name=? AND disk_path=?;"
-			   df bdisk-name bdisk-path)
-          (stack-push! (dbr:dbstruct-dbstack dbstruct) dbdat)
-	  res)
-	(begin
-	  (sqlite3:execute
-	   db
-	   "INSERT OR REPLACE INTO archive_disks (archive_area_name,disk_path,last_df)
-                VALUES (?,?,?);"
-	   bdisk-name bdisk-path df)
-          (stack-push! (dbr:dbstruct-dbstack dbstruct) dbdat)
-	  (db:archive-register-disk dbstruct bdisk-name bdisk-path df)))))
-
-;; record an archive path created on a given archive disk (identified by it's bdisk-id)
-;; if path starts with / then it is full, otherwise it is relative to the archive disk
-;; preference is to store the relative path.
-;;
-(define (db:archive-register-block-name dbstruct bdisk-id archive-path #!key (du #f))
-  (let* ((dbdat        (db:get-db dbstruct)) ;; archive tables are in main.db
-	 (db           (db:dbdat-get-db dbdat))
-	 (res          #f))
-    ;; first look to see if this path is already registered
-    (sqlite3:for-each-row
-     (lambda (id)
-       (set! res id))
-     db
-     "SELECT id FROM archive_blocks WHERE archive_disk_id=? AND disk_path=?;"
-     bdisk-id archive-path)
-    (if res ;; record exists, update du if applicable and return res
-	(if du (sqlite3:execute db "UPDATE archive_blocks SET last_du=?,last_du_time=(strftime('%s','now'))
-                                          WHERE archive_disk_id=? AND disk_path=?;"
-				bdisk-id archive-path du))
-	(begin
-	  (sqlite3:execute db "INSERT OR REPLACE INTO archive_blocks (archive_disk_id,disk_path,last_du)
-                                                        VALUES (?,?,?);"
-			   bdisk-id archive-path (or du 0))
-	  (set! res (db:archive-register-block-name dbstruct bdisk-id archive-path du: du))))
-    (stack-push! (dbr:dbstruct-dbstack dbstruct) dbdat)
-    res))
-
-
-;; The "archived" field in tests is overloaded; 0 = not archived, > 0 archived in block with given id
-;;
-(define (db:test-set-archive-block-id dbstruct run-id test-id archive-block-id)
-  (db:with-db
-   dbstruct
-   run-id
-   #f
-   (lambda (db)
-     (sqlite3:execute db "UPDATE tests SET archived=? WHERE id=?;"
-		      archive-block-id test-id))))
- 
-;; Look up the archive block info given a block-id
-;;
-(define (db:test-get-archive-block-info dbstruct archive-block-id)
-  (db:with-db
-   dbstruct
-   #f
-   #f
-   (lambda (db)
-     (let ((res #f))
-       (sqlite3:for-each-row 
-	;;        0         1           2        3          4           5
-	(lambda (id archive-disk-id disk-path last-du last-du-time creation-time)
-	  (set! res (vector id archive-disk-id disk-path last-du last-du-time creation-time)))
-	db
-	"SELECT id,archive_disk_id,disk_path,last_du,last_du_time,creation_time FROM archive_blocks WHERE id=?;"
-	archive-block-id)
-       res))))
-
-;; (define (db:archive-allocate-testsuite/area-to-block block-id testsuite-name areakey)
-;;   (let* ((dbdat        (db:get-db dbstruct #f)) ;; archive tables are in main.db
-;; 	 (db           (db:dbdat-get-db dbdat))
-;; 	 (res          '())
-;; 	 (blocks       '())) ;; a block is an archive chunck that can be added too if there is space
-;;     (sqlite3:for-each-row  #f)
-
-;;======================================================================
-;; L O G G I N G    D B 
-;;======================================================================
-
-(define (open-logging-db)
-  (let* ((dbpath    (conc (if *toppath* (conc *toppath* "/") "") "logging.db")) ;; fname)
-	 (dbexists  (common:file-exists? dbpath))
-	 (db        (sqlite3:open-database dbpath))
-	 (handler   (sqlite3:make-busy-timeout (if (args:get-arg "-override-timeout")
-					   (string->number (args:get-arg "-override-timeout"))
-					   136000)))) ;; 136000)))
-    (sqlite3:set-busy-handler! db handler)
-    (if (not dbexists)
-	(begin
-	  (sqlite3:execute db "CREATE TABLE IF NOT EXISTS log (id INTEGER PRIMARY KEY,event_time TIMESTAMP DEFAULT (strftime('%s','now')),logline TEXT,pwd TEXT,cmdline TEXT,pid INTEGER);")
-	  (db:set-sync db) ;; (sqlite3:execute db (conc "PRAGMA synchronous = 0;"))
-	  ))
-    db))
-
-(define (db:log-local-event . loglst)
-  (let ((logline (apply conc loglst)))
-    (db:log-event logline)))
-
-(define (db:log-event logline)
-  (let ((db (open-logging-db)))
-    (sqlite3:execute db "INSERT INTO log (logline,pwd,cmdline,pid) VALUES (?,?,?,?);"
-		     logline
-		     (current-directory)
-		     (string-intersperse (argv) " ")
-		     (current-process-id))
-    (sqlite3:finalize! db)
-    logline))
-
-;;======================================================================
-;; D B   U T I L S
-;;======================================================================
-
-;;======================================================================
-;; M A I N T E N A N C E
-;;======================================================================
-
-(define (db:have-incompletes? dbstruct run-id ovr-deadtime)
-  (let* ((incompleted '())
-	 (oldlaunched '())
-	 (toplevels   '())
-	 (deadtime-str (configf:lookup *configdat* "setup" "deadtime"))
-	 (deadtime     (if (and deadtime-str
-				(string->number deadtime-str))
-			   (string->number deadtime-str)
-			   72000))) ;; twenty hours
-    (db:with-db
-     dbstruct #f #f
-     (lambda (db)
-       (if (number? ovr-deadtime)(set! deadtime ovr-deadtime))
-       
-       ;; in RUNNING or REMOTEHOSTSTART for more than 10 minutes
-       ;;
-       ;; HOWEVER: this code in run:test seems to work fine
-       ;;              (> (- (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)
-          (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))))
-        db
-        "SELECT id,rundir,uname,testname,item_path FROM tests WHERE run_id=? AND (strftime('%s','now') - event_time) > (run_duration + ?) AND state IN ('RUNNING','REMOTEHOSTSTART');"
-        run-id 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)
-       (sqlite3:for-each-row
-        (lambda (test-id run-dir uname testname item-path)
-          (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))
-              (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)
-       
-       (debug:print-info 18 *default-log-port* "Found " (length oldlaunched) " old LAUNCHED items, " (length toplevels) " old LAUNCHED toplevel tests and " (length incompleted) " tests marked RUNNING but apparently dead.")
-       (if (and (null? incompleted)
-                (null? oldlaunched)
-                (null? toplevels))
-           #f
-           #t)))))
-
-(define (db:get-status-from-final-status-file run-dir)
-  (let ((infile (conc run-dir "/.final-status")))
-    ;; first verify we are able to write the output file
-    (if (not (file-read-access? infile))
-        (begin 
-	  (debug:print 0 *default-log-port* "ERROR: cannot read " infile)
-          (debug:print 0 *default-log-port* "ERROR: run-dir is " run-dir)
-          #f
-          )
-        (with-input-from-file infile read-lines)
-	)))
-
-;;  select end_time-now from
-;;      (select testname,item_path,event_time+run_duration as
-;;                          end_time,strftime('%s','now') as now from tests where state in
-;;      ('RUNNING','REMOTEHOSTSTART','LAUNCHED'));
-
-(define (db:find-and-mark-incomplete dbstruct run-id ovr-deadtime)
-  (let* ((incompleted '())
-	 (oldlaunched '())
-	 (toplevels   '())
-          ;; The default running-deadtime is 720 seconds = 12 minutes.
-          ;; "(running-deadtime-default (+ server-start-allowance (* 2 launch-monitor-period)))" = 200 + (2 * (200 + 30 + 30))
-         (deadtime-trim (or ovr-deadtime (configf:lookup-number *configdat* "setup" "deadtime")))
-         (server-start-allowance 200)
-         (server-overloaded-budget 200)
-         (launch-monitor-off-time (or (configf:lookup-number *configdat* "setup" "test-stats-update-period") 30))
-         (launch-monitor-on-time-budget 30)
-         (launch-monitor-period (+ launch-monitor-off-time launch-monitor-on-time-budget server-overloaded-budget))
-         (remotehoststart-deadtime-default (+ server-start-allowance server-overloaded-budget 30))
-         (remotehoststart-deadtime (or deadtime-trim remotehoststart-deadtime-default))
-         (running-deadtime-default (+ server-start-allowance (* 2 launch-monitor-period)))
-         (running-deadtime (or deadtime-trim running-deadtime-default)) ;; two minutes (30 seconds between updates, this leaves 3x grace period)
-         )
-    (debug:print-info 4  *default-log-port* "running-deadtime = " running-deadtime)
-    (debug:print-info 4  *default-log-port* "deadtime-trim = " deadtime-trim)
-
-    (db:with-db 
-     dbstruct #f #f
-     (lambda (db)
-       (let* ((stmth1 (db:get-cache-stmth
-		       dbstruct 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');"))
-	      (stmth2 (db:get-cache-stmth
-		       dbstruct 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 ('REMOTEHOSTSTART');"))
-	      (stmth3 (db:get-cache-stmth
-		       dbstruct db
-		       "SELECT id,rundir,uname,testname,item_path FROM tests
-                           WHERE run_id=? AND (strftime('%s','now') - event_time) > 86400
-                                          AND state IN ('LAUNCHED');")))
-	 ;; in RUNNING or REMOTEHOSTSTART for more than 10 minutes
-	 ;;
-	 ;; HOWEVER: this code in run:test seems to work fine
-	 ;;              (> (- (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 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
-		  (set! incompleted (cons (list test-id run-dir uname testname item-path run-id) incompleted))
-		  (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))))
-	  stmth1
-	  run-id running-deadtime) ;; default time 720 seconds
-       
-	 (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 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)))))
-	  stmth2
-	  run-id remotehoststart-deadtime) ;; default time 230 seconds
-	 
-	 ;; 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)
-	 (sqlite3:for-each-row
-	  (lambda (test-id run-dir uname testname item-path)
-	    (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 LAUNCHED state, test-id=" test-id
-				    " 1 day since event_time marked")
-                (set! oldlaunched (cons (list test-id run-dir uname testname item-path run-id) oldlaunched)))))
-	  stmth3
-	  run-id)
-       
-	 (debug:print-info 18 *default-log-port* "Found " (length oldlaunched) " old LAUNCHED items, "
-			   (length toplevels) " old LAUNCHED toplevel tests and "
-			   (length incompleted) " tests marked RUNNING but apparently dead."))
-
-	 ;; These are defunct tests, do not do all the overhead of set-state-status. Force them to INCOMPLETE.
-       ;;
-	 ;; (db:delay-if-busy dbdat)
-	 (let* ((min-incompleted-ids (map car incompleted)) ;; do 'em all
-		(all-ids             (append min-incompleted-ids (map car oldlaunched))))
-	   (if (> (length all-ids) 0)
-	       (begin
-		 ;; (launch:is-test-alive "localhost" 435)
-		 (debug:print 0 *default-log-port* "WARNING: Marking test(s); " (string-intersperse (map conc all-ids) ", ")
-			      " as DEAD")
-		 (for-each
-                  (lambda (test-id)
-                    (let* (;; (run-dir (db:test-get-rundir-from-test-id dbstruct run-id test-id))
-			   (tinfo   (db:get-test-info-by-id dbstruct run-id test-id))
-			   (run-dir (db:test-get-rundir     tinfo))
-			   (host    (db:test-get-host       tinfo))
-			   (pid     (db:test-get-process_id tinfo))
-			   (result (db:get-status-from-final-status-file run-dir)))
-		      (if (and (list? result) (> (length result) 1) (equal? "PASS" (cadr result)) (equal? "COMPLETED" (car result))) 
-			  (begin
-			    (debug:print 0 *default-log-port* "INFO: test " test-id " actually passed, so marking PASS not DEAD")
-			    (db:set-state-status-and-roll-up-items
-			     dbstruct run-id test-id 'foo "COMPLETED" "PASS"
-			     "Test stopped responding but it has PASSED; marking it PASS in the DB."))
-			  (let ((is-alive (and (not (eq? pid 0))  ;; 0 is default in re-used field "attemptnum" where pid stored.
-					       (launch:is-test-alive host pid))))
-			    (if is-alive
-				(debug:print 0 *default-log-port* "INFO: test " test-id " on host " host
-					     " has a process on pid " pid ", NOT setting to DEAD.")
-				(begin
-				  (debug:print 0 *default-log-port* "INFO: test " test-id
-					       " final state/status is not COMPLETED/PASS. It is " result)
-				  (db:set-state-status-and-roll-up-items
-				   dbstruct run-id test-id 'foo "COMPLETED" "DEAD"
-				   "Test stopped responding while in RUNNING or REMOTEHOSTSTART; presumed dead.")))))))
-		  ;; call end of eud of run detection for posthook - from merge, is it needed?
-		  ;; (launch:end-of-run-check run-id)
-		  all-ids)
-		 ;;call end of eud of run detection for posthook
-		 (launch:end-of-run-check run-id)
-		 )))))))
-
-;; BUG: Probably broken - does not explicitly use run-id in the query
-;;
-(define (db:top-test-set-per-pf-counts dbstruct run-id test-name)
-  (db:general-call dbstruct 'top-test-set-per-pf-counts (list test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name)))
-
-;; Clean out old junk and vacuum the database
-;;
-;; Ultimately do something like this:
-;;
-;; 1. Look at test records either deleted or part of deleted run:
-;;    a. If test dir exists, set the the test to state='UNKNOWN', Set the run to 'unknown'
-;;    b. If test dir gone, delete the test record
-;; 2. Look at run records
-;;    a. If have tests that are not deleted, set state='unknown'
-;;    b. ....
-;;
-(define (db:clean-up dbdat)
-  ;; (debug:print 0 *default-log-port* "WARNING: db clean up not fully ported to v1.60, cleanup action will be on megatest.db")
-  (let* ((keep-record-age ( - (current-seconds) (common:hms-string->seconds (or (configf:lookup *configdat* "setup" "delete-record-age") "30d"))))
-	 (db         (db:dbdat-get-db dbdat))
-	 (count-stmt (sqlite3:prepare db "SELECT (SELECT count(id) FROM tests)+(SELECT count(id) FROM runs);"))
-	(statements
-	 (map (lambda (stmt)
-		(sqlite3:prepare db stmt))
-	      (list
-	       ;; delete all tests that belong to runs that are 'deleted'
-	       (conc "DELETE FROM tests WHERE run_id in (SELECT id FROM runs WHERE state='deleted') and last_update < " keep-record-age ";")
-	       ;; delete all tests that are 'DELETED'
-	       (conc "DELETE FROM tests WHERE state='DELETED' and last_update < " keep-record-age " ;")
-	       ;; delete all tests that have no run
-	       (conc "DELETE FROM tests WHERE run_id NOT IN (SELECT DISTINCT id FROM runs) and last_update < " keep-record-age "; ")
-	       ;; delete all runs that are state='deleted'
-	       (conc "DELETE FROM runs WHERE state='deleted' and last_update < " keep-record-age ";")
-	       ;; delete empty runs
-	       (conc "DELETE FROM runs WHERE id NOT IN (SELECT DISTINCT r.id FROM runs AS r INNER JOIN tests AS t ON t.run_id=r.id) and last_update < " keep-record-age ";")
-	       ;; remove orphaned test_rundat entries
-	       (conc "DELETE FROM test_rundat where test_id NOT IN (SELECT id FROM tests);")
-	       ;; remove orphaned test_steps entries
-	       (conc "DELETE FROM test_steps WHERE test_id NOT IN (SELECT id FROM tests);")
-               ;; remove orphaned test_dat entries
-	       (conc "DELETE FROM test_data WHERE test_id NOT IN (SELECT id FROM tests);")
-
-	       ))))
-    ;; (db:delay-if-busy dbdat)
-    ;(debug:print-info 0 *default-log-port*  statements) 
-    (sqlite3:with-transaction 
-     db
-     (lambda ()
-       (sqlite3:for-each-row (lambda (tot)
-			       (debug:print-info 0 *default-log-port* "Records count before clean: " tot))
-			     count-stmt)
-       (map sqlite3:execute statements)
-       (sqlite3:for-each-row (lambda (tot)
-			       (debug:print-info 0 *default-log-port* "Records count after  clean: " tot))
-			     count-stmt)))
-    (map sqlite3:finalize! statements)
-    (sqlite3:finalize! count-stmt)
-    ;; (db:find-and-mark-incomplete db)
-    ;; (db:delay-if-busy dbdat)
-    (sqlite3:execute db "VACUUM;")))
-
-;; Clean out old junk and vacuum the database
-;;
-;; Ultimately do something like this:
-;;
-;; 1. Look at test records either deleted or part of deleted run:
-;;    a. If test dir exists, set the the test to state='UNKNOWN', Set the run to 'unknown'
-;;    b. If test dir gone, delete the test record
-;; 2. Look at run records
-;;    a. If have tests that are not deleted, set state='unknown'
-;;    b. ....
-;;
-(define (db:clean-up-rundb dbdat)
-  ;; (debug:print 0 *default-log-port* "WARNING: db clean up not fully ported to v1.60, cleanup action will be on megatest.db")
-  (let* ((db         (db:dbdat-get-db dbdat))
-	 (count-stmt (sqlite3:prepare db "SELECT (SELECT count(id) FROM tests);"))
-	(statements
-	 (map (lambda (stmt)
-		(sqlite3:prepare db stmt))
-	      (list
-	       ;; delete all tests that belong to runs that are 'deleted'
-	       ;; (conc "DELETE FROM tests WHERE run_id NOT IN (" (string-intersperse (map conc valid-runs) ",") ");")
-	       ;; delete all tests that are 'DELETED'
-	       "DELETE FROM tests WHERE state='DELETED';"
-	       ))))
-    ;; (db:delay-if-busy dbdat)
-    (sqlite3:with-transaction 
-     db
-     (lambda ()
-       (sqlite3:for-each-row (lambda (tot)
-			       (debug:print-info 0 *default-log-port* "Records count before clean: " tot))
-			     count-stmt)
-       (map sqlite3:execute statements)
-       (sqlite3:for-each-row (lambda (tot)
-			       (debug:print-info 0 *default-log-port* "Records count after  clean: " tot))
-			     count-stmt)))
-    (map sqlite3:finalize! statements)
-    (sqlite3:finalize! count-stmt)
-    ;; (db:find-and-mark-incomplete db)
-    ;; (db:delay-if-busy dbdat)
-    (sqlite3:execute db "VACUUM;")))
-
-;; Clean out old junk and vacuum the database
-;;
-;; Ultimately do something like this:
-;;
-;; 1. Look at test records either deleted or part of deleted run:
-;;    a. If test dir exists, set the the test to state='UNKNOWN', Set the run to 'unknown'
-;;    b. If test dir gone, delete the test record
-;; 2. Look at run records
-;;    a. If have tests that are not deleted, set state='unknown'
-;;    b. ....
-;;
-(define (db:clean-up-maindb dbdat)
-  ;; (debug:print 0 *default-log-port* "WARNING: db clean up not fully ported to v1.60, cleanup action will be on megatest.db")
-  (let* ((db         (db:dbdat-get-db dbdat))
-	 (count-stmt (sqlite3:prepare db "SELECT (SELECT count(id) FROM runs);"))
-	 (statements
-	  (map (lambda (stmt)
-		 (sqlite3:prepare db stmt))
-	       (list
-		;; delete all tests that belong to runs that are 'deleted'
-		;; (conc "DELETE FROM tests WHERE run_id NOT IN (" (string-intersperse (map conc valid-runs) ",") ");")
-		;; delete all tests that are 'DELETED'
-		"DELETE FROM runs WHERE state='deleted';"
-		)))
-	 (dead-runs '()))
-    (sqlite3:for-each-row
-     (lambda (run-id)
-       (set! dead-runs (cons run-id dead-runs)))
-       db
-       "SELECT id FROM runs WHERE state='deleted';")
-    ;; (db:delay-if-busy dbdat)
-    (sqlite3:with-transaction 
-     db
-     (lambda ()
-       (sqlite3:for-each-row (lambda (tot)
-			       (debug:print-info 0 *default-log-port* "Records count before clean: " tot))
-			     count-stmt)
-       (map sqlite3:execute statements)
-       (sqlite3:for-each-row (lambda (tot)
-			       (debug:print-info 0 *default-log-port* "Records count after  clean: " tot))
-			     count-stmt)))
-    (map sqlite3:finalize! statements)
-    (sqlite3:finalize! count-stmt)
-    ;; (db:find-and-mark-incomplete db)
-    ;; (db:delay-if-busy dbdat)
-    (sqlite3:execute db "VACUUM;")
-    dead-runs))
-
-;;======================================================================
-;; M E T A   G E T   A N D   S E T   V A R S
-;;======================================================================
-
-;; returns number if string->number is successful, string otherwise
-;; also updates *global-delta*
-;;
-(define (db:get-var dbstruct var)
-  (let* ((res      #f))
-    (db:with-db
-     dbstruct #f #f
-     (lambda (db)
-       (sqlite3:for-each-row
-        (lambda (val)
-          (set! res val))
-        db
-        "SELECT val FROM metadat WHERE var=?;" var)
-       ;; convert to number if can
-       (if (string? res)
-           (let ((valnum (string->number res)))
-             (if valnum (set! res valnum))))
-       res))))
-
-(define (db:inc-var dbstruct var)
-  (db:with-db dbstruct #f #t 
-	      (lambda (db)
-		(sqlite3:execute db "UPDATE metadat SET val=val+1 WHERE var=?;" var))))
-
-(define (db:dec-var dbstruct var)
-  (db:with-db dbstruct #f #t 
-	      (lambda (db)
-		(sqlite3:execute db "UPDATE metadat SET val=val-1 WHERE var=?;" var))))
-
-;; This was part of db:get-var. It was used to estimate the load on
-;; the database files.
-;;
-;; scale by 10, average with current value.
-;;     (set! *global-delta* (/ (+ *global-delta* (* (- (current-milliseconds) start-ms)
-;; 						 (if throttle throttle 0.01)))
-;; 			    2))
-;;     (if (> (abs (- *last-global-delta-printed* *global-delta*)) 0.08) ;; don't print all the time, only if it changes a bit
-;; 	(begin
-;; 	  (debug:print-info 4 *default-log-port* "launch throttle factor=" *global-delta*)
-;; 	  (set! *last-global-delta-printed* *global-delta*)))
-
-(define (db:set-var dbstruct var val)
-  (db:with-db dbstruct #f #t 
-	      (lambda (db)
-		(sqlite3:execute db "INSERT OR REPLACE INTO metadat (var,val) VALUES (?,?);" var val))))
-
-(define (db:add-var dbstruct var val)
-  (db:with-db dbstruct #f #t 
-	      (lambda (db)
-		(sqlite3:execute db "UPDATE metadat SET val=val+? WHERE var=?;" val var))))
-
-(define (db:del-var dbstruct var)
-  (db:with-db dbstruct #f #t 
-	      (lambda (db)
-		(sqlite3:execute db "DELETE FROM metadat WHERE var=?;" var))))
-
-;;======================================================================
-;; no-sync.db - small bits of data to be shared between servers
-;;======================================================================
-
-(define (db:open-no-sync-db)
-  (let* ((dbpath (db:dbfile-path))
-	 (dbname (conc dbpath "/no-sync.db"))
-	 (db-exists (common:file-exists? dbname))
-	 (db     (sqlite3:open-database dbname)))
-    (sqlite3:set-busy-handler! db (sqlite3:make-busy-timeout 136000))
-    (if (not db-exists)
-	(begin
-	  (sqlite3:execute db "PRAGMA synchronous = 0;")
-	  (sqlite3:execute db "CREATE TABLE IF NOT EXISTS no_sync_metadat (var TEXT,val TEXT, CONSTRAINT no_sync_metadat_constraint UNIQUE (var));")
-	  (sqlite3:execute db "PRAGMA journal_mode=WAL;")))
-    db))
-
-;; if we are not a server create a db handle. this is not finalized
-;; so watch for problems. I'm still not clear if it is needed to manually
-;; finalize sqlite3 dbs with the sqlite3 egg.
-;;
-(define (db:no-sync-db db-in)
-  (mutex-lock! *db-access-mutex*)
-  (let ((res (if db-in
-                 db-in
-                 (let ((db (db:open-no-sync-db)))
-                   (set! *no-sync-db* db)
-                   db))))
-    (mutex-unlock! *db-access-mutex*)
-    res))
-
-(define (db:no-sync-set db var val)
-  (sqlite3:execute (db:no-sync-db db) "INSERT OR REPLACE INTO no_sync_metadat (var,val) VALUES (?,?);" var val))
-
-(define (db:no-sync-del! db var)
-  (sqlite3:execute (db:no-sync-db db) "DELETE FROM no_sync_metadat WHERE var=?;" var))
-
-(define (db:no-sync-get/default db var default)
-  (let ((res default))
-    (sqlite3:for-each-row
-     (lambda (val)
-       (set! res val))
-     (db:no-sync-db db)
-     "SELECT val FROM no_sync_metadat WHERE var=?;"
-     var)
-    (if res
-        (let ((newres (if (string? res)
-			  (string->number res)
-			  #f)))
-          (if newres
-              newres
-              res))
-        res)))
-
-(define (db:no-sync-close-db db stmt-cache)
-  (db:safely-close-sqlite3-db db stmt-cache))
-
-;; transaction protected lock aquisition
-;; either:
-;;    fails    returns  (#f . lock-creation-time)
-;;    succeeds (returns (#t . lock-creation-time)
-;; use (db:no-sync-del! db keyname) to release the lock
-;;
-(define (db:no-sync-get-lock db-in keyname)
-  (let ((db (db:no-sync-db db-in)))
-    (sqlite3:with-transaction
-     db
-     (lambda ()
-       (handle-exceptions
-	   exn
-	 (let ((lock-time (current-seconds)))
-	   (debug:print-info 2 *default-log-port* "db:no-sync-get-lock keyname=" keyname ", lock-time=" lock-time ", exn=" exn)
-	   (sqlite3:execute db "INSERT INTO no_sync_metadat (var,val) VALUES(?,?);" keyname lock-time)
-	   `(#t . ,lock-time))
-	 `(#f . ,(sqlite3:first-result db "SELECT val FROM no_sync_metadat WHERE var=?;" keyname)))))))
-
-
-
-;; use a global for some primitive caching, it is just silly to
-;; re-read the db over and over again for the keys since they never
-;; change
-
-;; why get the keys from the db? why not get from the *configdat*
-;; using keys:config-get-fields?
-
-(define (db:get-keys dbstruct)
-  (if *db-keys* *db-keys* 
-      (let ((res '()))
-	(db:with-db dbstruct #f #f
-		    (lambda (db)
-		      (sqlite3:for-each-row 
-		       (lambda (key)
-			 (set! res (cons key res)))
-		       db
-		       "SELECT fieldname FROM keys ORDER BY id DESC;")))
-	(set! *db-keys* res)
-	res)))
-
-;; extract index number given a header/data structure
-(define (db:get-index-by-header header field)
-  (list-index (lambda (x)(equal? x field)) header))
-
-;; look up values in a header/data structure
-(define (db:get-value-by-header row header field)
-  (if (or (null? header) (not row))
-      #f
-      (let loop ((hed (car header))
-                 (tal (cdr header))
-                 (n   0))
-        (if (equal? hed field)
-            (handle-exceptions
-             exn
-             (begin
-               (debug:print 0 *default-log-port* "WARNING: attempt to read non-existant field, row="
-			    row " header=" header " field=" field ", exn=" exn)
-               #f)
-             (vector-ref row n))
-	    (if (null? tal) #f (loop (car tal)(cdr tal)(+ n 1)))))))
-
-;; Accessors for the header/data structure
-;; get rows and header from 
-(define (db:get-header vec)(vector-ref vec 0))
-(define (db:get-rows   vec)(vector-ref vec 1))
-
-;;======================================================================
-;;  R U N S
-;;======================================================================
-
-
-
-
-
-(define (db:get-run-times dbstruct run-patt target-patt)
-(let ((res `())
-           (qry 	(conc "select runname, (max(end_time)-min(event_time))/60 as runtime, target from (select runname, run_id,tests.event_time,tests.event_time+run_duration AS end_time, " (string-join (db:get-keys dbstruct) " || '/' || ") " as target from tests inner join runs on tests.run_id = runs.id where runs.runname like ? and target like ?) group by run_id ;")))
-;(print qry)
-(db:with-db 
-   dbstruct
-   #f ;; this is for the main runs db
-   #f ;; does not modify db
-   (lambda (db)
-            (sqlite3:for-each-row
-	(lambda (runname runtime target )
-	  (set! res (cons (vector runname runtime target) res)))
-	db
-        qry 
-	run-patt target-patt)
-       
-       res))))
-
-
-
-(define (db:get-run-name-from-id dbstruct run-id)
-  (db:with-db 
-   dbstruct
-   #f ;; this is for the main runs db
-   #f ;; does not modify db
-   (lambda (db)
-     (let ((res #f))
-       (sqlite3:for-each-row
-	(lambda (runname)
-	  (set! res runname))
-	db
-	"SELECT runname FROM runs WHERE id=?;"
-	run-id)
-       res))))
-
-(define (db:get-run-key-val dbstruct run-id key)
-  (db:with-db
-   dbstruct
-   #f
-   #f
-   (lambda (db)
-     (let ((res #f))
-       (sqlite3:for-each-row
-	(lambda (val)
-	  (set! res val))
-	db
-	(conc "SELECT " key " FROM runs WHERE id=?;")
-	run-id)
-       res))))
-
-;; keys list to key1,key2,key3 ...
-(define (runs:get-std-run-fields keys remfields)
-  (let* ((header    (append keys remfields))
-	 (keystr    (conc (keys->keystr keys) ","
-			  (string-intersperse remfields ","))))
-    (list keystr header)))
-
-;; make a query (fieldname like 'patt1' OR fieldname 
-(define (db:patt->like fieldname pattstr #!key (comparator " OR "))
-  (let ((patts (if (string? pattstr)
-		   (string-split pattstr ",")
-		   '("%"))))
-    (string-intersperse (map (lambda (patt)
-			       (let ((wildtype (if (substring-index "%" patt) "LIKE" "GLOB")))
-				 (conc fieldname " " wildtype " '" patt "'")))
-			     (if (null? patts)
-				 '("")
-				 patts))
-			comparator)))
-
-
-;; register a test run with the db, this accesses the main.db and does NOT
-;; use server api
-;;
-(define (db:register-run dbstruct keyvals runname state status user contour-in)
-  (let* ((keys      (map car keyvals))
-	 (keystr    (keys->keystr keys))
-	 (contour   (or contour-in ""))  ;; empty string to force no hierarcy and be backwards compatible.
-	 (comma     (if (> (length keys) 0) "," ""))
-	 (andstr    (if (> (length keys) 0) " AND " ""))
-	 (valslots  (keys->valslots keys)) ;; ?,?,? ...
-	 (allvals   (append (list runname state status user contour) (map cadr keyvals)))
-	 (qryvals   (append (list runname) (map cadr keyvals)))
-	 (key=?str  (string-intersperse (map (lambda (k)(conc k "=?")) keys) " AND ")))
-    (debug:print 3 *default-log-port* "keys: " keys " allvals: " allvals " keyvals: " keyvals " key=?str is " key=?str)
-    (debug:print 2 *default-log-port* "NOTE: using target " (string-intersperse (map cadr keyvals) "/") " for this run")
-    (if (and runname (null? (filter (lambda (x)(not x)) keyvals))) ;; there must be a better way to "apply and"
-	(db:with-db
-	 dbstruct #f #f
-	 (lambda (db)
-	   (let ((res #f))
-	     (apply sqlite3:execute db (conc "INSERT OR IGNORE INTO runs (runname,state,status,owner,event_time,contour" comma keystr ") VALUES (?,?,?,?,strftime('%s','now'),?" comma valslots ");")
-		    allvals)
-	     (apply sqlite3:for-each-row 
-		    (lambda (id)
-		      (set! res id))
-		    db
-		    (let ((qry (conc "SELECT id FROM runs WHERE (runname=? " andstr key=?str ");")))
-		      qry)
-		    qryvals)
-	     (sqlite3:execute db "UPDATE runs SET state=?,status=?,event_time=strftime('%s','now') WHERE id=? AND state='deleted';" state status res)
-	     res))) 
-	(begin
-	  (debug:print-error 0 *default-log-port* "Called without all necessary keys")
-	  #f))))
-
-;; replace header and keystr with a call to runs:get-std-run-fields
-;;
-;; keypatts: ( (KEY1 "abc%def")(KEY2 "%") )
-;; runpatts: patt1,patt2 ...
-;;
-(define (db:get-runs dbstruct runpatt count offset keypatts)
-  (let* ((res       '())
-	 (keys       (db:get-keys dbstruct))
-	 (runpattstr (db:patt->like "runname" runpatt))
-	 (remfields  (list "id" "runname" "state" "status" "owner" "event_time"))
-	 (header     (append keys remfields))
-	 (keystr     (conc (keys->keystr keys) ","
-			   (string-intersperse remfields ",")))
-	 (qrystr     (conc "SELECT " keystr " FROM runs WHERE (" runpattstr ") " ;; runname LIKE ? "
-			   ;; Generate: " AND x LIKE 'keypatt' ..."
-			   (if (null? keypatts) ""
-			       (conc " AND "
-				     (string-join 
-				      (map (lambda (keypatt)
-					     (let ((key  (car keypatt))
-						   (patt (cadr keypatt)))
-					       (db:patt->like key patt)))
-					   keypatts)
-				      " AND ")))
-			   " AND state != 'deleted' ORDER BY event_time DESC "
-			   (if (number? count)
-			       (conc " LIMIT " count)
-			       "")
-			   (if (number? offset)
-			       (conc " OFFSET " offset)
-			       ""))))
-    (debug:print-info 11 *default-log-port* "db:get-runs START qrystr: " qrystr " keypatts: " keypatts " offset: " offset " limit: " count)
-    (db:with-db dbstruct #f #f
-		(lambda (db)		
-		  (sqlite3:for-each-row
-		   (lambda (a . x)
-		     (set! res (cons (apply vector a x) res)))
-		   db
-		   qrystr
-		   )))
-    (debug:print-info 11 *default-log-port* "db:get-runs END qrystr: " qrystr " keypatts: " keypatts " offset: " offset " limit: " count)
-    (vector header res)))
-
-
-(define-record simple-run target id runname state status owner event_time)
-(define-record-printer (simple-run x out)
-  (fprintf out "#,(simple-run ~S ~S ~S ~S)"
-	   (simple-run-target x) (simple-run-id x) (simple-run-runname x) (time->string (seconds->local-time (simple-run-event_time x) ))))
-
-;; simple get-runs
-;;
-(define (db:simple-get-runs dbstruct runpatt count offset target last-update)
-    (let* ((res       '())
-	   (keys       (db:get-keys dbstruct))
-	   (runpattstr (db:patt->like "runname" runpatt))
-	   (remfields  (list "id" "runname" "state" "status" "owner" "event_time"))
-	   (targstr    (string-intersperse keys "||'/'||"))
-	   (keystr     (conc targstr " AS target,"
-			     (string-intersperse remfields ",")))
-	   (qrystr     (conc "SELECT " keystr " FROM runs WHERE (" runpattstr ") " ;; runname LIKE ? "
-			     ;; Generate: " AND x LIKE 'keypatt' ..."
-			     " AND target LIKE '" target "'"
-			     " AND state != 'deleted' "
-			     (if (number? last-update)
-				 (conc " AND last_update >= " last-update)
-				 "")
-			     " ORDER BY event_time DESC "
-			     (if (number? count)
-				 (conc " LIMIT " count)
-				 "")
-			     (if (number? offset)
-				 (conc " OFFSET " offset)
-				 "")))
-	   )
-    (debug:print-info 11 *default-log-port* "db:get-runs START qrystr: " qrystr " target: " target " offset: " offset " limit: " count)
-    (db:with-db dbstruct #f #f
-		(lambda (db)		
-		  (sqlite3:for-each-row
-		   (lambda (target id runname state status owner event_time)
-		     (set! res (cons (make-simple-run target id runname state status owner event_time) res)))
-		   db
-		   qrystr
-		   )))
-    (debug:print-info 11 *default-log-port* "db:get-runs END qrystr: " qrystr " target: " target " offset: " offset " limit: " count)
-    res))
-
-;; TODO: Switch this to use max(update_time) from each run db? Then if using a server there is no disk traffic (using inmem db)
-;;
-(define (db:get-changed-run-ids since-time)
-  (let* ((dbdir      (db:dbfile-path)) ;; (configf:lookup *configdat* "setup" "dbdir"))
-	 (alldbs     (glob (conc dbdir "/[0-9]*.db")))
-	 (changed    (filter (lambda (dbfile)
-			       (> (file-modification-time dbfile) since-time))
-			     alldbs)))
-    (delete-duplicates
-     (map (lambda (dbfile)
-	    (let* ((res (string-match ".*\\/(\\d)*\\.db" dbfile)))
-	      (if res
-		  (string->number (cadr res))
-		  (begin
-		    (debug:print 2 *default-log-port* "WARNING: Failed to process " dbfile " for run-id")
-		    0))))
-	  changed))))
-
-;; Get all targets from the db
-;;
-(define (db:get-targets dbstruct)
-  (let* ((res       '())
-	 (keys       (db:get-keys dbstruct))
-	 (header     keys) ;; (map key:get-fieldname keys))
-	 (keystr     (keys->keystr keys))
-	 (qrystr     (conc "SELECT " keystr " FROM runs WHERE state != 'deleted';"))
-	 (seen       (make-hash-table)))
-    (db:with-db
-     dbstruct
-     #f
-     #f
-     (lambda (db)
-       (sqlite3:for-each-row
-	(lambda (a . x)
-	  (let ((targ (cons a x)))
-	    (if (not (hash-table-ref/default seen targ #f))
-		(begin
-		  (hash-table-set! seen targ #t)
-		  (set! res (cons (apply vector targ) res))))))
-	db
-	qrystr)
-       (debug:print-info 11 *default-log-port* "db:get-targets END qrystr: " qrystr )
-       (vector header res)))))
-
-;; just get count of runs
-(define (db:get-num-runs dbstruct runpatt)
-  (db:with-db
-   dbstruct
-   #f
-   #f
-   (lambda (db)
-     (let ((numruns 0))
-       (debug:print-info 11 *default-log-port* "db:get-num-runs START " runpatt)
-       (sqlite3:for-each-row 
-	(lambda (count)
-	  (set! numruns count))
-	db
-	"SELECT COUNT(id) FROM runs WHERE runname LIKE ? AND state != 'deleted';" runpatt)
-       (debug:print-info 11 *default-log-port* "db:get-num-runs END " runpatt)
-       numruns))))
-
-;; just get count of runs
-(define (db:get-runs-cnt-by-patt dbstruct runpatt targetpatt keys)
-  (db:with-db
-   dbstruct
-   #f
-   #f
-   (lambda (db)
-     (let ((numruns 0)
-           (qry-str #f)
-           (key-patt "")
-	     	   (keyvals  (if targetpatt (keys:target->keyval keys targetpatt) '())))
-     
-    (for-each (lambda (keyval)
-		(let* ((key    (car keyval))
-		       (patt   (cadr keyval))
-		       (fulkey (conc ":" key))
-		       (wildtype (if (substring-index "%" patt) "like" "glob")))
-         
-		  (if patt
-		      (set! key-patt (conc key-patt " AND " key " " wildtype " '" patt "'"))
-		      (begin
-			(debug:print-error 0 *default-log-port* "searching for runs with no pattern set for " fulkey)
-			(exit 6)))))
-	      keyvals)
-    ;(print  runpatt " -- " key-patt)
-    (set! qry-str (conc "SELECT COUNT(id) FROM runs WHERE state != 'deleted' AND runname  like '" runpatt "'" key-patt))
-    ;(print qry-str )
-       
-       (sqlite3:for-each-row 
-					 (lambda (count)
-	  			    (set! numruns count))
-				db
-				qry-str)
-       (debug:print-info 11 *default-log-port* "db:get-num-runs END " runpatt)
-       numruns))))
-
-
-;; (sqlite3#fold-row proc3670 init3671 db-or-stmt3672 . params3673)>
-;; 
-(define (db:get-raw-run-stats dbstruct run-id)
-  (db:with-db
-   dbstruct
-   run-id
-   #f
-   (lambda (db)
-     (sqlite3:fold-row
-	(lambda (res state status count)
-	  (cons (list state status count) res))
-	'()
-	db
-	"SELECT state,status,count(id) AS count FROM tests WHERE run_id=? AND NOT(uname='n/a' AND item_path='') GROUP BY state,status;"
-	run-id))))
-
-;; Update run_stats for given run_id
-;; input data is a list (state status count)
-;;
-(define (db:update-run-stats dbstruct run-id stats)
-  ;; (mutex-lock! *db-transaction-mutex*)
-  (db:with-db
-   dbstruct
-   #f
-   #f
-
-   (lambda (db)
-     ;; remove previous data
-     
-     (let* ((stmt1 (sqlite3:prepare db "DELETE FROM run_stats WHERE run_id=? AND state=? AND status=?;"))
-	    (stmt2 (sqlite3:prepare db "INSERT INTO run_stats (run_id,state,status,count) VALUES (?,?,?,?);"))
-	    (res
-	     (sqlite3:with-transaction
-	      db
-	      (lambda ()
-		(for-each
-		 (lambda (dat)
-		   (sqlite3:execute stmt1 run-id (car dat)(cadr dat))
-		   (apply sqlite3:execute stmt2 run-id dat))
-		 stats)))))
-       (sqlite3:finalize! stmt1)
-       (sqlite3:finalize! stmt2)
-       ;; (mutex-unlock! *db-transaction-mutex*)
-       res))))
-
-(define (db:get-main-run-stats dbstruct run-id)
-  (db:with-db
-   dbstruct
-   #f ;; this data comes from main
-   #f
-   (lambda (db)
-     (sqlite3:fold-row
-	(lambda (res state status count)
-	  (cons (list state status count) res))
-	'()
-	db
-	"SELECT state,status,count FROM run_stats WHERE run_id=? AND run_id IN (SELECT id FROM runs WHERE state NOT IN ('DELETED','deleted'));"
-	run-id))))
-
-(define (db:print-current-query-stats)
-  ;; generate stats from *db-api-call-time*
-  (let ((ordered-keys (sort (hash-table-keys *db-api-call-time*)
-			    (lambda (a b)
-			      (let ((sum-a (common:sum (hash-table-ref *db-api-call-time* a)))
-				    (sum-b (common:sum (hash-table-ref *db-api-call-time* b))))
-				(> sum-a sum-b)))))
-	(total        0))
-    (for-each
-     (lambda (cmd-key)
-       (let* ((dat  (hash-table-ref *db-api-call-time* cmd-key))
-	      (num  (length dat))
-	      (avg  (if (> num 0)
-			(/ (common:sum dat)(length dat)))))
-	 (set! total (+ total num))
-	 (debug:print-info 0 *default-log-port* cmd-key "\tavg: " avg " max: " (common:max dat) " min: " (common:min-max < dat) " num: " (length dat))))
-     ordered-keys)
-    (debug:print-info 0 *default-log-port* "TOTAL: " total " api calls since start.")))
-
-(define (db:get-all-run-ids dbstruct)
-  (db:with-db
-   dbstruct
-   #f
-   #f
-   (lambda (db)
-     (let ((run-ids '()))
-       (sqlite3:for-each-row
-	(lambda (run-id)
-	  (set! run-ids (cons run-id run-ids)))
-	db
-	"SELECT id FROM runs WHERE state != 'deleted' ORDER BY event_time DESC;")
-    (reverse run-ids)))))
-
-;; get some basic run stats
-;;
-;; data structure:
-;;
-;; ( (runname (( state  count ) ... ))
-;;   (   ...
-;;
-(define (db:get-run-stats dbstruct)
-  (let* ((totals       (make-hash-table))
-	 (curr         (make-hash-table))
-	 (res          '())
-	 (runs-info    '()))
-    ;; First get all the runname/run-ids
-    (db:with-db
-     dbstruct #f #f
-     (lambda (db)
-       (sqlite3:for-each-row
-	(lambda (run-id runname)
-	  (set! runs-info (cons (list run-id runname) runs-info)))
-	db
-	"SELECT id,runname FROM runs WHERE state != 'deleted' ORDER BY event_time DESC;"))) ;; If you change this to the more logical ASC please adjust calls to db:get-run-stats
-    ;; for each run get stats data
-    (for-each
-     (lambda (run-info)
-       ;; get the net state/status counts for this run
-       (let* ((run-id   (car  run-info))
-	      (run-name (cadr run-info)))
-	 (db:with-db
-	  dbstruct
-	  run-id
-	  #f
-	  (lambda (db)
-	    (sqlite3:for-each-row
-	     (lambda (state status count)
-	       (let ((netstate (if (equal? state "COMPLETED") status state)))
-		 (if (string? netstate)
-		     (begin
-		       (hash-table-set! totals netstate (+ (hash-table-ref/default totals netstate 0) count))
-		       (hash-table-set! curr   netstate (+ (hash-table-ref/default curr   netstate 0) count))))))
-	     db
-	     "SELECT state,status,count(id) FROM tests AS t WHERE run_id=? GROUP BY state,status ORDER BY state,status DESC;"
-             run-id)
-	    ;; add the per run counts to res
-	    (for-each (lambda (state)
-			(set! res (cons (list run-name state (hash-table-ref curr state)) res)))
-		      (sort (hash-table-keys curr) string>=))
-	    (set! curr (make-hash-table))))))
-     runs-info)
-    (for-each (lambda (state)
-		(set! res (cons (list "Totals" state (hash-table-ref totals state)) res)))
-	      (sort (hash-table-keys totals) string>=))
-    res))
-
-;; db:get-runs-by-patt
-;; get runs by list of criteria
-;; register a test run with the db
-;;
-;; Use: (db:get-value-by-header (db:get-header runinfo)(db:get-rows runinfo))
-;;  to extract info from the structure returned
-;;
-(define (db:get-runs-by-patt dbstruct keys runnamepatt targpatt offset limit fields last-update  sort-order ) ;; test-name)
-  (let* ((tmp      (runs:get-std-run-fields keys (or fields '("id" "runname" "state" "status" "owner" "event_time"))))
-	 (keystr   (car tmp))
-	 (header   (cadr tmp))
-	 (key-patt "")
-	 (runwildtype (if (substring-index "%" runnamepatt) "like" "glob"))
-	 (qry-str  #f)
-	 (keyvals  (if targpatt (keys:target->keyval keys targpatt) '())))
-    (for-each (lambda (keyval)
-		(let* ((key    (car keyval))
-		       (patt   (cadr keyval))
-		       (fulkey (conc ":" key))
-		       (wildtype (if (substring-index "%" patt) "like" "glob")))
-		  (if patt
-		      (set! key-patt (conc key-patt " AND " key " " wildtype " '" patt "'"))
-		      (begin
-			(debug:print-error 0 *default-log-port* "searching for runs with no pattern set for " fulkey)
-			(exit 6)))))
-	      keyvals)
-    (set! qry-str (conc "SELECT " keystr " FROM runs WHERE state != 'deleted' AND runname " runwildtype " ? " key-patt 
-			(if last-update
-			       (conc " AND last_update >= " last-update " ")
-			       " ")
-			" ORDER BY event_time " sort-order " " 
-			(if limit  (conc " LIMIT " limit)   "")
-			(if offset (conc " OFFSET " offset) "")
-			";"))
-    (debug:print-info 4 *default-log-port* "runs:get-runs-by-patt qry=" qry-str " " runnamepatt)
-    ;(print "runs:get-runs-by-patt qry=" qry-str " " runnamepatt)
-
-    (vector header 
-            (reverse
-             (db:with-db dbstruct #f #f ;; reads db, does not write to it.
-                         (lambda (db)
-                           (sqlite3:fold-row
-                            (lambda (res . r)
-                              (cons (list->vector r) res))
-                            '()
-                            db
-                            qry-str
-                            runnamepatt)))))))
-
-;; use (get-value-by-header (db:get-header runinfo)(db:get-rows runinfo))
-;; NOTE: Does NOT return a list of rows (or one row) for the first slot of the vector
-;;       this is inconsistent with get-runs but it makes some sense.
-;;
-(define (db:get-run-info dbstruct run-id)
-  ;;(if (hash-table-ref/default *run-info-cache* run-id #f)
-  ;;    (hash-table-ref *run-info-cache* run-id)
-  (let* ((res       (vector #f #f #f #f))
-	 (keys      (db:get-keys dbstruct))
-	 (remfields (list "id" "runname" "state" "status" "owner" "event_time" "comment" "fail_count" "pass_count" "contour" "last_update")) ;;  "area_id"))
-	 (header    (append keys remfields))
-	 (keystr    (conc (keys->keystr keys) ","
-			  (string-intersperse remfields ","))))
-    (debug:print-info 11 *default-log-port* "db:get-run-info run-id: " run-id " header: " header " keystr: " keystr)
-    
-    (db:with-db
-     dbstruct #f #f
-     (lambda (db)
-       (sqlite3:for-each-row
-	(lambda (a . x)
-	  (set! res (apply vector a x)))
-	db 
-	(conc "SELECT " keystr " FROM runs WHERE id=?;")
-	run-id)))
-    (debug:print-info 11 *default-log-port* "db:get-run-info run-id: " run-id " header: " header " keystr: " keystr)
-    (let ((finalres (vector header res)))
-      ;; (hash-table-set! *run-info-cache* run-id finalres)
-      finalres)))
-
-(define (db:set-comment-for-run dbstruct run-id comment)
-  (db:with-db
-   dbstruct #f #f
-   (lambda (db)
-     (sqlite3:execute db "UPDATE runs SET comment=? WHERE id=?;" comment ;; (sdb:qry 'getid comment)
-		      run-id))))
-
-;; does not (obviously!) removed dependent data. But why not!!?
-(define (db:delete-run dbstruct run-id)
-  (db:with-db
-   dbstruct #f #f
-   (lambda (db)
-     (sqlite3:with-transaction
-      db
-      (lambda ()
-        (sqlite3:execute db "DELETE FROM test_steps WHERE test_id IN (SELECT id FROM tests WHERE run_id=?);" run-id)
-        (sqlite3:execute db "DELETE FROM test_data WHERE test_id IN (SELECT id FROM tests WHERE run_id=?);"  run-id)
-        (sqlite3:execute db "UPDATE tests SET state='DELETED',comment='' WHERE run_id=?;" run-id)
-        ;; (db:delay-if-busy dbdat)
-        (sqlite3:execute db "UPDATE runs SET state='deleted',comment='' WHERE id=?;" run-id))))))
-
-(define (db:update-run-event_time dbstruct run-id)
-  (db:with-db
-   dbstruct #f #t
-   (lambda (db)
-     (sqlite3:execute db "UPDATE runs SET event_time=strftime('%s','now') WHERE id=?;" run-id))))
-
-(define (db:lock/unlock-run dbstruct run-id lock unlock user)
-  (db:with-db
-   dbstruct #f #t
-   (lambda (db)
-     (let ((newlockval (if lock "locked"
-			   (if unlock
-			       "unlocked"
-			       "locked")))) ;; semi-failsafe
-       (sqlite3:execute db "UPDATE runs SET state=? WHERE id=?;" newlockval run-id)
-       (sqlite3:execute db "INSERT INTO access_log (user,accessed,args) VALUES(?,strftime('%s','now'),?);"
-			user (conc newlockval " " run-id))
-       (debug:print-info 1 *default-log-port* "" newlockval " run number " run-id)))))
-
-(define (db:set-run-status dbstruct run-id status msg)
-  (db:with-db
-   dbstruct #f #f
-   (lambda (db)
-       (if msg
-         (sqlite3:execute db "UPDATE runs SET status=?,comment=? WHERE id=?;" status msg run-id)
-         (sqlite3:execute db "UPDATE runs SET status=? WHERE id=?;" status run-id)))))
-
-(define (db:set-run-state-status dbstruct run-id state status )
-  (db:with-db
-   dbstruct #f #f
-   (lambda (db)
-          (sqlite3:execute db "UPDATE runs SET status=?,state=? WHERE id=?;" status state run-id))))
-
-
-
-(define (db:get-run-status dbstruct run-id)
-  (let ((res "n/a"))
-    (db:with-db
-     dbstruct #f #f
-     (lambda (db)
-       (sqlite3:for-each-row 
-	(lambda (status)
-	  (set! res status))
-	db
-	"SELECT status FROM runs WHERE id=?;" 
-	run-id)
-       res))))
-
-(define (db:get-run-state dbstruct run-id)
-  (let ((res "n/a"))
-    (db:with-db
-     dbstruct #f #f
-     (lambda (db)
-       (sqlite3:for-each-row 
-	(lambda (status)
-	  (set! res status))
-	db
-	"SELECT state FROM runs WHERE id=?;" 
-	run-id)
-       res))))
-
-
-;;======================================================================
-;; K E Y S
-;;======================================================================
-
-;; get key val pairs for a given run-id
-;; ( (FIELDNAME1 keyval1) (FIELDNAME2 keyval2) ... )
-(define (db:get-key-val-pairs dbstruct run-id)
-  (let* ((keys (db:get-keys dbstruct))
-	 (res  '()))
-    (db:with-db
-     dbstruct #f #f
-     (lambda (db)
-       (for-each 
-	(lambda (key)
-	  (let ((qry (conc "SELECT " key " FROM runs WHERE id=?;")))
-	    (sqlite3:for-each-row 
-	     (lambda (key-val)
-	       (set! res (cons (list key (if (string? key-val) key-val "")) res))) ;; replace non-string bad values with empty string to prevent crashes. This scenario can happen when Megatest is killed on updating the db
-	     db qry run-id)))
-	keys)))
-       (reverse res)))
-
-;; get key vals for a given run-id
-(define (db:get-key-vals dbstruct run-id)
-  (let* ((keys (db:get-keys dbstruct))
-	 (res  '()))
-    (db:with-db
-     dbstruct #f #f
-     (lambda (db)
-       (for-each 
-	(lambda (key)
-	  (let ((qry (conc "SELECT " key " FROM runs WHERE id=?;")))
-	    ;; (db:delay-if-busy dbdat)
-	    (sqlite3:for-each-row 
-	     (lambda (key-val)
-	       (set! res (cons (if (string? key-val) key-val "") res))) ;; check that the key-val is a string for cases where a crash injected bad data in the megatest.db
-	     db qry run-id)))
-	keys)))
-    (let ((final-res (reverse res)))
-      (hash-table-set! *keyvals* run-id final-res)
-      final-res)))
-
-;; The target is keyval1/keyval2..., cached in *target* as it is used often
-(define (db:get-target dbstruct run-id)
-  (let* ((keyvals (db:get-key-vals dbstruct run-id))
-	 (thekey  (string-intersperse (map (lambda (x)(if x x "-na-")) keyvals) "/")))
-    thekey))
-
-;; Get run-ids for runs with same target but different runnames and NOT run-id
-;;
-(define (db:get-prev-run-ids dbstruct run-id)
-  (let* ((keyvals (db:get-key-val-pairs dbstruct run-id))
-	 (kvalues (map cadr keyvals))
-	 (keys    (db:get-keys dbstruct))
-	 (qrystr  (string-intersperse (map (lambda (x)(conc x "=?")) keys) " AND ")))
-    (let ((prev-run-ids '()))
-      (if (null? keyvals)
-          '()
-          (begin
-            (db:with-db dbstruct #f #f ;; #f means work with the zeroth db - i.e. the runs db
-                        (lambda (db)
-                          (apply sqlite3:for-each-row
-                                 (lambda (id)
-                                   (set! prev-run-ids (cons id prev-run-ids)))
-                                 db
-                                 (conc "SELECT id FROM runs WHERE " qrystr " AND state != 'deleted' AND id != ?;")
-                                 (append kvalues (list run-id)))))
-            prev-run-ids)))))
-
-;;======================================================================
-;;  T E S T S
-;;======================================================================
-
-;; states and statuses are lists, turn them into ("PASS","FAIL"...) and use NOT IN
-;; i.e. these lists define what to NOT show.
-;; states and statuses are required to be lists, empty is ok
-;; not-in #t = above behaviour, #f = must match
-;; mode:
-;;  'dashboard - use state = 'COMPLETED' AND status in ( statuses ) OR state in ( states )
-;;
-(define (db:get-tests-for-run dbstruct run-id testpatt states statuses offset limit not-in sort-by sort-order qryvals last-update mode)
-  (let* ((qryvalstr       (case qryvals
-			    ((shortlist) "id,run_id,testname,item_path,state,status")
-			    ((#f)        db:test-record-qry-selector) ;; "id,run_id,testname,state,status,event_time,host,cpuload,diskfree,uname,rundir,item_path,run_duration,final_logf,comment")
-			    (else        qryvals)))
-	 (res            '())
-	 ;; if states or statuses are null then assume match all when not-in is false
-	 (states-qry      (if (null? states) 
-			      #f
-			      (conc " state "  
-				    (if (eq? mode 'dashboard)
-					" IN ('"
-					(if not-in
-					    " NOT IN ('"
-					    " IN ('")) 
-				    (string-intersperse states   "','")
-				    "')")))
-	 (statuses-qry    (if (null? statuses)
-			      #f
-			      (conc " status "
-				    (if (eq? mode 'dashboard)
-					" IN ('"
-					(if not-in 
-					    " NOT IN ('"
-					    " IN ('") )
-				    (string-intersperse statuses "','")
-				    "')")))
-	 (interim-qry       (conc " AND " (if not-in "NOT " "") "( state='COMPLETED' " (if statuses-qry (conc " AND " statuses-qry " ) ") " ) ")
-				  (if states-qry
-				      (conc (if not-in " AND " " OR ") states-qry ) ;; " ) ")
-				      "")))
-	 (states-statuses-qry 
-	  (cond 
-	   ((and states-qry statuses-qry)
-	    (case mode
-	      ((dashboard) 
-	       (if not-in
-		   (conc " AND (state='COMPLETED' AND status NOT IN ('" (string-intersperse statuses "','") "')) "
-			 " OR (state != 'COMPLETED' AND state NOT IN ('" (string-intersperse states "','") "')) ")
-		   (conc " AND (state='COMPLETED' AND status IN ('" (string-intersperse statuses "','") "')) "
-			 " OR (state NOT IN ('COMPLETED','DELETED') AND state IN ('" (string-intersperse states "','") "')) ")))
-	      (else       (conc " AND ( " states-qry " AND " statuses-qry " ) "))))
-	   (states-qry  
-	    (case mode
-	      ((dashboard) (conc " AND " (if not-in "NOT " "") " state IN ('" (string-intersperse states    "','") "') ")) ;; interim-qry)
-	      (else        (conc " AND " states-qry))))
-	   (statuses-qry 
-	    (case mode
-	      ((dashboard) (conc " AND " (if not-in "NOT " "") " status IN ('" (string-intersperse statuses "','") "') ")) ;; interim-qry)
-	      (else        (conc " AND " statuses-qry))))
-	   (else "")))
-	 (tests-match-qry (tests:match->sqlqry testpatt))
-	 (qry             (conc "SELECT " qryvalstr
-				(if run-id
-				    " FROM tests WHERE run_id=? "
-				    " FROM tests WHERE ? > 0 ") ;; should work?
-				(if last-update " " " AND state != 'DELETED' ") ;; if using last-update we want deleted tests?
-				states-statuses-qry
-				(if tests-match-qry (conc " AND (" tests-match-qry ") ") "")
-				(if last-update (conc " AND last_update >= " last-update " ") "")
-				(case sort-by
-				  ((rundir)      " ORDER BY length(rundir) ")
-				  ((testname)    (conc " ORDER BY testname " (if sort-order (conc sort-order ",") "") " item_path "))
-				  ((statestatus) (conc " ORDER BY state " (if  sort-order (conc sort-order ",") "") " status "))
-				  ((event_time)  " ORDER BY event_time ")
-				  (else          (if (string? sort-by)
-						     (conc " ORDER BY " sort-by " ")
-						     " ")))
-				(if sort-order sort-order " ")
-				(if limit  (conc " LIMIT " limit)   " ")
-				(if offset (conc " OFFSET " offset) " ")
-				";"
-				)))
-    (debug:print-info 8 *default-log-port* "db:get-tests-for-run run-id=" run-id ", qry=" qry)
-    (let* ((res (db:with-db dbstruct run-id #f
-			    (lambda (db)
-			      ;; (let* ((stmth (db:get-cache-stmth dbstruct db qry))) ;; due to use of last-update we can't efficiently cache this query
-				(reverse
-				 (sqlite3:fold-row
-				  (lambda (res . row)
-				    ;; id run-id testname state status event-time host cpuload
-				    ;;     diskfree uname rundir item-path run-duration final-logf comment)
-				    (cons (list->vector row) res))
-				  '()
-				  db qry ;; stmth
-				  (or run-id 1) ;; 1 > 0 , for the case where we are seeking tests matching criteral for all runs
-				  ))))))
-      (case qryvals
-	((shortlist)(map db:test-short-record->norm res))
-	((#f)       res)
-	(else       res)))))
-
-(define (db:test-short-record->norm inrec)
-  ;;  "id,run_id,testname,item_path,state,status"
-  ;;  "id,run_id,testname,state,status,event_time,host,cpuload,diskfree,uname,rundir,item_path,run_duration,final_logf,comment
-  (vector (vector-ref inrec 0) ;; id
-	  (vector-ref inrec 1) ;; run_id
-	  (vector-ref inrec 2) ;; testname
-	  (vector-ref inrec 4) ;; state
-	  (vector-ref inrec 5) ;; status
-	  -1 "" -1 -1 "" "-" 
-	  (vector-ref inrec 3) ;; item-path
-	  -1 "-" "-"))
-
-;;
-;; 1. cache tests-match-qry
-;; 2. compile qry and store in hash
-;; 3. convert for-each-row to fold
-;;
-;; (define (db:get-tests-for-run-state-status dbstruct run-id testpatt)
-;;   (db:with-db
-;;    dbstruct run-id #f
-;;    (lambda (db)
-;;      (let* ((res            '())
-;; 	    (stmt-cache      (dbr:dbstruct-stmt-cache dbstruct))
-;; 	    (stmth           (let* ((sh (db:hoh-get stmt-cache db testpatt)))
-;; 			       (or sh
-;; 				   (let* ((tests-match-qry (tests:match->sqlqry testpatt))
-;; 					  (qry             (conc "SELECT id,testname,item_path,state,status FROM tests WHERE run_id=? " 
-;; 								 (if tests-match-qry (conc " AND (" tests-match-qry ") ") "")))
-;; 					  (newsh           (sqlite3:prepare db qry)))
-;; 				     (debug:print-info 8 *default-log-port* "db:get-tests-for-run qry=" qry)
-;; 				     (db:hoh-set! stmt-cache db testpatt newsh)
-;; 				     newsh)))))
-;;        (reverse
-;; 	(sqlite3:fold-row
-;; 	 (lambda (res id testname item-path state status)
-;; 	   ;;  id,run_id,testname,state,status,event_time,host,cpuload,diskfree,uname,rundir,item_path,run_duration,final_logf,comment
-;; 	   (cons (vector id run-id testname state status -1         ""     -1      -1       ""    "-"  item-path -1           "-"         "-") res))
-;; 	 '()
-;; 	 stmth
-;; 	 run-id))))))
-
-(define (db:get-tests-for-run-state-status dbstruct run-id testpatt #!optional (last-update 0))
-  (let* ((res            '())
-	 (tests-match-qry (tests:match->sqlqry testpatt))
-	 (qry             (conc "SELECT id,testname,item_path,state,status,event_time,run_duration FROM tests WHERE run_id=? " 
-				" AND last_update > ? "
-				(if tests-match-qry (conc " AND (" tests-match-qry ") ") "")
-				)))
-    (debug:print-info 8 *default-log-port* "db:get-tests-for-run qry=" qry)
-    (db:with-db dbstruct run-id #f
-		(lambda (db)
-		  (sqlite3:fold-row
-		   (lambda (res id testname item-path state status event-time run-duration)
-		     ;;            id,run_id,testname,state,status,event_time,host,cpuload,diskfree,uname,rundir,item_path,run_duration,final_logf,comment
-		     (cons (vector id run-id testname state status event-time  ""     -1      -1       ""    "-"  item-path run-duration  "-"         "-") res))
-		   '()
-		   db 
-		   qry
-		   run-id
-		   (or last-update 0))))))
-
-(define (db:get-testinfo-state-status dbstruct run-id test-id)
-  (let ((res            #f))
-    (db:with-db dbstruct run-id #f
-		(lambda (db)
-		  (sqlite3:for-each-row
-		   (lambda (run-id testname item-path state status)
-		     ;; id,run_id,testname,state,status,event_time,host,cpuload,diskfree,uname,rundir,item_path,run_duration,final_logf,comment
-		     (set! res (vector test-id run-id testname state status -1 "" -1 -1 "" "-" item-path -1 "-" "-")))
-		   db 
-		   "SELECT run_id,testname,item_path,state,status FROM tests WHERE id=?;" 
-		   test-id)))
-    res))
-
-;; get a useful subset of the tests data (used in dashboard
-;; use db:mintest-get-{id ,run_id,testname ...}
-;;
-(define (db:get-tests-for-run-mindata dbstruct run-id testpatt states statuses not-in)
-  (db:get-tests-for-run dbstruct run-id testpatt states statuses #f #f not-in #f #f "id,run_id,testname,state,status,event_time,item_path" 0 #f))
-
-;; do not use.
-;;
-(define (db:get-tests-for-runs dbstruct run-ids testpatt states statuses #!key (not-in #f)(qryvals #f))
-  ;; (db:delay-if-busy)
-  (let ((res '()))
-    (for-each 
-     (lambda (run-id)
-       (set! res (append 
-		  res 
-		  (db:get-tests-for-run dbstruct run-id testpatt states statuses #f #f not-in #f #f qryvals #f 'normal))))
-     (if run-ids
-	 run-ids
-	 (db:get-all-run-ids dbstruct)))
-    res))
-
-;; Convert calling routines to get list of run-ids and loop, do not use the get-tests-for-runs
-;;
-
-(define (db:delete-test-records dbstruct run-id test-id)
-  (db:general-call dbstruct 'delete-test-step-records (list test-id))
-  (db:general-call dbstruct 'delete-test-data-records (list test-id))
-  (db:with-db
-   dbstruct #f #f
-   (lambda (db)
-     (sqlite3:execute db "UPDATE tests SET state='DELETED',status='n/a',comment='' WHERE id=?;" test-id))))
-
-;; 
-(define (db:delete-old-deleted-test-records dbstruct)
-  (let ((targtime (- (current-seconds)
-		     (or (configf:lookup-number *configdat* "setup" "keep-deleted-records")
-			 (* 30 24 60 60))))) ;; one month in the past
-    (db:with-db
-     dbstruct
-     0
-     #t
-     (lambda (db)
-       (sqlite3:with-transaction
-	db
-	(lambda ()
-	  (sqlite3:execute db "DELETE FROM test_steps WHERE test_id IN (SELECT id FROM tests WHERE state='DELETED' AND event_time<?);" targtime)
-	  (sqlite3:execute db "DELETE FROM test_data WHERE test_id IN (SELECT id FROM tests WHERE state='DELETED' AND event_time<?);" targtime)
-	  (sqlite3:execute db "DELETE FROM tests WHERE state='DELETED' AND event_time<?;" targtime)))))))
-
-;; set tests with state currstate and status currstatus to newstate and newstatus
-;; use currstate = #f and or currstatus = #f to apply to any state or status respectively
-;; WARNING: SQL injection risk. NB// See new but not yet used "faster" version below
-;;
-;;  AND NOT (item_path='' AND testname in (SELECT DISTINCT testname FROM tests WHERE testname=? AND item_path != ''));")))
-;;  (debug:print 0 *default-log-port* "QRY: " qry)
-;;  (db:delay-if-busy)
-;;
-;; NB// This call only operates on toplevel tests. Consider replacing it with more general call
-;;
-(define (db:set-tests-state-status dbstruct run-id testnames currstate currstatus newstate newstatus)
-  (let ((test-ids '()))
-    (for-each
-     (lambda (testname)
-       (let ((qry (conc "UPDATE tests SET state=?,status=? WHERE "
-			(if currstate  (conc "state='" currstate "' AND ") "")
-			(if currstatus (conc "status='" currstatus "' AND ") "")
-			" run_id=? AND testname LIKE ?;"))
-	     (test-id (db:get-test-id dbstruct run-id testname "")))
-	 (db:with-db
-	  dbstruct
-	  run-id
-	  #t
-	  (lambda (db)
-	    (sqlite3:execute db qry
-			     (or newstate  currstate "NOT_STARTED")
-			     (or newstatus currstate "UNKNOWN")
-			     run-id testname)))
-	 (if test-id
-	     (begin
-	       (set! test-ids (cons test-id test-ids))
-	       (mt:process-triggers dbstruct run-id test-id newstate newstatus)))))
-     testnames)
-    test-ids))
-
-;; ;; speed up for common cases with a little logic
-;; ;; NB// Ultimately this will be deprecated in deference to mt:test-set-state-status-by-id
-;;
-;;      NOTE: run-id is not used
-;; ;;
-(define (db:test-set-state-status dbstruct run-id test-id newstate newstatus newcomment)
-  (db:with-db
-   dbstruct
-   ;; run-id
-   #f
-   #t
-   (lambda (db)
-     (cond
-      ((and newstate newstatus newcomment)
-       (sqlite3:execute db "UPDATE tests SET state=?,status=?,comment=? WHERE id=?;" newstate newstatus newcomment ;; (sdb:qry 'getid newcomment)
-			test-id))
-      ((and newstate newstatus)
-       (sqlite3:execute db "UPDATE tests SET state=?,status=? WHERE id=?;" newstate newstatus test-id))
-      (else
-       (if newstate   (sqlite3:execute db "UPDATE tests SET state=?   WHERE id=?;" newstate   test-id))
-       (if newstatus  (sqlite3:execute db "UPDATE tests SET status=?  WHERE id=?;" newstatus  test-id))
-       (if newcomment (sqlite3:execute db "UPDATE tests SET comment=? WHERE id=?;" newcomment ;; (sdb:qry 'getid newcomment)
-				       test-id))))))
-  (mt:process-triggers dbstruct run-id test-id newstate newstatus))
-
-;; NEW BEHAVIOR: Count tests running in all runs!
-;;
-(define (db:get-count-tests-running dbstruct run-id) ;; fastmode)
-  (let* ((qry ;; (if fastmode
-		;;   "SELECT count(id) FROM tests WHERE state in ('RUNNING','LAUNCHED','REMOTEHOSTSTART') AND NOT (uname = 'n/a' AND item_path = '') LIMIT 1;"
-		  "SELECT count(id) FROM tests WHERE state in ('RUNNING','LAUNCHED','REMOTEHOSTSTART') AND NOT (uname = 'n/a' AND item_path = '');")) ;; )
-  (db:with-db
-   dbstruct
-   run-id
-   #f
-   (lambda (db)
-     (let* ((stmth (db:get-cache-stmth dbstruct  db qry)))
-       (sqlite3:first-result stmth))))))
-
-;; NEW BEHAVIOR: Count tests running in only one run!
-;;
-(define (db:get-count-tests-actually-running dbstruct run-id)
-  (db:with-db
-   dbstruct
-   run-id
-   #f
-   (lambda (db)
-     (sqlite3:first-result
-      db
-      ;; WARNING BUG EDIT ME - merged from v1.55 - not sure what is right here ...
-      ;; "SELECT count(id) FROM tests WHERE state in ('RUNNING','LAUNCHED','REMOTEHOSTSTART') AND run_id NOT IN (SELECT id FROM runs WHERE state='deleted') AND NOT (uname = 'n/a' AND item_path = '');")
-      "SELECT count(id) FROM tests WHERE state in ('RUNNING','REMOTEHOSTSTART','LAUNCHED') AND run_id=?;" 
-      run-id)))) ;; NOT IN (SELECT id FROM runs WHERE state='deleted');")
-
-;; NEW BEHAVIOR: Look only at single run with run-id
-;; 
-;; (define (db:get-running-stats dbstruct run-id)
-(define (db:get-count-tests-running-for-run-id dbstruct run-id) ;; fastmode)
-  (let* ((qry ;; (if fastmode
-		 ;;  "SELECT count(id) FROM tests WHERE state in ('RUNNING','LAUNCHED','REMOTEHOSTSTART') AND run_id=? LIMIT 1;"
-		  "SELECT count(id) FROM tests WHERE state in ('RUNNING','LAUNCHED','REMOTEHOSTSTART') AND run_id=?;")) ;; )
-    (db:with-db
-     dbstruct
-     run-id
-     #f
-     (lambda (db)
-       (let* ((stmth (db:get-cache-stmth dbstruct db qry)))
-	 (sqlite3:first-result stmth run-id))))))
-
-;; For a given testname how many items are running? Used to determine
-;; probability for regenerating html
-;;
-(define (db:get-count-tests-running-for-testname dbstruct run-id testname)
-  (db:with-db
-   dbstruct
-   run-id
-   #f
-   (lambda (db)
-     (let* ((stmt "SELECT count(id) FROM tests WHERE state in ('RUNNING','LAUNCHED','REMOTEHOSTSTART') AND run_id=? AND NOT (uname = 'n/a' AND item_path = '') AND testname=?;")
-	    (stmth (db:get-cache-stmth dbstruct db stmt)))
-       (sqlite3:first-result
-	stmth run-id testname)))))
-
-(define (db:get-not-completed-cnt dbstruct run-id)
-(db:with-db
-   dbstruct
-   run-id
-   #f
-   (lambda (db)
-      ;(print "SELECT count(id) FROM tests WHERE state not in ('COMPLETED', 'DELETED') AND run_id=" run-id)  
-     (sqlite3:first-result
-      db
-      "SELECT count(id) FROM tests WHERE state not in ('COMPLETED', 'DELETED') AND run_id=?;" run-id))))
-
-(define (db:get-count-tests-running-in-jobgroup dbstruct run-id jobgroup)
-  (if (not jobgroup)
-      0 ;; 
-      (let ((testnames '()))
-	;; get the testnames
-	(db:with-db
-	 dbstruct #f #f
-	 (lambda (db)
-	   (sqlite3:for-each-row
-	    (lambda (testname)
-	      (set! testnames (cons testname testnames)))
-	    db
-	    "SELECT testname FROM test_meta WHERE jobgroup=?"
-	    jobgroup)))
-	;; get the jobcount NB// EXTEND THIS TO OPPERATE OVER ALL RUNS?
-	(if (not (null? testnames))
-	    (db:with-db
-	     dbstruct
-	     run-id
-	     #f
-	     (lambda (db)
-	       (sqlite3:first-result
-		db
-		(conc "SELECT count(id) FROM tests WHERE state in ('RUNNING','LAUNCHED','REMOTEHOSTSTART') AND testname in ('"
-		      (string-intersperse testnames "','")
-		      "') AND NOT (uname = 'n/a' AND item_path='');")) ;; should this include the (uname = 'n/a' ...) ???
-	       ))
-	    0))))
-
-;; tags: '("tag%" "tag2" "%ag6")
-;;
-
-;; done with run when:
-;;   0 tests in LAUNCHED, NOT_STARTED, REMOTEHOSTSTART, RUNNING
-(define (db:estimated-tests-remaining dbstruct run-id)
-  (db:with-db
-   dbstruct
-   run-id
-   #f
-   (lambda (db)
-     (sqlite3:first-result
-      db
-      "SELECT count(id) FROM tests WHERE state in ('LAUNCHED','NOT_STARTED','REMOTEHOSTSTART','RUNNING','KILLREQ') AND run_id=?;")
-     run-id)))
-
-;; map run-id, testname item-path to test-id
-(define (db:get-test-id dbstruct run-id testname item-path)
-  (db:with-db
-   dbstruct
-   run-id
-   #f
-   (lambda (db)
-     (db:first-result-default
-      db
-      "SELECT id FROM tests WHERE testname=? AND item_path=? AND run_id=?;"
-      #f ;; the default
-      testname item-path run-id))))
-
-;; overload the unused attemptnum field for the process id of the runscript or 
-;; ezsteps step script in progress
-;;
-(define (db:test-set-top-process-pid dbstruct run-id test-id pid)
-  (db:with-db
-   dbstruct
-   run-id
-   #f
-   (lambda (db)
-     (sqlite3:execute db "UPDATE tests SET attemptnum=? WHERE id=?;"
-		      pid test-id))))
-
-(define (db:test-get-top-process-pid dbstruct run-id test-id)
-  (db:with-db
-   dbstruct
-   run-id
-   #f
-   (lambda (db)
-     (db:first-result-default 
-      db
-      "SELECT attemptnum FROM tests WHERE id=?;"
-      #f
-      test-id))))
-
-(define db:test-record-fields '("id"           "run_id"        "testname"  "state"      "status"      "event_time"
-				"host"         "cpuload"       "diskfree"  "uname"      "rundir"      "item_path"
-                                "run_duration" "final_logf"    "comment"   "shortdir"   "attemptnum"  "archived" "last_update"))
-
-;; fields *must* be a non-empty list
-;;
-(define (db:field->number fieldname fields)
-  (if (null? fields)
-      #f
-      (let loop ((hed  (car fields))
-		 (tal  (cdr fields))
-		 (indx 0))
-	(if (equal? fieldname hed)
-	    indx
-	    (if (null? tal)
-		#f
-		(loop (car tal)(cdr tal)(+ indx 1)))))))
-
-(define db:test-record-qry-selector (string-intersperse db:test-record-fields ","))
-
-(define (db:update-tesdata-on-repilcate-db dbstruct old-lt new-lt)
-  (db:with-db
-   dbstruct   #f   #f
-   (lambda (db)
-     (sqlite3:execute db "UPDATE tests SET rundir= replace(rundir,?,?), shortdir=replace(shortdir,?,?);"
-		      old-lt new-lt  old-lt new-lt))))
-
-;; NOTE: Use db:test-get* to access records
-;; NOTE: This needs rundir decoding? Decide, decode here or where used? For the moment decode where used.
-(define (db:get-all-tests-info-by-run-id dbstruct run-id)
-  (let* ((res '()))
-    (db:with-db
-     dbstruct #f #f
-     (lambda (db)
-       (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)
-	  ;;                 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)
-			  res)))
-	db
-	(conc "SELECT " db:test-record-qry-selector " FROM tests WHERE state != 'DELETED' AND run_id=?;")
-	run-id)))
-    res))
-
-(define (db:replace-test-records dbstruct run-id testrecs)
-  (db:with-db dbstruct run-id #t 
-	      (lambda (db)
-		(let* ((qmarks (string-intersperse (make-list (length db:test-record-fields) "?") ","))
-		       (qrystr (conc "INSERT OR REPLACE INTO tests (" db:test-record-qry-selector ") VALUES (" qmarks ") WHERE run_id=?;"))
-		       (qry    (sqlite3:prepare db qrystr)))
-		  (debug:print 0 *default-log-port* "INFO: migrating test records for run with id " run-id)
-		  (sqlite3:with-transaction
-		   db
-		   (lambda ()
-		     (for-each 
-		      (lambda (rec)
-			;; (debug:print 0 *default-log-port* "INFO: Inserting values: " (string-intersperse (map conc (vector->list rec)) ",") "\n")
-			(apply sqlite3:execute qry (append (vector->list rec)(list run-id))))
-		      testrecs)))
-		  (sqlite3:finalize! qry)))))
-
-;; map a test-id into the proper range
-;;
-(define (db:adj-test-id mtdb min-test-id test-id)
-  (if (>= test-id min-test-id)
-      test-id
-      (let loop ((new-id min-test-id))
-	(let ((test-id-found #f))
-	  (sqlite3:for-each-row 
-	   (lambda (id)
-	     (set! test-id-found id))
-	   (db:dbdat-get-db mtdb)
-	   "SELECT id FROM tests WHERE id=?;"
-	   new-id)
-	  ;; if test-id-found then need to try again
-	  (if test-id-found
-	      (loop (+ new-id 1))
-	      (begin
-		(debug:print-info 0 *default-log-port* "New test id " new-id " selected for test with id " test-id)
-		(sqlite3:execute mtdb "UPDATE tests SET id=? WHERE id=?;" new-id test-id)))))))
-
-;; move test ids into the 30k * run_id range
-;;
-(define (db:prep-megatest.db-adj-test-ids mtdb run-id testrecs)
-  (debug:print-info 0 *default-log-port* "Adjusting test ids in megatest.db for run " run-id)
-  (let ((min-test-id (* run-id 30000)))
-    (for-each 
-     (lambda (testrec)
-       (let* ((test-id (vector-ref testrec (db:field->number "id" db:test-record-fields))))
-	 (db:adj-test-id (db:dbdat-get-db mtdb) min-test-id test-id)))
-     testrecs)))
-	
-;; 1. move test ids into the 30k * run_id range
-;; 2. move step ids into the 30k * run_id range
-;;
-(define (db:prep-megatest.db-for-migration mtdb)
-  (let* ((run-ids (db:get-all-run-ids mtdb)))
-    (for-each 
-     (lambda (run-id)
-       (let ((testrecs (db:get-all-tests-info-by-run-id mtdb run-id)))
-	 (db:prep-megatest.db-adj-test-ids (db:dbdat-get-db mtdb) run-id testrecs)))
-     run-ids)))
-
-;; Get test data using test_id, run-id is not used
-;; 
-(define (db:get-test-info-by-id dbstruct run-id test-id)
-  (db:with-db
-   dbstruct
-   #f ;; 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 testname state status event-time host cpuload diskfree uname rundir-id item-path run_duration final-logf-id comment short-dir-id attemptnum archived last-update)
-	  ;;                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-id item-path run_duration final-logf-id comment short-dir-id attemptnum archived last-update)))
-	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!!
-;;
-(define (db:get-test-info-by-ids dbstruct run-id test-ids)
-  (db:with-db
-   dbstruct
-   run-id
-   #f
-   (lambda (db)
-     (let ((res '()))
-       (sqlite3:for-each-row
-	(lambda (a . b)
-	  ;;                 0    1       2      3      4        5       6      7        8     9     10      11          12          13       14
-	  (set! res (cons (apply vector a b) res)))
-	db
-	(conc "SELECT " db:test-record-qry-selector " FROM tests WHERE id in ("
-	      (string-intersperse (map conc test-ids) ",") ");"))
-       res))))
-
-(define (db:get-test-info dbstruct run-id test-name item-path)
-  (db:with-db
-   dbstruct
-   run-id
-   #f
-   (lambda (db)
-     (let ((res #f))
-       (sqlite3:for-each-row
-	(lambda (a . b)
-	  (set! res (apply vector a b)))
-	db
-	(conc "SELECT " db:test-record-qry-selector " FROM tests WHERE testname=? AND item_path=? AND run_id=?;")
-	test-name item-path run-id)
-       res))))
-
-(define (db:test-get-rundir-from-test-id dbstruct run-id test-id)
-  (db:with-db
-   dbstruct
-   run-id
-   #f
-   (lambda (db)
-     (db:first-result-default
-      db
-      "SELECT rundir FROM tests WHERE id=?;"
-      #f ;; default result
-      test-id))))
-
-(define (db:get-test-times dbstruct run-name target)
-  (let ((res `())
-        (qry 	(conc "select testname, item_path, run_duration, "
-		      (string-join (db:get-keys dbstruct) " || '/' || ")
-		      " as target from tests inner join runs on tests.run_id = runs.id where runs.runname = ? and target = ?  ;")))
-  (db:with-db 
-    dbstruct
-    #f ;; this is for the main runs db
-    #f ;; does not modify db
-    (lambda (db)
-            (sqlite3:for-each-row
-	(lambda (test-name item-path test-time target )
-	  (set! res (cons (vector test-name item-path test-time) res)))
-	db
-        qry 
-	run-name target)
-       res))))
-
-;;======================================================================
-;; S T E P S
-;;======================================================================
-
-(define (db:teststep-set-status! dbstruct run-id test-id teststep-name state-in status-in comment logfile)
-  (db:with-db
-   dbstruct
-   run-id
-   #t
-   (lambda (db)
-     (sqlite3:execute 
-      db
-      "INSERT OR REPLACE into test_steps (test_id,stepname,state,status,event_time,comment,logfile) VALUES(?,?,?,?,?,?,?);"
-      test-id teststep-name state-in status-in (current-seconds)
-      (if comment comment "")
-      (if logfile logfile "")))))
-
-
-
-(define (db:delete-steps-for-test! dbstruct run-id test-id)
-  ;; TODO: figure out why status is the key field rather than state (note:  CONSTRAINT test_steps_constraint UNIQUE (test_id,stepname,state) )
-  (db:with-db
-   dbstruct
-   run-id
-   #t
-   (lambda (db)
-     (sqlite3:execute 
-      db
-      "UPDATE test_steps set status='DELETED' where test_id=?" ;;  and run_id=? !! - run_id not in table (bummer) TODO: get run_id into schema for test_steps
-      test-id))))
-
-
-;; db-get-test-steps-for-run
-(define (db:get-steps-for-test dbstruct run-id test-id)
-  (db:with-db
-   dbstruct
-   run-id
-   #f
-   (lambda (db)
-     (let* ((res '()))
-       (sqlite3:for-each-row 
-	(lambda (id test-id stepname state status event-time logfile comment)
-	  (set! res (cons (vector id test-id stepname state status event-time (if (string? logfile) logfile "") comment) res)))
-	db
-	"SELECT id,test_id,stepname,state,status,event_time,logfile,comment FROM test_steps WHERE status != 'DELETED' AND test_id=? ORDER BY id ASC;" ;; event_time DESC,id ASC;
-	test-id)
-       (reverse res)))))
-
- (define (db:get-steps-info-by-id dbstruct  test-step-id)
-   (db:with-db
-    dbstruct
-    #f 
-    #f
-    (lambda (db)
-      (let* ((res (vector #f #f #f #f #f #f #f #f #f)))
-        (sqlite3:for-each-row 
-       (lambda (id test-id stepname state status event-time logfile comment last-update)
-         (set! res (vector id test-id stepname state status event-time (if (string? logfile) logfile "") comment last-update)))
-       db
-       "SELECT id,test_id,stepname,state,status,event_time,logfile,comment,last_update FROM test_steps WHERE id=? ORDER BY id ASC;" ;; event_time DESC,id ASC;
-       test-step-id)
-        res))))
-
-(define (db:get-steps-data dbstruct run-id test-id)
-  (db:with-db
-   dbstruct
-   run-id
-   #f
-   (lambda (db)
-     (let ((res '()))
-       (sqlite3:for-each-row 
-	(lambda (id test-id stepname state status event-time logfile)
-	  (set! res (cons (vector id test-id stepname state status event-time (if (string? logfile) logfile "")) res)))
-	db
-	"SELECT id,test_id,stepname,state,status,event_time,logfile FROM test_steps WHERE status != 'DELETED' AND test_id=? ORDER BY id ASC;" ;; event_time DESC,id ASC;
-	test-id)
-       (reverse res)))))
-
-;;======================================================================
-;; T E S T  D A T A 
-;;======================================================================
-
-(define (db:get-data-info-by-id dbstruct  test-data-id)
-  (let* ((stmt        "SELECT id,test_id, category, variable, value, expected, tol, units, comment, status, type, last_update FROM test_data WHERE id=? ORDER BY id ASC;")) ;; event_time DESC,id ASC;
-    (db:with-db
-     dbstruct
-     #f 
-     #f
-     (lambda (db)
-       (let* ((stmth (db:get-cache-stmth dbstruct db stmt))
-	      (res   (sqlite3:fold-row
-		      (lambda (res id test-id  category variable value expected tol units comment status type last-update)
-			(vector id test-id  category variable value expected tol units comment status type last-update))
-		      (vector #f #f #f #f #f #f #f #f #f #f #f #f)
-		      stmth
-		      test-data-id)))
-        res)))))
-
-;; WARNING: Do NOT call this for the parent test on an iterated test
-;; Roll up test_data pass/fail results
-;; look at the test_data status field, 
-;;    if all are pass (any case) and the test status is PASS or NULL or '' then set test status to PASS.
-;;    if one or more are fail (any case) then set test status to PASS, non "pass" or "fail" are ignored
-(define (db:test-data-rollup dbstruct run-id test-id status)
-  (let* ((fail-count 0)
-	 (pass-count 0))
-    (db:with-db
-     dbstruct #f #f
-     (lambda (db)
-       (sqlite3:for-each-row
-	(lambda (fcount pcount)
-	  (set! fail-count fcount)
-	  (set! pass-count pcount))
-	db 
-	"SELECT (SELECT count(id) FROM test_data WHERE test_id=? AND status like 'fail') AS fail_count,
-             (SELECT count(id) FROM test_data WHERE test_id=? AND status like 'pass') AS pass_count;"
-	test-id test-id)
-       ;; Now rollup the counts to the central megatest.db
-       (db:general-call dbstruct 'pass-fail-counts (list pass-count fail-count test-id))
-       ;; if the test is not FAIL then set status based on the fail and pass counts.
-       (db:general-call dbstruct 'test_data-pf-rollup (list test-id test-id test-id test-id))))))
-
-;; each section is a rule except "final" which is the final result
-;;
-;; [rule-5]
-;; operator in
-;; section LogFileBody
-;; desc Output voltage
-;; status OK
-;; expected 1.9
-;; measured 1.8
-;; type +/-
-;; tolerance 0.1
-;; pass 1
-;; fail 0
-;; 
-;; [final]
-;; exit-code 6
-;; exit-status SKIP
-;; message If flagged we are asking for this to exit with code 6
-;;
-;; recorded in steps table:
-;;   category: stepname
-;;   variable: rule-N
-;;   value:    measured
-;;   expected: expected
-;;   tol:      tolerance
-;;   units:    -
-;;   comment:  desc or message
-;;   status:   status
-;;   type:     type
-;; 
-(define (db:logpro-dat->csv dat stepname)
-  (let ((res '()))
-    (for-each
-     (lambda (entry-name)
-       (if (equal? entry-name "final")
-	   (set! res (append 
-		      res
-		      (list
-		       (list stepname
-			     entry-name
-			     (configf:lookup dat entry-name "exit-code")    ;; 0 ;; Value
-			     0                                              ;; 1 ;; Expected
-			     0                                              ;; 2 ;; Tolerance
-			     "n/a"					    ;; 3 ;; Units
-			     (configf:lookup dat entry-name "message")      ;; 4 ;; Comment
-			     (configf:lookup dat entry-name "exit-status")  ;; 5 ;; Status
-			     "logpro"                                       ;; 6 ;; Type
-			     ))))
-	   (let* ((value     (or (configf:lookup dat entry-name "measured")  "n/a"))
-		  (expected  (or (configf:lookup dat entry-name "expected")  0.0))
-		  (tolerance (or (configf:lookup dat entry-name "tolerance") 0.0))
-		  (comment   (or (configf:lookup dat entry-name "comment")
-				 (configf:lookup dat entry-name "desc")      "n/a"))
-		  (status    (or (configf:lookup dat entry-name "status")    "n/a"))
-		  (type      (or (configf:lookup dat entry-name "expected")  "n/a")))
-	     (set! res (append
-			res  
-			(list (list stepname
-				    entry-name 
-				    value        ;; 0
-				    expected     ;; 1
-				    tolerance    ;; 2
-				    "n/a"        ;; 3 Units
-				    comment      ;; 4
-				    status       ;; 5
-				    type         ;; 6
-				    )))))))
-     (hash-table-keys dat))
-    res))
-
-;; $MT_MEGATEST -load-test-data << EOF
-;; foo,bar,   1.2,  1.9, >
-;; foo,rab, 1.0e9, 10e9, 1e9
-;; foo,bla,   1.2,  1.9, <
-;; foo,bal,   1.2,  1.2, <   ,     ,Check for overload
-;; foo,alb,   1.2,  1.2, <=  , Amps,This is the high power circuit test
-;; foo,abl,   1.2,  1.3, 0.1
-;; foo,bra,   1.2, pass, silly stuff
-;; faz,bar,    10,  8mA,     ,     ,"this is a comment"
-;; EOF
-
-(define (db:csv->test-data dbstruct run-id test-id csvdata)
-  (debug:print 4 *default-log-port* "test-id " test-id ", csvdata: " csvdata)
-  (db:with-db
-   dbstruct #f #f
-   (lambda (db)
-     (let* ((csvlist (csv->list (make-csv-reader
-				 (open-input-string csvdata)
-				 '((strip-leading-whitespace? #t)
-				   (strip-trailing-whitespace? #t)))))) ;; (csv->list csvdata)))
-       (for-each
-	(lambda (csvrow)
-	  (let* ((padded-row  (take (append csvrow (list #f #f #f #f #f #f #f #f #f)) 9))
-		 (category    (list-ref padded-row 0))
-		 (variable    (list-ref padded-row 1))
-		 (value       (any->number-if-possible (list-ref padded-row 2)))
-		 (expected    (any->number-if-possible (list-ref padded-row 3)))
-		 (tol         (any->number-if-possible (list-ref padded-row 4))) ;; >, <, >=, <=, or a number
-		 (units       (list-ref padded-row 5))
-		 (comment     (list-ref padded-row 6))
-		 (status      (let ((s (list-ref padded-row 7)))
-				(if (and (string? s)(or (string-match (regexp "^\\s*$") s)
-							(string-match (regexp "^n/a$") s)))
-				    #f
-				    s))) ;; if specified on the input then use, else calculate
-		 (type        (list-ref padded-row 8)))
-	    ;; look up expected,tol,units from previous best fit test if they are all either #f or ''
-	    (debug:print 4 *default-log-port* "BEFORE: category: " category " variable: " variable " value: " value 
-			 ", expected: " expected " tol: " tol " units: " units " status: " status " comment: " comment " type: " type)
-	    
-	    (if (and (or (not expected)(equal? expected ""))
-		     (or (not tol)     (equal? expected ""))
-		     (or (not units)   (equal? expected "")))
-		(let-values (((new-expected new-tol new-units)(tdb:get-prev-tol-for-test #f test-id category variable)))
-		  (set! expected new-expected)
-		  (set! tol      new-tol)
-		  (set! units    new-units)))
-	    
-	    (debug:print 4 *default-log-port* "AFTER:  category: " category " variable: " variable " value: " value 
-			 ", expected: " expected " tol: " tol " units: " units " status: " status " comment: " comment)
-	    ;; calculate status if NOT specified
-	    (if (and (not status)(number? expected)(number? value)) ;; need expected and value to be numbers
-		(if (number? tol) ;; if tol is a number then we do the standard comparison
-		    (let* ((max-val (+ expected tol))
-			   (min-val (- expected tol))
-			   (result  (and (>=  value min-val)(<= value max-val))))
-		      (debug:print 4 *default-log-port* "max-val: " max-val " min-val: " min-val " result: " result)
-		      (set! status (if result "pass" "fail")))
-		    (set! status ;; NB// need to assess each one (i.e. not return operator since need to act if not valid op.
-		      (case (string->symbol tol) ;; tol should be >, <, >=, <=
-			((>)  (if (>  value expected) "pass" "fail"))
-			((<)  (if (<  value expected) "pass" "fail"))
-			((>=) (if (>= value expected) "pass" "fail"))
-			((<=) (if (<= value expected) "pass" "fail"))
-			(else (conc "ERROR: bad tol comparator " tol))))))
-	    (debug:print 4 *default-log-port* "AFTER2: category: " category " variable: " variable " value: " value 
-			 ", expected: " expected " tol: " tol " units: " units " status: " status " comment: " comment)
-	    ;; (db:delay-if-busy dbdat)
-	    (sqlite3:execute db "INSERT OR REPLACE INTO test_data (test_id,category,variable,value,expected,tol,units,comment,status,type) VALUES (?,?,?,?,?,?,?,?,?,?);"
-			     test-id category variable value expected tol units (if comment comment "") status type)))
-	csvlist)))))
-
-;; This routine moved from tdb.scm, tdb:read-test-data
-;;
-(define (db:read-test-data dbstruct run-id test-id categorypatt)
-  (let* ((res '()))
-    (db:with-db
-     dbstruct #f #f
-     (lambda (db)
-       (sqlite3:for-each-row 
-	(lambda (id test_id category variable value expected tol units comment status type)
-	  (set! res (cons (vector id test_id category variable value expected tol units comment status type) res)))
-	db
-	"SELECT id,test_id,category,variable,value,expected,tol,units,comment,status,type FROM test_data WHERE test_id=? AND category LIKE ? ORDER BY category,variable;" test-id categorypatt)
-       (reverse res)))))
-
-;; This routine moved from tdb.scm, :read-test-data
-;;
-(define (db:read-test-data-varpatt dbstruct run-id test-id categorypatt varpatt)
-  (let* ((res '()))
-    (db:with-db
-     dbstruct #f #f
-     (lambda (db)
-       (sqlite3:for-each-row 
-	(lambda (id test_id category variable value expected tol units comment status type)
-	  (set! res (cons (vector id test_id category variable value expected tol units comment status type) res)))
-	db
-	"SELECT id,test_id,category,variable,value,expected,tol,units,comment,status,type FROM test_data WHERE test_id=? AND category LIKE ? AND variable LIKE ? ORDER BY category,variable;" test-id categorypatt varpatt)
-       (reverse res)))))
-
-
-;;======================================================================
-;; Misc. test related queries
-;;======================================================================
-
-(define (db:get-run-ids-matching-target dbstruct keynames target res runname testpatt statepatt statuspatt)
-  (db:with-db
-   dbstruct #f #f
-   (lambda (db)
-     (let* ((row-ids '())
-	    (keystr (string-intersperse 
-		     (map (lambda (key val)
-			    (conc key " like '" val "'"))
-			  keynames 
-			  (string-split target "/"))
-		     " AND "))
-	    ;; (testqry (tests:match->sqlqry testpatt))
-	    (runsqry (sqlite3:prepare db (conc "SELECT id FROM runs WHERE " keystr " AND runname LIKE '" runname "';"))))
-       ;; (debug:print 8 *default-log-port* "db:test-get-paths-matching-keynames-target-new\n  runsqry=" runsqry "\n  tstsqry=" testqry)
-       (sqlite3:for-each-row
-	(lambda (rid)
-	  (set! row-ids (cons rid row-ids)))
-	runsqry)
-       (sqlite3:finalize! runsqry)
-       row-ids))))
-
-;; finds latest matching all patts for given run-id
-;;
-(define (db:test-get-paths-matching-keynames-target-new dbstruct run-id keynames target res testpatt statepatt statuspatt runname)
-  (let* ((testqry (tests:match->sqlqry testpatt))
-	 (tstsqry (conc "SELECT rundir FROM tests WHERE run_id=? AND " testqry " AND state LIKE '" statepatt "' AND status LIKE '" statuspatt "' ORDER BY event_time ASC;")))
-    (db:with-db
-     dbstruct
-     run-id
-     #f
-     (lambda (db)
-       (sqlite3:for-each-row 
-	(lambda (p)
-	  (set! res (cons p res)))
-	db
-	tstsqry
-	run-id)
-       res))))
-
-(define (db:test-toplevel-num-items dbstruct run-id testname)
-  (db:with-db
-   dbstruct
-   run-id
-   #f
-   (lambda (db)
-     (let ((res 0))
-       (sqlite3:for-each-row
-	(lambda (num-items)
-	  (set! res num-items))
-	db
-	"SELECT count(id) FROM tests WHERE run_id=? AND testname=? AND item_path != '' AND state NOT IN ('DELETED');"
-	run-id
-	testname)
-       res))))
-
-;;======================================================================
-;; QUEUE UP META, TEST STATUS AND STEPS REMOTE ACCESS
-;;======================================================================
-
-;; NOTE: Can remove the regex and base64 encoding for zmq
-(define (db:obj->string obj #!key (transport 'http))
-  (case transport
-    ;; ((fs) obj)
-    ((http fs)
-     (string-substitute
-      (regexp "=") "_"
-      (base64:base64-encode 
-       (z3:encode-buffer
-	(with-output-to-string
-	  (lambda ()(serialize obj))))) ;; BB: serialize - this is what causes problems between different builds of megatest communicating.  serialize is sensitive to binary image of mtest.
-      #t))
-    ((zmq nmsg)(with-output-to-string (lambda ()(serialize obj))))
-    (else obj))) ;; rpc
-
-(define (db:string->obj msg #!key (transport 'http))
-  (case transport
-    ;; ((fs) msg)
-    ((http fs)
-     (if (string? msg)
-	 (with-input-from-string 
-	     (z3:decode-buffer
-	      (base64:base64-decode
-	       (string-substitute 
-		(regexp "_") "=" msg #t)))
-	   (lambda ()(deserialize)))
-	 (begin
-	   (debug:print-error 0 *default-log-port* "reception failed. Received \"" msg "\" but cannot translate it.")
-           (print-call-chain (current-error-port))
-	   msg))) ;; crude reply for when things go awry
-    ((zmq nmsg)(with-input-from-string msg (lambda ()(deserialize))))
-    (else msg))) ;; rpc
-
-;; ; This is to be the big daddy call NOPE: Replaced by db:set-state-status-and-roll-up-items
-;; ;
-;; define (db:test-set-state-status dbstruct run-id test-id state status msg)
-;;  (let ((dbdat  (db:get-db dbstruct run-id)))
-;;    (if (member state '("LAUNCHED" "REMOTEHOSTSTART"))
-;; 	(db:general-call dbdat 'set-test-start-time (list test-id)))
-;;    ;; (if msg
-;;    ;; 	(db:general-call dbdat 'state-status-msg (list state status msg test-id))
-;;    ;; 	(db:general-call dbdat 'state-status     (list state status test-id)))
-;;    (db:set-state-status-and-roll-up-items dbstruct run-id test-id #f state status msg)
-;;    ;; process the test_data table
-;;    (if (and test-id state status (equal? status "AUTO")) 
-;; 	(db:test-data-rollup dbstruct run-id test-id status))
-;;    (mt:process-triggers dbstruct run-id test-id state status)))
-
-;; state is the priority rollup of all states
-;; status is the priority rollup of all completed statesfu
-;;
-;; if test-name is an integer work off that instead of test-name test-path
-;;
-(define (db:set-state-status-and-roll-up-items dbstruct run-id test-name item-path state status comment)
-  ;; establish info on incoming test followed by info on top level test
-  ;; BBnote - for mode itemwait, linkage between upstream test & matching item status is propagated to run queue in db:prereqs-not-met
-  (let* ((testdat      (if (number? test-name)
-			   (db:get-test-info-by-id dbstruct run-id test-name) ;; test-name is actually a test-id
-			   (db:get-test-info       dbstruct run-id test-name item-path)))
-	 (test-id      (db:test-get-id testdat))
-	 (test-name    (if (number? test-name)
-			   (db:test-get-testname testdat)
-			   test-name))
-	 (item-path    (db:test-get-item-path testdat))
-         (tl-testdat   (db:get-test-info dbstruct run-id test-name ""))
-         (tl-test-id   (if tl-testdat
-			   (db:test-get-id tl-testdat)
-			   #f)))
-    (if (member state '("LAUNCHED" "REMOTEHOSTSTART")) 
-	(db:general-call dbstruct 'set-test-start-time (list test-id)))
-    (mutex-lock! *db-transaction-mutex*)
-    (db:with-db
-     dbstruct #f #f
-     (lambda (db)
-       (let ((tr-res
-              (sqlite3:with-transaction
-               db
-               (lambda ()
-                 ;; NB// Pass the db so it is part fo the transaction
-                 (db:test-set-state-status db run-id test-id state status comment) ;; this call sets the item state/status
-                 (if (not (equal? item-path "")) ;; only roll up IF incoming test is an item
-                     (let* ((state-status-counts  (db:get-all-state-status-counts-for-test dbstruct run-id test-name item-path state status)) ;; item-path is used to exclude current state/status of THIS test
-			      						  (state-stauses (db:roll-up-rules state-status-counts state status))
-                          (newstate (car state-stauses))
-                          (newstatus (cadr state-stauses)))
-                       (debug:print 4 *default-log-port* "BB> tl-test-id="tl-test-id" ; "test-name":"item-path" newstate="newstate" newstatus="newstatus" len(sscs)="(length state-status-counts)  " state-status-counts: "
-							(apply conc
-                  (map (lambda (x)
-                     (conc
-                     		(with-output-to-string (lambda () (pp (dbr:counts->alist x)))) " | "))
-                              state-status-counts))); end debug:print
-   
-                       (if tl-test-id
-			   (db:test-set-state-status db run-id tl-test-id newstate newstatus #f)) ;; we are still in the transaction - must access the db and not the dbstruct
-		       ))))))
-         (mutex-unlock! *db-transaction-mutex*)
-         (if (and test-id state status (equal? status "AUTO")) 
-             (db:test-data-rollup dbstruct run-id test-id status))
-         tr-res)))))
-
-(define (db:roll-up-rules state-status-counts state status)
-		(let* ((running     (length (filter (lambda (x)
-                          (member (dbr:counts-state x) *common:running-states*))
-                                 state-status-counts)))
-           (bad-not-started      (length (filter (lambda (x)
-                                      (and (equal? (dbr:counts-state x) "NOT_STARTED") 
-                                        (not (member (dbr:counts-status x)  *common:not-started-ok-statuses*))))
-																	state-status-counts)))
-           (all-curr-states      (common:special-sort  ;; worst -> best (sort of)
-                                    (delete-duplicates
-                                      (if (and state (not (member state *common:dont-roll-up-states*)))
-                                          (cons state (map dbr:counts-state state-status-counts))
-                                          (map dbr:counts-state state-status-counts)))
-                                                  *common:std-states* >))
-           (all-curr-statuses    (common:special-sort  ;; worst -> best
-                                    (delete-duplicates
-                                      (if (and state status (not (member state *common:dont-roll-up-states*)))
-                                          (cons status (map dbr:counts-status state-status-counts))
-                                          (map dbr:counts-status state-status-counts)))
-                                                   *common:std-statuses* >))
-           (non-completes        (filter (lambda (x)
-							 										 (not (member x (cons "COMPLETED" *common:dont-roll-up-states*))))
-						       									all-curr-states))
-			     (preq-fails        (filter (lambda (x)
-							 								(equal? x "PREQ_FAIL"))
-						       							all-curr-statuses))
-           (num-non-completes (length non-completes))
- 					 (newstate          (cond
-															((> running 0)           "RUNNING")            ;; anything running, call the situation running
-                              ((> (length preq-fails) 0) "NOT_STARTED")
-															((> bad-not-started 0)   "COMPLETED")          ;; we have an ugly situation, it is completed in the sense we cannot do more.
-															((> num-non-completes 0) (car non-completes))  ;;  (remove (lambda (x)(equal? "COMPLETED" x)) all-curr-states))) ;; only rollup DELETED if all DELETED
-															(else                    (car all-curr-states))))
-           (newstatus         (cond
-                              ((> (length preq-fails) 0)  "PREQ_FAIL")
-                              ((or (> bad-not-started 0)
-                                   (and (equal? newstate "NOT_STARTED")
-                                      (> num-non-completes 0)))
-                                            "STARTED")
-                              (else (car all-curr-statuses)))))
- 					(debug:print-info 2 *default-log-port*
-                                         "\n--> probe db:set-state-status-and-roll-up-items: "
-                                         "\n--> state-status-counts: "(map dbr:counts->alist state-status-counts)
-                                         "\n--> running:             "running
-                                         "\n--> bad-not-started:     "bad-not-started
-                                         "\n--> non-non-completes:   "num-non-completes
-                                         "\n--> non-completes:       "non-completes
-                                         "\n--> all-curr-states:     "all-curr-states
-                                         "\n--> all-curr-statuses:     "all-curr-statuses
-                                         "\n--> newstate              "newstate
-                                         "\n--> newstatus            "newstatus
-                                         "\n\n")
-
-                        ;; NB// Pass the db so it is part of the transaction
-         (list newstate newstatus)))
-
-(define (db:set-state-status-and-roll-up-run dbstruct run-id curr-state curr-status)
-    (mutex-lock! *db-transaction-mutex*)
-    (db:with-db
-     dbstruct #f #f
-     (lambda (db)
-       (let ((tr-res
-              (sqlite3:with-transaction
-               db
-               (lambda ()
-                   (let* ((state-status-counts  (db:get-all-state-status-counts-for-run dbstruct run-id))
-													(state-stauses (db:roll-up-rules state-status-counts #f #f ))
-                          (newstate (car state-stauses))
-                          (newstatus (cadr state-stauses))) 
-                    (if (or (not (eq? newstate curr-state)) (not (eq?  newstatus curr-status)))
-                   (db:set-run-state-status dbstruct run-id newstate newstatus )))))))
-         (mutex-unlock! *db-transaction-mutex*)
-         tr-res))))
-
-
-(define (db:get-all-state-status-counts-for-run dbstruct run-id)
- (let* ((test-count-recs (db:with-db
-                                  dbstruct #f #f
-                                  (lambda (db)
-                                    (sqlite3:map-row
-                                     (lambda (state status count)
-                                        (make-dbr:counts state: state status: status count: count))
-                                     db
-                                     "SELECT state,status,count(id) FROM tests WHERE run_id=?  GROUP BY state,status;"
-                                     run-id )))))
-   test-count-recs))
-
-
-;; BBnote: db:get-all-state-status-counts-for-test returns dbr:counts object aggregating state and status of items of a given test, *not including rollup state/status*
-;;
-;; NOTE: This is called within a transaction
-;;
-(define (db:get-all-state-status-counts-for-test dbstruct run-id test-name item-path item-state-in item-status-in)
-  (let* ((test-info   (db:get-test-info dbstruct run-id test-name item-path))
-         (item-state  (or item-state-in (db:test-get-state test-info))) 
-         (item-status (or item-status-in (db:test-get-status test-info)))
-         (other-items-count-recs (db:with-db
-                                  dbstruct #f #f
-                                  (lambda (db)
-                                    (sqlite3:map-row
-                                     (lambda (state status count)
-                                       (make-dbr:counts state: state status: status count: count))
-                                     db
-                                     ;; ignore current item because we have changed its value in the current transation so this select will see the old value.
-                                     "SELECT state,status,count(id) FROM tests WHERE run_id=? AND testname=? AND item_path != '' AND item_path !=? GROUP BY state,status;"
-                                     run-id test-name item-path))))
-
-         ;; add current item to tally outside of sql query
-         (match-countrec-lambda (lambda (countrec) 
-                                  (and (equal? (dbr:counts-state  countrec) item-state)
-                                       (equal? (dbr:counts-status countrec) item-status))))
-
-         (already-have-count-rec-list
-          (filter match-countrec-lambda other-items-count-recs)) ;; will have either 0 or 1 count recs depending if another item shares this item's state/status
-         
-         (updated-count-rec    (if (null? already-have-count-rec-list)
-                                   (make-dbr:counts state: item-state status: item-status count: 1)
-                                   (let* ((our-count-rec (car already-have-count-rec-list))
-                                          (new-count (add1 (dbr:counts-count our-count-rec))))
-                                     (make-dbr:counts state: item-state status: item-status count: new-count))))
-
-         (nonmatch-countrec-lambda (lambda (countrec) (not (match-countrec-lambda countrec))))
-         
-         (unrelated-rec-list   
-          (filter nonmatch-countrec-lambda other-items-count-recs)))
-    
-    (cons updated-count-rec unrelated-rec-list)))
-
-;; (define (db:get-all-item-states db run-id test-name)
-;;   (sqlite3:map-row 
-;;    (lambda (a) a)
-;;    db
-;;    "SELECT DISTINCT state FROM tests WHERE item_path != '' AND state != 'DELETED' AND run_id=? AND testname=?"
-;;    run-id test-name))
-;; 
-;; (define (db:get-all-item-statuses db run-id test-name)
-;;   (sqlite3:map-row 
-;;    (lambda (a) a)
-;;    db
-;;    "SELECT DISTINCT status FROM tests WHERE item_path != '' AND state != 'DELETED' AND state='COMPLETED' AND run_id=? AND testname=?"
-;;    run-id test-name))
-
-(define (db:test-get-logfile-info dbstruct run-id test-name)
-  (db:with-db
-   dbstruct
-   run-id
-   #f
-   (lambda (db)
-     (let ((res #f))
-       (sqlite3:for-each-row 
-	(lambda (path final_logf)
-	  ;; (let ((path       (sdb:qry 'getstr path-id))
-	  ;;       (final_logf (sdb:qry 'getstr final_logf-id)))
-	  (set! logf final_logf)
-	  (set! res (list path final_logf))
-	  (if (directory? path)
-	      (debug:print 2 *default-log-port* "Found path: " path)
-	      (debug:print 2 *default-log-port* "No such path: " path))) ;; )
-	db
-	"SELECT rundir,final_logf FROM tests WHERE testname=? AND item_path='' AND run_id=?;"
-	test-name run-id)
-       res))))
-
-;;======================================================================
-;; A G R E G A T E D   T R A N S A C T I O N   D B   W R I T E S 
-;;======================================================================
-
-(define db:queries 
-  (list '(update-run-duration     "UPDATE tests SET run_duration=? WHERE id=?;")
-
-	;; TESTS
-	'(register-test          "INSERT OR IGNORE INTO tests (run_id,testname,event_time,item_path,state,status) VALUES (?,?,strftime('%s','now'),?,'NOT_STARTED','n/a');")
-	;; Test state and status
-	'(set-test-state         "UPDATE tests SET state=?   WHERE id=?;")
-	'(set-test-status        "UPDATE tests SET state=?   WHERE id=?;")
-	'(state-status           "UPDATE tests SET state=?,status=? WHERE id=?;") ;; D/ONE
-	'(state-status-msg       "UPDATE tests SET state=?,status=?,comment=? WHERE id=?;") ;; DONE
-	;; Test comment
-	'(set-test-comment       "UPDATE tests SET comment=? WHERE id=?;")
-	'(set-test-start-time    "UPDATE tests SET event_time=strftime('%s','now') WHERE id=?;") ;; DONE
-	'(pass-fail-counts       "UPDATE tests SET pass_count=?,fail_count=? WHERE id=?;")
-	;; test_data-pf-rollup is used to set a tests PASS/FAIL based on the pass/fail info from the steps
-	'(test_data-pf-rollup    "UPDATE tests
-                                    SET status=CASE WHEN (SELECT fail_count FROM tests WHERE id=?) > 0 
-                                      THEN 'FAIL'
-                                    WHEN (SELECT pass_count FROM tests WHERE id=?) > 0 AND 
-                                      (SELECT status FROM tests WHERE id=?) NOT IN ('WARN','FAIL')
-                                    THEN 'PASS'
-                                    ELSE status
-                                    END WHERE id=?;") ;; DONE
-	'(test-set-log            "UPDATE tests SET final_logf=? WHERE id=?;")      ;; DONE
-	;; '(test-set-rundir-by-test-id "UPDATE tests SET rundir=? WHERE id=?")        ;; DONE
-	;; '(test-set-rundir         "UPDATE tests SET rundir=? AND testname=? AND item_path=?;") ;; DONE
-	'(test-set-rundir-shortdir "UPDATE tests SET rundir=?,shortdir=? WHERE testname=? AND item_path=? AND run_id=?;")    ;; BROKEN!!! NEEDS run-id
-	'(delete-tests-in-state   ;; "DELETE FROM tests WHERE state=?;")                  ;; DONE
-	  "UPDATE tests SET state='DELETED' WHERE state=?")
-	'(tests:test-set-toplog   "UPDATE tests SET final_logf=? WHERE run_id=? AND testname=? AND item_path='';")
-	'(update-cpuload-diskfree "UPDATE tests SET cpuload=?,diskfree=? WHERE id=?;") ;; DONE
-	'(update-uname-host       "UPDATE tests SET uname=?,host=? WHERE id=?;")       ;; DONE
-        '(update-test-rundat      "INSERT INTO test_rundat (test_id,update_time,cpuload,diskfree,diskusage,run_duration) VALUES (?,?,?,?,?,?);")
-	'(update-test-state       "UPDATE tests SET state=? WHERE state=? AND run_id=? AND testname=? AND NOT (item_path='' AND testname IN (SELECT DISTINCT testname FROM tests WHERE testname=? AND item_path != ''));")
-	'(update-test-status      "UPDATE tests SET status=? WHERE status like ? AND run_id=? AND testname=? AND NOT (item_path='' AND testname IN (SELECT DISTINCT testname FROM tests WHERE testname=? AND item_path != ''));")
-	;; stuff for set-state-status-and-roll-up-items
-	'(update-pass-fail-counts "UPDATE tests 
-             SET fail_count=(SELECT count(id) FROM tests WHERE testname=? AND item_path != '' AND status IN ('FAIL','CHECK','INCOMPLETE','ABORT')),
-                 pass_count=(SELECT count(id) FROM tests WHERE testname=? AND item_path != '' AND status IN ('PASS','WARN','WAIVED'))
-             WHERE testname=? AND item_path='' AND run_id=?;") ;; DONE  ;; BROKEN!!! NEEDS run-id
-	'(top-test-set-running  "UPDATE tests SET state='RUNNING' WHERE testname=? AND item_path='' AND run_id=?;") ;; DONE   ;; BROKEN!!! NEEDS run-id
-
-	;; NOT USED
-	;;
-	;; Might be the following top-test-set-per-pf-counts query could be better based off of something like this:
-	;;
-	;; select state,status,count(state) from tests where run_id=59 AND testname='runfirst' group by state,status;
-	;;
-	'(top-test-set-per-pf-counts "UPDATE tests
-                       SET state=CASE 
-                                   WHEN (SELECT count(id) FROM tests 
-                                                WHERE testname=?
-                                                     AND item_path != '' 
-                                                     AND status NOT IN ('n/a')
-                                                     AND state in ('NOT_STARTED')) > 0 THEN 'UNKNOWN'
-                                   WHEN (SELECT count(id) FROM tests 
-                                                WHERE testname=?
-                                                     AND item_path != '' 
-                                                     AND (status NOT IN ('TEN_STRIKES','BLOCKED') OR status IN ('INCOMPLETE'))
-                                                     AND state in ('RUNNING','NOT_STARTED','LAUNCHED','REMOTEHOSTSTART')) > 0 THEN 'RUNNING'
-                                   WHEN (SELECT count(id) FROM tests 
-                                                WHERE testname=?
-                                                     AND item_path != '' 
-                                                     AND state NOT IN ('COMPLETED','DELETED')) = 0 THEN 'COMPLETED'
-                                   WHEN (SELECT count(id) FROM tests 
-                                                WHERE testname=?
-                                                     AND item_path != '' 
-                                                     AND state = 'NOT_STARTED') > 0 THEN 'NOT_STARTED'
-                                   ELSE 'UNKNOWN' END,
-                            status=CASE 
-                                  WHEN fail_count > 0 THEN 'FAIL' 
-                                  WHEN (SELECT count(id) FROM tests
-                                         WHERE testname=?
-                                              AND item_path != ''
-                                              AND state IN ('BLOCKED','INCOMPLETE')) > 0 THEN 'FAIL'
-                                  WHEN (SELECT count(id) FROM tests
-                                         WHERE testname=?
-                                              AND item_path != ''
-                                              AND state NOT IN ('DELETED')
-                                              AND status IN ('INCOMPLETE','ABORT')) > 0 THEN 'ABORT'
-                                  WHEN (SELECT count(id) FROM tests
-                                         WHERE testname=?
-                                              AND item_path != ''
-                                              AND state NOT IN ('DELETED')
-                                              AND status = 'AUTO') > 0 THEN 'AUTO'
-                                  WHEN (SELECT count(id) FROM tests
-                                         WHERE testname=?
-                                              AND item_path != ''
-                                              AND state NOT IN ('DELETED')
-                                              AND status IN ('STUCK/INCOMPLETE', 'INCOMPLETE')) > 0 THEN 'INCOMPLETE'
-                                  WHEN (SELECT count(id) FROM tests
-                                         WHERE testname=?
-                                              AND item_path != ''
-                                              AND state IN ('COMPLETED','STUCK/INCOMPLETE','INCOMPLETE')
-                                              AND status = 'FAIL') > 0 THEN 'FAIL'
-                                  WHEN (SELECT count(id) FROM tests
-                                         WHERE testname=?
-                                              AND item_path != ''
-                                              AND state NOT IN ('DELETED')
-                                              AND status = 'CHECK') > 0 THEN 'CHECK'
-                                  WHEN (SELECT count(id) FROM tests
-                                         WHERE testname=?
-                                              AND item_path != ''
-                                              AND state NOT IN ('DELETED')
-                                              AND status = 'SKIP') > 0 THEN 'SKIP'
-                                  WHEN (SELECT count(id) FROM tests
-                                         WHERE testname=?
-                                              AND item_path != ''
-                                              AND state NOT IN ('DELETED')
-                                              AND status = 'WARN') > 0 THEN 'WARN'
-                                  WHEN (SELECT count(id) FROM tests
-                                         WHERE testname=?
-                                              AND item_path != ''
-                                              AND state NOT IN ('DELETED')
-                                              AND status = 'WAIVED') > 0 THEN 'WAIVED'
-                                  WHEN (SELECT count(id) FROM tests
-                                         WHERE testname=? 
-                                              AND item_path != ''
-                                              AND state NOT IN ('DELETED')
-                                              AND status NOT IN ('PASS','FAIL','WARN','WAIVED')) > 0 THEN 'ABORT'
-                                  WHEN (SELECT count(id) FROM tests
-                                         WHERE testname=?
-                                              AND item_path != ''
-                                              AND state='NOT_STARTED') > 0 THEN 'n/a'
-                                  WHEN (SELECT count(id) FROM tests
-                                         WHERE testname=?
-                                              AND item_path != ''
-                                              AND state = 'COMPLETED'
-                                              AND status = 'PASS') > 0 THEN 'PASS'
-                                  WHEN pass_count > 0 AND fail_count=0 THEN 'PASS' 
-                                  ELSE 'UNKNOWN' END
-                       WHERE testname=? AND item_path='';") ;; DONE  ;; BROKEN!!! NEEDS run-id
-
-	;; STEPS
-	'(delete-test-step-records "UPDATE test_steps SET status='DELETED' WHERE test_id=?;")
-	'(delete-test-data-records "UPDATE test_data  SET status='DELETED' WHERE test_id=?;") ;; using status since no state field
-	))
-
-(define (db:lookup-query qry-name)
-  (let ((q (alist-ref qry-name db:queries)))
-    (if q (car q) #f)))
-
-;; do not run these as part of the transaction
-(define db:special-queries   '(rollup-tests-pass-fail
-			       ;; db:set-state-status-and-roll-up-items  ;; WHY NOT!?
-			       login
-			       immediate
-			       flush
-			       sync
-			       set-verbosity
-			       killserver
-			       ))
-
-(define (db:login dbstruct calling-path calling-version client-signature)
-   (cond 
-   ((not (equal? calling-path *toppath*))
-    (list #f "Login failed due to mismatch paths: " calling-path ", " *toppath*))
-   ;; ((not (equal? *run-id* run-id))
-   ;;  (list #f "Login failed due to mismatch run-id: " run-id ", " *run-id*))
-   ((not (equal? megatest-version calling-version))
-    (list #t (conc "Login warning due to mismatch megatest version: " calling-version ", " megatest-version)))
-   
-    (else
-    (hash-table-set! *logged-in-clients* client-signature (current-seconds))
-    '(#t "successful login"))))
-
-(define (db:general-call dbstruct stmtname params)
-  (let ((query (let ((q (alist-ref (if (string? stmtname)
-				       (string->symbol stmtname)
-				       stmtname)
-				   db:queries)))
- 		 (if q (car q) #f))))
-    (db:with-db
-     dbstruct #f #f
-     (lambda (db)
-       (apply sqlite3:execute db query params)
-       #t))))
-
-;; get a summary of state and status counts to calculate a rollup
-;;
-(define (db:get-state-status-summary dbstruct run-id testname)
-  (let ((res   '()))
-    (db:with-db
-     dbstruct #f #f
-     (lambda (db)
-       (sqlite3:for-each-row
-	(lambda (state status count)
-	  (set! res (cons (vector state status count) res)))
-	db
-	"SELECT state,status,count(state) FROM tests WHERE run_id=? AND testname=? AND item_path='' GROUP BY state,status;"
-	run-id testname)
-       res))))
-
-(define (db:get-latest-host-load dbstruct raw-hostname)
-  (let* ((hostname (string-substitute "\\..*$" "" raw-hostname))
-         (res  (cons -1 0)))
-    (db:with-db
-     dbstruct #f #f
-     (lambda (db)
-       (sqlite3:for-each-row
-        (lambda (cpuload update-time)  (set! res (cons cpuload update-time)))
-        db
-        "SELECT tr.cpuload, tr.update_time FROM test_rundat tr, tests t WHERE t.host=? AND tr.cpuload != -1  AND tr.test_id=t.id ORDER BY tr.update_time DESC LIMIT 1;"
-        hostname))) res ))
-
-(define (db:set-top-level-from-items dbstruct run-id testname)
-  (let* ((summ  (db:get-state-status-summary dbstruct run-id testname))
-	 (find  (lambda (state status)
-		  (if (null? summ) 
-		      #f
-		      (let loop ((hed (car summ))
-				 (tal (cdr summ)))
-			(if (and (string-match state  (vector-ref hed 0))
-				 (string-match status (vector-ref hed 1)))
-			    hed
-			    (if (null? tal)
-				#f
-				(loop (car tal)(cdr tal)))))))))
-
-
-      ;;;     E D I T M E ! !
-
-
-    (cond
-     ((> (find "COMPLETED" ".*") 0) #f))))
-		   
-    
-
-;; get the previous records for when these tests were run where all keys match but runname
-;; NB// Merge this with test:get-previous-test-run-records? This one looks for all matching tests
-;; can use wildcards. Also can likely be factored in with get test paths?
-;;
-;; Run this remotely!!
-;;
-(define (db:get-matching-previous-test-run-records dbstruct run-id test-name item-path)
-  (let* ((keys    (db:get-keys dbstruct))
-	 (selstr  (string-intersperse keys ","))
-	 (qrystr  (string-intersperse (map (lambda (x)(conc x "=?")) keys) " AND "))
-	 (keyvals #f)
-	 (tests-hash (make-hash-table)))
-    ;; first look up the key values from the run selected by run-id
-    (db:with-db
-     dbstruct #f #f
-     (lambda (db)
-       (sqlite3:for-each-row 
-	(lambda (a . b)
-	  (set! keyvals (cons a b)))
-	db
-	(conc "SELECT " selstr " FROM runs WHERE id=? ORDER BY event_time DESC;") run-id)))
-    (if (not keyvals)
-	'()
-	(let ((prev-run-ids '()))
-	  (db:with-db
-	   dbstruct #f #f
-	   (lambda (db)
-	     (apply sqlite3:for-each-row
-		    (lambda (id)
-		      (set! prev-run-ids (cons id prev-run-ids)))
-		    db
-		    (conc "SELECT id FROM runs WHERE " qrystr " AND id != ?;") (append keyvals (list run-id)))))
-	  ;; collect all matching tests for the runs then
-	  ;; extract the most recent test and return that.
-	  (debug:print 4 *default-log-port* "selstr: " selstr ", qrystr: " qrystr ", keyvals: " keyvals 
-		       ", previous run ids found: " prev-run-ids)
-	  (if (null? prev-run-ids) '()  ;; no previous runs? return null
-	      (let loop ((hed (car prev-run-ids))
-			 (tal (cdr prev-run-ids)))
-		(let ((results (db:get-tests-for-run dbstruct hed (conc test-name "/" item-path) '() '() #f #f #f #f #f #f #f 'normal)))
-		  (debug:print 4 *default-log-port* "Got tests for run-id " run-id ", test-name " test-name 
-			       ", item-path " item-path " results: " (intersperse results "\n"))
-		  ;; Keep only the youngest of any test/item combination
-		  (for-each 
-		   (lambda (testdat)
-		     (let* ((full-testname (conc (db:test-get-testname testdat) "/" (db:test-get-item-path testdat)))
-			    (stored-test   (hash-table-ref/default tests-hash full-testname #f)))
-		       (if (or (not stored-test)
-			       (and stored-test
-				    (> (db:test-get-event_time testdat)(db:test-get-event_time stored-test))))
-			   ;; this test is younger, store it in the hash
-			   (hash-table-set! tests-hash full-testname testdat))))
-		   results)
-		  (if (null? tal)
-		      (map cdr (hash-table->alist tests-hash)) ;; return a list of the most recent tests
-		      (loop (car tal)(cdr tal))))))))))
-
-;; Function recursively checks if <db>.journal exists; if yes means db busy; call itself after delayed interval
-;; return the sqlite3 db handle if possible
-;; 
-(define (db:delay-if-busy dbdat #!key (count 6))
-  (if (not (configf:lookup *configdat* "server" "delay-on-busy")) 
-      (and dbdat (db:dbdat-get-db dbdat))
-      (if dbdat
-	  (let* ((dbpath (db:dbdat-get-path dbdat))
-		 (db     (db:dbdat-get-db   dbdat)) ;; we'll return this so (db:delay--if-busy can be called inline
-		 (dbfj   (conc dbpath "-journal")))
-	    (if (handle-exceptions
-		 exn
-		 (begin
-		   (debug:print-info 0 *default-log-port* "WARNING: failed to test for existance of " dbfj ", exn=" exn)
-		   (thread-sleep! 1)
-		   (db:delay-if-busy count (- count 1))) 
-		 (common:file-exists? dbfj))
-		(case count
-		  ((6)
-		   (thread-sleep! 0.2)
-		   (db:delay-if-busy count: 5))
-		  ((5)
-		   (thread-sleep! 0.4)
-		   (db:delay-if-busy count: 4))
-		  ((4)
-		   (thread-sleep! 0.8)
-		   (db:delay-if-busy count: 3))
-		  ((3)
-		   (thread-sleep! 1.6)
-		   (db:delay-if-busy count: 2))
-		  ((2)
-		   (thread-sleep! 3.2)
-		   (db:delay-if-busy count: 1))
-		  ((1)
-		   (thread-sleep! 6.4)
-		   (db:delay-if-busy count: 0))
-		  (else
-		   (debug:print-info 0 *default-log-port* "delaying db access due to high database load.")
-		   (thread-sleep! 12.8))))
-	    db) 
-	  "bogus result from db:delay-if-busy")))
-
-(define (db:test-get-records-for-index-file dbstruct run-id test-name)
-  (let ((res '()))
-    (db:with-db
-     dbstruct
-     run-id
-     #f
-     (lambda (db)
-       (sqlite3:for-each-row 
-	(lambda (id itempath state status run_duration logf comment)
-	  (set! res (cons (vector id itempath state status run_duration logf comment) res)))
-	db
-	"SELECT id,item_path,state,status,run_duration,final_logf,comment FROM tests WHERE testname=? AND item_path != '' AND run_id=?;" ;; BUG! WHY NO run_id?
-	test-name
-	run-id)
-       res))))
-
-;;======================================================================
-;; Tests meta data
-;;======================================================================
-
-;; returns a hash table of tags to tests
-;;
-(define (db:get-tests-tags dbstruct)
-  (db:with-db
-   dbstruct #f #f
-   (lambda (db)
-     (let* ((res     (make-hash-table)))
-       (sqlite3:for-each-row
-	(lambda (testname tags-in)
-	  (let ((tags (string-split tags-in ",")))
-	    (for-each
-	     (lambda (tag)
-	       (hash-table-set! res tag
-				(delete-duplicates
-				 (cons testname (hash-table-ref/default res tag '())))))
-	     tags)))
-	db
-	"SELECT testname,tags FROM test_meta")
-       (hash-table->alist res)))))
-
-;; read the record given a testname
-(define (db:testmeta-get-record dbstruct testname)
-  (let ((res   #f))
-    (db:with-db
-     dbstruct
-     #f
-     #f
-     (lambda (db)
-       (sqlite3:for-each-row
-	(lambda (id testname author owner description reviewed iterated avg_runtime avg_disk tags jobgroup)
-	  (set! res (vector id testname author owner description reviewed iterated avg_runtime avg_disk tags jobgroup)))
-	db
-	"SELECT id,testname,author,owner,description,reviewed,iterated,avg_runtime,avg_disk,tags,jobgroup FROM test_meta WHERE testname=?;"
-	testname)
-       res))))
-
-;; create a new record for a given testname
-(define (db:testmeta-add-record dbstruct testname)
-  (db:with-db dbstruct #f #f 
-	      (lambda (db)
-		(sqlite3:execute 
-		 db
-		 "INSERT OR IGNORE INTO test_meta (testname,author,owner,description,reviewed,iterated,avg_runtime,avg_disk,tags) VALUES (?,'','','','','','','','');" testname))))
-
-;; update one of the testmeta fields
-(define (db:testmeta-update-field dbstruct testname field value)
-  (db:with-db dbstruct #f #f 
-	      (lambda (db)
-		(sqlite3:execute 
-		 db
-		 (conc "UPDATE test_meta SET " field "=? WHERE testname=?;") value testname))))
-
-(define (db:testmeta-get-all dbstruct)
-  (db:with-db dbstruct #f #f 
-	      (lambda (db)
-		(let ((res '()))
-		  (sqlite3:for-each-row
-		   (lambda (a . b)
-		     (set! res (cons (apply vector a b) res)))
-		   db
-		   "SELECT id,testname,author,owner,description,reviewed,iterated,avg_runtime,avg_disk,tags,jobgroup FROM test_meta;")
-		  res))))
-
-;;======================================================================
-;; M I S C   M A N A G E M E N T   I T E M S 
-;;======================================================================
-
-;; A routine to map itempaths using a itemmap
-;; patha and pathb must be strings or this will fail
-;;
-;; path-b is waiting on path-a
-;;
-(define (db:compare-itempaths test-b-name path-a path-b itemmaps )
-  (debug:print-info 6 *default-log-port* "ITEMMAPS: " itemmaps)
-  (let* ((itemmap    (tests:lookup-itemmap itemmaps test-b-name)))
-    (if itemmap
-	(let ((path-b-mapped (db:multi-pattern-apply path-b itemmap)))
-	  (debug:print-info 6 *default-log-port* "ITEMMAP is " itemmap ", path: " path-b ", mapped path: " path-b-mapped)
-	  (equal? path-a path-b-mapped))
-	(equal? path-b path-a))))
-
-;; A routine to convert test/itempath using a itemmap
-;; NOTE: to process only an itempath (i.e. no prepended testname)
-;;       just call db:multi-pattern-apply
-;;
-(define (db:convert-test-itempath path-in itemmap)
-  (debug:print-info 6 *default-log-port* "ITEMMAP is " itemmap)
-  (let* ((path-parts  (string-split path-in "/"))
-	 (test-name   (if (null? path-parts) "" (car path-parts)))
-	 (item-path   (string-intersperse (if (null? path-parts) '() (cdr path-parts)) "/")))
-    (conc test-name "/" 
-	  (db:multi-pattern-apply item-path itemmap))))
-
-;; patterns are:
-;;    "rx1"  "replacement1"\n
-;;    "rx2"  "replacement2"
-;; etc.
-;;
-(define (db:multi-pattern-apply item-path itemmap)
-  (let ((all-patts (string-split itemmap "\n")))
-    (if (null? all-patts)
-	item-path
-	(let loop ((hed (car all-patts))
-		   (tal (cdr all-patts))
-		   (res item-path))
-	  (let* ((parts (string-split hed))
-		 (patt  (car parts))
-
-		 (repl  (if (> (length parts) 1)(cadr parts) ""))
-
-		 (newr  (if (and patt repl)
-			    (begin
-                              (handle-exceptions
-                               exn
-                               (begin
-                                  (debug:print 0 *default-log-port*
-                                  "WARNING: itemmap has problem \"" itemmap "\", patt: " patt ", repl: " repl ", exn=" exn)
-                                 res)
-                              (string-substitute patt repl res))
-
-
-                              )
-			    (begin
-                              (debug:print 0 *default-log-port*
-                               "WARNING: itemmap has problem \"" itemmap "\", patt: " patt ", repl: " repl)
-			      res))))
-	    (if (null? tal)
-		newr
-		(loop (car tal)(cdr tal) newr)))))))
-
-
-
-
-;; the new prereqs calculation, looks also at itempath if specified
-;; all prereqs must be met
-;;    if prereq test with itempath='' is COMPLETED and PASS, WARN, CHECK, or WAIVED then prereq is met
-;;    if prereq test with itempath=ref-item-path and COMPLETED with PASS, WARN, CHECK, or WAIVED then prereq is met
-;;
-;; Note: mode 'normal means that tests must be COMPLETED and ok (i.e. PASS, WARN, CHECK, SKIP or WAIVED)
-;;       mode 'toplevel means that tests must be COMPLETED only
-;;       mode 'itemmatch or 'itemwait means that tests items must be COMPLETED and (PASS|WARN|WAIVED|CHECK) [[ NB// NOT IMPLEMENTED YET ]]
-;;       mode 'exclusive means this test/item cannot run if the same test/item is LAUNCHED,REMOTEHOSTSTART or RUNNING
-;;
-;; IDEA for consideration:
-;;    1. collect all tests "upstream"
-;;    2. any NOT completed and good? if yes => return those as prereqs not met, if no => return null list
-;; 
-;; (define (db:get-prereqs-not-met dbstruct run-id waitons ref-item-path mode)
-(define (db:get-prereqs-not-met dbstruct run-id waitons ref-test-name ref-item-path mode itemmaps) ;; #!key (mode '(normal))(itemmap #f))
-  ;; BBnote - rollup of an itemized test's overall state/status done in db:set-state-status-and-roll-up-items
-  (append
-   (if (member 'exclusive mode)
-       (let ((running-tests (db:get-tests-for-run dbstruct
-						  #f  ;; run-id of #f means for all runs. 
-						  (if (string=? ref-item-path "")   ;; testpatt
-						      ref-test-name
-						      (conc ref-test-name "/" ref-item-path))
-						  '("LAUNCHED" "REMOTEHOSTSTART" "RUNNING") ;; states
-						  '()          ;; statuses
-						  #f           ;; offset
-						  #f           ;; limit
-						  #f           ;; not-in
-						  #f           ;; sort by
-						  #f           ;; sort order
-						  'shortlist   ;; query type
-						  0            ;; last update, beginning of time ....
-						  #f           ;; mode
-						  )))
-	;;(map (lambda (testdat)
-	;;	(if (equal? (db:test-get-item-path testdat) "")
-	;;	    (db:test-get-testname testdat)
-	;;	    (conc (db:test-get-testname testdat)
-	;;		  "/"
-	;;		  (db:test-get-item-path testdat))))
-	 running-tests) ;; calling functions want the entire data
-       '())
-
-   ;; collection of: for each waiton -
-   ;;   if this ref-test-name is an item in an itemized test and mode is itemwait/itemmatch:
-   ;;     if waiton is not itemized - if waiton is not both completed and in ok status, add as unmet prerequisite
-   ;;     if waiton is itemized:
-   ;;           and waiton's items are not expanded, add as unmet prerequisite
-   ;;           else if matching waiton item is not both completed and in an ok status, add as unmet prerequisite
-   ;;   else
-   ;;    if waiton toplevel is not in both completed and ok status, add as unmet prerequisite
-
-   (if (or (not waitons)
-	   (null? waitons))
-       '()
-       (let* ((ref-test-itemized-mode (not (null? (lset-intersection eq? mode '(itemmatch itemwait))))) ;; how is this different from using member?
-              (ref-test-toplevel-mode (not (null? (lset-intersection eq? mode '(toplevel)))))
-              (ref-test-is-toplevel   (equal? ref-item-path ""))
-              (ref-test-is-item       (not ref-test-is-toplevel))
-              (unmet-pre-reqs '())
-	      (result         '())
-              (unmet-prereq-items '())
-              )
-	 (for-each  ; waitons
-	  (lambda (waitontest-name)
-	    ;; by getting the tests with matching name we are looking only at the matching test 
-	    ;; and related sub items
-	    ;; next should be using mt:get-tests-for-run?
-
-            (let (;(waiton-is-itemized ...)
-                  ;(waiton-items-are-expanded ...)
-                  (waiton-tests             (db:get-tests-for-run-state-status dbstruct run-id waitontest-name))
-		  (ever-seen         #f)
-		  (parent-waiton-met #f)
-		  (item-waiton-met   #f)
-
-                  )
-	      (for-each ; test expanded from waiton
-	       (lambda (waiton-test) 
-		 (let* ((waiton-state             (db:test-get-state waiton-test))
-			(waiton-status            (db:test-get-status waiton-test))
-			(waiton-item-path         (db:test-get-item-path waiton-test)) ;; BB- this is the upstream itempath
-			(waiton-test-name         (db:test-get-testname waiton-test))
-                        (waiton-is-toplevel       (equal? waiton-item-path ""))
-                        (waiton-is-item           (not waiton-is-toplevel))
-			(waiton-is-completed      (member waiton-state  *common:ended-states*))
-			(waiton-is-running        (member waiton-state  *common:running-states*))
-			(waiton-is-killed         (member waiton-state  *common:badly-ended-states*))
-			(waiton-is-ok             (member waiton-status *common:well-ended-states*)) 
-			;;                                              testname-b    path-a    path-b
-			(same-itempath            (db:compare-itempaths ref-test-name waiton-item-path ref-item-path itemmaps)) ;; (equal? ref-item-path waiton-item-path)))
-			(real-ref-test-name       (car (string-split ref-test-name "/"))) ;; I THINK ref-test-name SHOULD NEVER HAVE THE ITEM_PATH!
-			(test-and-ref-are-same    (equal? real-ref-test-name waiton-test-name)))
-		   (debug:print 4 *default-log-port* "waiton-test-name " waiton-test-name " ref-test-name: " ref-test-name " test-and-ref-are-same: " test-and-ref-are-same)
-		   (set! ever-seen #t)
-                   ;;(BB> "***consider waiton "waiton-test"/"waiton-item-path"***")
-                   (cond
-                    ;; case 0 - toplevel of an itemized test, at least one item in prereq has completed
-                    ((and waiton-is-item ref-test-is-toplevel ref-test-itemized-mode waiton-is-completed)
-                     (set! parent-waiton-met #t))
-
-                    ;; case 1, non-item (parent test) is 
-		    ((and waiton-is-toplevel ;; this is the parent test of the waiton being examined
-			  waiton-is-completed
-                          ;;(BB> "cond1")
-			  (or waiton-is-ok ref-test-toplevel-mode)) ;;  itemmatch itemwait))))))
-		     (set! parent-waiton-met #t))
-		    ;; Special case for toplevel and KILLED
-		    ((and waiton-is-toplevel ;; this is the parent test
-			  waiton-is-killed
-			  (member 'toplevel mode))
-                     ;;(BB> "cond2")
-		     (set! parent-waiton-met #t))
-		    ;; For itemwait mode IFF the previous matching item is good the set parent-waiton-met
-                    ((and ref-test-itemized-mode ref-test-is-item same-itempath)
-                     ;;(BB> "cond3")
-		     (if (and waiton-is-completed (or waiton-is-ok ref-test-toplevel-mode)) 
-                         (set! item-waiton-met #t)
-                         (set! unmet-prereq-items (cons waiton-test unmet-prereq-items)))
-                     (if (and waiton-is-toplevel ;; if upstream rollup test is completed, parent-waiton-met is set
-			      (or waiton-is-completed waiton-is-running))
-			 (set! parent-waiton-met #t)))
-		    ;; normal checking of parent items, any parent or parent item not ok blocks running
-		    ((and waiton-is-completed
-			  (or waiton-is-ok 
-			      (member 'toplevel mode))              ;; toplevel does not block on FAIL
-			  (and waiton-is-ok (member 'itemmatch mode) ;; itemmatch blocks on not ok ;; TODO: THIS IS PROBABLY A BUG.  ITEMMATCH AND ITEMWAIT ARE SYNONYMS!! WHAT HAPPENED OT ITEMWAIT???
-                               ))
-                     ;;(BB> "cond4")
-		     (set! item-waiton-met #t))
-                    ((and waiton-is-completed waiton-is-ok same-itempath)
-                     ;;(BB> "cond5")
-                     (set! item-waiton-met #t))
-		    ((and waiton-is-completed waiton-is-ok test-and-ref-are-same) ;; probably from [waitons] table
-		     (set! item-waiton-met #t))
-                    (else
-                     #t
-                     ;;(BB> "condelse")
-                     ))))
-               waiton-tests)
-	      ;; both requirements, parent and item-waiton must be met to NOT add item to
-	      ;; prereq's not met list
-               ;; (BB>
-               ;;  "\n* waiton-tests           "waiton-tests
-               ;;  "\n* parent-waiton-met      "parent-waiton-met
-               ;;  "\n* item-waiton-met        "item-waiton-met
-               ;;  "\n* ever-seen              "ever-seen
-               ;;  "\n* ref-test-itemized-mode "ref-test-itemized-mode
-               ;;  "\n* unmet-prereq-items     "unmet-prereq-items
-               ;;  "\n* result (pre)           "result
-               ;;  "\n* ever-seen              "ever-seen
-               ;;  "\n")
-
-              (cond
-               ((and ref-test-itemized-mode ref-test-is-item (not (null? unmet-prereq-items)))
-                (set! result (append unmet-prereq-items result)))
-               ((not (or parent-waiton-met item-waiton-met))
-                (set! result (append (if (null? waiton-tests) (list waitontest-name) waiton-tests) result))) ;; appends the string if the full record is not available
-	      ;; if the test is not found then clearly the waiton is not met...
-	      ;; (if (not ever-seen)(set! result (cons waitontest-name result)))))
-               ((not ever-seen)
-                (set! result (append (if (null? waiton-tests)(list waitontest-name) waiton-tests) result))))))
-	  waitons)
-	 (delete-duplicates result)))))
-
-;;======================================================================
-;; To sync individual run
-;;======================================================================
-(define (db:get-run-record-ids dbstruct target run keynames test-patt)
-(let ((backcons (lambda (lst item)(cons item lst))))
-    (db:with-db
-     dbstruct #f #f 
-     (lambda (db)
-        (let* ((keystr (string-intersperse 
-		     (map (lambda (key val)
-			    (conc key " like '" val "'"))
-			  keynames 
-			  (string-split target "/"))
-		     " AND "))
-         (run-qry (conc "SELECT id FROM runs  WHERE " keystr  " and runname='" run"'"))
-         (test-qry (conc "SELECT id FROM tests WHERE run_id in (" run-qry ") and testname like '" test-patt "'")))
-         (print run-qry)
-         (print test-qry) 
-	 `((runs       . ,(sqlite3:fold-row backcons '() db run-qry))
-	   (tests      . ,(sqlite3:fold-row backcons '() db test-qry))
-	   (test_steps . ,(sqlite3:fold-row backcons '() db (conc "SELECT id FROM test_steps WHERE test_id in (" test-qry ")")))
-	   (test_data  . ,(sqlite3:fold-row backcons '() db (conc "SELECT id FROM test_data  WHERE test_id in (" test-qry ")" )))
-	   ))))))
-
-;;======================================================================
-;; Just for sync, procedures to make sync easy
-;;======================================================================
-
-;; get an alist of record ids changed since time since-time
-;;   '((runs . (1 2 3 ...))(steps . (5 6 7 ...) ...))
-;;
-(define (db:get-changed-record-ids dbstruct since-time)
-  ;; no transaction, allow the db to be accessed between the big queries
-  (let ((backcons (lambda (lst item)(cons item lst))))
-    (db:with-db
-     dbstruct #f #f 
-     (lambda (db)
-       `((runs       . ,(sqlite3:fold-row backcons '() db "SELECT id FROM runs  WHERE last_update>=?" since-time))
-	 (tests      . ,(sqlite3:fold-row backcons '() db "SELECT id FROM tests WHERE last_update>=?" since-time))
-	 (test_steps . ,(sqlite3:fold-row backcons '() db "SELECT id FROM test_steps WHERE last_update>=?" since-time))
-	 (test_data  . ,(sqlite3:fold-row backcons '() db "SELECT id FROM test_data  WHERE last_update>=?" since-time))
-	 ;; (test_meta  . ,(fold-row backcons '() db "SELECT id FROM test_meta  WHERE last_update>?" since-time))
-	 (run_stats  . ,(sqlite3:fold-row backcons '() db "SELECT id FROM run_stats  WHERE last_update>=?" since-time))
-	 )))))
-
 ;;======================================================================
 ;; Extract ods file from the db
 ;;======================================================================
 
 ;; NOT REWRITTEN YET!!!!!
 
 ;; runspatt is a comma delimited list of run patterns
 ;; keypatt-alist must contain *all* keys with an associated pattern: '( ("KEY1" "%") .. )
-(define (db:extract-ods-file dbstruct outputfile keypatt-alist runspatt pathmod)
+
+;; TODO: Re-enable this functionality
+
+#;(define (db:extract-ods-file dbstruct outputfile keypatt-alist runspatt pathmod)
   (let* ((keysstr  (string-intersperse (map car keypatt-alist) ","))
 	 (keyqry   (string-intersperse (map (lambda (p)(conc (car p) " LIKE ? ")) keypatt-alist) " AND "))
 	 (numkeys  (length keypatt-alist))
 	 (test-ids '())
 	 (dbdat    (db:get-db dbstruct))
 	 (db       (db:dbdat-get-db dbdat))
 	 (windows  (and pathmod (substring-index "\\" pathmod)))
-	 (tempdir  (conc "/tmp/" (current-user-name) "/" runspatt "_" (random 10000) "_" (current-process-id)))
+	 (tempdir  (conc "/tmp/" (current-user-name) "/" runspatt "_" (pseudo-random-integer 10000) "_" (current-process-id)))
 	 (runsheader (append (list "Run Id" "Runname") ; 0 1
 			     (map car keypatt-alist)   ; + N = length keypatt-alist
 			     (list "Testname"          ; 2
 				   "Item Path"         ; 3 
 				   "Description"       ; 4 

Index: db_records.scm
==================================================================
--- db_records.scm
+++ db_records.scm
@@ -74,59 +74,51 @@
 ;;     (dbr:dbstruct-path-set! v path)
 ;;     (dbr:dbstruct-local-set! v local)
 ;;     (dbr:dbstruct-locdbs-set! v (make-hash-table))
 ;;     v))
 
-;; Returns the database for a particular run-id fron the dbstruct:localdbs
-;;
-(define (dbr:dbstruct-localdb v run-id)
-  (hash-table-ref/default (dbr:dbstruct-locdbs v) run-id #f))
-
-(define (dbr:dbstruct-localdb-set! v run-id db)
-  (hash-table-set! (dbr:dbstruct-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-archived     vec) (vector-ref vec 17))
-(define-inline (db:test-get-last_update     vec) (vector-ref vec 18))
-
-;; (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)
+(define (db:test-get-id           vec) (vector-ref vec 0))
+(define (db:test-get-run_id       vec) (vector-ref vec 1))
+(define (db:test-get-testname     vec) (vector-ref vec 2))
+(define (db:test-get-state        vec) (vector-ref vec 3))
+(define (db:test-get-status       vec) (vector-ref vec 4))
+(define (db:test-get-event_time   vec) (vector-ref vec 5))
+(define (db:test-get-host         vec) (vector-ref vec 6))
+(define (db:test-get-cpuload      vec) (vector-ref vec 7))
+(define (db:test-get-diskfree     vec) (vector-ref vec 8))
+(define (db:test-get-uname        vec) (vector-ref vec 9))
+;; (define (db:test-get-rundir       vec) (sdb:qry 'getstr (vector-ref vec 10)))
+(define (db:test-get-rundir       vec) (vector-ref vec 10))
+(define (db:test-get-item-path    vec) (vector-ref vec 11))
+(define (db:test-get-run_duration vec) (vector-ref vec 12))
+(define (db:test-get-final_logf   vec) (vector-ref vec 13))
+(define (db:test-get-comment      vec) (vector-ref vec 14))
+(define (db:test-get-process_id   vec) (vector-ref vec 16))
+(define (db:test-get-archived     vec) (vector-ref vec 17))
+(define (db:test-get-last_update  vec) (vector-ref vec 18))
+
+;; (define (db:test-get-pass_count   vec) (vector-ref vec 15))
+;; (define (db:test-get-fail_count   vec) (vector-ref vec 16))
+(define (db:test-get-fullname     vec)
   (conc (db:test-get-testname vec) "/" (db:test-get-item-path vec)))
 
 ;; replace runs:make-full-test-name with this routine
 (define (db:test-make-full-name testname itempath)
   (if (equal? itempath "") testname (conc testname "/" itempath)))
 
-(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))) ;; RADT => reference 16 is repeated
-
-(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))
-(define-inline (db:test-set-status!   vec val)(vector-set! vec 4 val))
-(define-inline (db:test-set-run_duration! vec val)(vector-set! vec 12 val))
-(define-inline (db:test-set-final_logf! vec val)(vector-set! vec 13 val))
+(define (db:test-get-first_err    vec) (conc #;printable (vector-ref vec 15)))
+(define (db:test-get-first_warn   vec) (conc #;printable (vector-ref vec 16))) ;; RADT => reference 16 is repeated
+
+(define (db:test-set-cpuload!  vec val)(vector-set! vec 7 val))
+(define (db:test-set-diskfree! vec val)(vector-set! vec 8 val))
+(define (db:test-set-testname! vec val)(vector-set! vec 2 val))
+(define (db:test-set-state!    vec val)(vector-set! vec 3 val))
+(define (db:test-set-status!   vec val)(vector-set! vec 4 val))
+(define (db:test-set-run_duration! vec val)(vector-set! vec 12 val))
+(define (db:test-set-final_logf! vec val)(vector-set! vec 13 val))
 
 ;; Test record utility functions
 
 ;; Is a test a toplevel?
 ;;
@@ -136,39 +128,39 @@
 
 ;; make-vector-record "" db mintest id run_id testname state status event_time item_path
 ;; RADT => purpose of mintest??
 ;;
 (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 (db:mintest-get-id           vec)    (vector-ref  vec 0))
+(define (db:mintest-get-run_id       vec)    (vector-ref  vec 1))
+(define (db:mintest-get-testname     vec)    (vector-ref  vec 2))
+(define (db:mintest-get-state        vec)    (vector-ref  vec 3))
+(define (db:mintest-get-status       vec)    (vector-ref  vec 4))
+(define (db:mintest-get-event_time   vec)    (vector-ref  vec 5))
+(define (db:mintest-get-item_path    vec)    (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-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))
-(define-inline (db:testmeta-set-reviewed!     vec val)(vector-set! vec 5 val))
-(define-inline (db:testmeta-set-iterated!     vec val)(vector-set! vec 6 val))
-(define-inline (db:testmeta-set-avg_runtime!  vec val)(vector-set! vec 7 val))
-(define-inline (db:testmeta-set-avg_disk!     vec val)(vector-set! vec 8 val))
+(define (db:testmeta-get-id            vec)    (vector-ref  vec 0))
+(define (db:testmeta-get-testname      vec)    (vector-ref  vec 1))
+(define (db:testmeta-get-author        vec)    (vector-ref  vec 2))
+(define (db:testmeta-get-owner         vec)    (vector-ref  vec 3))
+(define (db:testmeta-get-description   vec)    (vector-ref  vec 4))
+(define (db:testmeta-get-reviewed      vec)    (vector-ref  vec 5))
+(define (db:testmeta-get-iterated      vec)    (vector-ref  vec 6))
+(define (db:testmeta-get-avg_runtime   vec)    (vector-ref  vec 7))
+(define (db:testmeta-get-avg_disk      vec)    (vector-ref  vec 8))
+(define (db:testmeta-get-tags          vec)    (vector-ref  vec 9))
+(define (db:testmeta-set-id!           vec val)(vector-set! vec 0 val))
+(define (db:testmeta-set-testname!     vec val)(vector-set! vec 1 val))
+(define (db:testmeta-set-author!       vec val)(vector-set! vec 2 val))
+(define (db:testmeta-set-owner!        vec val)(vector-set! vec 3 val))
+(define (db:testmeta-set-description!  vec val)(vector-set! vec 4 val))
+(define (db:testmeta-set-reviewed!     vec val)(vector-set! vec 5 val))
+(define (db:testmeta-set-iterated!     vec val)(vector-set! vec 6 val))
+(define (db:testmeta-set-avg_runtime!  vec val)(vector-set! vec 7 val))
+(define (db:testmeta-set-avg_disk!     vec val)(vector-set! vec 8 val))
 
 ;;======================================================================
 ;; S I M P L E   R U N
 ;;======================================================================
 
@@ -176,84 +168,84 @@
 
 ;;======================================================================
 ;; 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-last_update      vec)    (vector-ref  vec 11))
-
-(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))
-(define-inline (db:test-data-set-value!           vec val)(vector-set!  vec 4  val))
-(define-inline (db:test-data-set-expected!        vec val)(vector-set!  vec 5  val))
-(define-inline (db:test-data-set-tol!             vec val)(vector-set!  vec 6  val))
-(define-inline (db:test-data-set-units!           vec val)(vector-set!  vec 7  val))
-(define-inline (db:test-data-set-comment!         vec val)(vector-set!  vec 8  val))
-(define-inline (db:test-data-set-status!          vec val)(vector-set!  vec 9  val))
-(define-inline (db:test-data-set-type!            vec val)(vector-set!  vec 10 val))
+(define (db:test-data-get-id               vec)    (vector-ref  vec 0))
+(define (db:test-data-get-test_id          vec)    (vector-ref  vec 1))
+(define (db:test-data-get-category         vec)    (vector-ref  vec 2))
+(define (db:test-data-get-variable         vec)    (vector-ref  vec 3))
+(define (db:test-data-get-value            vec)    (vector-ref  vec 4))
+(define (db:test-data-get-expected         vec)    (vector-ref  vec 5))
+(define (db:test-data-get-tol              vec)    (vector-ref  vec 6))
+(define (db:test-data-get-units            vec)    (vector-ref  vec 7))
+(define (db:test-data-get-comment          vec)    (vector-ref  vec 8))
+(define (db:test-data-get-status           vec)    (vector-ref  vec 9))
+(define (db:test-data-get-type             vec)    (vector-ref  vec 10))
+(define (db:test-data-get-last_update      vec)    (vector-ref  vec 11))
+
+(define (db:test-data-set-id!              vec val)(vector-set!  vec 0  val))
+(define (db:test-data-set-test_id!         vec val)(vector-set!  vec 1  val))
+(define (db:test-data-set-category!        vec val)(vector-set!  vec 2  val))
+(define (db:test-data-set-variable!        vec val)(vector-set!  vec 3  val))
+(define (db:test-data-set-value!           vec val)(vector-set!  vec 4  val))
+(define (db:test-data-set-expected!        vec val)(vector-set!  vec 5  val))
+(define (db:test-data-set-tol!             vec val)(vector-set!  vec 6  val))
+(define (db:test-data-set-units!           vec val)(vector-set!  vec 7  val))
+(define (db:test-data-set-comment!         vec val)(vector-set!  vec 8  val))
+(define (db:test-data-set-status!          vec val)(vector-set!  vec 9  val))
+(define (db:test-data-set-type!            vec val)(vector-set!  vec 10 val))
 
 ;;======================================================================
 ;; 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 9))
-(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-comment         vec)    (vector-ref  vec 7))
-(define-inline (tdb:step-get-last_update     vec)    (vector-ref  vec 8))
-(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))
-(define-inline (tdb:step-set-event_time!     vec val)(vector-set! vec 5 val))
-(define-inline (tdb:step-set-logfile!        vec val)(vector-set! vec 6 val))
-(define-inline (tdb:step-set-comment!        vec val)(vector-set! vec 7 val))
+(define (tdb:step-get-id              vec)    (vector-ref  vec 0))
+(define (tdb:step-get-test_id         vec)    (vector-ref  vec 1))
+(define (tdb:step-get-stepname        vec)    (vector-ref  vec 2))
+(define (tdb:step-get-state           vec)    (vector-ref  vec 3))
+(define (tdb:step-get-status          vec)    (vector-ref  vec 4))
+(define (tdb:step-get-event_time      vec)    (vector-ref  vec 5))
+(define (tdb:step-get-logfile         vec)    (vector-ref  vec 6))
+(define (tdb:step-get-comment         vec)    (vector-ref  vec 7))
+(define (tdb:step-get-last_update     vec)    (vector-ref  vec 8))
+(define (tdb:step-set-id!             vec val)(vector-set! vec 0 val))
+(define (tdb:step-set-test_id!        vec val)(vector-set! vec 1 val))
+(define (tdb:step-set-stepname!       vec val)(vector-set! vec 2 val))
+(define (tdb:step-set-state!          vec val)(vector-set! vec 3 val))
+(define (tdb:step-set-status!         vec val)(vector-set! vec 4 val))
+(define (tdb:step-set-event_time!     vec val)(vector-set! vec 5 val))
+(define (tdb:step-set-logfile!        vec val)(vector-set! vec 6 val))
+(define (tdb:step-set-comment!        vec val)(vector-set! vec 7 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-log-file   vec)    (vector-ref  vec 5))
-
-(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))
+(define (tdb:steps-table-get-stepname   vec)    (vector-ref  vec 0))
+(define (tdb:steps-table-get-start      vec)    (vector-ref  vec 1))
+(define (tdb:steps-table-get-end        vec)    (vector-ref  vec 2))
+(define (tdb:steps-table-get-status     vec)    (vector-ref  vec 3))
+(define (tdb:steps-table-get-runtime    vec)    (vector-ref  vec 4))
+(define (tdb:steps-table-get-log-file   vec)    (vector-ref  vec 5))
+
+(define (tdb:step-stable-set-stepname!  vec val)(vector-set! vec 0 val))
+(define (tdb:step-stable-set-start!     vec val)(vector-set! vec 1 val))
+(define (tdb:step-stable-set-end!       vec val)(vector-set! vec 2 val))
+(define (tdb:step-stable-set-status!    vec val)(vector-set! vec 3 val))
+(define (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-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))
+(define (cdb:packet-get-client-sig   vec)    (vector-ref  vec 0))
+(define (cdb:packet-get-qtype        vec)    (vector-ref  vec 1))
+(define (cdb:packet-get-immediate    vec)    (vector-ref  vec 2))
+(define (cdb:packet-get-query-sig    vec)    (vector-ref  vec 3))
+(define (cdb:packet-get-params       vec)    (vector-ref  vec 4))
+(define (cdb:packet-get-qtime        vec)    (vector-ref  vec 5))
+(define (cdb:packet-set-client-sig!  vec val)(vector-set! vec 0 val))
+(define (cdb:packet-set-qtype!       vec val)(vector-set! vec 1 val))
+(define (cdb:packet-set-immediate!   vec val)(vector-set! vec 2 val))
+(define (cdb:packet-set-query-sig!   vec val)(vector-set! vec 3 val))
+(define (cdb:packet-set-params!      vec val)(vector-set! vec 4 val))
+(define (cdb:packet-set-qtime!       vec val)(vector-set! vec 5 val))

ADDED   dbi.scm
Index: dbi.scm
==================================================================
--- /dev/null
+++ dbi.scm
@@ -0,0 +1,23 @@
+;;======================================================================
+;; Copyright 2019, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
+
+;;======================================================================
+
+(declare (unit dbi))
+
+(include "dbi/dbi.scm")

ADDED   dbi/dbi.egg
Index: dbi/dbi.egg
==================================================================
--- /dev/null
+++ dbi/dbi.egg
@@ -0,0 +1,5 @@
+((license "BSD")
+ (category db)
+ (dependencies autoload sql-null)
+ (test-dependencies test)
+ (components (extension dbi)))

ADDED   dbi/dbi.meta
Index: dbi/dbi.meta
==================================================================
--- /dev/null
+++ dbi/dbi.meta
@@ -0,0 +1,21 @@
+;; -*- scheme -*-
+(
+; Your egg's license:
+(license "BSD")
+
+; Pick one from the list of categories (see below) for your egg and enter it
+; here.
+(category db)
+
+; A list of eggs dbi depends on.  If none, you can omit this declaration
+; altogether. If you are making an egg for chicken 3 and you need to use
+; procedures from the `files' unit, be sure to include the `files' egg in the
+; `needs' section (chicken versions < 3.4.0 don't provide the `files' unit).
+; `depends' is an alias to `needs'.
+(needs (autoload "3.0") sql-null)
+
+; A list of eggs required for TESTING ONLY.  See the `Tests' section.
+(test-depends test)
+
+(author "Matt Welland")
+(synopsis "An abstract database interface."))

ADDED   dbi/dbi.release-info
Index: dbi/dbi.release-info
==================================================================
--- /dev/null
+++ dbi/dbi.release-info
@@ -0,0 +1,7 @@
+(repo fossil "http://www.kiatoa.com/cgi-bin/fossils/{egg-name}")
+(uri zip "http://www.kiatoa.com/cgi-bin/fossils/{egg-name}/zip/{egg-name}.zip?uuid={egg-release}")
+(release "0.5")
+(release "0.4")
+(release "0.3")
+(release "0.2")
+(release "0.1")

ADDED   dbi/dbi.scm
Index: dbi/dbi.scm
==================================================================
--- /dev/null
+++ dbi/dbi.scm
@@ -0,0 +1,483 @@
+;;; dbi: Minimal gasket to postgresql, sqlite3 and mysql
+;;;
+;; Copyright (C) 2007-2018 Matt Welland
+;; Copyright (C) 2016 Peter Bex
+;; Redistribution and use in source and binary forms, with or without
+;; modification, is permitted.
+;;
+;; THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+;; OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+;; WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+;; ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE
+;; LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+;; CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+;; OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+;; BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+;; LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+;; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+;; USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+;; DAMAGE.
+
+;; ONLY A LOWEST COMMON DEMOMINATOR IS SUPPORTED!
+
+;; d = db handle
+;; t = statement handle
+;; s = statement
+;; l = proc
+;; p = params
+;;
+;;          sqlite3                    postgres                   dbi
+;; prepare: (prepare d s)              n/a                        prepare (sqlite3, pg)
+;; for-each (for-each-row l d s . p)   (query-for-each l s d)     for-each-row
+;; for-each (for-each-row l t . p)     n/a                        NOT YET
+;; exec     (exec d s . p)             (query-tuples s d)      
+;; exec     (exec t . p)               n/a
+
+;; set to 'pg or 'sqlite3
+;; (define dbi:type 'sqlite3) ;; or 'pg
+;;  (dbi:open 'sqlite3 (list (cons 'dbname fullname)))
+
+;;======================================================================
+;; D B I
+;;======================================================================
+(module dbi
+    (open db-dbtype db-conn for-each-row get-one get-one-row get-rows
+     exec close escape-string mk-db now database? with-transaction fold-row
+     prepare map-row convert prepare-exec get-res
+
+     ;; TODO: These don't really belong here.  Also, the naming is not
+     ;; consistent with the usual Scheme conventions.
+     pgdatetime-get-year pgdatetime-get-month pgdatetime-get-day
+     pgdatetime-get-hour pgdatetime-get-minute pgdatetime-get-second
+     pgdatetime-get-microsecond
+     pgdatetime-set-year! pgdatetime-set-month! pgdatetime-set-day!
+     pgdatetime-set-hour! pgdatetime-set-minute! pgdatetime-set-second!
+     pgdatetime-set-microsecond!
+
+     lazy-bool)
+
+(import (chicken base) (chicken process) (chicken file) (chicken time) (chicken string) (chicken format) (chicken time posix) scheme srfi-1 srfi-13)
+(import (chicken condition) autoload sql-null)
+
+(define-record-type db
+  (make-db dbtype dbconn)
+  db?
+  (dbtype db-dbtype  db-dbtype-set!)
+  (dbconn db-conn    db-conn-set!))
+
+(define (missing-egg type eggname)
+  (lambda _
+    (error (printf
+               "Cannot access ~A databases.  Please install the ~S egg and try again." type eggname))))
+
+;; (define (sqlite3:statement? h) #f) ;; dummy - hope it gets clobbered if sqlite3 gets loaded
+
+;; TODO: Make a convenience macro for this?
+(define sqlite3-missing (missing-egg 'sqlite3 "sqlite3"))
+(autoload sqlite3
+          (open-database sqlite3:open-database sqlite3-missing)
+          (for-each-row sqlite3:for-each-row sqlite3-missing)
+          (execute sqlite3:execute sqlite3-missing)
+          (with-transaction sqlite3:with-transaction sqlite3-missing)
+          (finalize! sqlite3:finalize! sqlite3-missing)
+          (make-busy-timeout sqlite3:make-busy-timeout sqlite3-missing)
+          (set-busy-handler! sqlite3:set-busy-handler! sqlite3-missing)
+          (database? sqlite3:database? sqlite3-missing)
+          (prepare sqlite3:prepare sqlite3-missing)
+          (fold-row sqlite3:fold-row sqlite3-missing)
+          (map-row sqlite3:map-row sqlite3-missing)
+          (statement? sqlite3:statement? sqlite3-missing))
+
+(define sql-de-lite-missing (missing-egg 'sql-de-lite "sql-de-lite"))
+(autoload sql-de-lite
+          (open-database     sql:open-database     sql-de-lite-missing)
+	  (close-database    sql:close-database    sql-de-lite-missing)
+          (for-each-row      sql:for-each-row      sql-de-lite-missing)
+	  (fold-rows         sql:fold-rows         sql-de-lite-missing)
+          (exec              sql:exec              sql-de-lite-missing)
+	  (fetch-value       sql:fetch-value       sql-de-lite-missing)
+	  (with-transaction  sql:with-transaction  sql-de-lite-missing)
+          (finalize!         sql:finalize!         sql-de-lite-missing)
+          (make-busy-timeout sql:make-busy-timeout sql-de-lite-missing)
+          (set-busy-handler! sql:set-busy-handler! sql-de-lite-missing)
+	  (query             sql:query             sql-de-lite-missing)
+	  (sql               sql:sql               sql-de-lite-missing))
+
+(define pg-missing (missing-egg 'pg "postgresql"))
+(autoload postgresql
+          (connect pg:connect pg-missing)
+          (row-for-each pg:row-for-each pg-missing)
+          (with-transaction pg:with-transaction pg-missing)
+          (query pg:query pg-missing)
+          ;;(escape-string pg:escape-string pg-missing)
+          (disconnect pg:disconnect pg-missing)
+          (connection? pg:connection? pg-missing)
+          (row-fold pg:row-fold pg-missing)
+          (row-map pg:row-map pg-missing)
+          (affected-rows pg:affected-rows pg-missing)
+          (result? pg:result? pg-missing))
+
+(define mysql-missing (missing-egg 'mysql "mysql-client"))
+(autoload mysql-client 
+  (make-mysql-connection mysql:make-connection mysql-missing)
+  (mysql-null? mysql:mysql-null? mysql-missing))
+
+(define (open dbtype dbinit)
+  (make-db
+   dbtype
+   (case dbtype
+     ((sqlite3)     (sqlite3:open-database (alist-ref 'dbname dbinit)))
+     ((sql-de-lite) (sql:open-database (alist-ref 'dbname dbinit)))
+     ((pg)          (pg:connect dbinit))
+     ((mysql)       (mysql:make-connection (alist-ref 'host dbinit)
+					   (alist-ref 'user dbinit)
+					   (alist-ref 'password dbinit)
+					   (alist-ref 'dbname dbinit)
+					   port: (alist-ref 'port dbinit)))
+     (else (error "Unsupported dbtype " dbtype)))))
+
+(define (convert dbh)
+  (cond
+    ((database? dbh)           dbh) 
+    ((sqlite3:database? dbh)   (make-db 'sqlite3 dbh))
+    ((pg:connection? dbh)      (make-db 'pg dbh))
+    ((not mysql:mysql-null?)   (make-db 'mysql dbh))
+    (else (error "Unsupported database handle " dbh))))
+
+(define (for-each-row proc dbh stmt . params)
+    (let ((dbtype (db-dbtype dbh))
+	  (conn    (db-conn dbh)))
+      (case dbtype
+        ((sqlite3) (sqlite3:for-each-row 
+                    (lambda (first . remaining)
+                      (let ((tuple (list->vector (cons first remaining))))
+                        (proc tuple)))
+                    conn
+                    (apply sqlparam stmt params)))
+	((sql-de-lite)(apply sql:query (sql:for-each-row
+					(lambda (row)
+					  (proc (list->vector row))))
+			     (sql:sql conn stmt)
+			     params))
+        ((pg) (pg:row-for-each
+               (lambda (tuple)
+                 (proc (list->vector tuple)))
+               (pg:query conn (apply sqlparam stmt params))))
+        ((mysql) (let* ((replaced-sql (apply sqlparam stmt params))
+                        (fetcher (conn replaced-sql)))
+                   (fetcher (lambda (tuple)
+                              (proc (list->vector tuple))))))
+        (else (error "Unsupported dbtype " dbtype)))))
+
+;; common idiom is to seek a single value, #f if no match
+;; NOTE: wish to return first found. Do the set only if not set
+(define (get-one dbh stmt . params)
+  (let ((dbtype (db-dbtype dbh))
+	(conn    (db-conn dbh)))
+    (case dbtype
+      ((sql-de-lite)
+       (apply sql:query sql:fetch-value (sql:sql conn stmt) params))
+      (else 
+        (let ((res #f))
+	  (apply for-each-row
+		 (lambda (row)
+		   (if (not res)
+		       (set! res (vector-ref row 0))))
+		 dbh
+		 stmt 
+		 params)
+	  res)))))
+
+;; common idiom is to seek a single value, #f if no match
+;; NOTE: wish to return first found. Do the set only if not set
+(define (get-one-row dbh stmt . params)
+  (let ((res #f))
+    (apply for-each-row
+	   (lambda (row)
+	     (if (not res)
+	         (set! res row)))
+	   dbh
+	   stmt 
+	   params)
+    res))
+
+;; common idiom is to seek a list of rows, '() if no match
+(define (get-rows dbh stmt . params)
+  (let ((res '()))
+    (apply for-each-row
+	   (lambda (row)
+	     (set! res (cons row res)))
+	   dbh
+	   stmt 
+	   params)
+    (reverse res)))
+
+(define (exec dbh stmt . params)
+    (let ((dbtype (db-dbtype dbh))
+      	 (conn   (db-conn dbh))
+      	 (junk   #f))
+          (case dbtype
+            ((sqlite3) (apply sqlite3:execute conn stmt params))
+            ((sql-de-lite)(apply sql:exec (sql:sql conn stmt) params))
+            ((pg) (pg:query conn (apply sqlparam stmt params)))
+            ((mysql) (conn (apply sqlparam stmt params)))
+            (else (error "Unsupported dbtype " dbtype)))))
+
+(define (with-transaction dbh proc)
+  (let ((dbtype (db-dbtype dbh))
+  (conn   (db-conn dbh)))
+    (case dbtype
+      ((sql-de-lite)(sql:with-transaction conn proc))
+      ((sqlite3) (sqlite3:with-transaction
+                  conn
+                  (lambda () (proc))))
+      ((pg) (pg:with-transaction
+             conn (lambda () (proc))))
+      ((mysql) 
+        (conn "START TRANSACTION")
+        (conn proc)
+        (conn "COMMIT"))
+      (else (error "Unsupported dbtype " dbtype)))))
+
+(define (prepare dbh stmt)
+  (let ((dbtype (db-dbtype dbh))
+  (conn   (db-conn dbh)))
+    (case dbtype
+      ((sql-de-lite) dbh) ;; nop?
+      ((sqlite3) (sqlite3:prepare conn stmt))
+      ((pg) (exec dbh stmt) (cons (cons dbh (cadr (string-split stmt))) '()))
+      ((mysql) (print "WIP"))
+      (else (error "Unsupported dbtype" dbtype)))))
+
+(define (fold-row proc init dbh stmt . params) ;; expecting (proc init/prev res)
+  (let ((dbtype (db-dbtype dbh))
+  (conn   (db-conn dbh)))
+    (case dbtype
+      ((sql-de-lite) (apply sql:query (sql:fold-rows proc init)
+			    (sql:sql conn stmt) params))
+      ((sqlite3)     (let ((newproc (lambda (prev . rem)
+				      (proc rem prev))))
+		       (apply sqlite3:fold-row newproc init conn stmt params))) ;; (fold-row PROC INIT DATABASE SQL . PARAMETERS)
+      ((pg)          (pg:row-fold proc init (exec dbh stmt params)))
+      ((mysql)       (fold proc '() (get-rows dbh stmt)))
+      (else          (error "Unsupported dbtype" dbtype)))))
+
+(define (map-row proc init dbh stmt . params)
+  (let ((dbtype (db-dbtype dbh))
+  (conn   (db-conn dbh)))
+    (case dbtype
+      ((sqlite3) (apply sqlite3:map-row proc conn stmt params))
+      ((pg) (pg:row-map proc (exec dbh stmt params)))
+      ((mysql) (map proc (get-rows dbh stmt)))
+      (else (error "Unsupported dbtype" dbtype)))))
+
+(define (prepare-exec stmth . params)
+  (if (sqlite3:statement? stmth)
+        (apply sqlite3:execute stmth params))
+  (if (pair? stmth)
+    (let* ((dbh (car (car stmth)))
+          (dbtype (db-dbtype dbh))
+          (conn   (db-conn dbh))
+          (stmth-name (string->symbol (cdr (car stmth)))))
+        (apply pg:query conn stmth-name params))))
+
+(define (get-res handle option)
+  (if (pg:result? handle)
+      (case option
+        ((affected-rows) (pg:affected-rows handle)))))
+      
+(define (close dbh)
+  (cond
+   ((database? dbh)
+    (let ((dbtype (db-dbtype dbh))
+ 	  (conn   (db-conn dbh)))
+      (case dbtype
+	((sql-de-lite) (sql:close-database conn))
+	((sqlite3)     (sqlite3:finalize! conn)) 
+	((pg)          (pg:disconnect conn))
+	((mysql)       (void)) ; The mysql-client egg doesn't support closing...
+	(else (error "Unsupported dbtype " dbtype)))))
+   ((pair? dbh)
+    (let ((stmt (conc "DEALLOCATE " (cdr (car dbh)) ";")))
+      (exec (car (car dbh)) stmt)))
+   ((sqlite3:statement? dbh) ;; do this last so that *IF* it is a proper dbh it will be closed above and the sqlite3:statement? will not be called
+    (sqlite3:finalize! dbh))
+   
+   ))
+
+;;======================================================================
+;; D B   M I S C
+;;======================================================================
+
+(define (escape-string str)
+      (let ((parts (split-string str "'")))
+	(string-intersperse parts "''")))
+;;      (pg:escape-string val)))
+
+;; convert values to appropriate strings
+;;
+(define (sqlparam-val->string val)
+  (cond
+   ((list?   val)(string-intersperse (map conc val) ",")) ;; (a b c) => a,b,c
+   ((string? val)(string-append "'" (escape-string val) "'"))
+   ((sql-null? val) "NULL")
+   ((number? val)(number->string val))
+   ((symbol? val)(sqlparam-val->string (symbol->string val)))
+   ((boolean? val)
+    (if val "TRUE" "FALSE"))  ;; should this be "TRUE" or 1?
+                              ;; should this be "FALSE" or 0 or NULL?
+   ((vector? val) ;; 'tis a date NB// 5/29/2011 - this is badly borked BUGGY!
+    (sqlparam-val->string (time->string (seconds->local-time (current-seconds)))))
+   (else
+    (error "sqlparam: unknown type for value: " val)
+    "")))
+
+;; (sqlparam "INSERT INTO foo(name,age) VALUES(?,?);" "bob" 20)
+;; NB// 1. values only!! 
+;;      2. terminating semicolon required (used as part of logic)
+;;
+;; a=? 1 (number) => a=1
+;; a=? 1 (string) => a='1'
+;; a=? #f         => a=FALSE 
+;; a=? a (symbol) => a=a 
+;;
+(define (sqlparam query . args)
+  (let* ((query-parts (string-split query "?"))
+         (num-parts    (length query-parts))
+         (num-args    (length args)))
+    (if (not (= (+ num-args 1) num-parts))
+        (error "ERROR, sqlparam: wrong number of arguments or missing semicolon, " num-args " for query " query)
+        (if (= num-args 0) query
+            (let loop ((section (car query-parts))
+                       (tail    (cdr query-parts))
+                       (result  "")
+                       (arg     (car args))
+                       (argtail (cdr args)))
+              (let* ((valstr    (sqlparam-val->string arg))
+                     (newresult (string-append result section valstr)))
+                (if (null? argtail) ;; we are done
+                    (string-append newresult (car tail))
+                    (loop
+                     (car tail)
+                     (cdr tail)
+                     newresult
+                     (car argtail)
+                     (cdr argtail)))))))))
+
+;; a poorly written but non-broken split-string
+;;
+(define (split-string strng delim)
+  (if (eq? (string-length strng) 0) (list strng)
+      (let loop ((head (make-string 1 (car (string->list strng))))
+		 (tail (cdr (string->list strng)))
+		 (dest '())
+		 (temp ""))
+	(cond ((equal? head delim)
+	       (set! dest (append dest (list temp)))
+	       (set! temp ""))
+	      ((null? head) 
+	       (set! dest (append dest (list temp))))
+	      (else (set! temp (string-append temp head)))) ;; end if
+	(cond ((null? tail)
+	       (set! dest (append dest (list temp))) dest)
+	      (else (loop (make-string 1 (car tail)) (cdr tail) dest temp))))))
+
+(define (database? dbh)
+  (if (db? dbh)
+    (let ((dbtype (db-dbtype dbh))
+    (conn   (db-conn dbh)))
+      (case dbtype
+        ((sqlite3)     (if (sqlite3:database? conn) #t #f))
+	((sql-de-lite) #t) ;; don't know how to test for database
+        ((pg) (if (pg:connection? conn) #t #f))
+        ((mysql) #t)
+        (else (error "Unsupported dbtype " dbtype)))) #f))
+
+;;======================================================================
+;; Convienence routines
+;;======================================================================
+
+;; make a db from a list of statements or open it if it already exists
+(define (mk-db path file stmts)
+  (let* ((fname    (conc path "/" file))
+	 (dbexists (file-exists? fname))
+	 (dbh      (if dbexists (open 'sqlite3 (list (cons 'dbname fname))) #f)))
+    (if (not dbexists)
+	(begin
+	  (system (conc "mkdir -p " path)) ;; create the path
+	  (set! dbh (open 'sqlite3 (list (cons 'dbname fname))))
+	  (for-each 
+	   (lambda (sqry)
+	     (exec dbh sqry))
+	   stmts)))
+    (sqlite3:set-busy-handler!
+     (db-conn dbh) (sqlite3:make-busy-timeout 1000000))
+    dbh))
+
+(define (now dbh)
+  (let ((dbtype (db-dbtype dbh)))
+    (case dbtype
+      ((sqlite3) "datetime('now')")
+      ;; Standard SQL
+      (else      "now()"))))
+
+(define (make-pgdatetime)(make-vector 7))
+(define (pgdatetime-get-year          vec)    (vector-ref  vec 0))
+(define (pgdatetime-get-month         vec)    (vector-ref  vec 1))
+(define (pgdatetime-get-day           vec)    (vector-ref  vec 2))
+(define (pgdatetime-get-hour          vec)    (vector-ref  vec 3))
+(define (pgdatetime-get-minute        vec)    (vector-ref  vec 4))
+(define (pgdatetime-get-second        vec)    (vector-ref  vec 5))
+(define (pgdatetime-get-microsecond   vec)    (vector-ref  vec 6))
+(define (pgdatetime-set-year!         vec val)(vector-set! vec 0 val))
+(define (pgdatetime-set-month!        vec val)(vector-set! vec 1 val))
+(define (pgdatetime-set-day!          vec val)(vector-set! vec 2 val))
+(define (pgdatetime-set-hour!         vec val)(vector-set! vec 3 val))
+(define (pgdatetime-set-minute!       vec val)(vector-set! vec 4 val))
+(define (pgdatetime-set-second!       vec val)(vector-set! vec 5 val))
+(define (pgdatetime-set-microsecond!  vec val)(vector-set! vec 6 val))
+
+;; takes postgres date or timestamp
+(define (pg-date->string pgdate)
+  (conc (pgdatetime-get-month pgdate) "/"
+	(pgdatetime-get-day   pgdate) "/"
+	(pgdatetime-get-year  pgdate)))
+
+;; takes postgres date or timestamp
+(define (pg-datetime->string pgdate)
+  (conc (pgdatetime-get-month pgdate) "/"
+        (pgdatetime-get-day   pgdate) "/"
+        (pgdatetime-get-year  pgdate) " "
+	(pgdatetime-get-hour  pgdate) ":"
+	(pgdatetime-get-minute pgdate)`))
+
+
+
+;; map to 0 or 1 from a range of values
+;;            #f => 0
+;;            #t => 1
+;;           "0" => 0
+;;           "1" => 1
+;;         FALSE => 0
+;;          TRUE => 1
+;; anything else => 1
+(define (lazy-bool val)
+  (case val
+   ((#f) 0)
+   ((#t) 1)
+   ((0)  0)
+   ((1)  1)
+   (else
+    (cond
+     ((string? val)
+      (let ((nval (string->number val)))
+	(if nval 
+	    (lazy-bool nval)
+	    (cond
+	     ((string=? val "FALSE") 0)
+	     ((string=? val "TRUE")  1)
+	     (else 1)))))
+     ((symbol? val)
+      (lazy-bool (symbol->string val)))
+     (else 1)))))
+)

ADDED   dbi/dbi.setup
Index: dbi/dbi.setup
==================================================================
--- /dev/null
+++ dbi/dbi.setup
@@ -0,0 +1,11 @@
+;; Copyright 2007-2018, Matthew Welland.
+;;
+;;  This program is made available under the GNU GPL version 2.0 or
+;;  greater. See the accompanying file COPYING for details.
+;;
+;;  This program is distributed WITHOUT ANY WARRANTY; without even the
+;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+;;  PURPOSE.
+
+;;;; dbi.setup
+(standard-extension 'dbi "0.5")

ADDED   dbi/example.scm
Index: dbi/example.scm
==================================================================
--- /dev/null
+++ dbi/example.scm
@@ -0,0 +1,69 @@
+;;; dbi: Minimal gasket to postgresql, sqlite3 and mysql
+;;;
+;; Copyright (C) 2007-2016 Matt Welland
+;; Redistribution and use in source and binary forms, with or without
+;; modification, is permitted.
+;;
+;; THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+;; OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+;; WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+;; ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE
+;; LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+;; CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+;; OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+;; BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+;; LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+;; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+;; USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+;; DAMAGE.
+
+;; WARNING: This example is basically useless, I'll rewrite it one of these days ....
+
+(require-library margs dbi)
+
+(define help "help me")
+
+(define remargs (args:get-args 
+		 (argv)
+		 (list "-inf")
+		 (list "-h")
+		 args:arg-hash
+		 0))
+
+;; define DBPATH in setup.scm
+(include "setup.scm")
+
+(define (ftf:mk-db)
+  (let* ((fname    (conc DBPATH "/ftfplan.db"))
+ 	 (dbexists (file-exists? fname))
+	 (dbh      (if dbexists (dbi:open 'sqlite3 (list (cons 'dbname fname))) #f)))
+    (if (not dbexists)
+	(begin
+	  ;; (print "fullname: " fullname)
+	  (system (conc "mkdir -p " DBPATH)) ;; create the path
+	  (set! dbh (dbi:open 'sqlite3 (list (cons 'dbname fname))))
+	  (for-each 
+	   (lambda (sqry)
+	     ;; (print sqry)
+	     (dbi:exec dbh sqry))
+	   ;; types: 0 text, 1 jpg, 2 png, 3 svg, 4 spreadsheet, 5 audio, 6 video :: better specs to come...
+	   (list
+	    "CREATE TABLE pics     (id INTEGER PRIMARY KEY,name TEXT,dat_id INTEGER,thumb_dat_id INTEGER,created_on INTEGER,owner_id INTEGER);"
+	    "CREATE TABLE dats     (id INTEGER PRIMARY KEY,md5sum TEXT,dat BLOB,type INTEGER);"
+	     ;; on every modification a new tiddlers entry is created. When displaying the tiddlers do:
+	     ;;    select where created_on < somedate order by created_on desc limit 1
+	     "CREATE TABLE tiddlers (id INTEGER PRIMARY KEY,wiki_id INTEGER,name TEXT,rev INTEGER,dat_id INTEGER,created_on INTEGER,owner_id INTEGER);"
+	     ;; rev and tag only utilized when user sets a tag. All results from a select as above for tiddlers are set to the tag
+	     "CREATE TABLE revs     (id INTEGER PRIMARY KEY,tag TEXT);"
+	     ;; wikis is here for when postgresql support is added or if a sub wiki is created. 
+	     "CREATE TABLE wikis    (id INTEGER PRIMARY KEY,key_name TEXT,title TEXT,created_on INTEGER);"))
+             ))
+    dbh))
+
+(define db (ftf:mk-db))
+
+(dbi:exec db "INSERT INTO pics (name,owner_id) VALUES ('bob',1);")
+(dbi:for-each-row (lambda (row)(print "Name: " (vector-ref row 0) ", owner_id: " (vector-ref row 1)))
+   db
+   "SELECT name,owner_id FROM pics;")
+

Index: dbmod.scm
==================================================================
--- dbmod.scm
+++ dbmod.scm
@@ -18,22 +18,5527 @@
 
 ;;======================================================================
 
 (declare (unit dbmod))
 
+(declare (uses debugprint))
+(declare (uses commonmod))
+(declare (uses configfmod))
+(declare (uses mtargs))
+(declare (uses mtver))
+(declare (uses csv-xml))
+(declare (uses keysmod))
+(declare (uses mtmod))
+(declare (uses pkts))
+(declare (uses dbi))
+
 (module dbmod
 	*
 	
-(import scheme chicken data-structures extras)
-(import (prefix sqlite3 sqlite3:) posix typed-records srfi-18)
-
-(define (just-testing)
-  (print "JUST TESTING"))
-
-;; (define (debug:print . params) #f)
-;; (define (debug:print-info . params) #f)
+(import scheme
+	(prefix sqlite3 sqlite3:)
+	chicken.base
+	chicken.condition
+	chicken.eval
+	chicken.file
+	chicken.file.posix
+	chicken.format
+	chicken.io
+	chicken.pathname
+	chicken.port
+	chicken.pretty-print
+	chicken.process
+	chicken.process-context
+	chicken.process-context.posix
+	chicken.sort
+	chicken.string
+	chicken.time
+	chicken.time.posix
+	system-information
+	
+	(prefix base64 base64:)
+	csv-xml
+	directory-utils
+	matchable
+	regex
+	s11n
+	srfi-1
+	srfi-13
+	srfi-18
+	srfi-69
+	stack
+	typed-records
+	z3
+
+	(prefix mtargs args:)
+	commonmod
+	configfmod
+	debugprint
+	keysmod
+	mtmod
+	mtver
+	pkts
+	(prefix dbi dbi:)
+	)
+
+
+(include "key_records.scm")
+
+;;======================================================================
+;;  R E C O R D S
+;;======================================================================
+
+;; each db entry in the hash is a dbr:dbdat
+;; this record will evolve into the area record
+;;
+(defstruct dbr:dbstruct 
+  (mtdb        #f)
+  (dbdats      (make-hash-table)) ;; id => dbdat
+  (read-only   #f)                ;; the area is read-only
+  (stmt-cache  (make-hash-table)))
+
+(defstruct dbr:dbdat
+  (db          #f)    ;; should rename this to oddb for on disk db
+  (inmem       #f)
+  (last-sync   0)
+  (last-write  (current-seconds))
+  (run-id      #f)
+  (fname       #f))
+  
+;; Returns the dbdat for a particular run-id from dbstruct
+;;
+(define (dbr:dbstruct-get-dbdat v run-id)
+  (hash-table-ref/default (dbr:dbstruct-dbdats v) run-id #f))
+
+(define (dbr:dbstruct-dbdat-put! v run-id db)
+  (hash-table-set! (dbr:dbstruct-dbdats v) run-id db))
+
+(define (db:run-id->first-num run-id)
+  (let* ((s (number->string run-id))
+	 (l (string-length s)))
+    (substring s (- l 1) l)))
+
+;; 1234 => 4/1234.db
+;;   #f => 0/main.db
+;;   (abandoned the idea of num/db)
+;; 
+(define (db:run-id->path apath run-id)
+  (conc apath"/"(db:run-id->dbname run-id)))
+
+(define (db:dbname->path apath dbname)
+  (conc apath"/"dbname))
+
+;;  (let ((firstnum (if run-id
+;; 		      (db:run-id->first-num run-id)
+;; 		      "0")))
+;;    (conc *toppath* "/.dbs/" ;; firstnum"/"
+;; 	  (or run-id "main")".db")))
+
+(define (db:run-id->dbname run-id)
+  (if (number? run-id)
+      (conc ".db/" (modulo run-id 100) ".db")
+      (conc ".db/main.db")))
+  
+
+;; record for keeping state,status and count for doing roll-ups in
+;; iterated tests
+;;
+(defstruct dbr:counts
+  (state #f)
+  (status #f)
+  (count  0)) 
+
+;; Retrieve a dbdat given dbfile, open and setup both inmemory and
+;; db file if needed
+;;
+;;    if run-id => get run specific db
+;;    if #f     => get main.db
+;;    if db already open - return inmem
+;;    if db not open, open inmem, rundb and sync then return inmem
+;;    inuse gets set automatically for rundb's
+;;
+(define (db:get-dbdat dbstruct apath dbfile)
+  (let ((dbdat (dbr:dbstruct-get-dbdat dbstruct dbfile))) ;; run-id)))
+    (if dbdat
+	dbdat
+	(let* (;; (dbfile   (db:run-id->path apath run-id))
+	       (newdbdat (db:open-dbdat apath dbfile db:initialize-db)))
+	  (dbr:dbstruct-dbdat-put! dbstruct dbfile newdbdat)
+	  newdbdat))))
+
+;; get the inmem db for actual db operations
+;;
+(define (db:get-inmem dbstruct apath dbfile)
+  (dbr:dbdat-inmem (db:get-dbdat dbstruct apath dbfile)))
+
+;; get the handle for the on-disk db
+;;
+(define (db:get-ddb dbstruct apath dbfile)
+  (dbr:dbdat-db (db:get-dbdat dbstruct apath dbfile)))
+
+;; open or create the disk db file
+;; create and fill the inmemory db
+;; assemble into dbr:dbdat struct and return
+;; 
+(define (db:open-dbdat apath dbfile dbinit-proc)
+  (let* (;; (dbfile   (db:run-id->path apath run-id))
+	 (db       (db:open-run-db dbfile dbinit-proc))
+	 (inmem    (db:open-inmem-db dbinit-proc))
+	 (dbdat    (make-dbr:dbdat
+		    db:     db
+		    inmem:  inmem
+		    ;; run-id: run-id  ;; no can do, there are many run-id values that point to single db
+		    fname:  dbfile)))
+    ;; now sync the disk file data into the inmemory db
+    (db:sync-tables (db:sync-all-tables-list) #f db inmem)
+    dbdat))
+
+;; open the disk database file
+;; NOTE: May need to add locking to file create process here
+;; returns an sqlite3 database handle
+;;
+(define (db:open-run-db dbfile dbinit-proc)
+  (let* ((parent-dir (pathname-directory dbfile)))
+    (if (not (directory-exists? parent-dir))
+	(create-directory parent-dir #t))
+    (let* ((exists  (file-exists? dbfile))
+	   (db      (sqlite3:open-database dbfile))
+	   (handler (sqlite3:make-busy-timeout 3600)))
+      (sqlite3:set-busy-handler! db handler)
+      (db:set-sync db)
+      (if (not exists)
+	  (dbinit-proc db))
+      db)))
+    
+;; open and initialize the inmem db
+;; NOTE: Does NOT sync in the data from the disk db
+;;
+(define (db:open-inmem-db dbinit-proc)
+  (let* ((db      (sqlite3:open-database ":memory:"))
+	 (handler (sqlite3:make-busy-timeout 3600)))
+    (sqlite3:set-busy-handler! db handler)
+    (dbinit-proc db) ;; NOTE: inmem must always be initialized (db:initialize-db db)
+    db))
+
+;; get and initalize dbstruct for a given run-id
+;;
+;;  - uses db:initialize-db to create the schema
+;;
+;; Make the dbstruct, call for main db at least once
+;; sync disk db to inmem
+;;
+;; called in http-transport and replicated in rmt.scm for *local* access. 
+;;
+(define (db:setup run-id)
+  (assert *toppath* "FATAL: db:setup called before toppath is available.")
+  (let* ((dbstruct (make-dbr:dbstruct))
+	 (db-file  (db:run-id->path *toppath* run-id)))
+    (db:get-dbdat dbstruct *toppath* db-file)
+    (set! *dbstruct-db* dbstruct)
+    dbstruct))
+
+;;======================================================================
+;; setting/getting a lock on the db for only one server per db
+;;
+;;  NOTE:
+;;       These operate directly on the disk file, NOT on the inmemory db
+;;       The lockname is the filename (can have many to one, run-id to fname 
+;;======================================================================
+
+;; only use for main.db - need to re-write some of this :(
+;;
+(define (db:get-main-lock dbfile)
+  (db:with-lock-db dbfile
+		(lambda (dbh dbfile)
+		  (db:get-iam-server-lock dbh dbfile))))
+
+(define (db:with-lock-db dbfile proc)
+  (let* ((dbh (db:open-run-db dbfile db:initialize-db))
+	 (res (proc dbh dbfile)))
+    (sqlite3:finalize! dbh)
+    res))
+
+;; called before db is open?
+;;
+(define (db:get-iam-server-lock dbh dbfname)
+  (sqlite3:with-transaction
+   dbh
+   (lambda ()
+     (let* ((locker (db:get-locker dbh dbfname)))
+       (if locker
+	   #f
+	   (db:take-lock dbh dbfname))))))
+	     
+;; (exn sqlite3) 
+(define (db:get-locker dbh dbfname)
+  (condition-case
+   (sqlite3:first-row dbh "SELECT owner_pid,owner_host,event_time FROM locks WHERE lockname=?;" dbfname)
+   (exn (sqlite3) #f)))
+
+;; should never fail because it is run in a transaction with a test for the lock
+;;
+(define (db:take-lock dbh dbfname)
+  ;; (condition-case
+  ;;  (begin
+     (sqlite3:execute dbh "INSERT INTO locks (lockname,owner_pid,owner_host) VALUES (?,?,?);" dbfname (current-process-id) (get-host-name))
+   ;;   #t)
+     ;; (exn (sqlite3) #f)))
+     #t)
+
+(define (db:release-lock dbh dbfname)
+  (sqlite3:execute dbh "DELETE FROM locks WHERE lockname=?;" dbfname))
+
+;;======================================================================
+;; SQLITE3 HELPERS
+;;======================================================================
+
+(define (db:general-sqlite-error-dump exn stmt . params)
+  (let ((err-status ((condition-property-accessor 'sqlite3 'status #f) exn))) ;; RADT ... how does this work?
+    ;; check for (exn sqlite3) ((condition-property-accessor 'exn 'message) exn)
+    ;; (print "err-status: " err-status)
+    (debug:print-error 0 *default-log-port* " query " stmt " failed, params: " params ", error: " ((condition-property-accessor 'exn 'message) exn))
+    (print-call-chain (current-error-port))))
+
+;; convert to -inline 
+;;
+(define (db:first-result-default db stmt default . params)
+  (handle-exceptions
+   exn
+   (let ((err-status ((condition-property-accessor 'sqlite3 'status #f) exn)))
+     ;; check for (exn sqlite3) ((condition-property-accessor 'exn 'message) exn)
+     (if (eq? err-status 'done)
+	 default
+	 (begin
+	   (debug:print-error 0 *default-log-port* " query " stmt " failed, params: " params ", error: " ((condition-property-accessor 'exn 'message) exn) ", exn=" exn)
+	   (print-call-chain (current-error-port))
+	   default)))
+   (apply sqlite3:first-result db stmt params)))
+
+(define (db:generic-error-printout exn . message)
+  (print-call-chain (current-error-port))
+  (apply debug:print-error 0 *default-log-port* message)
+  (debug:print-error 0 *default-log-port* ;; "   params: " params
+		     ", error: "     ((condition-property-accessor 'exn 'message)   exn)
+		     ", arguments: " ((condition-property-accessor 'exn 'arguments) exn)
+		     ", location: "  ((condition-property-accessor 'exn 'location)  exn)
+		     ))
+
+;; (db:with-db dbstruct run-id sqlite3:exec "select blah fgrom blaz;")
+;; r/w is a flag to indicate if the db is modified by this query #t = yes, #f = no
+;;
+(define (db:with-db dbstruct run-id r/w proc . params)
+  (assert (dbr:dbstruct? dbstruct) "FATAL: db:with-db called with bad dbstruct")
+  (let* ((dbpath    (db:run-id->dbname run-id))
+	 (dbdat     (db:get-dbdat dbstruct *toppath* dbpath))
+	 (db        (dbr:dbdat-inmem dbdat))
+	 (fname     (dbr:dbdat-fname dbdat))
+	 (use-mutex (> *api-process-request-count* 25))) ;; was 25
+    (if (and use-mutex
+	     (common:low-noise-print 120 "over-50-parallel-api-requests"))
+	(debug:print-info 0 *default-log-port* *api-process-request-count* " parallel api requests being processed in process " (current-process-id) ", throttling access"))
+    (if (common:low-noise-print 600 (conc "parallel-api-requests" *max-api-process-requests*))
+	(debug:print-info 2 *default-log-port* "Parallel api request count: " *api-process-request-count* " max parallel requests: " *max-api-process-requests*))
+    (condition-case
+     (begin
+       (if use-mutex (mutex-lock! *db-with-db-mutex*))
+       (let ((res (apply proc db params)))
+	 (if use-mutex (mutex-unlock! *db-with-db-mutex*))
+	 ;; (if (vector? dbstruct)(db:done-with dbstruct run-id r/w))
+	 res))
+     (exn (io-error)
+	  (db:generic-error-printout exn "ERROR: i/o error with " fname ". Check permissions, disk space etc. and try again."))
+     (exn (corrupt)
+	  (db:generic-error-printout exn "ERROR: database " fname " is corrupt. Repair it to proceed."))
+     (exn (busy)
+	  (db:generic-error-printout exn "ERROR: database " fname
+				     " is locked. Try copying to another location, remove original and copy back."))
+     (exn (permission)(db:generic-error-printout exn "ERROR: database " fname " has some permissions problem."))
+     (exn ()
+	  (db:generic-error-printout exn "ERROR: Unknown error with database " fname " message: "
+				     ((condition-property-accessor 'exn 'message) exn))))))
+      
+(define (db:set-sync db)
+  (let ((syncprag (configf:lookup *configdat* "setup" "sychronous")))
+    (sqlite3:execute db (conc "PRAGMA synchronous = " (or syncprag 0) ";")))) 
+
+;; get last time a record was updated in either tests or runs table
+;;
+;;    NOTE: Takes a sqlite3 db handle, not dbstruct or dbdat
+;;
+(define (db:get-last-update-time db)
+  (let ((last-update-time #f))
+    (sqlite3:for-each-row 
+     (lambda (lup) 
+       (set! last-update-time lup))     
+     db    
+     "select max(lup) from ( select max(last_update) as lup  from tests union select max(last_update) as lup from runs);")
+    last-update-time))
+
+;; NOTE: opens the legacy megatest.db at the top of *toppath* ==> deprecate and use export
+;;       from previous version instead
+;;
+;;  - NOT ready for use
+;;
+;; ;; (define (db:open-legacy-megatest-db fname)
+;; ;;   (let* ((dbexists     (if (equal? fname ":inmem:")
+;; ;; 			   #f
+;; ;; 			   (common:file-exists? dbpath)))
+;; ;; 	 ;; TODO, replace use of lock with a transaction around the db initalization
+;; ;; 	 (db           (db:initialize-main-db db) #;(db:lock-create-open dbpath
+;; ;; 					    (lambda (db)
+;; ;;                                               (db:initialize-main-db db)
+;; ;; 					      ;;(db:initialize-run-id-db db)
+;; ;; 					      )))
+;; ;; 	 (write-access (file-writable? dbpath)))
+;; ;;     (debug:print-info 13 *default-log-port* "db:open-megatest-db "dbpath)
+;; ;;     (if (and dbexists (not write-access))
+;; ;; 	(set! *db-write-access* #f))
+;; ;;     (cons db dbpath)))
+
+;; ;; ;; sync run to disk if touched
+;; ;; ;;
+;; ;; (define (db:sync-touched dbstruct run-id #!key (force-sync #f))
+;; ;;   (let ((tmpdb   (db:get-db dbstruct))
+;; ;; 	(mtdb    (dbr:dbstruct-mtdb   dbstruct))
+;; ;;         (refndb  (dbr:dbstruct-refndb dbstruct))
+;; ;; 	(start-t (current-seconds)))
+;; ;;     (debug:print-info 4 *default-log-port* "Syncing for run-id: " run-id)
+;; ;;     (mutex-lock! *db-multi-sync-mutex*)
+;; ;;     (let ((update_info (cons (if force-sync 0 *db-last-sync*) "last_update")))
+;; ;;       (mutex-unlock! *db-multi-sync-mutex*)
+;; ;;       (db:sync-tables (db:sync-all-tables-list dbstruct) update_info tmpdb refndb mtdb))
+;; ;;     (mutex-lock! *db-multi-sync-mutex*)
+;; ;;     (set! *db-last-sync* start-t)
+;; ;;     (set! *db-last-access* start-t)
+;; ;;     (mutex-unlock! *db-multi-sync-mutex*)
+;; ;;     (stack-push! (dbr:dbstruct-dbstack dbstruct) tmpdb)))
+
+;; NOTE: touched logic is disabled/not done
+;; sync run to disk if touched
+;;
+(define (db:sync-inmem->disk dbstruct dbfile #!key (force-sync #f))
+  (let* ((dbdat       (db:get-dbdat dbstruct dbfile))
+	 (db          (dbr:dbdat-db dbstruct))
+	 (inmem       (dbr:dbdat-inmem dbstruct))
+	 (start-t     (current-seconds))
+	 (last-update (dbr:dbdat-last-write dbdat))
+	 (last-sync   (dbr:dbdat-last-sync dbdat)))
+    (debug:print-info 4 *default-log-port* "Syncing for dbfile: " dbfile)
+    (mutex-lock! *db-multi-sync-mutex*)
+    (let* ((update_info (cons (if force-sync 0 last-update) "last_update"))
+    	   (need-sync   (or force-sync (>= last-update last-sync))))
+      (mutex-unlock! *db-multi-sync-mutex*)
+      (if need-sync
+	  (db:sync-tables (db:sync-all-tables-list) update_info inmem db)
+	  (debug:print 0 *default-log-port* "Skipping sync as nothing touched.")))
+    (mutex-lock! *db-multi-sync-mutex*)
+    (dbr:dbdat-last-sync-set! dbdat start-t)
+    (mutex-unlock! *db-multi-sync-mutex*)))
+
+
+(define (db:safely-close-sqlite3-db db stmt-cache #!key (try-num 3))
+  (if (<= try-num 0)
+      #f
+      (handle-exceptions
+	  exn
+	(begin
+	  (print "Attempt to safely close sqlite3 db failed. Trying again. exn=" exn)
+	  (thread-sleep! 3)
+	  (sqlite3:interrupt! db)
+	  (db:safely-close-sqlite3-db db stmt-cache try-num: (- try-num 1)))
+	(if (sqlite3:database? db)
+	    (let* ((stmts (and stmt-cache (hash-table-ref/default stmt-cache db #f))))
+	      (if stmts (map sqlite3:finalize! (hash-table-values stmts)))
+	      (sqlite3:finalize! db)
+	      #t)
+	    #f))))
+
+;; close all opened run-id dbs
+(define (db:close-all dbstruct)
+  (assert (dbr:dbstruct? dbstruct) "FATAL: db:close-all called with dbstruct not set up.")
+  (handle-exceptions
+   exn
+   (begin
+     (debug:print 0 *default-log-port* "WARNING: Finalizing failed, "  ((condition-property-accessor 'exn 'message) exn) ", note - exn=" exn)
+     (print-call-chain *default-log-port*))
+   ;; (db:sync-touched dbstruct 0 force-sync: #t) ;; NO. Do not do this here. Instead we rely on a server to be started when there are writes, even if the server itself is not going to be used as a server.
+   (let ((tdbs       (map dbr:dbdat-db 
+			  (hash-table-values (dbr:dbstruct-dbdats dbstruct))))
+	 (stmt-cache (dbr:dbstruct-stmt-cache dbstruct)))
+     (map (lambda (db)
+	    (db:safely-close-sqlite3-db db stmt-cache))
+	  tdbs))))
+
+;; just tests, test_steps and test_data tables
+(define db:sync-tests-only
+  (list
+   ;; (list "strs"
+   ;;       '("id"             #f)
+   ;;       '("str"            #f))
+   (list "tests" 
+	 '("id"             #f)
+	 '("run_id"         #f)
+	 '("testname"       #f)
+	 '("host"           #f)
+	 '("cpuload"        #f)
+	 '("diskfree"       #f)
+	 '("uname"          #f)
+	 '("rundir"         #f)
+	 '("shortdir"       #f)
+	 '("item_path"      #f)
+	 '("state"          #f)
+	 '("status"         #f)
+	 '("attemptnum"     #f)
+	 '("final_logf"     #f)
+	 '("logdat"         #f)
+	 '("run_duration"   #f)
+	 '("comment"        #f)
+	 '("event_time"     #f)
+	 '("fail_count"     #f)
+	 '("pass_count"     #f)
+	 '("archived"       #f)
+         '("last_update"    #f))
+  (list "test_steps"
+	 '("id"             #f)
+	 '("test_id"        #f)
+	 '("stepname"       #f)
+	 '("state"          #f)
+	 '("status"         #f)
+	 '("event_time"     #f)
+	 '("comment"        #f)
+	 '("logfile"        #f)
+         '("last_update"    #f))
+   (list "test_data"
+	 '("id"             #f)
+	 '("test_id"        #f)
+	 '("category"       #f)
+	 '("variable"       #f)
+	 '("value"          #f)
+	 '("expected"       #f)
+	 '("tol"            #f)
+	 '("units"          #f)
+	 '("comment"        #f)
+	 '("status"         #f)
+	 '("type"           #f)
+         '("last_update"    #f))))
+
+;; needs db to get keys, this is for syncing all tables
+;;
+(define (db:sync-main-list) ;;  dbstruct)
+  (let ((keys  (common:get-fields *configdat*))) ;; (db:get-keys dbstruct)))
+    (list
+     (list "keys"
+	   '("id"        #f)
+	   '("fieldname" #f)
+	   '("fieldtype" #f))
+     (list "metadat" '("var" #f) '("val" #f))
+     (append (list "runs" 
+		   '("id"  #f))
+	     (map (lambda (k)(list k #f))
+		  (append keys
+			  (list "runname" "state" "status" "owner" "event_time" "comment" "fail_count" "pass_count" "contour" "last_update"))))
+     (list "archive_disks"
+           '("id" #f)
+           '("archive_area_name" #f) 
+           '("disk_path" #f)
+           '("last_df" #f)
+           '("last_df_time" #f)
+           '("creation_time" #f)) 
+
+     (list "archive_blocks"
+           '("id" #f)
+           '("archive_disk_id" #f) 
+           '("disk_path" #f)
+           '("last_du" #f)
+           '("last_du_time" #f)
+           '("creation_time" #f)) 
+
+     (list "test_meta"
+	   '("id"             #f)
+	   '("testname"       #f)
+	   '("owner"          #f)
+	   '("description"    #f)
+	   '("reviewed"       #f)
+	   '("iterated"       #f)
+	   '("avg_runtime"    #f)
+	   '("avg_disk"       #f)
+	   '("tags"           #f)
+	   '("jobgroup"       #f)))))
+
+(define (db:sync-all-tables-list)
+  (append (db:sync-main-list)
+	  db:sync-tests-only))
+
+;; use bunch of Unix commands to try to break the lock and recreate the db
+;;
+(define (db:move-and-recreate-db dbdat)
+  (let* ((dbpath   (dbr:dbdat-fname           dbdat))
+	 (dbdir    (pathname-directory       dbpath))
+	 (fname    (pathname-strip-directory dbpath))
+	 (fnamejnl (conc fname "-journal"))
+	 (tmpname  (conc fname "." (current-process-id)))
+	 (tmpjnl   (conc fnamejnl "." (current-process-id))))
+    (debug:print-error 0 *default-log-port* "" fname " appears corrupted. Making backup \"old/" fname "\"")
+    (system (conc "cd " dbdir ";mkdir -p old;cat " fname " > old/" tmpname))
+    (system (conc "rm -f " dbpath))
+    (if (common:file-exists? fnamejnl)
+	(begin
+	  (debug:print-error 0 *default-log-port* "" fnamejnl " found, moving it to old dir as " tmpjnl)
+	  (system (conc "cd " dbdir ";mkdir -p old;cat " fnamejnl " > old/" tmpjnl))
+	  (system (conc "rm -f " dbdir "/" fnamejnl))))
+    ;; attempt to recreate database
+    (system (conc "cd " dbdir ";sqlite3 old/" tmpname " .dump | sqlite3 " fname))))
+    
+;; return #f to indicate the dbdat should be closed/reopened
+;; else return dbdat
+;;
+(define (db:repair-db dbdat #!key (numtries 1))
+  (let* ((dbpath   (dbr:dbdat-fname           dbdat))
+	 (dbdir    (pathname-directory       dbpath))
+	 (fname    (pathname-strip-directory dbpath)))
+    (debug:print-info 0 *default-log-port* "Checking db " dbpath " for errors.")
+    (cond
+     ((not (file-writable? dbdir))
+      (debug:print 0 *default-log-port* "WARNING: can't write to " dbdir ", can't fix " fname)
+      #f)
+
+     ;; handle special cases, megatest.db and monitor.db
+     ;; 
+     ;;  NOPE: apply this same approach to all db files
+     ;;
+     (else ;; ((equal? fname "megatest.db") ;; this file can be regenerated if needed
+      (handle-exceptions
+       exn
+       (begin
+	 (print "Problems trying to repair the db, exn=" exn)
+	 ;; (db:move-and-recreate-db dbdat)
+	 (if (> numtries 0)
+	     (db:repair-db dbdat numtries: (- numtries 1))
+	     #f)
+	 (debug:print 0 *default-log-port* "FATAL: file " dbpath " was found corrupted, an attempt to fix has been made but you must start over.")
+	 (debug:print 0 *default-log-port*
+		      "   check the following:\n"
+		      "      1. full directories, look in ~/ /tmp and " dbdir "\n"
+		      "      2. write access to " dbdir "\n\n"
+		      "   if the automatic recovery failed you may be able to recover data by doing \"" 
+		      (if (member fname '("megatest.db" "monitor.db"))
+			  "megatest -cleanup-db"
+			  "megatest -import-megatest.db;megatest -cleanup-db")
+		      "\"\n")
+	 (exit) ;; we can not safely continue when a db was corrupted - even if fixed.
+	 )
+       ;; test read/write access to the database
+       (let ((db (sqlite3:open-database dbpath)))
+	 (sqlite3:set-busy-handler! db (sqlite3:make-busy-timeout 136000))
+	 (sqlite3:execute db "PRAGMA synchronous = 0;")
+	 (cond
+	  ((equal? fname "megatest.db")
+	   (sqlite3:execute db "DELETE FROM tests WHERE state='DELETED';"))
+	  ((equal? fname "main.db")
+	   (sqlite3:execute db "DELETE FROM runs WHERE state='deleted';"))
+	  ((string-match "\\d.db" fname)
+	   (sqlite3:execute db "UPDATE tests SET state='DELETED' WHERE state='DELETED';"))
+	  ((equal? fname "monitor.db")
+	   (sqlite3:execute "DELETE FROM servers WHERE state LIKE 'defunct%';"))
+	  (else
+	   (sqlite3:execute db "vacuum;")))
+	 
+	 (sqlite3:finalize! db)
+	 #t))))))
+
+(define (db:sync-one-table fromdb todb tabledat last-update numrecs)
+  (let* ((tablename        (car tabledat))
+	 (fields           (cdr tabledat))
+	 (has-last-update  (member "last_update" fields))
+	 (use-last-update  (cond
+			    ((and has-last-update
+				  (member "last_update" fields))
+			     #t) ;; if given a number, just use it for all fields
+			    ((number? last-update) #f) ;; if not matched first entry then ignore last-update for this table
+			    ((and (pair? last-update)
+				  (member (car last-update)    ;; last-update field name
+					  (map car fields)))
+			     #t)
+			    (last-update
+			     (debug:print 0 *default-log-port* "ERROR: parameter last-update for db:sync-tables must be a pair or a number, received: " last-update);; found in fields
+			     #f)
+			    (else
+			     #f)))
+	 (last-update-value (if use-last-update ;; no need to check for has-last-update - it is already accounted for
+				(if (number? last-update)
+				    last-update
+				    (cdr last-update))
+				#f))
+	 (last-update-field (if use-last-update
+				(if (number? last-update)
+				    "last_update"
+				    (car last-update))
+				#f))
+	 (num-fields (length fields))
+	 (field->num (make-hash-table))
+	 (num->field (apply vector (map car fields))) ;; BBHERE
+	 (full-sel   (conc "SELECT " (string-intersperse (map car fields) ",") 
+			   " FROM " tablename (if use-last-update ;; apply last-update criteria
+						  (conc " WHERE " last-update-field " >= " last-update-value)
+						  "")
+			   ";"))
+	 (full-ins   (conc "INSERT OR REPLACE INTO " tablename " ( " (string-intersperse (map car fields) ",") " ) "
+			   " VALUES ( " (string-intersperse (make-list num-fields "?") ",") " );"))
+	 (fromdat    '())
+	 (fromdats   '())
+	 (totrecords 0)
+	 (batch-len  (string->number (or (configf:lookup *configdat* "sync" "batchsize") "100")))
+	 (todat      (make-hash-table))
+	 (count      0)
+	 (field-names (map car fields))
+	 ;; (delay-handicap  (string->number (or (configf:lookup *configdat* "sync" "delay-handicap") "0")))
+	 )
+    
+    ;; set up the field->num table
+    (for-each
+     (lambda (field)
+       (hash-table-set! field->num field count)
+       (set! count (+ count 1)))
+     fields)
+    
+    ;; read the source table
+    (sqlite3:for-each-row
+     (lambda (a . b)
+       (set! fromdat (cons (apply vector a b) fromdat))
+       (if (> (length fromdat) batch-len)
+	   (begin
+	     (set! fromdats (cons fromdat fromdats))
+	     (set! fromdat  '())
+	     (set! totrecords (+ totrecords 1)))))
+     fromdb ;; (dbr:dbdat-db fromdb)
+     full-sel)
+    
+    ;; tack on remaining records in fromdat
+    (if (not (null? fromdat))
+	(set! fromdats (cons fromdat fromdats)))
+    
+    (if (common:low-noise-print 120 "sync-records")
+	(debug:print-info 4 *default-log-port* "found " totrecords " records to sync"))
+    
+    ;; read the target table; BBHERE
+    (sqlite3:for-each-row
+     (lambda (a . b)
+       (hash-table-set! todat a (apply vector a b)))
+     todb ;; (dbr:dbdat-db todb)
+     full-sel)
+    
+    ;; delay stuff was here
+    
+    ;; first pass implementation, just insert all changed rows
+    (let* ((db                 todb) ;; (dbr:dbdat-db targdb))
+	   (drp-trigger        (if (member "last_update" field-names)
+				   (db:drop-trigger db tablename) 
+				   #f))
+	   (is-trigger-dropped (if (member "last_update" field-names)
+				   (db:is-trigger-dropped db tablename)
+				   #f)) 
+	   (stmth  (sqlite3:prepare db full-ins)))
+      ;; (db:delay-if-busy targdb) ;; NO WAITING
+      (if (member "last_update" field-names)
+	  (debug:print-info 3 *default-log-port* "is-trigger-dropped: " is-trigger-dropped)) 
+      (for-each
+       (lambda (fromdat-lst)
+	 (sqlite3:with-transaction
+	  db
+	  (lambda ()
+	    (for-each ;; 
+	     (lambda (fromrow)
+	       (let* ((a    (vector-ref fromrow 0))
+		      (curr (hash-table-ref/default todat a #f))
+		      (same #t))
+		 (let loop ((i 0))
+		   (if (or (not curr)
+			   (not (equal? (vector-ref fromrow i)(vector-ref curr i))))
+		       (set! same #f))
+		   (if (and same
+			    (< i (- num-fields 1)))
+		       (loop (+ i 1))))
+		 (if (not same)
+		     (begin
+		       (apply sqlite3:execute stmth (vector->list fromrow))
+		       (hash-table-set! numrecs tablename (+ 1 (hash-table-ref/default numrecs tablename 0)))))))
+	     fromdat-lst))))
+       fromdats)
+      (sqlite3:finalize! stmth)
+      (if (member "last_update" field-names)
+	  (db:create-trigger db tablename)))))
+
+;; tbls is ( ("tablename" ( "field1" [#f|proc1] ) ( "field2" [#f|proc2] ) .... ) )
+;; db's are sqlite3 handles
+;;
+;; if last-update specified ("field-name" . time-in-seconds)
+;;    then sync only records where field-name >= time-in-seconds
+;;    IFF field-name exists
+;;
+(define (db:sync-tables tbls last-update fromdb todb)
+
+  ;; NOTE: I'm moving all the checking OUT of this routine. Check for read/write access, existance, etc
+  ;;       BEFORE calling this sync
+  
+  (let ((stmts       (make-hash-table)) ;; table-field => stmt
+	(all-stmts   '())              ;; ( ( stmt1 value1 ) ( stml2 value2 ))
+	(numrecs     (make-hash-table))
+	(start-time  (current-milliseconds))
+	(tot-count   0))
+
+    (for-each ;; table
+     (lambda (tabledat)
+       (db:sync-one-table fromdb todb tabledat last-update numrecs))
+     tbls)
+
+    (let* ((runtime      (- (current-milliseconds) start-time))
+	   (should-print (or (debug:debug-mode 12)
+			     (common:low-noise-print 120 "db sync" (> runtime 500))))) ;; low and high sync times treated as separate.
+      (if should-print (debug:print 3 *default-log-port* "INFO: db sync, total run time " runtime " ms"))
+      (for-each 
+       (lambda (dat)
+	 (let ((tblname (car dat))
+	       (count   (cdr dat)))
+	   (set! tot-count (+ tot-count count))
+	   (if (> count 0)
+	       (if should-print (debug:print 0 *default-log-port* (format #f "    ~10a ~5a" tblname count))))))
+       (sort (hash-table->alist numrecs)(lambda (a b)(> (cdr a)(cdr b))))))
+    tot-count))
+
+(define (db:patch-schema-rundb frundb)
+  ;;
+  ;; remove this some time after September 2016 (added in version v1.6031
+  ;;
+  (for-each
+   (lambda (table-name)
+     (handle-exceptions
+      exn
+      (if (string-match ".*duplicate.*" ((condition-property-accessor 'exn 'message) exn))
+          (debug:print 0 *default-log-port* "Column last_update already added to " table-name " table")
+          (db:general-sqlite-error-dump exn "alter table " table-name " ..." #f "none"))
+      (sqlite3:execute
+       frundb
+       (conc "ALTER TABLE " table-name " ADD COLUMN last_update INTEGER DEFAULT 0")))
+     (sqlite3:execute
+      frundb
+      (conc "DROP TRIGGER IF EXISTS update_" table-name "_trigger;"))
+     (sqlite3:execute
+      frundb
+      (conc "CREATE TRIGGER IF NOT EXISTS update_" table-name "_trigger AFTER UPDATE ON " table-name "
+                             FOR EACH ROW
+                               BEGIN 
+                                 UPDATE " table-name " SET last_update=(strftime('%s','now'))
+                                   WHERE id=old.id;
+                               END;"))
+     )
+   '("tests" "test_steps" "test_data")))
+
+(define (db:patch-schema-maindb maindb)
+  ;;
+  ;; remove all these some time after september 2016 (added in v1.6031
+  ;;
+  (for-each
+   (lambda (column type default)
+     (handle-exceptions
+	 exn
+	 (if (string-match ".*duplicate.*" ((condition-property-accessor 'exn 'message) exn))
+	     (debug:print 0 *default-log-port* "Column " column " already added to runs table")
+	     (db:general-sqlite-error-dump exn "alter table runs ..." #f "none"))
+       (sqlite3:execute
+	maindb
+	(conc "ALTER TABLE runs ADD COLUMN " column " " type " DEFAULT " default))))
+   (list "last_update" "contour")
+   (list "INTEGER"     "TEXT"   )
+   (list "0"           "''"   ))
+  ;; these schema changes don't need exception handling
+  (sqlite3:execute
+   maindb
+   "CREATE TRIGGER IF NOT EXISTS update_runs_trigger AFTER UPDATE ON runs
+                             FOR EACH ROW
+                               BEGIN 
+                                 UPDATE runs SET last_update=(strftime('%s','now'))
+                                   WHERE id=old.id;
+                               END;")
+  (sqlite3:execute maindb "CREATE TABLE IF NOT EXISTS run_stats (
+                              id     INTEGER PRIMARY KEY,
+                              run_id INTEGER,
+                              state  TEXT,
+                              status TEXT,
+                              count  INTEGER,
+                              last_update INTEGER DEFAULT (strftime('%s','now')))")
+  (sqlite3:execute maindb "CREATE TRIGGER  IF NOT EXISTS update_run_stats_trigger AFTER UPDATE ON run_stats
+                             FOR EACH ROW
+                               BEGIN 
+                                 UPDATE run_stats SET last_update=(strftime('%s','now'))
+                                   WHERE id=old.id;
+                               END;")
+  (sqlite3:execute maindb "CREATE TABLE IF NOT EXISTS test_rundat (
+                              id           INTEGER PRIMARY KEY,
+                              test_id      INTEGER,
+                              update_time  TIMESTAMP,
+                              cpuload      INTEGER DEFAULT -1,
+                              diskfree     INTEGER DEFAULT -1,
+                              diskusage    INTGER DEFAULT -1,
+                              run_duration INTEGER DEFAULT 0);"))
+
+(define (db:adj-target db)
+  (let ((fields    (configf:get-section *configdat* "fields"))
+	(field-num 0))
+    ;; because we will be refreshing the keys table it is best to clear it here
+    (sqlite3:execute db "DELETE FROM keys;")
+    (for-each
+     (lambda (field)
+       (let ((column (car field))
+	     (spec   (cadr field)))
+	 (handle-exceptions
+	  exn
+	  (if (string-match ".*duplicate.*" ((condition-property-accessor 'exn 'message) exn))
+	      (debug:print 0 *default-log-port* "Target field " column " already exists in the runs table")
+	      (db:general-sqlite-error-dump exn "alter table runs ..." #f "none"))
+	  ;; Add the column if needed
+	  (sqlite3:execute
+	   db
+	   (conc "ALTER TABLE runs ADD COLUMN " column " " spec)))
+	 ;; correct the entry in the keys column
+	 (sqlite3:execute
+	  db
+	  "INSERT INTO keys (id,fieldname,fieldtype) VALUES (?,?,?);"
+	  field-num column spec)
+	 ;; fill in blanks (not allowed as it would be part of the path
+	 (sqlite3:execute
+	  db
+	  (conc "UPDATE runs SET " column "='x' WHERE " column "='';"))
+	 (set! field-num (+ field-num 1))))
+     fields)))
+  
+(define (db:get-access-mode)
+  (if (args:get-arg "-use-db-cache") 'cached 'rmt))
+
+;; Add db direct
+;;
+(define (db:dispatch-query access-mode rmt-cmd db-cmd . params)
+  (if (eq? access-mode 'cached)
+      (debug:print 2 *default-log-port* "not doing cached calls right now"))
+;;      (apply db:call-with-cached-db db-cmd params)
+      (apply rmt-cmd params))
+;;)
+
+;; ;; ;; return the target db handle so it can be used
+;; ;; ;;
+;; ;; (define (db:cache-for-read-only source target #!key (use-last-update #f))
+;; ;;   (assert *toppath* "ERROR: db:cache-for-read-only called before launch:setup. This is fatal.")
+;; ;;   (if (and (hash-table-ref/default *global-db-store* target #f)
+;; ;; 	   (>= (file-modification-time target)(file-modification-time source)))
+;; ;;       (hash-table-ref *global-db-store* target)
+;; ;;       (let* ((toppath  *toppath*) ;;  (launch:setup))
+;; ;; 	     (targ-db-last-mod (if (common:file-exists? target)
+;; ;; 				   (file-modification-time target)
+;; ;; 				   0))
+;; ;; 	     (cache-db  (or (hash-table-ref/default *global-db-store* target #f)
+;; ;; 			    (db:open-megatest-db path: target)))
+;; ;; 	     (source-db (db:open-megatest-db path: source))
+;; ;; 	     (curr-time (current-seconds))
+;; ;; 	     (res      '())
+;; ;; 	     (last-update (if use-last-update (cons "last_update" targ-db-last-mod) #f)))
+;; ;; 	(db:sync-tables (db:sync-main-list source-db) last-update source-db cache-db)
+;; ;; 	(db:sync-tables db:sync-tests-only last-update source-db cache-db)
+;; ;; 	(hash-table-set! *global-db-store* target cache-db)
+;; ;; 	cache-db)))
+
+;; ;; call a proc with a cached db
+;; ;;
+;; (define (db:call-with-cached-db proc . params)
+;;   ;; first cache the db in /tmp
+;;   (let* ((cname-part (conc "megatest_cache/" (common:get-area-name)))
+;; 	 (fname      (conc  (common:get-area-path-signature) ".db"))
+;; 	 (cache-dir  (common:get-create-writeable-dir
+;; 		      (list (conc "/tmp/" (current-user-name) "/" cname-part)
+;; 			    (conc "/tmp/" (current-user-name) "-" cname-part)
+;; 			     (conc "/tmp/" (current-user-name) "_" cname-part))))
+;; 	 (megatest-db (conc *toppath* "/megatest.db")))
+;;     ;; (debug:print-info 0 *default-log-port* "Using cache dir " cache-dir)
+;;     (if (not cache-dir)
+;; 	(begin
+;; 	  (debug:print 0 *default-log-port* "ERROR: Failed to find an area to write the cache db")
+;; 	  (exit 1))
+;; 	(let* ((th1      (make-thread
+;; 			  (lambda ()
+;; 			    (if (and (common:file-exists? megatest-db)
+;; 				     (file-writable? megatest-db))
+;; 				(begin
+;; 				  (db:sync-to-megatest.db dbstruct 'timestamps) ;; internally mutexes on *db-local-sync*
+;; 				  (debug:print-info 2 *default-log-port* "Done syncing to megatest.db"))))
+;; 			  "call-with-cached-db sync-to-megatest.db"))
+;; 	       (cache-db (db:cache-for-read-only
+;; 			  megatest-db
+;; 			  (conc cache-dir "/" fname)
+;; 			  use-last-update: #t)))
+;; 	  (thread-start! th1)
+;; 	  (apply proc cache-db params)
+;; 	  ))))
+
+;; options:
+;;
+;;  'killservers  - kills all servers
+;;  'dejunk       - removes junk records
+;;  'adj-testids  - move test-ids into correct ranges
+;;  'old2new      - sync megatest.db to /tmp/.../megatest.db and /tmp/.../megatest_ref.db
+;;  'new2old      - sync /tmp/.../megatest.db to megatest.db and /tmp/.../megatest_ref.db (and update data_synced)
+;;  'closeall     - close all opened dbs
+;;  'schema       - attempt to apply schema changes
+;;  run-ids: '(1 2 3 ...) or #f (for all)
+;;
+;; ;; (define (db:multi-db-sync dbstruct . options)
+;; ;;   ;; (if (not (launch:setup))
+;; ;;   ;;    (debug:print 0 *default-log-port* "ERROR: not able to setup up for megatest.")
+;; ;;   (let* ((mtdb     (dbr:dbstruct-mtdb dbstruct))
+;; ;; 	 (tmpdb    (db:get-db dbstruct))
+;; ;; 	 (refndb   (dbr:dbstruct-refndb dbstruct))
+;; ;; 	 (allow-cleanup #t) ;; (if run-ids #f #t))
+;; ;; 	 (servers (server:get-list *toppath*)) ;; (tasks:get-all-servers (db:delay-if-busy tdbdat)))
+;; ;; 	 (data-synced 0)) ;; count of changed records (I hope)
+;; ;;     
+;; ;;     (for-each
+;; ;;      (lambda (option)
+;; ;; 
+;; ;;        (case option
+;; ;; 	 ;; kill servers
+;; ;; 	 ((killservers)
+;; ;; 	  (for-each
+;; ;; 	   (lambda (server)
+;; ;;              (handle-exceptions
+;; ;;              exn
+;; ;;              (begin 
+;; ;;                (debug:print-info 0 *default-log-port*  "Unable to get host and/or port from " server ", exn=" exn)     
+;; ;;                #f)
+;; ;; 	     (match-let (((mod-time host port start-time server-id pid) server))
+;; ;; 	       (if (and host pid)
+;; ;; 		   (tasks:kill-server host pid)))))
+;; ;; 	   servers)
+;; ;; 
+;; ;;           ;; /tmp/bjbarcla/megatest_localdb/fullrun/.nfs.pdx.disks.icf_env_disk001.bjbarcla.gwa.issues.mtdev.matt-bisect.megatest.ext-tests.runs.all.v1.65.1.6524.dev.bb-24-justrollup-f8.rollup.fullrun/megatest.db.lock
+;; ;;           (delete-file* (common:get-sync-lock-filepath))
+;; ;;           )
+;; ;; 	 
+;; ;; 	 ;; clear out junk records
+;; ;; 	 ;;
+;; ;; 	 ((dejunk)
+;; ;; 	  ;; (db:delay-if-busy mtdb) ;; ok to delay on mtdb
+;; ;; 	  (when (file-writable? (db:dbdat-get-path mtdb)) (db:clean-up mtdb))
+;; ;; 	  (db:clean-up tmpdb)
+;; ;; 	  (db:clean-up refndb))
+;; ;; 
+;; ;; 	 ;; sync runs, test_meta etc.
+;; ;; 	 ;;
+;; ;; 	 ((old2new)
+;; ;; 	  (set! data-synced
+;; ;; 	    (+ (db:sync-tables (db:sync-all-tables-list dbstruct) #f mtdb tmpdb refndb)
+;; ;; 	       data-synced)))
+;; ;; 	 
+;; ;; 	 ;; now ensure all newdb data are synced to megatest.db
+;; ;; 	 ;; do not use the run-ids list passed in to the function
+;; ;; 	 ;;
+;; ;; 	 ((new2old)
+;; ;; 	  (set! data-synced
+;; ;; 	    (+ (db:sync-tables (db:sync-all-tables-list dbstruct) #f tmpdb refndb mtdb)
+;; ;; 	       data-synced)))
+;; ;; 
+;; ;; 	 ((adj-target)
+;; ;; 	  (db:adj-target (db:dbdat-get-db mtdb))
+;; ;; 	  (db:adj-target (db:dbdat-get-db tmpdb))
+;; ;; 	  (db:adj-target (db:dbdat-get-db refndb)))
+;; ;; 	 
+;; ;; 	 ((schema)
+;; ;; 	  (db:patch-schema-maindb (db:dbdat-get-db mtdb))
+;; ;; 	  (db:patch-schema-maindb (db:dbdat-get-db tmpdb))
+;; ;; 	  (db:patch-schema-maindb (db:dbdat-get-db refndb))
+;; ;; 	  (db:patch-schema-rundb  (db:dbdat-get-db mtdb))
+;; ;; 	  (db:patch-schema-rundb  (db:dbdat-get-db tmpdb))
+;; ;; 	  (db:patch-schema-rundb  (db:dbdat-get-db refndb))))
+;; ;;        
+;; ;;        (stack-push! (dbr:dbstruct-dbstack dbstruct) tmpdb))
+;; ;;      options)
+;; ;;     data-synced))
+;; ;; 
+;; ;; (define (db:tmp->megatest.db-sync dbstruct last-update)
+;; ;;   (let* ((mtdb        (dbr:dbstruct-mtdb dbstruct))
+;; ;; 	 (tmpdb       (db:get-db dbstruct))
+;; ;; 	 (refndb      (dbr:dbstruct-refndb dbstruct))
+;; ;; 	 (res         (db:sync-tables (db:sync-all-tables-list dbstruct) last-update tmpdb refndb mtdb)))
+;; ;;     (stack-push! (dbr:dbstruct-dbstack dbstruct) tmpdb)
+;; ;;     res))
+;; ;; 
+;; ;; ;;;; run-ids
+;; ;; ;;    if #f use *db-local-sync* : or 'local-sync-flags
+;; ;; ;;    if #t use timestamps      : or 'timestamps
+;; ;; ;;
+;; ;; ;;  NB// no-sync-db is the db handle, not a flag!
+;; ;; ;;
+;; ;; (define (db:sync-to-megatest.db dbstruct #!key (no-sync-db #f)) 
+;; ;;   (let* ((start-time         (current-seconds))
+;; ;; 	 (last-full-update   (if no-sync-db
+;; ;; 				 (db:no-sync-get/default no-sync-db "LAST_FULL_UPDATE" 0)
+;; ;; 				 0))
+;; ;; 	 (full-sync-needed   (> (- start-time last-full-update) 3600)) ;; every hour do a full sync
+;; ;; 	 (last-update        (if full-sync-needed
+;; ;; 				 0
+;; ;; 				 (if no-sync-db
+;; ;; 				     (db:no-sync-get/default no-sync-db "LAST_UPDATE" 0)
+;; ;; 				     0))) ;; (or (db:get-var dbstruct "LAST_UPDATE") 0))
+;; ;; 	 (sync-needed        (> (- start-time last-update) 6))
+;; ;; 	 (res                (if (or sync-needed ;; don't sync if a sync already occurred in the past 6 seconds
+;; ;; 				     full-sync-needed)
+;; ;; 				 (begin
+;; ;; 				   (if no-sync-db
+;; ;; 				       (begin
+;; ;; 					 (if full-sync-needed (db:no-sync-set no-sync-db "LAST_FULL_UPDATE" start-time))
+;; ;; 					 (db:no-sync-set no-sync-db "LAST_UPDATE" start-time)))
+;; ;; 				   (db:tmp->megatest.db-sync dbstruct last-update))
+;; ;; 				 0))
+;; ;; 	 (sync-time           (- (current-seconds) start-time)))
+;; ;;       (debug:print-info 3 *default-log-port* "Sync of newdb to olddb completed in " sync-time " seconds pid="(current-process-id))
+;; ;;       (if (common:low-noise-print 30 "sync new to old")
+;; ;;           (if sync-needed
+;; ;;               (debug:print-info 0 *default-log-port* "Sync of " res " records from newdb to olddb completed in " sync-time " seconds pid="(current-process-id))
+;; ;;               (debug:print-info 0 *default-log-port* "No sync needed, last updated " (- start-time last-update) " seconds ago")))
+;; ;;       res))
+
+;; keeping it around for debugging purposes only
+#;(define (open-run-close-no-exception-handling  proc idb . params)
+  (debug:print-info 11 *default-log-port* "open-run-close-no-exception-handling START given a db=" (if idb "yes " "no ") ", params=" params)
+  (print "I don't work anymore. open-run-close-no-exception-handling needs fixing or removing...")
+  (exit)
+  (if (or *db-write-access*
+	  (not #t)) ;; was: (member proc * db:all-write-procs *)))
+      (let* ((db (cond
+		  ((pair? idb)                 (db:dbdat-get-db idb))
+		  ((sqlite3:database? idb)     idb)
+		  ((not idb)                   (debug:print-error 0 *default-log-port* "cannot open-run-close with #f anymore"))
+		  ((procedure? idb)            (idb))
+		  (else   	               (debug:print-error 0 *default-log-port* "cannot open-run-close with #f anymore"))))
+	     (res #f))
+	(set! res (apply proc db params))
+	(if (not idb)(sqlite3:finalize! dbstruct))
+	(debug:print-info 11 *default-log-port* "open-run-close-no-exception-handling END" )
+	res)
+      #f))
+
+#;(define (open-run-close-exception-handling proc idb . params)
+  (handle-exceptions
+   exn
+   (let ((sleep-time (pseudo-random-integer 30))
+	 (err-status ((condition-property-accessor 'sqlite3 'status #f) exn)))
+     (case err-status
+       ((busy)
+	(thread-sleep! sleep-time))
+       (else
+	(debug:print 0 *default-log-port* "EXCEPTION: database probably overloaded or unreadable.")
+	(debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
+	(debug:print 5 *default-log-port* "exn=" (condition->list exn))
+	(debug:print 0 *default-log-port* " status:  " ((condition-property-accessor 'sqlite3 'status) exn))
+	(print-call-chain (current-error-port))
+	(thread-sleep! sleep-time)
+	(debug:print-info 0 *default-log-port* "trying db call one more time....this may never recover, if necessary kill process " (current-process-id) " on host " (get-host-name) " to clean up")))
+     (apply open-run-close-exception-handling proc idb params))
+   (apply open-run-close-no-exception-handling proc idb params)))
+
+;; (define open-run-close 
+#;(define open-run-close open-run-close-exception-handling)
+		;;	   open-run-close-no-exception-handling
+;;			   open-run-close-exception-handling)
+;;)
+
+(define db:trigger-list 
+     (list (list "update_runs_trigger"  "CREATE TRIGGER IF NOT EXISTS update_runs_trigger AFTER UPDATE ON runs
+                             FOR EACH ROW
+                               BEGIN 
+                                 UPDATE runs SET last_update=(strftime('%s','now'))
+                                   WHERE id=old.id;
+                               END;" ) 
+	   (list "update_run_stats_trigger"  "CREATE TRIGGER  IF NOT EXISTS update_run_stats_trigger AFTER UPDATE ON run_stats
+                             FOR EACH ROW
+                               BEGIN 
+                                 UPDATE run_stats SET last_update=(strftime('%s','now'))
+                                   WHERE id=old.id;
+                               END;" )
+	   (list "update_tests_trigger"  "CREATE TRIGGER  IF NOT EXISTS update_tests_trigger AFTER UPDATE ON tests
+                             FOR EACH ROW
+                               BEGIN 
+                                 UPDATE tests SET last_update=(strftime('%s','now'))
+                                   WHERE id=old.id;
+                               END;" )
+	   (list "update_teststeps_trigger"  "CREATE TRIGGER  IF NOT EXISTS update_teststeps_trigger AFTER UPDATE ON test_steps
+                             FOR EACH ROW
+                               BEGIN 
+                                 UPDATE test_steps SET last_update=(strftime('%s','now'))
+                                   WHERE id=old.id;
+                               END;" )
+	   (list "update_test_data_trigger"  "CREATE TRIGGER  IF NOT EXISTS update_test_data_trigger AFTER UPDATE ON test_data
+                             FOR EACH ROW
+                               BEGIN 
+                                 UPDATE test_data SET last_update=(strftime('%s','now'))
+                                   WHERE id=old.id;
+                               END;" )))
+
+(define (db:create-all-triggers dbstruct)
+(db:with-db
+   dbstruct #f #f
+   (lambda (db)
+(db:create-triggers db))))
+
+(define (db:create-triggers db)
+    (for-each (lambda (key)
+              (sqlite3:execute db (cadr key)))
+          db:trigger-list))
+
+(define (db:drop-all-triggers dbstruct)
+  (db:with-db
+   dbstruct #f #f
+   (lambda (db)
+     (db:drop-triggers db))))
+
+(define (db:is-trigger-dropped db tbl-name)
+  (let* ((trigger-name (if (equal? tbl-name "test_steps")
+			   "update_teststeps_trigger" 
+                           (conc "update_" tbl-name "_trigger")))
+	 (res          #f))
+    (sqlite3:for-each-row
+     (lambda (name)
+       (if (equal? name trigger-name)
+	   (set! res #t)))
+     db 
+     "SELECT name FROM sqlite_master WHERE type = 'trigger' ;" 
+     )))
+
+(define (db:drop-triggers db)
+  (for-each
+   (lambda (key) 
+     (sqlite3:execute db (conc "drop trigger if exists " (car key))))
+   db:trigger-list))
+
+(define  (db:drop-trigger db tbl-name)
+  (let* ((trigger-name (if (equal? tbl-name "test_steps")
+			   "update_teststeps_trigger" 
+                           (conc "update_" tbl-name "_trigger"))))
+    (for-each
+     (lambda (key) 
+       (if (equal? (car key) trigger-name)
+           (sqlite3:execute db (conc "drop trigger if exists " trigger-name))))
+     db:trigger-list)))
+
+(define  (db:create-trigger db tbl-name)
+      (let* ((trigger-name (if (equal? tbl-name "test_steps")
+                              "update_teststeps_trigger" 
+                              (conc "update_" tbl-name "_trigger"))))
+       (for-each (lambda (key) 
+             (if (equal? (car key) trigger-name)
+             (sqlite3:execute db (cadr key))))
+      db:trigger-list))) 
+
+
+(define (db:initialize-db db)
+  (assert *configinfo* "ERROR: db:initialize-db called before configfiles loaded. This is fatal.")
+  (let* ((configdat (car *configinfo*))  ;; tut tut, global warning...
+	 (keys     (keys:config-get-fields configdat))
+	 (havekeys (> (length keys) 0))
+	 (keystr   (keys->keystr keys))
+	 (fieldstr (keys:make-key/field-string configdat))
+	 #;(db       (dbr:dbdat-db dbdat)))
+    (for-each (lambda (key)
+		(let ((keyn key))
+		  (if (member (string-downcase keyn)
+			      (list "runname" "state" "status" "owner" "event_time" "comment" "fail_count"
+				    "pass_count" "contour"))
+		      (begin
+			(print "ERROR: your key cannot be named " keyn " as this conflicts with the same named field in the runs table, you must remove your megatest.db and <linktree>/.db before trying again.")
+			(exit 1)))))
+	      keys)
+    (sqlite3:with-transaction
+     db
+     (lambda ()
+       (sqlite3:execute db "CREATE TABLE IF NOT EXISTS locks
+                                   (id INTEGER PRIMARY KEY,
+                                    lockname TEXT,
+                                    owner_pid INTEGER,
+                                    owner_host TEXT,
+                                    event_time TIMESTAMP DEFAULT (strftime('%s','now')),
+                               CONSTRAINT lock_constraint UNIQUE (lockname));")
+
+       ;; maps to *srvpktspec* from http-transportmod
+       (sqlite3:execute db "CREATE TABLE IF NOT EXISTS servers
+                                   (id INTEGER PRIMARY KEY,
+                                    host TEXT,
+                                    port INTEGER,
+                                    servkey TEXT,
+                                    pid TEXT,
+                                    ipaddr TEXT,
+                                    dbpath TEXT,
+                                    event_time TIMESTAMP DEFAULT (strftime('%s','now')),
+                               CONSTRAINT servers_constraint UNIQUE (dbpath));")
+
+       (sqlite3:execute db "CREATE TABLE IF NOT EXISTS keys
+                                    (id INTEGER PRIMARY KEY,
+                                     fieldname TEXT,
+                                     fieldtype TEXT,
+                                CONSTRAINT keyconstraint UNIQUE (fieldname));")
+       
+       (for-each (lambda (key)
+		   (sqlite3:execute db "INSERT OR REPLACE INTO keys (fieldname,fieldtype) VALUES (?,?);" key "TEXT"))
+		 keys)
+
+       (sqlite3:execute db (conc 
+			    "CREATE TABLE IF NOT EXISTS runs (id INTEGER PRIMARY KEY, \n			 " 
+			     fieldstr (if havekeys "," "") "
+			 runname    TEXT DEFAULT 'norun',
+                         contour    TEXT DEFAULT '',
+			 state      TEXT DEFAULT '',
+			 status     TEXT DEFAULT '',
+			 owner      TEXT DEFAULT '',
+			 event_time TIMESTAMP DEFAULT (strftime('%s','now')),
+			 comment    TEXT DEFAULT '',
+			 fail_count INTEGER DEFAULT 0,
+			 pass_count INTEGER DEFAULT 0,
+                         last_update INTEGER DEFAULT (strftime('%s','now')),
+			 CONSTRAINT runsconstraint UNIQUE (runname" (if havekeys "," "") keystr "));"))
+       
+	(sqlite3:execute db "CREATE TABLE IF NOT EXISTS run_stats (
+                              id     INTEGER PRIMARY KEY,
+                              run_id INTEGER,
+                              state  TEXT,
+                              status TEXT,
+                              count  INTEGER,
+                              last_update INTEGER DEFAULT (strftime('%s','now')))")
+	(sqlite3:execute db "CREATE TABLE IF NOT EXISTS test_meta (
+                                     id          INTEGER PRIMARY KEY,
+                                     testname    TEXT DEFAULT '',
+                                     author      TEXT DEFAULT '',
+                                     owner       TEXT DEFAULT '',
+                                     description TEXT DEFAULT '',
+                                     reviewed    TIMESTAMP,
+                                     iterated    TEXT DEFAULT '',
+                                     avg_runtime REAL,
+                                     avg_disk    REAL,
+                                     tags        TEXT DEFAULT '',
+                                     jobgroup    TEXT DEFAULT 'default',
+                                CONSTRAINT test_meta_constraint UNIQUE (testname));")
+	(sqlite3:execute db "CREATE TABLE IF NOT EXISTS tasks_queue (id INTEGER PRIMARY KEY,
+                                action TEXT DEFAULT '',
+                                owner TEXT,
+                                state TEXT DEFAULT 'new',
+                                target TEXT DEFAULT '',
+                                name TEXT DEFAULT '',
+                                testpatt TEXT DEFAULT '',
+                                keylock TEXT,
+                                params TEXT,
+                                creation_time TIMESTAMP DEFAULT (strftime('%s','now')),
+                                execution_time TIMESTAMP);")
+	;; archive disk areas, cached info from [archive-disks]
+	(sqlite3:execute db "CREATE TABLE IF NOT EXISTS archive_disks (
+                                id INTEGER PRIMARY KEY,
+                                archive_area_name TEXT,
+                                disk_path TEXT,
+                                last_df INTEGER DEFAULT -1,
+                                last_df_time TIMESTAMP DEFAULT (strftime('%s','now')),
+                                creation_time TIMESTAMP DEFAULT (strftime('%s','now')));")
+	;; individual bup (or tar) data chunks
+	(sqlite3:execute db "CREATE TABLE IF NOT EXISTS archive_blocks (
+                                id INTEGER PRIMARY KEY,
+                                archive_disk_id INTEGER,
+                                disk_path TEXT,
+                                last_du INTEGER DEFAULT -1,
+                                last_du_time TIMESTAMP DEFAULT (strftime('%s','now')),
+                                creation_time TIMESTAMP DEFAULT (strftime('%s','now')));")
+	;; tests allocated to what chunks. reusing a chunk for a test/item_path is very efficient
+	;; NB// the per run/test recording of where the archive is stored is done in the test
+	;;      record. 
+	(sqlite3:execute db "CREATE TABLE IF NOT EXISTS archive_allocations (
+                                id INTEGER PRIMARY KEY,
+                                archive_block_id INTEGER,
+                                testname TEXT,
+                                item_path TEXT,
+                                creation_time TIMESTAMP DEFAULT (strftime('%s','now')));")
+	;; move this clean up call somewhere else
+	(sqlite3:execute db "DELETE FROM tasks_queue WHERE state='done' AND creation_time < ?;" (- (current-seconds)(* 24 60 60))) ;; remove older than 24 hrs
+	(sqlite3:execute db (conc "CREATE INDEX IF NOT EXISTS runs_index ON runs (runname" (if havekeys "," "") keystr ");"))
+	;; (sqlite3:execute db "CREATE VIEW runs_tests AS SELECT * FROM runs INNER JOIN tests ON runs.id=tests.run_id;")
+	(sqlite3:execute db "CREATE TABLE IF NOT EXISTS extradat (id INTEGER PRIMARY KEY, run_id INTEGER, key TEXT, val TEXT);")
+	(sqlite3:execute db "CREATE TABLE IF NOT EXISTS metadat (id INTEGER PRIMARY KEY, var TEXT, val TEXT,
+                                  CONSTRAINT metadat_constraint UNIQUE (var));")
+	(sqlite3:execute db "CREATE TABLE IF NOT EXISTS access_log (id INTEGER PRIMARY KEY, user TEXT, accessed TIMESTAMP, args TEXT);")
+	;; Must do this *after* running patch db !! No more. 
+	;; cannot use db:set-var since it will deadlock, hardwire the code here
+	(sqlite3:execute db "INSERT OR REPLACE INTO metadat (var,val) VALUES (?,?);" "MEGATEST_VERSION" (common:version-signature))
+	(debug:print-info 11 *default-log-port* "db:initialize END") ;; ))))
+
+	;;======================================================================
+	;; R U N   S P E C I F I C   D B 
+	;;======================================================================
+	
+	(sqlite3:execute db "CREATE TABLE IF NOT EXISTS tests 
+                    (id INTEGER PRIMARY KEY,
+                     run_id       INTEGER   DEFAULT -1,
+                     testname     TEXT      DEFAULT 'noname',
+                     host         TEXT      DEFAULT 'n/a',
+                     cpuload      REAL      DEFAULT -1,
+                     diskfree     INTEGER   DEFAULT -1,
+                     uname        TEXT      DEFAULT 'n/a', 
+                     rundir       TEXT      DEFAULT '/tmp/badname',
+                     shortdir     TEXT      DEFAULT '/tmp/badname',
+                     item_path    TEXT      DEFAULT '',
+                     state        TEXT      DEFAULT 'NOT_STARTED',
+                     status       TEXT      DEFAULT 'FAIL',
+                     attemptnum   INTEGER   DEFAULT 0,
+                     final_logf   TEXT      DEFAULT 'logs/final.log',
+                     logdat       TEXT      DEFAULT '', 
+                     run_duration INTEGER   DEFAULT 0,
+                     comment      TEXT      DEFAULT '',
+                     event_time   TIMESTAMP DEFAULT (strftime('%s','now')),
+                     fail_count   INTEGER   DEFAULT 0,
+                     pass_count   INTEGER   DEFAULT 0,
+                     archived     INTEGER   DEFAULT 0, -- 0=no, > 1=archive block id where test data can be found
+                     last_update  INTEGER DEFAULT (strftime('%s','now')),
+                        CONSTRAINT testsconstraint UNIQUE (run_id, testname, item_path));")
+	;; deprecated -- (sqlite3:execute db "CREATE INDEX IF NOT EXISTS tests_index ON tests (run_id, testname, item_path, uname);")
+        
+        (sqlite3:execute db "CREATE INDEX IF NOT EXISTS tests_run_id_index ON tests (run_id);")  ;; new
+        (sqlite3:execute db "CREATE INDEX IF NOT EXISTS tests_testname_index ON tests (testname,item_path);") ;; new
+        (sqlite3:execute db "CREATE INDEX IF NOT EXISTS tests_state_status_index ON tests (state, status); ") ;; new
+	(sqlite3:execute db "CREATE TABLE IF NOT EXISTS test_steps 
+                              (id INTEGER PRIMARY KEY,
+                               test_id INTEGER, 
+                               stepname TEXT, 
+                               state TEXT DEFAULT 'NOT_STARTED', 
+                               status TEXT DEFAULT 'n/a',
+                               event_time TIMESTAMP,
+                               comment TEXT DEFAULT '',
+                               logfile TEXT DEFAULT '',
+                               last_update  INTEGER DEFAULT (strftime('%s','now')),
+                               CONSTRAINT test_steps_constraint UNIQUE (test_id,stepname,state));")
+	(sqlite3:execute db "CREATE INDEX IF NOT EXISTS teststeps_index ON tests (run_id, testname, item_path);")
+	(sqlite3:execute db "CREATE TABLE IF NOT EXISTS test_data (id INTEGER PRIMARY KEY,
+                                test_id INTEGER,
+                                category TEXT DEFAULT '',
+                                variable TEXT,
+	                        value REAL,
+	                        expected REAL,
+	                        tol REAL,
+                                units TEXT,
+                                comment TEXT DEFAULT '',
+                                status TEXT DEFAULT 'n/a',
+                                type TEXT DEFAULT '',
+                                last_update  INTEGER DEFAULT (strftime('%s','now')),
+                              CONSTRAINT test_data_constraint UNIQUE (test_id,category,variable));")
+	(sqlite3:execute db "CREATE INDEX IF NOT EXISTS test_data_index ON test_data (test_id);")
+	(sqlite3:execute db "CREATE TABLE IF NOT EXISTS test_rundat (
+                              id           INTEGER PRIMARY KEY,
+                              test_id      INTEGER,
+                              update_time  TIMESTAMP,
+                              cpuload      INTEGER DEFAULT -1,
+                              diskfree     INTEGER DEFAULT -1,
+                              diskusage    INTGER DEFAULT -1,
+                              run_duration INTEGER DEFAULT 0);")
+	(sqlite3:execute db "CREATE TABLE IF NOT EXISTS archives (
+                              id           INTEGER PRIMARY KEY,
+                              test_id      INTEGER,
+                              state        TEXT DEFAULT 'new',
+                              status       TEXT DEFAULT 'n/a',
+                              archive_type TEXT DEFAULT 'bup',
+                              du           INTEGER,
+                              archive_path TEXT);")))
+         (print "creating triggers from init") 
+        (db:create-triggers db)    
+     db)) ;; )
+
+;;======================================================================
+;; A R C H I V E S
+;;======================================================================
+
+;; dneeded is minimum space needed, scan for existing archives that 
+;; are on disks with adequate space and already have this test/itempath
+;; archived
+;;
+(define (db:archive-get-allocations dbstruct testname itempath dneeded)
+  (let* ((db           (db:get-inmem dbstruct #f)) ;; archive tables are in main.db
+	 (res          '())
+	 (blocks       '())) ;; a block is an archive chunck that can be added too if there is space
+    (sqlite3:for-each-row
+     (lambda (id archive-disk-id disk-path last-du last-du-time)
+       (set! res (cons (vector id archive-disk-id disk-path last-du last-du-time) res)))
+     db
+     "SELECT b.id,b.archive_disk_id,b.disk_path,b.last_du,b.last_du_time FROM archive_blocks AS b
+        INNER JOIN archive_allocations AS a ON a.archive_block_id=b.id
+        WHERE a.testname=? AND a.item_path=?;" 
+     testname itempath)
+    ;; Now res has list of candidate paths, look in archive_disks for candidate with potential free space
+    (if (null? res)
+	'()
+	(sqlite3:for-each-row
+	 (lambda (id archive-area-name disk-path last-df last-df-time)
+	   (set! blocks (cons (vector id archive-area-name disk-path last-df last-df-time) blocks)))
+	 db 
+	 (conc
+	  "SELECT d.id,d.archive_area_name,disk_path,last_df,last_df_time FROM archive_disks AS d
+             INNER JOIN archive_blocks AS b ON d.id=b.archive_disk_id
+             WHERE b.id IN (" (string-intersperse (map conc res) ",") ") AND
+         last_df > ?;")
+	 dneeded))
+    blocks))
+    
+;; returns id of the record, register a disk allocated to archiving and record it's last known
+;; available space
+;;
+;; NEEDS WORK! THIS WILL LIKELY NOT WORK AS IS!
+;;
+(define (db:archive-register-disk dbstruct bdisk-name bdisk-path df)
+  (let* ((db           (db:get-inmem dbstruct #f)) ;; archive tables are in main.db
+	 (res          #f))
+    (sqlite3:for-each-row
+     (lambda (id)
+       (set! res id))
+     db
+     "SELECT id FROM archive_disks WHERE archive_area_name=? AND disk_path=?;"
+     bdisk-name bdisk-path)
+    (if res ;; record exists, update df and return id
+	(begin
+	  (sqlite3:execute db "UPDATE archive_disks SET last_df=?,last_df_time=(strftime('%s','now'))
+                                  WHERE archive_area_name=? AND disk_path=?;"
+			   df bdisk-name bdisk-path)
+	  res)
+	(begin
+	  (sqlite3:execute
+	   db
+	   "INSERT OR REPLACE INTO archive_disks (archive_area_name,disk_path,last_df)
+                VALUES (?,?,?);"
+	   bdisk-name bdisk-path df)
+	  (db:archive-register-disk dbstruct bdisk-name bdisk-path df)))))
+
+;; record an archive path created on a given archive disk (identified by it's bdisk-id)
+;; if path starts with / then it is full, otherwise it is relative to the archive disk
+;; preference is to store the relative path.
+;;
+(define (db:archive-register-block-name dbstruct bdisk-id archive-path #!key (du #f))
+  (let* ((db           (db:get-inmem dbstruct #f)) ;; archive tables are in main.db
+	 (res          #f))
+    ;; first look to see if this path is already registered
+    (sqlite3:for-each-row
+     (lambda (id)
+       (set! res id))
+     db
+     "SELECT id FROM archive_blocks WHERE archive_disk_id=? AND disk_path=?;"
+     bdisk-id archive-path)
+    (if res ;; record exists, update du if applicable and return res
+	(if du (sqlite3:execute db "UPDATE archive_blocks SET last_du=?,last_du_time=(strftime('%s','now'))
+                                          WHERE archive_disk_id=? AND disk_path=?;"
+				bdisk-id archive-path du))
+	(begin
+	  (sqlite3:execute db "INSERT OR REPLACE INTO archive_blocks (archive_disk_id,disk_path,last_du)
+                                                        VALUES (?,?,?);"
+			   bdisk-id archive-path (or du 0))
+	  (set! res (db:archive-register-block-name dbstruct bdisk-id archive-path du: du))))
+    res))
+
+
+;; The "archived" field in tests is overloaded; 0 = not archived, > 0 archived in block with given id
+;;
+(define (db:test-set-archive-block-id dbstruct run-id test-id archive-block-id)
+  (db:with-db
+   dbstruct
+   run-id
+   #f
+   (lambda (db)
+     (sqlite3:execute db "UPDATE tests SET archived=? WHERE id=?;"
+		      archive-block-id test-id))))
+ 
+;; Look up the archive block info given a block-id
+;;
+(define (db:test-get-archive-block-info dbstruct archive-block-id)
+  (db:with-db
+   dbstruct
+   #f
+   #f
+   (lambda (db)
+     (let ((res #f))
+       (sqlite3:for-each-row 
+	;;        0         1           2        3          4           5
+	(lambda (id archive-disk-id disk-path last-du last-du-time creation-time)
+	  (set! res (vector id archive-disk-id disk-path last-du last-du-time creation-time)))
+	db
+	"SELECT id,archive_disk_id,disk_path,last_du,last_du_time,creation_time FROM archive_blocks WHERE id=?;"
+	archive-block-id)
+       res))))
+
+;; (define (db:archive-allocate-testsuite/area-to-block block-id testsuite-name areakey)
+;;   (let* ((dbdat        (db:get-inmem dbstruct #f)) ;; archive tables are in main.db
+;; 	 (db           (db:dbdat-get-db dbdat))
+;; 	 (res          '())
+;; 	 (blocks       '())) ;; a block is an archive chunck that can be added too if there is space
+;;     (sqlite3:for-each-row  #f)
+
+;;======================================================================
+;; L O G G I N G    D B 
+;;======================================================================
+
+(define (open-logging-db)
+  (let* ((dbpath    (conc (if *toppath* (conc *toppath* "/") "") "logging.db")) ;; fname)
+	 (dbexists  (common:file-exists? dbpath))
+	 (db        (sqlite3:open-database dbpath))
+	 (handler   (sqlite3:make-busy-timeout (if (args:get-arg "-override-timeout")
+					   (string->number (args:get-arg "-override-timeout"))
+					   136000)))) ;; 136000)))
+    (sqlite3:set-busy-handler! db handler)
+    (if (not dbexists)
+	(begin
+	  (sqlite3:execute db "CREATE TABLE IF NOT EXISTS log (id INTEGER PRIMARY KEY,event_time TIMESTAMP DEFAULT (strftime('%s','now')),logline TEXT,pwd TEXT,cmdline TEXT,pid INTEGER);")
+	  (db:set-sync db) ;; (sqlite3:execute db (conc "PRAGMA synchronous = 0;"))
+	  ))
+    db))
+
+(define (db:log-local-event . loglst)
+  (let ((logline (apply conc loglst)))
+    (db:log-event logline)))
+
+(define (db:log-event logline)
+  (let ((db (open-logging-db)))
+    (sqlite3:execute db "INSERT INTO log (logline,pwd,cmdline,pid) VALUES (?,?,?,?);"
+		     logline
+		     (current-directory)
+		     (string-intersperse (argv) " ")
+		     (current-process-id))
+    (sqlite3:finalize! db)
+    logline))
+
+;;======================================================================
+;; D B   U T I L S
+;;======================================================================
+
+;;======================================================================
+;; M A I N T E N A N C E
+;;======================================================================
+
+(define (db:have-incompletes? dbstruct run-id ovr-deadtime)
+  (let* ((incompleted '())
+	 (oldlaunched '())
+	 (toplevels   '())
+	 (deadtime-str (configf:lookup *configdat* "setup" "deadtime"))
+	 (deadtime     (if (and deadtime-str
+				(string->number deadtime-str))
+			   (string->number deadtime-str)
+			   72000))) ;; twenty hours
+    (db:with-db
+     dbstruct #f #f
+     (lambda (db)
+       (if (number? ovr-deadtime)(set! deadtime ovr-deadtime))
+       
+       ;; in RUNNING or REMOTEHOSTSTART for more than 10 minutes
+       ;;
+       ;; HOWEVER: this code in run:test seems to work fine
+       ;;              (> (- (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)
+          (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))))
+        db
+        "SELECT id,rundir,uname,testname,item_path FROM tests WHERE run_id=? AND (strftime('%s','now') - event_time) > (run_duration + ?) AND state IN ('RUNNING','REMOTEHOSTSTART');"
+        run-id 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)
+       (sqlite3:for-each-row
+        (lambda (test-id run-dir uname testname item-path)
+          (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))
+              (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)
+       
+       (debug:print-info 18 *default-log-port* "Found " (length oldlaunched) " old LAUNCHED items, " (length toplevels) " old LAUNCHED toplevel tests and " (length incompleted) " tests marked RUNNING but apparently dead.")
+       (if (and (null? incompleted)
+                (null? oldlaunched)
+                (null? toplevels))
+           #f
+           #t)))))
+
+(define (db:get-status-from-final-status-file run-dir)
+  (let ((infile (conc run-dir "/.final-status")))
+    ;; first verify we are able to write the output file
+    (if (not (file-readable? infile))
+        (begin 
+	  (debug:print 0 *default-log-port* "ERROR: cannot read " infile)
+          (debug:print 0 *default-log-port* "ERROR: run-dir is " run-dir)
+          #f
+          )
+        (with-input-from-file infile read-lines)
+	)))
+
+;;  select end_time-now from
+;;      (select testname,item_path,event_time+run_duration as
+;;                          end_time,strftime('%s','now') as now from tests where state in
+;;      ('RUNNING','REMOTEHOSTSTART','LAUNCHED'));
+
+(define (db:find-and-mark-incomplete dbstruct run-id ovr-deadtime)
+  (let* ((incompleted '())
+	 (oldlaunched '())
+	 (toplevels   '())
+          ;; The default running-deadtime is 720 seconds = 12 minutes.
+          ;; "(running-deadtime-default (+ server-start-allowance (* 2 launch-monitor-period)))" = 200 + (2 * (200 + 30 + 30))
+         (deadtime-trim (or ovr-deadtime (configf:lookup-number *configdat* "setup" "deadtime")))
+         (server-start-allowance 200)
+         (server-overloaded-budget 200)
+         (launch-monitor-off-time (or (configf:lookup-number *configdat* "setup" "test-stats-update-period") 30))
+         (launch-monitor-on-time-budget 30)
+         (launch-monitor-period (+ launch-monitor-off-time launch-monitor-on-time-budget server-overloaded-budget))
+         (remotehoststart-deadtime-default (+ server-start-allowance server-overloaded-budget 30))
+         (remotehoststart-deadtime (or deadtime-trim remotehoststart-deadtime-default))
+         (running-deadtime-default (+ server-start-allowance (* 2 launch-monitor-period)))
+         (running-deadtime (or deadtime-trim running-deadtime-default)) ;; two minutes (30 seconds between updates, this leaves 3x grace period)
+         )
+    (debug:print-info 4  *default-log-port* "running-deadtime = " running-deadtime)
+    (debug:print-info 4  *default-log-port* "deadtime-trim = " deadtime-trim)
+
+    (db:with-db 
+     dbstruct #f #f
+     (lambda (db)
+       (let* ((stmth1 (db:get-cache-stmth
+		       dbstruct 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');"))
+	      (stmth2 (db:get-cache-stmth
+		       dbstruct 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 ('REMOTEHOSTSTART');"))
+	      (stmth3 (db:get-cache-stmth
+		       dbstruct db
+		       "SELECT id,rundir,uname,testname,item_path FROM tests
+                           WHERE run_id=? AND (strftime('%s','now') - event_time) > 86400
+                                          AND state IN ('LAUNCHED');")))
+	 ;; in RUNNING or REMOTEHOSTSTART for more than 10 minutes
+	 ;;
+	 ;; HOWEVER: this code in run:test seems to work fine
+	 ;;              (> (- (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 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
+		  (set! incompleted (cons (list test-id run-dir uname testname item-path run-id) incompleted))
+		  (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))))
+	  stmth1
+	  run-id running-deadtime) ;; default time 720 seconds
+       
+	 (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 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)))))
+	  stmth2
+	  run-id remotehoststart-deadtime) ;; default time 230 seconds
+	 
+	 ;; 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)
+	 (sqlite3:for-each-row
+	  (lambda (test-id run-dir uname testname item-path)
+	    (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 LAUNCHED state, test-id=" test-id
+				    " 1 day since event_time marked")
+                (set! oldlaunched (cons (list test-id run-dir uname testname item-path run-id) oldlaunched)))))
+	  stmth3
+	  run-id)
+       
+	 (debug:print-info 18 *default-log-port* "Found " (length oldlaunched) " old LAUNCHED items, "
+			   (length toplevels) " old LAUNCHED toplevel tests and "
+			   (length incompleted) " tests marked RUNNING but apparently dead."))
+
+	 ;; These are defunct tests, do not do all the overhead of set-state-status. Force them to INCOMPLETE.
+       ;;
+	 ;; (db:delay-if-busy dbdat)
+	 (let* ((min-incompleted-ids (map car incompleted)) ;; do 'em all
+		(all-ids             (append min-incompleted-ids (map car oldlaunched))))
+	   (if (> (length all-ids) 0)
+	       (begin
+		 ;; (launch:is-test-alive "localhost" 435)
+		 (debug:print 0 *default-log-port* "WARNING: Marking test(s); " (string-intersperse (map conc all-ids) ", ")
+			      " as DEAD")
+		 (for-each
+                  (lambda (test-id)
+                    (let* (;; (run-dir (db:test-get-rundir-from-test-id dbstruct run-id test-id))
+			   (tinfo   (db:get-test-info-by-id dbstruct run-id test-id))
+			   (run-dir (db:test-get-rundir     tinfo))
+			   (host    (db:test-get-host       tinfo))
+			   (pid     (db:test-get-process_id tinfo))
+			   (result (db:get-status-from-final-status-file run-dir)))
+		      (if (and (list? result) (> (length result) 1) (equal? "PASS" (cadr result)) (equal? "COMPLETED" (car result))) 
+			  (begin
+			    (debug:print 0 *default-log-port* "INFO: test " test-id " actually passed, so marking PASS not DEAD")
+			    (db:set-state-status-and-roll-up-items
+			     dbstruct run-id test-id 'foo "COMPLETED" "PASS"
+			     "Test stopped responding but it has PASSED; marking it PASS in the DB."))
+			  (let ((is-alive (and (not (eq? pid 0))  ;; 0 is default in re-used field "attemptnum" where pid stored.
+					       (launch:is-test-alive host pid))))
+			    (if is-alive
+				(debug:print 0 *default-log-port* "INFO: test " test-id " on host " host
+					     " has a process on pid " pid ", NOT setting to DEAD.")
+				(begin
+				  (debug:print 0 *default-log-port* "INFO: test " test-id
+					       " final state/status is not COMPLETED/PASS. It is " result)
+				  (db:set-state-status-and-roll-up-items
+				   dbstruct run-id test-id 'foo "COMPLETED" "DEAD"
+				   "Test stopped responding while in RUNNING or REMOTEHOSTSTART; presumed dead.")))))))
+		  ;; call end of eud of run detection for posthook - from merge, is it needed?
+		  ;; (launch:end-of-run-check run-id)
+		  all-ids)
+		 ;;call end of eud of run detection for posthook
+		 ;; MATT: Moving this to rmt.scm - call right after calling find-and-mark-complete
+		 ;; (launch:end-of-run-check run-id)
+		 )))))))
+
+;; BUG: Probably broken - does not explicitly use run-id in the query
+;;
+(define (db:top-test-set-per-pf-counts dbstruct run-id test-name)
+  (db:general-call dbstruct 'top-test-set-per-pf-counts (list test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name)))
+
+;; Clean out old junk and vacuum the database
+;;
+;; Ultimately do something like this:
+;;
+;; 1. Look at test records either deleted or part of deleted run:
+;;    a. If test dir exists, set the the test to state='UNKNOWN', Set the run to 'unknown'
+;;    b. If test dir gone, delete the test record
+;; 2. Look at run records
+;;    a. If have tests that are not deleted, set state='unknown'
+;;    b. ....
+;;
+(define (db:clean-up dbdat run-id)
+  ;; (debug:print 0 *default-log-port* "WARNING: db clean up not fully ported to v1.60, cleanup action will be on megatest.db")
+  (let* ((keep-record-age ( - (current-seconds) (common:hms-string->seconds (or (configf:lookup *configdat* "setup" "delete-record-age") "30d"))))
+	 (db         (db:get-inmem dbdat run-id))
+	 (count-stmt (sqlite3:prepare db "SELECT (SELECT count(id) FROM tests)+(SELECT count(id) FROM runs);"))
+	(statements
+	 (map (lambda (stmt)
+		(sqlite3:prepare db stmt))
+	      (list
+	       ;; delete all tests that belong to runs that are 'deleted'
+	       (conc "DELETE FROM tests WHERE run_id in (SELECT id FROM runs WHERE state='deleted') and last_update < " keep-record-age ";")
+	       ;; delete all tests that are 'DELETED'
+	       (conc "DELETE FROM tests WHERE state='DELETED' and last_update < " keep-record-age " ;")
+	       ;; delete all tests that have no run
+	       (conc "DELETE FROM tests WHERE run_id NOT IN (SELECT DISTINCT id FROM runs) and last_update < " keep-record-age "; ")
+	       ;; delete all runs that are state='deleted'
+	       (conc "DELETE FROM runs WHERE state='deleted' and last_update < " keep-record-age ";")
+	       ;; delete empty runs
+	       (conc "DELETE FROM runs WHERE id NOT IN (SELECT DISTINCT r.id FROM runs AS r INNER JOIN tests AS t ON t.run_id=r.id) and last_update < " keep-record-age ";")
+	       ;; remove orphaned test_rundat entries
+	       (conc "DELETE FROM test_rundat where test_id NOT IN (SELECT id FROM tests);")
+	       ;; remove orphaned test_steps entries
+	       (conc "DELETE FROM test_steps WHERE test_id NOT IN (SELECT id FROM tests);")
+               ;; remove orphaned test_dat entries
+	       (conc "DELETE FROM test_data WHERE test_id NOT IN (SELECT id FROM tests);")
+
+	       ))))
+    ;; (db:delay-if-busy dbdat)
+    ;(debug:print-info 0 *default-log-port*  statements) 
+    (sqlite3:with-transaction 
+     db
+     (lambda ()
+       (sqlite3:for-each-row (lambda (tot)
+			       (debug:print-info 0 *default-log-port* "Records count before clean: " tot))
+			     count-stmt)
+       (map sqlite3:execute statements)
+       (sqlite3:for-each-row (lambda (tot)
+			       (debug:print-info 0 *default-log-port* "Records count after  clean: " tot))
+			     count-stmt)))
+    (map sqlite3:finalize! statements)
+    (sqlite3:finalize! count-stmt)
+    ;; (db:find-and-mark-incomplete db)
+    ;; (db:delay-if-busy dbdat)
+    (sqlite3:execute db "VACUUM;")))
+
+;; Clean out old junk and vacuum the database
+;;
+;; Ultimately do something like this:
+;;
+;; 1. Look at test records either deleted or part of deleted run:
+;;    a. If test dir exists, set the the test to state='UNKNOWN', Set the run to 'unknown'
+;;    b. If test dir gone, delete the test record
+;; 2. Look at run records
+;;    a. If have tests that are not deleted, set state='unknown'
+;;    b. ....
+;;
+(define (db:clean-up-rundb dbdat run-id)
+  ;; (debug:print 0 *default-log-port* "WARNING: db clean up not fully ported to v1.60, cleanup action will be on megatest.db")
+  (let* ((db         (db:get-inmem dbdat run-id))
+	 (count-stmt (sqlite3:prepare db "SELECT (SELECT count(id) FROM tests);"))
+	(statements
+	 (map (lambda (stmt)
+		(sqlite3:prepare db stmt))
+	      (list
+	       ;; delete all tests that belong to runs that are 'deleted'
+	       ;; (conc "DELETE FROM tests WHERE run_id NOT IN (" (string-intersperse (map conc valid-runs) ",") ");")
+	       ;; delete all tests that are 'DELETED'
+	       "DELETE FROM tests WHERE state='DELETED';"
+	       ))))
+    ;; (db:delay-if-busy dbdat)
+    (sqlite3:with-transaction 
+     db
+     (lambda ()
+       (sqlite3:for-each-row (lambda (tot)
+			       (debug:print-info 0 *default-log-port* "Records count before clean: " tot))
+			     count-stmt)
+       (map sqlite3:execute statements)
+       (sqlite3:for-each-row (lambda (tot)
+			       (debug:print-info 0 *default-log-port* "Records count after  clean: " tot))
+			     count-stmt)))
+    (map sqlite3:finalize! statements)
+    (sqlite3:finalize! count-stmt)
+    ;; (db:find-and-mark-incomplete db)
+    ;; (db:delay-if-busy dbdat)
+    (sqlite3:execute db "VACUUM;")))
+
+;; ;; Clean out old junk and vacuum the database
+;; ;;
+;; ;; Ultimately do something like this:
+;; ;;
+;; ;; 1. Look at test records either deleted or part of deleted run:
+;; ;;    a. If test dir exists, set the the test to state='UNKNOWN', Set the run to 'unknown'
+;; ;;    b. If test dir gone, delete the test record
+;; ;; 2. Look at run records
+;; ;;    a. If have tests that are not deleted, set state='unknown'
+;; ;;    b. ....
+;; ;;
+;; (define (db:clean-up-maindb dbdat)
+;;   ;; (debug:print 0 *default-log-port* "WARNING: db clean up not fully ported to v1.60, cleanup action will be on megatest.db")
+;;   (let* ((db         (db:dbdat-get-db dbdat))
+;; 	 (count-stmt (sqlite3:prepare db "SELECT (SELECT count(id) FROM runs);"))
+;; 	 (statements
+;; 	  (map (lambda (stmt)
+;; 		 (sqlite3:prepare db stmt))
+;; 	       (list
+;; 		;; delete all tests that belong to runs that are 'deleted'
+;; 		;; (conc "DELETE FROM tests WHERE run_id NOT IN (" (string-intersperse (map conc valid-runs) ",") ");")
+;; 		;; delete all tests that are 'DELETED'
+;; 		"DELETE FROM runs WHERE state='deleted';"
+;; 		)))
+;; 	 (dead-runs '()))
+;;     (sqlite3:for-each-row
+;;      (lambda (run-id)
+;;        (set! dead-runs (cons run-id dead-runs)))
+;;        db
+;;        "SELECT id FROM runs WHERE state='deleted';")
+;;     ;; (db:delay-if-busy dbdat)
+;;     (sqlite3:with-transaction 
+;;      db
+;;      (lambda ()
+;;        (sqlite3:for-each-row (lambda (tot)
+;; 			       (debug:print-info 0 *default-log-port* "Records count before clean: " tot))
+;; 			     count-stmt)
+;;        (map sqlite3:execute statements)
+;;        (sqlite3:for-each-row (lambda (tot)
+;; 			       (debug:print-info 0 *default-log-port* "Records count after  clean: " tot))
+;; 			     count-stmt)))
+;;     (map sqlite3:finalize! statements)
+;;     (sqlite3:finalize! count-stmt)
+;;     ;; (db:find-and-mark-incomplete db)
+;;     ;; (db:delay-if-busy dbdat)
+;;     (sqlite3:execute db "VACUUM;")
+;;     dead-runs))
+
+;;======================================================================
+;; M E T A   G E T   A N D   S E T   V A R S
+;;======================================================================
+
+;; returns number if string->number is successful, string otherwise
+;; also updates *global-delta*
+;;
+(define (db:get-var dbstruct var)
+  (let* ((res      #f))
+    (db:with-db
+     dbstruct #f #f
+     (lambda (db)
+       (sqlite3:for-each-row
+        (lambda (val)
+          (set! res val))
+        db
+        "SELECT val FROM metadat WHERE var=?;" var)
+       ;; convert to number if can
+       (if (string? res)
+           (let ((valnum (string->number res)))
+             (if valnum (set! res valnum))))
+       res))))
+
+(define (db:inc-var dbstruct var)
+  (db:with-db dbstruct #f #t 
+	      (lambda (db)
+		(sqlite3:execute db "UPDATE metadat SET val=val+1 WHERE var=?;" var))))
+
+(define (db:dec-var dbstruct var)
+  (db:with-db dbstruct #f #t 
+	      (lambda (db)
+		(sqlite3:execute db "UPDATE metadat SET val=val-1 WHERE var=?;" var))))
+
+;; This was part of db:get-var. It was used to estimate the load on
+;; the database files.
+;;
+;; scale by 10, average with current value.
+;;     (set! *global-delta* (/ (+ *global-delta* (* (- (current-milliseconds) start-ms)
+;; 						 (if throttle throttle 0.01)))
+;; 			    2))
+;;     (if (> (abs (- *last-global-delta-printed* *global-delta*)) 0.08) ;; don't print all the time, only if it changes a bit
+;; 	(begin
+;; 	  (debug:print-info 4 *default-log-port* "launch throttle factor=" *global-delta*)
+;; 	  (set! *last-global-delta-printed* *global-delta*)))
+
+(define (db:set-var dbstruct var val)
+  (db:with-db dbstruct #f #t 
+	      (lambda (db)
+		(sqlite3:execute db "INSERT OR REPLACE INTO metadat (var,val) VALUES (?,?);" var val))))
+
+(define (db:add-var dbstruct var val)
+  (db:with-db dbstruct #f #t 
+	      (lambda (db)
+		(sqlite3:execute db "UPDATE metadat SET val=val+? WHERE var=?;" val var))))
+
+(define (db:del-var dbstruct var)
+  (db:with-db dbstruct #f #t 
+	      (lambda (db)
+		(sqlite3:execute db "DELETE FROM metadat WHERE var=?;" var))))
+
+;;======================================================================
+;; no-sync.db - small bits of data to be shared between servers
+;;======================================================================
+
+(define (db:open-no-sync-db)
+  (let* ((dbpath (common:get-db-tmp-area))
+	 (dbname (conc dbpath "/no-sync.db"))
+	 (db-exists (common:file-exists? dbname))
+	 (db     (sqlite3:open-database dbname)))
+    (sqlite3:set-busy-handler! db (sqlite3:make-busy-timeout 136000))
+    (if (not db-exists)
+	(begin
+	  (sqlite3:execute db "PRAGMA synchronous = 0;")
+	  (sqlite3:execute db "CREATE TABLE IF NOT EXISTS no_sync_metadat (var TEXT,val TEXT, CONSTRAINT no_sync_metadat_constraint UNIQUE (var));")
+	  (sqlite3:execute db "PRAGMA journal_mode=WAL;")))
+    db))
+
+;; if we are not a server create a db handle. this is not finalized
+;; so watch for problems. I'm still not clear if it is needed to manually
+;; finalize sqlite3 dbs with the sqlite3 egg.
+;;
+(define (db:no-sync-db db-in)
+  (mutex-lock! *db-access-mutex*)
+  (let ((res (if db-in
+                 db-in
+                 (let ((db (db:open-no-sync-db)))
+                   (set! *no-sync-db* db)
+                   db))))
+    (mutex-unlock! *db-access-mutex*)
+    res))
+
+(define (db:no-sync-set db var val)
+  (sqlite3:execute (db:no-sync-db db) "INSERT OR REPLACE INTO no_sync_metadat (var,val) VALUES (?,?);" var val))
+
+(define (db:no-sync-del! db var)
+  (sqlite3:execute (db:no-sync-db db) "DELETE FROM no_sync_metadat WHERE var=?;" var))
+
+(define (db:no-sync-get/default db var default)
+  (let ((res default))
+    (sqlite3:for-each-row
+     (lambda (val)
+       (set! res val))
+     (db:no-sync-db db)
+     "SELECT val FROM no_sync_metadat WHERE var=?;"
+     var)
+    (if res
+        (let ((newres (if (string? res)
+			  (string->number res)
+			  #f)))
+          (if newres
+              newres
+              res))
+        res)))
+
+(define (db:no-sync-close-db db stmt-cache)
+  (db:safely-close-sqlite3-db db stmt-cache))
+
+;; transaction protected lock aquisition
+;; either:
+;;    fails    returns  (#f . lock-creation-time)
+;;    succeeds (returns (#t . lock-creation-time)
+;; use (db:no-sync-del! db keyname) to release the lock
+;;
+(define (db:no-sync-get-lock db-in keyname)
+  (let ((db (db:no-sync-db db-in)))
+    (sqlite3:with-transaction
+     db
+     (lambda ()
+       (handle-exceptions
+	   exn
+	 (let ((lock-time (current-seconds)))
+	   (debug:print-info 2 *default-log-port* "db:no-sync-get-lock keyname=" keyname ", lock-time=" lock-time ", exn=" exn)
+	   (sqlite3:execute db "INSERT INTO no_sync_metadat (var,val) VALUES(?,?);" keyname lock-time)
+	   `(#t . ,lock-time))
+	 `(#f . ,(sqlite3:first-result db "SELECT val FROM no_sync_metadat WHERE var=?;" keyname)))))))
+
+
+
+;; use a global for some primitive caching, it is just silly to
+;; re-read the db over and over again for the keys since they never
+;; change
+
+;; why get the keys from the db? why not get from the *configdat*
+;; using keys:config-get-fields?
+
+(define (db:get-keys dbstruct)
+  (if *db-keys* *db-keys* 
+      (let ((res '()))
+	(db:with-db dbstruct #f #f
+		    (lambda (db)
+		      (sqlite3:for-each-row 
+		       (lambda (key)
+			 (set! res (cons key res)))
+		       db
+		       "SELECT fieldname FROM keys ORDER BY id DESC;")))
+	(set! *db-keys* res)
+	res)))
+
+;; extract index number given a header/data structure
+(define (db:get-index-by-header header field)
+  (list-index (lambda (x)(equal? x field)) header))
+
+;; look up values in a header/data structure
+(define (db:get-value-by-header row header field)
+  (if (or (null? header) (not row))
+      #f
+      (let loop ((hed (car header))
+                 (tal (cdr header))
+                 (n   0))
+        (if (equal? hed field)
+            (handle-exceptions
+             exn
+             (begin
+               (debug:print 0 *default-log-port* "WARNING: attempt to read non-existant field, row="
+			    row " header=" header " field=" field ", exn=" exn)
+               #f)
+             (vector-ref row n))
+	    (if (null? tal) #f (loop (car tal)(cdr tal)(+ n 1)))))))
+
+;; Accessors for the header/data structure
+;; get rows and header from 
+(define (db:get-header vec)(vector-ref vec 0))
+(define (db:get-rows   vec)(vector-ref vec 1))
+
+;;======================================================================
+;;  R U N S
+;;======================================================================
+
+
+
+
+
+(define (db:get-run-times dbstruct run-patt target-patt)
+(let ((res `())
+           (qry 	(conc "select runname, (max(end_time)-min(event_time))/60 as runtime, target from (select runname, run_id,tests.event_time,tests.event_time+run_duration AS end_time, " (string-join (db:get-keys dbstruct) " || '/' || ") " as target from tests inner join runs on tests.run_id = runs.id where runs.runname like ? and target like ?) group by run_id ;")))
+;(print qry)
+(db:with-db 
+   dbstruct
+   #f ;; this is for the main runs db
+   #f ;; does not modify db
+   (lambda (db)
+            (sqlite3:for-each-row
+	(lambda (runname runtime target )
+	  (set! res (cons (vector runname runtime target) res)))
+	db
+        qry 
+	run-patt target-patt)
+       
+       res))))
+
+
+
+(define (db:get-run-name-from-id dbstruct run-id)
+  (db:with-db 
+   dbstruct
+   #f ;; this is for the main runs db
+   #f ;; does not modify db
+   (lambda (db)
+     (let ((res #f))
+       (sqlite3:for-each-row
+	(lambda (runname)
+	  (set! res runname))
+	db
+	"SELECT runname FROM runs WHERE id=?;"
+	run-id)
+       res))))
+
+(define (db:get-run-key-val dbstruct run-id key)
+  (db:with-db
+   dbstruct
+   #f
+   #f
+   (lambda (db)
+     (let ((res #f))
+       (sqlite3:for-each-row
+	(lambda (val)
+	  (set! res val))
+	db
+	(conc "SELECT " key " FROM runs WHERE id=?;")
+	run-id)
+       res))))
+
+;; keys list to key1,key2,key3 ...
+(define (runs:get-std-run-fields keys remfields)
+  (let* ((header    (append keys remfields))
+	 (keystr    (conc (keys->keystr keys) ","
+			  (string-intersperse remfields ","))))
+    (list keystr header)))
+
+;; register a test run with the db, this accesses the main.db and does NOT
+;; use server api
+;;
+(define (db:register-run dbstruct keyvals runname state status user contour-in)
+  (let* ((keys      (map car keyvals))
+	 (keystr    (keys->keystr keys))
+	 (contour   (or contour-in ""))  ;; empty string to force no hierarcy and be backwards compatible.
+	 (comma     (if (> (length keys) 0) "," ""))
+	 (andstr    (if (> (length keys) 0) " AND " ""))
+	 (valslots  (keys->valslots keys)) ;; ?,?,? ...
+	 (allvals   (append (list runname state status user contour) (map cadr keyvals)))
+	 (qryvals   (append (list runname) (map cadr keyvals)))
+	 (key=?str  (string-intersperse (map (lambda (k)(conc k "=?")) keys) " AND ")))
+    (debug:print 3 *default-log-port* "keys: " keys " allvals: " allvals " keyvals: " keyvals " key=?str is " key=?str)
+    (debug:print 2 *default-log-port* "NOTE: using target " (string-intersperse (map cadr keyvals) "/") " for this run")
+    (if (and runname (null? (filter (lambda (x)(not x)) keyvals))) ;; there must be a better way to "apply and"
+	(db:with-db
+	 dbstruct #f #f
+	 (lambda (db)
+	   (let ((res #f))
+	     (apply sqlite3:execute db (conc "INSERT OR IGNORE INTO runs (runname,state,status,owner,event_time,contour" comma keystr ") VALUES (?,?,?,?,strftime('%s','now'),?" comma valslots ");")
+		    allvals)
+	     (apply sqlite3:for-each-row 
+		    (lambda (id)
+		      (set! res id))
+		    db
+		    (let ((qry (conc "SELECT id FROM runs WHERE (runname=? " andstr key=?str ");")))
+		      qry)
+		    qryvals)
+	     (sqlite3:execute db "UPDATE runs SET state=?,status=?,event_time=strftime('%s','now') WHERE id=? AND state='deleted';" state status res)
+	     res))) 
+	(begin
+	  (debug:print-error 0 *default-log-port* "Called without all necessary keys")
+	  #f))))
+
+;; replace header and keystr with a call to runs:get-std-run-fields
+;;
+;; keypatts: ( (KEY1 "abc%def")(KEY2 "%") )
+;; runpatts: patt1,patt2 ...
+;;
+(define (db:get-runs dbstruct runpatt count offset keypatts)
+  (let* ((res       '())
+	 (keys       (db:get-keys dbstruct))
+	 (runpattstr (db:patt->like "runname" runpatt))
+	 (remfields  (list "id" "runname" "state" "status" "owner" "event_time"))
+	 (header     (append keys remfields))
+	 (keystr     (conc (keys->keystr keys) ","
+			   (string-intersperse remfields ",")))
+	 (qrystr     (conc "SELECT " keystr " FROM runs WHERE (" runpattstr ") " ;; runname LIKE ? "
+			   ;; Generate: " AND x LIKE 'keypatt' ..."
+			   (if (null? keypatts) ""
+			       (conc " AND "
+				     (string-join 
+				      (map (lambda (keypatt)
+					     (let ((key  (car keypatt))
+						   (patt (cadr keypatt)))
+					       (db:patt->like key patt)))
+					   keypatts)
+				      " AND ")))
+			   " AND state != 'deleted' ORDER BY event_time DESC "
+			   (if (number? count)
+			       (conc " LIMIT " count)
+			       "")
+			   (if (number? offset)
+			       (conc " OFFSET " offset)
+			       ""))))
+    (debug:print-info 11 *default-log-port* "db:get-runs START qrystr: " qrystr " keypatts: " keypatts " offset: " offset " limit: " count)
+    (db:with-db dbstruct #f #f
+		(lambda (db)		
+		  (sqlite3:for-each-row
+		   (lambda (a . x)
+		     (set! res (cons (apply vector a x) res)))
+		   db
+		   qrystr
+		   )))
+    (debug:print-info 11 *default-log-port* "db:get-runs END qrystr: " qrystr " keypatts: " keypatts " offset: " offset " limit: " count)
+    (vector header res)))
+
+
+(define-record simple-run target id runname state status owner event_time)
+(define-record-printer (simple-run x out)
+  (fprintf out "#,(simple-run ~S ~S ~S ~S)"
+	   (simple-run-target x) (simple-run-id x) (simple-run-runname x) (time->string (seconds->local-time (simple-run-event_time x) ))))
+
+;; simple get-runs
+;;
+(define (db:simple-get-runs dbstruct runpatt count offset target last-update)
+    (let* ((res       '())
+	   (keys       (db:get-keys dbstruct))
+	   (runpattstr (db:patt->like "runname" runpatt))
+	   (remfields  (list "id" "runname" "state" "status" "owner" "event_time"))
+	   (targstr    (string-intersperse keys "||'/'||"))
+	   (keystr     (conc targstr " AS target,"
+			     (string-intersperse remfields ",")))
+	   (qrystr     (conc "SELECT " keystr " FROM runs WHERE (" runpattstr ") " ;; runname LIKE ? "
+			     ;; Generate: " AND x LIKE 'keypatt' ..."
+			     " AND target LIKE '" target "'"
+			     " AND state != 'deleted' "
+			     (if (number? last-update)
+				 (conc " AND last_update >= " last-update)
+				 "")
+			     " ORDER BY event_time DESC "
+			     (if (number? count)
+				 (conc " LIMIT " count)
+				 "")
+			     (if (number? offset)
+				 (conc " OFFSET " offset)
+				 "")))
+	   )
+    (debug:print-info 11 *default-log-port* "db:get-runs START qrystr: " qrystr " target: " target " offset: " offset " limit: " count)
+    (db:with-db dbstruct #f #f
+		(lambda (db)		
+		  (sqlite3:for-each-row
+		   (lambda (target id runname state status owner event_time)
+		     (set! res (cons (make-simple-run target id runname state status owner event_time) res)))
+		   db
+		   qrystr
+		   )))
+    (debug:print-info 11 *default-log-port* "db:get-runs END qrystr: " qrystr " target: " target " offset: " offset " limit: " count)
+    res))
+
+;; TODO: Switch this to use max(update_time) from each run db? Then if using a server there is no disk traffic (using inmem db)
+;;
+(define (db:get-changed-run-ids since-time)
+  (let* ((dbdir      (common:get-db-tmp-area)) ;; (configf:lookup *configdat* "setup" "dbdir"))
+	 (alldbs     (glob (conc dbdir "/[0-9]*.db")))
+	 (changed    (filter (lambda (dbfile)
+			       (> (file-modification-time dbfile) since-time))
+			     alldbs)))
+    (delete-duplicates
+     (map (lambda (dbfile)
+	    (let* ((res (string-match ".*\\/(\\d)*\\.db" dbfile)))
+	      (if res
+		  (string->number (cadr res))
+		  (begin
+		    (debug:print 2 *default-log-port* "WARNING: Failed to process " dbfile " for run-id")
+		    0))))
+	  changed))))
+
+;; Get all targets from the db
+;;
+(define (db:get-targets dbstruct)
+  (let* ((res       '())
+	 (keys       (db:get-keys dbstruct))
+	 (header     keys) ;; (map key:get-fieldname keys))
+	 (keystr     (keys->keystr keys))
+	 (qrystr     (conc "SELECT " keystr " FROM runs WHERE state != 'deleted';"))
+	 (seen       (make-hash-table)))
+    (db:with-db
+     dbstruct
+     #f
+     #f
+     (lambda (db)
+       (sqlite3:for-each-row
+	(lambda (a . x)
+	  (let ((targ (cons a x)))
+	    (if (not (hash-table-ref/default seen targ #f))
+		(begin
+		  (hash-table-set! seen targ #t)
+		  (set! res (cons (apply vector targ) res))))))
+	db
+	qrystr)
+       (debug:print-info 11 *default-log-port* "db:get-targets END qrystr: " qrystr )
+       (vector header res)))))
+
+;; just get count of runs
+(define (db:get-num-runs dbstruct runpatt)
+  (db:with-db
+   dbstruct
+   #f
+   #f
+   (lambda (db)
+     (let ((numruns 0))
+       (debug:print-info 11 *default-log-port* "db:get-num-runs START " runpatt)
+       (sqlite3:for-each-row 
+	(lambda (count)
+	  (set! numruns count))
+	db
+	"SELECT COUNT(id) FROM runs WHERE runname LIKE ? AND state != 'deleted';" runpatt)
+       (debug:print-info 11 *default-log-port* "db:get-num-runs END " runpatt)
+       numruns))))
+
+;; just get count of runs
+(define (db:get-runs-cnt-by-patt dbstruct runpatt targetpatt keys)
+  (db:with-db
+   dbstruct
+   #f
+   #f
+   (lambda (db)
+     (let ((numruns 0)
+           (qry-str #f)
+           (key-patt "")
+	     	   (keyvals  (if targetpatt (keys:target->keyval keys targetpatt) '())))
+     
+    (for-each (lambda (keyval)
+		(let* ((key    (car keyval))
+		       (patt   (cadr keyval))
+		       (fulkey (conc ":" key))
+		       (wildtype (if (substring-index "%" patt) "like" "glob")))
+         
+		  (if patt
+		      (set! key-patt (conc key-patt " AND " key " " wildtype " '" patt "'"))
+		      (begin
+			(debug:print-error 0 *default-log-port* "searching for runs with no pattern set for " fulkey)
+			(exit 6)))))
+	      keyvals)
+    ;(print  runpatt " -- " key-patt)
+    (set! qry-str (conc "SELECT COUNT(id) FROM runs WHERE state != 'deleted' AND runname  like '" runpatt "'" key-patt))
+    ;(print qry-str )
+       
+       (sqlite3:for-each-row 
+					 (lambda (count)
+	  			    (set! numruns count))
+				db
+				qry-str)
+       (debug:print-info 11 *default-log-port* "db:get-num-runs END " runpatt)
+       numruns))))
+
+
+;; (sqlite3#fold-row proc3670 init3671 db-or-stmt3672 . params3673)>
+;; 
+(define (db:get-raw-run-stats dbstruct run-id)
+  (db:with-db
+   dbstruct
+   run-id
+   #f
+   (lambda (db)
+     (sqlite3:fold-row
+	(lambda (res state status count)
+	  (cons (list state status count) res))
+	'()
+	db
+	"SELECT state,status,count(id) AS count FROM tests WHERE run_id=? AND NOT(uname='n/a' AND item_path='') GROUP BY state,status;"
+	run-id))))
+
+;; Update run_stats for given run_id
+;; input data is a list (state status count)
+;;
+(define (db:update-run-stats dbstruct run-id stats)
+  ;; (mutex-lock! *db-transaction-mutex*)
+  (db:with-db
+   dbstruct
+   #f
+   #f
+
+   (lambda (db)
+     ;; remove previous data
+     
+     (let* ((stmt1 (sqlite3:prepare db "DELETE FROM run_stats WHERE run_id=? AND state=? AND status=?;"))
+	    (stmt2 (sqlite3:prepare db "INSERT INTO run_stats (run_id,state,status,count) VALUES (?,?,?,?);"))
+	    (res
+	     (sqlite3:with-transaction
+	      db
+	      (lambda ()
+		(for-each
+		 (lambda (dat)
+		   (sqlite3:execute stmt1 run-id (car dat)(cadr dat))
+		   (apply sqlite3:execute stmt2 run-id dat))
+		 stats)))))
+       (sqlite3:finalize! stmt1)
+       (sqlite3:finalize! stmt2)
+       ;; (mutex-unlock! *db-transaction-mutex*)
+       res))))
+
+(define (db:get-main-run-stats dbstruct run-id)
+  (db:with-db
+   dbstruct
+   #f ;; this data comes from main
+   #f
+   (lambda (db)
+     (sqlite3:fold-row
+	(lambda (res state status count)
+	  (cons (list state status count) res))
+	'()
+	db
+	"SELECT state,status,count FROM run_stats WHERE run_id=? AND run_id IN (SELECT id FROM runs WHERE state NOT IN ('DELETED','deleted'));"
+	run-id))))
+
+(define (db:print-current-query-stats)
+  ;; generate stats from *db-api-call-time*
+  (let ((ordered-keys (sort (hash-table-keys *db-api-call-time*)
+			    (lambda (a b)
+			      (let ((sum-a (common:sum (hash-table-ref *db-api-call-time* a)))
+				    (sum-b (common:sum (hash-table-ref *db-api-call-time* b))))
+				(> sum-a sum-b)))))
+	(total        0))
+    (for-each
+     (lambda (cmd-key)
+       (let* ((dat  (hash-table-ref *db-api-call-time* cmd-key))
+	      (num  (length dat))
+	      (avg  (if (> num 0)
+			(/ (common:sum dat)(length dat)))))
+	 (set! total (+ total num))
+	 (debug:print-info 0 *default-log-port* cmd-key "\tavg: "avg
+			   " max: " (common:max dat) " min: "
+			   (common:min-max < dat) " num: " (length dat))))
+     ordered-keys)
+    (debug:print-info 0 *default-log-port* "TOTAL: "total
+		      " api calls since start.")))
+
+(define (db:get-all-run-ids dbstruct)
+  (db:with-db
+   dbstruct
+   #f
+   #f
+   (lambda (db)
+     (let ((run-ids '()))
+       (sqlite3:for-each-row
+	(lambda (run-id)
+	  (set! run-ids (cons run-id run-ids)))
+	db
+	"SELECT id FROM runs WHERE state != 'deleted' ORDER BY event_time DESC;")
+    (reverse run-ids)))))
+
+;; get some basic run stats
+;;
+;; data structure:
+;;
+;; ( (runname (( state  count ) ... ))
+;;   (   ...
+;;
+(define (db:get-run-stats dbstruct)
+  (let* ((totals       (make-hash-table))
+	 (curr         (make-hash-table))
+	 (res          '())
+	 (runs-info    '()))
+    ;; First get all the runname/run-ids
+    (db:with-db
+     dbstruct #f #f
+     (lambda (db)
+       (sqlite3:for-each-row
+	(lambda (run-id runname)
+	  (set! runs-info (cons (list run-id runname) runs-info)))
+	db
+	"SELECT id,runname FROM runs WHERE state != 'deleted' ORDER BY event_time DESC;"))) ;; If you change this to the more logical ASC please adjust calls to db:get-run-stats
+    ;; for each run get stats data
+    (for-each
+     (lambda (run-info)
+       ;; get the net state/status counts for this run
+       (let* ((run-id   (car  run-info))
+	      (run-name (cadr run-info)))
+	 (db:with-db
+	  dbstruct
+	  run-id
+	  #f
+	  (lambda (db)
+	    (sqlite3:for-each-row
+	     (lambda (state status count)
+	       (let ((netstate (if (equal? state "COMPLETED") status state)))
+		 (if (string? netstate)
+		     (begin
+		       (hash-table-set! totals netstate (+ (hash-table-ref/default totals netstate 0) count))
+		       (hash-table-set! curr   netstate (+ (hash-table-ref/default curr   netstate 0) count))))))
+	     db
+	     "SELECT state,status,count(id) FROM tests AS t WHERE run_id=? GROUP BY state,status ORDER BY state,status DESC;"
+             run-id)
+	    ;; add the per run counts to res
+	    (for-each (lambda (state)
+			(set! res (cons (list run-name state (hash-table-ref curr state)) res)))
+		      (sort (hash-table-keys curr) string>=))
+	    (set! curr (make-hash-table))))))
+     runs-info)
+    (for-each (lambda (state)
+		(set! res (cons (list "Totals" state (hash-table-ref totals state)) res)))
+	      (sort (hash-table-keys totals) string>=))
+    res))
+
+;; db:get-runs-by-patt
+;; get runs by list of criteria
+;; register a test run with the db
+;;
+;; Use: (db:get-value-by-header (db:get-header runinfo)(db:get-rows runinfo))
+;;  to extract info from the structure returned
+;;
+(define (db:get-runs-by-patt dbstruct keys runnamepatt targpatt offset limit fields last-update  sort-order ) ;; test-name)
+  (let* ((tmp      (runs:get-std-run-fields keys (or fields '("id" "runname" "state" "status" "owner" "event_time"))))
+	 (keystr   (car tmp))
+	 (header   (cadr tmp))
+	 (key-patt "")
+	 (runwildtype (if (substring-index "%" runnamepatt) "like" "glob"))
+	 (qry-str  #f)
+	 (keyvals  (if targpatt (keys:target->keyval keys targpatt) '())))
+    (for-each (lambda (keyval)
+		(let* ((key    (car keyval))
+		       (patt   (cadr keyval))
+		       (fulkey (conc ":" key))
+		       (wildtype (if (substring-index "%" patt) "like" "glob")))
+		  (if patt
+		      (set! key-patt (conc key-patt " AND " key " " wildtype " '" patt "'"))
+		      (begin
+			(debug:print-error 0 *default-log-port* "searching for runs with no pattern set for " fulkey)
+			(exit 6)))))
+	      keyvals)
+    (set! qry-str (conc "SELECT " keystr " FROM runs WHERE state != 'deleted' AND runname " runwildtype " ? " key-patt 
+			(if last-update
+			       (conc " AND last_update >= " last-update " ")
+			       " ")
+			" ORDER BY event_time " sort-order " " 
+			(if limit  (conc " LIMIT " limit)   "")
+			(if offset (conc " OFFSET " offset) "")
+			";"))
+    (debug:print-info 4 *default-log-port* "runs:get-runs-by-patt qry=" qry-str " " runnamepatt)
+    ;(print "runs:get-runs-by-patt qry=" qry-str " " runnamepatt)
+
+    (vector header 
+            (reverse
+             (db:with-db dbstruct #f #f ;; reads db, does not write to it.
+                         (lambda (db)
+                           (sqlite3:fold-row
+                            (lambda (res . r)
+                              (cons (list->vector r) res))
+                            '()
+                            db
+                            qry-str
+                            runnamepatt)))))))
+
+;; use (get-value-by-header (db:get-header runinfo)(db:get-rows runinfo))
+;; NOTE: Does NOT return a list of rows (or one row) for the first slot of the vector
+;;       this is inconsistent with get-runs but it makes some sense.
+;;
+(define (db:get-run-info dbstruct run-id)
+  ;;(if (hash-table-ref/default *run-info-cache* run-id #f)
+  ;;    (hash-table-ref *run-info-cache* run-id)
+  (let* ((res       (vector #f #f #f #f))
+	 (keys      (db:get-keys dbstruct))
+	 (remfields (list "id" "runname" "state" "status" "owner" "event_time" "comment" "fail_count" "pass_count" "contour" "last_update")) ;;  "area_id"))
+	 (header    (append keys remfields))
+	 (keystr    (conc (keys->keystr keys) ","
+			  (string-intersperse remfields ","))))
+    (debug:print-info 11 *default-log-port* "db:get-run-info run-id: " run-id " header: " header " keystr: " keystr)
+    
+    (db:with-db
+     dbstruct #f #f
+     (lambda (db)
+       (sqlite3:for-each-row
+	(lambda (a . x)
+	  (set! res (apply vector a x)))
+	db 
+	(conc "SELECT " keystr " FROM runs WHERE id=?;")
+	run-id)))
+    (debug:print-info 11 *default-log-port* "db:get-run-info run-id: " run-id " header: " header " keystr: " keystr)
+    (let ((finalres (vector header res)))
+      ;; (hash-table-set! *run-info-cache* run-id finalres)
+      finalres)))
+
+(define (db:set-comment-for-run dbstruct run-id comment)
+  (db:with-db
+   dbstruct #f #f
+   (lambda (db)
+     (sqlite3:execute db "UPDATE runs SET comment=? WHERE id=?;" comment ;; (sdb:qry 'getid comment)
+		      run-id))))
+
+;; does not (obviously!) removed dependent data. But why not!!?
+(define (db:delete-run dbstruct run-id)
+  (db:with-db
+   dbstruct #f #f
+   (lambda (db)
+     (sqlite3:with-transaction
+      db
+      (lambda ()
+        (sqlite3:execute db "DELETE FROM test_steps WHERE test_id IN (SELECT id FROM tests WHERE run_id=?);" run-id)
+        (sqlite3:execute db "DELETE FROM test_data WHERE test_id IN (SELECT id FROM tests WHERE run_id=?);"  run-id)
+        (sqlite3:execute db "UPDATE tests SET state='DELETED',comment='' WHERE run_id=?;" run-id)
+        ;; (db:delay-if-busy dbdat)
+        (sqlite3:execute db "UPDATE runs SET state='deleted',comment='' WHERE id=?;" run-id))))))
+
+(define (db:update-run-event_time dbstruct run-id)
+  (db:with-db
+   dbstruct #f #t
+   (lambda (db)
+     (sqlite3:execute db "UPDATE runs SET event_time=strftime('%s','now') WHERE id=?;" run-id))))
+
+(define (db:lock/unlock-run dbstruct run-id lock unlock user)
+  (db:with-db
+   dbstruct #f #t
+   (lambda (db)
+     (let ((newlockval (if lock "locked"
+			   (if unlock
+			       "unlocked"
+			       "locked")))) ;; semi-failsafe
+       (sqlite3:execute db "UPDATE runs SET state=? WHERE id=?;" newlockval run-id)
+       (sqlite3:execute db "INSERT INTO access_log (user,accessed,args) VALUES(?,strftime('%s','now'),?);"
+			user (conc newlockval " " run-id))
+       (debug:print-info 1 *default-log-port* "" newlockval " run number " run-id)))))
+
+(define (db:set-run-status dbstruct run-id status msg)
+  (db:with-db
+   dbstruct #f #f
+   (lambda (db)
+       (if msg
+         (sqlite3:execute db "UPDATE runs SET status=?,comment=? WHERE id=?;" status msg run-id)
+         (sqlite3:execute db "UPDATE runs SET status=? WHERE id=?;" status run-id)))))
+
+(define (db:set-run-state-status dbstruct run-id state status )
+  (db:with-db
+   dbstruct #f #f
+   (lambda (db)
+          (sqlite3:execute db "UPDATE runs SET status=?,state=? WHERE id=?;" status state run-id))))
+
+
+
+(define (db:get-run-status dbstruct run-id)
+  (let ((res "n/a"))
+    (db:with-db
+     dbstruct #f #f
+     (lambda (db)
+       (sqlite3:for-each-row 
+	(lambda (status)
+	  (set! res status))
+	db
+	"SELECT status FROM runs WHERE id=?;" 
+	run-id)
+       res))))
+
+(define (db:get-run-state dbstruct run-id)
+  (let ((res "n/a"))
+    (db:with-db
+     dbstruct #f #f
+     (lambda (db)
+       (sqlite3:for-each-row 
+	(lambda (status)
+	  (set! res status))
+	db
+	"SELECT state FROM runs WHERE id=?;" 
+	run-id)
+       res))))
+
+
+;;======================================================================
+;; K E Y S
+;;======================================================================
+
+;; get key val pairs for a given run-id
+;; ( (FIELDNAME1 keyval1) (FIELDNAME2 keyval2) ... )
+(define (db:get-key-val-pairs dbstruct run-id)
+  (let* ((keys (db:get-keys dbstruct))
+	 (res  '()))
+    (db:with-db
+     dbstruct #f #f
+     (lambda (db)
+       (for-each 
+	(lambda (key)
+	  (let ((qry (conc "SELECT " key " FROM runs WHERE id=?;")))
+	    (sqlite3:for-each-row 
+	     (lambda (key-val)
+	       (set! res (cons (list key (if (string? key-val) key-val "")) res))) ;; replace non-string bad values with empty string to prevent crashes. This scenario can happen when Megatest is killed on updating the db
+	     db qry run-id)))
+	keys)))
+       (reverse res)))
+
+;; get key vals for a given run-id
+(define (db:get-key-vals dbstruct run-id)
+  (let* ((keys (db:get-keys dbstruct))
+	 (res  '()))
+    (db:with-db
+     dbstruct #f #f
+     (lambda (db)
+       (for-each 
+	(lambda (key)
+	  (let ((qry (conc "SELECT " key " FROM runs WHERE id=?;")))
+	    ;; (db:delay-if-busy dbdat)
+	    (sqlite3:for-each-row 
+	     (lambda (key-val)
+	       (set! res (cons (if (string? key-val) key-val "") res))) ;; check that the key-val is a string for cases where a crash injected bad data in the megatest.db
+	     db qry run-id)))
+	keys)))
+    (let ((final-res (reverse res)))
+      (hash-table-set! *keyvals* run-id final-res)
+      final-res)))
+
+;; The target is keyval1/keyval2..., cached in *target* as it is used often
+(define (db:get-target dbstruct run-id)
+  (let* ((keyvals (db:get-key-vals dbstruct run-id))
+	 (thekey  (string-intersperse (map (lambda (x)(if x x "-na-")) keyvals) "/")))
+    thekey))
+
+;; Get run-ids for runs with same target but different runnames and NOT run-id
+;;
+(define (db:get-prev-run-ids dbstruct run-id)
+  (let* ((keyvals (db:get-key-val-pairs dbstruct run-id))
+	 (kvalues (map cadr keyvals))
+	 (keys    (db:get-keys dbstruct))
+	 (qrystr  (string-intersperse (map (lambda (x)(conc x "=?")) keys) " AND ")))
+    (let ((prev-run-ids '()))
+      (if (null? keyvals)
+          '()
+          (begin
+            (db:with-db dbstruct #f #f ;; #f means work with the zeroth db - i.e. the runs db
+                        (lambda (db)
+                          (apply sqlite3:for-each-row
+                                 (lambda (id)
+                                   (set! prev-run-ids (cons id prev-run-ids)))
+                                 db
+                                 (conc "SELECT id FROM runs WHERE " qrystr " AND state != 'deleted' AND id != ?;")
+                                 (append kvalues (list run-id)))))
+            prev-run-ids)))))
+
+;;======================================================================
+;;  T E S T S
+;;======================================================================
+
+;; states and statuses are lists, turn them into ("PASS","FAIL"...) and use NOT IN
+;; i.e. these lists define what to NOT show.
+;; states and statuses are required to be lists, empty is ok
+;; not-in #t = above behaviour, #f = must match
+;; mode:
+;;  'dashboard - use state = 'COMPLETED' AND status in ( statuses ) OR state in ( states )
+;;
+(define (db:get-tests-for-run dbstruct run-id testpatt states statuses offset limit not-in sort-by sort-order qryvals last-update mode)
+  (let* ((qryvalstr       (case qryvals
+			    ((shortlist) "id,run_id,testname,item_path,state,status")
+			    ((#f)        db:test-record-qry-selector) ;; "id,run_id,testname,state,status,event_time,host,cpuload,diskfree,uname,rundir,item_path,run_duration,final_logf,comment")
+			    (else        qryvals)))
+	 (res            '())
+	 ;; if states or statuses are null then assume match all when not-in is false
+	 (states-qry      (if (null? states) 
+			      #f
+			      (conc " state "  
+				    (if (eq? mode 'dashboard)
+					" IN ('"
+					(if not-in
+					    " NOT IN ('"
+					    " IN ('")) 
+				    (string-intersperse states   "','")
+				    "')")))
+	 (statuses-qry    (if (null? statuses)
+			      #f
+			      (conc " status "
+				    (if (eq? mode 'dashboard)
+					" IN ('"
+					(if not-in 
+					    " NOT IN ('"
+					    " IN ('") )
+				    (string-intersperse statuses "','")
+				    "')")))
+	 (interim-qry       (conc " AND " (if not-in "NOT " "") "( state='COMPLETED' " (if statuses-qry (conc " AND " statuses-qry " ) ") " ) ")
+				  (if states-qry
+				      (conc (if not-in " AND " " OR ") states-qry ) ;; " ) ")
+				      "")))
+	 (states-statuses-qry 
+	  (cond 
+	   ((and states-qry statuses-qry)
+	    (case mode
+	      ((dashboard) 
+	       (if not-in
+		   (conc " AND (state='COMPLETED' AND status NOT IN ('" (string-intersperse statuses "','") "')) "
+			 " OR (state != 'COMPLETED' AND state NOT IN ('" (string-intersperse states "','") "')) ")
+		   (conc " AND (state='COMPLETED' AND status IN ('" (string-intersperse statuses "','") "')) "
+			 " OR (state NOT IN ('COMPLETED','DELETED') AND state IN ('" (string-intersperse states "','") "')) ")))
+	      (else       (conc " AND ( " states-qry " AND " statuses-qry " ) "))))
+	   (states-qry  
+	    (case mode
+	      ((dashboard) (conc " AND " (if not-in "NOT " "") " state IN ('" (string-intersperse states    "','") "') ")) ;; interim-qry)
+	      (else        (conc " AND " states-qry))))
+	   (statuses-qry 
+	    (case mode
+	      ((dashboard) (conc " AND " (if not-in "NOT " "") " status IN ('" (string-intersperse statuses "','") "') ")) ;; interim-qry)
+	      (else        (conc " AND " statuses-qry))))
+	   (else "")))
+	 (tests-match-qry (tests:match->sqlqry testpatt))
+	 (qry             (conc "SELECT " qryvalstr
+				(if run-id
+				    " FROM tests WHERE run_id=? "
+				    " FROM tests WHERE ? > 0 ") ;; should work?
+				(if last-update " " " AND state != 'DELETED' ") ;; if using last-update we want deleted tests?
+				states-statuses-qry
+				(if tests-match-qry (conc " AND (" tests-match-qry ") ") "")
+				(if last-update (conc " AND last_update >= " last-update " ") "")
+				(case sort-by
+				  ((rundir)      " ORDER BY length(rundir) ")
+				  ((testname)    (conc " ORDER BY testname " (if sort-order (conc sort-order ",") "") " item_path "))
+				  ((statestatus) (conc " ORDER BY state " (if  sort-order (conc sort-order ",") "") " status "))
+				  ((event_time)  " ORDER BY event_time ")
+				  (else          (if (string? sort-by)
+						     (conc " ORDER BY " sort-by " ")
+						     " ")))
+				(if sort-order sort-order " ")
+				(if limit  (conc " LIMIT " limit)   " ")
+				(if offset (conc " OFFSET " offset) " ")
+				";"
+				)))
+    (debug:print-info 8 *default-log-port* "db:get-tests-for-run run-id=" run-id ", qry=" qry)
+    (let* ((res (db:with-db dbstruct run-id #f
+			    (lambda (db)
+			      ;; (let* ((stmth (db:get-cache-stmth dbstruct db qry))) ;; due to use of last-update we can't efficiently cache this query
+				(reverse
+				 (sqlite3:fold-row
+				  (lambda (res . row)
+				    ;; id run-id testname state status event-time host cpuload
+				    ;;     diskfree uname rundir item-path run-duration final-logf comment)
+				    (cons (list->vector row) res))
+				  '()
+				  db qry ;; stmth
+				  (or run-id 1) ;; 1 > 0 , for the case where we are seeking tests matching criteral for all runs
+				  ))))))
+      (case qryvals
+	((shortlist)(map db:test-short-record->norm res))
+	((#f)       res)
+	(else       res)))))
+
+(define (db:test-short-record->norm inrec)
+  ;;  "id,run_id,testname,item_path,state,status"
+  ;;  "id,run_id,testname,state,status,event_time,host,cpuload,diskfree,uname,rundir,item_path,run_duration,final_logf,comment
+  (vector (vector-ref inrec 0) ;; id
+	  (vector-ref inrec 1) ;; run_id
+	  (vector-ref inrec 2) ;; testname
+	  (vector-ref inrec 4) ;; state
+	  (vector-ref inrec 5) ;; status
+	  -1 "" -1 -1 "" "-" 
+	  (vector-ref inrec 3) ;; item-path
+	  -1 "-" "-"))
+
+;;
+;; 1. cache tests-match-qry
+;; 2. compile qry and store in hash
+;; 3. convert for-each-row to fold
+;;
+;; (define (db:get-tests-for-run-state-status dbstruct run-id testpatt)
+;;   (db:with-db
+;;    dbstruct run-id #f
+;;    (lambda (db)
+;;      (let* ((res            '())
+;; 	    (stmt-cache      (dbr:dbstruct-stmt-cache dbstruct))
+;; 	    (stmth           (let* ((sh (db:hoh-get stmt-cache db testpatt)))
+;; 			       (or sh
+;; 				   (let* ((tests-match-qry (tests:match->sqlqry testpatt))
+;; 					  (qry             (conc "SELECT id,testname,item_path,state,status FROM tests WHERE run_id=? " 
+;; 								 (if tests-match-qry (conc " AND (" tests-match-qry ") ") "")))
+;; 					  (newsh           (sqlite3:prepare db qry)))
+;; 				     (debug:print-info 8 *default-log-port* "db:get-tests-for-run qry=" qry)
+;; 				     (db:hoh-set! stmt-cache db testpatt newsh)
+;; 				     newsh)))))
+;;        (reverse
+;; 	(sqlite3:fold-row
+;; 	 (lambda (res id testname item-path state status)
+;; 	   ;;  id,run_id,testname,state,status,event_time,host,cpuload,diskfree,uname,rundir,item_path,run_duration,final_logf,comment
+;; 	   (cons (vector id run-id testname state status -1         ""     -1      -1       ""    "-"  item-path -1           "-"         "-") res))
+;; 	 '()
+;; 	 stmth
+;; 	 run-id))))))
+
+(define (db:get-tests-for-run-state-status dbstruct run-id testpatt #!optional (last-update 0))
+  (let* ((res            '())
+	 (tests-match-qry (tests:match->sqlqry testpatt))
+	 (qry             (conc "SELECT id,testname,item_path,state,status,event_time,run_duration FROM tests WHERE run_id=? " 
+				" AND last_update > ? "
+				(if tests-match-qry (conc " AND (" tests-match-qry ") ") "")
+				)))
+    (debug:print-info 8 *default-log-port* "db:get-tests-for-run qry=" qry)
+    (db:with-db dbstruct run-id #f
+		(lambda (db)
+		  (sqlite3:fold-row
+		   (lambda (res id testname item-path state status event-time run-duration)
+		     ;;            id,run_id,testname,state,status,event_time,host,cpuload,diskfree,uname,rundir,item_path,run_duration,final_logf,comment
+		     (cons (vector id run-id testname state status event-time  ""     -1      -1       ""    "-"  item-path run-duration  "-"         "-") res))
+		   '()
+		   db 
+		   qry
+		   run-id
+		   (or last-update 0))))))
+
+(define (db:get-testinfo-state-status dbstruct run-id test-id)
+  (let ((res            #f))
+    (db:with-db dbstruct run-id #f
+		(lambda (db)
+		  (sqlite3:for-each-row
+		   (lambda (run-id testname item-path state status)
+		     ;; id,run_id,testname,state,status,event_time,host,cpuload,diskfree,uname,rundir,item_path,run_duration,final_logf,comment
+		     (set! res (vector test-id run-id testname state status -1 "" -1 -1 "" "-" item-path -1 "-" "-")))
+		   db 
+		   "SELECT run_id,testname,item_path,state,status FROM tests WHERE id=?;" 
+		   test-id)))
+    res))
+
+;; get a useful subset of the tests data (used in dashboard
+;; use db:mintest-get-{id ,run_id,testname ...}
+;;
+(define (db:get-tests-for-run-mindata dbstruct run-id testpatt states statuses not-in)
+  (db:get-tests-for-run dbstruct run-id testpatt states statuses #f #f not-in #f #f "id,run_id,testname,state,status,event_time,item_path" 0 #f))
+
+;; do not use.
+;;
+(define (db:get-tests-for-runs dbstruct run-ids testpatt states statuses #!key (not-in #f)(qryvals #f))
+  ;; (db:delay-if-busy)
+  (let ((res '()))
+    (for-each 
+     (lambda (run-id)
+       (set! res (append 
+		  res 
+		  (db:get-tests-for-run dbstruct run-id testpatt states statuses #f #f not-in #f #f qryvals #f 'normal))))
+     (if run-ids
+	 run-ids
+	 (db:get-all-run-ids dbstruct)))
+    res))
+
+;; Convert calling routines to get list of run-ids and loop, do not use the get-tests-for-runs
+;;
+
+(define (db:delete-test-records dbstruct run-id test-id)
+  (db:general-call dbstruct 'delete-test-step-records (list test-id))
+  (db:general-call dbstruct 'delete-test-data-records (list test-id))
+  (db:with-db
+   dbstruct #f #f
+   (lambda (db)
+     (sqlite3:execute db "UPDATE tests SET state='DELETED',status='n/a',comment='' WHERE id=?;" test-id))))
+
+;; 
+(define (db:delete-old-deleted-test-records dbstruct)
+  (let ((targtime (- (current-seconds)
+		     (or (configf:lookup-number *configdat* "setup" "keep-deleted-records")
+			 (* 30 24 60 60))))) ;; one month in the past
+    (db:with-db
+     dbstruct
+     0
+     #t
+     (lambda (db)
+       (sqlite3:with-transaction
+	db
+	(lambda ()
+	  (sqlite3:execute db "DELETE FROM test_steps WHERE test_id IN (SELECT id FROM tests WHERE state='DELETED' AND event_time<?);" targtime)
+	  (sqlite3:execute db "DELETE FROM test_data WHERE test_id IN (SELECT id FROM tests WHERE state='DELETED' AND event_time<?);" targtime)
+	  (sqlite3:execute db "DELETE FROM tests WHERE state='DELETED' AND event_time<?;" targtime)))))))
+
+;; set tests with state currstate and status currstatus to newstate and newstatus
+;; use currstate = #f and or currstatus = #f to apply to any state or status respectively
+;; WARNING: SQL injection risk. NB// See new but not yet used "faster" version below
+;;
+;;  AND NOT (item_path='' AND testname in (SELECT DISTINCT testname FROM tests WHERE testname=? AND item_path != ''));")))
+;;  (debug:print 0 *default-log-port* "QRY: " qry)
+;;  (db:delay-if-busy)
+;;
+;; NB// This call only operates on toplevel tests. Consider replacing it with more general call
+;;
+(define (db:set-tests-state-status dbstruct run-id testnames currstate currstatus newstate newstatus)
+  (let ((test-ids '()))
+    (for-each
+     (lambda (testname)
+       (let ((qry (conc "UPDATE tests SET state=?,status=? WHERE "
+			(if currstate  (conc "state='" currstate "' AND ") "")
+			(if currstatus (conc "status='" currstatus "' AND ") "")
+			" run_id=? AND testname LIKE ?;"))
+	     (test-id (db:get-test-id dbstruct run-id testname "")))
+	 (db:with-db
+	  dbstruct
+	  run-id
+	  #t
+	  (lambda (db)
+	    (sqlite3:execute db qry
+			     (or newstate  currstate "NOT_STARTED")
+			     (or newstatus currstate "UNKNOWN")
+			     run-id testname)))
+	 (if test-id
+	     (begin
+	       (set! test-ids (cons test-id test-ids))
+	       (mt:process-triggers dbstruct run-id test-id newstate newstatus)))))
+     testnames)
+    test-ids))
+
+;; ;; speed up for common cases with a little logic
+;; ;; NB// Ultimately this will be deprecated in deference to mt:test-set-state-status-by-id
+;;
+;;      NOTE: run-id is not used
+;; ;;
+(define (db:test-set-state-status dbstruct run-id test-id newstate newstatus newcomment)
+  (db:with-db
+   dbstruct
+   ;; run-id
+   #f
+   #t
+   (lambda (db)
+     (cond
+      ((and newstate newstatus newcomment)
+       (sqlite3:execute db "UPDATE tests SET state=?,status=?,comment=? WHERE id=?;" newstate newstatus newcomment ;; (sdb:qry 'getid newcomment)
+			test-id))
+      ((and newstate newstatus)
+       (sqlite3:execute db "UPDATE tests SET state=?,status=? WHERE id=?;" newstate newstatus test-id))
+      (else
+       (if newstate   (sqlite3:execute db "UPDATE tests SET state=?   WHERE id=?;" newstate   test-id))
+       (if newstatus  (sqlite3:execute db "UPDATE tests SET status=?  WHERE id=?;" newstatus  test-id))
+       (if newcomment (sqlite3:execute db "UPDATE tests SET comment=? WHERE id=?;" newcomment ;; (sdb:qry 'getid newcomment)
+				       test-id))))))
+  (mt:process-triggers dbstruct run-id test-id newstate newstatus))
+
+;; NEW BEHAVIOR: Count tests running in all runs!
+;;
+(define (db:get-count-tests-running dbstruct run-id) ;; fastmode)
+  (let* ((qry ;; (if fastmode
+		;;   "SELECT count(id) FROM tests WHERE state in ('RUNNING','LAUNCHED','REMOTEHOSTSTART') AND NOT (uname = 'n/a' AND item_path = '') LIMIT 1;"
+		  "SELECT count(id) FROM tests WHERE state in ('RUNNING','LAUNCHED','REMOTEHOSTSTART') AND NOT (uname = 'n/a' AND item_path = '');")) ;; )
+  (db:with-db
+   dbstruct
+   run-id
+   #f
+   (lambda (db)
+     (let* ((stmth (db:get-cache-stmth dbstruct  db qry)))
+       (sqlite3:first-result stmth))))))
+
+;; NEW BEHAVIOR: Count tests running in only one run!
+;;
+(define (db:get-count-tests-actually-running dbstruct run-id)
+  (db:with-db
+   dbstruct
+   run-id
+   #f
+   (lambda (db)
+     (sqlite3:first-result
+      db
+      ;; WARNING BUG EDIT ME - merged from v1.55 - not sure what is right here ...
+      ;; "SELECT count(id) FROM tests WHERE state in ('RUNNING','LAUNCHED','REMOTEHOSTSTART') AND run_id NOT IN (SELECT id FROM runs WHERE state='deleted') AND NOT (uname = 'n/a' AND item_path = '');")
+      "SELECT count(id) FROM tests WHERE state in ('RUNNING','REMOTEHOSTSTART','LAUNCHED') AND run_id=?;" 
+      run-id)))) ;; NOT IN (SELECT id FROM runs WHERE state='deleted');")
+
+;; NEW BEHAVIOR: Look only at single run with run-id
+;; 
+;; (define (db:get-running-stats dbstruct run-id)
+(define (db:get-count-tests-running-for-run-id dbstruct run-id) ;; fastmode)
+  (let* ((qry ;; (if fastmode
+		 ;;  "SELECT count(id) FROM tests WHERE state in ('RUNNING','LAUNCHED','REMOTEHOSTSTART') AND run_id=? LIMIT 1;"
+		  "SELECT count(id) FROM tests WHERE state in ('RUNNING','LAUNCHED','REMOTEHOSTSTART') AND run_id=?;")) ;; )
+    (db:with-db
+     dbstruct
+     run-id
+     #f
+     (lambda (db)
+       (let* ((stmth (db:get-cache-stmth dbstruct db qry)))
+	 (sqlite3:first-result stmth run-id))))))
+
+;; For a given testname how many items are running? Used to determine
+;; probability for regenerating html
+;;
+(define (db:get-count-tests-running-for-testname dbstruct run-id testname)
+  (db:with-db
+   dbstruct
+   run-id
+   #f
+   (lambda (db)
+     (let* ((stmt "SELECT count(id) FROM tests WHERE state in ('RUNNING','LAUNCHED','REMOTEHOSTSTART') AND run_id=? AND NOT (uname = 'n/a' AND item_path = '') AND testname=?;")
+	    (stmth (db:get-cache-stmth dbstruct db stmt)))
+       (sqlite3:first-result
+	stmth run-id testname)))))
+
+(define (db:get-not-completed-cnt dbstruct run-id)
+(db:with-db
+   dbstruct
+   run-id
+   #f
+   (lambda (db)
+      ;(print "SELECT count(id) FROM tests WHERE state not in ('COMPLETED', 'DELETED') AND run_id=" run-id)  
+     (sqlite3:first-result
+      db
+      "SELECT count(id) FROM tests WHERE state not in ('COMPLETED', 'DELETED') AND run_id=?;" run-id))))
+
+(define (db:get-count-tests-running-in-jobgroup dbstruct run-id jobgroup)
+  (if (not jobgroup)
+      0 ;; 
+      (let ((testnames '()))
+	;; get the testnames
+	(db:with-db
+	 dbstruct #f #f
+	 (lambda (db)
+	   (sqlite3:for-each-row
+	    (lambda (testname)
+	      (set! testnames (cons testname testnames)))
+	    db
+	    "SELECT testname FROM test_meta WHERE jobgroup=?"
+	    jobgroup)))
+	;; get the jobcount NB// EXTEND THIS TO OPPERATE OVER ALL RUNS?
+	(if (not (null? testnames))
+	    (db:with-db
+	     dbstruct
+	     run-id
+	     #f
+	     (lambda (db)
+	       (sqlite3:first-result
+		db
+		(conc "SELECT count(id) FROM tests WHERE state in ('RUNNING','LAUNCHED','REMOTEHOSTSTART') AND testname in ('"
+		      (string-intersperse testnames "','")
+		      "') AND NOT (uname = 'n/a' AND item_path='');")) ;; should this include the (uname = 'n/a' ...) ???
+	       ))
+	    0))))
+
+;; tags: '("tag%" "tag2" "%ag6")
+;;
+
+;; done with run when:
+;;   0 tests in LAUNCHED, NOT_STARTED, REMOTEHOSTSTART, RUNNING
+(define (db:estimated-tests-remaining dbstruct run-id)
+  (db:with-db
+   dbstruct
+   run-id
+   #f
+   (lambda (db)
+     (sqlite3:first-result
+      db
+      "SELECT count(id) FROM tests WHERE state in ('LAUNCHED','NOT_STARTED','REMOTEHOSTSTART','RUNNING','KILLREQ') AND run_id=?;")
+     run-id)))
+
+;; map run-id, testname item-path to test-id
+(define (db:get-test-id dbstruct run-id testname item-path)
+  (db:with-db
+   dbstruct
+   run-id
+   #f
+   (lambda (db)
+     (db:first-result-default
+      db
+      "SELECT id FROM tests WHERE testname=? AND item_path=? AND run_id=?;"
+      #f ;; the default
+      testname item-path run-id))))
+
+;; overload the unused attemptnum field for the process id of the runscript or 
+;; ezsteps step script in progress
+;;
+(define (db:test-set-top-process-pid dbstruct run-id test-id pid)
+  (db:with-db
+   dbstruct
+   run-id
+   #f
+   (lambda (db)
+     (sqlite3:execute db "UPDATE tests SET attemptnum=? WHERE id=?;"
+		      pid test-id))))
+
+(define (db:test-get-top-process-pid dbstruct run-id test-id)
+  (db:with-db
+   dbstruct
+   run-id
+   #f
+   (lambda (db)
+     (db:first-result-default 
+      db
+      "SELECT attemptnum FROM tests WHERE id=?;"
+      #f
+      test-id))))
+
+(define db:test-record-fields '("id"           "run_id"        "testname"  "state"      "status"      "event_time"
+				"host"         "cpuload"       "diskfree"  "uname"      "rundir"      "item_path"
+                                "run_duration" "final_logf"    "comment"   "shortdir"   "attemptnum"  "archived" "last_update"))
+
+;; fields *must* be a non-empty list
+;;
+(define (db:field->number fieldname fields)
+  (if (null? fields)
+      #f
+      (let loop ((hed  (car fields))
+		 (tal  (cdr fields))
+		 (indx 0))
+	(if (equal? fieldname hed)
+	    indx
+	    (if (null? tal)
+		#f
+		(loop (car tal)(cdr tal)(+ indx 1)))))))
+
+;; CONVERT THIS TO A FUNCTION!
+(define db:test-record-qry-selector (string-intersperse db:test-record-fields ","))
+
+(define (db:update-tesdata-on-repilcate-db dbstruct old-lt new-lt)
+  (db:with-db
+   dbstruct   #f   #f
+   (lambda (db)
+     (sqlite3:execute db "UPDATE tests SET rundir= replace(rundir,?,?), shortdir=replace(shortdir,?,?);"
+		      old-lt new-lt  old-lt new-lt))))
+
+;; NOTE: Use db:test-get* to access records
+;; NOTE: This needs rundir decoding? Decide, decode here or where used? For the moment decode where used.
+(define (db:get-all-tests-info-by-run-id dbstruct run-id)
+  (let* ((res '()))
+    (db:with-db
+     dbstruct #f #f
+     (lambda (db)
+       (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)
+	  ;;                 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)
+			  res)))
+	db
+	(conc "SELECT " db:test-record-qry-selector " FROM tests WHERE state != 'DELETED' AND run_id=?;")
+	run-id)))
+    res))
+
+(define (db:replace-test-records dbstruct run-id testrecs)
+  (db:with-db dbstruct run-id #t 
+	      (lambda (db)
+		(let* ((qmarks (string-intersperse (make-list (length db:test-record-fields) "?") ","))
+		       (qrystr (conc "INSERT OR REPLACE INTO tests (" db:test-record-qry-selector ") VALUES (" qmarks ") WHERE run_id=?;"))
+		       (qry    (sqlite3:prepare db qrystr)))
+		  (debug:print 0 *default-log-port* "INFO: migrating test records for run with id " run-id)
+		  (sqlite3:with-transaction
+		   db
+		   (lambda ()
+		     (for-each 
+		      (lambda (rec)
+			;; (debug:print 0 *default-log-port* "INFO: Inserting values: " (string-intersperse (map conc (vector->list rec)) ",") "\n")
+			(apply sqlite3:execute qry (append (vector->list rec)(list run-id))))
+		      testrecs)))
+		  (sqlite3:finalize! qry)))))
+
+;; ;; ;; map a test-id into the proper range
+;; ;; ;;
+;; ;; (define (db:adj-test-id mtdb min-test-id test-id)
+;; ;;   (if (>= test-id min-test-id)
+;; ;;       test-id
+;; ;;       (let loop ((new-id min-test-id))
+;; ;; 	(let ((test-id-found #f))
+;; ;; 	  (sqlite3:for-each-row 
+;; ;; 	   (lambda (id)
+;; ;; 	     (set! test-id-found id))
+;; ;; 	   (db:dbdat-get-db mtdb)
+;; ;; 	   "SELECT id FROM tests WHERE id=?;"
+;; ;; 	   new-id)
+;; ;; 	  ;; if test-id-found then need to try again
+;; ;; 	  (if test-id-found
+;; ;; 	      (loop (+ new-id 1))
+;; ;; 	      (begin
+;; ;; 		(debug:print-info 0 *default-log-port* "New test id " new-id " selected for test with id " test-id)
+;; ;; 		(sqlite3:execute mtdb "UPDATE tests SET id=? WHERE id=?;" new-id test-id)))))))
+
+;; ;; ;; move test ids into the 30k * run_id range
+;; ;; ;;
+;; ;; (define (db:prep-megatest.db-adj-test-ids mtdb run-id testrecs)
+;; ;;   (debug:print-info 0 *default-log-port* "Adjusting test ids in megatest.db for run " run-id)
+;; ;;   (let ((min-test-id (* run-id 30000)))
+;; ;;     (for-each 
+;; ;;      (lambda (testrec)
+;; ;;        (let* ((test-id (vector-ref testrec (db:field->number "id" db:test-record-fields))))
+;; ;; 	 (db:adj-test-id (db:dbdat-get-db mtdb) min-test-id test-id)))
+;; ;;      testrecs)))
+	
+;; ;; ;; 1. move test ids into the 30k * run_id range
+;; ;; ;; 2. move step ids into the 30k * run_id range
+;; ;; ;;
+;; ;; (define (db:prep-megatest.db-for-migration mtdb)
+;; ;;   (let* ((run-ids (db:get-all-run-ids mtdb)))
+;; ;;     (for-each 
+;; ;;      (lambda (run-id)
+;; ;;        (let ((testrecs (db:get-all-tests-info-by-run-id mtdb run-id)))
+;; ;; 	 (db:prep-megatest.db-adj-test-ids (db:dbdat-get-db mtdb) run-id testrecs)))
+;; ;;      run-ids)))
+
+;; Get test data using test_id
+;; 
+(define (db:get-test-info-by-id dbstruct run-id test-id)
+  (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 testname state status event-time host cpuload diskfree uname rundir-id item-path run_duration final-logf-id comment short-dir-id attemptnum archived last-update)
+	  ;;                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-id item-path run_duration final-logf-id comment short-dir-id attemptnum archived last-update)))
+	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!!
+;;
+(define (db:get-test-info-by-ids dbstruct run-id test-ids)
+  (db:with-db
+   dbstruct
+   run-id
+   #f
+   (lambda (db)
+     (let ((res '()))
+       (sqlite3:for-each-row
+	(lambda (a . b)
+	  ;;                 0    1       2      3      4        5       6      7        8     9     10      11          12          13       14
+	  (set! res (cons (apply vector a b) res)))
+	db
+	(conc "SELECT " db:test-record-qry-selector " FROM tests WHERE id in ("
+	      (string-intersperse (map conc test-ids) ",") ");"))
+       res))))
+
+(define (db:get-test-info dbstruct run-id test-name item-path)
+  (db:with-db
+   dbstruct
+   run-id
+   #f
+   (lambda (db)
+     (let ((res #f))
+       (sqlite3:for-each-row
+	(lambda (a . b)
+	  (set! res (apply vector a b)))
+	db
+	(conc "SELECT " db:test-record-qry-selector " FROM tests WHERE testname=? AND item_path=? AND run_id=?;")
+	test-name item-path run-id)
+       res))))
+
+(define (db:test-get-rundir-from-test-id dbstruct run-id test-id)
+  (db:with-db
+   dbstruct
+   run-id
+   #f
+   (lambda (db)
+     (db:first-result-default
+      db
+      "SELECT rundir FROM tests WHERE id=?;"
+      #f ;; default result
+      test-id))))
+
+(define (db:get-test-times dbstruct run-name target)
+  (let ((res `())
+        (qry 	(conc "select testname, item_path, run_duration, "
+		      (string-join (db:get-keys dbstruct) " || '/' || ")
+		      " as target from tests inner join runs on tests.run_id = runs.id where runs.runname = ? and target = ?  ;")))
+  (db:with-db 
+    dbstruct
+    #f ;; this is for the main runs db
+    #f ;; does not modify db
+    (lambda (db)
+            (sqlite3:for-each-row
+	(lambda (test-name item-path test-time target )
+	  (set! res (cons (vector test-name item-path test-time) res)))
+	db
+        qry 
+	run-name target)
+       res))))
+
+;;======================================================================
+;; S T E P S
+;;======================================================================
+
+(define (db:teststep-set-status! dbstruct run-id test-id teststep-name state-in status-in comment logfile)
+  (db:with-db
+   dbstruct
+   run-id
+   #t
+   (lambda (db)
+     (sqlite3:execute 
+      db
+      "INSERT OR REPLACE into test_steps (test_id,stepname,state,status,event_time,comment,logfile) VALUES(?,?,?,?,?,?,?);"
+      test-id teststep-name state-in status-in (current-seconds)
+      (if comment comment "")
+      (if logfile logfile "")))))
+
+
+
+(define (db:delete-steps-for-test! dbstruct run-id test-id)
+  ;; TODO: figure out why status is the key field rather than state (note:  CONSTRAINT test_steps_constraint UNIQUE (test_id,stepname,state) )
+  (db:with-db
+   dbstruct
+   run-id
+   #t
+   (lambda (db)
+     (sqlite3:execute 
+      db
+      "UPDATE test_steps set status='DELETED' where test_id=?" ;;  and run_id=? !! - run_id not in table (bummer) TODO: get run_id into schema for test_steps
+      test-id))))
+
+
+;; db-get-test-steps-for-run
+(define (db:get-steps-for-test dbstruct run-id test-id)
+  (db:with-db
+   dbstruct
+   run-id
+   #f
+   (lambda (db)
+     (let* ((res '()))
+       (sqlite3:for-each-row 
+	(lambda (id test-id stepname state status event-time logfile comment)
+	  (set! res (cons (vector id test-id stepname state status event-time (if (string? logfile) logfile "") comment) res)))
+	db
+	"SELECT id,test_id,stepname,state,status,event_time,logfile,comment FROM test_steps WHERE status != 'DELETED' AND test_id=? ORDER BY id ASC;" ;; event_time DESC,id ASC;
+	test-id)
+       (reverse res)))))
+
+ (define (db:get-steps-info-by-id dbstruct  test-step-id)
+   (db:with-db
+    dbstruct
+    #f 
+    #f
+    (lambda (db)
+      (let* ((res (vector #f #f #f #f #f #f #f #f #f)))
+        (sqlite3:for-each-row 
+       (lambda (id test-id stepname state status event-time logfile comment last-update)
+         (set! res (vector id test-id stepname state status event-time (if (string? logfile) logfile "") comment last-update)))
+       db
+       "SELECT id,test_id,stepname,state,status,event_time,logfile,comment,last_update FROM test_steps WHERE id=? ORDER BY id ASC;" ;; event_time DESC,id ASC;
+       test-step-id)
+        res))))
+
+(define (db:get-steps-data dbstruct run-id test-id)
+  (db:with-db
+   dbstruct
+   run-id
+   #f
+   (lambda (db)
+     (let ((res '()))
+       (sqlite3:for-each-row 
+	(lambda (id test-id stepname state status event-time logfile)
+	  (set! res (cons (vector id test-id stepname state status event-time (if (string? logfile) logfile "")) res)))
+	db
+	"SELECT id,test_id,stepname,state,status,event_time,logfile FROM test_steps WHERE status != 'DELETED' AND test_id=? ORDER BY id ASC;" ;; event_time DESC,id ASC;
+	test-id)
+       (reverse res)))))
+
+;;======================================================================
+;; T E S T  D A T A 
+;;======================================================================
+
+(define (db:get-data-info-by-id dbstruct  test-data-id)
+  (let* ((stmt        "SELECT id,test_id, category, variable, value, expected, tol, units, comment, status, type, last_update FROM test_data WHERE id=? ORDER BY id ASC;")) ;; event_time DESC,id ASC;
+    (db:with-db
+     dbstruct
+     #f 
+     #f
+     (lambda (db)
+       (let* ((stmth (db:get-cache-stmth dbstruct db stmt))
+	      (res   (sqlite3:fold-row
+		      (lambda (res id test-id  category variable value expected tol units comment status type last-update)
+			(vector id test-id  category variable value expected tol units comment status type last-update))
+		      (vector #f #f #f #f #f #f #f #f #f #f #f #f)
+		      stmth
+		      test-data-id)))
+        res)))))
+
+;; WARNING: Do NOT call this for the parent test on an iterated test
+;; Roll up test_data pass/fail results
+;; look at the test_data status field, 
+;;    if all are pass (any case) and the test status is PASS or NULL or '' then set test status to PASS.
+;;    if one or more are fail (any case) then set test status to PASS, non "pass" or "fail" are ignored
+(define (db:test-data-rollup dbstruct run-id test-id status)
+  (let* ((fail-count 0)
+	 (pass-count 0))
+    (db:with-db
+     dbstruct #f #f
+     (lambda (db)
+       (sqlite3:for-each-row
+	(lambda (fcount pcount)
+	  (set! fail-count fcount)
+	  (set! pass-count pcount))
+	db 
+	"SELECT (SELECT count(id) FROM test_data WHERE test_id=? AND status like 'fail') AS fail_count,
+             (SELECT count(id) FROM test_data WHERE test_id=? AND status like 'pass') AS pass_count;"
+	test-id test-id)
+       ;; Now rollup the counts to the central megatest.db
+       (db:general-call dbstruct 'pass-fail-counts (list pass-count fail-count test-id))
+       ;; if the test is not FAIL then set status based on the fail and pass counts.
+       (db:general-call dbstruct 'test_data-pf-rollup (list test-id test-id test-id test-id))))))
+
+;; each section is a rule except "final" which is the final result
+;;
+;; [rule-5]
+;; operator in
+;; section LogFileBody
+;; desc Output voltage
+;; status OK
+;; expected 1.9
+;; measured 1.8
+;; type +/-
+;; tolerance 0.1
+;; pass 1
+;; fail 0
+;; 
+;; [final]
+;; exit-code 6
+;; exit-status SKIP
+;; message If flagged we are asking for this to exit with code 6
+;;
+;; recorded in steps table:
+;;   category: stepname
+;;   variable: rule-N
+;;   value:    measured
+;;   expected: expected
+;;   tol:      tolerance
+;;   units:    -
+;;   comment:  desc or message
+;;   status:   status
+;;   type:     type
+;; 
+(define (db:logpro-dat->csv dat stepname)
+  (let ((res '()))
+    (for-each
+     (lambda (entry-name)
+       (if (equal? entry-name "final")
+	   (set! res (append 
+		      res
+		      (list
+		       (list stepname
+			     entry-name
+			     (configf:lookup dat entry-name "exit-code")    ;; 0 ;; Value
+			     0                                              ;; 1 ;; Expected
+			     0                                              ;; 2 ;; Tolerance
+			     "n/a"					    ;; 3 ;; Units
+			     (configf:lookup dat entry-name "message")      ;; 4 ;; Comment
+			     (configf:lookup dat entry-name "exit-status")  ;; 5 ;; Status
+			     "logpro"                                       ;; 6 ;; Type
+			     ))))
+	   (let* ((value     (or (configf:lookup dat entry-name "measured")  "n/a"))
+		  (expected  (or (configf:lookup dat entry-name "expected")  0.0))
+		  (tolerance (or (configf:lookup dat entry-name "tolerance") 0.0))
+		  (comment   (or (configf:lookup dat entry-name "comment")
+				 (configf:lookup dat entry-name "desc")      "n/a"))
+		  (status    (or (configf:lookup dat entry-name "status")    "n/a"))
+		  (type      (or (configf:lookup dat entry-name "expected")  "n/a")))
+	     (set! res (append
+			res  
+			(list (list stepname
+				    entry-name 
+				    value        ;; 0
+				    expected     ;; 1
+				    tolerance    ;; 2
+				    "n/a"        ;; 3 Units
+				    comment      ;; 4
+				    status       ;; 5
+				    type         ;; 6
+				    )))))))
+     (hash-table-keys dat))
+    res))
+
+;; $MT_MEGATEST -load-test-data << EOF
+;; foo,bar,   1.2,  1.9, >
+;; foo,rab, 1.0e9, 10e9, 1e9
+;; foo,bla,   1.2,  1.9, <
+;; foo,bal,   1.2,  1.2, <   ,     ,Check for overload
+;; foo,alb,   1.2,  1.2, <=  , Amps,This is the high power circuit test
+;; foo,abl,   1.2,  1.3, 0.1
+;; foo,bra,   1.2, pass, silly stuff
+;; faz,bar,    10,  8mA,     ,     ,"this is a comment"
+;; EOF
+
+(define (db:csv->test-data dbstruct run-id test-id csvdata)
+  (debug:print 4 *default-log-port* "test-id " test-id ", csvdata: " csvdata)
+  (db:with-db
+   dbstruct #f #f
+   (lambda (db)
+     (let* ((csvlist (csv->list (make-csv-reader
+				 (open-input-string csvdata)
+				 '((strip-leading-whitespace? #t)
+				   (strip-trailing-whitespace? #t)))))) ;; (csv->list csvdata)))
+       (for-each
+	(lambda (csvrow)
+	  (let* ((padded-row  (take (append csvrow (list #f #f #f #f #f #f #f #f #f)) 9))
+		 (category    (list-ref padded-row 0))
+		 (variable    (list-ref padded-row 1))
+		 (value       (any->number-if-possible (list-ref padded-row 2)))
+		 (expected    (any->number-if-possible (list-ref padded-row 3)))
+		 (tol         (any->number-if-possible (list-ref padded-row 4))) ;; >, <, >=, <=, or a number
+		 (units       (list-ref padded-row 5))
+		 (comment     (list-ref padded-row 6))
+		 (status      (let ((s (list-ref padded-row 7)))
+				(if (and (string? s)(or (string-match (regexp "^\\s*$") s)
+							(string-match (regexp "^n/a$") s)))
+				    #f
+				    s))) ;; if specified on the input then use, else calculate
+		 (type        (list-ref padded-row 8)))
+	    ;; look up expected,tol,units from previous best fit test if they are all either #f or ''
+	    (debug:print 4 *default-log-port* "BEFORE: category: " category " variable: " variable " value: " value 
+			 ", expected: " expected " tol: " tol " units: " units " status: " status " comment: " comment " type: " type)
+	    
+	    (if (and (or (not expected)(equal? expected ""))
+		     (or (not tol)     (equal? expected ""))
+		     (or (not units)   (equal? expected "")))
+		(let-values (((new-expected new-tol new-units)(tdb:get-prev-tol-for-test #f test-id category variable)))
+		  (set! expected new-expected)
+		  (set! tol      new-tol)
+		  (set! units    new-units)))
+	    
+	    (debug:print 4 *default-log-port* "AFTER:  category: " category " variable: " variable " value: " value 
+			 ", expected: " expected " tol: " tol " units: " units " status: " status " comment: " comment)
+	    ;; calculate status if NOT specified
+	    (if (and (not status)(number? expected)(number? value)) ;; need expected and value to be numbers
+		(if (number? tol) ;; if tol is a number then we do the standard comparison
+		    (let* ((max-val (+ expected tol))
+			   (min-val (- expected tol))
+			   (result  (and (>=  value min-val)(<= value max-val))))
+		      (debug:print 4 *default-log-port* "max-val: " max-val " min-val: " min-val " result: " result)
+		      (set! status (if result "pass" "fail")))
+		    (set! status ;; NB// need to assess each one (i.e. not return operator since need to act if not valid op.
+		      (case (string->symbol tol) ;; tol should be >, <, >=, <=
+			((>)  (if (>  value expected) "pass" "fail"))
+			((<)  (if (<  value expected) "pass" "fail"))
+			((>=) (if (>= value expected) "pass" "fail"))
+			((<=) (if (<= value expected) "pass" "fail"))
+			(else (conc "ERROR: bad tol comparator " tol))))))
+	    (debug:print 4 *default-log-port* "AFTER2: category: " category " variable: " variable " value: " value 
+			 ", expected: " expected " tol: " tol " units: " units " status: " status " comment: " comment)
+	    ;; (db:delay-if-busy dbdat)
+	    (sqlite3:execute db "INSERT OR REPLACE INTO test_data (test_id,category,variable,value,expected,tol,units,comment,status,type) VALUES (?,?,?,?,?,?,?,?,?,?);"
+			     test-id category variable value expected tol units (if comment comment "") status type)))
+	csvlist)))))
+
+;; This routine moved from tdb.scm, tdb:read-test-data
+;;
+(define (db:read-test-data dbstruct run-id test-id categorypatt)
+  (let* ((res '()))
+    (db:with-db
+     dbstruct #f #f
+     (lambda (db)
+       (sqlite3:for-each-row 
+	(lambda (id test_id category variable value expected tol units comment status type)
+	  (set! res (cons (vector id test_id category variable value expected tol units comment status type) res)))
+	db
+	"SELECT id,test_id,category,variable,value,expected,tol,units,comment,status,type FROM test_data WHERE test_id=? AND category LIKE ? ORDER BY category,variable;" test-id categorypatt)
+       (reverse res)))))
+
+;; This routine moved from tdb.scm, :read-test-data
+;;
+(define (db:read-test-data-varpatt dbstruct run-id test-id categorypatt varpatt)
+  (let* ((res '()))
+    (db:with-db
+     dbstruct #f #f
+     (lambda (db)
+       (sqlite3:for-each-row 
+	(lambda (id test_id category variable value expected tol units comment status type)
+	  (set! res (cons (vector id test_id category variable value expected tol units comment status type) res)))
+	db
+	"SELECT id,test_id,category,variable,value,expected,tol,units,comment,status,type FROM test_data WHERE test_id=? AND category LIKE ? AND variable LIKE ? ORDER BY category,variable;" test-id categorypatt varpatt)
+       (reverse res)))))
+
+
+;;======================================================================
+;; Misc. test related queries
+;;======================================================================
+
+(define (db:get-run-ids-matching-target dbstruct keynames target res runname testpatt statepatt statuspatt)
+  (db:with-db
+   dbstruct #f #f
+   (lambda (db)
+     (let* ((row-ids '())
+	    (keystr (string-intersperse 
+		     (map (lambda (key val)
+			    (conc key " like '" val "'"))
+			  keynames 
+			  (string-split target "/"))
+		     " AND "))
+	    ;; (testqry (tests:match->sqlqry testpatt))
+	    (runsqry (sqlite3:prepare db (conc "SELECT id FROM runs WHERE " keystr " AND runname LIKE '" runname "';"))))
+       ;; (debug:print 8 *default-log-port* "db:test-get-paths-matching-keynames-target-new\n  runsqry=" runsqry "\n  tstsqry=" testqry)
+       (sqlite3:for-each-row
+	(lambda (rid)
+	  (set! row-ids (cons rid row-ids)))
+	runsqry)
+       (sqlite3:finalize! runsqry)
+       row-ids))))
+
+;; finds latest matching all patts for given run-id
+;;
+(define (db:test-get-paths-matching-keynames-target-new dbstruct run-id keynames target res testpatt statepatt statuspatt runname)
+  (let* ((testqry (tests:match->sqlqry testpatt))
+	 (tstsqry (conc "SELECT rundir FROM tests WHERE run_id=? AND " testqry " AND state LIKE '" statepatt "' AND status LIKE '" statuspatt "' ORDER BY event_time ASC;")))
+    (db:with-db
+     dbstruct
+     run-id
+     #f
+     (lambda (db)
+       (sqlite3:for-each-row 
+	(lambda (p)
+	  (set! res (cons p res)))
+	db
+	tstsqry
+	run-id)
+       res))))
+
+(define (db:test-toplevel-num-items dbstruct run-id testname)
+  (db:with-db
+   dbstruct
+   run-id
+   #f
+   (lambda (db)
+     (let ((res 0))
+       (sqlite3:for-each-row
+	(lambda (num-items)
+	  (set! res num-items))
+	db
+	"SELECT count(id) FROM tests WHERE run_id=? AND testname=? AND item_path != '' AND state NOT IN ('DELETED');"
+	run-id
+	testname)
+       res))))
+
+;;======================================================================
+;; QUEUE UP META, TEST STATUS AND STEPS REMOTE ACCESS
+;;======================================================================
+
+;; NOTE: Can remove the regex and base64 encoding for zmq
+(define (db:obj->string obj #!key (transport 'http))
+  (case transport
+    ;; ((fs) obj)
+    ((http fs)
+     (string-substitute
+      (regexp "=") "_"
+      (base64:base64-encode 
+       (z3:encode-buffer
+	(with-output-to-string
+	  (lambda ()(serialize obj))))) ;; BB: serialize - this is what causes problems between different builds of megatest communicating.  serialize is sensitive to binary image of mtest.
+      #t))
+    ((zmq nmsg)(with-output-to-string (lambda ()(serialize obj))))
+    (else obj))) ;; rpc
+
+(define (db:string->obj msg #!key (transport 'http))
+  (case transport
+    ;; ((fs) msg)
+    ((http fs)
+     (if (string? msg)
+	 (with-input-from-string 
+	     (z3:decode-buffer
+	      (base64:base64-decode
+	       (string-substitute 
+		(regexp "_") "=" msg #t)))
+	   (lambda ()(deserialize)))
+	 (begin
+	   (debug:print-error 0 *default-log-port* "reception failed. Received \"" msg "\" but cannot translate it.")
+           (print-call-chain (current-error-port))
+	   msg))) ;; crude reply for when things go awry
+    ((zmq nmsg)(with-input-from-string msg (lambda ()(deserialize))))
+    (else msg))) ;; rpc
+
+;; ; This is to be the big daddy call NOPE: Replaced by db:set-state-status-and-roll-up-items
+;; ;
+;; define (db:test-set-state-status dbstruct run-id test-id state status msg)
+;;  (let ((dbdat  (db:get-dbdat dbstruct run-id)))
+;;    (if (member state '("LAUNCHED" "REMOTEHOSTSTART"))
+;; 	(db:general-call dbdat 'set-test-start-time (list test-id)))
+;;    ;; (if msg
+;;    ;; 	(db:general-call dbdat 'state-status-msg (list state status msg test-id))
+;;    ;; 	(db:general-call dbdat 'state-status     (list state status test-id)))
+;;    (db:set-state-status-and-roll-up-items dbstruct run-id test-id #f state status msg)
+;;    ;; process the test_data table
+;;    (if (and test-id state status (equal? status "AUTO")) 
+;; 	(db:test-data-rollup dbstruct run-id test-id status))
+;;    (mt:process-triggers dbstruct run-id test-id state status)))
+
+;; state is the priority rollup of all states
+;; status is the priority rollup of all completed statesfu
+;;
+;; if test-name is an integer work off that instead of test-name test-path
+;;
+(define (db:set-state-status-and-roll-up-items dbstruct run-id test-name item-path state status comment)
+  ;; establish info on incoming test followed by info on top level test
+  ;; BBnote - for mode itemwait, linkage between upstream test & matching item status is propagated to run queue in db:prereqs-not-met
+  (let* ((testdat      (if (number? test-name)
+			   (db:get-test-info-by-id dbstruct run-id test-name) ;; test-name is actually a test-id
+			   (db:get-test-info       dbstruct run-id test-name item-path)))
+	 (test-id      (db:test-get-id testdat))
+	 (test-name    (if (number? test-name)
+			   (db:test-get-testname testdat)
+			   test-name))
+	 (item-path    (db:test-get-item-path testdat))
+         (tl-testdat   (db:get-test-info dbstruct run-id test-name ""))
+         (tl-test-id   (if tl-testdat
+			   (db:test-get-id tl-testdat)
+			   #f)))
+    (if (member state '("LAUNCHED" "REMOTEHOSTSTART")) 
+	(db:general-call dbstruct 'set-test-start-time (list test-id)))
+    (mutex-lock! *db-transaction-mutex*)
+    (db:with-db
+     dbstruct #f #f
+     (lambda (db)
+       (let ((tr-res
+              (sqlite3:with-transaction
+               db
+               (lambda ()
+                 ;; NB// Pass the db so it is part fo the transaction
+                 (db:test-set-state-status db run-id test-id state status comment) ;; this call sets the item state/status
+                 (if (not (equal? item-path "")) ;; only roll up IF incoming test is an item
+                     (let* ((state-status-counts  (db:get-all-state-status-counts-for-test dbstruct run-id test-name item-path state status)) ;; item-path is used to exclude current state/status of THIS test
+			      						  (state-stauses (db:roll-up-rules state-status-counts state status))
+                          (newstate (car state-stauses))
+                          (newstatus (cadr state-stauses)))
+                       (debug:print 4 *default-log-port* "BB> tl-test-id="tl-test-id" ; "test-name":"item-path" newstate="newstate" newstatus="newstatus" len(sscs)="(length state-status-counts)  " state-status-counts: "
+							(apply conc
+                  (map (lambda (x)
+                     (conc
+                     		(with-output-to-string (lambda () (pp (dbr:counts->alist x)))) " | "))
+                              state-status-counts))); end debug:print
+   
+                       (if tl-test-id
+			   (db:test-set-state-status db run-id tl-test-id newstate newstatus #f)) ;; we are still in the transaction - must access the db and not the dbstruct
+		       ))))))
+         (mutex-unlock! *db-transaction-mutex*)
+         (if (and test-id state status (equal? status "AUTO")) 
+             (db:test-data-rollup dbstruct run-id test-id status))
+         tr-res)))))
+
+(define (db:roll-up-rules state-status-counts state status)
+		(let* ((running     (length (filter (lambda (x)
+                          (member (dbr:counts-state x) *common:running-states*))
+                                 state-status-counts)))
+           (bad-not-started      (length (filter (lambda (x)
+                                      (and (equal? (dbr:counts-state x) "NOT_STARTED") 
+                                        (not (member (dbr:counts-status x)  *common:not-started-ok-statuses*))))
+																	state-status-counts)))
+           (all-curr-states      (common:special-sort  ;; worst -> best (sort of)
+                                    (delete-duplicates
+                                      (if (and state (not (member state *common:dont-roll-up-states*)))
+                                          (cons state (map dbr:counts-state state-status-counts))
+                                          (map dbr:counts-state state-status-counts)))
+                                                  *common:std-states* >))
+           (all-curr-statuses    (common:special-sort  ;; worst -> best
+                                    (delete-duplicates
+                                      (if (and state status (not (member state *common:dont-roll-up-states*)))
+                                          (cons status (map dbr:counts-status state-status-counts))
+                                          (map dbr:counts-status state-status-counts)))
+                                                   *common:std-statuses* >))
+           (non-completes        (filter (lambda (x)
+							 										 (not (member x (cons "COMPLETED" *common:dont-roll-up-states*))))
+						       									all-curr-states))
+			     (preq-fails        (filter (lambda (x)
+							 								(equal? x "PREQ_FAIL"))
+						       							all-curr-statuses))
+           (num-non-completes (length non-completes))
+ 					 (newstate          (cond
+															((> running 0)           "RUNNING")            ;; anything running, call the situation running
+                              ((> (length preq-fails) 0) "NOT_STARTED")
+															((> bad-not-started 0)   "COMPLETED")          ;; we have an ugly situation, it is completed in the sense we cannot do more.
+															((> num-non-completes 0) (car non-completes))  ;;  (remove (lambda (x)(equal? "COMPLETED" x)) all-curr-states))) ;; only rollup DELETED if all DELETED
+															(else                    (car all-curr-states))))
+           (newstatus         (cond
+                              ((> (length preq-fails) 0)  "PREQ_FAIL")
+                              ((or (> bad-not-started 0)
+                                   (and (equal? newstate "NOT_STARTED")
+                                      (> num-non-completes 0)))
+                                            "STARTED")
+                              (else (car all-curr-statuses)))))
+ 					(debug:print-info 2 *default-log-port*
+                                         "\n--> probe db:set-state-status-and-roll-up-items: "
+                                         "\n--> state-status-counts: "(map dbr:counts->alist state-status-counts)
+                                         "\n--> running:             "running
+                                         "\n--> bad-not-started:     "bad-not-started
+                                         "\n--> non-non-completes:   "num-non-completes
+                                         "\n--> non-completes:       "non-completes
+                                         "\n--> all-curr-states:     "all-curr-states
+                                         "\n--> all-curr-statuses:     "all-curr-statuses
+                                         "\n--> newstate              "newstate
+                                         "\n--> newstatus            "newstatus
+                                         "\n\n")
+
+                        ;; NB// Pass the db so it is part of the transaction
+         (list newstate newstatus)))
+
+(define (db:set-state-status-and-roll-up-run dbstruct run-id curr-state curr-status)
+    (mutex-lock! *db-transaction-mutex*)
+    (db:with-db
+     dbstruct #f #f
+     (lambda (db)
+       (let ((tr-res
+              (sqlite3:with-transaction
+               db
+               (lambda ()
+                   (let* ((state-status-counts  (db:get-all-state-status-counts-for-run dbstruct run-id))
+													(state-stauses (db:roll-up-rules state-status-counts #f #f ))
+                          (newstate (car state-stauses))
+                          (newstatus (cadr state-stauses))) 
+                    (if (or (not (eq? newstate curr-state)) (not (eq?  newstatus curr-status)))
+                   (db:set-run-state-status dbstruct run-id newstate newstatus )))))))
+         (mutex-unlock! *db-transaction-mutex*)
+         tr-res))))
+
+
+(define (db:get-all-state-status-counts-for-run dbstruct run-id)
+ (let* ((test-count-recs (db:with-db
+                                  dbstruct #f #f
+                                  (lambda (db)
+                                    (sqlite3:map-row
+                                     (lambda (state status count)
+                                        (make-dbr:counts state: state status: status count: count))
+                                     db
+                                     "SELECT state,status,count(id) FROM tests WHERE run_id=?  GROUP BY state,status;"
+                                     run-id )))))
+   test-count-recs))
+
+
+;; BBnote: db:get-all-state-status-counts-for-test returns dbr:counts object aggregating state and status of items of a given test, *not including rollup state/status*
+;;
+;; NOTE: This is called within a transaction
+;;
+(define (db:get-all-state-status-counts-for-test dbstruct run-id test-name item-path item-state-in item-status-in)
+  (let* ((test-info   (db:get-test-info dbstruct run-id test-name item-path))
+         (item-state  (or item-state-in (db:test-get-state test-info))) 
+         (item-status (or item-status-in (db:test-get-status test-info)))
+         (other-items-count-recs (db:with-db
+                                  dbstruct #f #f
+                                  (lambda (db)
+                                    (sqlite3:map-row
+                                     (lambda (state status count)
+                                       (make-dbr:counts state: state status: status count: count))
+                                     db
+                                     ;; ignore current item because we have changed its value in the current transation so this select will see the old value.
+                                     "SELECT state,status,count(id) FROM tests WHERE run_id=? AND testname=? AND item_path != '' AND item_path !=? GROUP BY state,status;"
+                                     run-id test-name item-path))))
+
+         ;; add current item to tally outside of sql query
+         (match-countrec-lambda (lambda (countrec) 
+                                  (and (equal? (dbr:counts-state  countrec) item-state)
+                                       (equal? (dbr:counts-status countrec) item-status))))
+
+         (already-have-count-rec-list
+          (filter match-countrec-lambda other-items-count-recs)) ;; will have either 0 or 1 count recs depending if another item shares this item's state/status
+         
+         (updated-count-rec    (if (null? already-have-count-rec-list)
+                                   (make-dbr:counts state: item-state status: item-status count: 1)
+                                   (let* ((our-count-rec (car already-have-count-rec-list))
+                                          (new-count (add1 (dbr:counts-count our-count-rec))))
+                                     (make-dbr:counts state: item-state status: item-status count: new-count))))
+
+         (nonmatch-countrec-lambda (lambda (countrec) (not (match-countrec-lambda countrec))))
+         
+         (unrelated-rec-list   
+          (filter nonmatch-countrec-lambda other-items-count-recs)))
+    
+    (cons updated-count-rec unrelated-rec-list)))
+
+;; (define (db:get-all-item-states db run-id test-name)
+;;   (sqlite3:map-row 
+;;    (lambda (a) a)
+;;    db
+;;    "SELECT DISTINCT state FROM tests WHERE item_path != '' AND state != 'DELETED' AND run_id=? AND testname=?"
+;;    run-id test-name))
+;; 
+;; (define (db:get-all-item-statuses db run-id test-name)
+;;   (sqlite3:map-row 
+;;    (lambda (a) a)
+;;    db
+;;    "SELECT DISTINCT status FROM tests WHERE item_path != '' AND state != 'DELETED' AND state='COMPLETED' AND run_id=? AND testname=?"
+;;    run-id test-name))
+
+(define (db:test-get-logfile-info dbstruct run-id test-name)
+  (db:with-db
+   dbstruct
+   run-id
+   #f
+   (lambda (db)
+     (let ((res #f))
+       (sqlite3:for-each-row 
+	(lambda (path final_logf)
+	  ;; (let ((path       (sdb:qry 'getstr path-id))
+	  ;;       (final_logf (sdb:qry 'getstr final_logf-id)))
+	  (set! logf final_logf)
+	  (set! res (list path final_logf))
+	  (if (directory? path)
+	      (debug:print 2 *default-log-port* "Found path: " path)
+	      (debug:print 2 *default-log-port* "No such path: " path))) ;; )
+	db
+	"SELECT rundir,final_logf FROM tests WHERE testname=? AND item_path='' AND run_id=?;"
+	test-name run-id)
+       res))))
+
+;;======================================================================
+;; A G R E G A T E D   T R A N S A C T I O N   D B   W R I T E S 
+;;======================================================================
+
+(define db:queries 
+  (list '(update-run-duration     "UPDATE tests SET run_duration=? WHERE id=?;")
+
+	;; TESTS
+	'(register-test          "INSERT OR IGNORE INTO tests (run_id,testname,event_time,item_path,state,status) VALUES (?,?,strftime('%s','now'),?,'NOT_STARTED','n/a');")
+	;; Test state and status
+	'(set-test-state         "UPDATE tests SET state=?   WHERE id=?;")
+	'(set-test-status        "UPDATE tests SET state=?   WHERE id=?;")
+	'(state-status           "UPDATE tests SET state=?,status=? WHERE id=?;") ;; D/ONE
+	'(state-status-msg       "UPDATE tests SET state=?,status=?,comment=? WHERE id=?;") ;; DONE
+	;; Test comment
+	'(set-test-comment       "UPDATE tests SET comment=? WHERE id=?;")
+	'(set-test-start-time    "UPDATE tests SET event_time=strftime('%s','now') WHERE id=?;") ;; DONE
+	'(pass-fail-counts       "UPDATE tests SET pass_count=?,fail_count=? WHERE id=?;")
+	;; test_data-pf-rollup is used to set a tests PASS/FAIL based on the pass/fail info from the steps
+	'(test_data-pf-rollup    "UPDATE tests
+                                    SET status=CASE WHEN (SELECT fail_count FROM tests WHERE id=?) > 0 
+                                      THEN 'FAIL'
+                                    WHEN (SELECT pass_count FROM tests WHERE id=?) > 0 AND 
+                                      (SELECT status FROM tests WHERE id=?) NOT IN ('WARN','FAIL')
+                                    THEN 'PASS'
+                                    ELSE status
+                                    END WHERE id=?;") ;; DONE
+	'(test-set-log            "UPDATE tests SET final_logf=? WHERE id=?;")      ;; DONE
+	;; '(test-set-rundir-by-test-id "UPDATE tests SET rundir=? WHERE id=?")        ;; DONE
+	;; '(test-set-rundir         "UPDATE tests SET rundir=? AND testname=? AND item_path=?;") ;; DONE
+	'(test-set-rundir-shortdir "UPDATE tests SET rundir=?,shortdir=? WHERE testname=? AND item_path=? AND run_id=?;")    ;; BROKEN!!! NEEDS run-id
+	'(delete-tests-in-state   ;; "DELETE FROM tests WHERE state=?;")                  ;; DONE
+	  "UPDATE tests SET state='DELETED' WHERE state=?")
+	'(tests:test-set-toplog   "UPDATE tests SET final_logf=? WHERE run_id=? AND testname=? AND item_path='';")
+	'(update-cpuload-diskfree "UPDATE tests SET cpuload=?,diskfree=? WHERE id=?;") ;; DONE
+	'(update-uname-host       "UPDATE tests SET uname=?,host=? WHERE id=?;")       ;; DONE
+        '(update-test-rundat      "INSERT INTO test_rundat (test_id,update_time,cpuload,diskfree,diskusage,run_duration) VALUES (?,?,?,?,?,?);")
+	'(update-test-state       "UPDATE tests SET state=? WHERE state=? AND run_id=? AND testname=? AND NOT (item_path='' AND testname IN (SELECT DISTINCT testname FROM tests WHERE testname=? AND item_path != ''));")
+	'(update-test-status      "UPDATE tests SET status=? WHERE status like ? AND run_id=? AND testname=? AND NOT (item_path='' AND testname IN (SELECT DISTINCT testname FROM tests WHERE testname=? AND item_path != ''));")
+	;; stuff for set-state-status-and-roll-up-items
+	'(update-pass-fail-counts "UPDATE tests 
+             SET fail_count=(SELECT count(id) FROM tests WHERE testname=? AND item_path != '' AND status IN ('FAIL','CHECK','INCOMPLETE','ABORT')),
+                 pass_count=(SELECT count(id) FROM tests WHERE testname=? AND item_path != '' AND status IN ('PASS','WARN','WAIVED'))
+             WHERE testname=? AND item_path='' AND run_id=?;") ;; DONE  ;; BROKEN!!! NEEDS run-id
+	'(top-test-set-running  "UPDATE tests SET state='RUNNING' WHERE testname=? AND item_path='' AND run_id=?;") ;; DONE   ;; BROKEN!!! NEEDS run-id
+
+	;; NOT USED
+	;;
+	;; Might be the following top-test-set-per-pf-counts query could be better based off of something like this:
+	;;
+	;; select state,status,count(state) from tests where run_id=59 AND testname='runfirst' group by state,status;
+	;;
+	'(top-test-set-per-pf-counts "UPDATE tests
+                       SET state=CASE 
+                                   WHEN (SELECT count(id) FROM tests 
+                                                WHERE testname=?
+                                                     AND item_path != '' 
+                                                     AND status NOT IN ('n/a')
+                                                     AND state in ('NOT_STARTED')) > 0 THEN 'UNKNOWN'
+                                   WHEN (SELECT count(id) FROM tests 
+                                                WHERE testname=?
+                                                     AND item_path != '' 
+                                                     AND (status NOT IN ('TEN_STRIKES','BLOCKED') OR status IN ('INCOMPLETE'))
+                                                     AND state in ('RUNNING','NOT_STARTED','LAUNCHED','REMOTEHOSTSTART')) > 0 THEN 'RUNNING'
+                                   WHEN (SELECT count(id) FROM tests 
+                                                WHERE testname=?
+                                                     AND item_path != '' 
+                                                     AND state NOT IN ('COMPLETED','DELETED')) = 0 THEN 'COMPLETED'
+                                   WHEN (SELECT count(id) FROM tests 
+                                                WHERE testname=?
+                                                     AND item_path != '' 
+                                                     AND state = 'NOT_STARTED') > 0 THEN 'NOT_STARTED'
+                                   ELSE 'UNKNOWN' END,
+                            status=CASE 
+                                  WHEN fail_count > 0 THEN 'FAIL' 
+                                  WHEN (SELECT count(id) FROM tests
+                                         WHERE testname=?
+                                              AND item_path != ''
+                                              AND state IN ('BLOCKED','INCOMPLETE')) > 0 THEN 'FAIL'
+                                  WHEN (SELECT count(id) FROM tests
+                                         WHERE testname=?
+                                              AND item_path != ''
+                                              AND state NOT IN ('DELETED')
+                                              AND status IN ('INCOMPLETE','ABORT')) > 0 THEN 'ABORT'
+                                  WHEN (SELECT count(id) FROM tests
+                                         WHERE testname=?
+                                              AND item_path != ''
+                                              AND state NOT IN ('DELETED')
+                                              AND status = 'AUTO') > 0 THEN 'AUTO'
+                                  WHEN (SELECT count(id) FROM tests
+                                         WHERE testname=?
+                                              AND item_path != ''
+                                              AND state NOT IN ('DELETED')
+                                              AND status IN ('STUCK/INCOMPLETE', 'INCOMPLETE')) > 0 THEN 'INCOMPLETE'
+                                  WHEN (SELECT count(id) FROM tests
+                                         WHERE testname=?
+                                              AND item_path != ''
+                                              AND state IN ('COMPLETED','STUCK/INCOMPLETE','INCOMPLETE')
+                                              AND status = 'FAIL') > 0 THEN 'FAIL'
+                                  WHEN (SELECT count(id) FROM tests
+                                         WHERE testname=?
+                                              AND item_path != ''
+                                              AND state NOT IN ('DELETED')
+                                              AND status = 'CHECK') > 0 THEN 'CHECK'
+                                  WHEN (SELECT count(id) FROM tests
+                                         WHERE testname=?
+                                              AND item_path != ''
+                                              AND state NOT IN ('DELETED')
+                                              AND status = 'SKIP') > 0 THEN 'SKIP'
+                                  WHEN (SELECT count(id) FROM tests
+                                         WHERE testname=?
+                                              AND item_path != ''
+                                              AND state NOT IN ('DELETED')
+                                              AND status = 'WARN') > 0 THEN 'WARN'
+                                  WHEN (SELECT count(id) FROM tests
+                                         WHERE testname=?
+                                              AND item_path != ''
+                                              AND state NOT IN ('DELETED')
+                                              AND status = 'WAIVED') > 0 THEN 'WAIVED'
+                                  WHEN (SELECT count(id) FROM tests
+                                         WHERE testname=? 
+                                              AND item_path != ''
+                                              AND state NOT IN ('DELETED')
+                                              AND status NOT IN ('PASS','FAIL','WARN','WAIVED')) > 0 THEN 'ABORT'
+                                  WHEN (SELECT count(id) FROM tests
+                                         WHERE testname=?
+                                              AND item_path != ''
+                                              AND state='NOT_STARTED') > 0 THEN 'n/a'
+                                  WHEN (SELECT count(id) FROM tests
+                                         WHERE testname=?
+                                              AND item_path != ''
+                                              AND state = 'COMPLETED'
+                                              AND status = 'PASS') > 0 THEN 'PASS'
+                                  WHEN pass_count > 0 AND fail_count=0 THEN 'PASS' 
+                                  ELSE 'UNKNOWN' END
+                       WHERE testname=? AND item_path='';") ;; DONE  ;; BROKEN!!! NEEDS run-id
+
+	;; STEPS
+	'(delete-test-step-records "UPDATE test_steps SET status='DELETED' WHERE test_id=?;")
+	'(delete-test-data-records "UPDATE test_data  SET status='DELETED' WHERE test_id=?;") ;; using status since no state field
+	))
+
+(define (db:lookup-query qry-name)
+  (let ((q (alist-ref qry-name db:queries)))
+    (if q (car q) #f)))
+
+;; do not run these as part of the transaction
+(define db:special-queries   '(rollup-tests-pass-fail
+			       ;; db:set-state-status-and-roll-up-items  ;; WHY NOT!?
+			       login
+			       immediate
+			       flush
+			       sync
+			       set-verbosity
+			       killserver
+			       ))
+
+(define (db:login dbstruct calling-path calling-version client-signature)
+   (cond 
+   ((not (equal? calling-path *toppath*))
+    (list #f "Login failed due to mismatch paths: " calling-path ", " *toppath*))
+   ;; ((not (equal? *run-id* run-id))
+   ;;  (list #f "Login failed due to mismatch run-id: " run-id ", " *run-id*))
+   ((not (equal? megatest-version calling-version))
+    (list #t (conc "Login warning due to mismatch megatest version: " calling-version ", " megatest-version)))
+   
+    (else
+    (hash-table-set! *logged-in-clients* client-signature (current-seconds))
+    '(#t "successful login"))))
+
+(define (db:general-call dbstruct stmtname params)
+  (let ((query (let ((q (alist-ref (if (string? stmtname)
+				       (string->symbol stmtname)
+				       stmtname)
+				   db:queries)))
+ 		 (if q (car q) #f))))
+    (db:with-db
+     dbstruct #f #f
+     (lambda (db)
+       (apply sqlite3:execute db query params)
+       #t))))
+
+;; get a summary of state and status counts to calculate a rollup
+;;
+(define (db:get-state-status-summary dbstruct run-id testname)
+  (let ((res   '()))
+    (db:with-db
+     dbstruct #f #f
+     (lambda (db)
+       (sqlite3:for-each-row
+	(lambda (state status count)
+	  (set! res (cons (vector state status count) res)))
+	db
+	"SELECT state,status,count(state) FROM tests WHERE run_id=? AND testname=? AND item_path='' GROUP BY state,status;"
+	run-id testname)
+       res))))
+
+(define (db:get-latest-host-load dbstruct raw-hostname)
+  (let* ((hostname (string-substitute "\\..*$" "" raw-hostname))
+         (res  (cons -1 0)))
+    (db:with-db
+     dbstruct #f #f
+     (lambda (db)
+       (sqlite3:for-each-row
+        (lambda (cpuload update-time)  (set! res (cons cpuload update-time)))
+        db
+        "SELECT tr.cpuload, tr.update_time FROM test_rundat tr, tests t WHERE t.host=? AND tr.cpuload != -1  AND tr.test_id=t.id ORDER BY tr.update_time DESC LIMIT 1;"
+        hostname))) res ))
+
+(define (db:set-top-level-from-items dbstruct run-id testname)
+  (let* ((summ  (db:get-state-status-summary dbstruct run-id testname))
+	 (find  (lambda (state status)
+		  (if (null? summ) 
+		      #f
+		      (let loop ((hed (car summ))
+				 (tal (cdr summ)))
+			(if (and (string-match state  (vector-ref hed 0))
+				 (string-match status (vector-ref hed 1)))
+			    hed
+			    (if (null? tal)
+				#f
+				(loop (car tal)(cdr tal)))))))))
+
+
+      ;;;     E D I T M E ! !
+
+
+    (cond
+     ((> (find "COMPLETED" ".*") 0) #f))))
+		   
+    
+
+;; get the previous records for when these tests were run where all keys match but runname
+;; NB// Merge this with test:get-previous-test-run-records? This one looks for all matching tests
+;; can use wildcards. Also can likely be factored in with get test paths?
+;;
+;; Run this remotely!!
+;;
+(define (db:get-matching-previous-test-run-records dbstruct run-id test-name item-path)
+  (let* ((keys    (db:get-keys dbstruct))
+	 (selstr  (string-intersperse keys ","))
+	 (qrystr  (string-intersperse (map (lambda (x)(conc x "=?")) keys) " AND "))
+	 (keyvals #f)
+	 (tests-hash (make-hash-table)))
+    ;; first look up the key values from the run selected by run-id
+    (db:with-db
+     dbstruct #f #f
+     (lambda (db)
+       (sqlite3:for-each-row 
+	(lambda (a . b)
+	  (set! keyvals (cons a b)))
+	db
+	(conc "SELECT " selstr " FROM runs WHERE id=? ORDER BY event_time DESC;") run-id)))
+    (if (not keyvals)
+	'()
+	(let ((prev-run-ids '()))
+	  (db:with-db
+	   dbstruct #f #f
+	   (lambda (db)
+	     (apply sqlite3:for-each-row
+		    (lambda (id)
+		      (set! prev-run-ids (cons id prev-run-ids)))
+		    db
+		    (conc "SELECT id FROM runs WHERE " qrystr " AND id != ?;") (append keyvals (list run-id)))))
+	  ;; collect all matching tests for the runs then
+	  ;; extract the most recent test and return that.
+	  (debug:print 4 *default-log-port* "selstr: " selstr ", qrystr: " qrystr ", keyvals: " keyvals 
+		       ", previous run ids found: " prev-run-ids)
+	  (if (null? prev-run-ids) '()  ;; no previous runs? return null
+	      (let loop ((hed (car prev-run-ids))
+			 (tal (cdr prev-run-ids)))
+		(let ((results (db:get-tests-for-run dbstruct hed (conc test-name "/" item-path) '() '() #f #f #f #f #f #f #f 'normal)))
+		  (debug:print 4 *default-log-port* "Got tests for run-id " run-id ", test-name " test-name 
+			       ", item-path " item-path " results: " (intersperse results "\n"))
+		  ;; Keep only the youngest of any test/item combination
+		  (for-each 
+		   (lambda (testdat)
+		     (let* ((full-testname (conc (db:test-get-testname testdat) "/" (db:test-get-item-path testdat)))
+			    (stored-test   (hash-table-ref/default tests-hash full-testname #f)))
+		       (if (or (not stored-test)
+			       (and stored-test
+				    (> (db:test-get-event_time testdat)(db:test-get-event_time stored-test))))
+			   ;; this test is younger, store it in the hash
+			   (hash-table-set! tests-hash full-testname testdat))))
+		   results)
+		  (if (null? tal)
+		      (map cdr (hash-table->alist tests-hash)) ;; return a list of the most recent tests
+		      (loop (car tal)(cdr tal))))))))))
+
+;; Function recursively checks if <db>.journal exists; if yes means db busy; call itself after delayed interval
+;; return the sqlite3 db handle if possible
+;; 
+;; ;; (define (db:delay-if-busy dbdat #!key (count 6))
+;; ;;   (if (not (configf:lookup *configdat* "server" "delay-on-busy")) 
+;; ;;       (and dbdat (db:dbdat-get-db dbdat))
+;; ;;       (if dbdat
+;; ;; 	  (let* ((dbpath (db:dbdat-get-path dbdat))
+;; ;; 		 (db     (db:dbdat-get-db   dbdat)) ;; we'll return this so (db:delay--if-busy can be called inline
+;; ;; 		 (dbfj   (conc dbpath "-journal")))
+;; ;; 	    (if (handle-exceptions
+;; ;; 		 exn
+;; ;; 		 (begin
+;; ;; 		   (debug:print-info 0 *default-log-port* "WARNING: failed to test for existance of " dbfj ", exn=" exn)
+;; ;; 		   (thread-sleep! 1)
+;; ;; 		   (db:delay-if-busy count (- count 1))) 
+;; ;; 		 (common:file-exists? dbfj))
+;; ;; 		(case count
+;; ;; 		  ((6)
+;; ;; 		   (thread-sleep! 0.2)
+;; ;; 		   (db:delay-if-busy count: 5))
+;; ;; 		  ((5)
+;; ;; 		   (thread-sleep! 0.4)
+;; ;; 		   (db:delay-if-busy count: 4))
+;; ;; 		  ((4)
+;; ;; 		   (thread-sleep! 0.8)
+;; ;; 		   (db:delay-if-busy count: 3))
+;; ;; 		  ((3)
+;; ;; 		   (thread-sleep! 1.6)
+;; ;; 		   (db:delay-if-busy count: 2))
+;; ;; 		  ((2)
+;; ;; 		   (thread-sleep! 3.2)
+;; ;; 		   (db:delay-if-busy count: 1))
+;; ;; 		  ((1)
+;; ;; 		   (thread-sleep! 6.4)
+;; ;; 		   (db:delay-if-busy count: 0))
+;; ;; 		  (else
+;; ;; 		   (debug:print-info 0 *default-log-port* "delaying db access due to high database load.")
+;; ;; 		   (thread-sleep! 12.8))))
+;; ;; 	    db) 
+;; ;; 	  "bogus result from db:delay-if-busy")))
+
+(define (db:test-get-records-for-index-file dbstruct run-id test-name)
+  (let ((res '()))
+    (db:with-db
+     dbstruct
+     run-id
+     #f
+     (lambda (db)
+       (sqlite3:for-each-row 
+	(lambda (id itempath state status run_duration logf comment)
+	  (set! res (cons (vector id itempath state status run_duration logf comment) res)))
+	db
+	"SELECT id,item_path,state,status,run_duration,final_logf,comment FROM tests WHERE testname=? AND item_path != '' AND run_id=?;" ;; BUG! WHY NO run_id?
+	test-name
+	run-id)
+       res))))
+
+;;======================================================================
+;; Tests meta data
+;;======================================================================
+
+;; returns a hash table of tags to tests
+;;
+(define (db:get-tests-tags dbstruct)
+  (db:with-db
+   dbstruct #f #f
+   (lambda (db)
+     (let* ((res     (make-hash-table)))
+       (sqlite3:for-each-row
+	(lambda (testname tags-in)
+	  (let ((tags (string-split tags-in ",")))
+	    (for-each
+	     (lambda (tag)
+	       (hash-table-set! res tag
+				(delete-duplicates
+				 (cons testname (hash-table-ref/default res tag '())))))
+	     tags)))
+	db
+	"SELECT testname,tags FROM test_meta")
+       (hash-table->alist res)))))
+
+;; read the record given a testname
+(define (db:testmeta-get-record dbstruct testname)
+  (let ((res   #f))
+    (db:with-db
+     dbstruct
+     #f
+     #f
+     (lambda (db)
+       (sqlite3:for-each-row
+	(lambda (id testname author owner description reviewed iterated avg_runtime avg_disk tags jobgroup)
+	  (set! res (vector id testname author owner description reviewed iterated avg_runtime avg_disk tags jobgroup)))
+	db
+	"SELECT id,testname,author,owner,description,reviewed,iterated,avg_runtime,avg_disk,tags,jobgroup FROM test_meta WHERE testname=?;"
+	testname)
+       res))))
+
+;; create a new record for a given testname
+(define (db:testmeta-add-record dbstruct testname)
+  (db:with-db dbstruct #f #f 
+	      (lambda (db)
+		(sqlite3:execute 
+		 db
+		 "INSERT OR IGNORE INTO test_meta (testname,author,owner,description,reviewed,iterated,avg_runtime,avg_disk,tags) VALUES (?,'','','','','','','','');" testname))))
+
+;; update one of the testmeta fields
+(define (db:testmeta-update-field dbstruct testname field value)
+  (db:with-db dbstruct #f #f 
+	      (lambda (db)
+		(sqlite3:execute 
+		 db
+		 (conc "UPDATE test_meta SET " field "=? WHERE testname=?;") value testname))))
+
+(define (db:testmeta-get-all dbstruct)
+  (db:with-db dbstruct #f #f 
+	      (lambda (db)
+		(let ((res '()))
+		  (sqlite3:for-each-row
+		   (lambda (a . b)
+		     (set! res (cons (apply vector a b) res)))
+		   db
+		   "SELECT id,testname,author,owner,description,reviewed,iterated,avg_runtime,avg_disk,tags,jobgroup FROM test_meta;")
+		  res))))
+
+;;======================================================================
+;; M I S C   M A N A G E M E N T   I T E M S 
+;;======================================================================
+
+;; A routine to map itempaths using a itemmap
+;; patha and pathb must be strings or this will fail
+;;
+;; path-b is waiting on path-a
+;;
+(define (db:compare-itempaths test-b-name path-a path-b itemmaps )
+  (debug:print-info 6 *default-log-port* "ITEMMAPS: " itemmaps)
+  (let* ((itemmap    (tests:lookup-itemmap itemmaps test-b-name)))
+    (if itemmap
+	(let ((path-b-mapped (db:multi-pattern-apply path-b itemmap)))
+	  (debug:print-info 6 *default-log-port* "ITEMMAP is " itemmap ", path: " path-b ", mapped path: " path-b-mapped)
+	  (equal? path-a path-b-mapped))
+	(equal? path-b path-a))))
+
+;; A routine to convert test/itempath using a itemmap
+;; NOTE: to process only an itempath (i.e. no prepended testname)
+;;       just call db:multi-pattern-apply
+;;
+(define (db:convert-test-itempath path-in itemmap)
+  (debug:print-info 6 *default-log-port* "ITEMMAP is " itemmap)
+  (let* ((path-parts  (string-split path-in "/"))
+	 (test-name   (if (null? path-parts) "" (car path-parts)))
+	 (item-path   (string-intersperse (if (null? path-parts) '() (cdr path-parts)) "/")))
+    (conc test-name "/" 
+	  (db:multi-pattern-apply item-path itemmap))))
+
+;; patterns are:
+;;    "rx1"  "replacement1"\n
+;;    "rx2"  "replacement2"
+;; etc.
+;;
+(define (db:multi-pattern-apply item-path itemmap)
+  (let ((all-patts (string-split itemmap "\n")))
+    (if (null? all-patts)
+	item-path
+	(let loop ((hed (car all-patts))
+		   (tal (cdr all-patts))
+		   (res item-path))
+	  (let* ((parts (string-split hed))
+		 (patt  (car parts))
+
+		 (repl  (if (> (length parts) 1)(cadr parts) ""))
+
+		 (newr  (if (and patt repl)
+			    (begin
+                              (handle-exceptions
+                               exn
+                               (begin
+                                  (debug:print 0 *default-log-port*
+                                  "WARNING: itemmap has problem \"" itemmap "\", patt: " patt ", repl: " repl ", exn=" exn)
+                                 res)
+                              (string-substitute patt repl res))
+
+
+                              )
+			    (begin
+                              (debug:print 0 *default-log-port*
+                               "WARNING: itemmap has problem \"" itemmap "\", patt: " patt ", repl: " repl)
+			      res))))
+	    (if (null? tal)
+		newr
+		(loop (car tal)(cdr tal) newr)))))))
+
+
+
+
+;; the new prereqs calculation, looks also at itempath if specified
+;; all prereqs must be met
+;;    if prereq test with itempath='' is COMPLETED and PASS, WARN, CHECK, or WAIVED then prereq is met
+;;    if prereq test with itempath=ref-item-path and COMPLETED with PASS, WARN, CHECK, or WAIVED then prereq is met
+;;
+;; Note: mode 'normal means that tests must be COMPLETED and ok (i.e. PASS, WARN, CHECK, SKIP or WAIVED)
+;;       mode 'toplevel means that tests must be COMPLETED only
+;;       mode 'itemmatch or 'itemwait means that tests items must be COMPLETED and (PASS|WARN|WAIVED|CHECK) [[ NB// NOT IMPLEMENTED YET ]]
+;;       mode 'exclusive means this test/item cannot run if the same test/item is LAUNCHED,REMOTEHOSTSTART or RUNNING
+;;
+;; IDEA for consideration:
+;;    1. collect all tests "upstream"
+;;    2. any NOT completed and good? if yes => return those as prereqs not met, if no => return null list
+;; 
+;; (define (db:get-prereqs-not-met dbstruct run-id waitons ref-item-path mode)
+(define (db:get-prereqs-not-met dbstruct run-id waitons ref-test-name ref-item-path mode itemmaps) ;; #!key (mode '(normal))(itemmap #f))
+  ;; BBnote - rollup of an itemized test's overall state/status done in db:set-state-status-and-roll-up-items
+  (append
+   (if (member 'exclusive mode)
+       (let ((running-tests (db:get-tests-for-run dbstruct
+						  #f  ;; run-id of #f means for all runs. 
+						  (if (string=? ref-item-path "")   ;; testpatt
+						      ref-test-name
+						      (conc ref-test-name "/" ref-item-path))
+						  '("LAUNCHED" "REMOTEHOSTSTART" "RUNNING") ;; states
+						  '()          ;; statuses
+						  #f           ;; offset
+						  #f           ;; limit
+						  #f           ;; not-in
+						  #f           ;; sort by
+						  #f           ;; sort order
+						  'shortlist   ;; query type
+						  0            ;; last update, beginning of time ....
+						  #f           ;; mode
+						  )))
+	;;(map (lambda (testdat)
+	;;	(if (equal? (db:test-get-item-path testdat) "")
+	;;	    (db:test-get-testname testdat)
+	;;	    (conc (db:test-get-testname testdat)
+	;;		  "/"
+	;;		  (db:test-get-item-path testdat))))
+	 running-tests) ;; calling functions want the entire data
+       '())
+
+   ;; collection of: for each waiton -
+   ;;   if this ref-test-name is an item in an itemized test and mode is itemwait/itemmatch:
+   ;;     if waiton is not itemized - if waiton is not both completed and in ok status, add as unmet prerequisite
+   ;;     if waiton is itemized:
+   ;;           and waiton's items are not expanded, add as unmet prerequisite
+   ;;           else if matching waiton item is not both completed and in an ok status, add as unmet prerequisite
+   ;;   else
+   ;;    if waiton toplevel is not in both completed and ok status, add as unmet prerequisite
+
+   (if (or (not waitons)
+	   (null? waitons))
+       '()
+       (let* ((ref-test-itemized-mode (not (null? (lset-intersection eq? mode '(itemmatch itemwait))))) ;; how is this different from using member?
+              (ref-test-toplevel-mode (not (null? (lset-intersection eq? mode '(toplevel)))))
+              (ref-test-is-toplevel   (equal? ref-item-path ""))
+              (ref-test-is-item       (not ref-test-is-toplevel))
+              (unmet-pre-reqs '())
+	      (result         '())
+              (unmet-prereq-items '())
+              )
+	 (for-each  ; waitons
+	  (lambda (waitontest-name)
+	    ;; by getting the tests with matching name we are looking only at the matching test 
+	    ;; and related sub items
+	    ;; next should be using mt:get-tests-for-run?
+
+            (let (;(waiton-is-itemized ...)
+                  ;(waiton-items-are-expanded ...)
+                  (waiton-tests             (db:get-tests-for-run-state-status dbstruct run-id waitontest-name))
+		  (ever-seen         #f)
+		  (parent-waiton-met #f)
+		  (item-waiton-met   #f)
+
+                  )
+	      (for-each ; test expanded from waiton
+	       (lambda (waiton-test) 
+		 (let* ((waiton-state             (db:test-get-state waiton-test))
+			(waiton-status            (db:test-get-status waiton-test))
+			(waiton-item-path         (db:test-get-item-path waiton-test)) ;; BB- this is the upstream itempath
+			(waiton-test-name         (db:test-get-testname waiton-test))
+                        (waiton-is-toplevel       (equal? waiton-item-path ""))
+                        (waiton-is-item           (not waiton-is-toplevel))
+			(waiton-is-completed      (member waiton-state  *common:ended-states*))
+			(waiton-is-running        (member waiton-state  *common:running-states*))
+			(waiton-is-killed         (member waiton-state  *common:badly-ended-states*))
+			(waiton-is-ok             (member waiton-status *common:well-ended-states*)) 
+			;;                                              testname-b    path-a    path-b
+			(same-itempath            (db:compare-itempaths ref-test-name waiton-item-path ref-item-path itemmaps)) ;; (equal? ref-item-path waiton-item-path)))
+			(real-ref-test-name       (car (string-split ref-test-name "/"))) ;; I THINK ref-test-name SHOULD NEVER HAVE THE ITEM_PATH!
+			(test-and-ref-are-same    (equal? real-ref-test-name waiton-test-name)))
+		   (debug:print 4 *default-log-port* "waiton-test-name " waiton-test-name " ref-test-name: " ref-test-name " test-and-ref-are-same: " test-and-ref-are-same)
+		   (set! ever-seen #t)
+                   ;;(BB> "***consider waiton "waiton-test"/"waiton-item-path"***")
+                   (cond
+                    ;; case 0 - toplevel of an itemized test, at least one item in prereq has completed
+                    ((and waiton-is-item ref-test-is-toplevel ref-test-itemized-mode waiton-is-completed)
+                     (set! parent-waiton-met #t))
+
+                    ;; case 1, non-item (parent test) is 
+		    ((and waiton-is-toplevel ;; this is the parent test of the waiton being examined
+			  waiton-is-completed
+                          ;;(BB> "cond1")
+			  (or waiton-is-ok ref-test-toplevel-mode)) ;;  itemmatch itemwait))))))
+		     (set! parent-waiton-met #t))
+		    ;; Special case for toplevel and KILLED
+		    ((and waiton-is-toplevel ;; this is the parent test
+			  waiton-is-killed
+			  (member 'toplevel mode))
+                     ;;(BB> "cond2")
+		     (set! parent-waiton-met #t))
+		    ;; For itemwait mode IFF the previous matching item is good the set parent-waiton-met
+                    ((and ref-test-itemized-mode ref-test-is-item same-itempath)
+                     ;;(BB> "cond3")
+		     (if (and waiton-is-completed (or waiton-is-ok ref-test-toplevel-mode)) 
+                         (set! item-waiton-met #t)
+                         (set! unmet-prereq-items (cons waiton-test unmet-prereq-items)))
+                     (if (and waiton-is-toplevel ;; if upstream rollup test is completed, parent-waiton-met is set
+			      (or waiton-is-completed waiton-is-running))
+			 (set! parent-waiton-met #t)))
+		    ;; normal checking of parent items, any parent or parent item not ok blocks running
+		    ((and waiton-is-completed
+			  (or waiton-is-ok 
+			      (member 'toplevel mode))              ;; toplevel does not block on FAIL
+			  (and waiton-is-ok (member 'itemmatch mode) ;; itemmatch blocks on not ok ;; TODO: THIS IS PROBABLY A BUG.  ITEMMATCH AND ITEMWAIT ARE SYNONYMS!! WHAT HAPPENED OT ITEMWAIT???
+                               ))
+                     ;;(BB> "cond4")
+		     (set! item-waiton-met #t))
+                    ((and waiton-is-completed waiton-is-ok same-itempath)
+                     ;;(BB> "cond5")
+                     (set! item-waiton-met #t))
+		    ((and waiton-is-completed waiton-is-ok test-and-ref-are-same) ;; probably from [waitons] table
+		     (set! item-waiton-met #t))
+                    (else
+                     #t
+                     ;;(BB> "condelse")
+                     ))))
+               waiton-tests)
+	      ;; both requirements, parent and item-waiton must be met to NOT add item to
+	      ;; prereq's not met list
+               ;; (BB>
+               ;;  "\n* waiton-tests           "waiton-tests
+               ;;  "\n* parent-waiton-met      "parent-waiton-met
+               ;;  "\n* item-waiton-met        "item-waiton-met
+               ;;  "\n* ever-seen              "ever-seen
+               ;;  "\n* ref-test-itemized-mode "ref-test-itemized-mode
+               ;;  "\n* unmet-prereq-items     "unmet-prereq-items
+               ;;  "\n* result (pre)           "result
+               ;;  "\n* ever-seen              "ever-seen
+               ;;  "\n")
+
+              (cond
+               ((and ref-test-itemized-mode ref-test-is-item (not (null? unmet-prereq-items)))
+                (set! result (append unmet-prereq-items result)))
+               ((not (or parent-waiton-met item-waiton-met))
+                (set! result (append (if (null? waiton-tests) (list waitontest-name) waiton-tests) result))) ;; appends the string if the full record is not available
+	      ;; if the test is not found then clearly the waiton is not met...
+	      ;; (if (not ever-seen)(set! result (cons waitontest-name result)))))
+               ((not ever-seen)
+                (set! result (append (if (null? waiton-tests)(list waitontest-name) waiton-tests) result))))))
+	  waitons)
+	 (delete-duplicates result)))))
+
+;;======================================================================
+;; To sync individual run
+;;======================================================================
+(define (db:get-run-record-ids dbstruct target run keynames test-patt)
+(let ((backcons (lambda (lst item)(cons item lst))))
+    (db:with-db
+     dbstruct #f #f 
+     (lambda (db)
+        (let* ((keystr (string-intersperse 
+		     (map (lambda (key val)
+			    (conc key " like '" val "'"))
+			  keynames 
+			  (string-split target "/"))
+		     " AND "))
+         (run-qry (conc "SELECT id FROM runs  WHERE " keystr  " and runname='" run"'"))
+         (test-qry (conc "SELECT id FROM tests WHERE run_id in (" run-qry ") and testname like '" test-patt "'")))
+         (print run-qry)
+         (print test-qry) 
+	 `((runs       . ,(sqlite3:fold-row backcons '() db run-qry))
+	   (tests      . ,(sqlite3:fold-row backcons '() db test-qry))
+	   (test_steps . ,(sqlite3:fold-row backcons '() db (conc "SELECT id FROM test_steps WHERE test_id in (" test-qry ")")))
+	   (test_data  . ,(sqlite3:fold-row backcons '() db (conc "SELECT id FROM test_data  WHERE test_id in (" test-qry ")" )))
+	   ))))))
+
+;;======================================================================
+;; Just for sync, procedures to make sync easy
+;;======================================================================
+
+;; get an alist of record ids changed since time since-time
+;;   '((runs . (1 2 3 ...))(steps . (5 6 7 ...) ...))
+;;
+(define (db:get-changed-record-ids dbstruct since-time)
+  ;; no transaction, allow the db to be accessed between the big queries
+  (let ((backcons (lambda (lst item)(cons item lst))))
+    (db:with-db
+     dbstruct #f #f 
+     (lambda (db)
+       `((runs       . ,(sqlite3:fold-row backcons '() db "SELECT id FROM runs  WHERE last_update>=?" since-time))
+	 (tests      . ,(sqlite3:fold-row backcons '() db "SELECT id FROM tests WHERE last_update>=?" since-time))
+	 (test_steps . ,(sqlite3:fold-row backcons '() db "SELECT id FROM test_steps WHERE last_update>=?" since-time))
+	 (test_data  . ,(sqlite3:fold-row backcons '() db "SELECT id FROM test_data  WHERE last_update>=?" since-time))
+	 ;; (test_meta  . ,(fold-row backcons '() db "SELECT id FROM test_meta  WHERE last_update>?" since-time))
+	 (run_stats  . ,(sqlite3:fold-row backcons '() db "SELECT id FROM run_stats  WHERE last_update>=?" since-time))
+	 ))))
+
+  )
+
+
+
+
+;;======================================================================
+;; tdb stuff
+;;======================================================================
+
+
+;;======================================================================
+;; Database access
+;;======================================================================
+
+;; (require-extension (srfi 18) extras tcp)
+;; (use sqlite3 srfi-1 posix regex regex-case srfi-69 csv-xml s11n md5 message-digest base64)
+;; (import (prefix sqlite3 sqlite3:))
+;; (import (prefix base64 base64:))
+;; 
+;; (declare (unit tdb))
+;; (declare (uses common))
+;; (declare (uses keys))
+;; (declare (uses ods))
+;; (declare (uses client))
+;; (declare (uses mt))
+;; (declare (uses db))
+;; 
+;; (include "common_records.scm")
+;; (include "db_records.scm")
+;; (include "key_records.scm")
+;; (include "run_records.scm")
+
+;;======================================================================
+;;
+;; T E S T   D A T A B A S E S
+;;
+;;======================================================================
+
+;;======================================================================
+;; T E S T   S P E C I F I C   D B 
+;;======================================================================
+
+;; Create the sqlite db for the individual test(s)
+;;
+;; Moved these tables into <runid>.db
+;; THIS CODE TO BE REMOVED
+;;
+;; (define (open-test-db work-area) 
+;;   (debug:print-info 11 *default-log-port* "open-test-db " work-area)
+;;   (if (and work-area 
+;; 	   (directory? work-area)
+;; 	   (file-readable? work-area))
+;;       (let* ((dbpath              (conc work-area "/testdat.db"))
+;; 	     (dbexists            (common:file-exists? dbpath))
+;; 	     (work-area-writeable (file-writable? work-area))
+;; 	     (db                  (handle-exceptions  ;; open the db if area writeable or db pre-existing. open in-mem otherwise. if exception, open in-mem
+;; 				   exn
+;; 				   (begin
+;; 				     (print-call-chain (current-error-port))
+;; 				     (debug:print 2 *default-log-port* "ERROR: problem accessing test db " work-area ", you probably should clean and re-run this test"
+;; 						  ((condition-property-accessor 'exn 'message) exn))
+;; 				     (set! dbexists #f) ;; must force re-creation of tables, more tom-foolery
+;; 				     (sqlite3:open-database ":memory:")) ;; open an in-memory db to allow readonly access 
+;; 				   (if (or work-area-writeable
+;; 					   dbexists)
+;; 				       (sqlite3:open-database dbpath)
+;; 				       (sqlite3:open-database ":memory:"))))
+;; 	     (tdb-writeable       (and (file-writable? work-area)
+;; 				       (file-writable? dbpath)))
+;; 	     (handler   (sqlite3:make-busy-timeout (if (args:get-arg "-override-timeout")
+;; 						       (string->number (args:get-arg "-override-timeout"))
+;; 						       136000))))
+;; 	
+;; 	(if (and tdb-writeable
+;; 		 *db-write-access*)
+;; 	    (sqlite3:set-busy-handler! db handler))
+;; 	(if (not dbexists)
+;; 	    (begin
+;; 	      (db:set-sync db) ;; (sqlite3:execute db "PRAGMA synchronous = FULL;")
+;; 	      (debug:print-info 11 *default-log-port* "Initialized test database " dbpath)
+;; 	      (tdb:testdb-initialize db)))
+;; 	;; (sqlite3:execute db "PRAGMA synchronous = 0;")
+;; 	(debug:print-info 11 *default-log-port* "open-test-db END (sucessful)" work-area)
+;; 	;; now let's test that everything is correct
+;; 	(handle-exceptions
+;; 	 exn
+;; 	 (begin
+;; 	   (print-call-chain (current-error-port))
+;; 	   (debug:print-error 0 *default-log-port* "problem accessing test db " work-area ", you probably should clean and re-run this test or remove the file " 
+;; 			dbpath ".\n  "
+;; 			((condition-property-accessor 'exn 'message) exn))
+;; 	   #f)
+;; 	 ;; Is there a cheaper single line operation that will check for existance of a table
+;; 	 ;; and raise an exception ?
+;; 	 (sqlite3:execute db "SELECT id FROM test_data LIMIT 1;"))
+;; 	db)
+;;       ;; no work-area or not readable - create a placeholder to fake rest of world out
+;;       (let ((baddb (sqlite3:open-database ":memory:")))
+;;  	(debug:print-info 11 *default-log-port* "open-test-db END (unsucessful)" work-area)
+;;  	;; provide an in-mem db (this is dangerous!)
+;;  	(tdb:testdb-initialize baddb)
+;;  	baddb)))
+
+;; ;; find and open the testdat.db file for an existing test
+;; (define (tdb:open-test-db-by-test-id test-id #!key (work-area #f))
+;;   (let* ((test-path (if work-area
+;; 			work-area
+;; 			(rmt:test-get-rundir-from-test-id test-id))))
+;;     (debug:print 3 *default-log-port* "TEST PATH: " test-path)
+;;     (open-test-db test-path)))
+;; 
+;; ;; find and open the testdat.db file for an existing test
+;; (define (tdb:open-test-db-by-test-id-local dbstruct run-id test-id #!key (work-area #f))
+;;   (let* ((test-path (if work-area
+;; 			work-area
+;; 			(db:test-get-rundir-from-test-id dbstruct run-id test-id))))
+;;     (debug:print 3 *default-log-port* "TEST PATH: " test-path)
+;;     (open-test-db test-path)))
+;; 
+;; ;; find and open the testdat.db file for an existing test
+;; (define (tdb:open-run-close-db-by-test-id-local dbstruct run-id test-id work-area proc . params)
+;;   (let* ((test-path (if work-area
+;; 			work-area
+;; 			(db:test-get-rundir-from-test-id dbstruct run-id test-id)))
+;; 	 (tdb        (open-test-db test-path)))
+;;     (apply proc tdb params)))
+
+;; (define (tdb:testdb-initialize db)
+;;   (debug:print 11 *default-log-port* "db:testdb-initialize START")
+;;   (sqlite3:with-transaction
+;;    db
+;;    (lambda ()
+;;      (for-each
+;;       (lambda (sqlcmd)
+;; 	(sqlite3:execute db sqlcmd))
+;;       (list "CREATE TABLE IF NOT EXISTS test_rundat (
+;;               id INTEGER PRIMARY KEY,
+;;               update_time TIMESTAMP,
+;;               cpuload INTEGER DEFAULT -1,
+;;               diskfree INTEGER DEFAULT -1,
+;;               diskusage INTGER DEFAULT -1,
+;;               run_duration INTEGER DEFAULT 0);"
+;; 	    "CREATE TABLE IF NOT EXISTS test_data (
+;;               id INTEGER PRIMARY KEY,
+;;               test_id INTEGER,
+;;               category TEXT DEFAULT '',
+;;               variable TEXT,
+;; 	      value REAL,
+;; 	      expected REAL,
+;; 	      tol REAL,
+;;               units TEXT,
+;;               comment TEXT DEFAULT '',
+;;               status TEXT DEFAULT 'n/a',
+;;               type TEXT DEFAULT '',
+;;               CONSTRAINT test_data_constraint UNIQUE (test_id,category,variable));"
+;; 	    "CREATE TABLE IF NOT EXISTS test_steps (
+;;               id INTEGER PRIMARY KEY,
+;;               test_id INTEGER, 
+;;               stepname TEXT, 
+;;               state TEXT DEFAULT 'NOT_STARTED', 
+;;               status TEXT DEFAULT 'n/a',
+;;               event_time TIMESTAMP,
+;;               comment TEXT DEFAULT '',
+;;               logfile TEXT DEFAULT '',
+;;               CONSTRAINT test_steps_constraint UNIQUE (test_id,stepname,state));"
+;; 	    ;; test_meta can be used for handing commands to the test
+;; 	    ;; e.g. KILLREQ
+;; 	    ;;      the ackstate is set to 1 once the command has been completed
+;; 	    "CREATE TABLE IF NOT EXISTS test_meta (
+;;               id INTEGER PRIMARY KEY,
+;;               var TEXT,
+;;               val TEXT,
+;;               ackstate INTEGER DEFAULT 0,
+;;               CONSTRAINT metadat_constraint UNIQUE (var));"))))
+;;   (debug:print 11 *default-log-port* "db:testdb-initialize END"))
+
+;; This routine moved to db:read-test-data
+;;
+(define (tdb:read-test-data tdb test-id categorypatt)
+  (let ((res '()))
+    (sqlite3:for-each-row 
+     (lambda (id test_id category variable value expected tol units comment status type)
+       (set! res (cons (vector id test_id category variable value expected tol units comment status type) res)))
+     tdb
+     "SELECT id,test_id,category,variable,value,expected,tol,units,comment,status,type FROM test_data WHERE test_id=? AND category LIKE ? ORDER BY category,variable;" test-id categorypatt)
+    (sqlite3:finalize! tdb)
+    (reverse res)))
+
+;;======================================================================
+;; T E S T   D A T A 
+;;======================================================================
+
+;; ;; get a list of test_data records matching categorypatt
+;; (define (tdb:read-test-data test-id categorypatt #!key (work-area #f))
+;;   (let ((tdb  (tdb:open-test-db-by-test-id test-id work-area: work-area)))
+;;     (if (sqlite3:database? tdb)
+;; 	(let ((res '()))
+;; 	  (sqlite3:for-each-row 
+;; 	   (lambda (id test_id category variable value expected tol units comment status type)
+;; 	     (set! res (cons (vector id test_id category variable value expected tol units comment status type) res)))
+;; 	   tdb
+;; 	   "SELECT id,test_id,category,variable,value,expected,tol,units,comment,status,type FROM test_data WHERE test_id=? AND category LIKE ? ORDER BY category,variable;" test-id categorypatt)
+;; 	  (sqlite3:finalize! tdb)
+;; 	  (reverse res))
+;; 	'())))
+
+(define (tdb:get-prev-tol-for-test tdb test-id category variable)
+  ;; Finish me?
+  (values #f #f #f))
+
+;;======================================================================
+;; S T E P S 
+;;======================================================================
+
+(define (tdb:step-get-time-as-string vec)
+  (seconds->time-string (tdb:step-get-event_time vec)))
+
+;; get a pretty table to summarize steps
+;; 
+;; NOT USED, WILL BE REMOVED
+;;
+(define (tdb:get-steps-table steps);; organise the steps for better readability
+  (let ((res (make-hash-table)))
+    (for-each 
+     (lambda (step)
+       (debug:print 6 *default-log-port* "step=" step)
+       (let ((record (hash-table-ref/default 
+		      res 
+		      (tdb:step-get-stepname step) 
+		      ;;        stepname                start end status Duration  Logfile 
+		      (vector (tdb:step-get-stepname step) ""   "" ""     ""        ""))))
+	 (debug:print 6 *default-log-port* "record(before) = " record 
+		      "\nid:       " (tdb:step-get-id step)
+		      "\nstepname: " (tdb:step-get-stepname step)
+		      "\nstate:    " (tdb:step-get-state step)
+		      "\nstatus:   " (tdb:step-get-status step)
+		      "\ntime:     " (tdb:step-get-event_time step))
+	 (case (string->symbol (tdb:step-get-state step))
+	   ((start)(vector-set! record 1 (tdb:step-get-event_time step))
+	    (vector-set! record 3 (if (equal? (vector-ref record 3) "")
+				      (tdb:step-get-status step)))
+	    (if (> (string-length (tdb:step-get-logfile step))
+		   0)
+		(vector-set! record 5 (tdb:step-get-logfile step))))
+	   ((end)  
+	    (vector-set! record 2 (any->number (tdb:step-get-event_time step)))
+	    (vector-set! record 3 (tdb:step-get-status step))
+	    (vector-set! record 4 (let ((startt (any->number (vector-ref record 1)))
+					(endt   (any->number (vector-ref record 2))))
+				    (debug:print 4 *default-log-port* "record[1]=" (vector-ref record 1) 
+						 ", startt=" startt ", endt=" endt
+						 ", get-status: " (tdb:step-get-status step))
+				    (if (and (number? startt)(number? endt))
+					(seconds->hr-min-sec (- endt startt)) "-1")))
+	    (if (> (string-length (tdb:step-get-logfile step))
+		   0)
+		(vector-set! record 5 (tdb:step-get-logfile step))))
+	   (else
+	    (vector-set! record 2 (tdb:step-get-state step))
+	    (vector-set! record 3 (tdb:step-get-status step))
+	    (vector-set! record 4 (tdb:step-get-event_time step))))
+	 (hash-table-set! res (tdb:step-get-stepname step) record)
+	 (debug:print 6 *default-log-port* "record(after)  = " record 
+		      "\nid:       " (tdb:step-get-id step)
+		      "\nstepname: " (tdb:step-get-stepname step)
+		      "\nstate:    " (tdb:step-get-state step)
+		      "\nstatus:   " (tdb:step-get-status step)
+		      "\ntime:     " (tdb:step-get-event_time step))))
+     ;; (else   (vector-set! record 1 (tdb:step-get-event_time step)))
+     (sort steps (lambda (a b)
+		   (cond
+		    ((<   (tdb:step-get-event_time a)(tdb:step-get-event_time b)) #t)
+		    ((eq? (tdb:step-get-event_time a)(tdb:step-get-event_time b)) 
+		     (<   (tdb:step-get-id a)        (tdb:step-get-id b)))
+		    (else #f)))))
+    res))
+
+;; Move this to steps.scm
+;;
+;; get a pretty table to summarize steps
+;;
+(define (tdb:get-steps-table-list steps)
+  ;; organise the steps for better readability
+  (let ((res (make-hash-table)))
+    (for-each 
+     (lambda (step)
+       (debug:print 6 *default-log-port* "step=" step)
+       (let ((record (hash-table-ref/default 
+		      res 
+		      (tdb:step-get-stepname step) 
+		      ;;        stepname                start end status    
+		      (vector (tdb:step-get-stepname step) ""   "" ""     "" ""))))
+	 (debug:print 6 *default-log-port* "record(before) = " record 
+		      "\nid:       " (tdb:step-get-id step)
+		      "\nstepname: " (tdb:step-get-stepname step)
+		      "\nstate:    " (tdb:step-get-state step)
+		      "\nstatus:   " (tdb:step-get-status step)
+		      "\ntime:     " (tdb:step-get-event_time step))
+	 (case (string->symbol (tdb:step-get-state step))
+	   ((start)(vector-set! record 1 (tdb:step-get-event_time step))
+	    (vector-set! record 3 (if (equal? (vector-ref record 3) "")
+				      (tdb:step-get-status step)))
+	    (if (> (string-length (tdb:step-get-logfile step))
+		   0)
+		(vector-set! record 5 (tdb:step-get-logfile step))))
+	   ((end)  
+	    (vector-set! record 2 (any->number (tdb:step-get-event_time step)))
+	    (vector-set! record 3 (tdb:step-get-status step))
+	    (vector-set! record 4 (let ((startt (any->number (vector-ref record 1)))
+					(endt   (any->number (vector-ref record 2))))
+				    (debug:print 4 *default-log-port* "record[1]=" (vector-ref record 1) 
+						 ", startt=" startt ", endt=" endt
+						 ", get-status: " (tdb:step-get-status step))
+				    (if (and (number? startt)(number? endt))
+					(seconds->hr-min-sec (- endt startt)) "-1")))
+	    (if (> (string-length (tdb:step-get-logfile step))
+		   0)
+		(vector-set! record 5 (tdb:step-get-logfile step))))
+	   (else
+	    (vector-set! record 2 (tdb:step-get-state step))
+	    (vector-set! record 3 (tdb:step-get-status step))
+	    (vector-set! record 4 (tdb:step-get-event_time step))))
+	 (hash-table-set! res (tdb:step-get-stepname step) record)
+	 (debug:print 6 *default-log-port* "record(after)  = " record 
+		      "\nid:       " (tdb:step-get-id step)
+		      "\nstepname: " (tdb:step-get-stepname step)
+		      "\nstate:    " (tdb:step-get-state step)
+		      "\nstatus:   " (tdb:step-get-status step)
+		      "\ntime:     " (tdb:step-get-event_time step))))
+     ;; (else   (vector-set! record 1 (tdb:step-get-event_time step)))
+     (sort steps (lambda (a b)
+		   (cond
+		    ((<   (tdb:step-get-event_time a)(tdb:step-get-event_time b)) #t)
+		    ((eq? (tdb:step-get-event_time a)(tdb:step-get-event_time b)) 
+		     (<   (tdb:step-get-id a)        (tdb:step-get-id b)))
+		    (else #f)))))
+    res))
+
+;;
+;; Move to steps.scm
+;;
+(define (tdb:get-compressed-steps comprsteps) ;; from tdb:get-steps-table
+  (map (lambda (x)
+	 ;; take advantage of the \n on time->string
+	 (vector
+	  (vector-ref x 0)
+	  (let ((s (vector-ref x 1)))
+	    (if (number? s)(seconds->time-string s) s))
+	  (let ((s (vector-ref x 2)))
+	    (if (number? s)(seconds->time-string s) s))
+	  (vector-ref x 3)    ;; status
+	  (vector-ref x 4)
+	  (vector-ref x 5)))  ;; time delta
+       (sort (hash-table-values comprsteps)
+	     (lambda (a b)
+	       (let ((time-a (vector-ref a 1))
+		     (time-b (vector-ref b 1)))
+		 (if (and (number? time-a)(number? time-b))
+		     (if (< time-a time-b)
+			 #t
+			 (if (eq? time-a time-b)
+			     (string<? (conc (vector-ref a 2))
+				       (conc (vector-ref b 2)))
+			     #f))
+		     (string<? (conc time-a)(conc time-b))))))))
+
+;; 
+;; (define (tdb:remote-update-testdat-meta-info run-id test-id work-area cpuload diskfree minutes)
+;;   (let ((tdb         (rmt:open-test-db-by-test-id run-id test-id work-area: work-area)))
+;;     (if (sqlite3:database? tdb)
+;; 	(begin
+;; 	  (sqlite3:execute tdb "INSERT INTO test_rundat (update_time,cpuload,diskfree,run_duration) VALUES (strftime('%s','now'),?,?,?);"
+;; 			   cpuload diskfree minutes)
+;; 	  (sqlite3:finalize! tdb))
+;; 	(debug:print 2 *default-log-port* "Can't update testdat.db for test " test-id " read-only or non-existant"))))
+;;     
+;; 
+
+;;======================================================================
+;;  T R I G G E R S
+;;======================================================================
+
+(define (mt:run-trigger cmd test-id test-rundir trigger logname test-name item-path event-time actual-state actual-status)
+  ;; Putting the commandline into ( )'s means no control over the shell. 
+  ;; stdout and stderr will be caught in the NBFAKE or mt_launch.log files
+  ;; or equivalent. No need to do this. Just run it?
+  (let* ((fullcmd (conc "nbfake "
+			cmd           " "
+			test-id       " "
+			test-rundir   " "
+			trigger       " "
+			test-name     " "
+			item-path     " " ;; has / prepended to deal with toplevel tests
+			actual-state  " "
+			actual-status " "
+			event-time
+			))
+	 (prev-nbfake-log (get-environment-variable "NBFAKE_LOG")))
+    (setenv "NBFAKE_LOG" (conc (cond
+				((and (directory-exists? test-rundir)
+				      (file-writable? test-rundir))
+				 test-rundir)
+				((and (directory-exists? *toppath*)
+				      (file-writable? *toppath*))
+				 *toppath*)
+				(else (conc "/tmp/" (current-user-name))))
+			       "/" logname))
+    (debug:print-info 0 *default-log-port* "TRIGGERED on " trigger ", running command " fullcmd " output at " (get-environment-variable "NBFAKE_LOG"))
+    ;; (call-with-environment-variables
+    ;;  `(("NBFAKE_LOG" . ,(conc test-rundir "/" logname)))
+    ;;  (lambda ()
+    (process-run fullcmd)
+    (if prev-nbfake-log
+	(setenv "NBFAKE_LOG" prev-nbfake-log)
+	(unsetenv "NBFAKE_LOG"))
+    )) ;; ))
+
+(define (mt:process-triggers dbstruct run-id test-id newstate newstatus)
+  (if test-id 
+      (let* ((test-dat      (db:get-test-info-by-id dbstruct run-id test-id)))
+	(if test-dat
+	    (let* ((test-rundir   (db:test-get-rundir       test-dat)) ;; ) ;; )
+		   (test-name     (db:test-get-testname     test-dat))
+		   (item-path     (db:test-get-item-path    test-dat))
+		   (duration      (db:test-get-run_duration test-dat))
+		   (comment       (db:test-get-comment      test-dat))
+		   (event-time    (db:test-get-event_time   test-dat))
+		   (tconfig       #f)
+		   (state         (if newstate  newstate  (db:test-get-state  test-dat)))
+		   (status        (if newstatus newstatus (db:test-get-status test-dat))))
+	      ;; (mutex-lock! *triggers-mutex*)
+              (handle-exceptions
+               exn
+               (begin
+                 (debug:print-error 0 *default-log-port* " Exception in mt:process-triggers for run-id="run-id" test-id="test-id" newstate="newstate" newstatus="newstatus
+                                    "\n   error: " ((condition-property-accessor 'exn 'message) exn) ", exn=" exn
+                                    "\n   test-rundir="test-rundir
+                                    "\n   test-name="test-name
+                                    "\n   item-path="item-path
+                                    "\n   state="state
+                                    "\n   status="status
+                                    "\n")
+                 (print-call-chain (current-error-port))
+                 #f)
+               (if (and test-name
+                        test-rundir)   ;; #f means no dir set yet
+                   ;; (common:file-exists? test-rundir)
+                   ;; (directory? test-rundir))
+                   (call-with-environment-variables
+                    (list (cons "MT_TEST_NAME"    (or test-name "no such test"))
+                          (cons "MT_TEST_RUN_DIR" (or test-rundir "no test directory yet"))
+                          (cons "MT_ITEMPATH"     (or item-path "")))
+                    (lambda ()
+                      (if (directory-exists? test-rundir)
+                          (push-directory test-rundir)
+                          (push-directory *toppath*))
+                      (set! tconfig (mt:lazy-read-test-config test-name))
+                      (for-each (lambda (trigger)
+                                  (let* ((munged-trigger (string-translate trigger "/ " "--"))
+					(logname        (conc "last-trigger-" munged-trigger ".log")))
+                                    ;; first any triggers from the testconfig
+                                    (let ((cmd  (configf:lookup tconfig "triggers" trigger)))
+                                      (if cmd (mt:run-trigger cmd test-id test-rundir trigger (conc "tconfig-" logname) test-name item-path event-time state status)))
+                                    ;; next any triggers from megatest.config
+                                    (let ((cmd  (configf:lookup *configdat* "triggers" trigger)))
+                                      (if cmd (mt:run-trigger cmd test-id test-rundir trigger (conc "mtconfig-" logname) test-name item-path event-time state status)))))
+                                (list
+                                 (conc state "/" status)
+                                 (conc state "/")
+                                 (conc "/" status)))
+		     (pop-directory))
+                    )))
+	      ;; (mutex-unlock! *triggers-mutex*)
+	      )))))
+
+
+(define (mt:lazy-read-test-config test-name)
+  (let ((tconf (hash-table-ref/default *testconfigs* test-name #f)))
+    (if tconf
+	tconf
+	(let ((test-dirs (tests:get-tests-search-path *configdat*)))
+	  (let loop ((hed (car test-dirs))
+		     (tal (cdr test-dirs)))
+	    ;; Setting MT_LINKTREE here is almost certainly unnecessary. 
+	    (let ((tconfig-file (conc hed "/" test-name "/testconfig")))
+	      (if (and (common:file-exists? tconfig-file)
+		       (file-readable? tconfig-file))
+		  (let ((link-tree-path (common:get-linktree)) ;; (configf:lookup *configdat* "setup" "linktree"))
+			(old-link-tree  (get-environment-variable "MT_LINKTREE"))
+			(bigmodenv      (module-environment 'bigmod)))
+		    (if link-tree-path (setenv "MT_LINKTREE" link-tree-path))
+		    (let ((newtcfg (configf:read-config tconfig-file #f #f env-to-use: bigmodenv))) ;; NOTE: Does NOT run [system ...]
+		      (hash-table-set! *testconfigs* test-name newtcfg)
+		      (if old-link-tree 
+			  (setenv "MT_LINKTREE" old-link-tree)
+			  (unsetenv "MT_LINKTREE"))
+		      newtcfg))
+		  (if (null? tal)
+		      (begin
+			(debug:print-error 0 *default-log-port* "No readable testconfig found for " test-name)
+			#f)
+		      (loop (car tal)(cdr tal))))))))))
+
+
+(define (mt:get-run-stats dbstruct run-id)
+;;  Get run stats from local access, move this ... but where?
+  (db:get-run-stats dbstruct run-id))
+
+
+;; When using zmq this would send the message back (two step process)
+;; with spiffy or rpc this simply returns the return data to be returned
+;; 
+(define (server:reply return-addr query-sig success/fail result)
+  (debug:print-info 11 *default-log-port* "server:reply return-addr=" return-addr ", result=" result)
+  (db:obj->string (vector success/fail query-sig result)))
+
+
+(define (common:with-queue-db mtconf proc #!key (use-lt #f)(toppath-in #f))
+  (let* ((pktsdirs (common:get-pkts-dirs mtconf use-lt))
+	 (pktsdir  (if pktsdirs (car pktsdirs) #f))
+	 (toppath  (or (configf:lookup mtconf "scratchdat" "toppath")
+		       toppath-in))
+	 (pdbpath  (or (configf:lookup mtconf "setup"  "pdbpath") pktsdir)))
+    (cond
+     ((not (and  pktsdir toppath pdbpath))
+      (debug:print 0 *default-log-port* "ERROR: settings are missing in your megatest.config for area management.")
+      (debug:print  0 *default-log-port* "  you need to have pktsdirs in the [setup] section."))
+     ((not (common:file-exists? pktsdir))
+      (debug:print 0 *default-log-port* "ERROR: pkts directory not found " pktsdir))
+     ((not (equal? (file-owner pktsdir)(current-effective-user-id)))
+      (debug:print 0 *default-log-port* "ERROR: directory " pktsdir " is not owned by " (current-effective-user-name)))
+     (else
+	(let* ((pdb  (open-queue-db pdbpath "pkts.db"
+				    schema: '("CREATE TABLE groups (id INTEGER PRIMARY KEY,groupname TEXT, CONSTRAINT group_constraint UNIQUE (groupname));"))))
+	  (proc pktsdirs pktsdir pdb)
+	  (dbi:close pdb))))))
+
+(define (common:load-pkts-to-db mtconf #!key (use-lt #f))
+  (common:with-queue-db
+   mtconf
+   (lambda (pktsdirs pktsdir pdb)
+     (for-each
+      (lambda (pktsdir) ;; look at all
+	(cond
+	 ((not (common:file-exists? pktsdir))
+	  (debug:print 0 *default-log-port* "ERROR: packets directory " pktsdir " does not exist."))
+	 ((not (directory? pktsdir))
+	  (debug:print 0 *default-log-port* "ERROR: packets directory path " pktsdir " is not a directory."))
+	 ((not (file-readable? pktsdir))
+	  (debug:print 0 *default-log-port* "ERROR: packets directory path " pktsdir " is not readable."))
+	 (else
+	  (debug:print-info 0 *default-log-port* "Loading packets found in " pktsdir)
+	  (let ((pkts (glob (conc pktsdir "/*.pkt"))))
+	    (for-each
+	     (lambda (pkt)
+	       (let* ((uuid    (cadr (string-match ".*/([0-9a-f]+).pkt" pkt)))
+		      (exists  (lookup-by-uuid pdb uuid #f)))
+		 (if (not exists)
+		     (let* ((pktdat (string-intersperse
+				     (with-input-from-file pkt read-lines)
+				     "\n"))
+			    (apkt   (pkt->alist pktdat))
+			    (ptype  (alist-ref 'T apkt)))
+		       (add-to-queue pdb pktdat uuid (or ptype 'cmd) #f 0)
+		       (debug:print 4 *default-log-port* "Added " uuid " of type " ptype " to queue"))
+		     (debug:print 4 *default-log-port* "pkt: " uuid " exists, skipping...")
+		     )))
+	     pkts)))))
+      pktsdirs))
+   use-lt: use-lt))
+
+;; ;; open an sql database inside a file lock
+;; ;; returns: db existed-prior-to-opening
+;; ;; RA => Returns a db handler; sets the lock if opened in writable mode
+;; ;;
+;; ;; (define *db-open-mutex* (make-mutex))
+;; 
+;; (define (db:lock-create-open fname initproc)
+;;   (let* ((parent-dir   (or (pathname-directory fname)(current-directory))) ;; no parent? go local
+;;          (raw-fname    (pathname-file fname))
+;; 	 (dir-writable (file-writable? parent-dir))
+;; 	 (file-exists  (common:file-exists? fname))
+;; 	 (file-write   (if file-exists
+;; 			   (file-writable? fname)
+;; 			   dir-writable )))
+;;     ;; (mutex-lock! *db-open-mutex*) ;; tried this mutex, not clear it helped.
+;;     (if file-write ;; dir-writable
+;; 	(condition-case
+;;          (let* ((lockfname   (conc fname ".lock"))
+;;                 (readyfname  (conc parent-dir "/.ready-" raw-fname))
+;;                 (readyexists (common:file-exists? readyfname)))
+;;            (if (not readyexists)
+;;                (common:simple-file-lock-and-wait lockfname))
+;;            (let ((db      (sqlite3:open-database fname)))
+;;              (sqlite3:set-busy-handler! db (sqlite3:make-busy-timeout 136000))
+;;              (sqlite3:execute db "PRAGMA synchronous = 0;")
+;;              #;(if (and (configf:lookup *configdat* "setup" "tmp_mode") (string-match "^/tmp/.*" fname))
+;;                  (begin
+;;                    ;;(print "DEBUG: Setting tmp_mode for " fname) 
+;;                    (sqlite3:execute db (configf:lookup *configdat* "setup" "tmp_mode"))
+;;                    )
+;;                  )  
+;;              #;(if (and (configf:lookup *configdat* "setup" "nfs_mode") (not (string-match "^/tmp/.*" fname)))
+;;                  (begin
+;;                    ;;(print "DEBUG: Setting nfs_mode for " fname)
+;;                    (sqlite3:execute db (configf:lookup *configdat* "setup" "nfs_mode"))
+;;                    )
+;;                  )  
+;;              #;(if (and (not (or (configf:lookup *configdat* "setup" "tmp_mode") (configf:lookup *configdat* "setup" "nfs_mode")))  
+;;                       (configf:lookup *configdat* "setup" "use-wal")
+;;                       (string-match "^/tmp/.*" fname)) ;; this is a file in /tmp
+;;                  (sqlite3:execute db "PRAGMA journal_mode=WAL;")
+;;                  (debug:print 2 *default-log-port* "Creating " fname " in NON-WAL mode."))
+;;              (if (not file-exists)
+;;                  (initproc db))
+;;              (if (not readyexists)
+;;                  (begin
+;;                    (common:simple-file-release-lock lockfname)
+;;                    (with-output-to-file
+;;                        readyfname
+;;                      (lambda ()
+;;                        (print "Ready at " 
+;;                               (seconds->year-work-week/day-time 
+;;                                (current-seconds)))))))
+;;              db))
+;;          (exn (io-error)  (debug:print 0 *default-log-port* "ERROR: i/o error with " fname ". Check permissions, disk space etc. and try again."))
+;;          (exn (corrupt)   (debug:print 0 *default-log-port* "ERROR: database " fname " is corrupt. Repair it to proceed."))
+;;          (exn (busy)      (debug:print 0 *default-log-port* "ERROR: database " fname " is locked. Try copying to another location, remove original and copy back."))
+;;          (exn (permission)(debug:print 0 *default-log-port* "ERROR: database " fname " has some permissions problem."))
+;;          (exn () (debug:print 0 *default-log-port* "ERROR: Unknown error with database " fname " message: " ((condition-property-accessor 'exn 'message) exn))))
+;;         
+;; 	(condition-case
+;;          (begin
+;;            (debug:print 2 *default-log-port* "WARNING: opening db in non-writable dir " fname)
+;;            (let ((db (sqlite3:open-database fname)))
+;;              (sqlite3:set-busy-handler! db (sqlite3:make-busy-timeout 136000))
+;;              (sqlite3:execute db "PRAGMA synchronous = 0;")
+;; 	     ;; (mutex-unlock! *db-open-mutex*)
+;;              db))
+;;          (exn (io-error)  (debug:print 0 *default-log-port* "ERROR: i/o error with " fname ". Check permissions, disk space etc. and try again."))
+;;          (exn (corrupt)   (debug:print 0 *default-log-port* "ERROR: database " fname " is corrupt. Repair it to proceed."))
+;;          (exn (busy)      (debug:print 0 *default-log-port* "ERROR: database " fname " is locked. Try copying to another location, remove original and copy back."))
+;;          (exn (permission)(debug:print 0 *default-log-port* "ERROR: database " fname " has some permissions problem."))
+;;          (exn () (debug:print 0 *default-log-port* "ERROR: Unknown error with database " fname " message: " ((condition-property-accessor 'exn 'message) exn))))
+;; 	)))
+
+
+;; ;; This routine creates the db if not already present. It is only called if the db is not already opened
+;; ;;
+;; (define (db:open-db dbstruct run-id)
+;;   (let* ((max-stale-tmp (configf:lookup-number *configdat* "server" "filling-db-max-stale-seconds" default: 10))
+;; 	 (dbpath       (common:get-db-tmp-area ))      ;; path to tmp db area
+;; 	 (dbexists     (common:file-exists? dbpath))
+;; 	 (tmpdbfname   (conc dbpath "/megatest.db"))
+;; 	 (dbfexists    (common:file-exists? tmpdbfname))  ;; (conc dbpath "/megatest.db")))
+;; 	 (mtdbexists   (common:file-exists? (conc *toppath* "/megatest.db")))
+;; 	 
+;; 	 (mtdbmodtime  (if mtdbexists (common:lazy-sqlite-db-modification-time (conc *toppath* "/megatest.db"))   #f))
+;; 	 (tmpdbmodtime (if dbfexists  (common:lazy-sqlite-db-modification-time tmpdbfname) #f)) 
+;; 	 (mtdb         (db:open-megatest-db))
+;; 	 (mtdbpath     (db:dbdat-get-path mtdb))
+;; 	 (tmpdb        (db:open-megatest-db path: dbpath)) ;; lock-create-open dbpath db:initialize-main-db))
+;; 	 (refndb       (db:open-megatest-db path: dbpath name: "megatest_ref.db"))
+;; 	 (write-access (file-writable? mtdbpath))
+;; 	 (modtimedelta (and mtdbmodtime tmpdbmodtime (- mtdbmodtime tmpdbmodtime))))
+;; 
+;;           (when write-access
+;;             (sqlite3:execute (car mtdb) "drop trigger if exists update_tests_trigger")
+;;             (sqlite3:execute (car mtdb) "drop trigger if exists update_runs_trigger"))
+;;           
+;; 	  (if (and dbexists (not write-access))
+;;               (begin
+;;                 (set! *db-write-access* #f)
+;;                 (dbr:dbstruct-read-only-set! dbstruct #t)))
+;;           (dbr:dbstruct-mtdb-set!   dbstruct mtdb)
+;;           (dbr:dbstruct-tmpdb-set!  dbstruct tmpdb)
+;;           (if (and  (or (not dbfexists)
+;; 			(and modtimedelta
+;; 			     (> modtimedelta max-stale-tmp))) ;; if db in tmp is over ten seconds older than the file in MTRA then do a sync back
+;; 		    do-sync)
+;; 	      (begin
+;; 		(debug:print 1 *default-log-port* "filling db " (db:dbdat-get-path tmpdb) " with data \n    from " (db:dbdat-get-path mtdb) " mod time delta: " modtimedelta)
+;; 		(db:sync-tables (db:sync-all-tables-list dbstruct) #f mtdb refndb tmpdb)
+;; 		;; touch tmp db to avoid wal mode wierdness  
+;; 		(set-file-times! tmpdbfname (current-seconds))  
+;;                 (debug:print-info 13 *default-log-port* "db:sync-all-tables-list done.")
+;;                 )
+;; 	      (debug:print 4 *default-log-port* " db, " (db:dbdat-get-path tmpdb) " already exists or fresh enough, not propogating data from\n     " (db:dbdat-get-path mtdb) " mod time delta: " modtimedelta) )
+;; 	  ;; (db:multi-db-sync dbstruct 'old2new))  ;; migrate data from megatest.db automatically
+;;           tmpdb))))
+
+;; Open the classic megatest.db file (defaults to open in toppath)
+;;
+;;   NOTE: returns a dbdat not a dbstruct!
+;;
+
+;;(define (db:reopen-megatest-db
+
+;;======================================================================
+;; K E E P   F I L E D B   I N   dbstruct
+;;======================================================================
+
+;; (define (db:get-filedb dbstruct run-id)
+;;   (let ((db (vector-ref dbstruct 2)))
+;;     (if db
+;; 	db
+;; 	(let ((fdb (filedb:open-db (conc *toplevel* "/db/files.db"))))
+;; 	  (vector-set! dbstruct 2 fdb)
+;; 	  fdb))))
+;; 
+;; ;; Can also be used to save arbitrary strings
+;; ;;
+;; (define (db:save-path dbstruct path)
+;;   (let ((fdb (db:get-filedb dbstruct)))b
+;;     (filedb:register-path fdb path)))
+;; 
+;; ;; Use to get a path. To get an arbitrary string see next define
+;; ;;
+;; (define (db:get-path dbstruct id)
+;;   (let ((fdb (db:get-filedb dbstruct)))
+;;     (filedb:get-path db id)))
+
+;;======================================================================
+;; alist-of-alists
+;;======================================================================
 ;; 
-;; (define (set-functions dbgp dbgpinfo)
-;;   (set! debug:print dbgp)
-;;   (set! debug:print-info dbgpinfo))
+;; (define (db:aa-set! dat key1 key2 val)
+;;   (let loop ((
+
+;;======================================================================
+;; hash of hashs
+;;======================================================================
+
+(define (db:hoh-set! dat key1 key2 val)
+  (let* ((subhash (hash-table-ref/default dat key1 #f)))
+    (if subhash
+	(hash-table-set! subhash key2 val)
+	(begin
+	  (hash-table-set! dat key1 (make-hash-table))
+	  (db:hoh-set! dat key1 key2 val)))))
+
+(define (db:hoh-get dat key1 key2)
+  (let* ((subhash (hash-table-ref/default dat key1 #f)))
+    (and subhash
+	 (hash-table-ref/default subhash key2 #f))))
+
+(define (db:get-cache-stmth dbstruct db stmt)
+  (let* ((stmt-cache        (dbr:dbstruct-stmt-cache dbstruct))
+	 (stmth             (db:hoh-get stmt-cache db stmt)))
+    (or stmth
+	(let* ((newstmth (sqlite3:prepare db stmt)))
+	  (db:hoh-set! stmt-cache db stmt newstmth)
+	  newstmth))))
+
+;;======================================================================
+;; S E R V E R   R E C O R D S
+;;======================================================================
+
+;; these are all intended to be run against main.db
+
+;; run this one in a transaction where first check if host:port is taken
+(define (db:register-server dbstruct host port servkey pid ipaddr dbpath)
+  (db:with-db
+   dbstruct
+   #f #f
+   (lambda (db)
+     (sqlite3:execute db "INSERT INTO servers (host,port,servkey,pid,ipaddr,dbpath) VALUES (?,?,?,?,?,?);"
+		      host port servkey pid ipaddr dbpath))))
+
+(define (db:get-server-info dbstruct apath dbname)
+  (db:with-db
+   dbstruct
+   #f #f
+   (lambda (db)
+     (sqlite3:fold-row
+      (lambda (res host port servkey pid ipaddr dbpath)
+	(list host port servkey pid ipaddr dbpath))
+      #f
+      db
+      "SELECT host,port,servkey,pid,ipaddr,dbpath FROM servers WHERE dbpath=?;"
+      (conc apath "/" dbname)))))
 
 )

ADDED   debugprint.scm
Index: debugprint.scm
==================================================================
--- /dev/null
+++ debugprint.scm
@@ -0,0 +1,109 @@
+(declare (unit debugprint))
+(declare (uses mtargs))
+
+(module debugprint
+	*
+	
+;;(import scheme chicken data-structures extras files ports)
+(import scheme
+	chicken.base
+	chicken.string
+	chicken.port
+	mtargs
+	srfi-1
+	)
+
+;;======================================================================
+;; debug stuff
+;;======================================================================
+
+(define verbosity (make-parameter '()))
+(define *default-log-port*  (current-error-port))
+	 
+;;======================================================================
+;; (define (debug:print . params) #f)
+;; (define (debug:print-info . params) #f)
+;; 
+;; (define (set-functions dbgp dbgpinfo)
+;;   (set! debug:print dbgp)
+;;   (set! debug:print-info dbgpinfo))
+
+;;======================================================================
+;; this was cached based on results from profiling but it turned out the profiling
+;; somehow went wrong - perhaps too many processes writing to it. Leaving the caching
+;; in for now but can probably take it out later.
+;;
+(define (debug:calc-verbosity vstr arg) ;; arg is 'v (verbose) or 'q (quiet)
+  (let* ((res (cond
+	       ((number? vstr) vstr)
+	       ((not (string?  vstr))   1)
+	       ;; ((string-match  "^\\s*$" vstr) 1)
+	       (vstr           (let ((debugvals  (filter number? (map string->number (string-split vstr ",")))))
+				 (cond
+				  ((> (length debugvals) 1) debugvals)
+				  ((> (length debugvals) 0)(car debugvals))
+				  (else 1))))
+	       ((eq? arg 'v)   2) ;; verbose
+	       ((eq? arg 'q)   0) ;; quiet
+	       (else                   1))))
+    (verbosity res)
+    res))
+
+;;======================================================================
+;; check verbosity, #t is ok
+#;(define (debug-check-verbosity verbosity vstr)
+  (if (not (or (number? verbosity)
+	       (list?   verbosity)))
+      (begin
+	(print "ERROR: Invalid debug value \"" vstr "\"")
+	#f)
+      #t))
+
+(define (debug:debug-mode n)
+  (let* ((vb (verbosity)))
+    (cond
+     ((and (number? vb)   ;; number number
+	   (number? n))
+      (<= n vb))
+     ((and (list? vb)     ;; list   number
+	   (number? n))
+      (member n vb))
+     ((and (list? vb)     ;; list   list
+	   (list? n))
+      (not (null? (lset-intersection! eq? vb n))))
+     ((and (number? vb)
+	   (list? n))
+      (member vb n))
+     (else #f))))
+
+(define (debug:print n e . params)
+  (if (debug:debug-mode n)
+      (with-output-to-port (or e (current-error-port))
+	(lambda ()
+	  ;; (if *logging*
+	      ;; (db:log-event (apply conc params))
+	  (apply print params)
+	  )))) ;; )
+
+(define (debug:print-error n e . params)
+  ;; normal print
+  (if (debug:debug-mode n)
+      (with-output-to-port (if (port? e) e (current-error-port))
+	(lambda ()
+	  (apply print "ERROR: " params)
+	  )))
+  ;; pass important messages to stderr
+  (if (and (eq? n 0)(not (eq? e (current-error-port)))) 
+      (with-output-to-port (current-error-port)
+	(lambda ()
+	  (apply print "ERROR: " params)
+	  ))))
+
+(define (debug:print-info n e . params)
+  (if (debug:debug-mode n)
+      (with-output-to-port (if (port? e) e (current-error-port))
+	(lambda ()
+	  (apply print "INFO: (" n ") " params) ;; res)
+	  ))))
+
+)

ADDED   deps.pdf
Index: deps.pdf
==================================================================
--- /dev/null
+++ deps.pdf
cannot compute difference between binary files

Index: diff-report.scm
==================================================================
--- diff-report.scm
+++ diff-report.scm
@@ -14,18 +14,19 @@
 ;; 
 ;;     You should have received a copy of the GNU General Public License
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 ;;
 
-(declare (unit diff-report))
-(declare (uses common))
-(declare (uses rmt))
-         
-(include "common_records.scm")
-(use matchable)
-(use fmt)
-(use ducttape-lib)
+;; (declare (unit diff-report))
+;; (declare (uses common))
+;; (declare (uses rmt))
+;;          
+;; (include "common_records.scm")
+;; (use matchable)
+;; (use fmt)
+;; (use ducttape-lib)
+
 (define css "")
 
 (define (diff:tests-mindat->hash tests-mindat)
   (let* ((res (make-hash-table)))
     (for-each

Index: ducttape/ducttape-lib.scm
==================================================================
--- ducttape/ducttape-lib.scm
+++ ducttape/ducttape-lib.scm
@@ -44,24 +44,46 @@
      isodate->wwdate
      wwdate->seconds
      wwdate->isodate
      current-wwdate
      current-isodate
-     *this-exe-dir*
-     *this-exe-name*
-     *this-exe-fullpath*
+     ;; *this-exe-dir*
+     ;; *this-exe-name*
+     ;; *this-exe-fullpath*
      )
 
-  (import scheme chicken extras ports data-structures )
-  (use posix regex ansi-escape-sequences test srfi-1 irregex slice srfi-13 rfc3339)
+  (import scheme
+	  chicken.base
+	  chicken.condition
+	  chicken.file
+	  chicken.file.posix
+	  chicken.format
+	  chicken.io
+	  chicken.pathname
+	  chicken.port
+	  chicken.process
+	  chicken.process
+	  chicken.process-context
+	  chicken.process-context.posix
+	  chicken.irregex 
+	  chicken.string
+	  chicken.time
+	  chicken.time.posix
+	  )
+
+  (import regex ansi-escape-sequences test srfi-1 slice srfi-13 rfc3339)
   ;;scsh-process ;; dropping scsh-process, it was clobbering posix's process and process*
-  (use directory-utils uuid-lib filepath srfi-19 ) ; linenoise
+  ;;(import directory-utils uuid-lib filepath srfi-19 ) ; linenoise
+  (import directory-utils filepath srfi-19 ) ; linenoise
 
     ;; plugs a hole in posix-extras in latter chicken versions
-  (use posix-extras pathname-expand files)
-  (define ##sys#expand-home-path pathname-expand)
-  (define (realpath x) (resolve-pathname  (pathname-expand (or x "/dev/null")) ))
+  ;; (import pathname-expand chicken.file chicken.string)
+  ;; (define ##sys#expand-home-path pathname-expand)
+  ;; (define (realpath x) (print "Path: " x) (normalize-pathname  (pathname-expand (or x "/dev/null")) ))
+  ;;(define (realpath x) (pathname-expand (or x "/dev/null")))
+  (define (realpath x)
+    (with-input-from-pipe (conc "readlink -f " x) read-line))
 
   ;; (include "mimetypes.scm") ; provides ext->mimetype
   ;; (include "workweekdate.scm")
 
   ;; gathered from macosx:
@@ -841,14 +863,14 @@
 ("avi" . "video/x-msvideo")
 ("movie" . "video/x-sgi-movie")
 ("smv" . "video/x-smv")
 ("ice" . "x-conference/x-cooltalk")))
 
-(use srfi-19)
-(use test)
+(import srfi-19)
+(import test)
 ;;(use format)
-(use regex)
+(import regex)
 ;(declare (unit wwdate))
 ;; utility procedures to convert among
 ;; different ways to express date (wwdate, seconds since epoch, isodate)
 ;;
 ;; samples:
@@ -1058,11 +1080,11 @@
         (if (null? rest-path-items)
             #f
             (let* ((this-dir (car rest-path-items))
                    (next-rest (cdr rest-path-items))
                    (candidate (conc this-dir "/" exe)))
-              (if (file-execute-access? candidate)
+              (if (file-executable? candidate)
                   candidate
                   (loop next-rest)))))))
 
 
   
@@ -1079,13 +1101,13 @@
            
            ;;(foo (begin (print "hello "(find-exe "/bin/sh") #f)))
            (fullpath (or (find-exe this-script) (realpath this-script))))
       fullpath))
   
-  (define *this-exe-fullpath* (__get-this-script-fullpath))
-  (define *this-exe-dir*      (pathname-directory *this-exe-fullpath*))
-  (define *this-exe-name*     (pathname-strip-directory *this-exe-fullpath*))
+  ;; (define *this-exe-fullpath* (__get-this-script-fullpath))
+  ;; (define *this-exe-dir*      (pathname-directory *this-exe-fullpath*))
+  ;; (define *this-exe-name*     (pathname-strip-directory *this-exe-fullpath*))
   
 
 ;;;; utility procedures
 
 
@@ -1247,15 +1269,15 @@
            (let ((num-debug-level (runs-ok (string->number raw-debug-level))))
              (if (integer? num-debug-level)
                  (begin
                    (let ((new-num-debug-level (- num-debug-level 1)))
                      (if (> new-num-debug-level 0) ;; decrement
-                         (setenv "DUCTTAPE_DEBUG_LEVEL" (number->string new-num-debug-level))
-                         (unsetenv "DUCTTAPE_DEBUG_LEVEL")))
+                         (set-environment-variable! "DUCTTAPE_DEBUG_LEVEL" (number->string new-num-debug-level))
+                         (unset-environment-variable! "DUCTTAPE_DEBUG_LEVEL")))
                    num-debug-level) ; it was set and > 0, mode is value
                  (begin
-                   (unsetenv "DUCTTAPE_DEBUG_LEVEL") ;; value was invalid, unset it
+                   (unset-environment-variable! "DUCTTAPE_DEBUG_LEVEL") ;; value was invalid, unset it
                    #f))) ; value was invalid, mode is f
            #f)))) ; var not set, mode is f
 
 
   (define ducttape-debug-mode (if (ducttape-debug-level)  #t  #f))
@@ -1360,11 +1382,11 @@
           (user (or (get-environment-variable "USER") "nouser"))
           (host (or (get-environment-variable "HOST") "nohost")))
       (if logfile
           (begin
             (ducttape-log-file logfile)
-            (setenv "DUCTTAPE_LOG_FILE" (ducttape-log-file))))
+            (set-environment-variable! "DUCTTAPE_LOG_FILE" (ducttape-log-file))))
       (ducttape-append-logfile 'note (format #f "START - pid=~A ppid=~A argv=(~A) pwd=~A user=~A host=~A" pid ppid argv pwd user host) #t)))         
 
 
   ;; log exit code
   (define (set-ducttape-log-exit-handler)
@@ -1522,11 +1544,13 @@
     (define (sendmail-proc sendmail-port)
       (define (wl line-str)
         (write-line line-str sendmail-port))
 
       (define (get-uuid)
-        (string-upcase (uuid->string (uuid-generate))))
+(print "ERROR in ducttape lib")
+	"foo")
+        ;;(string-upcase (uuid->string (uuid-generate))))
 
       (let ((mailpart-uuid (get-uuid))
             (mailpart-body-uuid (get-uuid)))
         
         (define (boundary)
@@ -1702,40 +1726,40 @@
 
     ;; --quiet
     (let ((quiet-opts (skim-cmdline-opts-noarg-by-regex "--?quiet")))
       (if (not (null? quiet-opts))
           (begin
-            (setenv "DUCTTAPE_QUIET_MODE" "1")
+            (set-environment-variable! "DUCTTAPE_QUIET_MODE" "1")
             (ducttape-quiet-mode "1"))))
 
     ;; --silent
     (let ((silent-opts (skim-cmdline-opts-noarg-by-regex "--?silent")))
       (if (not (null? silent-opts))
           (begin
-            (setenv "DUCTTAPE_SILENT_MODE" "1")
+            (set-environment-variable! "DUCTTAPE_SILENT_MODE" "1")
             (ducttape-silent-mode "1"))))
 
     ;; -color
     (let ((color-opts (skim-cmdline-opts-noarg-by-regex "--?colou?r(ize)?")))
       (if (not (null? color-opts))
           (begin
-            (setenv "DUCTTAPE_COLORIZE" "1")
+            (set-environment-variable! "DUCTTAPE_COLORIZE" "1")
             (ducttape-color-mode "1"))))
 
     ;; -nocolor
     (let ((nocolor-opts (skim-cmdline-opts-noarg-by-regex "--?nocolou?r(ize)?")))
       (if (not (null? nocolor-opts))
           (begin
-            (unsetenv "DUCTTAPE_COLORIZE" )
+            (unset-environment-variable! "DUCTTAPE_COLORIZE" )
             (ducttape-color-mode #f))))
 
     ;; -logfile
     (let ((logfile-opts (skim-cmdline-opts-withargs-by-regex "--?log(-?file)?")))
       (if (not (null? logfile-opts))
           (begin
             (ducttape-log-file (car (reverse logfile-opts)))
-            (setenv "DUCTTAPE_LOG_FILE" (ducttape-log-file)))))
+            (set-environment-variable! "DUCTTAPE_LOG_FILE" (ducttape-log-file)))))
 
     ;; -d -dd -d#
     (let ((debug-opts (skim-cmdline-opts-noarg-by-regex "-d(d*|\\d+)"))
           (initial-debuglevel (if (ducttape-debug-level) (ducttape-debug-level) 0) ))
       (if (not (null? debug-opts))
@@ -1750,19 +1774,19 @@
                          (ds (string-match "-(d+)" curopt))
                          (dnum (string-match "-d(\\d+)" curopt)))
                      (cond
                       (ds (loop restopts (+ debuglevel (string-length (cadr ds)))))
                       (dnum  (loop restopts (string->number (cadr dnum)))))))))
-            (setenv "DUCTTAPE_DEBUG_LEVEL" (number->string (ducttape-debug-level))))))
+            (set-environment-variable! "DUCTTAPE_DEBUG_LEVEL" (number->string (ducttape-debug-level))))))
 
 
     ;; -dp <pat> / --debug-pattern <pat>
     (let ((debugpat-opts (skim-cmdline-opts-withargs-by-regex "--?(debug-pattern|dp)")))
       (if (not (null? debugpat-opts))
           (begin
             (ducttape-debug-regex-filter (string-join debugpat-opts "|"))
-            (setenv "DUCTTAPE_DEBUG_PATTERN" (ducttape-debug-regex-filter)))))) 
+            (set-environment-variable! "DUCTTAPE_DEBUG_PATTERN" (ducttape-debug-regex-filter)))))) 
 
 
   ;;; following code commented out; side effects not wanted on startup
   ;; immediately activate logfile (will be noop if logfile disabled)
   ;;(ducttape-activate-logfile)

Index: env.scm
==================================================================
--- env.scm
+++ env.scm
@@ -16,13 +16,13 @@
 ;;     You should have received a copy of the GNU General Public License
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;======================================================================
 
-(declare (unit env))
+;; (declare (unit env))
 
-(use sql-de-lite) ;; srfi-1 posix regex regex-case srfi-69 srfi-18 call-with-environment-variables)
+;; (use sql-de-lite) ;; srfi-1 posix regex regex-case srfi-69 srfi-18 call-with-environment-variables)
 
 (define (env:open-db fname)
   (let* ((db-exists (common:file-exists? fname))
 	 (db        (open-database fname)))
     (if (not db-exists)

DELETED ezsteps.scm
Index: ezsteps.scm
==================================================================
--- ezsteps.scm
+++ /dev/null
@@ -1,393 +0,0 @@
-
-;; Copyright 2006-2012, Matthew Welland.
-;; 
-;; This file is part of Megatest.
-;; 
-;;     Megatest is free software: you can redistribute it and/or modify
-;;     it under the terms of the GNU General Public License as published by
-;;     the Free Software Foundation, either version 3 of the License, or
-;;     (at your option) any later version.
-;; 
-;;     Megatest is distributed in the hope that it will be useful,
-;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;     GNU General Public License for more details.
-;; 
-;;     You should have received a copy of the GNU General Public License
-;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
-;;
-
-;;  strftime('%m/%d/%Y %H:%M:%S','now','localtime')
-
-(use srfi-1 posix regex srfi-69 directory-utils call-with-environment-variables posix-extras
-     z3 csv typed-records pathname-expand matchable)
-
-(declare (unit ezsteps))
-(declare (uses db))
-(declare (uses common))
-(declare (uses items))
-(declare (uses runconfig))
-;; (declare (uses sdb))
-;; (declare (uses filedb))
-
-(include "common_records.scm")
-(include "key_records.scm")
-(include "db_records.scm")
-(include "run_records.scm")
-
-
-;;(rmt:get-test-info-by-id run-id test-id) -> testdat
-
-;; TODO: deprecate me in favor of ezsteps.scm
-;;
-(define (launch:runstep ezstep run-id test-id exit-info m tal testconfig all-steps-dat)
-  (let* ((stepname       (car ezstep))  ;; do stuff to run the step
-	 (stepinfo       (cadr ezstep))
-	;; (let ((info (cadr ezstep)))
-	;; 		   (if (proc? info) "" info)))
-	;; (stepproc       (let ((info (cadr ezstep)))
-	;; 		   (if (proc? info) info #f)))
-	 (stepparts      (string-match (regexp "^(\\{([^\\}\\{]*)\\}\\s*|)(.*)$") stepinfo))
-	 (stepparams     (if (and (list? stepparts)
-				  (> (length stepparts) 1))
-			     (list-ref stepparts 2)
-			     #f)) ;; for future use, {VAR=1,2,3}, run step for each
-	 (paramparts     (if (string? stepparams)
-			     (map (lambda (x)(string-split x "=")) (string-split-fields "[^;]*=[^;]*" stepparams))
-			     '()))
-	 (subrun         (alist-ref "subrun" paramparts equal?))
-	 (stepcmd        (if (and (list? stepparts)
-				  (> (length stepparts) 2))
-			     (list-ref stepparts 3)
-			     (conc "# error, no command for step "stepname)))
-	 (script         "") ; "#!/bin/bash\n") ;; yep, we depend on bin/bash FIXME!!!\
-	 (logpro-file    (conc stepname ".logpro"))
-	 (html-file      (conc stepname ".html"))
-	 (dat-file       (conc stepname ".dat"))
-	 (tconfig-logpro (configf:lookup testconfig "logpro" stepname))
-	 (logpro-used    (common:file-exists? logpro-file)))
-    (setenv "MT_STEP_NAME" stepname)
-    (hash-table-set! all-steps-dat stepname `((params . ,paramparts)))
-    (debug:print 0 *default-log-port* "stepparts: " stepparts ", stepparams: " stepparams
-                 ", paramparts: " paramparts ", subrun: " subrun ", stepcmd: " stepcmd)
-    
-    (if (and tconfig-logpro
-	     (not logpro-used)) ;; no logpro file found but have a defn in the testconfig
-	(begin
-	  (with-output-to-file logpro-file
-	    (lambda ()
-	      (print ";; logpro file extracted from testconfig\n"
-		     ";;")
-	      (print tconfig-logpro)))
-	  (set! logpro-used #t)))
-    
-    ;; NB// can safely assume we are in test-area directory
-    (debug:print 4 *default-log-port* "ezsteps:\n stepname: " stepname " stepinfo: " stepinfo " stepparts: " stepparts
-		 " stepparams: " stepparams " stepcmd: " stepcmd)
-    
-    ;; ;; first source the previous environment
-    ;; (let ((prev-env (conc ".ezsteps/" prevstep (if (string-search (regexp "csh") 
-    ;;      							 (get-environment-variable "SHELL")) ".csh" ".sh"))))
-    ;;   (if (and prevstep (common:file-exists? prev-env))
-    ;;       (set! script (conc script "source " prev-env))))
-    
-    ;; call the command using mt_ezstep
-    ;; (set! script (conc "mt_ezstep " stepname " " (if prevstep prevstep "x") " " stepcmd))
-    
-    (debug:print 4 *default-log-port* "script: " script)
-    (rmt:teststep-set-status! run-id test-id stepname "start" "-" #f #f)
-    ;; now launch the actual process
-    (call-with-environment-variables 
-     (list (cons "PATH" (conc (get-environment-variable "PATH") ":.")))
-     (lambda () ;; (process-run "/bin/bash" "-c" "exec ls -l /tmp/foobar > /tmp/delme-more.log 2>&1")
-       (let* ((cmd (conc stepcmd " > " stepname ".log 2>&1")) ;; >outfile 2>&1 
-	      (pid #f))
-	 (let ((proc (lambda ()
-		       (set! pid (process-run "/bin/bash" (list "-c" cmd))))))
-	   (if subrun
-               (begin
-                 (debug:print-info 0 *default-log-port* "Running without MT_.* environment variables.")
-                 (common:without-vars proc "^MT_.*"))
-	       (proc)))
-	 
-         (with-output-to-file "Makefile.ezsteps"
-           (lambda ()
-             (print stepname ".log :")
-             (print "\t" cmd)
-             (if (common:file-exists? (conc stepname ".logpro"))
-                 (print "\tlogpro " stepname ".logpro " stepname ".html < " stepname ".log"))
-             (print)
-             (print stepname " : " stepname ".log")
-             (print))
-           #:append)
-
-	 (rmt:test-set-top-process-pid run-id test-id pid)
-	 (let processloop ((i 0))
-	   (let-values (((pid-val exit-status exit-code)(process-wait pid #t)))
-		       (mutex-lock! m)
-		       (launch:einf-pid-set!         exit-info pid)         ;; (vector-set! exit-info 0 pid)
-		       (launch:einf-exit-status-set! exit-info exit-status) ;; (vector-set! exit-info 1 exit-status)
-		       (launch:einf-exit-code-set!   exit-info exit-code)   ;; (vector-set! exit-info 2 exit-code)
-		       (mutex-unlock! m)
-		       (if (eq? pid-val 0)
-			   (begin
-			     (thread-sleep! 2)
-			     (processloop (+ i 1))))
-		       )))))
-    (debug:print-info 0 *default-log-port* "step " stepname " completed with exit code " (launch:einf-exit-code exit-info)) ;; (vector-ref exit-info 2))
-    ;; now run logpro if needed
-    (if logpro-used
-	(let* ((logpro-exe (or (getenv "LOGPRO_EXE") "logpro"))
-               (pid        (process-run (conc "/bin/sh -c '"logpro-exe" "logpro-file " " (conc stepname ".html") " < " stepname ".log > /dev/null'"))))
-	  (let processloop ((i 0))
-	    (let-values (((pid-val exit-status exit-code)(process-wait pid #t)))
-			(mutex-lock! m)
-			;; (make-launch:einf pid: pid exit-status: exit-status exit-code: exit-code)
-			(launch:einf-pid-set!         exit-info pid)         ;; (vector-set! exit-info 0 pid)
-			(launch:einf-exit-status-set! exit-info exit-status) ;; (vector-set! exit-info 1 exit-status)
-			(launch:einf-exit-code-set!   exit-info exit-code)   ;; (vector-set! exit-info 2 exit-code)
-			(mutex-unlock! m)
-			(if (eq? pid-val 0)
-			    (begin
-			      (thread-sleep! 2)
-			      (processloop (+ i 1)))))
-	    (debug:print-info 0 *default-log-port* "logpro for step " stepname " exited with code " (launch:einf-exit-code exit-info))))) ;; (vector-ref exit-info 2)))))
-    
-    (let ((exinfo (launch:einf-exit-code exit-info)) ;; (vector-ref exit-info 2))
-	  (logfna (if logpro-used (conc stepname ".html") ""))
-	  (comment #f))
-      (if logpro-used
-	  (let ((datfile (conc stepname ".dat")))
-	    ;; load the .dat file into the test_data table if it exists
-	    (if (common:file-exists? datfile)
-		(set! comment (launch:load-logpro-dat run-id test-id stepname)))
-	    (rmt:test-set-log! run-id test-id (conc stepname ".html"))))
-      (rmt:teststep-set-status! run-id test-id stepname "end" exinfo comment logfna))
-    ;; set the test final status
-    (let* ((process-exit-status (launch:einf-exit-code exit-info)) ;; (vector-ref exit-info 2))
-	   (this-step-status (cond
-			      ((and (eq? process-exit-status 2) logpro-used) 'warn)   ;; logpro 2 = warnings
-			      ((and (eq? process-exit-status 3) logpro-used) 'check)  ;; logpro 3 = check
-			      ((and (eq? process-exit-status 4) logpro-used) 'waived) ;; logpro 4 = waived
-			      ((and (eq? process-exit-status 5) logpro-used) 'abort)  ;; logpro 5 = abort
-			      ((and (eq? process-exit-status 6) logpro-used) 'skip)   ;; logpro 6 = skip
-			      ((eq? process-exit-status 0)                   'pass)   ;; logpro 0 = pass
-			      (else 'fail)))
-	   (overall-status   (cond
-			      ((eq? (launch:einf-rollup-status exit-info) 2) 'warn) ;; rollup-status (vector-ref exit-info 3)
-			      ((eq? (launch:einf-rollup-status exit-info) 0) 'pass) ;; (vector-ref exit-info 3)
-			      (else 'fail)))
-	   (next-status      (cond 
-			      ((eq? overall-status 'pass) this-step-status)
-			      ((eq? overall-status 'warn)
-			       (if (eq? this-step-status 'fail) 'fail 'warn))
-			      ((eq? overall-status 'abort) 'abort)
-			      (else 'fail)))
-	   (next-state       ;; "RUNNING") ;; WHY WAS THIS CHANGED TO NOT USE (null? tal) ??
-	    (cond
-	     ((null? tal) ;; more to run?
-	      "COMPLETED")
-	     (else "RUNNING"))))
-      (debug:print 4 *default-log-port* "Exit value received: " (launch:einf-exit-code exit-info) " logpro-used: " logpro-used 
-		   " this-step-status: " this-step-status " overall-status: " overall-status 
-		   " next-status: " next-status " rollup-status: "  (launch:einf-rollup-status exit-info)) ;; (vector-ref exit-info 3))
-      (case next-status
-	((warn)
-	 (launch:einf-rollup-status-set! exit-info 2) ;; (vector-set! exit-info 3 2) ;; rollup-status
-	 ;; NB// test-set-status! does rdb calls under the hood
-	 (tests:test-set-status! run-id test-id next-state "WARN" 
-				 (if (eq? this-step-status 'warn) "Logpro warning found" #f)
-				 #f))
-	((check)
-	 (launch:einf-rollup-status-set! exit-info 3) ;; (vector-set! exit-info 3 3) ;; rollup-status
-	 ;; NB// test-set-status! does rdb calls under the hood
-	 (tests:test-set-status! run-id test-id next-state "CHECK" 
-				 (if (eq? this-step-status 'check) "Logpro check found" #f)
-				 #f))
-	((waived)
-	 (launch:einf-rollup-status-set! exit-info 4) ;; (vector-set! exit-info 3 3) ;; rollup-status
-	 ;; NB// test-set-status! does rdb calls under the hood
-	 (tests:test-set-status! run-id test-id next-state "WAIVED" 
-				 (if (eq? this-step-status 'check) "Logpro waived found" #f)
-				 #f))
-	((abort)
-	 (launch:einf-rollup-status-set! exit-info 5) ;; (vector-set! exit-info 3 4) ;; rollup-status
-	 ;; NB// test-set-status! does rdb calls under the hood
-	 (tests:test-set-status! run-id test-id next-state "ABORT" 
-				 (if (eq? this-step-status 'abort) "Logpro abort found" #f)
-				 #f))
-	((skip)
-	 (launch:einf-rollup-status-set! exit-info 6) ;; (vector-set! exit-info 3 4) ;; rollup-status
-	 ;; NB// test-set-status! does rdb calls under the hood
-	 (tests:test-set-status! run-id test-id next-state "SKIP" 
-				 (if (eq? this-step-status 'skip) "Logpro skip found" #f)
-				 #f))
-	((pass)
-	 (tests:test-set-status! run-id test-id next-state "PASS" #f #f))
-	(else ;; 'fail
-	 (launch:einf-rollup-status-set! exit-info 1) ;; (vector-set! exit-info 3 1) ;; force fail, this used to be next-state but that doesn't make sense. should always be "COMPLETED" 
-	 (tests:test-set-status! run-id test-id "COMPLETED" "FAIL" (conc "Failed at step " stepname) #f)
-	 )))
-    logpro-used))
-
-(define (ezsteps:run-from testdat start-step-name run-one)
-  ;;# TODO - recapture item variables, debug repeated step eval; regen logpro from test
-  (let* ((do-update-test-state-status #f)
-         (test-run-dir  ;; (filedb:get-path *fdb* 
-	  (db:test-get-rundir testdat)) ;; )
-	 (testconfig    (read-config (conc test-run-dir "/testconfig") #f #t environ-patt: "pre-launch-env-vars"))
-	 (ezstepslst    (hash-table-ref/default testconfig "ezsteps" '()))
-	 (run-mutex     (make-mutex))
-	 (rollup-status 0)
-         (rollup-status-string #f)
-         (rollup-status-sym #f)
-	 (exit-info     (vector #t #t #t))
-	 (test-id       (db:test-get-id        testdat))
-	 (run-id        (db:test-get-run_id    testdat))
-	 (test-name     (db:test-get-testname  testdat))
-         (orig-test-state (db:test-get-state   testdat))
-         (orig-test-status (db:test-get-status testdat))
-	 (kill-job      #f) ;; for future use (on re-factoring with launch.scm code
-	 (the-step-params '())) ;; not exactly "functional"
-
-    ;; keep trying till NFS deigns to populate test run dir on this host
-    (let loop ((count 5))
-      (if (not (common:file-exists? test-run-dir))
-	  ;;(push-directory test-run-dir)
-	  (if (> count 0)
-	      (begin
-		(debug:print 0 *default-log-port* "WARNING: ezsteps attempting to run but test run directory " test-run-dir " is not there. Waiting and trying again " count " more times")
-		(sleep 3)
-		(loop (- count 1))))))
-    
-    (debug:print-info 0 *default-log-port* "Running in directory " test-run-dir)
-    (if (not (common:file-exists? ".ezsteps"))(create-directory ".ezsteps"))
-    ;; if ezsteps was defined then we are sure to have at least one step but check anyway
-    
-    (if (not (> (length ezstepslst) 0))
-	(message-window "ERROR: You can only re-run steps defined via ezsteps")
-	(begin
-	  (let loop ((ezstep   (car ezstepslst))
-		     (tal      (cdr ezstepslst))
-                     (status-sym-so-far 'pass)
-		     ;;(runflag  #f)
-                     (saw-start-step-name #f)) ;; flag used to skip steps when not starting at the beginning
-	    (if (or (vector-ref exit-info 1)
-		    (equal? (alist-ref 'keep-going prev-step-params) 'yes))
-		(let* ((prev-step-params the-step-params) ;; need to snag this now
-		       (stepname    (car ezstep))  ;; do stuff to run the step
-                       (logpro-used (common:file-exists? (conc test-run-dir "/" stepname ".logpro")))
-		       (stepinfo    (cadr ezstep))
-		       (stepparts   (string-match (regexp "^(\\{([^\\}]*)\\}\\s*|)(.*)$") stepinfo))
-		       (stepparms   (list-ref stepparts 2)) ;; for future use, {VAR=1,2,3}, run step for each 
-		       (stepcmd     (list-ref stepparts 3))
-		       (script      (conc "mt_ezstep '"test-run-dir"' '"stepname"' '"stepcmd"'")) ;; call the command using mt_ezstep
-                       (saw-start-step-name-next (or saw-start-step-name (equal? stepname start-step-name)))
-                       (proceed-with-this-step
-                        (or (not start-step-name)
-                            (equal? stepname start-step-name)
-                            (and saw-start-step-name (not run-one))
-                            saw-start-step-name-next
-                            (and start-step-name (equal? stepname start-step-name))))
-                       )
-		  (debug:print 0 *default-log-port* "NOTE: stepparms=" stepparms)
-		  (set! prev-step-params stepparms)
-                  (set! do-update-test-state-status (and proceed-with-this-step (null? tal)))
-                  ;;(BB> "stepname="stepname" proceed-with-this-step="proceed-with-this-step " do-update-test-state-status="do-update-test-state-status " orig-test-state="orig-test-state" orig-test-status="orig-test-status)
-                  (cond
-                   ((and (not proceed-with-this-step) (null? tal))
-                    'done)
-                   ((not proceed-with-this-step)
-                      (loop (car tal)
-                            (cdr tal)
-                            status-sym-so-far
-                            saw-start-step-name-next))
-                   (else
-		    (debug:print 4 *default-log-port* "ezsteps:\n stepname: " stepname " stepinfo: " stepinfo " stepparts: " stepparts
-			         " stepparms: " stepparms " stepcmd: " stepcmd)
-		    (debug:print 4 *default-log-port* "script: " script)
-		    (rmt:teststep-set-status! run-id test-id stepname "start" "-" #f #f)
-
-		    ;; now launch the script
-		    (let ((pid (process-run script)))
-		      (let processloop ((i 0))
-		        (let-values (((pid-val exit-status exit-code)(process-wait pid #t)))
-			  (mutex-lock! run-mutex)
-			  (vector-set! exit-info 0 pid)
-			  (vector-set! exit-info 1 exit-status)
-			  (vector-set! exit-info 2 exit-code)
-			  (mutex-unlock! run-mutex)
-			  (if (eq? pid-val 0)
-			      (begin
-			        (thread-sleep! 1)
-			        (processloop (+ i 1))))
-			  ))
-		      (let ((exinfo (vector-ref exit-info 2))
-			    (logfna (if logpro-used (conc stepname ".html") "")))
-		        (rmt:teststep-set-status! run-id test-id stepname "end" exinfo #f logfna))
-                      
-		      (if logpro-used
-			  (rmt:test-set-log! run-id test-id (conc stepname ".html")))
-                      
-		      ;; set the test final status
-		      (let* ((this-step-status      (cond
-                                                     (logpro-used
-                                                      (common:logpro-exit-code->status-sym (vector-ref exit-info 2)))
-					             ((eq? (vector-ref exit-info 2) 0)
-                                                      'pass)
-					             (else
-                                                      'fail)))
-			     (overall-status-sym    (common:worse-status-sym this-step-status status-sym-so-far))
-                             (overall-status-string (status-sym->string overall-status-sym)))
-		        (debug:print 4 *default-log-port* "Exit value received: " (vector-ref exit-info 2) " logpro-used: " logpro-used 
-				     " this-step-status: " this-step-status " overall-status: " overall-status-sym) 
-		        ;;" next-status: " next-status " rollup-status: " rollup-status)
-                        (set! rollup-status-string overall-status-string)
-                        (set! rollup-status-sym overall-status-sym)
-                        (tests:test-set-status! run-id test-id "RUNNING" overall-status-string #f #f)))
-
-                    (if (and
-                         (not run-one)
-                         (common:steps-can-proceed-given-status-sym rollup-status-sym)
-                         (not (null? tal)))
-                        (loop (car tal)
-                              (cdr tal)
-                              rollup-status-sym
-                              saw-start-step-name-next)))))
-		(debug:print 4 *default-log-port* "WARNING: a prior step failed, stopping at " ezstep)))
-	  
-	  ;; Once done with step/steps update the test record
-	  ;;
-	  (let* ((item-path (db:test-get-item-path testdat)) ;; (item-list->path itemdat))
-		 (testinfo  (rmt:get-testinfo-state-status run-id test-id))) ;; refresh the testdat, call it iteminfo in case need prev/curr
-	    ;; Am I completed?
-	    (if (equal? (db:test-get-state testinfo) "RUNNING") ;; (not (equal? (db:test-get-state testinfo) "COMPLETED"))
-		(let ((new-state  (if kill-job "KILLED" "COMPLETED") ;; (if (eq? (vector-ref exit-info 2) 0) ;; exited with "good" status
-				  ;; "COMPLETED"
-				  ;; (db:test-get-state testinfo)))   ;; else preseve the state as set within the test
-				  )
-                      (new-status rollup-status-string)
-                      ) ;; (db:test-get-status testinfo)))
-		  (debug:print-info 2 *default-log-port* "Test NOT logged as COMPLETED, (state=" (db:test-get-state testinfo) "), updating result, rollup-status is " rollup-status)
-		  (tests:test-set-status! run-id test-id 
-					  (if do-update-test-state-status new-state orig-test-state)
-					  (if do-update-test-state-status new-status orig-test-status)
-					  (args:get-arg "-m") #f)
-		  ;; need to update the top test record if PASS or FAIL and this is a subtest
-		  (if (and (not (equal? item-path "")) do-update-test-state-status)
-                      (rmt:set-state-status-and-roll-up-items run-id test-name item-path new-state new-status #f))))
-	    ;; for automated creation of the rollup html file this is a good place...
-	    (if (not (equal? item-path ""))
-	      (tests:summarize-items run-id test-id test-name #f)) ;; don't force - just update if no
-	    )))
-    ;;(pop-directory)
-    rollup-status-string))
-
-(define (ezsteps:spawn-run-from testdat start-step-name run-one)
-  (thread-start! 
-   (make-thread
-    (lambda ()
-      (ezsteps:run-from testdat start-step-name run-one))
-    (conc "ezstep run single step " start-step-name " run-one="run-one)))
-  )
-

ADDED   ezstepsmod.scm
Index: ezstepsmod.scm
==================================================================
--- /dev/null
+++ ezstepsmod.scm
@@ -0,0 +1,489 @@
+;;======================================================================
+;; Copyright 2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
+
+;;======================================================================
+
+(declare (unit ezstepsmod))
+
+(declare (uses debugprint))
+(declare (uses commonmod))
+(declare (uses configfmod))
+(declare (uses mtargs))
+(declare (uses mtver))
+(declare (uses csv-xml))
+(declare (uses keysmod))
+(declare (uses mtmod))
+(declare (uses rmtmod))
+(declare (uses testsmod))
+(declare (uses dbmod))
+
+(module ezstepsmod
+	*
+	
+(import scheme
+	(prefix sqlite3 sqlite3:)
+	chicken.base
+	chicken.condition
+	chicken.eval
+	chicken.file
+	chicken.file.posix
+	chicken.format
+	chicken.io
+	chicken.pathname
+	chicken.port
+	chicken.pretty-print
+	chicken.process
+	chicken.process-context
+	chicken.process-context.posix
+	chicken.sort
+	chicken.string
+	chicken.time
+	chicken.time.posix
+
+	(prefix base64 base64:)
+	csv-xml
+	csv-abnf
+	directory-utils
+	matchable
+	regex
+	s11n
+	srfi-1
+	srfi-13
+	srfi-18
+	srfi-69
+	stack
+	typed-records
+	z3
+
+	(prefix mtargs args:)
+	commonmod
+	configfmod
+	debugprint
+;; 	keysmod
+	mtmod
+	mtver
+	rmtmod
+	testsmod
+	dbmod
+
+	)
+
+;;  strftime('%m/%d/%Y %H:%M:%S','now','localtime')
+
+;; (use srfi-1 posix regex srfi-69 directory-utils call-with-environment-variables posix-extras
+;;      z3 csv typed-records pathname-expand matchable)
+;; 
+;; (declare (unit ezsteps))
+;; (declare (uses db))
+;; (declare (uses common))
+;; (declare (uses items))
+;; (declare (uses runconfig))
+;; ;; (declare (uses sdb))
+;; ;; (declare (uses filedb))
+;; 
+;; (include "common_records.scm")
+;; (include "key_records.scm")
+;; (include "db_records.scm")
+;; (include "run_records.scm")
+;; 
+;; 
+;;(rmt:get-test-info-by-id run-id test-id) -> testdat
+
+(define message-window #f)
+
+;; TODO: deprecate me in favor of ezsteps.scm
+;;
+(define (launch:runstep ezstep run-id test-id exit-info m tal testconfig all-steps-dat)
+  (let* ((stepname       (car ezstep))  ;; do stuff to run the step
+	 (stepinfo       (cadr ezstep))
+	;; (let ((info (cadr ezstep)))
+	;; 		   (if (proc? info) "" info)))
+	;; (stepproc       (let ((info (cadr ezstep)))
+	;; 		   (if (proc? info) info #f)))
+	 (stepparts      (string-match (regexp "^(\\{([^\\}\\{]*)\\}\\s*|)(.*)$") stepinfo))
+	 (stepparams     (if (and (list? stepparts)
+				  (> (length stepparts) 1))
+			     (list-ref stepparts 2)
+			     #f)) ;; for future use, {VAR=1,2,3}, run step for each
+	 (paramparts     (if (string? stepparams)
+			     (map (lambda (x)(string-split x "=")) (string-split-fields "[^;]*=[^;]*" stepparams))
+			     '()))
+	 (subrun         (alist-ref "subrun" paramparts equal?))
+	 (stepcmd        (if (and (list? stepparts)
+				  (> (length stepparts) 2))
+			     (list-ref stepparts 3)
+			     (conc "# error, no command for step "stepname)))
+	 (script         "") ; "#!/bin/bash\n") ;; yep, we depend on bin/bash FIXME!!!\
+	 (logpro-file    (conc stepname ".logpro"))
+	 (html-file      (conc stepname ".html"))
+	 (dat-file       (conc stepname ".dat"))
+	 (tconfig-logpro (configf:lookup testconfig "logpro" stepname))
+	 (logpro-used    (common:file-exists? logpro-file)))
+    (setenv "MT_STEP_NAME" stepname)
+    (hash-table-set! all-steps-dat stepname `((params . ,paramparts)))
+    (debug:print 0 *default-log-port* "stepparts: " stepparts ", stepparams: " stepparams
+                 ", paramparts: " paramparts ", subrun: " subrun ", stepcmd: " stepcmd)
+    
+    (if (and tconfig-logpro
+	     (not logpro-used)) ;; no logpro file found but have a defn in the testconfig
+	(begin
+	  (with-output-to-file logpro-file
+	    (lambda ()
+	      (print ";; logpro file extracted from testconfig\n"
+		     ";;")
+	      (print tconfig-logpro)))
+	  (set! logpro-used #t)))
+    
+    ;; NB// can safely assume we are in test-area directory
+    (debug:print 4 *default-log-port* "ezsteps:\n stepname: " stepname " stepinfo: " stepinfo " stepparts: " stepparts
+		 " stepparams: " stepparams " stepcmd: " stepcmd)
+    
+    ;; ;; first source the previous environment
+    ;; (let ((prev-env (conc ".ezsteps/" prevstep (if (string-search (regexp "csh") 
+    ;;      							 (get-environment-variable "SHELL")) ".csh" ".sh"))))
+    ;;   (if (and prevstep (common:file-exists? prev-env))
+    ;;       (set! script (conc script "source " prev-env))))
+    
+    ;; call the command using mt_ezstep
+    ;; (set! script (conc "mt_ezstep " stepname " " (if prevstep prevstep "x") " " stepcmd))
+    
+    (debug:print 4 *default-log-port* "script: " script)
+    (rmt:teststep-set-status! run-id test-id stepname "start" "-" #f #f)
+    ;; now launch the actual process
+    (call-with-environment-variables 
+     (list (cons "PATH" (conc (get-environment-variable "PATH") ":.")))
+     (lambda () ;; (process-run "/bin/bash" "-c" "exec ls -l /tmp/foobar > /tmp/delme-more.log 2>&1")
+       (let* ((cmd (conc stepcmd " > " stepname ".log 2>&1")) ;; >outfile 2>&1 
+	      (pid #f))
+	 (let ((proc (lambda ()
+		       (set! pid (process-run "/bin/bash" (list "-c" cmd))))))
+	   (if subrun
+               (begin
+                 (debug:print-info 0 *default-log-port* "Running without MT_.* environment variables.")
+                 (common:without-vars proc "^MT_.*"))
+	       (proc)))
+	 
+         (with-output-to-file "Makefile.ezsteps"
+           (lambda ()
+             (print stepname ".log :")
+             (print "\t" cmd)
+             (if (common:file-exists? (conc stepname ".logpro"))
+                 (print "\tlogpro " stepname ".logpro " stepname ".html < " stepname ".log"))
+             (print)
+             (print stepname " : " stepname ".log")
+             (print))
+           #:append)
+
+	 (rmt:test-set-top-process-pid run-id test-id pid)
+	 (let processloop ((i 0))
+	   (let-values (((pid-val exit-status exit-code)(process-wait pid #t)))
+		       (mutex-lock! m)
+		       (launch:einf-pid-set!         exit-info pid)         ;; (vector-set! exit-info 0 pid)
+		       (launch:einf-exit-status-set! exit-info exit-status) ;; (vector-set! exit-info 1 exit-status)
+		       (launch:einf-exit-code-set!   exit-info exit-code)   ;; (vector-set! exit-info 2 exit-code)
+		       (mutex-unlock! m)
+		       (if (eq? pid-val 0)
+			   (begin
+			     (thread-sleep! 2)
+			     (processloop (+ i 1))))
+		       )))))
+    (debug:print-info 0 *default-log-port* "step " stepname " completed with exit code " (launch:einf-exit-code exit-info)) ;; (vector-ref exit-info 2))
+    ;; now run logpro if needed
+    (if logpro-used
+	(let* ((logpro-exe (or (getenv "LOGPRO_EXE") "logpro"))
+               (pid        (process-run (conc "/bin/sh -c '"logpro-exe" "logpro-file " " (conc stepname ".html") " < " stepname ".log > /dev/null'"))))
+	  (let processloop ((i 0))
+	    (let-values (((pid-val exit-status exit-code)(process-wait pid #t)))
+			(mutex-lock! m)
+			;; (make-launch:einf pid: pid exit-status: exit-status exit-code: exit-code)
+			(launch:einf-pid-set!         exit-info pid)         ;; (vector-set! exit-info 0 pid)
+			(launch:einf-exit-status-set! exit-info exit-status) ;; (vector-set! exit-info 1 exit-status)
+			(launch:einf-exit-code-set!   exit-info exit-code)   ;; (vector-set! exit-info 2 exit-code)
+			(mutex-unlock! m)
+			(if (eq? pid-val 0)
+			    (begin
+			      (thread-sleep! 2)
+			      (processloop (+ i 1)))))
+	    (debug:print-info 0 *default-log-port* "logpro for step " stepname " exited with code " (launch:einf-exit-code exit-info))))) ;; (vector-ref exit-info 2)))))
+    
+    (let ((exinfo (launch:einf-exit-code exit-info)) ;; (vector-ref exit-info 2))
+	  (logfna (if logpro-used (conc stepname ".html") ""))
+	  (comment #f))
+      (if logpro-used
+	  (let ((datfile (conc stepname ".dat")))
+	    ;; load the .dat file into the test_data table if it exists
+	    (if (common:file-exists? datfile)
+		(set! comment (launch:load-logpro-dat run-id test-id stepname)))
+	    (rmt:test-set-log! run-id test-id (conc stepname ".html"))))
+      (rmt:teststep-set-status! run-id test-id stepname "end" exinfo comment logfna))
+    ;; set the test final status
+    (let* ((process-exit-status (launch:einf-exit-code exit-info)) ;; (vector-ref exit-info 2))
+	   (this-step-status (cond
+			      ((and (eq? process-exit-status 2) logpro-used) 'warn)   ;; logpro 2 = warnings
+			      ((and (eq? process-exit-status 3) logpro-used) 'check)  ;; logpro 3 = check
+			      ((and (eq? process-exit-status 4) logpro-used) 'waived) ;; logpro 4 = waived
+			      ((and (eq? process-exit-status 5) logpro-used) 'abort)  ;; logpro 5 = abort
+			      ((and (eq? process-exit-status 6) logpro-used) 'skip)   ;; logpro 6 = skip
+			      ((eq? process-exit-status 0)                   'pass)   ;; logpro 0 = pass
+			      (else 'fail)))
+	   (overall-status   (cond
+			      ((eq? (launch:einf-rollup-status exit-info) 2) 'warn) ;; rollup-status (vector-ref exit-info 3)
+			      ((eq? (launch:einf-rollup-status exit-info) 0) 'pass) ;; (vector-ref exit-info 3)
+			      (else 'fail)))
+	   (next-status      (cond 
+			      ((eq? overall-status 'pass) this-step-status)
+			      ((eq? overall-status 'warn)
+			       (if (eq? this-step-status 'fail) 'fail 'warn))
+			      ((eq? overall-status 'abort) 'abort)
+			      (else 'fail)))
+	   (next-state       ;; "RUNNING") ;; WHY WAS THIS CHANGED TO NOT USE (null? tal) ??
+	    (cond
+	     ((null? tal) ;; more to run?
+	      "COMPLETED")
+	     (else "RUNNING"))))
+      (debug:print 4 *default-log-port* "Exit value received: " (launch:einf-exit-code exit-info) " logpro-used: " logpro-used 
+		   " this-step-status: " this-step-status " overall-status: " overall-status 
+		   " next-status: " next-status " rollup-status: "  (launch:einf-rollup-status exit-info)) ;; (vector-ref exit-info 3))
+      (case next-status
+	((warn)
+	 (launch:einf-rollup-status-set! exit-info 2) ;; (vector-set! exit-info 3 2) ;; rollup-status
+	 ;; NB// test-set-status! does rdb calls under the hood
+	 (tests:test-set-status! run-id test-id next-state "WARN" 
+				 (if (eq? this-step-status 'warn) "Logpro warning found" #f)
+				 #f))
+	((check)
+	 (launch:einf-rollup-status-set! exit-info 3) ;; (vector-set! exit-info 3 3) ;; rollup-status
+	 ;; NB// test-set-status! does rdb calls under the hood
+	 (tests:test-set-status! run-id test-id next-state "CHECK" 
+				 (if (eq? this-step-status 'check) "Logpro check found" #f)
+				 #f))
+	((waived)
+	 (launch:einf-rollup-status-set! exit-info 4) ;; (vector-set! exit-info 3 3) ;; rollup-status
+	 ;; NB// test-set-status! does rdb calls under the hood
+	 (tests:test-set-status! run-id test-id next-state "WAIVED" 
+				 (if (eq? this-step-status 'check) "Logpro waived found" #f)
+				 #f))
+	((abort)
+	 (launch:einf-rollup-status-set! exit-info 5) ;; (vector-set! exit-info 3 4) ;; rollup-status
+	 ;; NB// test-set-status! does rdb calls under the hood
+	 (tests:test-set-status! run-id test-id next-state "ABORT" 
+				 (if (eq? this-step-status 'abort) "Logpro abort found" #f)
+				 #f))
+	((skip)
+	 (launch:einf-rollup-status-set! exit-info 6) ;; (vector-set! exit-info 3 4) ;; rollup-status
+	 ;; NB// test-set-status! does rdb calls under the hood
+	 (tests:test-set-status! run-id test-id next-state "SKIP" 
+				 (if (eq? this-step-status 'skip) "Logpro skip found" #f)
+				 #f))
+	((pass)
+	 (tests:test-set-status! run-id test-id next-state "PASS" #f #f))
+	(else ;; 'fail
+	 (launch:einf-rollup-status-set! exit-info 1) ;; (vector-set! exit-info 3 1) ;; force fail, this used to be next-state but that doesn't make sense. should always be "COMPLETED" 
+	 (tests:test-set-status! run-id test-id "COMPLETED" "FAIL" (conc "Failed at step " stepname) #f)
+	 )))
+    logpro-used))
+
+(define (ezsteps:run-from testdat start-step-name run-one)
+  ;;# TODO - recapture item variables, debug repeated step eval; regen logpro from test
+  (let* ((do-update-test-state-status #f)
+         (test-run-dir  ;; (filedb:get-path *fdb* 
+	  (db:test-get-rundir testdat)) ;; )
+	 (bigmodenv     (module-environment 'bigmod))
+	 (testconfig    (configf:read-config (conc test-run-dir "/testconfig") #f #t environ-patt: "pre-launch-env-vars" env-to-use: bigmodenv))
+	 (ezstepslst    (hash-table-ref/default testconfig "ezsteps" '()))
+	 (run-mutex     (make-mutex))
+	 (rollup-status 0)
+         (rollup-status-string #f)
+         (rollup-status-sym #f)
+	 (exit-info     (vector #t #t #t))
+	 (test-id       (db:test-get-id        testdat))
+	 (run-id        (db:test-get-run_id    testdat))
+	 (test-name     (db:test-get-testname  testdat))
+         (orig-test-state (db:test-get-state   testdat))
+         (orig-test-status (db:test-get-status testdat))
+	 (kill-job      #f) ;; for future use (on re-factoring with launch.scm code
+	 (the-step-params '())) ;; not exactly "functional"
+
+    ;; keep trying till NFS deigns to populate test run dir on this host
+    (let loop ((count 5))
+      (if (not (common:file-exists? test-run-dir))
+	  ;;(push-directory test-run-dir)
+	  (if (> count 0)
+	      (begin
+		(debug:print 0 *default-log-port* "WARNING: ezsteps attempting to run but test run directory " test-run-dir " is not there. Waiting and trying again " count " more times")
+		(sleep 3)
+		(loop (- count 1))))))
+    
+    (debug:print-info 0 *default-log-port* "Running in directory " test-run-dir)
+    (if (not (common:file-exists? ".ezsteps"))(create-directory ".ezsteps"))
+    ;; if ezsteps was defined then we are sure to have at least one step but check anyway
+    
+    (if (not (> (length ezstepslst) 0))
+	(if message-window
+	    (message-window "ERROR: You can only re-run steps defined via ezsteps")
+	    (debug:print 0 *default-log-port* "ERROR: You can only re-run steps defined via ezsteps"))
+	(begin
+	  (let loop ((ezstep   (car ezstepslst))
+		     (tal      (cdr ezstepslst))
+                     (status-sym-so-far 'pass)
+		     ;;(runflag  #f)
+                     (saw-start-step-name #f)) ;; flag used to skip steps when not starting at the beginning
+	    (if (or (vector-ref exit-info 1)
+		    (equal? (alist-ref 'keep-going the-step-params) 'yes))
+		(let* ((prev-step-params the-step-params) ;; need to snag this now
+		       (stepname    (car ezstep))  ;; do stuff to run the step
+                       (logpro-used (common:file-exists? (conc test-run-dir "/" stepname ".logpro")))
+		       (stepinfo    (cadr ezstep))
+		       (stepparts   (string-match (regexp "^(\\{([^\\}]*)\\}\\s*|)(.*)$") stepinfo))
+		       (stepparms   (list-ref stepparts 2)) ;; for future use, {VAR=1,2,3}, run step for each 
+		       (stepcmd     (list-ref stepparts 3))
+		       (script      (conc "mt_ezstep '"test-run-dir"' '"stepname"' '"stepcmd"'")) ;; call the command using mt_ezstep
+                       (saw-start-step-name-next (or saw-start-step-name (equal? stepname start-step-name)))
+                       (proceed-with-this-step
+                        (or (not start-step-name)
+                            (equal? stepname start-step-name)
+                            (and saw-start-step-name (not run-one))
+                            saw-start-step-name-next
+                            (and start-step-name (equal? stepname start-step-name))))
+                       )
+		  (debug:print 0 *default-log-port* "NOTE: stepparms=" stepparms)
+		  (set! prev-step-params stepparms)
+                  (set! do-update-test-state-status (and proceed-with-this-step (null? tal)))
+                  ;;(BB> "stepname="stepname" proceed-with-this-step="proceed-with-this-step " do-update-test-state-status="do-update-test-state-status " orig-test-state="orig-test-state" orig-test-status="orig-test-status)
+                  (cond
+                   ((and (not proceed-with-this-step) (null? tal))
+                    'done)
+                   ((not proceed-with-this-step)
+                      (loop (car tal)
+                            (cdr tal)
+                            status-sym-so-far
+                            saw-start-step-name-next))
+                   (else
+		    (debug:print 4 *default-log-port* "ezsteps:\n stepname: " stepname " stepinfo: " stepinfo " stepparts: " stepparts
+			         " stepparms: " stepparms " stepcmd: " stepcmd)
+		    (debug:print 4 *default-log-port* "script: " script)
+		    (rmt:teststep-set-status! run-id test-id stepname "start" "-" #f #f)
+
+		    ;; now launch the script
+		    (let ((pid (process-run script)))
+		      (let processloop ((i 0))
+		        (let-values (((pid-val exit-status exit-code)(process-wait pid #t)))
+			  (mutex-lock! run-mutex)
+			  (vector-set! exit-info 0 pid)
+			  (vector-set! exit-info 1 exit-status)
+			  (vector-set! exit-info 2 exit-code)
+			  (mutex-unlock! run-mutex)
+			  (if (eq? pid-val 0)
+			      (begin
+			        (thread-sleep! 1)
+			        (processloop (+ i 1))))
+			  ))
+		      (let ((exinfo (vector-ref exit-info 2))
+			    (logfna (if logpro-used (conc stepname ".html") "")))
+		        (rmt:teststep-set-status! run-id test-id stepname "end" exinfo #f logfna))
+                      
+		      (if logpro-used
+			  (rmt:test-set-log! run-id test-id (conc stepname ".html")))
+                      
+		      ;; set the test final status
+		      (let* ((this-step-status      (cond
+                                                     (logpro-used
+                                                      (common:logpro-exit-code->status-sym (vector-ref exit-info 2)))
+					             ((eq? (vector-ref exit-info 2) 0)
+                                                      'pass)
+					             (else
+                                                      'fail)))
+			     (overall-status-sym    (common:worse-status-sym this-step-status status-sym-so-far))
+                             (overall-status-string (status-sym->string overall-status-sym)))
+		        (debug:print 4 *default-log-port* "Exit value received: " (vector-ref exit-info 2) " logpro-used: " logpro-used 
+				     " this-step-status: " this-step-status " overall-status: " overall-status-sym) 
+		        ;;" next-status: " next-status " rollup-status: " rollup-status)
+                        (set! rollup-status-string overall-status-string)
+                        (set! rollup-status-sym overall-status-sym)
+                        (tests:test-set-status! run-id test-id "RUNNING" overall-status-string #f #f)))
+
+                    (if (and
+                         (not run-one)
+                         (common:steps-can-proceed-given-status-sym rollup-status-sym)
+                         (not (null? tal)))
+                        (loop (car tal)
+                              (cdr tal)
+                              rollup-status-sym
+                              saw-start-step-name-next)))))
+		(debug:print 4 *default-log-port* "WARNING: a prior step failed, stopping at " ezstep)))
+	  
+	  ;; Once done with step/steps update the test record
+	  ;;
+	  (let* ((item-path (db:test-get-item-path testdat)) ;; (item-list->path itemdat))
+		 (testinfo  (rmt:get-testinfo-state-status run-id test-id))) ;; refresh the testdat, call it iteminfo in case need prev/curr
+	    ;; Am I completed?
+	    (if (equal? (db:test-get-state testinfo) "RUNNING") ;; (not (equal? (db:test-get-state testinfo) "COMPLETED"))
+		(let ((new-state  (if kill-job "KILLED" "COMPLETED") ;; (if (eq? (vector-ref exit-info 2) 0) ;; exited with "good" status
+				  ;; "COMPLETED"
+				  ;; (db:test-get-state testinfo)))   ;; else preseve the state as set within the test
+				  )
+                      (new-status rollup-status-string)
+                      ) ;; (db:test-get-status testinfo)))
+		  (debug:print-info 2 *default-log-port* "Test NOT logged as COMPLETED, (state=" (db:test-get-state testinfo) "), updating result, rollup-status is " rollup-status)
+		  (tests:test-set-status! run-id test-id 
+					  (if do-update-test-state-status new-state orig-test-state)
+					  (if do-update-test-state-status new-status orig-test-status)
+					  (args:get-arg "-m") #f)
+		  ;; need to update the top test record if PASS or FAIL and this is a subtest
+		  (if (and (not (equal? item-path "")) do-update-test-state-status)
+                      (rmt:set-state-status-and-roll-up-items run-id test-name item-path new-state new-status #f))))
+	    ;; for automated creation of the rollup html file this is a good place...
+	    (if (not (equal? item-path ""))
+	      (tests:summarize-items run-id test-id test-name #f)) ;; don't force - just update if no
+	    )))
+    ;;(pop-directory)
+    rollup-status-string))
+
+(define (ezsteps:spawn-run-from testdat start-step-name run-one)
+  (thread-start! 
+   (make-thread
+    (lambda ()
+      (ezsteps:run-from testdat start-step-name run-one))
+    (conc "ezstep run single step " start-step-name " run-one="run-one)))
+  )
+
+;; return (conc status ": " comment) from the final section so that
+;;   the comment can be set in the step record in launch.scm
+;;
+(define (launch:load-logpro-dat run-id test-id stepname)
+  (let ((cname (conc stepname ".dat")))
+    (if (common:file-exists? cname)
+	(let* ((dat  (configf:read-config cname #f #f))
+	       (csvr (db:logpro-dat->csv dat stepname))
+	       (csvt (let-values (((fmt-cell fmt-record fmt-csv) (make-format ",")))
+		       (fmt-csv (map list->csv-record csvr))))
+	       (status (configf:lookup dat "final" "exit-status"))
+	       (msg     (configf:lookup dat "final" "message")))
+          (if csvt  ;; this if blocked stack dump caused by .dat file from logpro being 0-byte.  fixed by upgrading logpro
+              (rmt:csv->test-data run-id test-id csvt)
+	      (debug:print 0 *default-log-port* "ERROR: no csvdat exists for run-id: " run-id " test-id: " test-id " stepname: " stepname ", check that logpro version is 1.15 or newer"))
+	  ;;  (debug:print-info 13 *default-log-port* "Error: run-id/test-id/stepname="run-id"/"test-id"/"stepname" => bad csvr="csvr)
+	  ;;  )
+	  (cond
+	   ((equal? status "PASS") "PASS") ;; skip the message part if status is pass
+	   (status (conc (configf:lookup dat "final" "exit-status") ": " (if msg msg "no message")))
+	   (else #f)))
+	#f)))
+
+
+)

DELETED fs-transport.scm
Index: fs-transport.scm
==================================================================
--- fs-transport.scm
+++ /dev/null
@@ -1,52 +0,0 @@
-
-;; Copyright 2006-2012, Matthew Welland.
-;; 
-;; This file is part of Megatest.
-;; 
-;;     Megatest is free software: you can redistribute it and/or modify
-;;     it under the terms of the GNU General Public License as published by
-;;     the Free Software Foundation, either version 3 of the License, or
-;;     (at your option) any later version.
-;; 
-;;     Megatest is distributed in the hope that it will be useful,
-;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;     GNU General Public License for more details.
-;; 
-;;     You should have received a copy of the GNU General Public License
-;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
-
-(require-extension (srfi 18) extras tcp s11n)
-
-(use sqlite3 srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest)
-(import (prefix sqlite3 sqlite3:))
-
-(use spiffy uri-common intarweb http-client spiffy-request-vars)
-
-(tcp-buffer-size 2048)
-
-(declare (unit fs-transport))
-
-(declare (uses common))
-(declare (uses db))
-(declare (uses tests))
-(declare (uses tasks)) ;; tasks are where stuff is maintained about what is running.
-
-(include "common_records.scm")
-(include "db_records.scm")
-
-
-;;======================================================================
-;; F S   T R A N S P O R T   S E R V E R
-;;======================================================================
-
-;; There is no "server" per se but a convience routine to make it non
-;; necessary to be reopening the db over and over again.
-;;
-
-(define (fs:process-queue-item packet)
-  (if (not *dbstruct-db*) ;; we will require that (setup-for-run) has already been called
-      (set! *dbstruct-db* (db:setup-db)))
-  (debug:print-info 11 *default-log-port* "fs:process-queue-item called with packet=" packet)
-  (db:process-queue-item *dbstruct-db* packet))
-      

Index: gen-data-for-graph.scm
==================================================================
--- gen-data-for-graph.scm
+++ gen-data-for-graph.scm
@@ -31,21 +31,21 @@
  (lambda ()
    (loop ((for m (up-from (/ one-year-ago 60) (to (/ now 60))))) ;; days of the year
 	 (let ((thetime (* m 60))
 	       (thehour (round (/ m 60))))
 	   (let loop ((lastsec -1)
-		      (sec     (random 60))
+		      (sec     (pseudo-random-integer 60))
 		      (count   0))
 	     (if (> sec lastsec)
 		 (exec (sql db "INSERT INTO alldat (event_time,var,val) VALUES (?,?,?)")
 		       (+ thetime sec) ;; (* sec 60))
 		       "stuff" 
 		       (if (even? thehour)
-			   (random 1000)
-			   (random 6))))
+			   (pseudo-random-integer 1000)
+			   (pseudo-random-integer 6))))
 	     (if (< count 20)
-		 (loop (max sec lastsec)(random 60)(+ count 1))))))))
+		 (loop (max sec lastsec)(pseudo-random-integer 60)(+ count 1))))))))
 
 (close-database db)
 
 
 ;; (with-transaction
@@ -55,18 +55,18 @@
 ;; 	 (print "Day: " d)
 ;; 	 (loop ((for h (up-from 1 (to 24))))
 ;; 	     (loop ((for m (up-from 1 (to 60))))
 ;; 		   (let ((thetime (+ beginning-2016 (* 365 24 60 60)(* h 60 60)(* m 60))))
 ;; 		     (let loop ((lastsec -1)
-;; 				(sec     (random 60))
+;; 				(sec     (pseudo-random-integer 60))
 ;; 				(count   0))
 ;; 		       (if (> sec lastsec)
 ;; 			   (exec (sql db "INSERT INTO alldat (event_time,var,val) VALUES (?,?,?)")
 ;; 				 (+ thetime sec) ;; (* sec 60))
 ;; 				 "stuff" 
 ;; 				 (if (even? h)
-;; 				     (random 100)
-;; 				     (random 6))))
+;; 				     (pseudo-random-integer 100)
+;; 				     (pseudo-random-integer 6))))
 ;; 		       (if (< count 20)
-;; 			   (loop (max sec lastsec)(random 60)(+ count 1))))))))))
+;; 			   (loop (max sec lastsec)(pseudo-random-integer 60)(+ count 1))))))))))
 ;; 
 ;; (close-database db)

Index: genexample.scm
==================================================================
--- genexample.scm
+++ genexample.scm
@@ -16,14 +16,14 @@
 ;;     You should have received a copy of the GNU General Public License
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;======================================================================
 
-(declare (unit genexample))
-(use posix regex matchable)
-
-(include "db_records.scm")
+;; (declare (unit genexample))
+;; (use posix regex matchable)
+;; 
+;; (include "db_records.scm")
 
 (define genexample:example-logpro
 #<<EOF
   ;; You should have at least one expect:required. This ensures that your process ran
   ;; comment out the line below and replace "put pattern here" with a pattern that will

ADDED   hostinfo.scm
Index: hostinfo.scm
==================================================================
--- /dev/null
+++ hostinfo.scm
@@ -0,0 +1,23 @@
+;;======================================================================
+;; Copyright 2019, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
+
+;;======================================================================
+
+(declare (unit hostinfo))
+
+(include "hostinfo/hostinfo.scm")

ADDED   hostinfo/hostinfo.h
Index: hostinfo/hostinfo.h
==================================================================
--- /dev/null
+++ hostinfo/hostinfo.h
@@ -0,0 +1,61 @@
+#ifdef _WIN32
+# include <winsock2.h>
+# include <ws2tcpip.h>
+
+const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt)
+{
+        if (af == AF_INET)
+        {
+                struct sockaddr_in in;
+                memset(&in, 0, sizeof(in));
+                in.sin_family = AF_INET;
+                memcpy(&in.sin_addr, src, sizeof(struct in_addr));
+                getnameinfo((struct sockaddr *)&in, sizeof(struct
+sockaddr_in), dst, cnt, NULL, 0, NI_NUMERICHOST);
+                return dst;
+        }
+        else if (af == AF_INET6)
+        {
+                struct sockaddr_in6 in;
+                memset(&in, 0, sizeof(in));
+                in.sin6_family = AF_INET6;
+                memcpy(&in.sin6_addr, src, sizeof(struct in_addr6));
+                getnameinfo((struct sockaddr *)&in, sizeof(struct
+sockaddr_in6), dst, cnt, NULL, 0, NI_NUMERICHOST);
+                return dst;
+        }
+        return NULL;
+}
+
+int inet_pton(int af, const char *src, void *dst)
+{
+        struct addrinfo hints, *res, *ressave;
+
+        memset(&hints, 0, sizeof(struct addrinfo));
+        hints.ai_family = af;
+
+        if (getaddrinfo(src, NULL, &hints, &res) != 0)
+        {
+                return -1;
+        }
+
+        ressave = res;
+
+        while (res)
+        {
+                memcpy(dst, res->ai_addr, res->ai_addrlen);
+                res = res->ai_next;
+        }
+
+        freeaddrinfo(ressave);
+        return 0;
+}
+
+#else
+ # include <sys/types.h>
+ # include <sys/socket.h>
+ # include <netinet/in.h>  /* in_addr */
+# include <arpa/inet.h>   /* inet_ntop, ... */
+# include <netdb.h>       /* hostent, gethostby* */
+# include <unistd.h>
+#endif

ADDED   hostinfo/hostinfo.meta
Index: hostinfo/hostinfo.meta
==================================================================
--- /dev/null
+++ hostinfo/hostinfo.meta
@@ -0,0 +1,9 @@
+;;; hostinfo.meta -*- Hen -*-
+((synopsis "Look up host, protocol, and service information")
+ (author "Jim Ursetto")
+ (needs vector-lib foreigners)
+ (egg "hostinfo.egg")
+ (files "hostinfo.h" "hostinfo.meta" "hostinfo.scm" "hostinfo.setup")
+ (license "BSD")
+ (doc-from-wiki)
+ (category net))

ADDED   hostinfo/hostinfo.scm
Index: hostinfo/hostinfo.scm
==================================================================
--- /dev/null
+++ hostinfo/hostinfo.scm
@@ -0,0 +1,489 @@
+;;; hostinfo extension to Chicken Scheme
+;;; Description: Look up host, service, and protocol information
+
+;; Copyright (c) 2005-2008, Jim Ursetto.  All rights reserved.
+;;
+;; Redistribution and use in source and binary forms, with or without
+;; modification, are permitted provided that the following conditions are met:
+;;
+;;   Redistributions of source code must retain the above copyright notice,
+;;   this list of conditions and the following disclaimer. Redistributions in
+;;   binary form must reproduce the above copyright notice, this list of
+;;   conditions and the following disclaimer in the documentation and/or
+;;   other materials provided with the distribution. Neither the name of the
+;;   author nor the names of its contributors may be used to endorse or
+;;   promote products derived from this software without specific prior
+;;   written permission.
+;;
+;; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+;; IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+;; THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+;; PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR
+;; CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+;; EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+;; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+;; PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+;; LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+;; NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+;; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+;;;
+
+;; This extension performs host, protocol and service information lookups
+;; via underlying calls to gethostbyname(3), getprotobyname(3), and
+;; getservbyname(3).  Depending on your system, this may consult DNS,
+;; NIS, /etc/hosts, /etc/services, /etc/protocols, and so on.
+
+;; A simple interface is provided for the most commmon queries. Also
+;; provided is a more comprehensive interface using records, which
+;; contain all data available in a lookup.
+
+;; IP addresses are represented by 4 (IPv4) or 16 (IPv6) byte
+;; u8vectors. The interface requires, and returns, addresses in this
+;; format; functions are provided to convert between the string and
+;; u8vector representations. However, the "do what I want" procedures
+;; (e.g. host-information) will do the conversion for you.
+
+;; Caveats:
+;; - IPv6 addresses can be converted to and from strings, and the underlying structure
+;;   supports IPv6, but lookup of IPv6 addresses and records is not currently implemented.
+;; - array0->string-vector and array0->bytevector-vector contain redundant code.
+;; - host, services, and protocol-information check their argument types, even
+;;   though the underlying code already does it.
+
+(declare
+ (fixnum))
+
+(cond-expand [paranoia]
+             [else
+              (declare (no-bound-checks))])
+
+#> #include "../hostinfo/hostinfo.h" <#
+
+;; (require-extension srfi-4 lolevel posix)
+
+(module hostinfo
+;;; Short and sweet lookups
+  (current-hostname
+   hostname->ip ip->hostname
+   protocol-name->number protocol-number->name
+   service-port->name service-name->port
+;;; Entire host, protocol or service record lookup
+   hostname->hostinfo ip->hostinfo
+   protocol-name->protoinfo protocol-number->protoinfo
+   service-port->servinfo service-name->servinfo
+;;; Record accessors and predicates
+   hostinfo? hostinfo-name hostinfo-aliases hostinfo-addresses
+   hostinfo-address hostinfo-type hostinfo-length
+   protoinfo? protoinfo-name protoinfo-aliases protoinfo-number
+   servinfo? servinfo-name servinfo-aliases servinfo-port servinfo-protocol
+;;; One-stop shops -- does what you want
+   host-information protocol-information service-information
+;;; Utilities
+   string->ip ip->string)
+
+  (import chicken.fixnum chicken.string chicken.blob srfi-2 scheme
+          typed-records srfi-9 chicken.foreign srfi-4 chicken.base
+	  foreigners system-information
+	  chicken.format)
+
+  (define (vector-map p v0)   ; to avoid linking in vector-lib
+    (let* ((len (vector-length v0))
+           (v (make-vector len)))
+      (do ((i 0 (+ i 1)))
+          ((>= i len) v)
+        (vector-set! v i
+                     (p i (vector-ref v0 i))))))
+
+  (cond-expand [unsafe
+                (eval-when (compile)
+                           (define-inline (##sys#check-string . r)
+                             (##core#undefined))) ]
+               [else])
+
+;;; C data structure conversions
+
+  (define (c-pointer->blob ptr len)
+    (let ((bv (make-blob len))
+          (memcpy (foreign-lambda bool "C_memcpy" blob c-pointer integer)))
+      (memcpy bv ptr len)
+      bv))
+
+;; Convert from null-terminated array of c-strings to vector of strings.
+;; These functions use C_alloc and so are not suitable for large datasets.
+;; Note: get_argv_2 of runtime.c shows how to build a list instead of a vector (in reverse).
+  (define array0->string-vector
+    (foreign-primitive scheme-object (((c-pointer "char *") list)) "
+    char **p; int len = 0;
+    C_word *a, vec, *elt;
+
+    for (p = list; *p; ++p, ++len);
+
+    a = C_alloc(C_SIZEOF_VECTOR(len));
+    vec = (C_word)a;
+    *a++ = C_make_header(C_VECTOR_TYPE, len);
+
+    for (p = list; *p; ++p) {
+       len = strlen(*p);
+       elt = C_alloc(C_SIZEOF_STRING(len));
+       /* Both C_mutate and *a++ =  seem to work fine here. */
+       C_mutate(a++, C_string(&elt, len, *p));
+    }
+    return(vec);"
+                       ))
+
+  ;; Convert from null-terminated array of IP addresses to vector of strings.
+  (define array0->bytevector-vector
+    (foreign-primitive scheme-object (((c-pointer "char *") list) (integer addrlen)) "
+    char **p; int len = 0;
+    C_word *a, vec, *elt;
+
+    for (p = list; *p; ++p, ++len);
+
+    a = C_alloc(C_SIZEOF_VECTOR(len));
+    vec = (C_word)a;
+    *a++ = C_make_header(C_VECTOR_TYPE, len);
+
+    for (p = list; *p; ++p) {
+       elt = C_alloc(C_SIZEOF_STRING(addrlen));
+       C_mutate(a++, C_bytevector(&elt, addrlen, *p));
+    }
+    return(vec);"
+                       ))
+
+  ;; Not currently used.  Could make the array0-> stuff somewhat cleaner.
+  ;; (define array0-length
+  ;;   (foreign-lambda* integer (((pointer "void *") list)) #<<EOF
+  ;;     void **p; int len = 0;
+  ;;     for (p = list; *p; ++p, ++len);
+  ;;     return(len);
+  ;; EOF
+  ;; ))
+
+;;; string->ip conversion
+
+  ;; inet_pton does not like "127.1", nor "0", nor any other non-standard
+  ;; representation of IP addresses.  This is specified by RFC2553.
+  ;; inet_aton resolves these addresses.  We use inet_pton here.
+
+  (define-foreign-variable inet4-addrstrlen integer "INET_ADDRSTRLEN")
+  (define-foreign-variable inet6-addrstrlen integer "INET6_ADDRSTRLEN")
+  (define-foreign-variable af-inet  integer "AF_INET")
+  (define-foreign-variable af-inet6 integer "AF_INET6")
+
+  (define inet-ntop (foreign-lambda c-string "inet_ntop" integer u8vector c-string integer))
+  (define inet-pton (foreign-lambda* bool ((integer type) (c-string src) (blob dest))
+                                     "return(inet_pton(type, src, dest) == 1);"))
+
+  (define (string->ip4 str)
+    (##sys#check-string str 'string->ip4)
+    (let ((bv (make-blob 4)))
+      (and (inet-pton af-inet str bv)
+           (blob->u8vector bv))))
+
+  (define (string->ip6 str)
+    (##sys#check-string str 'string->ip6)
+    (let ((bv (make-blob 16)))
+      (and (inet-pton af-inet6 str bv)
+           (blob->u8vector bv))))
+
+  (define (string->ip str)
+    (or (string->ip4 str)
+        (string->ip6 str)))
+
+;;; ip->string conversion
+
+  (define (ip4->string addr)
+    (let ((len inet4-addrstrlen))
+      (inet-ntop af-inet addr (make-string len) len)))
+
+  (define (ip6->string addr)
+    (let ((len inet6-addrstrlen))
+      (inet-ntop af-inet6 addr (make-string len) len)))
+
+  ;; Take an IPv4 or IPv6 u8vector and convert it into the
+  ;; appropriate string representation, via inet_ntop.
+  (define (ip->string addr)
+    (let ((len (u8vector-length addr)))
+      (cond ((fx= len 4)  (ip4->string addr))
+            ((fx= len 16) (ip6->string addr))
+            (else
+             (error "Invalid IP address length" addr)))))
+
+;;; hostent raw structure
+
+  (define-foreign-record-type (hostent "struct hostent")
+    (c-string h_name hostent-name)
+    (c-pointer h_aliases hostent-h_aliases)
+    (integer h_addrtype hostent-addrtype)
+    (integer h_length hostent-length)
+    (c-pointer h_addr_list hostent-addr-list))
+
+  ;; Some convenient accessors for the raw hostent structure--with raw c pointers
+  ;; converted to the appropriate scheme objects.  We only use these once or twice
+  ;; below, so their main advantage is clarity.
+  (define (hostent-aliases h)
+    (array0->string-vector (hostent-h_aliases h)))
+  (define (hostent-address h)
+    (let* ((get-addr (foreign-lambda* c-pointer ((hostent h)) "return(h->h_addr_list[0]);"))
+           (addr (get-addr h)))
+      (blob->u8vector
+       (c-pointer->blob addr (hostent-length h)))))
+  (define (hostent-addresses h)
+    (vector-map (lambda (i x) (blob->u8vector x))
+                (array0->bytevector-vector (hostent-addr-list h)
+                                           (hostent-length h))))
+  ;; The IPv6 equivalents of these are getipnodebyname and
+  ;; getipnodebyaddr.
+  (define gethostent/name (foreign-lambda hostent "gethostbyname" c-string))
+
+  (define (gethostent/addr addr)
+    (if (fx= (u8vector-length addr) 4)
+        (gethostent/addr/bv (u8vector->blob addr))
+        (error "invalid IP address length; only IPv4 supported" addr)))
+
+  ;; Warning: handle IPv6!!
+  (define gethostent/addr/bv (foreign-lambda* hostent ((blob addr))
+                                              "return(gethostbyaddr((const char *)addr, 4, AF_INET));"))
+
+  ;; This was originally made a macro so we could easily return multiple
+  ;; values -- but we're now returning a hostinfo structure.  Eh.
+  (define (hostent->hostinfo h)
+    (make-hostinfo (hostent-name h)
+                   (hostent-addresses h)
+                   (hostent-aliases h)))
+
+;;; hostinfo and host information
+
+  ;; The standard host name for the current processor.
+  ;; Gets & Sets, error otherwise.
+
+  (define set-host-name!
+    (foreign-lambda* int ((c-string name))
+                     "return(sethostname(name, strlen(name)));"))
+
+  (define (current-hostname . args)
+    (if (null? args)
+        (get-host-name)
+        (and (zero? (set-host-name! (->string (car args))))
+             (error 'current-hostname "cannot set hostname"))))
+
+  ;; Structure accessors created by define-foreign-record do not intercept
+  ;; NULL pointer input, including #f.
+  (define (hostname->ip host)
+    (and-let* ((h (gethostent/name host)))
+      (hostent-address h)))
+
+  (define (hostname->hostinfo host)
+    (and-let* ((h (gethostent/name host)))
+      (hostent->hostinfo h)))
+
+  (define (ip->hostname addr)
+    (and-let* ((h (gethostent/addr addr)))
+      (hostent-name h)))
+
+  (define (ip->hostinfo addr)
+    (and-let* ((h (gethostent/addr addr)))
+      (hostent->hostinfo h)))
+
+  ;; A simple hostinfo structure.
+  (define-record-type hostinfo
+    (make-hostinfo name addresses aliases)
+    hostinfo?
+    (name hostinfo-name)
+    (addresses hostinfo-addresses)
+    (aliases hostinfo-aliases))
+
+  ;; "Accessors" for phantom fields.
+  ;; We don't need to store length or type, as these are artifacts
+  ;; of the C implementation, and can be derived from the address itself.
+  (define (hostinfo-address h) (vector-ref (hostinfo-addresses h) 0))
+  (define (hostinfo-length h) (u8vector-length (hostinfo-address h)))
+  (define (hostinfo-type h)
+    (let ((len (u8vector-length (hostinfo-address h))))
+      (cond ((fx= len 4)  'AF_INET)   ;; Kind of a dummy implementation--
+            ((fx= len 16) 'AF_INET6)  ;; not sure what value would be appropriate
+            (else
+             (error "Invalid IP address length" (hostinfo-address h))))))
+
+  ;; Format the structure for easy interactive viewing--should be possible to
+  ;; add a ctor for this representation, though it's not clear why you'd want to.
+  (define-record-printer (hostinfo h port)
+    (fprintf port "#,(hostinfo name: ~S addresses: ~S aliases: ~S)"
+             (hostinfo-name h) (hostinfo-addresses h) (hostinfo-aliases h)))
+
+  ;; Warning:  lookup of an IP address which is invalid yet numeric will
+  ;; return a false positive.  Bug in gethostbyname?
+  ;; E.g.  (hostname->hostinfo "1") => #,(hostinfo name: "1" addresses: (#u8(0 0 0 1)))
+  ;; ** If we used inet_aton for string->ip, then these cases would
+  ;; be transformed into u8vector IPs, and the lookup would correctly fail.
+
+  ;; Return a hostinfo record.  HOST is a u8vector IP address, a string
+  ;; hostname, or a string numeric IP address.
+  (define (host-information host)
+    (if (u8vector? host)
+        (ip->hostinfo host)
+        (begin
+          (##sys#check-string host 'host-information)
+          (cond ((string->ip host) => ip->hostinfo)
+                (else (hostname->hostinfo host))))))
+
+;;; protocols
+
+  (define-foreign-record-type (protoent "struct protoent")
+    (c-string p_name protoent-name)
+    (c-pointer p_aliases protoent-p_aliases)
+    (integer p_proto protoent-proto))
+
+  (define getprotoent/name   (foreign-lambda protoent "getprotobyname" c-string))
+  (define getprotoent/number (foreign-lambda protoent "getprotobynumber" integer))
+
+  ;; Raw structure -> scheme-object accessors
+  (define (protoent-aliases p)
+    (array0->string-vector (protoent-p_aliases p)))
+
+  (define-record-type protoinfo
+    (make-protoinfo name number aliases)
+    protoinfo?
+    (name protoinfo-name)
+    (number protoinfo-number)
+    (aliases protoinfo-aliases))
+
+  (define-record-printer (protoinfo p port)
+    (fprintf port "#,(protoinfo name: ~S number: ~S aliases: ~S)"
+             (protoinfo-name p) (protoinfo-number p) (protoinfo-aliases p)))
+
+  (define (protocol-name->number name)
+    (and-let* ((p (getprotoent/name name)))
+      (protoent-proto p)))
+  (define (protocol-number->name nr)
+    (and-let* ((p (getprotoent/number nr)))
+      (protoent-name p)))
+
+  (define (protoent->protoinfo p)
+    (make-protoinfo (protoent-name p)
+                    (protoent-proto p)
+                    (protoent-aliases p)))
+
+  (define (protocol-name->protoinfo name)
+    (and-let* ((p (getprotoent/name name)))
+      (protoent->protoinfo p)))
+  (define (protocol-number->protoinfo nr)
+    (and-let* ((p (getprotoent/number nr)))
+      (protoent->protoinfo p)))
+
+  (define (protocol-information proto)
+    (if (fixnum? proto)
+        (protocol-number->protoinfo proto)
+        (begin
+          (##sys#check-string proto 'protocol-information)
+          (protocol-name->protoinfo proto))))
+
+;;; services
+
+  (define-foreign-type port-number int
+    (foreign-lambda int "htons" int)
+    (foreign-lambda int "ntohs" int) )
+
+  (define-foreign-record-type (servent "struct servent")
+    (c-string s_name servent-name)
+    (c-pointer s_aliases servent-s_aliases)
+    (port-number s_port servent-port)
+    (c-string s_proto servent-proto))
+
+  (define (servent->servinfo s)
+    (make-servinfo (servent-name s)
+                   (servent-port s)
+                   (array0->string-vector
+                    (servent-s_aliases s))
+                   (servent-proto s)))
+
+  (define getservent/name (foreign-lambda servent "getservbyname" c-string c-string))
+  (define getservent/port (foreign-lambda servent "getservbyport" port-number c-string))
+
+  (define-record-type servinfo
+    (make-servinfo name port aliases protocol)
+    servinfo?
+    (name servinfo-name)
+    (port servinfo-port)
+    (aliases servinfo-aliases)
+    (protocol servinfo-protocol))
+
+  (define-record-printer (servinfo s port)
+    (fprintf port "#,(servinfo name: ~S port: ~S aliases: ~S protocol: ~S)"
+             (servinfo-name s) (servinfo-port s) (servinfo-aliases s) (servinfo-protocol s)))
+
+  ;; If provided with the optional protocol argument (a string), these will
+  ;; restrict their search to that protocol.
+  (define (service-name->port name . pr)
+    (let-optionals pr ((proto #f))
+                   (and-let* ((s (getservent/name name proto)))
+                     (servent-port s))))
+  (define (service-port->name port . pr)
+    (let-optionals pr ((proto #f))
+                   (and-let* ((s (getservent/port port proto)))
+                     (servent-name s))))
+  (define (service-name->servinfo name . pr)
+    (let-optionals pr ((proto #f))
+                   (and-let* ((s (getservent/name name proto)))
+                     (servent->servinfo s))))
+  (define (service-port->servinfo port . pr)
+    (let-optionals pr ((proto #f))
+                   (and-let* ((s (getservent/port port proto)))
+                     (servent->servinfo s))))
+
+  ;; Return service information given a service name or port, and an
+  ;; optional protocol name or number to restrict the search to.
+  ;; Note: if the protocol-number->name lookup fails,
+  ;; an error is thrown, as this was probably not intended.
+  (define (service-information service . pr)
+    (let-optionals pr ((proto #f))
+                   (let ((proto (if (fixnum? proto)
+                                    (or (protocol-number->name proto)
+                                        (error 'service-information "illegal protocol number" proto))
+                                    proto)))
+                     (if (fixnum? service)
+                         (service-port->servinfo service proto)
+                         (begin
+                           (##sys#check-string service 'service-information)
+                           (service-name->servinfo service proto))))))
+)   ; end module
+
+;;; Tests
+(cond-expand
+ [testing
+  (import hostinfo)
+  (current-hostname)
+  (host-information "www.call-with-current-continuation.org")
+  (host-information '#u8(194 97 107 133))
+  (host-information "194.97.107.133")
+                                        ; =>  #,(hostinfo name: "www003.lifemedien.de" addresses: #(#u8(194 97 107 133))
+                                        ;        aliases: #("www.call-with-current-continuation.org"))
+  (ip->hostname '#u8(194 97 107 133)) ; "www003.lifemedien.de"
+  (string->ip "0708::0901")  ;  #u8(7 8 0 0 0 0 0 0 0 0 0 0 0 0 9 1)
+  (ip->string '#u8(127 0 0 1))        ;  "127.0.0.1"
+  (hostinfo-aliases
+   (hostname->hostinfo
+    (ip->hostname (hostname->ip
+                   (hostinfo-name
+                    (host-information "www.call-with-current-continuation.org"))))))
+                                        ; => #("www.call-with-current-continuation.org")
+
+  (protocol-information 17) ; => #,(protoinfo name: "udp" number: 17 aliases: #("UDP"))
+  (protoinfo-name (protocol-information 2)) ; => "igmp"
+  (protoinfo-aliases (protocol-name->protoinfo
+                      (protocol-number->name
+                       (protoinfo-number
+                        (protocol-information "ospf"))))) ; => #("OSPFIGP")
+  (protocol-name->number "OSPFIGP") ; 89 (you can look up aliases, too)
+
+  (servinfo-protocol (service-name->servinfo
+                      (service-port->name
+                       (servinfo-port (service-information "ssh"))))) ; => "udp" (yes, really)
+  (service-information "ssh" "tcp") ; => #,(servinfo name: "ssh" port: 22 aliases: #() protocol: "tcp")
+  (service-information "ssh" "tco")   ; => #f
+  (service-information 512 "tcp") ; #,(servinfo name: "exec" port: 512 aliases: #() protocol: "tcp")
+  (service-information 512 "udp") ; #,(servinfo name: "comsat" port: 512 aliases: #("biff") protocol: "udp")
+  (service-information 512 17)        ; same as previous
+  (service-information 512 170000)   ; Error: (service-information) illegal protocol number: 170000
+  ] [else])

ADDED   hostinfo/hostinfo.setup
Index: hostinfo/hostinfo.setup
==================================================================
--- /dev/null
+++ hostinfo/hostinfo.setup
@@ -0,0 +1,11 @@
+(define libs
+  (if (eq? (build-platform) 'msvc)
+      "-lws2_32"
+      "") )
+
+(compile -s -O2 -d2 hostinfo.scm ,libs -j hostinfo)
+(compile -s -O2 -d0 hostinfo.import.scm)
+(install-extension
+ 'hostinfo 
+ '("hostinfo.so" "hostinfo.import.so")
+ '((version "1.4.1")))

DELETED http-transport.scm
Index: http-transport.scm
==================================================================
--- http-transport.scm
+++ /dev/null
@@ -1,732 +0,0 @@
-
-;; Copyright 2006-2012, Matthew Welland.
-;; 
-;; This file is part of Megatest.
-;; 
-;;     Megatest is free software: you can redistribute it and/or modify
-;;     it under the terms of the GNU General Public License as published by
-;;     the Free Software Foundation, either version 3 of the License, or
-;;     (at your option) any later version.
-;; 
-;;     Megatest is distributed in the hope that it will be useful,
-;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;     GNU General Public License for more details.
-;; 
-;;     You should have received a copy of the GNU General Public License
-;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
-
-(require-extension (srfi 18) extras tcp s11n)
-
-
-(use  srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest posix-extras)
-
-(use spiffy uri-common intarweb http-client spiffy-request-vars intarweb spiffy-directory-listing)
-
-;; Configurations for server
-(tcp-buffer-size 2048)
-(max-connections 2048) 
-
-(declare (unit http-transport))
-
-(declare (uses common))
-(declare (uses db))
-(declare (uses tests))
-(declare (uses tasks)) ;; tasks are where stuff is maintained about what is running.
-(declare (uses server))
-;; (declare (uses daemon))
-(declare (uses portlogger))
-(declare (uses rmt))
-
-(include "common_records.scm")
-(include "db_records.scm")
-(include "js-path.scm")
-
-(require-library stml)
-(define (http-transport:make-server-url hostport)
-  (if (not hostport)
-      #f
-      (conc "http://" (car hostport) ":" (cadr hostport))))
-
-(define *server-loop-heart-beat* (current-seconds))
-
-;;======================================================================
-;; S E R V E R
-;; ======================================================================
-
-;; Call this to start the actual server
-;;
-
-(define *db:process-queue-mutex* (make-mutex))
-
-(define (http-transport:run hostn)
-  ;; Configurations for server
-  (tcp-buffer-size 2048)
-  (max-connections 2048) 
-  (debug:print 2 *default-log-port* "Attempting to start the server ...")
-  (let* ((db              #f) ;;        (open-db)) ;; we don't want the server to be opening and closing the db unnecesarily
-	 (hostname        (get-host-name))
-	 (ipaddrstr       (let ((ipstr (if (string=? "-" hostn)
-					   ;; (string-intersperse (map number->string (u8vector->list (hostname->ip hostname))) ".")
-					   (server:get-best-guess-address hostname)
-					   #f)))
-			    (if ipstr ipstr hostn))) ;; hostname))) 
-	 (start-port      (portlogger:open-run-close portlogger:find-port))
-	 (link-tree-path  (common:get-linktree))
-	 (tmp-area        (common:get-db-tmp-area))
-	 (start-file      (conc tmp-area "/.server-start")))
-    (debug:print-info 0 *default-log-port* "portlogger recommended port: " start-port)
-    ;; set some parameters for the server
-    (root-path     (if link-tree-path 
-		       link-tree-path
-		       (current-directory))) ;; WARNING: SECURITY HOLE. FIX ASAP!
-    (handle-directory spiffy-directory-listing)
-    (handle-exception (lambda (exn chain)
-			(signal (make-composite-condition
-				 (make-property-condition 
-				  'server
-				  'message "server error")))))
-
-    ;; http-transport:handle-directory) ;; simple-directory-handler)
-    ;; Setup the web server and a /ctrl interface
-    ;;
-    (vhost-map `(((* any) . ,(lambda (continue)
-			       ;; open the db on the first call 
-				 ;; This is were we set up the database connections
-			       (let* (($   (request-vars source: 'both))
-				      (dat ($ 'dat))
-				      (res #f))
-				 (cond
-				  ((equal? (uri-path (request-uri (current-request)))
-					   '(/ "api"))
-				   (send-response body:    (api:process-request *dbstruct-db* $) ;; the $ is the request vars proc
-						  headers: '((content-type text/plain)))
-				   (mutex-lock! *heartbeat-mutex*)
-				   (set! *db-last-access* (current-seconds))
-				   (mutex-unlock! *heartbeat-mutex*))
-				  ((equal? (uri-path (request-uri (current-request))) 
-					   '(/ ""))
-				   (send-response body: (http-transport:main-page)))
-				  ((equal? (uri-path (request-uri (current-request))) 
-					   '(/ "json_api"))
-				   (send-response body: (http-transport:main-page)))
-				  ((equal? (uri-path (request-uri (current-request))) 
-					   '(/ "runs"))
-				   (send-response body: (http-transport:main-page)))
-				  ((equal? (uri-path (request-uri (current-request))) 
-					   '(/ any))
-				   (send-response body: "hey there!\n"
-						  headers: '((content-type text/plain))))
-				  ((equal? (uri-path (request-uri (current-request))) 
-					   '(/ "hey"))
-				   (send-response body: "hey there!\n" 
-						  headers: '((content-type text/plain))))
-                                  ((equal? (uri-path (request-uri (current-request))) 
-					   '(/ "jquery3.1.0.js"))
-				   (send-response body: (http-transport:show-jquery) 
-						  headers: '((content-type application/javascript))))
-                                  ((equal? (uri-path (request-uri (current-request))) 
-					   '(/ "test_log"))
-				   (send-response body: (http-transport:html-test-log $) 
-						  headers: '((content-type text/HTML))))    
-                                  ((equal? (uri-path (request-uri (current-request))) 
-					   '(/ "dashboard"))
-				   (send-response body: (http-transport:html-dboard $) 
-						  headers: '((content-type text/HTML)))) 
-				  (else (continue))))))))
-    (handle-exceptions
-	exn
-      (debug:print 0 *default-log-port* "Failed to create file " start-file ", exn=" exn)
-      (with-output-to-file start-file (lambda ()(print (current-process-id)))))
-    (http-transport:try-start-server ipaddrstr start-port)))
-
-;; This is recursively run by http-transport:run until sucessful
-;;
-(define (http-transport:try-start-server ipaddrstr portnum)
-  (let ((config-hostname (configf:lookup *configdat* "server" "hostname"))
-	(config-use-proxy (equal? (configf:lookup *configdat* "client" "use-http_proxy") "yes")))
-    (if (not config-use-proxy)
-	(determine-proxy (constantly #f)))
-    (debug:print-info 0 *default-log-port* "http-transport:try-start-server time=" (seconds->time-string (current-seconds)) " ipaddrsstr=" ipaddrstr " portnum=" portnum " config-hostname=" config-hostname)
-    (handle-exceptions
-	exn
-	(begin
-	  (print-error-message exn)
-	  (if (< portnum 64000)
-	      (begin 
-		(debug:print 0 *default-log-port* "WARNING: attempt to start server failed. Trying again ...")
-		(debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
-		(debug:print 5 *default-log-port* "exn=" (condition->list exn))
-		(portlogger:open-run-close portlogger:set-failed portnum)
-		(debug:print 0 *default-log-port* "WARNING: failed to start on portnum: " portnum ", trying next port")
-		(thread-sleep! 0.1)
-		
-		;; get_next_port goes here
-		(http-transport:try-start-server ipaddrstr
-						 (portlogger:open-run-close portlogger:find-port)))
-	      (begin
-		(print "ERROR: Tried and tried but could not start the server"))))
-      ;; any error in following steps will result in a retry
-      (set! *server-info* (list ipaddrstr portnum))
-      (debug:print 0 *default-log-port* "INFO: Trying to start server on " ipaddrstr ":" portnum)
-      ;; This starts the spiffy server
-      ;; NEED WAY TO SET IP TO #f TO BIND ALL
-      ;; (start-server bind-address: ipaddrstr port: portnum)
-      (if config-hostname ;; this is a hint to bind directly
-	  (start-server port: portnum bind-address: (if (equal? config-hostname "-")
-							ipaddrstr
-							config-hostname))
-	  (start-server port: portnum))
-      (portlogger:open-run-close portlogger:set-port portnum "released")
-      (debug:print 1 *default-log-port* "INFO: server has been stopped"))))
-
-;;======================================================================
-;; S E R V E R   U T I L I T I E S 
-;;======================================================================
-
-;;======================================================================
-;; C L I E N T S
-;;======================================================================
-
-(define *http-mutex* (make-mutex))
-
-;; NOTE: Large block of code from 32436b426188080f72fceb6894af541fbad9921e removed here
-;;       I'm pretty sure it is defunct.
-
-;; This next block all imported en-mass from the api branch
-(define *http-requests-in-progress* 0)
-(define *http-connections-next-cleanup* (current-seconds))
-
-(define (http-transport:get-time-to-cleanup)
-  (let ((res #f))
-    (mutex-lock! *http-mutex*)
-    (set! res (> (current-seconds) *http-connections-next-cleanup*))
-    (mutex-unlock! *http-mutex*)
-    res))
-
-(define (http-transport:inc-requests-count)
-  (mutex-lock! *http-mutex*)
-  (set! *http-requests-in-progress* (+ 1 *http-requests-in-progress*))
-  ;; Use this opportunity to slow things down iff there are too many requests in flight
-  (if (> *http-requests-in-progress* 5)
-      (begin
-	(debug:print-info 0 *default-log-port* "Whoa there buddy, ease up...")
-	(thread-sleep! 1)))
-  (mutex-unlock! *http-mutex*))
-
-(define (http-transport:dec-requests-count proc) 
-  (mutex-lock! *http-mutex*)
-  (proc)
-  (set! *http-requests-in-progress* (- *http-requests-in-progress* 1))
-  (mutex-unlock! *http-mutex*))
-
-(define (http-transport:dec-requests-count-and-close-all-connections)
-  (set! *http-requests-in-progress* (- *http-requests-in-progress* 1))
-  (let loop ((etime (+ (current-seconds) 5))) ;; give up in five seconds
-    (if (> *http-requests-in-progress* 0)
-	(if (> etime (current-seconds))
-	    (begin
-	      (thread-sleep! 0.05)
-	      (loop etime))
-	    (debug:print-error 0 *default-log-port* "requests still in progress after 5 seconds of waiting. I'm going to pass on cleaning up http connections"))
-	(close-all-connections!)))
-  (set! *http-connections-next-cleanup* (+ (current-seconds) 10))
-  (mutex-unlock! *http-mutex*))
-
-(define (http-transport:inc-requests-and-prep-to-close-all-connections)
-  (mutex-lock! *http-mutex*)
-  (set! *http-requests-in-progress* (+ 1 *http-requests-in-progress*)))
-
-;; Send "cmd" with json payload "params" to serverdat and receive result
-;;
-(define (http-transport:client-api-send-receive run-id serverdat cmd params #!key (numretries 3)(area-dat #f))
-  (let* ((fullurl    (if (vector? serverdat)
-			 (http-transport:server-dat-get-api-req serverdat)
-			 (begin
-			   (debug:print 0 *default-log-port* "FATAL ERROR: http-transport:client-api-send-receive called with no server info")
-			   (exit 1))))
-	 (res        (vector #f "uninitialized"))
-	 (success    #t)
-	 (sparams    (db:obj->string params transport: 'http))
-	 (runremote  (or area-dat *runremote*))
-         (server-id   (if (vector? serverdat) 
-                           (http-transport:server-dat-get-server-id serverdat)
-                           (begin
-			     (debug:print 0 *default-log-port* "FATAL ERROR: http-transport:client-api-send-receive called with no server info")
-			     (exit 1)))))
-       (debug:print-info 11 *default-log-port* "cmd=" cmd " fullurl=" fullurl " server-id=" server-id " current time:" (current-seconds)) 
-
-       ;; set up the http-client here
-       (max-retry-attempts 1)
-       ;; consider all requests indempotent
-       (retry-request? (lambda (request)
-			 #f))
-       ;; send the data and get the response
-       ;; extract the needed info from the http data and 
-       ;; process and return it.
-       (let* ((send-recieve (lambda ()
-			      (mutex-lock! *http-mutex*)
-			      ;; (condition-case (with-input-from-request "http://localhost"; #f read-lines)
-			      ;;					       ((exn http client-error) e (print e)))
-			      (set! res (vector                ;;; DON'T FORGET - THIS IS THE CLIENT SIDE! NOTE: consider moving this to client.scm since we are only supporting http transport at this time.
-					 success
-					 (db:string->obj 
-					  (handle-exceptions
-					      exn
-					      (let ((call-chain (get-call-chain))
-						    (msg        ((condition-property-accessor 'exn 'message) exn)))
-						(set! success #f)
-                                                (if (debug:debug-mode 1)
-                                                    (debug:print-info 0 *default-log-port* "couldn't talk to server, trying again ...")
-                                                    (begin
-                                                      (debug:print 0 *default-log-port* "WARNING: failure in with-input-from-request to " fullurl ".")
-                                                      (debug:print 0 *default-log-port* " message: " msg ", exn=" exn)
-                                                      (debug:print 0 *default-log-port* " cmd: " cmd " params: " params " key:" (or server-id "thekey"))
-                                                      (debug:print 0 *default-log-port* " call-chain: " call-chain)))
-                                                (if runremote
-						    (remote-conndat-set! runremote #f))
-						;; Killing associated server to allow clean retry.")
-						;; (tasks:kill-server-run-id run-id)  ;; better to kill the server in the logic that called this routine?
-						(mutex-unlock! *http-mutex*)
-					     ;;; (signal (make-composite-condition
-					     ;;;          (make-property-condition 'commfail 'message "failed to connect to server")))
-					     ;;; "communications failed"
-						(db:obj->string #f))
-					    (with-input-from-request ;; was dat
-					     fullurl 
-					     (list (cons 'key (or server-id   "thekey"))
-						   (cons 'cmd cmd)
-						   (cons 'params sparams))
-					     read-string))
-					  transport: 'http)
-                                         0)) ;; added this speculatively
-			      ;; Shouldn't this be a call to the managed call-all-connections stuff above?
-			      (close-all-connections!)
-			      (mutex-unlock! *http-mutex*)
-			      ))
-	      (time-out     (lambda ()
-			      (thread-sleep! 45)
-			      (debug:print 0 *default-log-port* "WARNING: send-receive took more than 45 seconds!!")
-			      #f))
-	      (th1 (make-thread send-recieve "with-input-from-request"))
-	      (th2 (make-thread time-out     "time out")))
-	 (thread-start! th1)
-	 (thread-start! th2)
-	 (thread-join! th1)
-          (vector-set! res 0 success)
-	 (thread-terminate! th2)
-	 (if (vector? res)
-	     (if (vector-ref res 0) ;; this is the first flag or the second flag? 
-                 (let* ((res-dat (vector-ref res 1)))
-                    (if (and (string? res-dat) (string-contains res-dat "server-id mismatch"))
-                     (signal (make-composite-condition
-		          (make-property-condition 
-		       'servermismatch
-		       'message  (vector-ref res 1))))       
-		      res)) ;; this is the *inner* vector? seriously? why?
-                 (if (debug:debug-mode 11)
-                     (let ((call-chain (get-call-chain))) ;; note: this code also called in nmsg-transport - consider consolidating it
-                       (print-call-chain (current-error-port))
-                       (debug:print-error 11 *default-log-port* "error above occured at server, res=" res) ;; " message: " ((condition-property-accessor 'exn 'message) exn))
-                       (debug:print 11 *default-log-port* " server call chain:")
-                       (pp (vector-ref res 1) (current-error-port))
-                       (signal (vector-ref res 0)))
-                     res))
-	     (signal (make-composite-condition
-		      (make-property-condition 
-		       'timeout
-		       'message "nmsg-transport:client-api-send-receive-raw timed out talking to server")))))))
-
-;; careful closing of connections stored in *runremote*
-;;
-(define (http-transport:close-connections #!key (area-dat #f))
-  (let* ((runremote  (or area-dat *runremote*))
-	 (server-dat (if runremote
-                         (remote-conndat runremote)
-                         #f))) ;; (hash-table-ref/default *runremote* run-id #f)))
-    (if (vector? server-dat)
-	(let ((api-dat (http-transport:server-dat-get-api-uri server-dat)))
-	  (handle-exceptions
-	    exn
-	    (begin
-	      (print-call-chain *default-log-port*)
-	      (debug:print-error 0 *default-log-port* " closing connection failed with error: " ((condition-property-accessor 'exn 'message) exn) ", exn=" exn))
-	    (close-connection! api-dat)
-            ;;(close-idle-connections!)
-	    #t))
-	#f)))
-
-
-(define (make-http-transport:server-dat)(make-vector 6))
-(define (http-transport:server-dat-get-iface         vec)    (vector-ref  vec 0))
-(define (http-transport:server-dat-get-port          vec)    (vector-ref  vec 1))
-(define (http-transport:server-dat-get-api-uri       vec)    (vector-ref  vec 2))
-(define (http-transport:server-dat-get-api-url       vec)    (vector-ref  vec 3))
-(define (http-transport:server-dat-get-api-req       vec)    (vector-ref  vec 4))
-(define (http-transport:server-dat-get-last-access   vec)    (vector-ref  vec 5))
-;(define (http-transport:server-dat-get-socket        vec)    (vector-ref  vec 6))
-(define (http-transport:server-dat-get-server-id     vec)    (vector-ref  vec 6))
-
-(define (http-transport:server-dat-make-url vec)
-  (if (and (http-transport:server-dat-get-iface vec)
-	   (http-transport:server-dat-get-port  vec))
-      (conc "http://" 
-	    (http-transport:server-dat-get-iface vec)
-	    ":"
-	    (http-transport:server-dat-get-port  vec))
-      #f))
-
-(define (http-transport:server-dat-update-last-access vec)
-  (if (vector? vec)
-      (vector-set! vec 5 (current-seconds))
-      (begin
-	(print-call-chain (current-error-port))
-	(debug:print-error 0 *default-log-port* "call to http-transport:server-dat-update-last-access with non-vector!!"))))
-
-;;
-;; connect
-;;
-(define (http-transport:client-connect iface port server-id) 
-  (let* ((api-url      (conc "http://" iface ":" port "/api"))
-	 (api-uri      (uri-reference (conc "http://" iface ":" port "/api")))
-	 (api-req      (make-request method: 'POST uri: api-uri))
-	 (server-dat   (vector iface port api-uri api-url api-req (current-seconds) server-id)))
-    server-dat))
-
-;; run http-transport:keep-running in a parallel thread to monitor that the db is being 
-;; used and to shutdown after sometime if it is not.
-;;
-(define (http-transport:keep-running) 
-  ;; if none running or if > 20 seconds since 
-  ;; server last used then start shutdown
-  ;; This thread waits for the server to come alive
-  (debug:print-info 0 *default-log-port* "Starting the sync-back, keep alive thread in server")
-  (let* ((sdat              #f)
-	 (tmp-area          (common:get-db-tmp-area))
-	 (started-file      (conc tmp-area "/.server-started"))
-	 (server-start-time (current-seconds))
-	 (server-info (let loop ((start-time (current-seconds))
-				 (changed    #t)
-				 (last-sdat  "not this"))
-                        (begin ;; let ((sdat #f))
-			  (thread-sleep! 0.01)
-			  (debug:print-info 0 *default-log-port* "Waiting for server alive signature")
-                          (mutex-lock! *heartbeat-mutex*)
-                          (set! sdat *server-info*)
-                          (mutex-unlock! *heartbeat-mutex*)
-                          (if (and sdat
-				   (not changed)
-				   (> (- (current-seconds) start-time) 2))
-			      (begin
-				(debug:print-info 0 *default-log-port* "Received server alive signature")
-                                (common:save-pkt `((action . alive)
-                                                   (T      . server)
-                                                   (pid    . ,(current-process-id))
-                                                   (ipaddr . ,(car sdat))
-                                                   (port   . ,(cadr sdat)))
-                                                 *configdat* #t)
-				sdat)
-                              (begin
-				(debug:print-info 0 *default-log-port* "Still waiting, last-sdat=" last-sdat)
-                                (sleep 4)
-				(if (> (- (current-seconds) start-time) 120) ;; been waiting for two minutes
-				    (begin
-				      (debug:print-error 0 *default-log-port* "transport appears to have died, exiting server")
-                                      (common:save-pkt `((action . died)
-                                                         (T      . server)
-                                                         (pid    . ,(current-process-id))
-                                                         (ipaddr . ,(car sdat))
-                                                         (port   . ,(cadr sdat))
-                                                         (msg    . "Transport died?"))
-						       *configdat* #t)
-				      (exit))
-				    (loop start-time
-					  (equal? sdat last-sdat)
-					  sdat)))))))
-	 (iface       (car server-info))
-         (port        (cadr server-info))
-         (last-access 0)
-	 (server-timeout (server:expiration-timeout))
-	 (server-going  #f)
-	 (server-log-file (args:get-arg "-log"))) ;; always set when we are a server
-
-    (handle-exceptions
-	exn
-      (debug:print 0 *default-log-port* "Failed to create " started-file ", exn=" exn)
-      (with-output-to-file started-file (lambda ()(print (current-process-id)))))
-
-    (let loop ((count         0)
-	       (server-state 'available)
-	       (bad-sync-count 0)
-	       (start-time     (current-milliseconds)))
-      ;; Use this opportunity to sync the tmp db to megatest.db
-      (if (not server-going) ;; *dbstruct-db* 
-	  (begin
-	    (debug:print 0 *default-log-port* "SERVER: dbprep")
-	    (set! *dbstruct-db*  (db:setup #t)) ;;  run-id))
-	    (set! server-going #t)
-	    (debug:print 0 *default-log-port* "SERVER: running, megatest version: " (common:get-full-version)) ;; NOTE: the server is NOT yet marked as running in the log. We do that in the keep-running routine.
-	    (thread-start! *watchdog*)))
-      
-      ;; when things go wrong we don't want to be doing the various queries too often
-      ;; so we strive to run this stuff only every four seconds or so.
-      (let* ((sync-time (- (current-milliseconds) start-time))
-	    (rem-time  (quotient (- 4000 sync-time) 1000)))
-	(if (and (<= rem-time 4)
-		 (>  rem-time 0))
-	    (thread-sleep! rem-time)))
-      
-      (if (< count 1) ;; 3x3 = 9 secs aprox
-	  (loop (+ count 1) 'running bad-sync-count (current-milliseconds)))
-      
-      ;; Check that iface and port have not changed (can happen if server port collides)
-      (mutex-lock! *heartbeat-mutex*)
-      (set! sdat *server-info*)
-      (mutex-unlock! *heartbeat-mutex*)
-      
-      (if (not (equal? sdat (list iface port)))
-	  (let ((new-iface (car sdat))
-		(new-port  (cadr sdat)))
-	    (debug:print-info 0 *default-log-port* "WARNING: interface changed, refreshing iface and port info")
-	    (set! iface new-iface)
-	    (set! port  new-port)
-             (if (not *server-id*)
-              (set! *server-id* (server:mk-signature)))
-            (debug:print 0 *default-log-port* (current-seconds) (current-directory) (current-process-id) (argv))
-	    (debug:print 0 *default-log-port* "SERVER STARTED: " iface ":" port " AT " (current-seconds) " server-id: " *server-id*)
-	    (flush-output *default-log-port*)))
-      
-      ;; Transfer *db-last-access* to last-access to use in checking that we are still alive
-      (mutex-lock! *heartbeat-mutex*)
-      (set! last-access *db-last-access*)
-      (mutex-unlock! *heartbeat-mutex*)
-      
-      (if (common:low-noise-print 120 (conc "server running on " iface ":" port))
-	  (begin
-             (if (not *server-id*)
-              (set! *server-id* (server:mk-signature)))
-            (debug:print 0 *default-log-port* (current-seconds) (current-directory) (current-process-id) (argv))   
-	    (debug:print 0 *default-log-port* "SERVER STARTED: " iface ":" port " AT " (current-seconds) " server-id: " *server-id*)
-	    (flush-output *default-log-port*)))
-      (if (common:low-noise-print 60 "dbstats")
-	  (begin
-	    (debug:print 0 *default-log-port* "Server stats:")
-	    (db:print-current-query-stats)))
-      (let* ((hrs-since-start  (/ (- (current-seconds) server-start-time) 3600)))
-	(cond
-         ((and *server-run*
-	       (> (+ last-access server-timeout)
-		  (current-seconds)))
-          (if (common:low-noise-print 120 "server continuing")
-              (debug:print-info 0 *default-log-port* "Server continuing, seconds since last db access: " (- (current-seconds) last-access))
-	      (let ((curr-time (current-seconds)))
-		(handle-exceptions
-		    exn
-		    (debug:print 0 *default-log-port* "ERROR: Failed to change timestamp on log file " server-log-file ". Are you out of space on that disk? exn=" exn)
-		  (if (not *server-overloaded*)
-		      (change-file-times server-log-file curr-time curr-time)))))
-          (loop 0 server-state bad-sync-count (current-milliseconds)))
-         (else
-          (debug:print-info 0 *default-log-port* "Server timed out. seconds since last db access: " (- (current-seconds) last-access))
-          (http-transport:server-shutdown port)))))))
-
-(define (http-transport:server-shutdown port)
-  (begin
-    ;;(BB> "http-transport:server-shutdown called")
-    (debug:print-info 0 *default-log-port* "Starting to shutdown the server. pid="(current-process-id))
-    ;;
-    ;; start_shutdown
-    ;;
-    (set! *time-to-exit* #t) ;; tell on-exit to be fast as we've already cleaned up
-    (portlogger:open-run-close portlogger:set-port port "released")
-    (thread-sleep! 1)
-
-    ;; (debug:print-info 0 *default-log-port* "Max cached queries was    " *max-cache-size*)
-    ;; (debug:print-info 0 *default-log-port* "Number of cached writes   " *number-of-writes*)
-    ;; (debug:print-info 0 *default-log-port* "Average cached write time "
-    ;; 		      (if (eq? *number-of-writes* 0)
-    ;; 			  "n/a (no writes)"
-    ;; 			  (/ *writes-total-delay*
-    ;; 			     *number-of-writes*))
-    ;; 		      " ms")
-    ;; (debug:print-info 0 *default-log-port* "Number non-cached queries "  *number-non-write-queries*)
-    ;; (debug:print-info 0 *default-log-port* "Average non-cached time   "
-    ;; 		      (if (eq? *number-non-write-queries* 0)
-    ;; 			  "n/a (no queries)"
-    ;; 			  (/ *total-non-write-delay* 
-    ;; 			     *number-non-write-queries*))
-    ;; 		      " ms")
-    
-    (db:print-current-query-stats)
-    (common:save-pkt `((action . exit)
-                       (T      . server)
-                       (pid    . ,(current-process-id)))
-                     *configdat* #t)
-    (debug:print-info 0 *default-log-port* "Server shutdown complete. Exiting")
-    (exit)))
-
-;; all routes though here end in exit ...
-;;
-;; start_server? 
-;;
-(define (http-transport:launch)
-  ;; check that a server start is in progress, pause or exit if so
-  (let* ((tmp-area            (common:get-db-tmp-area))
-	 (server-start        (conc tmp-area "/.server-start"))
-	 (server-started      (conc tmp-area "/.server-started"))
-	 (start-time          (common:lazy-modification-time server-start))
-	 (started-time        (common:lazy-modification-time server-started))
-	 (server-starting     (< start-time started-time)) ;; if start-time is less than started-time then a server is still starting
-	 (start-time-old      (> (- (current-seconds) start-time) 5))
-         (cleanup-proc        (lambda (msg)
-                                (let* ((serv-fname      (conc "server-" (current-process-id) "-" (get-host-name) ".log"))
-                                       (full-serv-fname (conc *toppath* "/logs/" serv-fname))
-                                       (new-serv-fname  (conc *toppath* "/logs/" "defunct-" serv-fname)))
-                                  (debug:print 0 *default-log-port* msg)
-                                  (if (common:file-exists? full-serv-fname)
-                                      (system (conc "sleep 1;mv -f " full-serv-fname " " new-serv-fname))
-                                      (debug:print 0 *default-log-port* "INFO: cannot move " full-serv-fname " to " new-serv-fname))
-                                  (exit)))))
-    #;(if (and (not start-time-old) ;; last server start try was less than five seconds ago
-	     (not server-starting))
-	(begin
-	  (cleanup-proc "NOT starting server, there is either a recently started server or a server in process of starting")
-	  (exit)))
-    ;; lets not even bother to start if there are already three or more server files ready to go
-    #;(let* ((num-alive   (server:get-num-alive (server:get-list *toppath*))))
-      (if (> num-alive 3)
-          (begin
-            (cleanup-proc (conc "ERROR: Aborting server start because there are already " num-alive " possible servers either running or starting up"))
-            (exit))))
-  (common:save-pkt `((action . start)
-		     (T      . server)
-		     (pid    . ,(current-process-id)))
-		   *configdat* #t)
-    (let* ((th2 (make-thread (lambda ()
-                               (debug:print-info 0 *default-log-port* "Server run thread started")
-                               (http-transport:run 
-                                (if (args:get-arg "-server")
-                                    (args:get-arg "-server")
-                                    "-")
-                                )) "Server run"))
-           (th3 (make-thread (lambda ()
-                               (debug:print-info 0 *default-log-port* "Server monitor thread started")
-                               (http-transport:keep-running)
-                               "Keep running"))))
-      (thread-start! th2)
-      (thread-sleep! 0.25) ;; give the server time to settle before starting the keep-running monitor.
-      (thread-start! th3)
-      (set! *didsomething* #t)
-      (thread-join! th2)
-      (exit))))
-
-;; (define (http-transport:server-signal-handler signum)
-;;   (signal-mask! signum)
-;;   (handle-exceptions
-;;    exn
-;;    (debug:print 0 *default-log-port* " ... exiting ...")
-;;    (let ((th1 (make-thread (lambda ()
-;; 			     (thread-sleep! 1))
-;; 			   "eat response"))
-;; 	 (th2 (make-thread (lambda ()
-;; 			     (debug:print-error 0 *default-log-port* "Received ^C, attempting clean exit. Please be patient and wait a few seconds before hitting ^C again.")
-;; 			     (thread-sleep! 3) ;; give the flush three seconds to do it's stuff
-;; 			     (debug:print 0 *default-log-port* "       Done.")
-;; 			     (exit 4))
-;; 			   "exit on ^C timer")))
-;;      (thread-start! th2)
-;;      (thread-start! th1)
-;;      (thread-join! th2))))
-
-;;===============================================
-;; Java script
-;;===============================================
-(define (http-transport:show-jquery)
-  (let* ((data  (tests:readlines *java-script-lib*)))
-(string-join data "\n")))
-
-
-
-;;======================================================================
-;; web pages
-;;======================================================================
-
-(define (http-transport:html-test-log $)
-   (let* ((run-id ($ 'runid))
-         (test-item ($ 'testname))
-         (parts (string-split test-item ":"))
-         (test-name (car parts))
-             
-         (item-name (if (equal? (length parts) 1)
-             ""
-             (cadr parts))))
-  ;(print $) 
-(tests:get-test-log run-id test-name item-name)))
-
-
-(define (http-transport:html-dboard $)
-  (let* ((page ($ 'page))
-         (oup       (open-output-string)) 
-         (bdy "--------------------------")
-
-         (ret  (tests:dynamic-dboard page)))
-    (s:output-new  oup  ret)
-   (close-output-port oup)
-
-  (set! bdy   (get-output-string oup))
-     (conc "<h1>Dashboard</h1>" bdy "<br/> <br/> "  )))
-
-(define (http-transport:main-page)
-  (let ((linkpath (root-path)))
-    (conc "<head><h1>" (pathname-strip-directory *toppath*) "</h1></head>"
-	  "<body>"
-	  "Run area: " *toppath*
-	  "<h2>Server Stats</h2>"
-	  (http-transport:stats-table) 
-	  "<hr>"
-	  (http-transport:runs linkpath)
-	  "<hr>"
-	  ;; (http-transport:run-stats)
-	  "</body>"
-	  )))
-
-(define (http-transport:stats-table)
-  (mutex-lock! *heartbeat-mutex*)
-  (let ((res 
-	 (conc "<table>"
-	       ;; "<tr><td>Max cached queries</td>        <td>" *max-cache-size* "</td></tr>"
-	       "<tr><td>Number of cached writes</td>   <td>" *number-of-writes* "</td></tr>"
-	       "<tr><td>Average cached write time</td> <td>" (if (eq? *number-of-writes* 0)
-								 "n/a (no writes)"
-								 (/ *writes-total-delay*
-								    *number-of-writes*))
-	       " ms</td></tr>"
-	       "<tr><td>Number non-cached queries</td> <td>"  *number-non-write-queries* "</td></tr>"
-	       ;; "<tr><td>Average non-cached time</td>   <td>" (if (eq? *number-non-write-queries* 0)
-	       ;; 							 "n/a (no queries)"
-	       ;; 							 (/ *total-non-write-delay* 
-	       ;; 							    *number-non-write-queries*))
-	       " ms</td></tr>"
-	       "<tr><td>Last access</td><td>"              (seconds->time-string *db-last-access*) "</td></tr>"
-	       "</table>")))
-    (mutex-unlock! *heartbeat-mutex*)
-    res))
-
-(define (http-transport:runs linkpath)
-  (conc "<h3>Runs</h3>"
-	(string-intersperse
-	 (let ((files (map pathname-strip-directory (glob (conc linkpath "/*")))))
-	   (map (lambda (p)
-		  (conc "<a href=\"" p "\">" p "</a><br>"))
-		files))
-	 " ")))
-
-#;(define (http-transport:run-stats)
-  (let ((stats (open-run-close db:get-running-stats #f)))
-    (conc "<table>"
-	  (string-intersperse
-	   (map (lambda (stat)
-		  (conc "<tr><td>" (car stat) "</td><td>" (cadr stat) "</td></tr>"))
-		stats)
-	   " ")
-	  "</table>")))

ADDED   http-transportmod.scm
Index: http-transportmod.scm
==================================================================
--- /dev/null
+++ http-transportmod.scm
@@ -0,0 +1,900 @@
+;;======================================================================
+;; Copyright 2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
+
+;;======================================================================
+
+(declare (unit http-transportmod))
+(declare (uses debugprint))
+(declare (uses commonmod))
+(declare (uses configfmod))
+(declare (uses mtargs))
+(declare (uses mtver))
+(declare (uses dbmod))
+(declare (uses stml2))
+(declare (uses portloggermod))
+(declare (uses pkts))
+
+(module http-transportmod
+	*
+	
+(import scheme
+	(prefix sqlite3 sqlite3:)
+	chicken.base
+	chicken.condition
+	chicken.file
+	chicken.file.posix
+	chicken.format
+	chicken.io
+	chicken.pathname
+	chicken.port
+	chicken.pretty-print
+	chicken.process
+	chicken.process-context
+	chicken.process-context.posix
+	chicken.sort
+	chicken.string
+	chicken.time
+	chicken.time.posix
+	chicken.tcp
+	
+	(prefix base64 base64:)
+	directory-utils
+	matchable
+	md5
+	message-digest
+	regex
+	s11n
+	srfi-1
+	srfi-13
+	srfi-18
+	srfi-69
+	stack
+	system-information
+	typed-records
+	z3
+	  spiffy
+	  uri-common
+	  intarweb
+	  http-client
+	  spiffy-request-vars
+	  intarweb
+	  spiffy-directory-listing
+
+	(prefix mtargs args:)
+	commonmod
+	configfmod
+	debugprint
+	mtver
+	dbmod
+	stml2
+	portloggermod
+	pkts
+	
+	)
+
+;; (require-extension (srfi 18) extras tcp s11n)
+;; 
+;; 
+;; (use  srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest posix-extras)
+;; 
+;; (use spiffy uri-common intarweb http-client spiffy-request-vars intarweb spiffy-directory-listing)
+;; 
+;; Configurations for server
+(tcp-buffer-size 2048)
+(max-connections 2048) 
+
+(defstruct servdat
+  (host #f)
+  (port #f)
+  (uuid #f)
+  (dbfile #f)
+  (api-url #f)
+  (api-uri #f)
+  (api-req #f))
+
+(define (servdat->url sdat)
+  (conc (servdat-host sdat)":"(servdat-port sdat)))
+
+;; this must be set up prior to making calls
+(define api-proc (make-parameter conc))
+
+(define (http-transport:make-server-url hostport)
+  (if (not hostport)
+      #f
+      (conc "http://" (car hostport) ":" (cadr hostport))))
+
+;;======================================================================
+;; S E R V E R
+;; ======================================================================
+
+;; NOTE: http-transport:launch is the entry point
+;;          -> http-transport:run
+;;             -> http-transport:try-start-server -> http-transport:try-start-server (until success)
+
+(define (http-get-function fnkey)
+  (hash-table-ref/default *http-functions* fnkey (lambda () "nothing here yet")))
+
+(define (http-transport:run hostn)
+  ;; Configurations for server
+  (tcp-buffer-size 2048)
+  (max-connections 2048) 
+  (debug:print 2 *default-log-port* "Attempting to start the server ...")
+  (let* ((db              #f) ;;        (open-db)) ;; we don't want the server to be opening and closing the db unnecesarily
+	 (hostname        (get-host-name))
+	 (ipaddrstr       (let ((ipstr (if (string=? "-" hostn)
+					   ;; (string-intersperse (map number->string (u8vector->list (hostname->ip hostname))) ".")
+					   (server:get-best-guess-address hostname)
+					   #f)))
+			    (if ipstr ipstr hostn))) ;; hostname))) 
+	 (start-port      (portlogger:open-run-close portlogger:find-port))
+	 (link-tree-path  (common:get-linktree))
+	 (tmp-area        (common:get-db-tmp-area))
+	 #;(start-file      (conc tmp-area "/.server-start")))
+    (debug:print-info 0 *default-log-port* "portlogger recommended port: " start-port)
+    ;; set some parameters for the server
+    (root-path     (if link-tree-path 
+		       link-tree-path
+		       (current-directory))) ;; WARNING: SECURITY HOLE. FIX ASAP!
+    (handle-directory spiffy-directory-listing)
+    #;(handle-exception (lambda (exn chain)
+			(signal (make-composite-condition
+				 (make-property-condition 
+				  'server
+				  'message "server error")))))
+
+    ;; Setup the web server and a /ctrl interface
+    ;;
+    (vhost-map `(((* any) . ,(lambda (continue)
+			       ;; open the db on the first call 
+				 ;; This is were we set up the database connections
+			       (let* (($   (request-vars source: 'both))
+				      (dat ($ 'dat))
+				      (res #f))
+				 (cond
+				  ((equal? (uri-path (request-uri (current-request)))
+					   '(/ "api"))
+				   (debug:print 0 *default-log-port* "In api request $=" $)
+				   (send-response ;; the $ is the request vars proc
+				    body: ((api-proc) *dbstruct-db* $) ;; ($) => alist
+				    headers: '((content-type text/plain)))
+				   (set! *db-last-access* (current-seconds)))
+				  ((equal? (uri-path (request-uri (current-request))) 
+					   '(/ "ping"))
+				   (send-response body: (conc *toppath*"/"(args:get-arg "-db"))
+						  headers: '((content-type text/plain))))
+				  ((equal? (uri-path (request-uri (current-request))) 
+					   '(/ "loop-test"))
+				   (send-response body: (alist-ref 'data ($))
+						  headers: '((content-type text/plain))))
+				  ((equal? (uri-path (request-uri (current-request))) 
+					   '(/ ""))
+				   (send-response body: ((http-get-function 'http-transport:main-page))))
+				  ((equal? (uri-path (request-uri (current-request))) 
+					   '(/ "json_api"))
+				   (send-response body: ((http-get-function 'http-transport:main-page))))
+				  ((equal? (uri-path (request-uri (current-request))) 
+					   '(/ "runs"))
+				   (send-response body: ((http-get-function 'http-transport:main-page))))
+				  ((equal? (uri-path (request-uri (current-request))) 
+					   '(/ any))
+				   (send-response body: "hey there!\n"
+						  headers: '((content-type text/plain))))
+				  ((equal? (uri-path (request-uri (current-request))) 
+					   '(/ "hey"))
+				   (send-response body: "hey there!\n" 
+						  headers: '((content-type text/plain))))
+                                  ((equal? (uri-path (request-uri (current-request))) 
+					   '(/ "jquery3.1.0.js"))
+				   (send-response body: ((http-get-function 'http-transport:show-jquery))
+						  headers: '((content-type application/javascript))))
+                                  ((equal? (uri-path (request-uri (current-request))) 
+					   '(/ "test_log"))
+				   (send-response body: ((http-get-function 'http-transport:html-test-log) $) 
+						  headers: '((content-type text/HTML))))    
+                                  ((equal? (uri-path (request-uri (current-request))) 
+					   '(/ "dashboard"))
+				   (send-response body: ((http-get-function 'http-transport:html-dboard) $)
+						  headers: '((content-type text/HTML)))) 
+				  (else (continue))))))))
+    #;(handle-exceptions
+	exn
+      (debug:print 0 *default-log-port* "Failed to create file " start-file ", exn=" exn)
+      (with-output-to-file start-file (lambda ()(print (current-process-id)))))
+    (http-transport:try-start-server ipaddrstr start-port)))
+
+;; This is recursively run by http-transport:run until sucessful
+;;
+(define (http-transport:try-start-server ipaddrstr portnum)
+  (let ((config-hostname (configf:lookup *configdat* "server" "hostname"))
+	(config-use-proxy (equal? (configf:lookup *configdat* "client" "use-http_proxy") "yes")))
+    (if (not config-use-proxy)
+	(determine-proxy (constantly #f)))
+    (debug:print-info 0 *default-log-port* "http-transport:try-start-server time=" (seconds->time-string (current-seconds)) " ipaddrsstr=" ipaddrstr " portnum=" portnum " config-hostname=" config-hostname)
+    (handle-exceptions
+	exn
+	(begin
+	  (print-error-message exn)
+	  (if (< portnum 64000)
+	      (begin 
+		(debug:print 0 *default-log-port* "WARNING: attempt to start server failed. Trying again ...")
+		(debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
+		(debug:print 5 *default-log-port* "exn=" (condition->list exn))
+		(portlogger:open-run-close portlogger:set-failed portnum)
+		(debug:print 0 *default-log-port* "WARNING: failed to start on portnum: " portnum ", trying next port")
+		(thread-sleep! 0.1)
+		
+		;; get_next_port goes here
+		(http-transport:try-start-server ipaddrstr
+						 (portlogger:open-run-close portlogger:find-port)))
+	      (begin
+		(print "ERROR: Tried and tried but could not start the server"))))
+      ;; any error in following steps will result in a retry
+      (set! *server-info* (make-servdat host: ipaddrstr port: portnum))
+      (debug:print 0 *default-log-port* "INFO: Trying to start server on " ipaddrstr ":" portnum)
+      ;; This starts the spiffy server
+      ;; NEED WAY TO SET IP TO #f TO BIND ALL
+      ;; (start-server bind-address: ipaddrstr port: portnum)
+      (if config-hostname ;; this is a hint to bind directly
+	  (start-server port: portnum bind-address: (if (equal? config-hostname "-")
+							ipaddrstr
+							config-hostname))
+	  (start-server port: portnum))
+      (portlogger:open-run-close portlogger:set-port portnum "released")
+      (debug:print 1 *default-log-port* "INFO: server has been stopped"))))
+
+;;======================================================================
+;; S E R V E R   U T I L I T I E S 
+;;======================================================================
+
+;;======================================================================
+;; C L I E N T S
+;;======================================================================
+
+
+(define (http-transport:get-time-to-cleanup)
+  (let ((res #f))
+    (mutex-lock! *http-mutex*)
+    (set! res (> (current-seconds) *http-connections-next-cleanup*))
+    (mutex-unlock! *http-mutex*)
+    res))
+
+(define (http-transport:inc-requests-count)
+  (mutex-lock! *http-mutex*)
+  (set! *http-requests-in-progress* (+ 1 *http-requests-in-progress*))
+  ;; Use this opportunity to slow things down iff there are too many requests in flight
+  (if (> *http-requests-in-progress* 5)
+      (begin
+	(debug:print-info 0 *default-log-port* "Whoa there buddy, ease up...")
+	(thread-sleep! 1)))
+  (mutex-unlock! *http-mutex*))
+
+(define (http-transport:dec-requests-count proc) 
+  (mutex-lock! *http-mutex*)
+  (proc)
+  (set! *http-requests-in-progress* (- *http-requests-in-progress* 1))
+  (mutex-unlock! *http-mutex*))
+
+(define (http-transport:dec-requests-count-and-close-all-connections)
+  (set! *http-requests-in-progress* (- *http-requests-in-progress* 1))
+  (let loop ((etime (+ (current-seconds) 5))) ;; give up in five seconds
+    (if (> *http-requests-in-progress* 0)
+	(if (> etime (current-seconds))
+	    (begin
+	      (thread-sleep! 0.052)
+	      (loop etime))
+	    (debug:print-error 0 *default-log-port* "requests still in progress after 5 seconds of waiting. I'm going to pass on cleaning up http connections"))
+	(close-idle-connections!)))
+  (set! *http-connections-next-cleanup* (+ (current-seconds) 10))
+  (mutex-unlock! *http-mutex*))
+
+(define (http-transport:inc-requests-and-prep-to-close-all-connections)
+  (mutex-lock! *http-mutex*)
+  (set! *http-requests-in-progress* (+ 1 *http-requests-in-progress*)))
+
+;; serverdat contains uuid to be used for connection validation
+;;
+;; NOTE: serverdat must be initialized or created by servdat-init
+;;
+;; DO NOT USE. Moved to rmt:set-receive-real
+;;
+;; (define (http-transport:send-receive conn qry-key cmd params #!key (numretries 3))
+;;   (let* ((res        #f)
+;; 	 (success    #t)
+;; 	 (sparams    (with-output-to-string
+;; 		       (lambda ()(write params)))))
+;;     ;; send the data and get the response extract the needed info from
+;;     ;; the http data and process and return it.
+;;     (let* ((send-recieve (lambda ()
+;; 			   (set! res
+;; 				 (with-input-from-request
+;; 				  (rmt:conn->uri conn "api")
+;; 				  (list (cons 'key qry-key)
+;; 					;; (cons 'srvid (servdat-uuid sdat))
+;; 					(cons 'cmd cmd)
+;; 					(cons 'params sparams))
+;; 				   read-string))))
+;; 	   (time-out     (lambda ()
+;; 			   (thread-sleep! 45)
+;; 			   (debug:print 0 *default-log-port* "WARNING: send-receive took more than 45 seconds!!")
+;; 			   #f))
+;; 	   (th1 (make-thread send-recieve "with-input-from-request"))
+;; 	   (th2 (make-thread time-out     "time out")))
+;;       (thread-start! th1)
+;;       (thread-start! th2)
+;;       (thread-join! th1)
+;;       (close-idle-connections!)
+;;       (thread-terminate! th2)
+;;       (if (string? res)
+;; 	  (with-input-from-string res
+;; 	    (lambda () read))
+;; 	  res))))
+
+;; careful closing of connections stored in *runremote*
+;;
+(define (http-transport:close-connections #!key (area-dat #f))
+  (debug:print-info 0 *default-log-port* "http-transport:close-connections doesn't do anything now!"))
+;;   (let* ((runremote  (or area-dat *runremote*))
+;; 	 (server-dat (if runremote
+;;                          (remote-conndat runremote)
+;;                          #f))) ;; (hash-table-ref/default *runremote* run-id #f)))
+;;     (if (vector? server-dat)
+;; 	(let ((api-dat (http-transport:server-dat-get-api-uri server-dat)))
+;; 	  (handle-exceptions
+;; 	    exn
+;; 	    (begin
+;; 	      (print-call-chain *default-log-port*)
+;; 	      (debug:print-error 0 *default-log-port* " closing connection failed with error: " ((condition-property-accessor 'exn 'message) exn) ", exn=" exn))
+;; 	    (close-connection! api-dat)
+;;             ;;(close-idle-connections!)
+;; 	    #t))
+;; 	#f)))
+
+
+(define (make-http-transport:server-dat)(make-vector 6))
+(define (http-transport:server-dat-get-iface         vec)    (vector-ref  vec 0))
+(define (http-transport:server-dat-get-port          vec)    (vector-ref  vec 1))
+(define (http-transport:server-dat-get-api-uri       vec)    (vector-ref  vec 2))
+(define (http-transport:server-dat-get-api-url       vec)    (vector-ref  vec 3))
+(define (http-transport:server-dat-get-api-req       vec)    (vector-ref  vec 4))
+(define (http-transport:server-dat-get-last-access   vec)    (vector-ref  vec 5))
+;(define (http-transport:server-dat-get-socket        vec)    (vector-ref  vec 6))
+(define (http-transport:server-dat-get-server-id     vec)    (vector-ref  vec 6))
+
+(define (http-transport:server-dat-make-url vec)
+  (if (and (http-transport:server-dat-get-iface vec)
+	   (http-transport:server-dat-get-port  vec))
+      (conc "http://" 
+	    (http-transport:server-dat-get-iface vec)
+	    ":"
+	    (http-transport:server-dat-get-port  vec))
+      #f))
+
+(define (http-transport:server-dat-update-last-access vec)
+  (if (vector? vec)
+      (vector-set! vec 5 (current-seconds))
+      (begin
+	(print-call-chain (current-error-port))
+	(debug:print-error 0 *default-log-port* "call to http-transport:server-dat-update-last-access with non-vector!!"))))
+
+;; initialize servdat for client side, setup needed parameters
+;; pass in #f as sdat-in to create sdat
+;;
+(define (servdat-init sdat-in iface port uuid)
+  (let* ((sdat (or sdat-in (make-servdat))))
+    (if uuid (servdat-uuid-set! sdat uuid))
+    (servdat-host-set! sdat iface)
+    (servdat-port-set! sdat port)
+    (servdat-api-url-set! sdat (conc "http://" iface ":" port "/api"))
+    (servdat-api-uri-set! sdat (uri-reference (servdat-api-url sdat)))
+    (servdat-api-req-set! sdat (make-request method: 'POST
+					     uri: (servdat-api-uri sdat)))
+    ;; set up the http-client parameters
+    (max-retry-attempts 1)
+    ;; consider all requests indempotent
+    (retry-request? (lambda (request)
+		      #f))
+    (determine-proxy (constantly #f))
+   sdat))
+
+;;======================================================================
+;; NEW SERVER METHOD
+;;======================================================================
+
+;; only use for main.db - need to re-write some of this :(
+;;
+(define (get-lock-db sdat dbfile)
+  (let* ((dbh (db:open-run-db dbfile db:initialize-db))
+	 (res (db:get-iam-server-lock dbh dbfile)))
+    (sqlite3:finalize! dbh)
+    res))
+
+
+(define *srvpktspec*
+  `((server (host    . h)
+	    (port    . p)
+	    (servkey . k)
+	    (pid     . i)
+	    (ipaddr  . a)
+	    (dbpath  . d))))
+
+(define (register-server pkts-dir pkt-spec host port servkey ipaddr dbpath)
+  (let* ((pkt-dat `((host    . ,host)
+		    (port    . ,port)
+		    (servkey . ,servkey)
+		    (pid     . ,(current-process-id))
+		    (ipaddr  . ,ipaddr)
+		    (dbpath  . ,dbpath)))
+	 (uuid    (write-alist->pkt
+		   pkts-dir
+		   pkt-dat
+		   pktspec: pkt-spec
+		   ptype: 'server)))
+    (debug:print 0 *default-log-port* "Server on "host":"port" registered in pkt "uuid)
+    uuid))
+
+(define (get-pkts-dir #!optional (apath #f))
+  (let* ((effective-toppath (or *toppath* apath)))
+    (assert effective-toppath
+	    "ERROR: get-pkts-dir called without *toppath* set. Exiting.")
+    (let* ((pdir (conc effective-toppath "/.meta/srvpkts")))
+      (if (file-exists? pdir)
+	  pdir
+	  (begin
+	    (create-directory pdir #t)
+	    pdir)))))
+
+;; given a pkts dir read 
+;;
+(define (get-all-server-pkts pktsdir-in pktspec)
+  (let* ((pktsdir  (if (file-exists? pktsdir-in)
+		       pktsdir-in
+		       (begin
+			 (create-directory pktsdir-in #t)
+			 pktsdir-in)))
+	 (all-pkt-files (glob (conc pktsdir "/*.pkt"))))
+    (map (lambda (pkt-file)
+	   (read-pkt->alist pkt-file pktspec: pktspec))
+	 all-pkt-files)))
+
+(define (server-address srv-pkt)
+  (conc (alist-ref 'host srv-pkt) ":"
+	(alist-ref 'port srv-pkt)))
+	
+(define (server-ready? host port key) ;; server-address is host:port
+  ;; ping the server and ask it
+  ;; if it ready
+  ;; (let* ((sdat (servdat-init #f host port #f)))
+  ;;   (http-transport:send-receive sdat "abc" 'ping '())))
+  (let* ((res (with-input-from-request
+	       (conc "http://"host":"port"/ping") ;; returns *toppath*/dbname
+	       #f
+	       read-string)))
+    (if (equal? res key)
+	#t
+	(begin
+	  (debug:print-info 0 *default-log-port* "server-ready? key="key", received="res)
+	  #f))))
+	      
+(define (loop-test host port data) ;; server-address is host:port
+  ;; ping the server and ask it
+  ;; if it ready
+  ;; (let* ((sdat (servdat-init #f host port #f)))
+  ;;   (http-transport:send-receive sdat "abc" 'ping '())))
+  (let* ((payload (sexpr->string data))
+	 (res     (with-input-from-request
+		   (conc "http://"host":"port"/loop-test") ;; returns *toppath*/dbname
+		   `((data . ,payload))
+		   read-string)))
+    (string->sexpr res)))
+	      
+; from the pkts return servers associated with dbpath
+;; NOTE: Only one can be alive - have to check on each
+;;       in the list of pkts returned
+;;
+(define (get-viable-servers serv-pkts dbpath)
+  (let loop ((tail serv-pkts)
+	     (res  '()))
+    (if (null? tail)
+	res ;; NOTE: sort by age so oldest is considered first
+	(let* ((spkt (car tail)))
+	  (loop (cdr tail)
+		(if (equal? dbpath (alist-ref 'dbpath spkt))
+		    (cons spkt res)
+		    res))))))
+
+;; from viable servers get one that is alive and ready
+;;
+(define (get-the-server serv-pkts)
+  (let loop ((tail serv-pkts))
+    (if (null? tail)
+	#f
+	(let* ((spkt  (car tail))
+	       (host  (alist-ref 'ipaddr spkt))
+	       (port  (alist-ref 'port spkt))
+	       (dbpth (alist-ref 'dbpath spkt))
+	       (addr  (server-address spkt)))
+	  (if (server-ready? host port dbpth)
+	      spkt
+	      (loop (cdr tail)))))))
+
+;; am I the "first" in line server? I.e. my D card is smallest
+;; use Z card as tie breaker
+;;
+(define (get-best-candidate serv-pkts dbpath)
+  (if (null? serv-pkts)
+      #f
+      (let loop ((tail serv-pkts)
+		 (best  (car serv-pkts)))
+	(if (null? tail)
+	    best
+	    (let* ((candidate (car tail))
+		   (candidate-bd (string->number (alist-ref 'D candidate)))
+		   (best-bd      (string->number (alist-ref 'D best)))
+		   ;; bigger number is younger
+		   (candidate-z  (alist-ref 'Z candidate))
+		   (best-z       (alist-ref 'Z best))
+		   (new-best     (cond
+				  ((> best-bd candidate-bd) ;; best is younger than candidate
+				   candidate)
+				  ((< best-bd candidate-bd) ;; candidate is younger than best
+				   best)
+				  (else
+				   (if (string>=? best-z candidate-z)
+				       best
+				       candidate))))) ;; use Z card as tie breaker
+	      (if (null? tail)
+		  new-best
+		  (loop (cdr tail) new-best)))))))
+	  
+	  
+
+;;======================================================================
+;; END NEW SERVER METHOD
+;;======================================================================
+
+(define (http-transport:wait-for-server pkts-dir db-file server-key)
+  (let* ((sdat *server-info*))
+    (let loop ((start-time (current-seconds))
+	       (changed    #t)
+	       (last-sdat  "not this"))
+      (begin ;; let ((sdat #f))
+	(thread-sleep! 0.01)
+	(debug:print-info 0 *default-log-port* "Waiting for server alive signature")
+	(mutex-lock! *heartbeat-mutex*)
+	(set! sdat *server-info*)
+	(mutex-unlock! *heartbeat-mutex*)
+	(if (and sdat
+		 (not changed)
+		 (> (- (current-seconds) start-time) 2))
+	    (begin
+	      (debug:print-info 0 *default-log-port* "Received server alive signature, now attempting to lock in server")
+	      ;; create a server pkt in *toppath*/.meta/srvpkts
+	      
+	      ;; TODO:
+	      ;;   1. change sdat to stuct
+	      ;;   2. add uuid to struct
+	      ;;   3. update uuid in sdat here
+	      ;;
+	      (servdat-uuid-set! sdat
+				 (register-server
+				  pkts-dir *srvpktspec*
+				  (get-host-name)
+				  (servdat-port sdat) server-key
+				  (servdat-host sdat) db-file))
+	      
+	      ;; now read pkts and see if we are a contender
+	      (let* ((all-pkts     (get-all-server-pkts pkts-dir *srvpktspec*))
+		     (viables      (get-viable-servers all-pkts db-file))
+		     (best-srv     (get-best-candidate viables db-file))
+		     (best-srv-key (if best-srv (alist-ref 'servkey best-srv) #f)))
+		(debug:print 0 *default-log-port* "best-srv-key: "best-srv-key", server-key: "server-key)
+		;; am I the best-srv, compare server-keys to know
+		(if (equal? best-srv-key server-key)
+		    (if (get-lock-db sdat db-file) ;; (db:get-iam-server-lock *dbstruct-db* *toppath* run-id)
+			(begin
+			  (debug:print 0 *default-log-port* "I'm the server!")
+			  (servdat-dbfile-set! sdat db-file))
+			(begin
+			  (debug:print 0 *default-log-port* "I'm not the server, exiting.")
+			  (bdat-time-to-exit-set! *bdat* #t)
+			  (thread-sleep! 0.2)
+			  (exit)))
+		    (begin
+		      (debug:print 0 *default-log-port*
+				   "Keys do not match "best-srv-key", "server-key", exiting.")
+		      (bdat-time-to-exit-set! *bdat* #t)
+		      (thread-sleep! 0.2)
+		      (exit)))
+		sdat))
+	    (begin ;; sdat not yet contains server info
+	      (debug:print-info 0 *default-log-port* "Still waiting, last-sdat=" last-sdat)
+	      (sleep 4)
+	      (if (> (- (current-seconds) start-time) 120) ;; been waiting for two minutes
+		  (begin
+		    (debug:print-error 0 *default-log-port* "transport appears to have died, exiting server")
+		    (exit))
+		  (loop start-time
+			(equal? sdat last-sdat)
+			sdat))))))))
+
+;; run http-transport:keep-running in a parallel thread to monitor that the db is being 
+;; used and to shutdown after sometime if it is not.
+;;
+(define (http-transport:keep-running dbname) 
+  ;; if none running or if > 20 seconds since 
+  ;; server last used then start shutdown
+  ;; This thread waits for the server to come alive
+  (debug:print-info 0 *default-log-port* "Starting the sync-back, keep alive thread in server")
+  (let* ((run-id            (let ((rid (args:get-arg "-run-id"))) ;; consider getting rid of the -run-id mechanism
+			      (if rid                             ;; replace with -db
+				  (string->number rid)
+				  #f)))
+	 (db-file           (if dbname
+				(db:dbname->path *toppath* dbname)
+				(db:run-id->path *toppath* run-id)))
+	 (sdat              #f)
+	 ;; (tmp-area          (common:get-db-tmp-area))
+	 (server-start-time (current-seconds))
+	 (pkts-dir          (get-pkts-dir))
+	 (server-key        (server:mk-signature))
+	 (server-info       (http-transport:wait-for-server pkts-dir db-file server-key ))
+	 (iface       (servdat-host server-info))
+         (port        (servdat-port server-info))
+         (last-access 0)
+	 (server-timeout (server:expiration-timeout))
+	 (server-log-file (args:get-arg "-log"))) ;; always set when we are a server
+
+    (let loop ((count         0)
+	       (server-state 'available)
+	       (bad-sync-count 0)
+	       (start-time     (current-milliseconds)))
+      ;; Use this opportunity to sync the tmp db to megatest.db
+      (if (not *dbstruct-db* )
+	  (let ((watchdog (bdat-watchdog *bdat*)))
+	    (debug:print 0 *default-log-port* "SERVER: dbprep")
+	    
+	    (db:setup dbname) ;; sets *dbstruct-db* as side effect
+
+	    (debug:print 0 *default-log-port* "SERVER: running, megatest version: " (common:get-full-version)) ;; NOTE: the server is NOT yet marked as running in the log. We do that in the keep-running routine.
+	    (if watchdog
+		(if (not (member (thread-state watchdog) '(ready running blocked sleeping dead)))
+		    (begin
+		      (debug:print-info 0 *default-log-port* "Starting watchdog thread (in state "(thread-state watchdog)")")
+		      (thread-start! watchdog)))
+		(debug:print 0 *default-log-port* "ERROR: *watchdog* not setup, cannot start it."))))
+      
+      ;; when things go wrong we don't want to be doing the various queries too often
+      ;; so we strive to run this stuff only every four seconds or so.
+      (let* ((sync-time (- (current-milliseconds) start-time))
+	    (rem-time  (quotient (- 4000 sync-time) 1000)))
+	(if (and (<= rem-time 4)
+		 (>  rem-time 0))
+	    (thread-sleep! rem-time)))
+      
+      (if (< count 1) ;; 3x3 = 9 secs aprox
+	  (loop (+ count 1) 'running bad-sync-count (current-milliseconds)))
+      
+      ;; Check that iface and port have not changed (can happen if server port collides)
+      (mutex-lock! *heartbeat-mutex*)
+      (set! sdat *server-info*)
+      (mutex-unlock! *heartbeat-mutex*)
+      
+      (if (or (not (equal? (servdat-host sdat) iface))
+	      (not (equal? (servdat-port sdat) port)))
+	  (let ((new-iface (servdat-host sdat))
+		(new-port  (servdat-port sdat)))
+	    (debug:print-info 0 *default-log-port* "WARNING: interface changed, refreshing iface and port info")
+	    (set! iface new-iface)
+	    (set! port  new-port)
+	    (if (not *server-id*)
+		(set! *server-id* (server:mk-signature)))
+            ;; (debug:print 0 *default-log-port* (current-seconds) (current-directory) (current-process-id) (argv))
+	    (debug:print 0 *default-log-port* "SERVER STARTED: " iface ":" port " AT " (current-seconds) " server-id: " *server-id*)
+	    (flush-output *default-log-port*)))
+      
+      ;; Transfer *db-last-access* to last-access to use in checking that we are still alive
+      (mutex-lock! *heartbeat-mutex*)
+      (set! last-access *db-last-access*)
+      (mutex-unlock! *heartbeat-mutex*)
+      
+      (if (common:low-noise-print 120 (conc "server running on " iface ":" port))
+	  (begin
+             (if (not *server-id*)
+              (set! *server-id* (server:mk-signature)))
+	     ;; (debug:print 0 *default-log-port* (current-seconds) (current-directory) (current-process-id) (argv))   
+	     (debug:print 0 *default-log-port* "SERVER STARTED: " iface ":" port " AT " (current-seconds) " server-id: " *server-id*)
+	     (flush-output *default-log-port*)))
+      (if (common:low-noise-print 60 "dbstats")
+	  (begin
+	    (debug:print 0 *default-log-port* "Server stats:")
+	    (db:print-current-query-stats)))
+      (let* ((hrs-since-start  (/ (- (current-seconds) server-start-time) 3600)))
+	(cond
+         ((and *server-run*
+	       (> (+ last-access server-timeout)
+		  (current-seconds)))
+          (if (common:low-noise-print 120 "server continuing")
+              (debug:print-info 0 *default-log-port* "Server continuing, seconds since last db access: " (- (current-seconds) last-access))
+	      (let ((curr-time (current-seconds)))
+		(handle-exceptions
+		    exn
+		    (debug:print 0 *default-log-port* "ERROR: Failed to change timestamp on log file " server-log-file ". Are you out of space on that disk? exn=" exn)
+		  (if (and server-log-file (not *server-overloaded*))
+		      (set-file-times! server-log-file curr-time curr-time)))))
+          (loop 0 server-state bad-sync-count (current-milliseconds)))
+         (else
+          (debug:print-info 0 *default-log-port* "Server timed out. seconds since last db access: " (- (current-seconds) last-access))
+          (http-transport:server-shutdown port)))))))
+
+(define (http-transport:server-shutdown port)
+  (begin
+    ;;(BB> "http-transport:server-shutdown called")
+    (debug:print-info 0 *default-log-port* "Starting to shutdown the server. pid="(current-process-id))
+    ;;
+    ;; start_shutdown
+    ;;
+    (bdat-time-to-exit-set! *bdat* #t) ;; tell on-exit to be fast as we've already cleaned up
+    (portlogger:open-run-close portlogger:set-port port "released")
+    (thread-sleep! 1)
+
+    ;; (debug:print-info 0 *default-log-port* "Max cached queries was    " *max-cache-size*)
+    ;; (debug:print-info 0 *default-log-port* "Number of cached writes   " *number-of-writes*)
+    ;; (debug:print-info 0 *default-log-port* "Average cached write time "
+    ;; 		      (if (eq? *number-of-writes* 0)
+    ;; 			  "n/a (no writes)"
+    ;; 			  (/ *writes-total-delay*
+    ;; 			     *number-of-writes*))
+    ;; 		      " ms")
+    ;; (debug:print-info 0 *default-log-port* "Number non-cached queries "  *number-non-write-queries*)
+    ;; (debug:print-info 0 *default-log-port* "Average non-cached time   "
+    ;; 		      (if (eq? *number-non-write-queries* 0)
+    ;; 			  "n/a (no queries)"
+    ;; 			  (/ *total-non-write-delay* 
+    ;; 			     *number-non-write-queries*))
+    ;; 		      " ms")
+    
+    (db:print-current-query-stats)
+    (common:save-pkt `((action . exit)
+                       (T      . server)
+                       (pid    . ,(current-process-id)))
+                     *configdat* #t)
+    (debug:print-info 0 *default-log-port* "Server shutdown complete. Exiting")
+    (exit)))
+
+;; Call this to start the actual server
+;;
+
+;; all routes though here end in exit ...
+;;
+;; start_server? 
+;;
+(define (http-transport:launch dbname)
+  (let* (;; (tmp-area            (common:get-db-tmp-area))
+	 ;; (server-start        (conc tmp-area "/.server-start"))
+	 ;; (server-started      (conc tmp-area "/.server-started"))
+	 ;; (start-time          (common:lazy-modification-time server-start))
+	 ;; (started-time        (common:lazy-modification-time server-started))
+	 ;; (server-starting     (< start-time started-time)) ;; if start-time is less than started-time then a server is still starting
+	 ;; (start-time-old      (> (- (current-seconds) start-time) 5))
+         (cleanup-proc        (lambda (msg)
+                                (let* ((serv-fname      (conc "server-" (current-process-id) "-" (get-host-name) ".log"))
+                                       (full-serv-fname (conc *toppath* "/logs/" serv-fname))
+                                       (new-serv-fname  (conc *toppath* "/logs/" "defunct-" serv-fname)))
+                                  (debug:print 0 *default-log-port* msg)
+                                  (if (common:file-exists? full-serv-fname)
+                                      (system (conc "sleep 1;mv -f " full-serv-fname " " new-serv-fname))
+                                      (debug:print 0 *default-log-port* "INFO: cannot move " full-serv-fname " to " new-serv-fname))
+                                  (exit)))))
+    #;(common:save-pkt `((action . start)
+		       (T      . server)
+		       (pid    . ,(current-process-id)))
+		     *configdat* #t)
+    (let* ((th2 (make-thread (lambda ()
+                               (debug:print-info 0 *default-log-port* "Server run thread started")
+                               (http-transport:run 
+                                (if (args:get-arg "-server")
+                                    (args:get-arg "-server")
+                                    "-")
+                                )) "Server run"))
+           (th3 (make-thread (lambda ()
+                               (debug:print-info 0 *default-log-port* "Server monitor thread started")
+                               (http-transport:keep-running dbname)
+                               "Keep running"))))
+      (thread-start! th2)
+      (thread-sleep! 0.252) ;; give the server time to settle before starting the keep-running monitor.
+      (thread-start! th3)
+      (set! *didsomething* #t)
+      (thread-join! th2)
+      (exit))))
+	    
+;; Generate a unique signature for this server
+(define (server:mk-signature)
+  (message-digest-string (md5-primitive) 
+			 (with-output-to-string
+			   (lambda ()
+			     (write (list (current-directory)
+                                          (current-process-id)
+					  (argv)))))))
+
+(define (server:get-client-signature) 
+  (if *my-client-signature* *my-client-signature*
+      (let ((sig (server:mk-signature)))
+        (set! *my-client-signature* sig)
+        *my-client-signature*)))
+
+;; run ping in separate process, safest way in some cases
+;;
+(define (server:ping-server ifaceport)
+  (with-input-from-pipe 
+   (conc (common:get-megatest-exe) " -ping " ifaceport)
+   (lambda ()
+     (let loop ((inl (read-line))
+		(res "NOREPLY"))
+       (if (eof-object? inl)
+	   (case (string->symbol res)
+	     ((NOREPLY)  #f)
+	     ((LOGIN_OK) #t)
+	     (else       #f))
+	   (loop (read-line) inl))))))
+
+
+;;======================================================================
+;; S E R V E R
+;;======================================================================
+
+;; Call this to start the actual server
+;;
+
+;; all routes though here end in exit ...
+;;
+;; start_server
+;;
+(define (server:launch dbname)
+    (http-transport:launch dbname))
+
+;;======================================================================
+;; S E R V E R   U T I L I T I E S 
+;;======================================================================
+
+;; NOT USED (well, ok, reference in rpc-transport but otherwise not used).
+;;
+(define (server:login toppath)
+  (lambda (toppath)
+    (set! *db-last-access* (current-seconds)) ;; might not be needed.
+    (if (equal? *toppath* toppath)
+	#t
+	#f)))
+
+;; (define server:sync-lock-token "SERVER_SYNC_LOCK")
+;; (define (server:release-sync-lock)
+;;   (db:no-sync-del! *no-sync-db* server:sync-lock-token))
+;; (define (server:have-sync-lock?)
+;;   (let* ((have-lock-pair (db:no-sync-get-lock *no-sync-db* server:sync-lock-token))
+;;          (have-lock?     (car have-lock-pair))
+;;          (lock-time      (cdr have-lock-pair))
+;;          (lock-age       (- (current-seconds) lock-time)))
+;;     (cond
+;;      (have-lock? #t)
+;;      ((>lock-age
+;;        (* 3 (configf:lookup-number *configdat* "server" "minimum-intersync-delay" default: 180)))
+;;       (server:release-sync-lock)
+;;       (server:have-sync-lock?))
+;;      (else #f))))
+
+
+)

DELETED items.scm
Index: items.scm
==================================================================
--- items.scm
+++ /dev/null
@@ -1,212 +0,0 @@
-
-;; Copyright 2006-2012, Matthew Welland.
-;; 
-;; This file is part of Megatest.
-;; 
-;;     Megatest is free software: you can redistribute it and/or modify
-;;     it under the terms of the GNU General Public License as published by
-;;     the Free Software Foundation, either version 3 of the License, or
-;;     (at your option) any later version.
-;; 
-;;     Megatest is distributed in the hope that it will be useful,
-;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;     GNU General Public License for more details.
-;; 
-;;     You should have received a copy of the GNU General Public License
-;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
-
-
-;; (define itemdat '((ripeness    "green ripe overripe")
-;; 		     (temperature "cool medium hot")
-;; 		     (season      "summer winter fall spring")))
-
-(declare (unit items))
-(declare (uses common))
-
-(include "common_records.scm")
-
-;; Puts out all combinations
-(define (process-itemlist hierdepth curritemkey itemlist)
-  (let ((res '()))
-    (if (not hierdepth)
-	(set! hierdepth (length itemlist)))
-    (let loop ((hed (car itemlist))
-	       (tal (cdr itemlist)))
-      (if (null? tal)
-	  (for-each (lambda (item)
-		      (if (> (length curritemkey) (- hierdepth 2))
-			  (set! res (append res (list (append curritemkey (list (list (car hed) item))))))))
-		    (cadr hed))
-	  (begin
-	    (for-each (lambda (item)
-			(set! res (append res (process-itemlist hierdepth (append curritemkey (list (list (car hed) item))) tal))))
-		      (cadr hed))
-	    (loop (car tal)(cdr tal)))))
-    res))
-
-;; (item-assoc->item-list '(("ANIMAL" "Elephant Lion")("SEASON" "Spring Fall")))
-;;   => ((("ANIMAL" "Elephant") ("SEASON" "Spring")) 
-;;       (("ANIMAL" "Elephant") ("SEASON" "Fall")) 
-;;       (("ANIMAL" "Lion")     ("SEASON" "Spring"))
-;;       (("ANIMAL" "Lion")     ("SEASON" "Fall")))
-(define (item-assoc->item-list itemsdat)
-  (if (and itemsdat (not (null? itemsdat)))
-      (let ((itemlst (filter (lambda (x)
-			       (list? x))
-			     (map (lambda (x)
-				    (debug:print 6 *default-log-port* "item-assoc->item-list x: " x)
-				    (if (< (length x) 2)
-					(begin
-					  (debug:print-error 0 *default-log-port* "malformed items spec " (string-intersperse x " "))
-					  (list (car x)'()))
-					(let* ((name (car x))
-					       (items (cadr x))
-					       (ilist (list name (if (string? items)
-								     (string-split items)
-								     '()))))
-					  (if (null? ilist)
-					      (debug:print-error 0 *default-log-port* "No items specified for " name))
-					  ilist)))
-				  itemsdat))))
-	(let ((debuglevel 5))
-	  (debug:print 5 *default-log-port* "item-assoc->item-list: itemsdat => itemlst ")
-	  (if (debug:debug-mode 5)
-	      (begin
-		(pp itemsdat)
-		(print " => ")
-		(pp itemlst))))
-	(if (> (length itemlst) 0)
-	    (process-itemlist #f '() itemlst)
-	    '()))
-      '())) ;; return a list consisting on a single null list for non-item runs
-            ;; Nope, not now, return null as of 6/6/2011
-
-;; (item-table->item-list '(("ANIMAL" "Elephant Lion")("SEASON" "Spring Winter")))
-;;   => ((("ANIMAL" "Elephant")("SEASON" "Spring"))
-;;       (("ANIMAL" "Lion")    ("SEASON" "Winter")))
-(define (item-table->item-list itemtable)
-  (let ((newlst (map (lambda (x)
-		       (if (> (length x) 1)
-			   (list (car x)
-				 (string-split (cadr x)))
-			   (list x '())))
-		     itemtable))
-	(res     '())) ;; a list of items
-    (let loop ((indx    0)
-	       (item   '()) ;; an item will be ((KEYNAME1 VAL1)(KEYNAME2 VAL2) ...)
-	       (elflag  #f))
-      (for-each (lambda (row)
-		  (let ((rowname (car row))
-			(rowdat  (cadr row)))
-		    (set! item (append item 
-				       (list 
-					(if (< indx (length rowdat))
-					    (let ((new (list rowname (list-ref rowdat indx))))
-					      ;; (debug:print 0 *default-log-port* "New: " new)
-					      (set! elflag #t)
-					      new
-					      ) ;; i.e. had at least on legit value to use
-					    (list rowname "-")))))))
-		newlst)
-      (if elflag
-	  (begin
-	    (set! res (append res (list item)))
-	    (loop (+ indx 1)
-		  '()
-		  #f)))
-      res)))
-            ;; Nope, not now, return null as of 6/6/2011
-		
-(define (items:check-valid-items class item)
-  (let ((valid-values (let ((s (configf:lookup *configdat* "validvalues" class)))
-			(if s (string-split s) #f))))
-    (if valid-values
-	(if (member item valid-values)
-	    item #f)
-	item)))
-
-;;  '(("k1" "k2" "k3")
-;;    ("a" "b" "c")
-;;    ("d" "e" "f"))
-;;
-;;    => '((("k1" "a")("k2" "b")("k3" "c"))
-;;         (("k1" "d")("k2" "e")("k3" "f")))
-;;
-(define (items:first-row-intersperse data)
-  (if (< (length data) 2)
-      '()
-      (let ((header (car data))
-	    (rows   (cdr data)))
-	(map (lambda (row)
-	       (map list header row))
-	     rows))))
-
-;; k1/k2/k3
-;; a/b/c
-;; d/e/f
-;;    => '(("k1" "k2" "k3")
-;;         ("a" "b" "c")
-;;         ("d" "e" "f"))
-;;
-;;    => '((("k1" "a")("k2" "b")("k3" "c"))
-;;         (("k1" "d")("k2" "e")("k3" "f")))
-;;
-(define (items:read-items-file fname ftype) ;; 'sxml 'slash 'space 
-  (if (and fname (file-exists? fname))
-      (items:first-row-intersperse (case ftype
-				     ((slash space)
-				      (let ((splitter (case ftype
-							((slash) (lambda (x)(string-split x "/")))
-							(else    string-split))))
-					(debug:print 0 *default-log-port* "Reading " fname " of type " ftype)
-					(with-input-from-file fname
-					  (lambda ()
-					    (let loop ((inl (read-line))
-						       (res '()))
-					      (if (eof-object? inl)
-						  res
-						  (loop (read-line)(cons (splitter inl) res))))))))
-				     ((sxml)(with-input-from-file fname read))
-				     (else (debug:print 0 *default-log-port* "items file type " ftype " not recognised"))))
-      (begin
-	(if fname (debug:print 0 *default-log-port* "no items file " fname " found"))
-	'())))
-
-(define (items:get-items-from-config tconfig)
-  (let* ((slashf      (configf:lookup tconfig "itemopts" "slash")) ;; a/b/c\nd/e/f\n ...
-	 (sxmlf       (configf:lookup tconfig "itemopts" "sxml"))  ;; '(("a" "b" "c")("d" "e" "f") ...)
-	 (spacef      (configf:lookup tconfig "itemopts" "space")) ;; a b c\nd e f\n ...
-	 (have-items  (hash-table-ref/default tconfig "items"      #f))
-	 (have-itable (hash-table-ref/default tconfig "itemstable" #f))
-	 (items       (hash-table-ref/default tconfig "items"      '()))
-	 (itemstable  (hash-table-ref/default tconfig "itemstable" '())))
-    (debug:print 5 *default-log-port* "items: " items " itemstable: " itemstable)
-    (set! items (map (lambda (item)
-		       (if (procedure? (cadr item))
-			   (list (car item)((cadr item)))  ;; evaluate the proc
-			   item))
-		     items))
-    (set! itemstable (map (lambda (item)
-			    (if (procedure? (cadr item))
-				(list (car item)((cadr item)))  ;; evaluate the proc
-				item))
-			  itemstable))
-    (if (and have-items  (null? items))     (debug:print 0 *default-log-port* "WARNING:[items] section in testconfig but no entries defined"))
-    (if (and have-itable (null? itemstable))(debug:print 0 *default-log-port* "WARNNG:[itemstable] section in testconfig but no entries defined"))
-    (if (or (not (null? items))
-	    (not (null? itemstable))
-	    slashf
-	    sxmlf
-	    spacef)
-	(append (item-assoc->item-list items)
-		(item-table->item-list itemstable)
-		(items:read-items-file slashf 'slash)
-		(items:read-items-file sxmlf  'sxml)
-		(items:read-items-file spacef 'space))
-	'(()))))
-
-;; (pp (item-assoc->item-list itemdat))
-
-
-	

ADDED   itemsmod.scm
Index: itemsmod.scm
==================================================================
--- /dev/null
+++ itemsmod.scm
@@ -0,0 +1,266 @@
+;;======================================================================
+;; Copyright 2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
+
+;;======================================================================
+
+(declare (unit itemsmod))
+(declare (uses mtargs))
+(declare (uses debugprint))
+(declare (uses configfmod))
+
+(module itemsmod
+	*
+	
+(import scheme
+
+	chicken.base
+	chicken.condition
+	chicken.file
+	chicken.io
+	chicken.pathname
+	chicken.port
+	chicken.pretty-print
+	chicken.process
+	chicken.process-context
+	chicken.sort
+	chicken.string
+	chicken.time
+
+	debugprint
+	mtargs
+	pkts
+	
+	(prefix base64 base64:)
+	(prefix dbi dbi:)
+	(prefix sqlite3 sqlite3:)
+	(srfi 18)
+	directory-utils
+	format
+	matchable
+	md5
+	message-digest
+	regex
+	regex-case
+	sparse-vectors
+	srfi-1
+	srfi-13
+	srfi-69
+	stack
+	typed-records
+	z3
+
+	configfmod
+	
+	)
+;; (define itemdat '((ripeness    "green ripe overripe")
+;; 		     (temperature "cool medium hot")
+;; 		     (season      "summer winter fall spring")))
+
+;; (declare (unit items))
+;; (declare (uses common))
+;; 
+;; (include "common_records.scm")
+
+;; Puts out all combinations
+(define (process-itemlist hierdepth curritemkey itemlist)
+  (let ((res '()))
+    (if (not hierdepth)
+	(set! hierdepth (length itemlist)))
+    (let loop ((hed (car itemlist))
+	       (tal (cdr itemlist)))
+      (if (null? tal)
+	  (for-each (lambda (item)
+		      (if (> (length curritemkey) (- hierdepth 2))
+			  (set! res (append res (list (append curritemkey (list (list (car hed) item))))))))
+		    (cadr hed))
+	  (begin
+	    (for-each (lambda (item)
+			(set! res (append res (process-itemlist hierdepth (append curritemkey (list (list (car hed) item))) tal))))
+		      (cadr hed))
+	    (loop (car tal)(cdr tal)))))
+    res))
+
+;; (item-assoc->item-list '(("ANIMAL" "Elephant Lion")("SEASON" "Spring Fall")))
+;;   => ((("ANIMAL" "Elephant") ("SEASON" "Spring")) 
+;;       (("ANIMAL" "Elephant") ("SEASON" "Fall")) 
+;;       (("ANIMAL" "Lion")     ("SEASON" "Spring"))
+;;       (("ANIMAL" "Lion")     ("SEASON" "Fall")))
+(define (item-assoc->item-list itemsdat)
+  (if (and itemsdat (not (null? itemsdat)))
+      (let ((itemlst (filter (lambda (x)
+			       (list? x))
+			     (map (lambda (x)
+				    (debug:print 6 *default-log-port* "item-assoc->item-list x: " x)
+				    (if (< (length x) 2)
+					(begin
+					  (debug:print-error 0 *default-log-port* "malformed items spec " (string-intersperse x " "))
+					  (list (car x)'()))
+					(let* ((name (car x))
+					       (items (cadr x))
+					       (ilist (list name (if (string? items)
+								     (string-split items)
+								     '()))))
+					  (if (null? ilist)
+					      (debug:print-error 0 *default-log-port* "No items specified for " name))
+					  ilist)))
+				  itemsdat))))
+	(let ((debuglevel 5))
+	  (debug:print 5 *default-log-port* "item-assoc->item-list: itemsdat => itemlst ")
+	  (if (debug:debug-mode 5)
+	      (begin
+		(pp itemsdat)
+		(print " => ")
+		(pp itemlst))))
+	(if (> (length itemlst) 0)
+	    (process-itemlist #f '() itemlst)
+	    '()))
+      '())) ;; return a list consisting on a single null list for non-item runs
+            ;; Nope, not now, return null as of 6/6/2011
+
+;; (item-table->item-list '(("ANIMAL" "Elephant Lion")("SEASON" "Spring Winter")))
+;;   => ((("ANIMAL" "Elephant")("SEASON" "Spring"))
+;;       (("ANIMAL" "Lion")    ("SEASON" "Winter")))
+(define (item-table->item-list itemtable)
+  (let ((newlst (map (lambda (x)
+		       (if (> (length x) 1)
+			   (list (car x)
+				 (string-split (cadr x)))
+			   (list x '())))
+		     itemtable))
+	(res     '())) ;; a list of items
+    (let loop ((indx    0)
+	       (item   '()) ;; an item will be ((KEYNAME1 VAL1)(KEYNAME2 VAL2) ...)
+	       (elflag  #f))
+      (for-each (lambda (row)
+		  (let ((rowname (car row))
+			(rowdat  (cadr row)))
+		    (set! item (append item 
+				       (list 
+					(if (< indx (length rowdat))
+					    (let ((new (list rowname (list-ref rowdat indx))))
+					      ;; (debug:print 0 *default-log-port* "New: " new)
+					      (set! elflag #t)
+					      new
+					      ) ;; i.e. had at least on legit value to use
+					    (list rowname "-")))))))
+		newlst)
+      (if elflag
+	  (begin
+	    (set! res (append res (list item)))
+	    (loop (+ indx 1)
+		  '()
+		  #f)))
+      res)))
+            ;; Nope, not now, return null as of 6/6/2011
+		
+(define (items:check-valid-items class item)
+  (let ((valid-values (let ((s (configf:lookup *configdat* "validvalues" class)))
+			(if s (string-split s) #f))))
+    (if valid-values
+	(if (member item valid-values)
+	    item #f)
+	item)))
+
+;;  '(("k1" "k2" "k3")
+;;    ("a" "b" "c")
+;;    ("d" "e" "f"))
+;;
+;;    => '((("k1" "a")("k2" "b")("k3" "c"))
+;;         (("k1" "d")("k2" "e")("k3" "f")))
+;;
+(define (items:first-row-intersperse data)
+  (if (< (length data) 2)
+      '()
+      (let ((header (car data))
+	    (rows   (cdr data)))
+	(map (lambda (row)
+	       (map list header row))
+	     rows))))
+
+;; k1/k2/k3
+;; a/b/c
+;; d/e/f
+;;    => '(("k1" "k2" "k3")
+;;         ("a" "b" "c")
+;;         ("d" "e" "f"))
+;;
+;;    => '((("k1" "a")("k2" "b")("k3" "c"))
+;;         (("k1" "d")("k2" "e")("k3" "f")))
+;;
+(define (items:read-items-file fname ftype) ;; 'sxml 'slash 'space 
+  (if (and fname (file-exists? fname))
+      (items:first-row-intersperse (case ftype
+				     ((slash space)
+				      (let ((splitter (case ftype
+							((slash) (lambda (x)(string-split x "/")))
+							(else    string-split))))
+					(debug:print 0 *default-log-port* "Reading " fname " of type " ftype)
+					(with-input-from-file fname
+					  (lambda ()
+					    (let loop ((inl (read-line))
+						       (res '()))
+					      (if (eof-object? inl)
+						  res
+						  (loop (read-line)(cons (splitter inl) res))))))))
+				     ((sxml)(with-input-from-file fname read))
+				     (else (debug:print 0 *default-log-port* "items file type " ftype " not recognised"))))
+      (begin
+	(if fname (debug:print 0 *default-log-port* "no items file " fname " found"))
+	'())))
+
+(define (items:get-items-from-config tconfig)
+  (let* ((slashf      (configf:lookup tconfig "itemopts" "slash")) ;; a/b/c\nd/e/f\n ...
+	 (sxmlf       (configf:lookup tconfig "itemopts" "sxml"))  ;; '(("a" "b" "c")("d" "e" "f") ...)
+	 (spacef      (configf:lookup tconfig "itemopts" "space")) ;; a b c\nd e f\n ...
+	 (have-items  (hash-table-ref/default tconfig "items"      #f))
+	 (have-itable (hash-table-ref/default tconfig "itemstable" #f))
+	 (items       (hash-table-ref/default tconfig "items"      '()))
+	 (itemstable  (hash-table-ref/default tconfig "itemstable" '())))
+    (debug:print 5 *default-log-port* "items: " items " itemstable: " itemstable)
+    (set! items (map (lambda (item)
+		       (if (procedure? (cadr item))
+			   (list (car item)((cadr item)))  ;; evaluate the proc
+			   item))
+		     items))
+    (set! itemstable (map (lambda (item)
+			    (if (procedure? (cadr item))
+				(list (car item)((cadr item)))  ;; evaluate the proc
+				item))
+			  itemstable))
+    (if (and have-items  (null? items))     (debug:print 0 *default-log-port* "WARNING:[items] section in testconfig but no entries defined"))
+    (if (and have-itable (null? itemstable))(debug:print 0 *default-log-port* "WARNNG:[itemstable] section in testconfig but no entries defined"))
+    (if (or (not (null? items))
+	    (not (null? itemstable))
+	    slashf
+	    sxmlf
+	    spacef)
+	(append (item-assoc->item-list items)
+		(item-table->item-list itemstable)
+		(items:read-items-file slashf 'slash)
+		(items:read-items-file sxmlf  'sxml)
+		(items:read-items-file spacef 'space))
+	'(()))))
+
+
+
+;; (pp (item-assoc->item-list itemdat))
+
+
+	
+
+)

DELETED keys.scm
Index: keys.scm
==================================================================
--- keys.scm
+++ /dev/null
@@ -1,85 +0,0 @@
-
-;; Copyright 2006-2012, Matthew Welland.
-;; 
-;; This file is part of Megatest.
-;; 
-;;     Megatest is free software: you can redistribute it and/or modify
-;;     it under the terms of the GNU General Public License as published by
-;;     the Free Software Foundation, either version 3 of the License, or
-;;     (at your option) any later version.
-;; 
-;;     Megatest is distributed in the hope that it will be useful,
-;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;     GNU General Public License for more details.
-;; 
-;;     You should have received a copy of the GNU General Public License
-;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
-;;
- 
-;;======================================================================
-;; Run keys, these are used to hierarchially organise tests and run areas
-;;======================================================================
-
-(use sqlite3 srfi-1 posix regex regex-case srfi-69)
-(import (prefix sqlite3 sqlite3:))
-
-(declare (unit keys))
-(declare (uses common))
-
-(include "key_records.scm")
-(include "common_records.scm")
-
-(define (keys->keystr keys) ;; => key1,key2,key3,additiona1, ...
-  (string-intersperse keys ","))
-
-(define (args:usage . a) #f)
-
-;;======================================================================
-;; key <=> target routines
-;;======================================================================
-
-;; This invalidates using "/" in item names. Every key will be
-;; available via args:get-arg as :keyfield. Since this only needs to
-;; be called once let's use it to set the environment vars
-;;
-;; The setting of :keyfield in args should be turned off ASAP
-;;
-(define (keys:target-set-args keys target ht)
-  (if target
-      (let ((vals (string-split target "/")))
-	(if (eq? (length vals)(length keys))
-	    (for-each (lambda (key val)
-			(setenv key val)
-			(if ht (hash-table-set! ht (conc ":" key) val)))
-		      keys
-		      vals)
-	    (debug:print-error 0 *default-log-port* "wrong number of values in " target ", should match " keys))
-	vals)
-      (debug:print 4 *default-log-port* "ERROR: keys:target-set-args called with no target.")))
-
-;; given the keys (a list of vectors <key field> or a list of keys) and a target return a keyval list
-;; keyval list ( (key1 val1) (key2 val2) ...)
-(define (keys:target->keyval keys target)
-  (let* ((targlist (string-split target "/"))
-	 (numkeys  (length keys))
-	 (numtarg  (length targlist))
-	 (targtweaked (if (> numkeys numtarg)
-			  (append targlist (make-list (- numkeys numtarg) ""))
-			  targlist)))
-    (map (lambda (key targ)
-	   (list key targ))
-	 keys targtweaked)))
-
-;;======================================================================
-;; config file related routines
-;;======================================================================
-
-(define keys:config-get-fields common:get-fields)
-(define (keys:make-key/field-string confdat)
-  (let ((fields (configf:get-section confdat "fields")))
-    (string-join
-     (map (lambda (field)(conc (car field) " " (cadr field)))
-	  fields)
-     ",")))
-

ADDED   keysmod.scm
Index: keysmod.scm
==================================================================
--- /dev/null
+++ keysmod.scm
@@ -0,0 +1,124 @@
+;;======================================================================
+;; Copyright 2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
+
+;;======================================================================
+
+(declare (unit keysmod))
+
+(declare (uses mtargs))
+(declare (uses debugprint))
+
+
+(module keysmod
+	*
+	
+(import scheme
+
+	chicken.base
+	chicken.condition
+	chicken.file
+	chicken.io
+	chicken.pathname
+	chicken.port
+	chicken.pretty-print
+	chicken.process
+	chicken.process-context
+	chicken.sort
+	chicken.string
+	chicken.time
+
+	(prefix base64 base64:)
+	(prefix dbi dbi:)
+	(prefix sqlite3 sqlite3:)
+	(srfi 18)
+	directory-utils
+	format
+	matchable
+	md5
+	message-digest
+	regex
+	regex-case
+	sparse-vectors
+	srfi-1
+	srfi-13
+	srfi-69
+	stack
+	typed-records
+	z3
+
+	debugprint
+	mtargs
+	pkts
+	
+	)
+;;======================================================================
+;; Run keys, these are used to hierarchially organise tests and run areas
+;;======================================================================
+
+;; (use sqlite3 srfi-1 posix regex regex-case srfi-69)
+;; (import (prefix sqlite3 sqlite3:))
+;; 
+;; (declare (unit keys))
+;; (declare (uses common))
+;; 
+;; (include "key_records.scm")
+;; (include "common_records.scm")
+
+(define (keys->keystr keys) ;; => key1,key2,key3,additiona1, ...
+  (string-intersperse keys ","))
+
+(define (args:usage . a) #f)
+
+;;======================================================================
+;; key <=> target routines
+;;======================================================================
+
+;; This invalidates using "/" in item names. Every key will be
+;; available via args:get-arg as :keyfield. Since this only needs to
+;; be called once let's use it to set the environment vars
+;;
+;; The setting of :keyfield in args should be turned off ASAP
+;;
+(define (keys:target-set-args keys target ht)
+  (if target
+      (let ((vals (string-split target "/")))
+	(if (eq? (length vals)(length keys))
+	    (for-each (lambda (key val)
+			(set-environment-variable! key val)
+			(if ht (hash-table-set! ht (conc ":" key) val)))
+		      keys
+		      vals)
+	    (debug:print-error 0 *default-log-port* "wrong number of values in " target ", should match " keys))
+	vals)
+      (debug:print 4 *default-log-port* "ERROR: keys:target-set-args called with no target.")))
+
+;; given the keys (a list of vectors <key field> or a list of keys) and a target return a keyval list
+;; keyval list ( (key1 val1) (key2 val2) ...)
+(define (keys:target->keyval keys target)
+  (let* ((targlist (string-split target "/"))
+	 (numkeys  (length keys))
+	 (numtarg  (length targlist))
+	 (targtweaked (if (> numkeys numtarg)
+			  (append targlist (make-list (- numkeys numtarg) ""))
+			  targlist)))
+    (map (lambda (key targ)
+	   (list key targ))
+	 keys targtweaked)))
+
+
+)

DELETED launch.scm
Index: launch.scm
==================================================================
--- launch.scm
+++ /dev/null
@@ -1,1625 +0,0 @@
-
-;; Copyright 2006-2017, Matthew Welland.
-;; 
-;; This file is part of Megatest.
-;; 
-;;     Megatest is free software: you can redistribute it and/or modify
-;;     it under the terms of the GNU General Public License as published by
-;;     the Free Software Foundation, either version 3 of the License, or
-;;     (at your option) any later version.
-;; 
-;;     Megatest is distributed in the hope that it will be useful,
-;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;     GNU General Public License for more details.
-;; 
-;;     You should have received a copy of the GNU General Public License
-;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
-
-;;======================================================================
-;; launch a task - this runs on the originating host, tests themselves
-;;
-;;======================================================================
-
-(use regex regex-case base64 sqlite3 srfi-18 directory-utils posix-extras z3
-     call-with-environment-variables csv)
-(use typed-records pathname-expand matchable)
-
-(import (prefix base64 base64:))
-(import (prefix sqlite3 sqlite3:))
-
-(declare (unit launch))
-(declare (uses subrun))
-(declare (uses common))
-(declare (uses configf))
-(declare (uses db))
-(declare (uses ezsteps))
-
-(include "common_records.scm")
-(include "key_records.scm")
-(include "db_records.scm")
-(include "megatest-fossil-hash.scm")
-
-;;======================================================================
-;; ezsteps
-;;======================================================================
-
-;; ezsteps were going to be coded as
-;; stepname[,predstep1,predstep2 ...] [{VAR1=first,second,third}] command to execute
-;;   BUT
-;; now are
-;; stepname {VAR=first,second,third ...} command ...
-;; where the {VAR=first,second,third ...} is optional.
-
-;; given an exit code and whether or not logpro was used calculate OK/BAD
-;; return #t if we are ok, #f otherwise
-(define (steprun-good? logpro exitcode stepparms)
-  (or (eq? exitcode 0)
-      (and logpro (eq? exitcode 2)) ;; shouldn't this be (member exitcode 2 ...) with the other ok codes?
-      (let* ((params (alist-ref 'params stepparms)) ;; get the params section
-	     (keep-going (if params
-			     (alist-ref "keep-going" params equal?)
-			     #f)))
-	(debug:print 0 *default-log-port* "keep-going=" keep-going)
-	(and keep-going (equal? (car keep-going) "yes")))))
-
-;; if handed a string, process it, else look for MT_CMDINFO
-(define (launch:get-cmdinfo-assoc-list #!key (encoded-cmd #f))
-  (let ((enccmd (if encoded-cmd encoded-cmd (getenv "MT_CMDINFO"))))
-    (if enccmd
-	(common:read-encoded-string enccmd)
-	'())))
-
-;;                       0           1              2              3
-(defstruct launch:einf (pid #t)(exit-status #t)(exit-code #t)(rollup-status 0))
-
-;; return (conc status ": " comment) from the final section so that
-;;   the comment can be set in the step record in launch.scm
-;;
-(define (launch:load-logpro-dat run-id test-id stepname)
-  (let ((cname (conc stepname ".dat")))
-    (if (common:file-exists? cname)
-	(let* ((dat  (read-config cname #f #f))
-	       (csvr (db:logpro-dat->csv dat stepname))
-	       (csvt (let-values (((fmt-cell fmt-record fmt-csv) (make-format ",")))
-		       (fmt-csv (map list->csv-record csvr))))
-	       (status (configf:lookup dat "final" "exit-status"))
-	       (msg     (configf:lookup dat "final" "message")))
-          (if csvt  ;; this if blocked stack dump caused by .dat file from logpro being 0-byte.  fixed by upgrading logpro
-              (rmt:csv->test-data run-id test-id csvt)
-	      (debug:print 0 *default-log-port* "ERROR: no csvdat exists for run-id: " run-id " test-id: " test-id " stepname: " stepname ", check that logpro version is 1.15 or newer"))
-	  ;;  (debug:print-info 13 *default-log-port* "Error: run-id/test-id/stepname="run-id"/"test-id"/"stepname" => bad csvr="csvr)
-	  ;;  )
-	  (cond
-	   ((equal? status "PASS") "PASS") ;; skip the message part if status is pass
-	   (status (conc (configf:lookup dat "final" "exit-status") ": " (if msg msg "no message")))
-	   (else #f)))
-	#f)))
-
-(define (launch:manage-steps run-id test-id item-path fullrunscript ezsteps subrun test-name tconfigreg exit-info m)
-  ;; (let-values
-  ;;  (((pid exit-status exit-code)
-  ;;    (run-n-wait fullrunscript)))
-  ;; (tests:test-set-status! test-id "RUNNING" "n/a" #f #f)
-  ;; Since we should have a clean slate at this time there is no need to do 
-  ;; any of the other stuff that tests:test-set-status! does. Let's just 
-  ;; force RUNNING/n/a
-
-  ;; (thread-sleep! 0.3)
-  ;; (tests:test-force-state-status! run-id test-id "RUNNING" "n/a")
-  (rmt:set-state-status-and-roll-up-items run-id test-name item-path "RUNNING" #f #f) 
-  ;; (thread-sleep! 0.3) ;; NFS slowness has caused grief here
-
-  ;; if there is a runscript do it first
-  (if fullrunscript
-      (let ((pid (process-run fullrunscript)))
-	(rmt:test-set-top-process-pid run-id test-id pid)
-	(let loop ((i 0))
-	  (let-values
-	   (((pid-val exit-status exit-code) (process-wait pid #t)))
-	   (mutex-lock! m)
-	   (launch:einf-pid-set!           exit-info  pid)         ;; (vector-set! exit-info 0 pid)
-	   (launch:einf-exit-status-set!   exit-info  exit-status) ;; (vector-set! exit-info 1 exit-status)
-	   (launch:einf-exit-code-set!     exit-info  exit-code)   ;; (vector-set! exit-info 2 exit-code)
-	   (launch:einf-rollup-status-set! exit-info  exit-code)   ;; (vector-set! exit-info 3 exit-code)  ;; rollup status
-	   (mutex-unlock! m)
-	   (if (eq? pid-val 0)
-	       (begin
-		 (thread-sleep! 2)
-		 (loop (+ i 1)))
-	       )))))
-  ;; then, if runscript ran ok (or did not get called)
-  ;; do all the ezsteps (if any)
-  (if (or ezsteps subrun)
-      (let* ((test-run-dir (tests:get-test-path-from-environment))
-             (testconfig ;; (read-config (conc work-area "/testconfig") #f #t environ-patt: "pre-launch-env-vars")) ;; FIXME??? is allow-system ok here?
-	      ;; NOTE: it is tempting to turn off force-create of testconfig but dynamic
-	      ;;       ezstep names need a full re-eval here.
-	      (tests:get-testconfig test-name item-path tconfigreg #t force-create: #t)) ;; 'return-procs)))
-	     (ezstepslst (if (hash-table? testconfig)
-			     (hash-table-ref/default testconfig "ezsteps" '())
-			     #f)))
-	(if testconfig
-	    (hash-table-set! *testconfigs* test-name testconfig) ;; cached for lazy reads later ...
-	    (begin
-	      (launch:setup)
-	      (debug:print 0 *default-log-port* "WARNING: no testconfig found for " test-name " in search path:\n  "
-			   (string-intersperse (tests:get-tests-search-path *configdat*) "\n  "))))
-	;; after all that, still no testconfig? Time to abort
-	(if (not testconfig)
-	    (begin
-	      (debug:print-error 0 *default-log-port* "Failed to resolve megatest.config, runconfigs.config and testconfig issues. Giving up now")
-	      (exit 1)))
-
-	;; create a proc for the subrun if requested, save that proc in the ezsteps table as the last entry
-	;; 1. get section [runarun]
-	;; 2. unset MT_* vars
-	;; 3. fix target
-	;; 4. fix runname
-	;; 5. fix testpatt or calculate it from contour
-	;; 6. launch the run
-	;; 7. roll up the run result and or roll up the logpro processed result
-	(when (configf:lookup testconfig "subrun" "runwait") ;; we use runwait as the flag that a subrun is requested
-            (subrun:initialize-toprun-test testconfig test-run-dir)
-	    (let* ((mt-cmd (subrun:launch-cmd test-run-dir)))
-              (debug:print-info 0 *default-log-port* "Subrun command is \"" mt-cmd "\"")
-              (set! ezsteps #t) ;; set the needed flag
-	      (set! ezstepslst
-                    (append (or ezstepslst '())
-                            (list (list "subrun" (conc "{subrun=true} " mt-cmd)))))))
-
-	;; process the ezsteps
-	(if ezsteps
-	    (let* ((all-steps-dat (make-hash-table))) ;; keep all the info around as stepname ==> alist; where  'params is the params list (add other stuff as needed)
-	      (if (not (common:file-exists? ".ezsteps"))(create-directory ".ezsteps"))
-	      ;; if ezsteps was defined then we are sure to have at least one step but check anyway
-	      (if (not (> (length ezstepslst) 0))
-		  (debug:print-error 0 *default-log-port* "ezsteps defined but ezstepslst is zero length")
-		  (let loop ((ezstep (car ezstepslst))
-			     (tal    (cdr ezstepslst))
-			     (prevstep #f))
-                    (debug:print-info 0 *default-log-port* "Processing ezstep \"" (string-intersperse ezstep " ") "\"")
-		    ;; check exit-info (vector-ref exit-info 1)
-		    (if (launch:einf-exit-status exit-info) ;; (vector-ref exit-info 1)
-			(let* ((logpro-used (launch:runstep ezstep run-id test-id exit-info m tal testconfig all-steps-dat))
-			       (stepname    (car ezstep))
-			       (stepparms   (hash-table-ref all-steps-dat stepname)))
-			  (setenv "MT_STEP_NAME" stepname)
-			  (pp (hash-table->alist all-steps-dat))
-			  ;; if logpro-used read in the stepname.dat file
-			  (if (and logpro-used (common:file-exists? (conc stepname ".dat")))
-			      (launch:load-logpro-dat run-id test-id stepname))
-			  (if (steprun-good? logpro-used (launch:einf-exit-code exit-info) stepparms)
-			      (if (not (null? tal))
-				  (loop (car tal) (cdr tal) stepname))
-			      (debug:print 0 *default-log-port* "WARNING: step " (car ezstep) " failed. Stopping")))
-			(debug:print 0 *default-log-port* "WARNING: a prior step failed, stopping at " ezstep)))))))))
-
-(define (launch:monitor-job run-id test-id item-path fullrunscript ezsteps test-name tconfigreg exit-info m work-area runtlim misc-flags)
-  (let* ((update-period (string->number (or (configf:lookup *configdat* "setup" "test-stats-update-period") "30")))
-         (start-seconds (current-seconds))
-	 (calc-minutes  (lambda ()
-			  (inexact->exact 
-			   (round 
-			    (- 
-			     (current-seconds) 
-			     start-seconds)))))
-	 (kill-tries 0))
-    ;; (tests:set-full-meta-info #f test-id run-id (calc-minutes) work-area)
-    ;; (tests:set-full-meta-info test-id run-id (calc-minutes) work-area)
-    (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)))
-      ;; (common:telemetry-log "zombie" (conc "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
-                                  #f)))
-             (new-disk-free (let* ((df    (if over-time ;; only get df every 30 seconds
-                                              (get-df (current-directory))
-                                              disk-free))
-                                   (delta (abs (- df disk-free))))
-                              (if (and (> df 0)
-                                       (> (/ delta df) 0.1)) ;; (> delta 200) ;; ignore changes under 200 Meg
-                                  df
-                                  #f)))
-             (do-sync       (or new-cpu-load new-disk-free over-time))
-
-             (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))
-        ;; (common:telemetry-log "zombie" (conc "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))
-          (set! kill-reason (conc "KILLING TEST DUE TO TIME LIMIT EXCEEDED! Runtime=" (- (current-seconds) start-seconds) " seconds, limit=" runtlim))
-          (set! kill-job? #t))
-         ((equal? status "DEAD")
-          (tests:update-central-meta-info run-id test-id new-cpu-load new-disk-free (calc-minutes) #f #f)
-          (rmt:set-state-status-and-roll-up-items run-id test-id 'foo "RUNNING" "n/a" "was marked dead; really still running.")
-          ;;(set! kill-reason "KILLING TEST because it was marked as DEAD by launch:handle-zombie-tests (might indicate really overloaded server or else overzealous setup.deadtime)") ;; MARK RUNNING
-          (set! kill-job? #f)))
-
-        (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)))))
-          ;; (common:telemetry-log "zombie" (conc  "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)
-          ;; (common:telemetry-log "zombie" (conc "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)
-	      ;; NOTE: The pid can change as different steps are run. Do we need handshaking between this
-	      ;;       section and the runit section? Or add a loop that tries three times with a 1/4 second
-	      ;;       between tries?
-	      (let* ((pid1 (launch:einf-pid exit-info)) ;; (vector-ref exit-info 0))
-		     (pid2 (rmt:test-get-top-process-pid run-id test-id))
-		     (pids (delete-duplicates (filter number? (list pid1 pid2)))))
-		(if (not (null? pids))
-		    (begin
-		      (for-each
-		       (lambda (pid)
-			 (handle-exceptions
-			  exn
-			  (begin
-			    (debug:print-info 0 *default-log-port* "Unable to kill process with pid " pid ", possibly already killed.")
-			    (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn) ", exn=" exn))
-			  (debug:print 0 *default-log-port* "WARNING: Request received to kill job " pid) ;;  " (attempt # " kill-tries ")")
-			  (debug:print-info 0 *default-log-port* "Signal mask=" (signal-mask))
-			  ;; (if (process:alive? pid)
-			  ;;     (begin
-			  (map (lambda (pid-num)
-				 (process-signal pid-num signal/term))
-			       (process:get-sub-pids pid))
-			  (thread-sleep! 5)
-			  ;; (if (process:process-alive? pid)
-			  (map (lambda (pid-num)
-				 (handle-exceptions
-				     exn
-				   (begin
-				     (debug:print 0 *default-log-port* " .... had trouble sending kill to " pid-num ", exn=" exn)
-				     #f)
-				   (process-signal pid-num signal/kill)))
-			       (process:get-sub-pids pid))))
-		       ;;    (debug:print-info 0 *default-log-port* "not killing process " pid " as it is not alive"))))
-		       pids)
-                      ;; BB: question to Matt -- does the tests:test-state-status! encompass rollup to toplevel?  If not, should it?
-		      (tests:test-set-status! run-id test-id "KILLED"  "KILLED" (conc (args:get-arg "-m")" "kill-reason) #f)) ;; BB ADDED kill-reason -- confirm OK with Matt
-		    (begin
-		      (debug:print-error 0 *default-log-port* "Nothing to kill, pid1=" pid1 ", pid2=" pid2)
-		      (tests:test-set-status! run-id test-id "KILLED"  "FAILED TO KILL" (conc (args:get-arg "-m")" "kill-reason) #f) ;; BB ADDED kill-reason -- confirm OK with Matt
-		      )))
-	      (mutex-unlock! m)
-	      ;; no point in sticking around. Exit now. But run end of run before exiting?
-        (launch:end-of-run-check run-id)
-	      (exit)))
-	(if (hash-table-ref/default misc-flags 'keep-going #f)
-	    (begin
-	      (thread-sleep! 3) ;; (+ 3 (random 6))) ;; add some jitter to the call home time to spread out the db accesses
-	      (if (hash-table-ref/default misc-flags 'keep-going #f)  ;; keep originals for cpu-load and disk-free unless they change more than the allowed delta
-		  (loop (calc-minutes)
-                        (or new-cpu-load cpu-load)
-                        (or new-disk-free disk-free)
-                        (if do-sync (current-seconds) last-sync)))))))
-    (tests:update-central-meta-info run-id test-id (get-cpu-load) (get-df (current-directory))(calc-minutes) #f #f))) ;; NOTE: Checking twice for keep-going is intentional
-
-
-(define (launch:execute encoded-cmd)
-  (let* ((cmdinfo    (common:read-encoded-string encoded-cmd))
-	 (tconfigreg #f))
-    (setenv "MT_CMDINFO" encoded-cmd)
-    ;;(bb-check-path msg: "launch:execute incoming")
-    (if (list? cmdinfo) ;; ((testpath /tmp/mrwellan/jazzmind/src/example_run/tests/sqlitespeed)
-	;; (test-name sqlitespeed) (runscript runscript.rb) (db-host localhost) (run-id 1))
-	(let* ((testpath  (assoc/default 'testpath  cmdinfo))  ;; testpath is the test spec area
-	       (top-path  (assoc/default 'toppath   cmdinfo))
-	       (work-area (assoc/default 'work-area cmdinfo))  ;; work-area is the test run area
-	       (test-name (assoc/default 'test-name cmdinfo))
-	       (runscript (assoc/default 'runscript cmdinfo))
-	       (ezsteps   (assoc/default 'ezsteps   cmdinfo))
-	       (subrun    (assoc/default 'subrun    cmdinfo))
-	       ;; (runremote (assoc/default 'runremote cmdinfo))
-	       ;; (transport (assoc/default 'transport cmdinfo))  ;; not used
-	       ;; (serverinf (assoc/default 'serverinf cmdinfo))
-	       ;; (port      (assoc/default 'port      cmdinfo))
-	       (serverurl (assoc/default 'serverurl cmdinfo))
-	       (homehost  (assoc/default 'homehost  cmdinfo))
-	       (run-id    (assoc/default 'run-id    cmdinfo))
-	       (test-id   (assoc/default 'test-id   cmdinfo))
-	       (target    (assoc/default 'target    cmdinfo))
-	       (areaname  (assoc/default 'areaname  cmdinfo))
-	       (itemdat   (assoc/default 'itemdat   cmdinfo))
-	       (env-ovrd  (assoc/default 'env-ovrd  cmdinfo))
-	       (set-vars  (assoc/default 'set-vars  cmdinfo)) ;; pre-overrides from -setvar
-	       (runname   (assoc/default 'runname   cmdinfo))
-	       (megatest  (assoc/default 'megatest  cmdinfo))
-	       (runtlim   (assoc/default 'runtlim   cmdinfo))
-	       (contour   (assoc/default 'contour   cmdinfo))
-	       (item-path (item-list->path itemdat))
-	       (mt-bindir-path (assoc/default 'mt-bindir-path cmdinfo))
-	       (keys      #f)
-	       (keyvals   #f)
-	       (fullrunscript (if (not runscript)
-                                  #f
-                                  (if (substring-index "/" runscript)
-                                      runscript ;; use unadultered if contains slashes
-                                      (let ((fulln (conc work-area "/" runscript)))
-	                                  (if (and (common:file-exists? fulln)
-                                                   (file-execute-access? fulln))
-                                              fulln
-                                              runscript))))) ;; assume it is on the path
-               (check-work-area           (lambda ()
-                                            ;; NFS might not have propagated the directory meta data to the run host - give it time if needed
-                                            (let loop ((count 0))
-                                              (if (or (common:directory-exists? work-area)
-                                                      (> count 10))
-                                                  (change-directory work-area)
-                                                  (begin
-                                                    (debug:print 0 *default-log-port* "INFO: Not starting job yet - directory " work-area " not found")
-                                                    (thread-sleep! 10)
-                                                    (loop (+ count 1)))))
-
-                                            (if (not (string=?  (common:real-path work-area)(common:real-path (current-directory))))
-                                                (begin
-                                                  (debug:print 0 *default-log-port*
-                                                               "INFO: we are expecting to be in directory " work-area "\n"
-                                                               "     but we are actually in the directory " (current-directory) "\n"
-                                                               "     doing another change dir.")
-                                                  (change-directory work-area)))
-                                            
-                                            ;; spot check that the files in testpath are available. Too often NFS delays cause problems here.
-                                            (let ((files      (glob (conc testpath "/*")))
-                                                  (bad-files '()))
-                                              (for-each
-                                               (lambda (fullname)
-                                                 (let* ((fname (pathname-strip-directory fullname))
-                                                        (targn (conc work-area "/" fname)))
-                                                   (if (not (file-exists? targn))
-                                                       (set! bad-files (cons fname bad-files)))))
-                                               files)
-                                              (if (not (null? bad-files))
-                                                  (begin
-                                                    (debug:print 0 *default-log-port* "INFO: test data from " testpath " not copied properly or filesystem problems causing data to not be found. Re-running the copy command.")
-                                                    (debug:print 0 *default-log-port* "INFO: missing files from " work-area ": " (string-intersperse bad-files ", "))
-                                                    (launch:test-copy testpath work-area))))
-                                            ;; one more time, change to the work-area directory
-                                            (change-directory work-area)))
-	       ) ;; let*
-
-	  (if contour (setenv "MT_CONTOUR" contour))
-	  
-	  ;; immediated set some key variables from CMDINFO data, yes, these will be set again below ...
-	  ;;
-	  (setenv "MT_TESTSUITENAME" areaname)
-	  (setenv "MT_RUN_AREA_HOME" top-path)
-	  (set! *toppath* top-path)
-          (change-directory *toppath*) ;; temporarily switch to the run area home
-	  (setenv "MT_TEST_RUN_DIR"  work-area)
-
-	  (launch:setup) ;; should be properly in the run area home now
-
-	  (if contour (setenv "MT_CONTOUR" contour))
-	  
-	  ;; immediated set some key variables from CMDINFO data, yes, these will be set again below ...
-	  ;;
-	  (setenv "MT_TESTSUITENAME" areaname)
-	  (setenv "MT_RUN_AREA_HOME" top-path)
-	  (set! *toppath* top-path)
-          (change-directory *toppath*) ;; temporarily switch to the run area home
-	  (setenv "MT_TEST_RUN_DIR"  work-area)
-
-	  (launch:setup) ;; should be properly in the run area home now
-          
-	  (set! tconfigreg (tests:get-all)) ;; mapping of testname => test source path
-	  (let ((sighand (lambda (signum)
-			   ;; (signal-mask! signum) ;; to mask or not? seems to cause issues in exiting
-			   (if (eq? signum signal/stop)
-			       (debug:print-error 0 *default-log-port* "attempt to STOP process. Exiting."))
-			   (set! *time-to-exit* #t)
-			   (print "Received signal " signum ", cleaning up before exit (set this test to COMPLETED/ABORT) . Please wait...")
-			   (let ((th1 (make-thread (lambda ()
-                                                     (print "set test to COMPLETED/ABORT begin.")
-						     (rmt:test-set-state-status run-id test-id "COMPLETED" "ABORT" "received kill signal")
-                                                     (print "set test to COMPLETED/ABORT complete.")
-						     (print "Killed by signal " signum ". Exiting")
-						     (exit 1))))
-				 (th2 (make-thread (lambda ()
-						     (thread-sleep! 20)
-						     (debug:print 0 *default-log-port* "Done")
-						     (exit 4)))))
-			     (thread-start! th2)
-			     (thread-start! th1)
-			     (thread-join! th2)))))
-	    (set-signal-handler! signal/int sighand)
-	    (set-signal-handler! signal/term sighand)
-	    ) ;; (set-signal-handler! signal/stop sighand)
-	  
-	  ;; Do not run the test if it is REMOVING, RUNNING, KILLREQ or REMOTEHOSTSTART,
-	  ;; Mark the test as REMOTEHOSTSTART *IMMEDIATELY*
-	  ;;
-	  (let* ((test-info (let loop ((tries 0))
-			      (let ((tinfo (rmt:get-test-info-by-id run-id test-id)))
-				(if tinfo
-				    tinfo
-				    (if (> tries 5)
-					#f
-					(begin
-					  (thread-sleep! (+ 1 (* tries 10)))
-					  (loop (+ tries 1))))))))
-		 (test-host (if test-info
-				(db:test-get-host        test-info)
-				(begin
-				  (debug:print 0 *default-log-port* "ERROR: failed to find a record for test-id " test-id ", exiting.")
-				  (exit))))
-		 (test-pid  (db:test-get-process_id  test-info)))
-	    (cond
-             ;; -mrw- I'm removing KILLREQ from this list so that a test in KILLREQ state is treated as a "do not run" flag.
-	     ((member (db:test-get-state test-info) '("INCOMPLETE" "KILLED" "UNKNOWN" "STUCK")) ;; prior run of this test didn't complete, go ahead and try to rerun
-	      (debug:print 0 *default-log-port* "INFO: test is INCOMPLETE or KILLED, treat this execute call as a rerun request")
-	      ;; (tests:test-force-state-status! run-id test-id "REMOTEHOSTSTART" "n/a")
-
-              (rmt:general-call 'set-test-start-time #f test-id)
-              (rmt:test-set-state-status run-id test-id "REMOTEHOSTSTART" "n/a" #f)
-	      ) ;; prime it for running
-	     ((member (db:test-get-state test-info) '("RUNNING" "REMOTEHOSTSTART"))
-	      (if (process:alive-on-host? test-host test-pid)
-		  (debug:print-error 0 *default-log-port* "test state is "  (db:test-get-state test-info) " and process " test-pid " is still running on host " test-host ", cannot proceed")
-		  (exit)))
-	     ((member (db:test-get-state test-info) '("COMPLETED"))  ;; we do NOT want to re-run COMPLETED jobs. Mark as NOT_STARTED to run!
-	      (debug:print-error 0 *default-log-port* "test state is " (db:test-get-state test-info) ", cannot proceed")
-	      (exit))
-	     ((not (member (db:test-get-state test-info) '("REMOVING" "REMOTEHOSTSTART" "RUNNING" "KILLREQ")))
-	      ;; (tests:test-force-state-status! run-id test-id "REMOTEHOSTSTART" "n/a")
-              (rmt:general-call 'set-test-start-time #f test-id)
-	      (rmt:test-set-state-status run-id test-id "REMOTEHOSTSTART" "n/a" #f))
-	     (else ;; (member (db:test-get-state test-info) '("REMOVING" "REMOTEHOSTSTART" "RUNNING" "KILLREQ"))
-	      (debug:print-error 0 *default-log-port* "test state is " (db:test-get-state test-info) ", cannot proceed")
-	      (exit))))
-
-          ;; cleanup prior execution's steps
-          (rmt:delete-steps-for-test! run-id test-id)
-          
-	  (debug:print 2 *default-log-port* "Executing " test-name " (id: " test-id ") on " (get-host-name))
-	  (set! keys       (rmt:get-keys))
-	  ;; (runs:set-megatest-env-vars run-id inkeys: keys inkeyvals: keyvals) ;; these may be needed by the launching process
-	  ;; one of these is defunct/redundant ...
-	  (if (not (launch:setup force-reread: #t))
-	      (begin
-		(debug:print 0 *default-log-port* "Failed to setup, exiting") 
-		;; (sqlite3:finalize! db)
-		;; (sqlite3:finalize! tdb)
-		(exit 1)))
-          ;; validate that the test run area is available
-          (check-work-area)
-          
-          ;; still need to go back to run area home for next couple steps
-	  (change-directory *toppath*) 
-
-	  ;; NOTE: Current order is to process runconfigs *before* setting the MT_ vars. This 
-	  ;;       seems non-ideal but could well break stuff
-	  ;;    BUG? BUG? BUG?
-	  
-	  (let ((rconfig (full-runconfigs-read)) ;; (read-config (conc  *toppath* "/runconfigs.config") #f #t sections: (list "default" target))))
-		(wconfig (read-config "waivers.config" #f #t sections: `( "default" ,target )))) ;; read the waivers config if it exists
-	    ;; (setup-env-defaults (conc *toppath* "/runconfigs.config") run-id (make-hash-table) keyvals target)
-	    ;; (set-run-config-vars run-id keyvals target) ;; (db:get-target db run-id))
-	    ;; Now have runconfigs data loaded, set environment vars
-	    (for-each
-	     (lambda (section)
-	       (for-each
-		(lambda (varval)
-		  (let ((var (car varval))
-			(val (cadr varval)))
-		    (if (and (string? var)(string? val))
-			(begin
-			  (safe-setenv var (configf:eval-string-in-environment val))) ;; val)
-			(debug:print-error 0 *default-log-port* "bad variable spec, " var "=" val))))
-		(configf:get-section rconfig section)))
-	     (list "default" target)))
-          ;;(bb-check-path msg: "launch:execute post block 1")
-
-	  ;; NFS might not have propagated the directory meta data to the run host - give it time if needed
-	  (let loop ((count 0))
-	    (if (or (common:file-exists? work-area)
-		    (> count 10))
-		(change-directory work-area)
-		(begin
-		  (debug:print 0 *default-log-port* "INFO: Not starting job yet - directory " work-area " not found")
-		  (thread-sleep! 10)
-		  (loop (+ count 1)))))
-
-          ;; now we can switch to the work-area?
-          (change-directory work-area)
-          ;;(bb-check-path msg: "launch:execute post block 1.5")
-	  ;; (change-directory work-area) 
-	  (set! keyvals    (keys:target->keyval keys target))
-	  ;; apply pre-overrides before other variables. The pre-override vars must not
-	  ;; clobbers things from the official sources such as megatest.config and runconfigs.config
-	  (if (string? set-vars)
-	      (let ((varpairs (string-split set-vars ",")))
-		(debug:print 4 *default-log-port* "varpairs: " varpairs)
-		(map (lambda (varpair)
-		       (let ((varval (string-split varpair "=")))
-			 (if (eq? (length varval) 2)
-			     (let ((var (car varval))
-				   (val (cadr varval)))
-			       (debug:print 1 *default-log-port* "Adding pre-var/val " var " = " val " to the environment")
-			       (setenv var val)))))
-		     varpairs)))
-          ;;(bb-check-path msg: "launch:execute post block 2")
-	  (for-each
-	   (lambda (varval)
-	     (let ((var (car varval))
-		   (val (cadr varval)))
-	       (if val
-		   (setenv var val)
-		   (begin
-		     (debug:print-error 0 *default-log-port* "required variable " var " does not have a valid value. Exiting")
-		     (exit)))))
-	     (list 
-	      (list  "MT_TEST_RUN_DIR" work-area)
-	      (list  "MT_TEST_NAME" test-name)
-	      (list  "MT_ITEM_INFO" (conc itemdat))
-	      (list  "MT_ITEMPATH"  item-path)
-	      (list  "MT_RUNNAME"   runname)
-	      (list  "MT_MEGATEST"  megatest)
-	      (list  "MT_TARGET"    target)
-	      (list  "MT_LINKTREE"  (common:get-linktree)) ;; (configf:lookup *configdat* "setup" "linktree"))
-	      (list  "MT_TESTSUITENAME" (common:get-testsuite-name))))
-          ;;(bb-check-path msg: "launch:execute post block 3")
-
-	  (if mt-bindir-path (setenv "PATH" (conc (getenv "PATH") ":" mt-bindir-path)))
-          ;;(bb-check-path msg: "launch:execute post block 4")
-	  ;; (change-directory top-path)
-	  ;; Can setup as client for server mode now
-	  ;; (client:setup)
-
-	  
-	  ;; environment overrides are done *before* the remaining critical envars.
-	  (alist->env-vars env-ovrd)
-          ;;(bb-check-path msg: "launch:execute post block 41")
-	  (runs:set-megatest-env-vars run-id inkeys: keys inkeyvals: keyvals)
-          ;;(bb-check-path msg: "launch:execute post block 42")
-	  (set-item-env-vars itemdat)
-          ;;(bb-check-path msg: "launch:execute post block 43")
-          (let ((blacklist (configf:lookup *configdat* "setup" "blacklistvars")))
-            (if blacklist
-		(let ((vars (string-split blacklist)))
-		  (save-environment-as-files "megatest" ignorevars: vars)
-		  (for-each (lambda (var)
-			      (unsetenv var))
-			    vars))
-                (save-environment-as-files "megatest")))
-          ;;(bb-check-path msg: "launch:execute post block 44")
-	  ;; open-run-close not needed for test-set-meta-info
-	  ;; (tests:set-full-meta-info #f test-id run-id 0 work-area)
-	  ;; (tests:set-full-meta-info test-id run-id 0 work-area)
-	  (tests:set-full-meta-info #f test-id run-id 0 work-area 10)
-
-	  ;; (thread-sleep! 0.3) ;; NFS slowness has caused grief here
-
-	  (if (args:get-arg "-xterm")
-	      (set! fullrunscript "xterm")
-	      (if (and fullrunscript 
-		       (common:file-exists? fullrunscript)
-		       (not (file-execute-access? fullrunscript)))
-		  (system (conc "chmod ug+x " fullrunscript))))
-
-	  ;; We are about to actually kick off the test
-	  ;; so this is a good place to remove the records for 
-	  ;; any previous runs
-	  ;; (db:test-remove-steps db run-id testname itemdat)
-	  ;; now is also a good time to write the .testconfig file
-	  (let* ((tconfig-fname   (conc work-area "/.testconfig"))
-		 (tconfig-tmpfile (conc tconfig-fname ".tmp"))
-		 (tconfig         (tests:get-testconfig test-name item-path tconfigreg #t force-create: #t)) ;; 'return-procs)))
-		 (scripts (configf:get-section tconfig "scripts")))
-	    ;; create .testconfig file
-	    (configf:write-alist tconfig tconfig-tmpfile)
-	    (file-move tconfig-tmpfile tconfig-fname #t)
-	    (delete-file* ".final-status")
-
-	    ;; extract scripts from testconfig and write them to files in test run dir
-	    (for-each
-	     (lambda (scriptdat)
-	       (match scriptdat
-		      ((name content)
-		       (with-output-to-file name
-			 (lambda ()
-			   (print content)
-			   (change-file-mode name (bitwise-ior perm/irwxg perm/irwxu)))))
-		      (else
-		       (debug:print-info 0 "Invalid script definiton found in [scripts] section of testconfig. \"" scriptdat "\""))))
-	     scripts))
-	  ;; 
-	  (let* ((m            (make-mutex))
-		 (kill-job?    #f)
-		 (exit-info    (make-launch:einf pid: #t exit-status: #t exit-code: #t rollup-status: 0)) ;; pid exit-status exit-code (i.e. process was successfully run) rollup-status
-		 (job-thread   #f)
-		 ;; (keep-going   #t)
-		 (misc-flags   (let ((ht (make-hash-table)))
-				 (hash-table-set! ht 'keep-going #t)
-				 ht))
-		 (runit        (lambda ()
-				 (launch:manage-steps run-id test-id item-path fullrunscript ezsteps subrun test-name tconfigreg exit-info m)))
-		 (monitorjob   (lambda ()
-				 (launch:monitor-job  run-id test-id item-path fullrunscript ezsteps test-name tconfigreg exit-info m work-area runtlim misc-flags)))
-		 (th1          (make-thread monitorjob "monitor job"))
-		 (th2          (make-thread runit "run job")))
-	    (set! job-thread th2)
-	    (thread-start! th1)
-	    (thread-start! th2)
-	    (thread-join! th2)
-	    (debug:print-info 0 *default-log-port* "Megatest exectute of test " test-name ", item path " item-path " complete. Notifying the db ...")
-	    (hash-table-set! misc-flags 'keep-going #f)
-	    (thread-join! th1)
-	    (thread-sleep! 1)       ;; givbe thread th1 a chance to be done TODO: Verify this is needed. At 0.1 I was getting fail to stop, increased to total of 1.1 sec.
-	    (mutex-lock! m)
-	    (let* ((item-path (item-list->path itemdat))
-		   ;; only state and status needed - use lazy routine
-		   (testinfo  (rmt:get-testinfo-state-status run-id test-id)))
-	      ;; Am I completed?
-	      (if (member (db:test-get-state testinfo) '("REMOTEHOSTSTART" "RUNNING")) ;; NOTE: It should *not* be REMOTEHOSTSTART but for reasons I don't yet understand it sometimes gets stuck in that state ;; (not (equal? (db:test-get-state testinfo) "COMPLETED"))
-		  (let ((new-state  (if kill-job? "KILLED" "COMPLETED") ;; (if (eq? (vector-ref exit-info 2) 0) ;; exited with "good" status
-				                                        ;; "COMPLETED"							                ;; (db:test-get-state testinfo)))   ;; else preseve the state as set within the test
-				    )
-			(new-status (cond
-				     ((not (launch:einf-exit-status exit-info)) "FAIL") ;; job failed to run ... (vector-ref exit-info 1)
-				     ((eq? (launch:einf-rollup-status exit-info) 0)     ;; (vector-ref exit-info 3)
-				      ;; if the current status is AUTO then defer to the calculated value (i.e. leave this AUTO)
-				      (if (equal? (db:test-get-status testinfo) "AUTO") "AUTO" "PASS"))
-				     ((eq? (launch:einf-rollup-status exit-info) 1) "FAIL")  ;; (vector-ref exit-info 3)
-				     ((eq? (launch:einf-rollup-status exit-info) 2)	     ;;	(vector-ref exit-info 3)
-				      ;; if the current status is AUTO the defer to the calculated value but qualify (i.e. make this AUTO-WARN)
-				      (if (equal? (db:test-get-status testinfo) "AUTO") "AUTO-WARN" "WARN"))
-				     ((eq? (launch:einf-rollup-status exit-info) 3) "CHECK")
-				     ((eq? (launch:einf-rollup-status exit-info) 4) "WAIVED")
-				     ((eq? (launch:einf-rollup-status exit-info) 5) "ABORT")
-				     ((eq? (launch:einf-rollup-status exit-info) 6) "SKIP")
-				     (else "FAIL")))) ;; (db:test-get-status testinfo)))
-		    (debug:print-info 1 *default-log-port* "Test exited in state=" (db:test-get-state testinfo) ", setting state/status based on exit code of " (launch:einf-exit-status exit-info) " and rollup-status of " (launch:einf-rollup-status exit-info))
-   
-        ;; Leave a .final-status file for each sub-test
-        (tests:save-final-status run-id test-id)
-
-		    (tests:test-set-status! run-id 
-					    test-id 
-					    new-state
-					    new-status
-					    (args:get-arg "-m") #f)
-		    ;; need to update the top test record if PASS or FAIL and this is a subtest
-		    ;; NO NEED TO CALL set-state-status-and-roll-up-items HERE, THIS IS DONE IN set-state-status-and-roll-up-items called by tests:test-set-status!
-		    ))
-	      ;; for automated creation of the rollup html file this is a good place...
-	      (if (not (equal? item-path ""))
-		      (tests:summarize-items run-id test-id test-name #f))
-	      (tests:summarize-test run-id test-id)  ;; don't force - just update if no
-        ;; Leave a .final-status file for the top level test
-        (tests:save-final-status run-id test-id)
-	      (rmt:update-run-stats run-id (rmt:get-raw-run-stats run-id)))
-	    (mutex-unlock! m)
-            (launch:end-of-run-check run-id )
-	    (debug:print 2 *default-log-port* "Output from running " fullrunscript ", pid " (launch:einf-pid exit-info) " in work area " 
-			 work-area ":\n====\n exit code " (launch:einf-exit-code exit-info) "\n" "====\n")
-	    (if (not (launch:einf-exit-status exit-info))
-		(exit 4))))
-        )))
-
-;; Spec for End of test
-;; At end of each test call, after marking self as COMPLETED do run-state-status-rollup
-;; At transition to run COMPLETED/X do hooks
-;; Definition: test_dead if event_time + duration + 1 minute? < current_time AND
-;; we can prove the process is not alive (ssh host pstree -A pid)
-;; if dead safe to mark the test as killed in the db
-;; State/status table
-;; new
-;; 100% COMPLETED/ (PASS,FAIL,ABORT etc.) ==> COMPLETED / X where X is same as itemized rollup
-;; > 3 RUNNING with not test_dead do nothing (run should already be RUNNING/ na
-;; > 0 RUNNING and test_dead then send KILLREQ ==> COMPLETED
-;; 0 RUNNING ==> this is actually the first condition, should not get here
-
-(define (launch:end-of-run-check run-id )
-    (let* ((not-completed-cnt (rmt:get-not-completed-cnt run-id))  
-           (running-cnt (rmt:get-count-tests-running-for-run-id run-id))
-           (all-test-launched (rmt:get-var (conc "lunch-complete-" run-id)))
-           (current-state (rmt:get-run-state run-id))
-           (current-status (rmt:get-run-status run-id)))
-     ;;get-vars run-id to query metadata table to check if all completed. if all-test-launched = yes then only not-completed-cnt = 0 means everyting is completed if no entry found in the table do nothing 
-     (debug:print 0 *default-log-port* "Running test cnt :" running-cnt)                      
-     (rmt:set-state-status-and-roll-up-run  run-id current-state current-status)
-     (runs:update-junit-test-reporter-xml run-id) 
-     (cond 
-       ((and all-test-launched (eq? not-completed-cnt 0) (equal? all-test-launched "yes" ))
-                (if (and (equal? (rmt:get-var (conc "end-of-run-" run-id)) "no") (common:simple-lock (conc "endOfRun" run-id)))
-                (begin
-           	(debug:print 4 *default-log-port* "look for  post hook. currseconds: " (current-seconds) " EOR " (rmt:get-var (conc "end-of-run-" run-id)))
-                (debug:print 0 *default-log-port* "End of Run Detected.")
-                (rmt:set-var (conc "end-of-run-" run-id) "yes")
-                ;(thread-sleep! 10)
-          	(runs:run-post-hook run-id)
-                (debug:print 4 *default-log-port* "currseconds: " (current-seconds)" eor: " (rmt:get-var (conc "end-of-run-" run-id)))
-                (common:simple-unlock (conc "endOfRun" run-id)))
-                 (debug:print 0 *default-log-port* "End of Run Detected but not running post hook. This should happen when eor is set to yes. This will happen only when 2 tests exit at smae time. eor= " (rmt:get-var (conc "end-of-run-" run-id)))))
-        ((> running-cnt 3) 
-        	  (debug:print 0 *default-log-port* "There are " running-cnt " tests running." ))
-        ((> running-cnt 0)
-            (debug:print 0 *default-log-port* "running cnt > 0 but <= 3 kill-running-tests-if-dead" )
-   				  (let ((kill-cnt (launch:kill-tests-if-dead run-id)))
-           			(if (and all-test-launched  (equal? all-test-launched "yes") (eq? kill-cnt running-cnt))
-           					(launch:end-of-run-check run-id)))) ;;todo
-        (else  (debug:print 0 *default-log-port* "Should it get here?? May be everything is not launched yet. Running test cnt:" running-cnt " Not completed test cnt:" not-completed-cnt)
-         (let* ((not-completed-tests (rmt:get-tests-for-run run-id "%" `("NOT_STARTED" "RUNNING" "LAUNCHED" "REMOTEHOSTSTART") `() #f #f #f #f #f #f #f #f)))
-       (if (> (length not-completed-tests) 0) 
-           (let loop ((running-test (car not-completed-tests))
-			     (tal    (cdr not-completed-tests)))
-		       (let* ((test-name (vector-ref running-test 2))
-                 (item-path (vector-ref running-test 11)))
-			       	(debug:print 0 *default-log-port* "test " test-name "/" item-path " not completed")
-              (if (not (null? tal))
-				  (loop (car tal) (cdr tal)))))))))))        
- 
-(define (launch:is-test-alive host pid)
-  (if (and host pid (not (equal? host "n/a")))
-      (let* ((cmd (conc "ssh " host " pstree -A " pid))
-	     (output (with-input-from-pipe cmd read-lines)))
-	(debug:print 2 *default-log-port* "Running " cmd " received " output)
-	(if (eq? (length output) 0)
-	   #f
-	   #t))
-      #t))
- 
-(define (launch:kill-tests-if-dead run-id)
-  (let* ((running-tests (rmt:get-tests-for-run run-id "%" `("RUNNING" "LAUNCHED" "REMOTEHOSTSTART") `() #f #f #f #f #f #f #f #f)))
-       (let loop ((running-test (car running-tests))
-			     (tal    (cdr running-tests))
-			     (kill-cnt 0))
-		       (let* ((test-name (vector-ref running-test 2))
-                 (item-path (vector-ref running-test 11))
-								 (test-id (vector-ref running-test 0))
-                 (host (vector-ref running-test 6))
-                 (pid  (rmt:test-get-top-process-pid run-id test-id))   
-                 (event-time (vector-ref running-test 5))
-                 (duration (vector-ref running-test 12))
-                 (flag 0)   
-                 (curr-time (current-seconds)))
-       (if (and (< (+ event-time duration 600) curr-time) (not (launch:is-test-alive host pid))) ;;test has not updated duration in last 10 min then likely its not running but confirm before marking it as killed
-           (begin    
-			       	(debug:print 0 *default-log-port* "test " test-name "/" item-path " needs to be killed")
-              (set! flag 1) 
-              (rmt:set-state-status-and-roll-up-items run-id test-name item-path "KILLREQ" "n/a" #f)))
-               (if (not (null? tal))
-				  (loop (car tal) (cdr tal) (+ kill-cnt flag))
-                 (+ kill-cnt flag))))))
-
-;; DO NOT USE - caching of configs is handled in launch:setup now.
-;;
-(define (launch:cache-config)
-  ;; if we have a linktree and -runtests and -target and the directory exists dump the config
-  ;; to megatest-(current-seconds).cfg and symlink it to megatest.cfg
-  (if (and *configdat* 
-	   (or (args:get-arg "-run")
-	       (args:get-arg "-runtests")
-	       (args:get-arg "-execute")))
-      (let* ((linktree (common:get-linktree)) ;; (get-environment-variable "MT_LINKTREE"))
-	     (target   (common:args-get-target exit-if-bad: #t))
-	     (runname  (or (args:get-arg "-runname")
-			   (args:get-arg ":runname")
-			   (getenv "MT_RUNNAME")))
-	     (fulldir  (conc linktree "/"
-			     target "/"
-			     runname)))
-	(if (and linktree (common:file-exists? linktree)) ;; can't proceed without linktree
-	    (begin
-	      (debug:print-info 0 *default-log-port* "Have -run with target=" target ", runname=" runname ", fulldir=" fulldir ", testpatt=" (or (args:get-arg "-testpatt") "%"))
-	      (if (not (common:file-exists? fulldir))
-		  (create-directory fulldir #t)) ;; need to protect with exception handler 
-	      (if (and target
-		       runname
-		       (common:file-exists? fulldir))
-		  (let ((tmpfile  (conc fulldir "/.megatest.cfg." (current-seconds)))
-			(targfile (conc fulldir "/.megatest.cfg-"  megatest-version "-" megatest-fossil-hash))
-			(rconfig  (conc fulldir "/.runconfig." megatest-version "-" megatest-fossil-hash)))
-		    (if (common:file-exists? rconfig) ;; only cache megatest.config AFTER runconfigs has been cached
-			(begin
-			  (debug:print-info 0 *default-log-port* "Caching megatest.config in " tmpfile)
-                          (if (not (common:in-running-test?))
-                              (configf:write-alist *configdat* tmpfile))
-			  (system (conc "ln -sf " tmpfile " " targfile))))
-		    )))
-	    (debug:print-info 1 *default-log-port* "No linktree yet, no caching configs.")))))
-
-
-;; gather available information, if legit read configs in this order:
-;;
-;;   if have cache;
-;;      read it a return it
-;;   else
-;;     megatest.config     (do not cache)
-;;     runconfigs.config   (cache if all vars avail)
-;;     megatest.config     (cache if all vars avail)
-;;   returns:
-;;     *toppath*
-;;   side effects:
-;;     sets; *configdat*    (megatest.config info)
-;;           *runconfigdat* (runconfigs.config info)
-;;           *configstatus* (status of the read data)
-;;
-(define (launch:setup #!key (force-reread #f) (areapath #f))
-  (mutex-lock! *launch-setup-mutex*)
-  (if (and *toppath*
-	   (eq? *configstatus* 'fulldata) (not force-reread)) ;; got it all
-      (begin
-	(debug:print 2 *default-log-port* "NOTE: skipping launch:setup-body call since we have fulldata")
-	(mutex-unlock! *launch-setup-mutex*)
-	*toppath*)
-      (let ((res (launch:setup-body force-reread: force-reread areapath: areapath)))
-	(mutex-unlock! *launch-setup-mutex*)
-	res)))
-
-;; return paths depending on what info is available.
-;;
-(define (launch:get-cache-file-paths areapath toppath target mtconfig)
-  (let* ((use-cache (common:use-cache?))
-         (runname  (common:args-get-runname))
-         (linktree (common:get-linktree))
-         (testname (common:get-full-test-name))
-         (rundir   (if (and runname target linktree)
-                       (common:directory-writable? (conc linktree "/" target "/" runname))
-                       #f))
-         (testdir  (if (and rundir testname)
-                       (common:directory-writable? (conc rundir "/" testname))
-                       #f))
-         (cachedir (or testdir rundir))
-         (mtcachef (and cachedir (conc cachedir "/" ".megatest.cfg-"  megatest-version "-" megatest-fossil-hash)))
-         (rccachef (and cachedir (conc cachedir "/" ".runconfigs.cfg-"  megatest-version "-" megatest-fossil-hash))))
-    (debug:print-info 6 *default-log-port* 
-                      "runname=" runname 
-                      "\n  linktree=" linktree
-                      "\n  testname=" testname
-                      "\n  rundir=" rundir 
-                      "\n  testdir=" testdir 
-                      "\n  cachedir=" cachedir
-                      "\n  mtcachef=" mtcachef
-                      "\n  rccachef=" rccachef)
-    (cons mtcachef rccachef)))
-
-(define (launch:setup-body #!key (force-reread #f) (areapath #f))
-  (if (and (eq? *configstatus* 'fulldata)
-	   *toppath*
-	   (not force-reread)) ;; no need to reprocess
-      *toppath*   ;; return toppath
-      (let* ((use-cache (common:use-cache?)) ;; BB- use-cache checks *configdat* for use-cache setting.  We do not have *configdat*.  Bootstrapping problem here.
-	     (toppath  (common:get-toppath areapath))
-	     (target   (common:args-get-target))
-	     (sections (if target (list "default" target) #f)) ;; for runconfigs
-	     (mtconfig (or (args:get-arg "-config") "megatest.config")) ;; allow overriding megatest.config 
-             (cachefiles (launch:get-cache-file-paths areapath toppath target mtconfig))
-	     ;; checking for null cachefiles should not be necessary, I was seeing error car of '(), might be a chicken bug or a red herring ...
-	     (mtcachef   (if (null? cachefiles)
-			     #f
-			     (car cachefiles))) ;; (and cachedir (conc cachedir "/" ".megatest.cfg-"  megatest-version "-" megatest-fossil-hash)))
-	     (rccachef   (if (null? cachefiles)
-			     #f
-			     (cdr cachefiles)))) ;; (and cachedir (conc cachedir "/" ".runconfigs.cfg-"  megatest-version "-" megatest-fossil-hash)))
-	      ;; (cancreate (and cachedir (common:file-exists? cachedir)(file-write-access? cachedir) (not (common:in-running-test?)))))
-	(set! *toppath* toppath) ;; This is needed when we are running as a test using CMDINFO as a datasource
-        ;;(BB> "launch:setup-body -- cachefiles="cachefiles)
-	(cond
-	 ;; if mtcachef exists just read it, however we need to assume toppath is available in $MT_RUN_AREA_HOME
-	 ((and (not force-reread)
-	       mtcachef  rccachef
-	       use-cache
-	       (get-environment-variable "MT_RUN_AREA_HOME")
-	       (common:file-exists? mtcachef)
-	       (common:file-exists? rccachef))
-          ;;(BB> "launch:setup-body -- cond branch 1 - use-cache")
-          (set! *configdat*    (configf:read-alist mtcachef))
-          ;;(BB> "launch:setup-body -- 1 set! *configdat*="*configdat*)
-	  (set! *runconfigdat* (configf:read-alist rccachef))
-	  (set! *configinfo*   (list *configdat*  (get-environment-variable "MT_RUN_AREA_HOME")))
-	  (set! *configstatus* 'fulldata)
-	  (set! *toppath*      (get-environment-variable "MT_RUN_AREA_HOME"))
-	  *toppath*)
-	 ;; there are no existing cached configs, do full reads of the configs and cache them
-	 ;; we have all the info needed to fully process runconfigs and megatest.config
-	 ((and ;; (not force-reread) ;; force-reread is irrelevant in the AND, could however OR it?
-	       mtcachef
-	       rccachef) ;; BB- why are we doing this without asking if caching is desired?
-          ;;(BB> "launch:setup-body -- cond branch 2")
-	  (let* ((first-pass    (find-and-read-config        ;; NB// sets MT_RUN_AREA_HOME as side effect
-				 mtconfig
-				 environ-patt: "env-override"
-				 given-toppath: toppath
-				 pathenvvar: "MT_RUN_AREA_HOME"))
-		 (first-rundat  (let ((toppath (if toppath 
-						   toppath
-						   (car first-pass))))
-				  (read-config ;; (conc toppath "/runconfigs.config") ;; this should be converted to runconfig:read but it is non-trivial, leaving it for now.
-				   (conc (if (string? toppath)
-					     toppath
-					     (get-environment-variable "MT_RUN_AREA_HOME"))
-					 "/runconfigs.config")
-				   *runconfigdat* #t 
-				   sections: sections))))
-	    (set! *runconfigdat* first-rundat)
-	    (if first-pass  ;; 
-		(begin
-                  ;;(BB> "launch:setup-body -- \"first-pass\"=first-pass")
-		  (set! *configdat*  (car first-pass))
-                  ;;(BB> "launch:setup-body -- 2 set! *configdat*="*configdat*)
-		  (set! *configinfo* first-pass)
-		  (set! *toppath*    (or toppath (cadr first-pass))) ;; use the gathered data unless already have it
-		  (set! toppath      *toppath*)
-		  (if (not *toppath*)
-		      (begin
-			(debug:print-error 0 *default-log-port* "you are not in a megatest area!")
-			(exit 1)))
-		  (setenv "MT_RUN_AREA_HOME" *toppath*)
-		  ;; the seed read is done, now read runconfigs, cache it then read megatest.config one more time and cache it
-		  (let* ((keys         (common:list-or-null (rmt:get-keys)
-							    message: "Failed to retrieve keys in launch.scm. Please report this to the developers."))
-			 (key-vals     (keys:target->keyval keys target))
-			 (linktree     (common:get-linktree)) ;; (or (getenv "MT_LINKTREE")(if *configdat* (configf:lookup *configdat* "setup" "linktree") #f)))
-					;     (if *configdat*
-					; 	   (configf:lookup *configdat* "setup" "linktree")
-					; 	   (conc *toppath* "/lt"))))
-			 (second-pass  (find-and-read-config
-					mtconfig
-					environ-patt: "env-override"
-					given-toppath: toppath
-					pathenvvar: "MT_RUN_AREA_HOME"))
-			 (runconfigdat (begin     ;; this read of the runconfigs will see any adjustments made by re-reading megatest.config
-					 (for-each (lambda (kt)
-						     (setenv (car kt) (cadr kt)))
-						   key-vals)
-					 (read-config (conc toppath "/runconfigs.config") *runconfigdat* #t ;; consider using runconfig:read some day ...
-						      sections: sections)))
-                         (cachefiles   (launch:get-cache-file-paths areapath toppath target mtconfig))
-                         (mtcachef     (car cachefiles))
-                         (rccachef     (cdr cachefiles)))
-                    ;;  trap exception due to stale NFS handle -- Error: (open-output-file) cannot open file - Stale NFS file handle: "/p/fdk/gwa/lefkowit/mtTesting/qa/primbeqa/links/p1222/11/PDK_r1.1.1/prim/clean/pcell_testgen/.runconfigs.cfg-1.6427-7d1e789cb3f62f9cde719a4865bb51b3c17ea853" - ticket 220546342
-                    ;; TODO - consider 1) using simple-lock to bracket cache write
-                    ;;                 2) cache in hash on server, since need to do rmt: anyway to lock.
-
-		    (if rccachef
-                        (common:fail-safe
-                         (lambda ()
-                           (configf:write-alist runconfigdat rccachef))
-                         (conc "Could not write cache file - "rccachef)))
-                    (if mtcachef
-                        (common:fail-safe
-                         (lambda ()
-                           (configf:write-alist *configdat* mtcachef))
-                         (conc "Could not write cache file - "mtcachef)))
-		    (set! *runconfigdat* runconfigdat)
-		    (if (and rccachef mtcachef) (set! *configstatus* 'fulldata))))
-		;; no configs found? should not happen but let's try to recover gracefully, return an empty hash-table
-		(set! *configdat* (make-hash-table))
-		)))
-
-	 ;; else read what you can and set the flag accordingly
-	 ;; here we don't have either mtconfig or rccachef
-	 (else
-          ;;(BB> "launch:setup-body -- cond branch 3 - else")
-	  (let* ((cfgdat   (find-and-read-config 
-			    (or (args:get-arg "-config") "megatest.config")
-			    environ-patt: "env-override"
-			    given-toppath: (get-environment-variable "MT_RUN_AREA_HOME")
-			    pathenvvar: "MT_RUN_AREA_HOME")))
-
-            (if (and cfgdat (list? cfgdat) (> (length cfgdat) 0) (hash-table? (car cfgdat)))
-		(let* ((toppath  (or (get-environment-variable "MT_RUN_AREA_HOME")(cadr cfgdat)))
-		       (rdat     (read-config (conc toppath  ;; convert this to use runconfig:read!
-						    "/runconfigs.config") *runconfigdat* #t sections: sections)))
-		  (set! *configinfo*   cfgdat)
-		  (set! *configdat*    (car cfgdat))
-		  (set! *runconfigdat* rdat)
-		  (set! *toppath*      toppath)
-		  (set! *configstatus* 'partial))
-		(begin
-		  (debug:print-error 0 *default-log-port* "No " mtconfig " file found. Giving up.")
-		  (exit 2))))))
-	;; COND ends here.
-	
-	;; additional house keeping
-	(let* ((linktree (or (common:get-linktree)
-			     (conc *toppath* "/lt"))))
-	  (if linktree
-	      (begin
-		(if (not (common:file-exists? linktree))
-		    (begin
-		      (handle-exceptions
-			  exn
-			  (begin
-			    (debug:print-error 0 *default-log-port* "Something went wrong when trying to create linktree dir at " linktree)
-			    (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn) ", exn=" exn)
-			    (exit 1))
-			(create-directory linktree #t))))
-		(handle-exceptions
-		    exn
-		    (begin
-		      (debug:print-error 0 *default-log-port* "Something went wrong when trying to create link to linktree at " *toppath*)
-		      (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn) ", exn=" exn))
-		  (let ((tlink (conc *toppath* "/lt")))
-		    (if (not (common:file-exists? tlink))
-			(create-symbolic-link linktree tlink)))))
-	      (begin
-		(debug:print-error 0 *default-log-port* "linktree not defined in [setup] section of megatest.config")
-		)))
-	(if (and *toppath*
-		 (directory-exists? *toppath*))
-	    (begin
-	      (setenv "MT_RUN_AREA_HOME" *toppath*)
-	      (setenv "MT_TESTSUITENAME" (common:get-testsuite-name)))
-	    (begin
-	      (debug:print-error 0 *default-log-port* "failed to find the top path to your Megatest area.")
-	      (set! *toppath* #f) ;; force it to be false so we return #f
-	      #f))
-	
-        ;; one more attempt to cache the configs for future reading
-        (let* ((cachefiles   (launch:get-cache-file-paths areapath toppath target mtconfig))
-               (mtcachef     (car cachefiles))
-               (rccachef     (cdr cachefiles)))
-
-          ;; trap exception due to stale NFS handle -- Error: (open-output-file) cannot open file - Stale NFS file handle: "...somepath.../.runconfigs.cfg-1.6427-7d1e789cb3f62f9cde719a4865bb51b3c17ea853" - ticket 220546342
-          ;; TODO - consider 1) using simple-lock to bracket cache write
-          ;;                 2) cache in hash on server, since need to do rmt: anyway to lock.
-          (if (and rccachef *runconfigdat* (not (common:file-exists? rccachef)))
-              (common:fail-safe
-               (lambda ()
-                 (configf:write-alist *runconfigdat* rccachef))
-               (conc "Could not write cache file - "rccachef))
-              )
-          (if (and mtcachef *configdat*    (not (common:file-exists? mtcachef)))
-              (common:fail-safe
-               (lambda ()
-                 (configf:write-alist *configdat* mtcachef))
-               (conc "Could not write cache file - "mtcachef))
-              )
-          (if (and rccachef mtcachef *runconfigdat* *configdat*)
-              (set! *configstatus* 'fulldata)))
-
-	;; if have -append-config then read and append here
-	(let ((cfname (args:get-arg "-append-config")))
-	  (if (and cfname
-		   (file-read-access? cfname))
-	      (read-config cfname *configdat* #t))) ;; values are added to the hash, no need to do anything special.
-	*toppath*)))
-
-
-(define (get-best-disk confdat testconfig)
-  (let* ((disks   (or (and testconfig (hash-table-ref/default testconfig "disks" #f))
-		      (hash-table-ref/default confdat "disks" #f)))
-	 (minspace (let ((m (configf:lookup confdat "setup" "minspace")))
-		     (string->number (or m "10000")))))
-    (if disks 
-	(let ((res (common:get-disk-with-most-free-space disks minspace))) ;; min size of 1000, seems tad dumb
-	  (if res
-	      (cdr res)
-	      (begin ;; DEAD CODE PATH - REVISIT!
-;;		(if (common:low-noise-print 20 "No valid disks or no disk with enough space")
-;;		    (debug:print-error 0 *default-log-port* "No valid disks found in megatest.config. Please add some to your [disks] section and ensure the directory exists and has enough space!\n    You can change minspace in the [setup] section of megatest.config. Current setting is: " minspace))
-		;;(exit 1)
-                 (if (null? disks)
-                     (cons 1 (conc *toppath* "/runs"))
-                     (let ((paths (sort disks (lambda (x y) (> (string-length (cadr x)) (string-length (cadr y)))))))
-                       (let loop ((head (car paths)) (tail (cdr paths)))
-                         (let ((result (handle-exceptions exn
-					 (begin
-					   (debug:print 0 *default-log-port* "failed to create dir " (cadr head) ", exn=" exn)
-					   #f)
-					 (create-directory (cadr head) #t))))
-                           (if result
-                               result
-                               (if (null? tail)
-                                   (cons 1 (conc *toppath* "/runs"))
-                                   (loop (car tail) (cdr tail)))))))))))
-	;; no disks definition - use mtrah/runs, fall back to currdir/runs
-	(let* ((toppath (or *toppath*
-			    (common:get-toppath *toppath*)
-			    (begin
-			      (debug:print-error 0 *default-log-port* "Creating runs dir in current directory, this is probably not what you wanted. Please check your setup.")
-			      (current-directory))))
-	       (runsdir (conc toppath "/runs")))
-	  (if (not (file-exists? runsdir))(create-directory runsdir))
-	  runsdir)
-	))) ;; the code creates the necessary directories if it does not exist and returns the path.
-
-(define (launch:test-copy test-src-path test-path)
-  (let* ((ovrcmd (let ((cmd (configf:lookup *configdat* "setup" "testcopycmd")))
-		   (if cmd
-		       ;; substitute the TEST_SRC_PATH and TEST_TARG_PATH
-		       (string-substitute "TEST_TARG_PATH" test-path
-					  (string-substitute "TEST_SRC_PATH" test-src-path cmd #t) #t)
-		       #f)))
-	 (cmd    (if ovrcmd 
-		     ovrcmd
-		     (conc "rsync -av" (if (debug:debug-mode 1) "" "q") " " test-src-path "/ " test-path "/"
-			   " >> " test-path "/mt_launch.log 2>> " test-path "/mt_launch.log")))
-	 (status (system cmd)))
-    (if (not (eq? status 0))
-	(debug:print 2 *default-log-port* "ERROR: problem with running \"" cmd "\""))))
-
-
-;; Desired directory structure:
-;;
-;;  <linkdir> - <target> - <testname> -.
-;;                                     |
-;;                                     v
-;;  <rundir>  -  <target>  -    <testname> -|- <itempath(s)>
-;;
-;;  dir stored in test is:
-;; 
-;;  <linkdir> - <target> - <testname> [ - <itempath> ]
-;; 
-;; All log file links should be stored relative to the top of link path
-;;  
-;; <target> - <testname> [ - <itempath> ] 
-;;
-(define (create-work-area run-id run-info keyvals test-id test-src-path disk-path testname itemdat #!key (remtries 2))
-  (let* ((item-path (if (string? itemdat) itemdat (item-list->path itemdat))) ;; if pass in string - just use it
-	 (runname   (if (string? run-info) ;; if we pass in a string as run-info use it as run-name.
-			run-info
-			(db:get-value-by-header (db:get-rows run-info)
-						(db:get-header run-info)
-						"runname")))
-	 (contour   #f) ;; NOT READY FOR THIS (args:get-arg "-contour"))
-	 ;; convert back to db: from rdb: - this is always run at server end
-	 (target   (string-intersperse (map cadr keyvals) "/"))
-
-	 (not-iterated  (equal? "" item-path))
-
-	 ;; all tests are found at <rundir>/test-base or <linkdir>/test-base
-	 (testtop-base (conc target "/" runname "/" testname))
-	 (test-base    (conc testtop-base (if not-iterated "" "/") item-path))
-
-	 ;; nb// if itempath is not "" then it is prefixed with "/"
-	 (toptest-path (conc disk-path (if contour (conc "/" contour) "") "/" testtop-base))
-	 (test-path    (conc disk-path (if contour (conc "/" contour) "") "/" test-base))
-
-	 ;; ensure this exists first as links to subtests must be created there
-	 (linktree  (common:get-linktree))
-	 ;; WAS: (let ((rd (configf:lookup *configdat* "setup" "linktree")))
-	 ;;         (if rd rd (conc *toppath* "/runs"))))
-	 ;; which seems wrong ...
-
-	 (lnkbase   (conc linktree (if contour (conc "/" contour) "") "/" target "/" runname))
-	 (lnkpath   (conc lnkbase "/" testname))
-	 (lnkpathf  (conc lnkpath (if not-iterated "" "/") item-path))
-	 (lnktarget (conc lnkpath "/" item-path)))
-
-    ;; Update the rundir path in the test record for all, rundir=physical, shortdir=logical
-    ;;                                                 rundir   shortdir
-    (rmt:general-call 'test-set-rundir-shortdir run-id lnkpathf test-path testname item-path run-id)
-
-    (debug:print 2 *default-log-port* "INFO:\n       lnkbase=" lnkbase "\n       lnkpath=" lnkpath "\n  toptest-path=" toptest-path "\n     test-path=" test-path)
-    (if (not (common:file-exists? linktree))
-	(begin
-	  (debug:print 0 *default-log-port* "WARNING: linktree did not exist! Creating it now at " linktree)
-	  (create-directory linktree #t))) ;; (system (conc "mkdir -p " linktree))))
-    ;; create the directory for the tests dir links, this is needed no matter what... try up to three times
-    (let loop ((done 3)) 
-      (let ((success (if (and (not (common:directory-exists? lnkbase))
-			      (not (common:file-exists? lnkbase)))
-			 (handle-exceptions
-			  exn
-			  (begin
-			    (debug:print-error 0 *default-log-port* "Problem creating linktree base at " lnkbase ", exn=" exn)
-			    (print-error-message exn (current-error-port))
-			    #t)
-			  (create-directory lnkbase #t)
-			  #f))))
-	(if (and (not success)(> done 0))
-	    (loop (- done 1)))))
-    
-    ;; update the toptest record with its location rundir, cache the path
-    ;; This wass highly inefficient, one db write for every subtest, potentially
-    ;; thousands of unnecessary updates, cache the fact it was set and don't set it 
-    ;; again. 
-
-    ;; Now create the link from the test path to the link tree, however
-    ;; if the test is iterated it is necessary to create the parent path
-    ;; to the iteration. use pathname-directory to trim the path by one
-    ;; level
-    (if (not not-iterated) ;; i.e. iterated
-	(let ((iterated-parent  (pathname-directory (conc lnkpath "/" item-path))))
-	  (debug:print-info 2 *default-log-port* "Creating iterated parent " iterated-parent)
-	  (handle-exceptions
-	   exn
-	   (begin
-	     (debug:print-error 0 *default-log-port* " Failed to create directory " iterated-parent ((condition-property-accessor 'exn 'message) exn)
-				", continuing but link tree may be corrupted, exn=" exn)
-	     #;(exit 1))
-	   (create-directory iterated-parent #t))))
-
-    (if (symbolic-link? lnkpath) 
-	(handle-exceptions
-	 exn
-	 (begin
-	   (debug:print-error 0 *default-log-port* " Failed to remove symlink " lnkpath ((condition-property-accessor 'exn 'message) exn)
-			      ", continuing but link tree may be corrupted. exn=" exn)
-	   #;(exit 1))
-	 (delete-file lnkpath)))
-
-    (if (not (or (common:file-exists? lnkpath)
-		 (symbolic-link? lnkpath)))
-	(handle-exceptions
-	 exn
-	 (begin
-	   (debug:print-error 0 *default-log-port* " Failed to create symlink " lnkpath ((condition-property-accessor 'exn 'message) exn)
-			      ", continuing but link tree may be corrupted. exn=" exn)
-	   #;(exit 1))
-	 (create-symbolic-link toptest-path lnkpath)))
-    
-    ;; NB - This was not working right - some top tests are not getting the path set!!!
-    ;;
-    ;; Do the setting of this record after the paths are created so that the shortdir can 
-    ;; be set to the real directory location. This is safer for future clean up if the link
-    ;; tree is damaged or lost.
-    ;; 
-    (if (not (hash-table-ref/default *toptest-paths* testname #f))
-	(let* ((testinfo       (rmt:get-test-info-by-id run-id test-id)) ;;  run-id testname item-path))
-	       (curr-test-path (if testinfo ;; (filedb:get-path *fdb*
-							     ;; (db:get-path dbstruct
-				   ;; (rmt:sdb-qry 'getstr 
-				   (db:test-get-rundir testinfo) ;; ) ;; )
-				   #f)))
-	  (hash-table-set! *toptest-paths* testname curr-test-path)
-	  ;; NB// Was this for the test or for the parent in an iterated test?
-	  (rmt:general-call 'test-set-rundir-shortdir run-id lnkpath 
-			    (if (common:file-exists? lnkpath)
-				;; (resolve-pathname lnkpath)
-				(common:nice-path lnkpath)
-				lnkpath)
-			    testname "" run-id)
-	  ;; (rmt:general-call 'test-set-rundir run-id lnkpath testname "") ;; toptest-path)
-	  (if (or (not curr-test-path)
-		  (not (directory-exists? toptest-path)))
-	      (begin
-		(debug:print-info 2 *default-log-port* "Creating " toptest-path " and link " lnkpath)
-		(handle-exceptions
-		    exn
-		  (begin
-		    (debug:print 0 *default-log-port* "failed to create directory " toptest-path ", exn=" exn)
-		    #f)
-		 (create-directory toptest-path #t))
-		(hash-table-set! *toptest-paths* testname toptest-path)))))
-
-    ;; The toptest path has been created, the link to the test in the linktree has
-    ;; been created. Now, if this is an iterated test the real test dir must be created
-    (if (not not-iterated) ;; this is an iterated test
-	(begin ;; (let ((lnktarget (conc lnkpath "/" item-path)))
-	  (debug:print 2 *default-log-port* "Setting up sub test run area")
-	  (debug:print 2 *default-log-port* " - creating run area in " test-path)
-	  (handle-exceptions
-	   exn
-	   (begin
-	     (debug:print-error 0 *default-log-port* " Failed to create directory " test-path ((condition-property-accessor 'exn 'message) exn)
-				", exiting, exn=" exn)
-	     (exit 1))
-	   (create-directory test-path #t))
-	  (debug:print 2 *default-log-port* 
-		       " - creating link from: " test-path "\n"
-		       "                   to: " lnktarget)
-
-	  ;; If there is already a symlink delete it and recreate it.
-	  (handle-exceptions
-	   exn
-	   (begin
-	     (debug:print-error 0 *default-log-port* " Failed to re-create link " lnktarget ((condition-property-accessor 'exn 'message) exn) ", exiting, exn=" exn)
-	     (exit))
-	   (if (symbolic-link? lnktarget)     (delete-file lnktarget))
-	   (if (not (common:file-exists? lnktarget)) (create-symbolic-link test-path lnktarget)))))
-
-    (if (not (directory? test-path))
-	(create-directory test-path #t)) ;; this is a hack, I don't know why out of the blue this path does not exist sometimes
-
-    (if (and test-src-path (directory? test-path))
-	(begin
-	  (launch:test-copy test-src-path test-path)
-	  (list lnkpathf lnkpath ))
-	(if (and test-src-path (> remtries 0))
-	    (begin
-	      (debug:print-error 0 *default-log-port* "Failed to create work area at " test-path " with link at " lnktarget ", remaining attempts " remtries)
-	      ;; 
-	      (create-work-area run-id run-info keyvals test-id test-src-path disk-path testname itemdat remtries: (- remtries 1)))
-	    (list #f #f)))))
-
-
-(define (launch:handle-zombie-tests run-id)
-  (let* ((key (conc "zombiescan-runid-"run-id))
-         (now (current-seconds))
-         (threshold (- (current-seconds)  (* 2 (or (configf:lookup-number *configdat* "setup" "deadtime") 120))))
-         (val (rmt:get-var key))
-         (do-scan?
-          (cond
-           ((not val)
-            #t)
-           ((< val threshold)
-            #t)
-           (else #f))))
-    (when do-scan?
-      (debug:print 1 *default-log-port* "INFO: search and mark zombie tests")
-      (rmt:set-var key (current-seconds))
-      (rmt:find-and-mark-incomplete run-id #f))))
-
-
-
-
-
-;; 1. look though disks list for disk with most space
-;; 2. create run dir on disk, path name is meaningful
-;; 3. create link from run dir to megatest runs area 
-;; 4. remotely run the test on allocated host
-;;    - could be ssh to host from hosts table (update regularly with load)
-;;    - could be netbatch
-;;      (launch-test db (cadr status) test-conf))
-(define (launch-test test-id run-id run-info keyvals runname test-conf test-name test-path itemdat params)
-  (mutex-lock! *launch-setup-mutex*) ;; setting variables and processing the testconfig is NOT thread-safe, reuse the launch-setup mutex
-  (let* ( ;; (lock-key        (conc "test-" test-id))
-	;; (got-lock        (let loop ((lock        (rmt:no-sync-get-lock lock-key))
-	;; 			     (expire-time (+ (current-seconds) 15))) ;; give up on getting the lock and steal it after 15 seconds
-	;; 		    (if (car lock)
-	;; 			#t
-	;; 			(if (> (current-seconds) expire-time)
-	;; 			    (begin
-	;; 			      (debug:print-info 0 *default-log-port* "Timed out waiting for a lock to launch test " keyvals " " runname " " test-name " " test-path)
-	;; 			      (rmt:no-sync-del! lock-key) ;; destroy the lock
-	;; 			      (loop (rmt:no-sync-get-lock lock-key) expire-time)) ;; 
-	;; 			    (begin
-	;; 			      (thread-sleep! 1)
-	;; 			      (loop (rmt:no-sync-get-lock lock-key) expire-time))))))
-	 (item-path       (item-list->path itemdat))
-	 (contour         #f)) ;; NOT READY FOR THIS (args:get-arg "-contour")))
-    (let loop ((delta        (- (current-seconds) *last-launch*))
-	       (launch-delay (configf:lookup-number *configdat* "setup" "launch-delay" default: 0)))
-      (if (> launch-delay delta)
-	  (begin
-	    (if (common:low-noise-print 1200 "test launch delay") ;; every two hours or so remind the user about launch delay.
-		(debug:print-info 0 *default-log-port* "NOTE: test launches are delayed by " launch-delay " seconds. See megatest.config launch-delay setting to adjust.")) ;; launch of " test-name " for " (- launch-delay delta) " seconds"))
-	    (thread-sleep! (- launch-delay delta))
-	    (loop (- (current-seconds) *last-launch*) launch-delay))))
-    (change-directory *toppath*)
-    (alist->env-vars ;; consolidate this code with the code in megatest.scm for "-execute", *maybe* - the longer they are set the longer each launch takes (must be non-overlapping with the vars)
-     (append
-      (list
-       (list "MT_RUN_AREA_HOME" *toppath*)
-       (list "MT_TEST_NAME" test-name)
-       (list "MT_RUNNAME"   runname)
-       (list "MT_ITEMPATH"  item-path)
-       (list "MT_CONTOUR"   contour)
-       )
-      itemdat))
-    (let* ((tregistry       (tests:get-all)) ;; third param (below) is system-allowed
-           ;; for tconfig, why do we allow fallback to test-conf?
-	   (tconfig         (or (tests:get-testconfig test-name item-path tregistry #t force-create: #t)
-				(begin
-                                  (debug:print 0 *default-log-port* "WARNING: falling back to pre-calculated testconfig. This is likely not desired.")
-                                  test-conf))) ;; force re-read now that all vars are set
-	   (useshell        (let ((ush (configf:lookup *configdat* "jobtools"     "useshell")))
-			      (if ush 
-				  (if (equal? ush "no") ;; must use "no" to NOT use shell
-				      #f
-				      ush)
-				  #t)))     ;; default is yes
-	   (runscript       (configf:lookup tconfig   "setup"        "runscript"))
-	   (ezsteps         (> (length (hash-table-ref/default tconfig "ezsteps" '())) 0)) ;; don't send all the steps, could be big, just send a flag
-	   (subrun          (> (length (hash-table-ref/default tconfig "subrun"  '())) 0)) ;; send a flag to process a subrun
-	   ;; (diskspace       (configf:lookup tconfig   "requirements" "diskspace"))
-	   ;; (memory          (configf:lookup tconfig   "requirements" "memory"))
-	   ;; (hosts           (configf:lookup *configdat* "jobtools"     "workhosts")) ;; I'm pretty sure this was never completed
-	   (remote-megatest (configf:lookup *configdat* "setup" "executable"))
-	   (run-time-limit  (or (configf:lookup  tconfig   "requirements" "runtimelim")
-				(configf:lookup  *configdat* "setup" "runtimelim")))
-	   ;; FIXME SOMEDAY: not good how this is so obtuse, this hack is to 
-	   ;;                allow running from dashboard. Extract the path
-	   ;;                from the called megatest and convert dashboard
-	   ;;             	  or dboard to megatest
-	   (local-megatest  (common:find-local-megatest))
-	   #;(local-megatest  (let* ((lm  (car (argv)))
-				   (dir (pathname-directory lm))
-				   (exe (pathname-strip-directory lm)))
-			      (conc (if dir (conc dir "/") "")
-				    (case (string->symbol exe)
-				      ((dboard)    "../megatest")
-				      ((mtest)     "../megatest")
-				      ((dashboard) "megatest")
-				      (else exe)))))
-	   (launcher        (common:get-launcher *configdat* test-name item-path)) ;; (configf:lookup *configdat* "jobtools"     "launcher"))
-	   (test-sig        (conc (common:get-testsuite-name) ":" test-name ":" item-path)) ;; (item-list->path itemdat))) ;; test-path is the full path including the item-path
-	   (work-area       #f)
-	   (toptest-work-area #f) ;; for iterated tests the top test contains data relevant for all
-	   (diskpath   #f)
-	   (cmdparms   #f)
-	   (fullcmd    #f) ;; (define a (with-output-to-string (lambda ()(write x))))
-	   (mt-bindir-path #f)
-	   (testinfo   (rmt:get-test-info-by-id run-id test-id))
-	   (mt_target  (string-intersperse (map cadr keyvals) "/"))
-	   (debug-param (append (if (args:get-arg "-debug")  (list "-debug" (args:get-arg "-debug")) '())
-				(if (args:get-arg "-logging")(list "-logging") '())
-				(if (configf:lookup *configdat* "misc" "profilesw")
-				    (list (configf:lookup *configdat* "misc" "profilesw"))
-				    '()))))
-      ;; (if hosts (set! hosts (string-split hosts)))
-      ;; set the megatest to be called on the remote host
-      (if (not remote-megatest)(set! remote-megatest local-megatest)) ;; "megatest"))
-      (set! mt-bindir-path (pathname-directory remote-megatest))
-      (if launcher (set! launcher (string-split launcher)))
-      ;; set up the run work area for this test
-      (if (and (args:get-arg "-preclean") ;; user has requested to preclean for this run
-	       (not (member (db:test-get-rundir testinfo)(list "n/a" "/tmp/badname")))) ;; n/a is a placeholder and thus not a read dir
-	  (begin
-	    (debug:print-info 0 *default-log-port* "attempting to preclean directory " (db:test-get-rundir testinfo) " for test " test-name "/" item-path)
-	    (runs:remove-test-directory testinfo 'remove-data-only))) ;; remove data only, do not perturb the record
-      
-      ;; prevent overlapping actions - set to LAUNCHED as early as possible
-      ;;
-      ;; the following call handles waiver propogation. cannot yet condense into roll-up-pass-fail
-      (tests:test-set-status! run-id test-id "LAUNCHED" "n/a" #f #f) ;; (if launch-results launch-results "FAILED"))
-      (rmt:set-state-status-and-roll-up-items run-id test-name item-path #f "LAUNCHED" #f)
-      ;; (pp (hash-table->alist tconfig))
-      (set! diskpath (get-best-disk *configdat* tconfig))
-      (if diskpath
-	  (let ((dat  (create-work-area run-id run-info keyvals test-id test-path diskpath test-name itemdat)))
-	    (set! work-area (car dat))
-	    (set! toptest-work-area (cadr dat))
-	    (debug:print-info 2 *default-log-port* "Using work area " work-area))
-	  (begin
-	    (set! work-area (conc test-path "/tmp_run"))
-	    (create-directory work-area #t)
-	    (debug:print 0 *default-log-port* "WARNING: No disk work area specified - running in the test directory under tmp_run")))
-      (set! cmdparms (base64:base64-encode 
-		      (z3:encode-buffer 
-		       (with-output-to-string
-			 (lambda () ;; (list 'hosts     hosts)
-			   (write (list (list 'testpath  test-path)
-					;; (list 'transport (conc *transport-type*))
-					;; (list 'serverinf *server-info*)
-					(list 'homehost  (let* ((hhdat (common:get-homehost)))
-							   (if hhdat
-							       (car hhdat)
-							       #f)))
-					(list 'serverurl (if *runremote*
-							     (remote-server-url *runremote*)
-							     #f)) ;;
-					(list 'areaname  (common:get-testsuite-name))
-					(list 'toppath   *toppath*)
-					(list 'work-area work-area)
-					(list 'test-name test-name) 
-					(list 'runscript runscript) 
-					(list 'run-id    run-id   )
-					(list 'test-id   test-id  )
-					;; (list 'item-path item-path )
-					(list 'itemdat   itemdat  )
-					(list 'megatest  remote-megatest)
-					(list 'ezsteps   ezsteps)
-					(list 'subrun    subrun)
-					(list 'target    mt_target)
-					(list 'contour   contour)
-					(list 'runtlim   (if run-time-limit (common:hms-string->seconds run-time-limit) #f))
-					(list 'env-ovrd  (hash-table-ref/default *configdat* "env-override" '())) 
-					(list 'set-vars  (if params (hash-table-ref/default params "-setvars" #f)))
-					(list 'runname   runname)
-					(list 'mt-bindir-path mt-bindir-path))))))))
-      
-      ;; clean out step records from previous run if they exist
-      ;; (rmt:delete-test-step-records run-id test-id)
-      ;; if the dir does not exist we may have a itempath where individual variables are a path, launch anyway
-      (if (common:file-exists? work-area)
-	  (change-directory work-area)) ;; so that log files from the launch process don't clutter the test dir
-      (cond
-       ;; ((and launcher hosts) ;; must be using ssh hostname
-       ;;    (set! fullcmd (append launcher (car hosts)(list remote-megatest "-m" test-sig "-execute" cmdparms) debug-param)))
-       ;; (set! fullcmd (append launcher (car hosts)(list remote-megatest test-sig "-execute" cmdparms))))
-       (launcher
-	(set! fullcmd (append launcher (list remote-megatest "-m" test-sig "-execute" cmdparms) debug-param)))
-       ;; (set! fullcmd (append launcher (list remote-megatest test-sig "-execute" cmdparms))))
-       (else
-	(if (not useshell)(debug:print 0 *default-log-port* "WARNING: internal launching will not work well without \"useshell yes\" in your [jobtools] section"))
-	(set! fullcmd (append (list remote-megatest "-m" test-sig "-execute" cmdparms) debug-param (list (if useshell "&" ""))))))
-      ;; (set! fullcmd (list remote-megatest test-sig "-execute" cmdparms (if useshell "&" "")))))
-      (if (args:get-arg "-xterm")(set! fullcmd (append fullcmd (list "-xterm"))))
-      (debug:print 1 *default-log-port* "Launching " work-area)
-      ;; set pre-launch-env-vars before launching, keep the vars in prevvals and put the envionment back when done
-      (debug:print 4 *default-log-port* "fullcmd: " fullcmd)
-      (set! *last-launch* (current-seconds)) ;; all that junk above takes time, set this as late as possible.
-      (let* ((commonprevvals (alist->env-vars
-			      (hash-table-ref/default *configdat* "env-override" '())))
-	     (miscprevvals   (alist->env-vars ;; consolidate this code with the code in megatest.scm for "-execute"
-			      (append (list (list "MT_TEST_RUN_DIR" work-area)
-					    (list "MT_TEST_NAME" test-name)
-					    (list "MT_ITEM_INFO" (conc itemdat)) 
-					    (list "MT_RUNNAME"   runname)
-					    (list "MT_TARGET"    mt_target)
-					    (list "MT_ITEMPATH"  item-path)
-					    )
-				      itemdat)))
-	     (testprevvals   (alist->env-vars
-			      (hash-table-ref/default tconfig "pre-launch-env-overrides" '())))
-	     ;; Launchwait defaults to true, must override it to turn off wait
-	     (launchwait     (if (equal? (configf:lookup *configdat* "setup" "launchwait") "no") #f #t))
-	     (launch-results-prev (apply (if launchwait ;; BB: TODO: refactor this to examine return code of launcher, if nonzero, set state to launch failed.
-					     process:cmd-run-with-stderr-and-exitcode->list
-					     process-run)
-					 (if useshell
-					     (let ((cmdstr (string-intersperse fullcmd " ")))
-					       (if launchwait
-						   cmdstr
-						   (conc cmdstr " >> mt_launch.log 2>&1 &")))
-					     (car fullcmd))
-					 (if useshell
-					     '()
-					     (cdr fullcmd))))
-             (success        (if launchwait (equal? 0 (cadr launch-results-prev)) #t))
-             (launch-results (if launchwait (car launch-results-prev) launch-results-prev)))
-        (if (not success)
-            (tests:test-set-status! run-id test-id "COMPLETED" "DEAD" "launcher failed; exited non-zero; check mt_launch.log" #f)) ;; (if launch-results launch-results "FAILED"))
-        (mutex-unlock! *launch-setup-mutex*) ;; yes, really should mutex all the way to here. Need to put this entire process into a fork.
-	;; (rmt:no-sync-del! lock-key)         ;; release the lock for starting this test
-	(if (not launchwait) ;; give the OS a little time to allow the process to start
-	    (thread-sleep! 0.01))
-	(with-output-to-file "mt_launch.log"
-	  (lambda ()
-	    (print "LAUNCHCMD: " (string-intersperse fullcmd " "))
-	    (if (list? launch-results)
-		(apply print launch-results)
-		(print "NOTE: launched \"" fullcmd "\"\n  but did not wait for it to proceed. Add the following to megatest.config \n[setup]\nlaunchwait yes\n  if you have problems with this"))
-	    #:append))
-	(debug:print 2 *default-log-port* "Launching completed, updating db")
-	(debug:print 2 *default-log-port* "Launch results: " launch-results)
-	(if (not launch-results)
-	    (begin
-	      (print "ERROR: Failed to run " (string-intersperse fullcmd " ") ", exiting now")
-	      ;; (sqlite3:finalize! db)
-	      ;; good ole "exit" seems not to work
-	      ;; (_exit 9)
-	      ;; but this hack will work! Thanks go to Alan Post of the Chicken email list
-	      ;; NB// Is this still needed? Should be safe to go back to "exit" now?
-	      (process-signal (current-process-id) signal/kill)
-	      ))
-	(alist->env-vars miscprevvals)
-	(alist->env-vars testprevvals)
-	(alist->env-vars commonprevvals)
-	launch-results))
-    (change-directory *toppath*)
-    (thread-sleep! (configf:lookup-number *configdat* "setup" "inter-test-delay" default: 0.0))))
-
-;; recover a test where the top controlling mtest may have died
-;;
-(define (launch:recover-test run-id test-id)
-  ;; this function is called on the test run host via ssh
-  ;;
-  ;; 1. look at the process from pid
-  ;;    - is it owned by calling user
-  ;;    - it it's run directory correct for the test
-  ;;    - is there a controlling mtest (maybe stuck)
-  ;; 2. if recovery is needed watch pid
-  ;;    - when it exits take the exit code and do the needful
-  ;;
-  (let* ((pid (rmt:test-get-top-process-pid run-id test-id))
-	 (psres (with-input-from-pipe
-		 (conc "ps -F -u " (current-user-name) " | grep -E '" pid " ' | grep -v 'grep -E " pid "'")
-		 (lambda ()
-		   (read-line))))
-	 (rundir (if (string? psres) ;; real process owned by user
-		     (read-symbolic-link (conc "/proc/" pid "/cwd"))
-		     #f)))
-    ;; now wait on that process if all is correct
-    ;; periodically update the db with runtime
-    ;; when the process exits look at the db, if still RUNNING after 10 seconds set
-    ;; state/status appropriately
-    (process-wait pid)))

ADDED   launchmod.scm
Index: launchmod.scm
==================================================================
--- /dev/null
+++ launchmod.scm
@@ -0,0 +1,2649 @@
+;;======================================================================
+;; Copyright 2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
+
+;;======================================================================
+
+(declare (unit launchmod))
+
+(declare (uses commonmod))
+(declare (uses configfmod))
+(declare (uses csv-xml))
+(declare (uses dbmod))
+(declare (uses debugprint))
+(declare (uses ezstepsmod))
+(declare (uses keysmod))
+(declare (uses mtargs))
+(declare (uses mtmod))
+(declare (uses mtver))
+(declare (uses processmod))
+(declare (uses rmtmod))
+(declare (uses servermod))
+(declare (uses subrunmod))
+(declare (uses testsmod))
+(declare (uses bigmod))
+
+(module launchmod
+	*
+	
+(import scheme
+	(prefix sqlite3 sqlite3:)
+	chicken.base
+	chicken.condition
+	chicken.eval
+	chicken.file
+	chicken.file.posix
+	chicken.format
+	chicken.io
+	chicken.pathname
+	chicken.port
+	chicken.pretty-print
+	chicken.process
+	chicken.process-context
+	chicken.process-context.posix
+	chicken.process.signal
+	chicken.sort
+	chicken.string
+	chicken.time
+	chicken.time.posix
+	chicken.bitwise
+
+	(prefix base64 base64:)
+	csv-xml
+	directory-utils
+	matchable
+	regex
+	s11n
+	srfi-1
+	srfi-13
+	srfi-18
+	srfi-69
+	stack
+	system-information
+       
+	typed-records
+	z3
+	sxml-serializer
+	sxml-modifications
+	(prefix sxml-modifications sxml-)
+	sxml-transforms
+	
+	(prefix mtargs args:)
+	bigmod
+	commonmod
+	configfmod
+	dbmod
+	debugprint
+	ezstepsmod
+	keysmod
+	mtmod
+	mtver
+	processmod
+	rmtmod
+	servermod
+	subrunmod
+	testsmod
+	)
+
+;; (include "db_records.scm")
+(include "key_records.scm")
+
+;;======================================================================
+;; ezsteps
+;;======================================================================
+
+;; ezsteps were going to be coded as
+;; stepname[,predstep1,predstep2 ...] [{VAR1=first,second,third}] command to execute
+;;   BUT
+;; now are
+;; stepname {VAR=first,second,third ...} command ...
+;; where the {VAR=first,second,third ...} is optional.
+
+;; given an exit code and whether or not logpro was used calculate OK/BAD
+;; return #t if we are ok, #f otherwise
+(define (steprun-good? logpro exitcode stepparms)
+  (or (eq? exitcode 0)
+      (and logpro (eq? exitcode 2)) ;; shouldn't this be (member exitcode 2 ...) with the other ok codes?
+      (let* ((params (alist-ref 'params stepparms)) ;; get the params section
+	     (keep-going (if params
+			     (alist-ref "keep-going" params equal?)
+			     #f)))
+	(debug:print 0 *default-log-port* "keep-going=" keep-going)
+	(and keep-going (equal? (car keep-going) "yes")))))
+
+;; if handed a string, process it, else look for MT_CMDINFO
+(define (launch:get-cmdinfo-assoc-list #!key (encoded-cmd #f))
+  (let ((enccmd (if encoded-cmd encoded-cmd (getenv "MT_CMDINFO"))))
+    (if enccmd
+	(common:read-encoded-string enccmd)
+	'())))
+
+(define (launch:manage-steps run-id test-id item-path fullrunscript ezsteps subrun test-name tconfigreg exit-info m)
+  ;; (let-values
+  ;;  (((pid exit-status exit-code)
+  ;;    (run-n-wait fullrunscript)))
+  ;; (tests:test-set-status! test-id "RUNNING" "n/a" #f #f)
+  ;; Since we should have a clean slate at this time there is no need to do 
+  ;; any of the other stuff that tests:test-set-status! does. Let's just 
+  ;; force RUNNING/n/a
+
+  ;; (thread-sleep! 0.3)
+  ;; (tests:test-force-state-status! run-id test-id "RUNNING" "n/a")
+  (rmt:set-state-status-and-roll-up-items run-id test-name item-path "RUNNING" #f #f) 
+  ;; (thread-sleep! 0.3) ;; NFS slowness has caused grief here
+
+  ;; if there is a runscript do it first
+  (if fullrunscript
+      (let ((pid (process-run fullrunscript)))
+	(rmt:test-set-top-process-pid run-id test-id pid)
+	(let loop ((i 0))
+	  (let-values
+	   (((pid-val exit-status exit-code) (process-wait pid #t)))
+	   (mutex-lock! m)
+	   (launch:einf-pid-set!           exit-info  pid)         ;; (vector-set! exit-info 0 pid)
+	   (launch:einf-exit-status-set!   exit-info  exit-status) ;; (vector-set! exit-info 1 exit-status)
+	   (launch:einf-exit-code-set!     exit-info  exit-code)   ;; (vector-set! exit-info 2 exit-code)
+	   (launch:einf-rollup-status-set! exit-info  exit-code)   ;; (vector-set! exit-info 3 exit-code)  ;; rollup status
+	   (mutex-unlock! m)
+	   (if (eq? pid-val 0)
+	       (begin
+		 (thread-sleep! 2)
+		 (loop (+ i 1)))
+	       )))))
+  ;; then, if runscript ran ok (or did not get called)
+  ;; do all the ezsteps (if any)
+  (if (or ezsteps subrun)
+      (let* ((test-run-dir (tests:get-test-path-from-environment))
+             (testconfig ;; (configf:read-config (conc work-area "/testconfig") #f #t environ-patt: "pre-launch-env-vars")) ;; FIXME??? is allow-system ok here?
+	      ;; NOTE: it is tempting to turn off force-create of testconfig but dynamic
+	      ;;       ezstep names need a full re-eval here.
+	      (tests:get-testconfig test-name item-path tconfigreg #t force-create: #t)) ;; 'return-procs)))
+	     (ezstepslst (if (hash-table? testconfig)
+			     (hash-table-ref/default testconfig "ezsteps" '())
+			     #f)))
+	(if testconfig
+	    (hash-table-set! *testconfigs* test-name testconfig) ;; cached for lazy reads later ...
+	    (begin
+	      (launch:setup)
+	      (debug:print 0 *default-log-port* "WARNING: no testconfig found for " test-name " in search path:\n  "
+			   (string-intersperse (tests:get-tests-search-path *configdat*) "\n  "))))
+	;; after all that, still no testconfig? Time to abort
+	(if (not testconfig)
+	    (begin
+	      (debug:print-error 0 *default-log-port* "Failed to resolve megatest.config, runconfigs.config and testconfig issues. Giving up now")
+	      (exit 1)))
+
+	;; create a proc for the subrun if requested, save that proc in the ezsteps table as the last entry
+	;; 1. get section [runarun]
+	;; 2. unset MT_* vars
+	;; 3. fix target
+	;; 4. fix runname
+	;; 5. fix testpatt or calculate it from contour
+	;; 6. launch the run
+	;; 7. roll up the run result and or roll up the logpro processed result
+	(when (configf:lookup testconfig "subrun" "runwait") ;; we use runwait as the flag that a subrun is requested
+            (subrun:initialize-toprun-test testconfig test-run-dir)
+	    (let* ((mt-cmd (subrun:launch-cmd test-run-dir)))
+              (debug:print-info 0 *default-log-port* "Subrun command is \"" mt-cmd "\"")
+              (set! ezsteps #t) ;; set the needed flag
+	      (set! ezstepslst
+                    (append (or ezstepslst '())
+                            (list (list "subrun" (conc "{subrun=true} " mt-cmd)))))))
+
+	;; process the ezsteps
+	(if ezsteps
+	    (let* ((all-steps-dat (make-hash-table))) ;; keep all the info around as stepname ==> alist; where  'params is the params list (add other stuff as needed)
+	      (if (not (common:file-exists? ".ezsteps"))(create-directory ".ezsteps"))
+	      ;; if ezsteps was defined then we are sure to have at least one step but check anyway
+	      (if (not (> (length ezstepslst) 0))
+		  (debug:print-error 0 *default-log-port* "ezsteps defined but ezstepslst is zero length")
+		  (let loop ((ezstep (car ezstepslst))
+			     (tal    (cdr ezstepslst))
+			     (prevstep #f))
+                    (debug:print-info 0 *default-log-port* "Processing ezstep \"" (string-intersperse ezstep " ") "\"")
+		    ;; check exit-info (vector-ref exit-info 1)
+		    (if (launch:einf-exit-status exit-info) ;; (vector-ref exit-info 1)
+			(let* ((logpro-used (launch:runstep ezstep run-id test-id exit-info m tal testconfig all-steps-dat))
+			       (stepname    (car ezstep))
+			       (stepparms   (hash-table-ref all-steps-dat stepname)))
+			  (setenv "MT_STEP_NAME" stepname)
+			  (pp (hash-table->alist all-steps-dat))
+			  ;; if logpro-used read in the stepname.dat file
+			  (if (and logpro-used (common:file-exists? (conc stepname ".dat")))
+			      (launch:load-logpro-dat run-id test-id stepname))
+			  (if (steprun-good? logpro-used (launch:einf-exit-code exit-info) stepparms)
+			      (if (not (null? tal))
+				  (loop (car tal) (cdr tal) stepname))
+			      (debug:print 0 *default-log-port* "WARNING: step " (car ezstep) " failed. Stopping")))
+			(debug:print 0 *default-log-port* "WARNING: a prior step failed, stopping at " ezstep)))))))))
+
+(define (launch:monitor-job run-id test-id item-path fullrunscript ezsteps test-name tconfigreg exit-info m work-area runtlim misc-flags)
+  (let* ((update-period (string->number (or (configf:lookup *configdat* "setup" "test-stats-update-period") "30")))
+         (start-seconds (current-seconds))
+	 (calc-minutes  (lambda ()
+			  (inexact->exact 
+			   (round 
+			    (- 
+			     (current-seconds) 
+			     start-seconds)))))
+	 (kill-tries 0))
+    ;; (tests:set-full-meta-info #f test-id run-id (calc-minutes) work-area)
+    ;; (tests:set-full-meta-info test-id run-id (calc-minutes) work-area)
+    (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)))
+      ;; (common:telemetry-log "zombie" (conc "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
+                                  #f)))
+             (new-disk-free (let* ((df    (if over-time ;; only get df every 30 seconds
+                                              (get-df (current-directory))
+                                              disk-free))
+                                   (delta (abs (- df disk-free))))
+                              (if (and (> df 0)
+                                       (> (/ delta df) 0.1)) ;; (> delta 200) ;; ignore changes under 200 Meg
+                                  df
+                                  #f)))
+             (do-sync       (or new-cpu-load new-disk-free over-time))
+
+             (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))
+        ;; (common:telemetry-log "zombie" (conc "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))
+          (set! kill-reason (conc "KILLING TEST DUE TO TIME LIMIT EXCEEDED! Runtime=" (- (current-seconds) start-seconds) " seconds, limit=" runtlim))
+          (set! kill-job? #t))
+         ((equal? status "DEAD")
+          (tests:update-central-meta-info run-id test-id new-cpu-load new-disk-free (calc-minutes) #f #f)
+          (rmt:set-state-status-and-roll-up-items run-id test-id 'foo "RUNNING" "n/a" "was marked dead; really still running.")
+          ;;(set! kill-reason "KILLING TEST because it was marked as DEAD by launch:handle-zombie-tests (might indicate really overloaded server or else overzealous setup.deadtime)") ;; MARK RUNNING
+          (set! kill-job? #f)))
+
+        (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)))))
+          ;; (common:telemetry-log "zombie" (conc  "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)
+          ;; (common:telemetry-log "zombie" (conc "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)
+	      ;; NOTE: The pid can change as different steps are run. Do we need handshaking between this
+	      ;;       section and the runit section? Or add a loop that tries three times with a 1/4 second
+	      ;;       between tries?
+	      (let* ((pid1 (launch:einf-pid exit-info)) ;; (vector-ref exit-info 0))
+		     (pid2 (rmt:test-get-top-process-pid run-id test-id))
+		     (pids (delete-duplicates (filter number? (list pid1 pid2)))))
+		(if (not (null? pids))
+		    (begin
+		      (for-each
+		       (lambda (pid)
+			 (handle-exceptions
+			  exn
+			  (begin
+			    (debug:print-info 0 *default-log-port* "Unable to kill process with pid " pid ", possibly already killed.")
+			    (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn) ", exn=" exn))
+			  (debug:print 0 *default-log-port* "WARNING: Request received to kill job " pid) ;;  " (attempt # " kill-tries ")")
+			  (debug:print-info 0 *default-log-port* "Signal mask=" (signal-mask))
+			  ;; (if (process:alive? pid)
+			  ;;     (begin
+			  (map (lambda (pid-num)
+				 (process-signal pid-num signal/term))
+			       (process:get-sub-pids pid))
+			  (thread-sleep! 5)
+			  ;; (if (process:process-alive? pid)
+			  (map (lambda (pid-num)
+				 (handle-exceptions
+				     exn
+				   (begin
+				     (debug:print 0 *default-log-port* " .... had trouble sending kill to " pid-num ", exn=" exn)
+				     #f)
+				   (process-signal pid-num signal/kill)))
+			       (process:get-sub-pids pid))))
+		       ;;    (debug:print-info 0 *default-log-port* "not killing process " pid " as it is not alive"))))
+		       pids)
+                      ;; BB: question to Matt -- does the tests:test-state-status! encompass rollup to toplevel?  If not, should it?
+		      (tests:test-set-status! run-id test-id "KILLED"  "KILLED" (conc (args:get-arg "-m")" "kill-reason) #f)) ;; BB ADDED kill-reason -- confirm OK with Matt
+		    (begin
+		      (debug:print-error 0 *default-log-port* "Nothing to kill, pid1=" pid1 ", pid2=" pid2)
+		      (tests:test-set-status! run-id test-id "KILLED"  "FAILED TO KILL" (conc (args:get-arg "-m")" "kill-reason) #f) ;; BB ADDED kill-reason -- confirm OK with Matt
+		      )))
+	      (mutex-unlock! m)
+	      ;; no point in sticking around. Exit now. But run end of run before exiting?
+        (runs:end-of-run-check run-id)
+	      (exit)))
+	(if (hash-table-ref/default misc-flags 'keep-going #f)
+	    (begin
+	      (thread-sleep! 3) ;; (+ 3 (pseudo-random-integer 6))) ;; add some jitter to the call home time to spread out the db accesses
+	      (if (hash-table-ref/default misc-flags 'keep-going #f)  ;; keep originals for cpu-load and disk-free unless they change more than the allowed delta
+		  (loop (calc-minutes)
+                        (or new-cpu-load cpu-load)
+                        (or new-disk-free disk-free)
+                        (if do-sync (current-seconds) last-sync)))))))
+    (tests:update-central-meta-info run-id test-id (get-cpu-load) (get-df (current-directory))(calc-minutes) #f #f))) ;; NOTE: Checking twice for keep-going is intentional
+
+
+(define (launch:execute encoded-cmd)
+  (let* ((cmdinfo    (common:read-encoded-string encoded-cmd))
+	 (tconfigreg #f))
+    (setenv "MT_CMDINFO" encoded-cmd)
+    ;;(bb-check-path msg: "launch:execute incoming")
+    (if (list? cmdinfo) ;; ((testpath /tmp/mrwellan/jazzmind/src/example_run/tests/sqlitespeed)
+	;; (test-name sqlitespeed) (runscript runscript.rb) (db-host localhost) (run-id 1))
+	(let* ((testpath  (assoc/default 'testpath  cmdinfo))  ;; testpath is the test spec area
+	       (top-path  (assoc/default 'toppath   cmdinfo))
+	       (work-area (assoc/default 'work-area cmdinfo))  ;; work-area is the test run area
+	       (test-name (assoc/default 'test-name cmdinfo))
+	       (runscript (assoc/default 'runscript cmdinfo))
+	       (ezsteps   (assoc/default 'ezsteps   cmdinfo))
+	       (subrun    (assoc/default 'subrun    cmdinfo))
+	       ;; (runremote (assoc/default 'runremote cmdinfo))
+	       ;; (transport (assoc/default 'transport cmdinfo))  ;; not used
+	       ;; (serverinf (assoc/default 'serverinf cmdinfo))
+	       ;; (port      (assoc/default 'port      cmdinfo))
+	       (serverurl (assoc/default 'serverurl cmdinfo))
+	       ;; (homehost  (assoc/default 'homehost  cmdinfo))
+	       (run-id    (assoc/default 'run-id    cmdinfo))
+	       (test-id   (assoc/default 'test-id   cmdinfo))
+	       (target    (assoc/default 'target    cmdinfo))
+	       (areaname  (assoc/default 'areaname  cmdinfo))
+	       (itemdat   (assoc/default 'itemdat   cmdinfo))
+	       (env-ovrd  (assoc/default 'env-ovrd  cmdinfo))
+	       (set-vars  (assoc/default 'set-vars  cmdinfo)) ;; pre-overrides from -setvar
+	       (runname   (assoc/default 'runname   cmdinfo))
+	       (megatest  (assoc/default 'megatest  cmdinfo))
+	       (runtlim   (assoc/default 'runtlim   cmdinfo))
+	       (contour   (assoc/default 'contour   cmdinfo))
+	       (item-path (item-list->path itemdat))
+	       (mt-bindir-path (assoc/default 'mt-bindir-path cmdinfo))
+	       (keys      #f)
+	       (keyvals   #f)
+	       (fullrunscript (if (not runscript)
+                                  #f
+                                  (if (substring-index "/" runscript)
+                                      runscript ;; use unadultered if contains slashes
+                                      (let ((fulln (conc work-area "/" runscript)))
+	                                  (if (and (common:file-exists? fulln)
+                                                   (file-executable? fulln))
+                                              fulln
+                                              runscript))))) ;; assume it is on the path
+               (check-work-area           (lambda ()
+                                            ;; NFS might not have propagated the directory meta data to the run host - give it time if needed
+                                            (let loop ((count 0))
+                                              (if (or (common:directory-exists? work-area)
+                                                      (> count 10))
+                                                  (change-directory work-area)
+                                                  (begin
+                                                    (debug:print 0 *default-log-port* "INFO: Not starting job yet - directory " work-area " not found")
+                                                    (thread-sleep! 10)
+                                                    (loop (+ count 1)))))
+
+                                            (if (not (string=?  (common:real-path work-area)(common:real-path (current-directory))))
+                                                (begin
+                                                  (debug:print 0 *default-log-port*
+                                                               "INFO: we are expecting to be in directory " work-area "\n"
+                                                               "     but we are actually in the directory " (current-directory) "\n"
+                                                               "     doing another change dir.")
+                                                  (change-directory work-area)))
+                                            
+                                            ;; spot check that the files in testpath are available. Too often NFS delays cause problems here.
+                                            (let ((files      (glob (conc testpath "/*")))
+                                                  (bad-files '()))
+                                              (for-each
+                                               (lambda (fullname)
+                                                 (let* ((fname (pathname-strip-directory fullname))
+                                                        (targn (conc work-area "/" fname)))
+                                                   (if (not (file-exists? targn))
+                                                       (set! bad-files (cons fname bad-files)))))
+                                               files)
+                                              (if (not (null? bad-files))
+                                                  (begin
+                                                    (debug:print 0 *default-log-port* "INFO: test data from " testpath " not copied properly or filesystem problems causing data to not be found. Re-running the copy command.")
+                                                    (debug:print 0 *default-log-port* "INFO: missing files from " work-area ": " (string-intersperse bad-files ", "))
+                                                    (launch:test-copy testpath work-area))))
+                                            ;; one more time, change to the work-area directory
+                                            (change-directory work-area)))
+	       ) ;; let*
+
+	  (if contour (setenv "MT_CONTOUR" contour))
+	  
+	  ;; immediated set some key variables from CMDINFO data, yes, these will be set again below ...
+	  ;;
+	  (setenv "MT_TESTSUITENAME" areaname)
+	  (setenv "MT_RUN_AREA_HOME" top-path)
+	  (set! *toppath* top-path)
+          (change-directory *toppath*) ;; temporarily switch to the run area home
+	  (setenv "MT_TEST_RUN_DIR"  work-area)
+
+	  (launch:setup) ;; should be properly in the run area home now
+
+	  (if contour (setenv "MT_CONTOUR" contour))
+	  
+	  ;; immediated set some key variables from CMDINFO data, yes, these will be set again below ...
+	  ;;
+	  (setenv "MT_TESTSUITENAME" areaname)
+	  (setenv "MT_RUN_AREA_HOME" top-path)
+	  (set! *toppath* top-path)
+          (change-directory *toppath*) ;; temporarily switch to the run area home
+	  (setenv "MT_TEST_RUN_DIR"  work-area)
+
+	  (launch:setup) ;; should be properly in the run area home now
+          
+	  (set! tconfigreg (tests:get-all)) ;; mapping of testname => test source path
+	  (let ((sighand (lambda (signum)
+			   ;; (signal-mask! signum) ;; to mask or not? seems to cause issues in exiting
+			   (if (eq? signum signal/stop)
+			       (debug:print-error 0 *default-log-port* "attempt to STOP process. Exiting."))
+			   (bdat-time-to-exit-set! *bdat* #t)
+			   (print "Received signal " signum ", cleaning up before exit (set this test to COMPLETED/ABORT) . Please wait...")
+			   (let ((th1 (make-thread (lambda ()
+                                                     (print "set test to COMPLETED/ABORT begin.")
+						     (rmt:test-set-state-status run-id test-id "COMPLETED" "ABORT" "received kill signal")
+                                                     (print "set test to COMPLETED/ABORT complete.")
+						     (print "Killed by signal " signum ". Exiting")
+						     (exit 1))))
+				 (th2 (make-thread (lambda ()
+						     (thread-sleep! 20)
+						     (debug:print 0 *default-log-port* "Done")
+						     (exit 4)))))
+			     (thread-start! th2)
+			     (thread-start! th1)
+			     (thread-join! th2)))))
+	    (set-signal-handler! signal/int sighand)
+	    (set-signal-handler! signal/term sighand)
+	    ) ;; (set-signal-handler! signal/stop sighand)
+	  
+	  ;; Do not run the test if it is REMOVING, RUNNING, KILLREQ or REMOTEHOSTSTART,
+	  ;; Mark the test as REMOTEHOSTSTART *IMMEDIATELY*
+	  ;;
+	  (let* ((test-info (let loop ((tries 0))
+			      (let ((tinfo (rmt:get-test-info-by-id run-id test-id)))
+				(if tinfo
+				    tinfo
+				    (if (> tries 5)
+					#f
+					(begin
+					  (thread-sleep! (+ 1 (* tries 10)))
+					  (loop (+ tries 1))))))))
+		 (test-host (if test-info
+				(db:test-get-host        test-info)
+				(begin
+				  (debug:print 0 *default-log-port* "ERROR: failed to find a record for test-id " test-id ", exiting.")
+				  (exit))))
+		 (test-pid  (db:test-get-process_id  test-info)))
+	    (cond
+             ;; -mrw- I'm removing KILLREQ from this list so that a test in KILLREQ state is treated as a "do not run" flag.
+	     ((member (db:test-get-state test-info) '("INCOMPLETE" "KILLED" "UNKNOWN" "STUCK")) ;; prior run of this test didn't complete, go ahead and try to rerun
+	      (debug:print 0 *default-log-port* "INFO: test is INCOMPLETE or KILLED, treat this execute call as a rerun request")
+	      ;; (tests:test-force-state-status! run-id test-id "REMOTEHOSTSTART" "n/a")
+
+              (rmt:general-call 'set-test-start-time #f test-id)
+              (rmt:test-set-state-status run-id test-id "REMOTEHOSTSTART" "n/a" #f)
+	      ) ;; prime it for running
+	     ((member (db:test-get-state test-info) '("RUNNING" "REMOTEHOSTSTART"))
+	      (if (process:alive-on-host? test-host test-pid)
+		  (debug:print-error 0 *default-log-port* "test state is "  (db:test-get-state test-info) " and process " test-pid " is still running on host " test-host ", cannot proceed")
+		  (exit)))
+	     ((member (db:test-get-state test-info) '("COMPLETED"))  ;; we do NOT want to re-run COMPLETED jobs. Mark as NOT_STARTED to run!
+	      (debug:print-error 0 *default-log-port* "test state is " (db:test-get-state test-info) ", cannot proceed")
+	      (exit))
+	     ((not (member (db:test-get-state test-info) '("REMOVING" "REMOTEHOSTSTART" "RUNNING" "KILLREQ")))
+	      ;; (tests:test-force-state-status! run-id test-id "REMOTEHOSTSTART" "n/a")
+              (rmt:general-call 'set-test-start-time #f test-id)
+	      (rmt:test-set-state-status run-id test-id "REMOTEHOSTSTART" "n/a" #f))
+	     (else ;; (member (db:test-get-state test-info) '("REMOVING" "REMOTEHOSTSTART" "RUNNING" "KILLREQ"))
+	      (debug:print-error 0 *default-log-port* "test state is " (db:test-get-state test-info) ", cannot proceed")
+	      (exit))))
+
+          ;; cleanup prior execution's steps
+          (rmt:delete-steps-for-test! run-id test-id)
+          
+	  (debug:print 2 *default-log-port* "Executing " test-name " (id: " test-id ") on " (get-host-name))
+	  (set! keys       (rmt:get-keys))
+	  ;; (runs:set-megatest-env-vars run-id inkeys: keys inkeyvals: keyvals) ;; these may be needed by the launching process
+	  ;; one of these is defunct/redundant ...
+	  (if (not (launch:setup force-reread: #t))
+	      (begin
+		(debug:print 0 *default-log-port* "Failed to setup, exiting") 
+		;; (sqlite3:finalize! db)
+		;; (sqlite3:finalize! tdb)
+		(exit 1)))
+          ;; validate that the test run area is available
+          (check-work-area)
+          
+          ;; still need to go back to run area home for next couple steps
+	  (change-directory *toppath*) 
+
+	  ;; NOTE: Current order is to process runconfigs *before* setting the MT_ vars. This 
+	  ;;       seems non-ideal but could well break stuff
+	  ;;    BUG? BUG? BUG?
+	  
+	  (let ((rconfig (full-runconfigs-read)) ;; (configf:read-config (conc  *toppath* "/runconfigs.config") #f #t sections: (list "default" target))))
+		(wconfig (configf:read-config "waivers.config" #f #t sections: `( "default" ,target )))) ;; read the waivers config if it exists
+	    ;; (setup-env-defaults (conc *toppath* "/runconfigs.config") run-id (make-hash-table) keyvals target)
+	    ;; (set-run-config-vars run-id keyvals target) ;; (db:get-target db run-id))
+	    ;; Now have runconfigs data loaded, set environment vars
+	    (for-each
+	     (lambda (section)
+	       (for-each
+		(lambda (varval)
+		  (let ((var (car varval))
+			(val (cadr varval)))
+		    (if (and (string? var)(string? val))
+			(begin
+			  (safe-setenv var (configf:eval-string-in-environment val))) ;; val)
+			(debug:print-error 0 *default-log-port* "bad variable spec, " var "=" val))))
+		(configf:get-section rconfig section)))
+	     (list "default" target)))
+          ;;(bb-check-path msg: "launch:execute post block 1")
+
+	  ;; NFS might not have propagated the directory meta data to the run host - give it time if needed
+	  (let loop ((count 0))
+	    (if (or (common:file-exists? work-area)
+		    (> count 10))
+		(change-directory work-area)
+		(begin
+		  (debug:print 0 *default-log-port* "INFO: Not starting job yet - directory " work-area " not found")
+		  (thread-sleep! 10)
+		  (loop (+ count 1)))))
+
+          ;; now we can switch to the work-area?
+          (change-directory work-area)
+          ;;(bb-check-path msg: "launch:execute post block 1.5")
+	  ;; (change-directory work-area) 
+	  (set! keyvals    (keys:target->keyval keys target))
+	  ;; apply pre-overrides before other variables. The pre-override vars must not
+	  ;; clobbers things from the official sources such as megatest.config and runconfigs.config
+	  (if (string? set-vars)
+	      (let ((varpairs (string-split set-vars ",")))
+		(debug:print 4 *default-log-port* "varpairs: " varpairs)
+		(map (lambda (varpair)
+		       (let ((varval (string-split varpair "=")))
+			 (if (eq? (length varval) 2)
+			     (let ((var (car varval))
+				   (val (cadr varval)))
+			       (debug:print 1 *default-log-port* "Adding pre-var/val " var " = " val " to the environment")
+			       (setenv var val)))))
+		     varpairs)))
+          ;;(bb-check-path msg: "launch:execute post block 2")
+	  (for-each
+	   (lambda (varval)
+	     (let ((var (car varval))
+		   (val (cadr varval)))
+	       (if val
+		   (setenv var val)
+		   (begin
+		     (debug:print-error 0 *default-log-port* "required variable " var " does not have a valid value. Exiting")
+		     (exit)))))
+	     (list 
+	      (list  "MT_TEST_RUN_DIR" work-area)
+	      (list  "MT_TEST_NAME" test-name)
+	      (list  "MT_ITEM_INFO" (conc itemdat))
+	      (list  "MT_ITEMPATH"  item-path)
+	      (list  "MT_RUNNAME"   runname)
+	      (list  "MT_MEGATEST"  megatest)
+	      (list  "MT_TARGET"    target)
+	      (list  "MT_LINKTREE"  (common:get-linktree)) ;; (configf:lookup *configdat* "setup" "linktree"))
+	      (list  "MT_TESTSUITENAME" (common:get-area-name))))
+          ;;(bb-check-path msg: "launch:execute post block 3")
+
+	  (if mt-bindir-path (setenv "PATH" (conc (getenv "PATH") ":" mt-bindir-path)))
+          ;;(bb-check-path msg: "launch:execute post block 4")
+	  ;; (change-directory top-path)
+	  ;; Can setup as client for server mode now
+	  ;; (client:setup)
+
+	  
+	  ;; environment overrides are done *before* the remaining critical envars.
+	  (alist->env-vars env-ovrd)
+          ;;(bb-check-path msg: "launch:execute post block 41")
+	  (runs:set-megatest-env-vars run-id inkeys: keys inkeyvals: keyvals)
+          ;;(bb-check-path msg: "launch:execute post block 42")
+	  (set-item-env-vars itemdat)
+          ;;(bb-check-path msg: "launch:execute post block 43")
+          (let ((blacklist (configf:lookup *configdat* "setup" "blacklistvars")))
+            (if blacklist
+		(let ((vars (string-split blacklist)))
+		  (save-environment-as-files "megatest" ignorevars: vars)
+		  (for-each (lambda (var)
+			      (unsetenv var))
+			    vars))
+                (save-environment-as-files "megatest")))
+          ;;(bb-check-path msg: "launch:execute post block 44")
+	  ;; open-run-close not needed for test-set-meta-info
+	  ;; (tests:set-full-meta-info #f test-id run-id 0 work-area)
+	  ;; (tests:set-full-meta-info test-id run-id 0 work-area)
+	  (tests:set-full-meta-info #f test-id run-id 0 work-area 10)
+
+	  ;; (thread-sleep! 0.3) ;; NFS slowness has caused grief here
+
+	  (if (args:get-arg "-xterm")
+	      (set! fullrunscript "xterm")
+	      (if (and fullrunscript 
+		       (common:file-exists? fullrunscript)
+		       (not (file-executable? fullrunscript)))
+		  (system (conc "chmod ug+x " fullrunscript))))
+
+	  ;; We are about to actually kick off the test
+	  ;; so this is a good place to remove the records for 
+	  ;; any previous runs
+	  ;; (db:test-remove-steps db run-id testname itemdat)
+	  ;; now is also a good time to write the .testconfig file
+	  (let* ((tconfig-fname   (conc work-area "/.testconfig"))
+		 (tconfig-tmpfile (conc tconfig-fname ".tmp"))
+		 (tconfig         (tests:get-testconfig test-name item-path tconfigreg #t force-create: #t)) ;; 'return-procs)))
+		 (scripts (configf:get-section tconfig "scripts")))
+	    ;; create .testconfig file
+	    (configf:write-alist tconfig tconfig-tmpfile)
+	    (move-file tconfig-tmpfile tconfig-fname #t)
+	    (delete-file* ".final-status")
+
+	    ;; extract scripts from testconfig and write them to files in test run dir
+	    (for-each
+	     (lambda (scriptdat)
+	       (match scriptdat
+		      ((name content)
+		       (with-output-to-file name
+			 (lambda ()
+			   (print content)
+			   (set-file-permissions! name (bitwise-ior perm/irwxg perm/irwxu)))))
+		      (else
+		       (debug:print-info 0 "Invalid script definiton found in [scripts] section of testconfig. \"" scriptdat "\""))))
+	     scripts))
+	  ;; 
+	  (let* ((m            (make-mutex))
+		 (kill-job?    #f)
+		 (exit-info    (make-launch:einf pid: #t exit-status: #t exit-code: #t rollup-status: 0)) ;; pid exit-status exit-code (i.e. process was successfully run) rollup-status
+		 (job-thread   #f)
+		 ;; (keep-going   #t)
+		 (misc-flags   (let ((ht (make-hash-table)))
+				 (hash-table-set! ht 'keep-going #t)
+				 ht))
+		 (runit        (lambda ()
+				 (launch:manage-steps run-id test-id item-path fullrunscript ezsteps subrun test-name tconfigreg exit-info m)))
+		 (monitorjob   (lambda ()
+				 (launch:monitor-job  run-id test-id item-path fullrunscript ezsteps test-name tconfigreg exit-info m work-area runtlim misc-flags)))
+		 (th1          (make-thread monitorjob "monitor job"))
+		 (th2          (make-thread runit "run job")))
+	    (set! job-thread th2)
+	    (thread-start! th1)
+	    (thread-start! th2)
+	    (thread-join! th2)
+	    (debug:print-info 0 *default-log-port* "Megatest exectute of test " test-name ", item path " item-path " complete. Notifying the db ...")
+	    (hash-table-set! misc-flags 'keep-going #f)
+	    (thread-join! th1)
+	    (thread-sleep! 1)       ;; givbe thread th1 a chance to be done TODO: Verify this is needed. At 0.1 I was getting fail to stop, increased to total of 1.1 sec.
+	    (mutex-lock! m)
+	    (let* ((item-path (item-list->path itemdat))
+		   ;; only state and status needed - use lazy routine
+		   (testinfo  (rmt:get-testinfo-state-status run-id test-id)))
+	      ;; Am I completed?
+	      (if (member (db:test-get-state testinfo) '("REMOTEHOSTSTART" "RUNNING")) ;; NOTE: It should *not* be REMOTEHOSTSTART but for reasons I don't yet understand it sometimes gets stuck in that state ;; (not (equal? (db:test-get-state testinfo) "COMPLETED"))
+		  (let ((new-state  (if kill-job? "KILLED" "COMPLETED") ;; (if (eq? (vector-ref exit-info 2) 0) ;; exited with "good" status
+				                                        ;; "COMPLETED"							                ;; (db:test-get-state testinfo)))   ;; else preseve the state as set within the test
+				    )
+			(new-status (cond
+				     ((not (launch:einf-exit-status exit-info)) "FAIL") ;; job failed to run ... (vector-ref exit-info 1)
+				     ((eq? (launch:einf-rollup-status exit-info) 0)     ;; (vector-ref exit-info 3)
+				      ;; if the current status is AUTO then defer to the calculated value (i.e. leave this AUTO)
+				      (if (equal? (db:test-get-status testinfo) "AUTO") "AUTO" "PASS"))
+				     ((eq? (launch:einf-rollup-status exit-info) 1) "FAIL")  ;; (vector-ref exit-info 3)
+				     ((eq? (launch:einf-rollup-status exit-info) 2)	     ;;	(vector-ref exit-info 3)
+				      ;; if the current status is AUTO the defer to the calculated value but qualify (i.e. make this AUTO-WARN)
+				      (if (equal? (db:test-get-status testinfo) "AUTO") "AUTO-WARN" "WARN"))
+				     ((eq? (launch:einf-rollup-status exit-info) 3) "CHECK")
+				     ((eq? (launch:einf-rollup-status exit-info) 4) "WAIVED")
+				     ((eq? (launch:einf-rollup-status exit-info) 5) "ABORT")
+				     ((eq? (launch:einf-rollup-status exit-info) 6) "SKIP")
+				     (else "FAIL")))) ;; (db:test-get-status testinfo)))
+		    (debug:print-info 1 *default-log-port* "Test exited in state=" (db:test-get-state testinfo) ", setting state/status based on exit code of " (launch:einf-exit-status exit-info) " and rollup-status of " (launch:einf-rollup-status exit-info))
+   
+        ;; Leave a .final-status file for each sub-test
+        (tests:save-final-status run-id test-id)
+
+		    (tests:test-set-status! run-id 
+					    test-id 
+					    new-state
+					    new-status
+					    (args:get-arg "-m") #f)
+		    ;; need to update the top test record if PASS or FAIL and this is a subtest
+		    ;; NO NEED TO CALL set-state-status-and-roll-up-items HERE, THIS IS DONE IN set-state-status-and-roll-up-items called by tests:test-set-status!
+		    ))
+	      ;; for automated creation of the rollup html file this is a good place...
+	      (if (not (equal? item-path ""))
+		      (tests:summarize-items run-id test-id test-name #f))
+	      (tests:summarize-test run-id test-id)  ;; don't force - just update if no
+        ;; Leave a .final-status file for the top level test
+        (tests:save-final-status run-id test-id)
+	      (rmt:update-run-stats run-id (rmt:get-raw-run-stats run-id)))
+	    (mutex-unlock! m)
+            (runs:end-of-run-check run-id )
+	    (debug:print 2 *default-log-port* "Output from running " fullrunscript ", pid " (launch:einf-pid exit-info) " in work area " 
+			 work-area ":\n====\n exit code " (launch:einf-exit-code exit-info) "\n" "====\n")
+	    (if (not (launch:einf-exit-status exit-info))
+		(exit 4))))
+        )))
+
+;; launch:end-of-run-check moved to runs:end-of-run-check
+
+;; DO NOT USE - caching of configs is handled in launch:setup now.
+;;
+(define (launch:cache-config)
+  ;; if we have a linktree and -runtests and -target and the directory exists dump the config
+  ;; to megatest-(current-seconds).cfg and symlink it to megatest.cfg
+  (if (and *configdat* 
+	   (or (args:get-arg "-run")
+	       (args:get-arg "-runtests")
+	       (args:get-arg "-execute")))
+      (let* ((linktree (common:get-linktree)) ;; (get-environment-variable "MT_LINKTREE"))
+	     (target   (common:args-get-target exit-if-bad: #t))
+	     (runname  (or (args:get-arg "-runname")
+			   (args:get-arg ":runname")
+			   (getenv "MT_RUNNAME")))
+	     (fulldir  (conc linktree "/"
+			     target "/"
+			     runname)))
+	(if (and linktree (common:file-exists? linktree)) ;; can't proceed without linktree
+	    (begin
+	      (debug:print-info 0 *default-log-port* "Have -run with target=" target ", runname=" runname ", fulldir=" fulldir ", testpatt=" (or (args:get-arg "-testpatt") "%"))
+	      (if (not (common:file-exists? fulldir))
+		  (create-directory fulldir #t)) ;; need to protect with exception handler 
+	      (if (and target
+		       runname
+		       (common:file-exists? fulldir))
+		  (let ((tmpfile  (conc fulldir "/.megatest.cfg." (current-seconds)))
+			(targfile (conc fulldir "/.megatest.cfg-"  megatest-version "-" megatest-fossil-hash))
+			(rconfig  (conc fulldir "/.runconfig." megatest-version "-" megatest-fossil-hash)))
+		    (if (common:file-exists? rconfig) ;; only cache megatest.config AFTER runconfigs has been cached
+			(begin
+			  (debug:print-info 0 *default-log-port* "Caching megatest.config in " tmpfile)
+                          (if (not (common:in-running-test?))
+                              (configf:write-alist *configdat* tmpfile))
+			  (system (conc "ln -sf " tmpfile " " targfile))))
+		    )))
+	    (debug:print-info 1 *default-log-port* "No linktree yet, no caching configs.")))))
+
+
+;; gather available information, if legit read configs in this order:
+;;
+;;   if have cache;
+;;      read it a return it
+;;   else
+;;     megatest.config     (do not cache)
+;;     runconfigs.config   (cache if all vars avail)
+;;     megatest.config     (cache if all vars avail)
+;;   returns:
+;;     *toppath*
+;;   side effects:
+;;     sets; *configdat*    (megatest.config info)
+;;           *runconfigdat* (runconfigs.config info)
+;;           *configstatus* (status of the read data)
+;;
+(define (launch:setup #!key (force-reread #f) (areapath #f))
+  (mutex-lock! *launch-setup-mutex*)
+  (if (and *toppath*
+	   (eq? *configstatus* 'fulldata) (not force-reread)) ;; got it all
+      (begin
+	(debug:print 2 *default-log-port* "NOTE: skipping launch:setup-body call since we have fulldata")
+	(mutex-unlock! *launch-setup-mutex*)
+	*toppath*)
+      (let ((res (launch:setup-body force-reread: force-reread areapath: areapath)))
+	(mutex-unlock! *launch-setup-mutex*)
+	res)))
+
+;; return paths depending on what info is available.
+;;
+(define (launch:get-cache-file-paths areapath toppath target mtconfig)
+  (let* ((use-cache (common:use-cache?))
+         (runname  (common:args-get-runname))
+         (linktree (common:get-linktree))
+         (testname (common:get-full-test-name))
+         (rundir   (if (and runname target linktree)
+                       (common:directory-writable? (conc linktree "/" target "/" runname))
+                       #f))
+         (testdir  (if (and rundir testname)
+                       (common:directory-writable? (conc rundir "/" testname))
+                       #f))
+         (cachedir (or testdir rundir))
+         (mtcachef (and cachedir (conc cachedir "/" ".megatest.cfg-"  megatest-version "-" megatest-fossil-hash)))
+         (rccachef (and cachedir (conc cachedir "/" ".runconfigs.cfg-"  megatest-version "-" megatest-fossil-hash))))
+    (debug:print-info 6 *default-log-port* 
+                      "runname=" runname 
+                      "\n  linktree=" linktree
+                      "\n  testname=" testname
+                      "\n  rundir=" rundir 
+                      "\n  testdir=" testdir 
+                      "\n  cachedir=" cachedir
+                      "\n  mtcachef=" mtcachef
+                      "\n  rccachef=" rccachef)
+    (cons mtcachef rccachef)))
+
+(define (launch:setup-body #!key (force-reread #f) (areapath #f))
+  (if (and (eq? *configstatus* 'fulldata)
+	   *toppath*
+	   (not force-reread)) ;; no need to reprocess
+      *toppath*   ;; return toppath
+      (let* ((use-cache (common:use-cache?)) ;; BB- use-cache checks *configdat* for use-cache setting.  We do not have *configdat*.  Bootstrapping problem here.
+	     (toppath  (common:get-toppath areapath))
+	     (target   (common:args-get-target))
+	     (sections (if target (list "default" target) #f)) ;; for runconfigs
+	     (mtconfig (or (args:get-arg "-config") "megatest.config")) ;; allow overriding megatest.config 
+             (cachefiles (launch:get-cache-file-paths areapath toppath target mtconfig))
+	     ;; checking for null cachefiles should not be necessary, I was seeing error car of '(), might be a chicken bug or a red herring ...
+	     (mtcachef   (if (null? cachefiles)
+			     #f
+			     (car cachefiles))) ;; (and cachedir (conc cachedir "/" ".megatest.cfg-"  megatest-version "-" megatest-fossil-hash)))
+	     (rccachef   (if (null? cachefiles)
+			     #f
+			     (cdr cachefiles)))) ;; (and cachedir (conc cachedir "/" ".runconfigs.cfg-"  megatest-version "-" megatest-fossil-hash)))
+	      ;; (cancreate (and cachedir (common:file-exists? cachedir)(file-writable? cachedir) (not (common:in-running-test?)))))
+	(set! *toppath* toppath) ;; This is needed when we are running as a test using CMDINFO as a datasource
+        ;;(BB> "launch:setup-body -- cachefiles="cachefiles)
+	(cond
+	 ;; if mtcachef exists just read it, however we need to assume toppath is available in $MT_RUN_AREA_HOME
+	 ((and (not force-reread)
+	       mtcachef  rccachef
+	       use-cache
+	       (get-environment-variable "MT_RUN_AREA_HOME")
+	       (common:file-exists? mtcachef)
+	       (common:file-exists? rccachef))
+          ;;(BB> "launch:setup-body -- cond branch 1 - use-cache")
+          (set! *configdat*    (configf:read-alist mtcachef))
+          ;;(BB> "launch:setup-body -- 1 set! *configdat*="*configdat*)
+	  (set! *runconfigdat* (configf:read-alist rccachef))
+	  (set! *configinfo*   (list *configdat*  (get-environment-variable "MT_RUN_AREA_HOME")))
+	  (set! *configstatus* 'fulldata)
+	  (set! *toppath*      (get-environment-variable "MT_RUN_AREA_HOME"))
+	  *toppath*)
+	 ;; there are no existing cached configs, do full reads of the configs and cache them
+	 ;; we have all the info needed to fully process runconfigs and megatest.config
+	 ((and ;; (not force-reread) ;; force-reread is irrelevant in the AND, could however OR it?
+	       mtcachef
+	       rccachef) ;; BB- why are we doing this without asking if caching is desired?
+          ;;(BB> "launch:setup-body -- cond branch 2")
+	  (let* ((bigmodenv     (module-environment 'bigmod))
+		 (first-pass    (configf:find-and-read-config        ;; NB// sets MT_RUN_AREA_HOME as side effect
+				 mtconfig
+				 environ-patt: "env-override"
+				 given-toppath: toppath
+				 pathenvvar: "MT_RUN_AREA_HOME"
+				 env-to-use: bigmodenv))
+		 (first-rundat  (let ((toppath (if toppath 
+						   toppath
+						   (car first-pass))))
+				  (configf:read-config ;; (conc toppath "/runconfigs.config") ;; this should be converted to runconfig:read but it is non-trivial, leaving it for now.
+				   (conc (if (string? toppath)
+					     toppath
+					     (get-environment-variable "MT_RUN_AREA_HOME"))
+					 "/runconfigs.config")
+				   *runconfigdat* #t 
+				   sections: sections
+				   env-to-use: bigmodenv))))
+	    (set! *runconfigdat* first-rundat)
+	    (if first-pass  ;; 
+		(begin
+                  ;;(BB> "launch:setup-body -- \"first-pass\"=first-pass")
+		  (set! *configdat*  (car first-pass))
+                  ;;(BB> "launch:setup-body -- 2 set! *configdat*="*configdat*)
+		  (set! *configinfo* first-pass)
+		  (set! *toppath*    (or toppath (cadr first-pass))) ;; use the gathered data unless already have it
+		  (set! toppath      *toppath*)
+		  (if (not *toppath*)
+		      (begin
+			(debug:print-error 0 *default-log-port* "you are not in a megatest area!")
+			(exit 1)))
+		  (setenv "MT_RUN_AREA_HOME" *toppath*)
+		  ;; the seed read is done, now read runconfigs, cache it then read megatest.config one more time and cache it
+		  (let* ((keys         (common:list-or-null (rmt:get-keys)
+							    message: "Failed to retrieve keys in launch.scm. Please report this to the developers."))
+			 (key-vals     (keys:target->keyval keys target))
+			 (linktree     (common:get-linktree)) ;; (or (getenv "MT_LINKTREE")(if *configdat* (configf:lookup *configdat* "setup" "linktree") #f)))
+					;     (if *configdat*
+					; 	   (configf:lookup *configdat* "setup" "linktree")
+					; 	   (conc *toppath* "/lt"))))
+			 (second-pass  (configf:find-and-read-config
+					mtconfig
+					environ-patt: "env-override"
+					given-toppath: toppath
+					pathenvvar: "MT_RUN_AREA_HOME"
+					env-to-use: (module-environment 'bigmod)))
+			 (runconfigdat (begin     ;; this read of the runconfigs will see any adjustments made by re-reading megatest.config
+					 (for-each (lambda (kt)
+						     (setenv (car kt) (cadr kt)))
+						   key-vals)
+					 (configf:read-config (conc toppath "/runconfigs.config") *runconfigdat* #t ;; consider using runconfig:read some day ...
+						      sections: sections)))
+                         (cachefiles   (launch:get-cache-file-paths areapath toppath target mtconfig))
+                         (mtcachef     (car cachefiles))
+                         (rccachef     (cdr cachefiles)))
+                    ;;  trap exception due to stale NFS handle -- Error: (open-output-file) cannot open file - Stale NFS file handle: "/p/fdk/gwa/lefkowit/mtTesting/qa/primbeqa/links/p1222/11/PDK_r1.1.1/prim/clean/pcell_testgen/.runconfigs.cfg-1.6427-7d1e789cb3f62f9cde719a4865bb51b3c17ea853" - ticket 220546342
+                    ;; TODO - consider 1) using simple-lock to bracket cache write
+                    ;;                 2) cache in hash on server, since need to do rmt: anyway to lock.
+
+		    (if rccachef
+                        (common:fail-safe
+                         (lambda ()
+                           (configf:write-alist runconfigdat rccachef))
+                         (conc "Could not write cache file - "rccachef)))
+                    (if mtcachef
+                        (common:fail-safe
+                         (lambda ()
+                           (configf:write-alist *configdat* mtcachef))
+                         (conc "Could not write cache file - "mtcachef)))
+		    (set! *runconfigdat* runconfigdat)
+		    (if (and rccachef mtcachef) (set! *configstatus* 'fulldata))))
+		;; no configs found? should not happen but let's try to recover gracefully, return an empty hash-table
+		(set! *configdat* (make-hash-table))
+		)))
+
+	 ;; else read what you can and set the flag accordingly
+	 ;; here we don't have either mtconfig or rccachef
+	 (else
+          ;;(BB> "launch:setup-body -- cond branch 3 - else")
+	  (let* ((cfgdat   (configf:find-and-read-config 
+			    (or (args:get-arg "-config") "megatest.config")
+			    environ-patt: "env-override"
+			    given-toppath: (get-environment-variable "MT_RUN_AREA_HOME")
+			    pathenvvar: "MT_RUN_AREA_HOME"
+			    env-to-read: (module-environment 'bigmod))))
+
+            (if (and cfgdat (list? cfgdat) (> (length cfgdat) 0) (hash-table? (car cfgdat)))
+		(let* ((toppath  (or (get-environment-variable "MT_RUN_AREA_HOME")(cadr cfgdat)))
+		       (rdat     (configf:read-config (conc toppath  ;; convert this to use runconfig:read!
+						    "/runconfigs.config") *runconfigdat* #t sections: sections)))
+		  (set! *configinfo*   cfgdat)
+		  (set! *configdat*    (car cfgdat))
+		  (set! *runconfigdat* rdat)
+		  (set! *toppath*      toppath)
+		  (set! *configstatus* 'partial))
+		(begin
+		  (debug:print-error 0 *default-log-port* "No " mtconfig " file found. Giving up.")
+		  (exit 2))))))
+	;; COND ends here.
+	
+	;; additional house keeping
+	(let* ((linktree (or (common:get-linktree)
+			     (conc *toppath* "/lt"))))
+	  (if linktree
+	      (begin
+		(if (not (common:file-exists? linktree))
+		    (begin
+		      (handle-exceptions
+			  exn
+			  (begin
+			    (debug:print-error 0 *default-log-port* "Something went wrong when trying to create linktree dir at " linktree)
+			    (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn) ", exn=" exn)
+			    (exit 1))
+			(create-directory linktree #t))))
+		(handle-exceptions
+		    exn
+		    (begin
+		      (debug:print-error 0 *default-log-port* "Something went wrong when trying to create link to linktree at " *toppath*)
+		      (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn) ", exn=" exn))
+		  (let ((tlink (conc *toppath* "/lt")))
+		    (if (not (common:file-exists? tlink))
+			(create-symbolic-link linktree tlink)))))
+	      (begin
+		(debug:print-error 0 *default-log-port* "linktree not defined in [setup] section of megatest.config")
+		)))
+	(if (and *toppath*
+		 (directory-exists? *toppath*))
+	    (begin
+	      (setenv "MT_RUN_AREA_HOME" *toppath*)
+	      (setenv "MT_TESTSUITENAME" (common:get-area-name)))
+	    (begin
+	      (debug:print-error 0 *default-log-port* "failed to find the top path to your Megatest area.")
+	      (set! *toppath* #f) ;; force it to be false so we return #f
+	      #f))
+	
+        ;; one more attempt to cache the configs for future reading
+        (let* ((cachefiles   (launch:get-cache-file-paths areapath toppath target mtconfig))
+               (mtcachef     (car cachefiles))
+               (rccachef     (cdr cachefiles)))
+
+          ;; trap exception due to stale NFS handle -- Error: (open-output-file) cannot open file - Stale NFS file handle: "...somepath.../.runconfigs.cfg-1.6427-7d1e789cb3f62f9cde719a4865bb51b3c17ea853" - ticket 220546342
+          ;; TODO - consider 1) using simple-lock to bracket cache write
+          ;;                 2) cache in hash on server, since need to do rmt: anyway to lock.
+          (if (and rccachef *runconfigdat* (not (common:file-exists? rccachef)))
+              (common:fail-safe
+               (lambda ()
+                 (configf:write-alist *runconfigdat* rccachef))
+               (conc "Could not write cache file - "rccachef))
+              )
+          (if (and mtcachef *configdat*    (not (common:file-exists? mtcachef)))
+              (common:fail-safe
+               (lambda ()
+                 (configf:write-alist *configdat* mtcachef))
+               (conc "Could not write cache file - "mtcachef))
+              )
+          (if (and rccachef mtcachef *runconfigdat* *configdat*)
+              (set! *configstatus* 'fulldata)))
+
+	;; if have -append-config then read and append here
+	(let ((cfname (args:get-arg "-append-config")))
+	  (if (and cfname
+		   (file-readable? cfname))
+	      (configf:read-config cfname *configdat* #t))) ;; values are added to the hash, no need to do anything special.
+	*toppath*)))
+
+
+(define (get-best-disk confdat testconfig)
+  (let* ((disks   (or (and testconfig (hash-table-ref/default testconfig "disks" #f))
+		      (hash-table-ref/default confdat "disks" #f)))
+	 (minspace (let ((m (configf:lookup confdat "setup" "minspace")))
+		     (string->number (or m "10000")))))
+    (if disks 
+	(let ((res (common:get-disk-with-most-free-space disks minspace))) ;; min size of 1000, seems tad dumb
+	  (if res
+	      (cdr res)
+	      (begin ;; DEAD CODE PATH - REVISIT!
+;;		(if (common:low-noise-print 20 "No valid disks or no disk with enough space")
+;;		    (debug:print-error 0 *default-log-port* "No valid disks found in megatest.config. Please add some to your [disks] section and ensure the directory exists and has enough space!\n    You can change minspace in the [setup] section of megatest.config. Current setting is: " minspace))
+		;;(exit 1)
+                 (if (null? disks)
+                     (cons 1 (conc *toppath* "/runs"))
+                     (let ((paths (sort disks (lambda (x y) (> (string-length (cadr x)) (string-length (cadr y)))))))
+                       (let loop ((head (car paths)) (tail (cdr paths)))
+                         (let ((result (handle-exceptions exn
+					 (begin
+					   (debug:print 0 *default-log-port* "failed to create dir " (cadr head) ", exn=" exn)
+					   #f)
+					 (create-directory (cadr head) #t))))
+                           (if result
+                               result
+                               (if (null? tail)
+                                   (cons 1 (conc *toppath* "/runs"))
+                                   (loop (car tail) (cdr tail)))))))))))
+	;; no disks definition - use mtrah/runs, fall back to currdir/runs
+	(let* ((toppath (or *toppath*
+			    (common:get-toppath *toppath*)
+			    (begin
+			      (debug:print-error 0 *default-log-port* "Creating runs dir in current directory, this is probably not what you wanted. Please check your setup.")
+			      (current-directory))))
+	       (runsdir (conc toppath "/runs")))
+	  (if (not (file-exists? runsdir))(create-directory runsdir))
+	  runsdir)
+	))) ;; the code creates the necessary directories if it does not exist and returns the path.
+
+(define (launch:test-copy test-src-path test-path)
+  (let* ((ovrcmd (let ((cmd (configf:lookup *configdat* "setup" "testcopycmd")))
+		   (if cmd
+		       ;; substitute the TEST_SRC_PATH and TEST_TARG_PATH
+		       (string-substitute "TEST_TARG_PATH" test-path
+					  (string-substitute "TEST_SRC_PATH" test-src-path cmd #t) #t)
+		       #f)))
+	 (cmd    (if ovrcmd 
+		     ovrcmd
+		     (conc "rsync -av" (if (debug:debug-mode 1) "" "q") " " test-src-path "/ " test-path "/"
+			   " >> " test-path "/mt_launch.log 2>> " test-path "/mt_launch.log")))
+	 (status (system cmd)))
+    (if (not (eq? status 0))
+	(debug:print 2 *default-log-port* "ERROR: problem with running \"" cmd "\""))))
+
+
+;; Desired directory structure:
+;;
+;;  <linkdir> - <target> - <testname> -.
+;;                                     |
+;;                                     v
+;;  <rundir>  -  <target>  -    <testname> -|- <itempath(s)>
+;;
+;;  dir stored in test is:
+;; 
+;;  <linkdir> - <target> - <testname> [ - <itempath> ]
+;; 
+;; All log file links should be stored relative to the top of link path
+;;  
+;; <target> - <testname> [ - <itempath> ] 
+;;
+(define (create-work-area run-id run-info keyvals test-id test-src-path disk-path testname itemdat #!key (remtries 2))
+  (let* ((item-path (if (string? itemdat) itemdat (item-list->path itemdat))) ;; if pass in string - just use it
+	 (runname   (if (string? run-info) ;; if we pass in a string as run-info use it as run-name.
+			run-info
+			(db:get-value-by-header (db:get-rows run-info)
+						(db:get-header run-info)
+						"runname")))
+	 (contour   #f) ;; NOT READY FOR THIS (args:get-arg "-contour"))
+	 ;; convert back to db: from rdb: - this is always run at server end
+	 (target   (string-intersperse (map cadr keyvals) "/"))
+
+	 (not-iterated  (equal? "" item-path))
+
+	 ;; all tests are found at <rundir>/test-base or <linkdir>/test-base
+	 (testtop-base (conc target "/" runname "/" testname))
+	 (test-base    (conc testtop-base (if not-iterated "" "/") item-path))
+
+	 ;; nb// if itempath is not "" then it is prefixed with "/"
+	 (toptest-path (conc disk-path (if contour (conc "/" contour) "") "/" testtop-base))
+	 (test-path    (conc disk-path (if contour (conc "/" contour) "") "/" test-base))
+
+	 ;; ensure this exists first as links to subtests must be created there
+	 (linktree  (common:get-linktree))
+	 ;; WAS: (let ((rd (configf:lookup *configdat* "setup" "linktree")))
+	 ;;         (if rd rd (conc *toppath* "/runs"))))
+	 ;; which seems wrong ...
+
+	 (lnkbase   (conc linktree (if contour (conc "/" contour) "") "/" target "/" runname))
+	 (lnkpath   (conc lnkbase "/" testname))
+	 (lnkpathf  (conc lnkpath (if not-iterated "" "/") item-path))
+	 (lnktarget (conc lnkpath "/" item-path)))
+
+    ;; Update the rundir path in the test record for all, rundir=physical, shortdir=logical
+    ;;                                                 rundir   shortdir
+    (rmt:general-call 'test-set-rundir-shortdir run-id lnkpathf test-path testname item-path run-id)
+
+    (debug:print 2 *default-log-port* "INFO:\n       lnkbase=" lnkbase "\n       lnkpath=" lnkpath "\n  toptest-path=" toptest-path "\n     test-path=" test-path)
+    (if (not (common:file-exists? linktree))
+	(begin
+	  (debug:print 0 *default-log-port* "WARNING: linktree did not exist! Creating it now at " linktree)
+	  (create-directory linktree #t))) ;; (system (conc "mkdir -p " linktree))))
+    ;; create the directory for the tests dir links, this is needed no matter what... try up to three times
+    (let loop ((done 3)) 
+      (let ((success (if (and (not (common:directory-exists? lnkbase))
+			      (not (common:file-exists? lnkbase)))
+			 (handle-exceptions
+			  exn
+			  (begin
+			    (debug:print-error 0 *default-log-port* "Problem creating linktree base at " lnkbase ", exn=" exn)
+			    (print-error-message exn (current-error-port))
+			    #t)
+			  (create-directory lnkbase #t)
+			  #f))))
+	(if (and (not success)(> done 0))
+	    (loop (- done 1)))))
+    
+    ;; update the toptest record with its location rundir, cache the path
+    ;; This wass highly inefficient, one db write for every subtest, potentially
+    ;; thousands of unnecessary updates, cache the fact it was set and don't set it 
+    ;; again. 
+
+    ;; Now create the link from the test path to the link tree, however
+    ;; if the test is iterated it is necessary to create the parent path
+    ;; to the iteration. use pathname-directory to trim the path by one
+    ;; level
+    (if (not not-iterated) ;; i.e. iterated
+	(let ((iterated-parent  (pathname-directory (conc lnkpath "/" item-path))))
+	  (debug:print-info 2 *default-log-port* "Creating iterated parent " iterated-parent)
+	  (handle-exceptions
+	   exn
+	   (begin
+	     (debug:print-error 0 *default-log-port* " Failed to create directory " iterated-parent ((condition-property-accessor 'exn 'message) exn)
+				", continuing but link tree may be corrupted, exn=" exn)
+	     #;(exit 1))
+	   (create-directory iterated-parent #t))))
+
+    (if (symbolic-link? lnkpath) 
+	(handle-exceptions
+	 exn
+	 (begin
+	   (debug:print-error 0 *default-log-port* " Failed to remove symlink " lnkpath ((condition-property-accessor 'exn 'message) exn)
+			      ", continuing but link tree may be corrupted. exn=" exn)
+	   #;(exit 1))
+	 (delete-file lnkpath)))
+
+    (if (not (or (common:file-exists? lnkpath)
+		 (symbolic-link? lnkpath)))
+	(handle-exceptions
+	 exn
+	 (begin
+	   (debug:print-error 0 *default-log-port* " Failed to create symlink " lnkpath ((condition-property-accessor 'exn 'message) exn)
+			      ", continuing but link tree may be corrupted. exn=" exn)
+	   #;(exit 1))
+	 (create-symbolic-link toptest-path lnkpath)))
+    
+    ;; NB - This was not working right - some top tests are not getting the path set!!!
+    ;;
+    ;; Do the setting of this record after the paths are created so that the shortdir can 
+    ;; be set to the real directory location. This is safer for future clean up if the link
+    ;; tree is damaged or lost.
+    ;; 
+    (if (not (hash-table-ref/default *toptest-paths* testname #f))
+	(let* ((testinfo       (rmt:get-test-info-by-id run-id test-id)) ;;  run-id testname item-path))
+	       (curr-test-path (if testinfo ;; (filedb:get-path *fdb*
+							     ;; (db:get-path dbstruct
+				   ;; (rmt:sdb-qry 'getstr 
+				   (db:test-get-rundir testinfo) ;; ) ;; )
+				   #f)))
+	  (hash-table-set! *toptest-paths* testname curr-test-path)
+	  ;; NB// Was this for the test or for the parent in an iterated test?
+	  (rmt:general-call 'test-set-rundir-shortdir run-id lnkpath 
+			    (if (common:file-exists? lnkpath)
+				;; (resolve-pathname lnkpath)
+				(common:nice-path lnkpath)
+				lnkpath)
+			    testname "" run-id)
+	  ;; (rmt:general-call 'test-set-rundir run-id lnkpath testname "") ;; toptest-path)
+	  (if (or (not curr-test-path)
+		  (not (directory-exists? toptest-path)))
+	      (begin
+		(debug:print-info 2 *default-log-port* "Creating " toptest-path " and link " lnkpath)
+		(handle-exceptions
+		    exn
+		  (begin
+		    (debug:print 0 *default-log-port* "failed to create directory " toptest-path ", exn=" exn)
+		    #f)
+		 (create-directory toptest-path #t))
+		(hash-table-set! *toptest-paths* testname toptest-path)))))
+
+    ;; The toptest path has been created, the link to the test in the linktree has
+    ;; been created. Now, if this is an iterated test the real test dir must be created
+    (if (not not-iterated) ;; this is an iterated test
+	(begin ;; (let ((lnktarget (conc lnkpath "/" item-path)))
+	  (debug:print 2 *default-log-port* "Setting up sub test run area")
+	  (debug:print 2 *default-log-port* " - creating run area in " test-path)
+	  (handle-exceptions
+	   exn
+	   (begin
+	     (debug:print-error 0 *default-log-port* " Failed to create directory " test-path ((condition-property-accessor 'exn 'message) exn)
+				", exiting, exn=" exn)
+	     (exit 1))
+	   (create-directory test-path #t))
+	  (debug:print 2 *default-log-port* 
+		       " - creating link from: " test-path "\n"
+		       "                   to: " lnktarget)
+
+	  ;; If there is already a symlink delete it and recreate it.
+	  (handle-exceptions
+	   exn
+	   (begin
+	     (debug:print-error 0 *default-log-port* " Failed to re-create link " lnktarget ((condition-property-accessor 'exn 'message) exn) ", exiting, exn=" exn)
+	     (exit))
+	   (if (symbolic-link? lnktarget)     (delete-file lnktarget))
+	   (if (not (common:file-exists? lnktarget)) (create-symbolic-link test-path lnktarget)))))
+
+    (if (not (directory? test-path))
+	(create-directory test-path #t)) ;; this is a hack, I don't know why out of the blue this path does not exist sometimes
+
+    (if (and test-src-path (directory? test-path))
+	(begin
+	  (launch:test-copy test-src-path test-path)
+	  (list lnkpathf lnkpath ))
+	(if (and test-src-path (> remtries 0))
+	    (begin
+	      (debug:print-error 0 *default-log-port* "Failed to create work area at " test-path " with link at " lnktarget ", remaining attempts " remtries)
+	      ;; 
+	      (create-work-area run-id run-info keyvals test-id test-src-path disk-path testname itemdat remtries: (- remtries 1)))
+	    (list #f #f)))))
+
+
+(define (launch:handle-zombie-tests run-id)
+  (let* ((key (conc "zombiescan-runid-"run-id))
+         (now (current-seconds))
+         (threshold (- (current-seconds)  (* 2 (or (configf:lookup-number *configdat* "setup" "deadtime") 120))))
+         (val (rmt:get-var key))
+         (do-scan?
+          (cond
+           ((not val)
+            #t)
+           ((< val threshold)
+            #t)
+           (else #f))))
+    (when do-scan?
+      (debug:print 1 *default-log-port* "INFO: search and mark zombie tests")
+      (rmt:set-var key (current-seconds))
+      (runs:find-and-mark-incomplete-and-check-end-of-run run-id #f))))
+
+
+
+
+
+;; 1. look though disks list for disk with most space
+;; 2. create run dir on disk, path name is meaningful
+;; 3. create link from run dir to megatest runs area 
+;; 4. remotely run the test on allocated host
+;;    - could be ssh to host from hosts table (update regularly with load)
+;;    - could be netbatch
+;;      (launch-test db (cadr status) test-conf))
+(define (launch-test test-id run-id run-info keyvals runname test-conf test-name test-path itemdat params)
+  (mutex-lock! *launch-setup-mutex*) ;; setting variables and processing the testconfig is NOT thread-safe, reuse the launch-setup mutex
+  (let* ( ;; (lock-key        (conc "test-" test-id))
+	;; (got-lock        (let loop ((lock        (rmt:no-sync-get-lock lock-key))
+	;; 			     (expire-time (+ (current-seconds) 15))) ;; give up on getting the lock and steal it after 15 seconds
+	;; 		    (if (car lock)
+	;; 			#t
+	;; 			(if (> (current-seconds) expire-time)
+	;; 			    (begin
+	;; 			      (debug:print-info 0 *default-log-port* "Timed out waiting for a lock to launch test " keyvals " " runname " " test-name " " test-path)
+	;; 			      (rmt:no-sync-del! lock-key) ;; destroy the lock
+	;; 			      (loop (rmt:no-sync-get-lock lock-key) expire-time)) ;; 
+	;; 			    (begin
+	;; 			      (thread-sleep! 1)
+	;; 			      (loop (rmt:no-sync-get-lock lock-key) expire-time))))))
+	 (item-path       (item-list->path itemdat))
+	 (contour         #f)) ;; NOT READY FOR THIS (args:get-arg "-contour")))
+    (let loop ((delta        (- (current-seconds) *last-launch*))
+	       (launch-delay (configf:lookup-number *configdat* "setup" "launch-delay" default: 0)))
+      (if (> launch-delay delta)
+	  (begin
+	    (if (common:low-noise-print 1200 "test launch delay") ;; every two hours or so remind the user about launch delay.
+		(debug:print-info 0 *default-log-port* "NOTE: test launches are delayed by " launch-delay " seconds. See megatest.config launch-delay setting to adjust.")) ;; launch of " test-name " for " (- launch-delay delta) " seconds"))
+	    (thread-sleep! (- launch-delay delta))
+	    (loop (- (current-seconds) *last-launch*) launch-delay))))
+    (change-directory *toppath*)
+    (alist->env-vars ;; consolidate this code with the code in megatest.scm for "-execute", *maybe* - the longer they are set the longer each launch takes (must be non-overlapping with the vars)
+     (append
+      (list
+       (list "MT_RUN_AREA_HOME" *toppath*)
+       (list "MT_TEST_NAME" test-name)
+       (list "MT_RUNNAME"   runname)
+       (list "MT_ITEMPATH"  item-path)
+       (list "MT_CONTOUR"   contour)
+       )
+      itemdat))
+    (let* ((tregistry       (tests:get-all)) ;; third param (below) is system-allowed
+           ;; for tconfig, why do we allow fallback to test-conf?
+	   (tconfig         (or (tests:get-testconfig test-name item-path tregistry #t force-create: #t)
+				(begin
+                                  (debug:print 0 *default-log-port* "WARNING: falling back to pre-calculated testconfig. This is likely not desired.")
+                                  test-conf))) ;; force re-read now that all vars are set
+	   (useshell        (let ((ush (configf:lookup *configdat* "jobtools"     "useshell")))
+			      (if ush 
+				  (if (equal? ush "no") ;; must use "no" to NOT use shell
+				      #f
+				      ush)
+				  #t)))     ;; default is yes
+	   (runscript       (configf:lookup tconfig   "setup"        "runscript"))
+	   (ezsteps         (> (length (hash-table-ref/default tconfig "ezsteps" '())) 0)) ;; don't send all the steps, could be big, just send a flag
+	   (subrun          (> (length (hash-table-ref/default tconfig "subrun"  '())) 0)) ;; send a flag to process a subrun
+	   ;; (diskspace       (configf:lookup tconfig   "requirements" "diskspace"))
+	   ;; (memory          (configf:lookup tconfig   "requirements" "memory"))
+	   ;; (hosts           (configf:lookup *configdat* "jobtools"     "workhosts")) ;; I'm pretty sure this was never completed
+	   (remote-megatest (configf:lookup *configdat* "setup" "executable"))
+	   (run-time-limit  (or (configf:lookup  tconfig   "requirements" "runtimelim")
+				(configf:lookup  *configdat* "setup" "runtimelim")))
+	   ;; FIXME SOMEDAY: not good how this is so obtuse, this hack is to 
+	   ;;                allow running from dashboard. Extract the path
+	   ;;                from the called megatest and convert dashboard
+	   ;;             	  or dboard to megatest
+	   (local-megatest  (common:find-local-megatest))
+	   #;(local-megatest  (let* ((lm  (car (argv)))
+				   (dir (pathname-directory lm))
+				   (exe (pathname-strip-directory lm)))
+			      (conc (if dir (conc dir "/") "")
+				    (case (string->symbol exe)
+				      ((dboard)    "../megatest")
+				      ((mtest)     "../megatest")
+				      ((dashboard) "megatest")
+				      (else exe)))))
+	   (launcher        (common:get-launcher *configdat* test-name item-path)) ;; (configf:lookup *configdat* "jobtools"     "launcher"))
+	   (test-sig        (conc (common:get-area-name) ":" test-name ":" item-path)) ;; (item-list->path itemdat))) ;; test-path is the full path including the item-path
+	   (work-area       #f)
+	   (toptest-work-area #f) ;; for iterated tests the top test contains data relevant for all
+	   (diskpath   #f)
+	   (cmdparms   #f)
+	   (fullcmd    #f) ;; (define a (with-output-to-string (lambda ()(write x))))
+	   (mt-bindir-path #f)
+	   (testinfo   (rmt:get-test-info-by-id run-id test-id))
+	   (mt_target  (string-intersperse (map cadr keyvals) "/"))
+	   (debug-param (append (if (args:get-arg "-debug")  (list "-debug" (args:get-arg "-debug")) '())
+				(if (args:get-arg "-logging")(list "-logging") '())
+				(if (configf:lookup *configdat* "misc" "profilesw")
+				    (list (configf:lookup *configdat* "misc" "profilesw"))
+				    '()))))
+      ;; (if hosts (set! hosts (string-split hosts)))
+      ;; set the megatest to be called on the remote host
+      (if (not remote-megatest)(set! remote-megatest local-megatest)) ;; "megatest"))
+      (set! mt-bindir-path (pathname-directory remote-megatest))
+      (if launcher (set! launcher (string-split launcher)))
+      ;; set up the run work area for this test
+      (if (and (args:get-arg "-preclean") ;; user has requested to preclean for this run
+	       (not (member (db:test-get-rundir testinfo)(list "n/a" "/tmp/badname")))) ;; n/a is a placeholder and thus not a read dir
+	  (begin
+	    (debug:print-info 0 *default-log-port* "attempting to preclean directory " (db:test-get-rundir testinfo) " for test " test-name "/" item-path)
+	    (runs:remove-test-directory testinfo 'remove-data-only))) ;; remove data only, do not perturb the record
+      
+      ;; prevent overlapping actions - set to LAUNCHED as early as possible
+      ;;
+      ;; the following call handles waiver propogation. cannot yet condense into roll-up-pass-fail
+      (tests:test-set-status! run-id test-id "LAUNCHED" "n/a" #f #f) ;; (if launch-results launch-results "FAILED"))
+      (rmt:set-state-status-and-roll-up-items run-id test-name item-path #f "LAUNCHED" #f)
+      ;; (pp (hash-table->alist tconfig))
+      (set! diskpath (get-best-disk *configdat* tconfig))
+      (if diskpath
+	  (let ((dat  (create-work-area run-id run-info keyvals test-id test-path diskpath test-name itemdat)))
+	    (set! work-area (car dat))
+	    (set! toptest-work-area (cadr dat))
+	    (debug:print-info 2 *default-log-port* "Using work area " work-area))
+	  (begin
+	    (set! work-area (conc test-path "/tmp_run"))
+	    (create-directory work-area #t)
+	    (debug:print 0 *default-log-port* "WARNING: No disk work area specified - running in the test directory under tmp_run")))
+      (set! cmdparms (base64:base64-encode 
+		      (z3:encode-buffer 
+		       (with-output-to-string
+			 (lambda () ;; (list 'hosts     hosts)
+			   (write (list (list 'testpath  test-path)
+					;; (list 'transport (conc *transport-type*))
+					;; (list 'serverinf *server-info*)
+					#;(list 'homehost  (let* ((hhdat (common:get-homehost)))
+							   (if hhdat
+							       (car hhdat)
+							       #f)))
+					;; (list 'serverurl (if *runremote*
+					;; 		     (remote-server-url *runremote*)
+					;; 		     #f)) ;;
+					(list 'areaname  (common:get-area-name))
+					(list 'toppath   *toppath*)
+					(list 'work-area work-area)
+					(list 'test-name test-name) 
+					(list 'runscript runscript) 
+					(list 'run-id    run-id   )
+					(list 'test-id   test-id  )
+					;; (list 'item-path item-path )
+					(list 'itemdat   itemdat  )
+					(list 'megatest  remote-megatest)
+					(list 'ezsteps   ezsteps)
+					(list 'subrun    subrun)
+					(list 'target    mt_target)
+					(list 'contour   contour)
+					(list 'runtlim   (if run-time-limit (common:hms-string->seconds run-time-limit) #f))
+					(list 'env-ovrd  (hash-table-ref/default *configdat* "env-override" '())) 
+					(list 'set-vars  (if params (hash-table-ref/default params "-setvars" #f)))
+					(list 'runname   runname)
+					(list 'mt-bindir-path mt-bindir-path))))))))
+      
+      ;; clean out step records from previous run if they exist
+      ;; (rmt:delete-test-step-records run-id test-id)
+      ;; if the dir does not exist we may have a itempath where individual variables are a path, launch anyway
+      (if (common:file-exists? work-area)
+	  (change-directory work-area)) ;; so that log files from the launch process don't clutter the test dir
+      (cond
+       ;; ((and launcher hosts) ;; must be using ssh hostname
+       ;;    (set! fullcmd (append launcher (car hosts)(list remote-megatest "-m" test-sig "-execute" cmdparms) debug-param)))
+       ;; (set! fullcmd (append launcher (car hosts)(list remote-megatest test-sig "-execute" cmdparms))))
+       (launcher
+	(set! fullcmd (append launcher (list remote-megatest "-m" test-sig "-execute" cmdparms) debug-param)))
+       ;; (set! fullcmd (append launcher (list remote-megatest test-sig "-execute" cmdparms))))
+       (else
+	(if (not useshell)(debug:print 0 *default-log-port* "WARNING: internal launching will not work well without \"useshell yes\" in your [jobtools] section"))
+	(set! fullcmd (append (list remote-megatest "-m" test-sig "-execute" cmdparms) debug-param (list (if useshell "&" ""))))))
+      ;; (set! fullcmd (list remote-megatest test-sig "-execute" cmdparms (if useshell "&" "")))))
+      (if (args:get-arg "-xterm")(set! fullcmd (append fullcmd (list "-xterm"))))
+      (debug:print 1 *default-log-port* "Launching " work-area)
+      ;; set pre-launch-env-vars before launching, keep the vars in prevvals and put the envionment back when done
+      (debug:print 4 *default-log-port* "fullcmd: " fullcmd)
+      (set! *last-launch* (current-seconds)) ;; all that junk above takes time, set this as late as possible.
+      (let* ((commonprevvals (alist->env-vars
+			      (hash-table-ref/default *configdat* "env-override" '())))
+	     (miscprevvals   (alist->env-vars ;; consolidate this code with the code in megatest.scm for "-execute"
+			      (append (list (list "MT_TEST_RUN_DIR" work-area)
+					    (list "MT_TEST_NAME" test-name)
+					    (list "MT_ITEM_INFO" (conc itemdat)) 
+					    (list "MT_RUNNAME"   runname)
+					    (list "MT_TARGET"    mt_target)
+					    (list "MT_ITEMPATH"  item-path)
+					    )
+				      itemdat)))
+	     (testprevvals   (alist->env-vars
+			      (hash-table-ref/default tconfig "pre-launch-env-overrides" '())))
+	     ;; Launchwait defaults to true, must override it to turn off wait
+	     (launchwait     (if (equal? (configf:lookup *configdat* "setup" "launchwait") "no") #f #t))
+	     (launch-results-prev (apply (if launchwait ;; BB: TODO: refactor this to examine return code of launcher, if nonzero, set state to launch failed.
+					     process:cmd-run-with-stderr-and-exitcode->list
+					     process-run)
+					 (if useshell
+					     (let ((cmdstr (string-intersperse fullcmd " ")))
+					       (if launchwait
+						   cmdstr
+						   (conc cmdstr " >> mt_launch.log 2>&1 &")))
+					     (car fullcmd))
+					 (if useshell
+					     '()
+					     (cdr fullcmd))))
+             (success        (if launchwait (equal? 0 (cadr launch-results-prev)) #t))
+             (launch-results (if launchwait (car launch-results-prev) launch-results-prev)))
+        (if (not success)
+            (tests:test-set-status! run-id test-id "COMPLETED" "DEAD" "launcher failed; exited non-zero; check mt_launch.log" #f)) ;; (if launch-results launch-results "FAILED"))
+        (mutex-unlock! *launch-setup-mutex*) ;; yes, really should mutex all the way to here. Need to put this entire process into a fork.
+	;; (rmt:no-sync-del! lock-key)         ;; release the lock for starting this test
+	(if (not launchwait) ;; give the OS a little time to allow the process to start
+	    (thread-sleep! 0.01))
+	(with-output-to-file "mt_launch.log"
+	  (lambda ()
+	    (print "LAUNCHCMD: " (string-intersperse fullcmd " "))
+	    (if (list? launch-results)
+		(apply print launch-results)
+		(print "NOTE: launched \"" fullcmd "\"\n  but did not wait for it to proceed. Add the following to megatest.config \n[setup]\nlaunchwait yes\n  if you have problems with this"))
+	    #:append))
+	(debug:print 2 *default-log-port* "Launching completed, updating db")
+	(debug:print 2 *default-log-port* "Launch results: " launch-results)
+	(if (not launch-results)
+	    (begin
+	      (print "ERROR: Failed to run " (string-intersperse fullcmd " ") ", exiting now")
+	      ;; (sqlite3:finalize! db)
+	      ;; good ole "exit" seems not to work
+	      ;; (_exit 9)
+	      ;; but this hack will work! Thanks go to Alan Post of the Chicken email list
+	      ;; NB// Is this still needed? Should be safe to go back to "exit" now?
+	      (process-signal (current-process-id) signal/kill)
+	      ))
+	(alist->env-vars miscprevvals)
+	(alist->env-vars testprevvals)
+	(alist->env-vars commonprevvals)
+	launch-results))
+    (change-directory *toppath*)
+    (thread-sleep! (configf:lookup-number *configdat* "setup" "inter-test-delay" default: 0.0))))
+
+;; recover a test where the top controlling mtest may have died
+;;
+(define (launch:recover-test run-id test-id)
+  ;; this function is called on the test run host via ssh
+  ;;
+  ;; 1. look at the process from pid
+  ;;    - is it owned by calling user
+  ;;    - it it's run directory correct for the test
+  ;;    - is there a controlling mtest (maybe stuck)
+  ;; 2. if recovery is needed watch pid
+  ;;    - when it exits take the exit code and do the needful
+  ;;
+  (let* ((pid (rmt:test-get-top-process-pid run-id test-id))
+	 (psres (with-input-from-pipe
+		 (conc "ps -F -u " (current-user-name) " | grep -E '" pid " ' | grep -v 'grep -E " pid "'")
+		 (lambda ()
+		   (read-line))))
+	 (rundir (if (string? psres) ;; real process owned by user
+		     (read-symbolic-link (conc "/proc/" pid "/cwd"))
+		     #f)))
+    ;; now wait on that process if all is correct
+    ;; periodically update the db with runtime
+    ;; when the process exits look at the db, if still RUNNING after 10 seconds set
+    ;; state/status appropriately
+    (process-wait pid)))
+
+
+(define (runs:remove-test-directory test mode) ;; remove-data-only)
+  (let* ((run-dir       (db:test-get-rundir test))    ;; run dir is from the link tree
+	 (real-dir      (if (common:file-exists? run-dir)
+			    ;; (resolve-pathname run-dir)
+			    (common:nice-path run-dir)
+			    #f))
+         (clean-mode    (or mode 'remove-all))
+         (test-id       (db:test-get-id test))
+        ;; (lock-key      (conc "test-" test-id))
+        ;; (got-lock      (let loop ((lock        (rmt:no-sync-get-lock lock-key))
+	;; 			     (expire-time (+ (current-seconds) 30))) ;; give up on getting the lock and steal it after 15 seconds
+	;; 		    (if (car lock)
+	;; 			#t
+	;; 			(if (> (current-seconds) expire-time)
+	;; 			    (begin
+	;; 			      (debug:print-info 0 *default-log-port* "Timed out waiting for a lock to clean test with id " test-id)
+	;; 			      (rmt:no-sync-del! lock-key) ;; destroy the lock
+	;; 			      (loop (rmt:no-sync-get-lock lock-key) expire-time)) ;; 
+	;; 			    (begin
+	;; 			      (thread-sleep! 1)
+	 ;; 			      (loop (rmt:no-sync-get-lock lock-key) expire-time)))))))
+	 )
+    (case clean-mode
+      ((remove-data-only)(mt:test-set-state-status-by-id (db:test-get-run_id test)(db:test-get-id test) "CLEANING" "LOCKED" #f))
+      ((remove-all)      (mt:test-set-state-status-by-id (db:test-get-run_id test)(db:test-get-id test) "REMOVING" "LOCKED" #f))
+      ((archive-remove)  (mt:test-set-state-status-by-id (db:test-get-run_id test)(db:test-get-id test) "ARCHIVE_REMOVING" #f #f)))
+    (debug:print-info 1 *default-log-port* "Attempting to remove " (if real-dir (conc " dir " real-dir " and ") "") " link " run-dir)
+    (if (and real-dir 
+	     (> (string-length real-dir) 5)
+	     (common:file-exists? real-dir)) ;; bad heuristic but should prevent /tmp /home etc.
+	(let* ((realpath (realpath run-dir)))
+	  (debug:print-info 1 *default-log-port* "Recursively removing " realpath)
+	  (if (common:file-exists? realpath)
+	      (runs:safe-delete-test-dir realpath)
+	      (debug:print 0 *default-log-port* "WARNING: test dir " realpath " appears to not exist or is not readable")))
+	(if real-dir 
+	    (debug:print 0 *default-log-port* "WARNING: directory " real-dir " does not exist")
+	    (debug:print 0 *default-log-port* "WARNING: no real directory corrosponding to link " run-dir ", nothing done")))
+    (if (symbolic-link? run-dir)
+	(begin
+	  (debug:print-info 1 *default-log-port* "Removing symlink " run-dir)
+	  (handle-exceptions
+	   exn
+	   (debug:print-error 0 *default-log-port* " Failed to remove symlink " run-dir ((condition-property-accessor 'exn 'message) exn) ", attempting to continue, exn=" exn)
+	   (delete-file run-dir)))
+	(if (directory? run-dir)
+	    (if (> (directory-fold (lambda (f x)(+ 1 x)) 0 run-dir) 0)
+		(debug:print 0 *default-log-port* "WARNING: refusing to remove " run-dir " as it is not empty")
+		(handle-exceptions
+		 exn
+		 (debug:print-error 0 *default-log-port* " Failed to remove directory " run-dir ((condition-property-accessor 'exn 'message) exn) ", attempting to continue, exn=" exn)
+		 (delete-directory run-dir)))
+	    (if (and run-dir
+		     (not (member run-dir (list "n/a" "/tmp/badname"))))
+		(debug:print 0 *default-log-port* "WARNING: not removing " run-dir " as it either doesn't exist or is not a symlink")
+		(debug:print 0 *default-log-port* "NOTE: the run dir for this test is undefined. Test may have already been deleted."))
+	    ))
+    ;; Only delete the records *after* removing the directory. If things fail we have a record 
+    (case clean-mode
+      ((remove-data-only)(mt:test-set-state-status-by-id (db:test-get-run_id test)(db:test-get-id test) (db:test-get-state test)(db:test-get-status test) #f))
+      ((archive-remove)  (mt:test-set-state-status-by-id (db:test-get-run_id test)(db:test-get-id test) "ARCHIVED" #f #f))
+      (else (rmt:delete-test-records (db:test-get-run_id test) (db:test-get-id test))))
+    ;; (rmt:no-sync-del! lock-key)
+    ))
+
+(define (runs:recursive-delete-with-error-msg real-dir)
+  (if (> (system (conc "rm -rf " real-dir)) 0)
+      (begin
+	;; FAILED, possibly due to permissions, do chmod a+rwx then try one more time
+	(system (conc "chmod -R a+rwx " real-dir))
+	(if (> (system (conc "rm -rf " real-dir)) 0)
+	    (debug:print-error 0 *default-log-port* "There was a problem removing " real-dir " with rm -f")))))
+
+(define (runs:safe-delete-test-dir real-dir)
+  ;; first delete all sub-directories
+  (directory-fold 
+   (lambda (f x)
+     (let ((fullname (conc real-dir "/" f)))
+       (if (directory? fullname)(runs:recursive-delete-with-error-msg fullname)))
+     (+ 1 x))
+   0 real-dir)
+  ;; then files other than *testdat.db*
+  (directory-fold 
+   (lambda (f x)
+     (let ((fullname (conc real-dir "/" f)))
+       (if (not (string-search (regexp "testdat.db") f))
+	   (runs:recursive-delete-with-error-msg fullname)))
+     (+ 1 x))
+   0 real-dir #t)
+  ;; then the entire directory
+  (runs:recursive-delete-with-error-msg real-dir))
+
+
+;;======================================================================
+;; ideally put all this info into the db, no need to preserve it across moving homehost
+;;
+;; return list of
+;;  ( reachable? cpuload update-time )
+(define (common:get-host-info hostname)
+  (let* ((loadinfo                         (rmt:get-latest-host-load hostname)) ;; if this host happens to have been recently used by a test reuse the load data
+         (load                             (car loadinfo))
+         (load-sample-time                 (cdr loadinfo))
+         (load-sample-age                  (- (current-seconds) load-sample-time))
+         (loadinfo-timeout-seconds         6) ;; this was 20 seconds, seems way too lax. Switch to 6 seconds
+         (host-last-update-timeout-seconds 4)
+         (host-rec (hash-table-ref/default *host-loads* hostname #f))
+         )
+    (cond
+     ((< load-sample-age loadinfo-timeout-seconds)
+      (list #t
+            load-sample-time
+            load))
+     ((and host-rec
+           (< (current-seconds) (+ (host-last-update host-rec) host-last-update-timeout-seconds)))
+      (list #t
+            (host-last-update host-rec)
+            (host-last-cpuload host-rec )))
+     ((common:unix-ping hostname)
+      (list #t
+            (current-seconds)
+            (alist-ref 'adj-core-load (common:get-normalized-cpu-load hostname)))) ;; this is cheaper than you might think. get-normalized-cpu-load is cached for up to 5 seconds
+     (else
+      (list #f 0 -1) ;; bad host, don't use!
+      ))))
+
+;;======================================================================
+;; see defstruct host at top of file.
+;;    host: reachable last-update last-used last-cpuload
+;;
+(define (common:update-host-loads-table hosts-raw)
+  (let* ((hosts (filter (lambda (x)
+                          (string-match (regexp "^\\S+$") x))
+                        hosts-raw)))
+    (for-each
+     (lambda (hostname)
+       (let* ((rec       (let ((h (hash-table-ref/default *host-loads* hostname #f)))
+                          (if h
+                              h
+                              (let ((h (make-host)))
+                                (hash-table-set! *host-loads* hostname h)
+                                h))))
+              (host-info         (common:get-host-info hostname))
+              (is-reachable      (car host-info))
+              (last-reached-time (cadr host-info))
+              (load              (caddr host-info)))
+         (host-reachable-set!    rec is-reachable)
+         (host-last-update-set!  rec last-reached-time)
+         (host-last-cpuload-set! rec load)))
+     hosts)))
+
+
+;;======================================================================
+;;  T E S T   L A U N C H I N G   P E R   I T E M   W I T H   H O S T   T Y P E S
+;;======================================================================
+;; 
+;; [hosts]
+;; arm cubie01 cubie02
+;; x86_64 zeus xena myth01
+;; allhosts #{g hosts arm} #{g hosts x86_64}
+;; 
+;; [host-types]
+;; general #MTLOWESTLOAD #{g hosts allhosts}
+;; arm     #MTLOWESTLOAD #{g hosts arm}
+;; nbgeneral nbjob run JOBCOMMAND -log $MT_LINKTREE/$MT_TARGET/$MT_RUNNAME.$MT_TESTNAME-$MT_ITEM_PATH.lgo
+;;
+;; [host-rules]
+;; # maxnload   => max normalized load
+;; # maxnjobs   => max jobs per cpu
+;; # maxjobrate => max jobs per second
+;; general maxnload=1.1; maxnjobs=1.2; maxjobrate=0.1 
+;; 
+;; [launchers]
+;; envsetup general
+;; xor/%/n 4C16G
+;; % nbgeneral
+;; 
+;; [jobtools]
+;; # if defined and not "no" flexi-launcher will bypass "launcher" unless no match.
+;; flexi-launcher yes  
+;; launcher nbfake
+;;
+(define (common:get-launcher configdat testname itempath)
+  (let ((fallback-launcher (configf:lookup configdat "jobtools" "launcher")))
+    (if (and (configf:lookup configdat "jobtools" "flexi-launcher") ;; overrides launcher
+	     (not (equal? (configf:lookup configdat "jobtools" "flexi-launcher") "no")))
+	(let* ((launchers         (hash-table-ref/default configdat "launchers" '())))
+	  (if (null? launchers)
+	      fallback-launcher
+	      (let loop ((hed (car launchers))
+			 (tal (cdr launchers)))
+		(let ((patt      (car hed))
+		      (host-type (cadr hed)))
+		  (if (tests:match patt testname itempath)
+		      (begin
+			(debug:print-info 2 *default-log-port* "Have flexi-launcher match for " testname "/" itempath " = " host-type)
+			(let ((launcher (configf:lookup configdat "host-types" host-type)))
+			  (if launcher
+			      (let* ((launcher-parts (string-split launcher))
+				     (launcher-exe   (car launcher-parts)))
+				(if (equal? launcher-exe "#MTLOWESTLOAD") ;; this is our special case, we will find the lowest load and craft a nbfake commandline
+				    (let host-loop ((targ-host (common:get-least-loaded-host (cdr launcher-parts) host-type configdat))
+						    (count     100))
+				      (if targ-host
+					  (conc "remrun " targ-host)
+					  (if (> count 0)
+					      (begin
+						(debug:print 0 *default-log-port* "INFO: Waiting for a host for host-type " host-type)
+						(thread-sleep! (- 101 count))
+						(host-loop (common:get-least-loaded-host (cdr launcher-parts) host-type configdat)
+							   (- count 1)))
+					      (begin
+						(debug:print 0 *default-log-port* "FATAL: Failed to find a host from #MTLOWESTLOAD for host-type " host-type)
+						(exit)))))
+				    launcher))
+			      (begin
+				(debug:print-info 0 *default-log-port* "WARNING: no launcher found for host-type " host-type)
+				(if (null? tal)
+				    fallback-launcher
+				    (loop (car tal)(cdr tal)))))))
+		      ;; no match, try again
+		      (if (null? tal)
+			  fallback-launcher
+			  (loop (car tal)(cdr tal))))))))
+	fallback-launcher)))
+
+;;======================================================================
+;; go through the hosts from least recently used to most recently used, pick the first that meets the load criteral from the
+;; [host-rules] section.
+;;
+(define (common:get-least-loaded-host hosts-raw host-type configdat)
+  (let* ((rdat       (configf:lookup configdat "host-rules" host-type))
+	 (rules      (common:val->alist (or rdat "") convert: #t))   ;; maxnload, maxnjobs, maxjobrate
+	 (maxnload   (common:alist-ref/default 'maxnload rules 1.5)) ;; max normalized load
+	 (maxnjobs   (common:alist-ref/default 'maxnjobs rules 1.5)) ;; max normalized number of jobs
+	 (maxjobrate (common:alist-ref/default 'maxjobrate rules (/ 1 6))) ;; max rate of submitting jobs to a given host in jobs/second
+	 (hosts      (filter (lambda (x)
+			       (string-match (regexp "^\\S+$") x))
+			     hosts-raw))
+         ;; (best-host #f)
+	 (get-rec    (lambda (hostname)
+		       ;; (print "get-rec hostname=" hostname)
+		       (let ((h (hash-table-ref/default *host-loads* hostname #f)))
+			 (if h
+			     h
+			     (let ((h (make-host)))
+			       (hash-table-set! *host-loads* hostname h)
+			       h)))))
+         (best-load 99999)
+         (curr-time (current-seconds))
+	 (get-hosts-sorted (lambda (hosts)
+			     (sort hosts (lambda (a b)
+					   (let ((a-rec (get-rec a))
+						 (b-rec (get-rec b)))
+					     ;; (print "a=" a " a-rec=" a-rec " host-last-used=" (host-last-used a-rec))
+					     ;; (print "b=" b " b-rec=" b-rec " host-last-used=" (host-last-used b-rec))
+					     (< (host-last-used a-rec)
+						(host-last-used b-rec))))))))
+    (debug:print 0 *default-log-port* "INFO: hosts-sorted=" (get-hosts-sorted hosts))
+    (if (null? hosts)
+	#f ;; no hosts to select from. All done and giving up now.
+	(let ((hosts-sorted (get-hosts-sorted hosts)))
+	  (common:update-host-loads-table hosts)
+	  (let loop ((hostname  (car hosts-sorted))
+		     (tal       (cdr hosts-sorted))
+		     (best-host #f))
+	    (let* ((rec       (get-rec hostname))
+		   (reachable (host-reachable     rec))
+		   (load      (host-last-cpuload  rec))
+		   (last-used (host-last-used     rec))
+		   (delta     (- curr-time last-used))
+		   (job-rate  (if (> delta 0)
+				  (/ 1 delta)
+				  999)) ;; jobs per second
+		   (new-best  
+		    (cond
+		     ((not reachable)
+		      (debug:print 0 *default-log-port* "Skipping host " hostname " as it cannot be reached.")
+		      best-host)
+		     ((and (< load maxnload)        ;; load is acceptable
+			   (< job-rate maxjobrate)) ;; job rate is acceptable
+		      (set! best-load load)
+		      hostname)
+		     (else best-host))))
+	      (debug:print 0 *default-log-port* "INFO: Trying host " hostname " with load " load ", last used " delta " seconds ago, with job-rate " job-rate " for running a test." )
+	      (if new-best
+		  (begin ;; found a host, return it
+		    (debug:print 0 *default-log-port* "INFO: Found host: " new-best " load: " load " last-used: " delta " seconds ago, with job-rate: " job-rate)
+		    (host-last-used-set! rec curr-time)
+		    new-best)
+		  (if (null? tal) #f (loop (car tal)(cdr tal) best-host)))))))))
+
+
+;; Spec for End of test
+;; At end of each test call, after marking self as COMPLETED do run-state-status-rollup
+;; At transition to run COMPLETED/X do hooks
+;; Definition: test_dead if event_time + duration + 1 minute? < current_time AND
+;; we can prove the process is not alive (ssh host pstree -A pid)
+;; if dead safe to mark the test as killed in the db
+;; State/status table
+;; new
+;; 100% COMPLETED/ (PASS,FAIL,ABORT etc.) ==> COMPLETED / X where X is same as itemized rollup
+;; > 3 RUNNING with not test_dead do nothing (run should already be RUNNING/ na
+;; > 0 RUNNING and test_dead then send KILLREQ ==> COMPLETED
+;; 0 RUNNING ==> this is actually the first condition, should not get here
+
+(define (runs:end-of-run-check run-id )
+  (let* ((not-completed-cnt (rmt:get-not-completed-cnt run-id))  
+	 (running-cnt (rmt:get-count-tests-running-for-run-id run-id))
+	 (all-test-launched (rmt:get-var (conc "lunch-complete-" run-id)))
+	 (current-state (rmt:get-run-state run-id))
+	 (current-status (rmt:get-run-status run-id)))
+    ;;get-vars run-id to query metadata table to check if all completed. if all-test-launched = yes then only not-completed-cnt = 0 means everyting is completed if no entry found in the table do nothing 
+    (debug:print 0 *default-log-port* "Running test cnt :" running-cnt)                      
+    (rmt:set-state-status-and-roll-up-run  run-id current-state current-status)
+    (runs:update-junit-test-reporter-xml run-id) 
+    (cond 
+     ((and all-test-launched (eq? not-completed-cnt 0) (equal? all-test-launched "yes" ))
+      (if (and (equal? (rmt:get-var (conc "end-of-run-" run-id)) "no") (common:simple-lock (conc "endOfRun" run-id)))
+	  (begin
+	    (debug:print 4 *default-log-port* "look for  post hook. currseconds: " (current-seconds) " EOR " (rmt:get-var (conc "end-of-run-" run-id)))
+	    (debug:print 0 *default-log-port* "End of Run Detected.")
+	    (rmt:set-var (conc "end-of-run-" run-id) "yes")
+					;(thread-sleep! 10)
+	    (runs:run-post-hook run-id)
+	    (debug:print 4 *default-log-port* "currseconds: " (current-seconds)" eor: " (rmt:get-var (conc "end-of-run-" run-id)))
+	    (common:simple-unlock (conc "endOfRun" run-id)))
+	  (debug:print 0 *default-log-port* "End of Run Detected but not running post hook. This should happen when eor is set to yes. This will happen only when 2 tests exit at smae time. eor= " (rmt:get-var (conc "end-of-run-" run-id)))))
+     ((> running-cnt 3) 
+      (debug:print 0 *default-log-port* "There are " running-cnt " tests running." ))
+     ((> running-cnt 0)
+      (debug:print 0 *default-log-port* "running cnt > 0 but <= 3 kill-running-tests-if-dead" )
+      (let ((kill-cnt (launch:kill-tests-if-dead run-id)))
+	(if (and all-test-launched  (equal? all-test-launched "yes") (eq? kill-cnt running-cnt))
+	    (runs:end-of-run-check run-id)))) ;;todo
+     (else  (debug:print 0 *default-log-port* "Should it get here?? May be everything is not launched yet. Running test cnt:" running-cnt " Not completed test cnt:" not-completed-cnt)
+	    (let* ((not-completed-tests (rmt:get-tests-for-run run-id "%" `("NOT_STARTED" "RUNNING" "LAUNCHED" "REMOTEHOSTSTART") `() #f #f #f #f #f #f #f #f)))
+	      (if (> (length not-completed-tests) 0) 
+		  (let loop ((running-test (car not-completed-tests))
+			     (tal    (cdr not-completed-tests)))
+		    (let* ((test-name (vector-ref running-test 2))
+			   (item-path (vector-ref running-test 11)))
+		      (debug:print 0 *default-log-port* "test " test-name "/" item-path " not completed")
+		      (if (not (null? tal))
+			  (loop (car tal) (cdr tal)))))))))))
+
+(define (runs:find-and-mark-incomplete-and-check-end-of-run run-id ovr-deadtime)
+  (rmt:find-and-mark-incomplete run-id ovr-deadtime)
+  (runs:end-of-run-check run-id))
+
+
+
+(define (launch:kill-tests-if-dead run-id)
+  (let* ((running-tests (rmt:get-tests-for-run run-id "%" `("RUNNING" "LAUNCHED" "REMOTEHOSTSTART") `() #f #f #f #f #f #f #f #f)))
+       (let loop ((running-test (car running-tests))
+			     (tal    (cdr running-tests))
+			     (kill-cnt 0))
+		       (let* ((test-name (vector-ref running-test 2))
+                 (item-path (vector-ref running-test 11))
+								 (test-id (vector-ref running-test 0))
+                 (host (vector-ref running-test 6))
+                 (pid  (rmt:test-get-top-process-pid run-id test-id))   
+                 (event-time (vector-ref running-test 5))
+                 (duration (vector-ref running-test 12))
+                 (flag 0)   
+                 (curr-time (current-seconds)))
+       (if (and (< (+ event-time duration 600) curr-time) (not (launch:is-test-alive host pid))) ;;test has not updated duration in last 10 min then likely its not running but confirm before marking it as killed
+           (begin    
+			       	(debug:print 0 *default-log-port* "test " test-name "/" item-path " needs to be killed")
+              (set! flag 1) 
+              (rmt:set-state-status-and-roll-up-items run-id test-name item-path "KILLREQ" "n/a" #f)))
+               (if (not (null? tal))
+				  (loop (car tal) (cdr tal) (+ kill-cnt flag))
+                 (+ kill-cnt flag))))))
+
+
+(define (runs:run-post-hook run-id)
+    (let* ((run-post-hook   (configf:lookup *configdat* "runs" "post-hook"))
+           (existing-tests (if run-post-hook
+                               (rmt:get-tests-for-run run-id "%" '() '() ;; run-id testpatt states statuses
+                                                      #f #f ;; offset limit
+                                                      #f ;; not-in
+                                                      #f ;; sort-by
+                                                      #f ;; sort-order
+                                                      #f ;; get full data (not 'shortlist)
+                                                      0 ;; (runs:gendat-inc-results-last-update *runs:general-data*) ;; last update time
+                                                      'dashboard)
+                               '()))
+           (log-dir         (conc *toppath* "/logs"))
+           (log-file        (conc "post-hook-" (string-translate (getenv "MT_TARGET") "/" "-") "-" (getenv "MT_RUNNAME") ".log"))
+           (full-log-fname  (conc log-dir "/" log-file)))
+      (if run-post-hook
+          ;; (if (null? existing-tests)
+          ;;    (debug:print 0 *default-log-port* "Skipping post-hook call \"" run-post-hook "\" as there are existing tests for this run.")))))
+	  (let* ((use-log-dir (if (not (directory-exists? log-dir))
+				  (handle-exceptions
+				      exn
+				      (begin
+					(debug:print 0 *default-log-port* "WARNING: Failed to create " log-dir ", exn=" exn)
+					#f)
+				    (create-directory log-dir #t)
+				    #t)
+				  #t))
+		 (start-time   (current-seconds))
+		 (actual-logf  (if use-log-dir full-log-fname log-file)))
+	    (handle-exceptions
+		exn
+		(begin
+		  (print-call-chain *default-log-port*)
+		  (debug:print 0 *default-log-port* "Message: " ((condition-property-accessor 'exn 'message) exn) ", exn=" exn)
+		  (debug:print 0 *default-log-port* "ERROR: failed to run post-hook " run-post-hook ", check the log " log-file))
+	      (debug:print-info 0 *default-log-port* "running run-post-hook: \"" run-post-hook "\", log is " actual-logf)
+	      (system (conc run-post-hook " >> " actual-logf " 2>&1"))
+	      (debug:print-info 0 *default-log-port* "post-hook \"" run-post-hook "\" took " (- (current-seconds) start-time) " seconds to run."))))))
+
+
+(define (runs:rerun-hook test-id new-test-path testdat rerunlst)
+    (let* ((rerun-hook   (configf:lookup *configdat* "runs" "rerun-hook"))
+           (log-dir         (conc *toppath* "/reruns/logs"))
+           (target (getenv "MT_TARGET"))
+           (runname (common:args-get-runname))
+           (rundir (db:test-get-rundir testdat))
+           (tarfiledir (conc *toppath* "/reruns"))
+           (status (db:test-get-status testdat))
+           (comment (conc "\"" (db:test-get-comment testdat) "\"" ))
+           (testname (db:test-get-testname testdat))
+           (itempath (db:test-get-item-path testdat))
+           (file-body (conc status "-" (string-translate target "/" "-") "-" runname "." testname (if (not (string=? itempath "")) (conc  "." (string-translate itempath "/" "-")) "")))
+           (log-file (conc file-body ".log"))
+           ;; (log-file        (conc status "-" (string-translate target "/" "-") "-" runname "." testname (if (not (string=? itempath "")) (conc  "." (string-translate itempath "/" "-")) "") ".log"))
+           (full-log-fname  (conc log-dir "/" log-file))
+           (tarfilename (conc file-body ".tar"))
+           ;; (tarfilename (conc status "." (string-translate target "/" "-") "." runname "." testname (if (not (string=? itempath "")) (conc  "." (string-translate itempath "/" "-")) "") ".tar"))
+           )
+      (if rerun-hook
+	  (let* ((use-log-dir (if (not (directory-exists? log-dir))
+				  (handle-exceptions
+				      exn
+				      (begin
+					(debug:print 0 *default-log-port* "WARNING: Failed to create " log-dir ", exn=" exn)
+					#f)
+				    (create-directory log-dir #t)
+				    #t)
+				  #t))
+		 (start-time   (current-seconds))
+		 (actual-logf  (if use-log-dir full-log-fname log-file))
+                 (sys-call-text (conc rerun-hook " " tarfilename " " rundir " " actual-logf " " runname " " tarfiledir " " status " " target " " comment " " testname " " itempath " >> " actual-logf " 2>&1"))
+                 )
+	    (debug:print 2 *default-log-port* "Found rerun-hook in config:" rerun-hook)
+	    (handle-exceptions
+		exn
+		(begin
+		  (print-call-chain *default-log-port*)
+		  (debug:print 0 *default-log-port* "Message: " ((condition-property-accessor 'exn 'message) exn) ", exn=" exn)
+		  (debug:print 0 *default-log-port* "ERROR: failed to run rerun-hook " rerun-hook ", check the log " log-file))
+	      (debug:print-info 0 *default-log-port* "running rerun-hook: \"" rerun-hook "\", log is " actual-logf)
+              ;; call the hook
+              (debug:print-info 0 *default-log-port* "Calling rerun-hook for " test-id new-test-path testdat rerunlst)
+              (debug:print-info 0 *default-log-port* "rerun hook: " rerun-hook)
+              (debug:print-info 0 *default-log-port* "tarfilename: " tarfilename)
+              (debug:print-info 0 *default-log-port* "rundir: " rundir)
+              (debug:print-info 0 *default-log-port* "actual-logf: " actual-logf)
+              (debug:print-info 0 *default-log-port* "runname: " runname)
+              (debug:print-info 0 *default-log-port* "sys-call-text: " sys-call-text)
+	      (system sys-call-text)
+	      (debug:print-info 0 *default-log-port* "rerun-hook \"" rerun-hook "\" took " (- (current-seconds) start-time) " seconds to run."))))))
+
+
+(define (runs:update-junit-test-reporter-xml run-id)
+  (let*	((junit-test-reporter	(configf:lookup *configdat* "runs" "junit-test-reporter-xml"))
+	 (junit-test-report-dir  (configf:lookup *configdat* "runs" "junit-test-report-dir"))
+	 (xml-dir		(if (and junit-test-reporter (equal? junit-test-reporter "yes" ))
+				    (if junit-test-report-dir
+					junit-test-report-dir
+					(conc (getenv "MT_LINKTREE") "/" (getenv "MT_TARGET") "/" (getenv "MT_RUNNAME")))
+				    #f))
+	 (xml-ts-name		(if xml-dir
+				    (conc (getenv "MT_TESTSUITENAME")"."(string-translate (getenv "MT_TARGET") "/" ".") "." (getenv "MT_RUNNAME"))
+				    #f))
+         (keyname               (if xml-ts-name (common:get-signature xml-ts-name) #f))
+	 (xml-path		(if xml-dir
+				    (conc xml-dir "/" keyname ".xml")
+				    #f))
+
+	 (test-data		(if xml-dir
+				    (rmt:get-tests-for-run run-id "%" '() '() ;; run-id testpatt states statuses
+							   #f #f ;; offset limit
+							   #f ;; not-in
+							   #f ;; sort-by
+							   #f ;; sort-order
+							   #f ;; get full data (not 'shortlist)
+							   0 ;; (runs:gendat-inc-results-last-update *runs:general-data*) ;; last update time
+							   #f)
+				    '()))
+	 (tests-count		(if xml-dir (length test-data) #f)))
+    (if (and junit-test-reporter (equal? junit-test-reporter "yes" ))
+	(begin
+					;((sxml-modify! `("testsuite" insert-into (@ (name ,xml-ts-name) (tests ,tests-count)))) doc)
+
+	  (let loop	((test		(car test-data))
+			 (tail		(cdr test-data))
+			 (doc		doc-template)
+			 (fail-cnt	0)
+			 (error-cnt	0))
+	    (let*	((test-name	(vector-ref test 2))
+			 (test-itempath	(vector-ref test 11))
+			 (tc-name	(conc test-name (if (and test-itempath (not (equal? test-itempath ""))) (conc "." (string-translate test-itempath "/" "." )) "")))
+			 (test-state	(vector-ref test 3))
+			 (comment	(vector-ref test 14))   
+			 (test-status	(vector-ref test 4))
+			 (exc-msg	(conc "No bucket for State " test-state " Status " test-status))
+			 (new-doc	(cond 
+					 ((member test-state (list "RUNNING" ))
+					  ((sxml-modify `("testsuite" insert-into (testcase (@ (name ,tc-name)) (inProgress)))) doc))
+					 ((member test-state (list "LAUNCHED" "REMOTEHOSTSTART"  "NOT_STARTED"))
+					  ((sxml-modify `("testsuite" insert-into (testcase (@ (name ,tc-name)) (inQueue)))) doc))
+					 ((member test-status (list "PASS" "WARN" "WAIVED"))
+					  ((sxml-modify `("testsuite" insert-into (testcase (@ (name ,tc-name))))) doc))
+					 ((member test-status (list "FAIL" "CHECK"))
+					  ((sxml-modify `("testsuite" insert-into (testcase (@ (name ,tc-name)) (failure (@ (message ,comment) (type "failure")))))) doc)) 
+					 ((member test-status (list "DEAD" "KILLED" "ABORT" "PREQ_FAIL" "PREQ_DISCARDED"))
+					  ((sxml-modify `("testsuite" insert-into (testcase (@ (name ,tc-name)) (failure (@ (message ,comment) (type "error")))))) doc))
+					 ((member test-status (list "SKIP"))
+					  ((sxml-modify `("testsuite" insert-into (testcase (@ (name ,tc-name)) (skipped (@ (type "skipped")))))) doc))
+					 (else 
+					  (debug:print 0 *default-log-port* (conc "What do I do with State " test-state " Status " test-status))
+					  ((sxml-modify `("testsuite" insert-into (testcase (@ (name ,tc-name)) (failure (@ (message ,exc-msg) (type "error")))))) doc))))
+			 (new-error-cnt	(if (member test-status (list "DEAD" "KILLED" "ABORT" "PREQ_FAIL" "PREQ_DISCARDED"))
+					    (+ error-cnt 1) 
+					    error-cnt))
+			 (new-fail-cnt	(if (member test-status (list "FAIL" "CHECK"))
+					    (+ fail-cnt 1)
+					    fail-cnt)))
+ 	      (if (null? tail)
+		    (let* ((final-doc ((sxml-modify `("testsuite" insert-into (@ (name ,xml-ts-name) (tests ,tests-count) (errors ,error-cnt) (failures ,fail-cnt)))) new-doc)))
+		    (debug:print 0 *default-log-port* "modify attrib error=" error-cnt " fail= " fail-cnt)
+		    (handle-exceptions
+		     exn
+		     (let*	((msg	((condition-property-accessor 'exn 'message) exn)))
+		       (debug:print 0 *default-log-port* (conc "WARNING: Failed to update file" xml-path". Message:" msg ", exn=" exn)))
+		     		   
+		     (if (not (file-exists? xml-dir)) 
+			 (create-directory xml-dir #t))
+                     (if (not (rmt:no-sync-get/default keyname #f)) 
+                       (begin
+			 (rmt:no-sync-set  keyname "on")
+			 (debug:print 0 *default-log-port* "creating xml at " xml-path)
+		         (with-output-to-file xml-path
+		         (lambda ()
+			   (print (sxml-serializer#serialize-sxml final-doc  ns-prefixes: (list (cons 'gnm "http://foo"))))))
+                           (rmt:no-sync-del! keyname))
+                          (debug:print 0 *default-log-port*  "Could not get the lock. Skip writing the xml file."))))
+		  (loop (car tail) (cdr tail) new-doc new-fail-cnt new-error-cnt))))))))
+	 
+(define doc-template 
+  '(*TOP*
+    (*PI* xml "version='1.0'")
+    (testsuite)))
+
+(define (set-item-env-vars itemdat)
+  (for-each (lambda (item)
+	      (debug:print 2 *default-log-port* "setenv " (car item) " " (cadr item))
+	      (setenv (car item) (cadr item)))
+	    itemdat))
+
+;; set up needed environment variables given a run-id and optionally a target, itempath etc.
+;;
+(define (runs:set-megatest-env-vars run-id #!key (inkeys #f)(inrunname #f)(inkeyvals #f)(intarget #f)(testname #f)(itempath #f))
+  ;;(bb-check-path msg: "runs:set-megatest-env-vars entry")
+  (let* ((target    (or intarget 
+			(common:args-get-target)
+			(get-environment-variable "MT_TARGET")))
+	 (keys      (if inkeys    inkeys    (common:get-fields *configdat*) #;(rmt:get-keys)))
+	 (keyvals   (if inkeyvals inkeyvals (keys:target->keyval keys target)))
+	 (vals      (hash-table-ref/default *env-vars-by-run-id* run-id #f))
+	 (link-tree (common:get-linktree))) ;; (configf:lookup *configdat* "setup" "linktree")))
+    (if testname (setenv "MT_TEST_NAME" testname))
+    (if itempath (setenv "MT_ITEMPATH"  itempath))
+
+    ;; get the info from the db and put it in the cache
+    (if link-tree
+	(setenv "MT_LINKTREE" link-tree)
+	(debug:print-error 0 *default-log-port* "linktree not set, should be set in megatest.config in [setup] section."))
+    (if (not vals)
+	(let ((ht (make-hash-table)))
+	  (hash-table-set! *env-vars-by-run-id* run-id ht)
+	  (set! vals ht)
+	  (for-each
+	   (lambda (key)
+	     (hash-table-set! vals (car key) (cadr key)))
+	   keyvals)))
+    ;; from the cached data set the vars
+    
+    (hash-table-for-each
+     vals
+     (lambda (key val)
+       (debug:print 2 *default-log-port* "setenv " key " " val)
+       (safe-setenv key val)))
+    ;;(bb-check-path msg: "runs:set-megatest-env-vars block 1")
+    ;;(BB> "*env-vars-by-run-id*/runid("run-id" vals="(hash-table->alist vals))
+
+    (if (not (get-environment-variable "MT_TARGET"))(setenv "MT_TARGET" target))
+    ;; we had a case where there was an exception generated by the hash-table-ref
+    ;; due to *configdat* being #f Adding a handle and exit
+    (let fatal-loop ((count 0)) 
+      (handle-exceptions
+	  exn
+	  (let ((call-chain (get-call-chain))
+		(msg        ((condition-property-accessor 'exn 'message) exn)))
+	    (if (< count 5)
+		(begin ;; this call is colliding, do some crude stuff to fix it.
+		  (debug:print 0 *default-log-port* "ERROR: *configdat* was inaccessible! This should never happen. Retry #" count
+			       ", exn=" exn)
+		  (launch:setup force-reread: #t)
+		  (fatal-loop (+ count 1))) 
+		(begin
+		  (debug:print 0 *default-log-port* "FATAL: *configdat* was inaccessible! This should never happen. Retried " count
+			       " times. Message: " msg)
+		  (debug:print 0 *default-log-port* "Call chain:")
+		  (with-output-to-port *default-log-port*
+
+                    (lambda ()
+                      (print "*configdat* is >>"*configdat*"<<")
+                      (pp *configdat*)
+                      (pp call-chain)))
+                  
+		  (exit 1))))
+          ;;(bb-check-path msg: "runs:set-megatest-env-vars block 1.5")
+          (when (or (not *configdat*) (not (hash-table? *configdat*)))
+              (debug:print 0 *default-log-port* "WARNING: *configdat* was inaccessible! This should never happen.  Brute force reread.")
+              ;;(BB> "ERROR: *configdat* was inaccessible! This should never happen.  Brute force reread.")
+              (thread-sleep! 2) ;; assuming nfs lag.
+              (launch:setup force-reread: #t))
+          (alist->env-vars (hash-table-ref/default *configdat* "env-override" '())))) ;;;; environment is tainted HERE in this let block.
+    ;;(bb-check-path msg: "runs:set-megatest-env-vars block 2")
+    ;; Lets use this as an opportunity to put MT_RUNNAME in the environment
+    (let ((runname  (if inrunname inrunname (rmt:get-run-name-from-id run-id))))
+      (if runname
+	  (setenv "MT_RUNNAME" runname)
+	  (debug:print-error 0 *default-log-port* "no value for runname for id " run-id)))
+    (setenv "MT_RUN_AREA_HOME" *toppath*)
+    ;; if a testname and itempath are available set the remaining appropriate variables
+    (if testname (setenv "MT_TEST_NAME" testname))
+    (if itempath (setenv "MT_ITEMPATH"  itempath))
+    ;;(bb-check-path msg: "runs:set-megatest-env-vars block 3")
+    (if (and testname link-tree)
+	(setenv "MT_TEST_RUN_DIR" (conc (getenv "MT_LINKTREE")  "/"
+					(getenv "MT_TARGET")    "/"
+					(getenv "MT_RUNNAME")   "/"
+					(getenv "MT_TEST_NAME")
+					(if (and itempath
+						 (not (equal? itempath "")))
+					    (conc "/" itempath)
+					    ""))))))
+
+  
+;; cache the runconfigs in $MT_LINKTREE/$MT_TARGET/$MT_RUNNAME/.runconfig
+;;
+(define (full-runconfigs-read)
+  ;; in the envprocessing branch the below code replaces the further below code
+  ;;  (if (eq? *configstatus* 'fulldata)
+  ;;      *runconfigdat*
+  ;;      (begin
+  ;;	(launch:setup)
+  ;;	*runconfigdat*)))
+  (let* ((rundir (if (and (getenv "MT_LINKTREE")(getenv "MT_TARGET")(getenv "MT_RUNNAME"))
+		     (conc (getenv "MT_LINKTREE") "/" (getenv "MT_TARGET") "/" (getenv "MT_RUNNAME"))
+		     #f))
+	 (cfgf   (if rundir (conc rundir "/.runconfig." megatest-version "-" megatest-fossil-hash) #f)))
+    (if (and cfgf
+	     (file-exists? cfgf)
+	     (file-writable? cfgf)
+	     (common:use-cache?))
+	(configf:read-alist cfgf) ;; use the cached file
+	(let* ((keys   (common:get-fields *configdat*))     ;; (rmt:get-keys))
+	       (target (common:args-get-target))
+	       (key-vals (if target (keys:target->keyval keys target) #f))
+	       (sections (if target (list "default" target) #f))
+	       (data     (begin
+			   (setenv "MT_RUN_AREA_HOME" *toppath*)
+			   (if key-vals
+			       (for-each (lambda (kt)
+					   (setenv (car kt) (cadr kt)))
+					 key-vals))
+			   ;; (configf:read-config (conc *toppath* "/runconfigs.config") #f #t sections: sections))))
+			   (runconfig:read (conc *toppath* "/runconfigs.config") target #f))))
+	  (if (and rundir ;; have all needed variabless
+		   (directory-exists? rundir)
+		   (file-writable? rundir))
+	      (begin
+		(if (not (common:in-running-test?))
+		    (configf:write-alist data cfgf))
+		;; force re-read of megatest.config - this resolves circular references between megatest.config
+		(launch:setup force-reread: #t)
+		;; (launch:cache-config) ;; there are two independent config cache locations, turning this one off for now. MRW.
+		)) ;; we can safely cache megatest.config since we have a valid runconfig
+	  data))))
+
+;;======================================================================
+;; TODO: for multiple areas, we will have multiple watchdogs; and multiple threads to manage
+(define (common:watchdog)
+  (debug:print-info 13 *default-log-port* "common:watchdog entered.")
+  #;(if (launch:setup)
+      (if (common:on-homehost?)
+	  (let ((dbstruct (db:setup #t)))
+	    (debug:print-info 13 *default-log-port* "after db:setup with dbstruct=" dbstruct)
+	    (cond
+	     ((dbr:dbstruct-read-only dbstruct)
+	      (debug:print-info 13 *default-log-port* "loading read-only watchdog")
+	      (common:readonly-watchdog dbstruct))
+	     (else
+	      (debug:print-info 13 *default-log-port* "loading writable-watchdog.")
+              (let* ((syncer (or (configf:lookup *configdat* "server" "sync-method") "brute-force-sync")))
+                (cond
+                 ((equal? syncer "brute-force-sync")
+                  (server:writable-watchdog-bruteforce dbstruct))
+                 ((equal? syncer "delta-sync")
+                  (server:writable-watchdog-deltasync dbstruct))
+                 (else
+                  (debug:print-error 0 *default-log-port* "Unknown server/sync-method specified ("syncer") - valid values are brute-force-sync and delta-sync.")
+                  (exit 1)))
+                ;;(debug:print 1 *default-log-port* "INFO: ["(common:human-time)"] Syncer started (method="syncer")")
+                )))
+	    (debug:print-info 13 *default-log-port* "watchdog done."))
+	  (debug:print-info 13 *default-log-port* "no need for watchdog on non-homehost"))))
+
+;;======================================================================
+;; currently the primary job of the watchdog is to run the sync back to megatest.db from the db in /tmp
+;; if we are on the homehost and we are a server (by definition we are on the homehost if we are a server)
+;;
+(define (common:readonly-watchdog dbstruct)
+  #f)
+
+#;(define (common:readonly-watchdog dbstruct)
+  (let ((just-testing 0.0501))
+    (thread-sleep! just-testing)) ;; (/ 1 20)) ;; 0.051) ;; delay for startup
+  (debug:print-info 13 *default-log-port* "common:readonly-watchdog entered.")
+  ;; sync megatest.db to /tmp/.../megatst.db
+  (let* ((sync-cool-off-duration   3)
+        (golden-mtdb     (dbr:dbstruct-mtdb dbstruct))
+        (golden-mtpath   (db:dbdat-get-path golden-mtdb))
+        (tmp-mtdb        (dbr:dbstruct-tmpdb dbstruct))
+        (tmp-mtpath      (db:dbdat-get-path tmp-mtdb)))
+    (debug:print-info 0 *default-log-port* "Read-only periodic sync thread started.")
+    (let loop ((last-sync-time 0))
+      (debug:print-info 13 *default-log-port* "loop top tmp-mtpath="tmp-mtpath" golden-mtpath="golden-mtpath)
+      (let* ((duration-since-last-sync (- (current-seconds) last-sync-time)))
+        (debug:print-info 13 *default-log-port* "duration-since-last-sync="duration-since-last-sync)
+        (if (and (not (bdat-time-to-exit *bdat*))
+                 (< duration-since-last-sync sync-cool-off-duration))
+            (thread-sleep! (- sync-cool-off-duration duration-since-last-sync)))
+        (if (not (bdat-time-to-exit *bdat*))
+            (let ((golden-mtdb-mtime (file-modification-time golden-mtpath))
+                  (tmp-mtdb-mtime    (file-modification-time tmp-mtpath)))
+	      (if (> golden-mtdb-mtime tmp-mtdb-mtime)
+		  (if (< golden-mtdb-mtime (- (current-seconds) 3)) ;; file has NOT been touched in past three seconds, this way multiple servers won't fight to sync back
+		      (let ((res (db:multi-db-sync dbstruct 'old2new)))
+			(debug:print-info 13 *default-log-port* "rosync called, " res " records transferred."))))
+              (loop (current-seconds)))
+            #t)))
+    (debug:print-info 0 *default-log-port* "Exiting readonly-watchdog timer, (bdat-time-to-exit *bdat*) = " (bdat-time-to-exit *bdat*)" pid="(current-process-id)" mtpath="golden-mtpath)))
+
+
+;; TODO: for multiple areas, we will have multiple watchdogs; and multiple threads to manage
+(define (init-watchdog)
+  (bdat-watchdog-set! *bdat*
+		      (make-thread
+		       (lambda ()
+			 (handle-exceptions
+			  exn
+			  (begin
+			    (print-call-chain)
+			    (print " message: " ((condition-property-accessor 'exn 'message) exn) ", exn=" exn))
+			  (common:watchdog)))
+		       "Watchdog thread"))
+  (start-watchdog))
+
+(define (start-watchdog)
+  ;;(if (not (args:get-arg "-server"))
+  ;;    (thread-start! *watchdog*)) ;; if starting a server; wait till we get to running state before kicking off watchdog
+  (let* ((no-watchdog-args
+	  '("-list-runs"
+	    "-testdata-csv"
+	    "-list-servers"
+	    "-server"
+	    "-adjutant"
+	    "-list-disks"
+	    "-list-targets"
+	    "-show-runconfig"
+	    ;;"-list-db-targets"
+	    "-show-runconfig"
+	    "-show-config"
+	    "-show-cmdinfo"
+	    "-cleanup-db"
+	    ))
+	 (no-watchdog-argvals            (list '("-archive" . "replicate-db")))
+	 (start-watchdog-special-arg-val (let loop ((hed  (car no-watchdog-argvals))
+						    (tail (cdr  no-watchdog-argvals)))
+					   ;; (print "hed" hed " arg " (args:get-arg (car hed)) " val:" (cdr hed)  " eql" (equal? (args:get-arg (car hed)) (cdr hed)))  
+					   (if (equal? (args:get-arg (car hed)) (cdr hed))
+					       #f
+					       (if (null? tail)
+						   #t
+						   (loop (car tail) (cdr tail))))))      
+	 (no-watchdog-args-vals (filter (lambda (x) x)
+					(map args:get-arg no-watchdog-args)))
+	 (start-watchdog (and (null? no-watchdog-args-vals) start-watchdog-special-arg-val)))
+    ;; (print  "no-watchdog-args="no-watchdog-args "no-watchdog-args-vals="no-watchdog-args-vals " start-watchdog-special-arg-val:" start-watchdog-special-arg-val " start-watchdog:" start-watchdog) 
+    (if start-watchdog
+	(thread-start! (bdat-watchdog *bdat*)))))
+
+(define (server:writable-watchdog-deltasync dbstruct)
+  #f)
+#;(define (server:writable-watchdog-deltasync dbstruct)
+  (thread-sleep! 0.054) ;; delay for startup
+  (let ((legacy-sync  (common:run-sync?))
+        (sync-stale-seconds (configf:lookup-number *configdat* "server" "sync-stale-seconds" default: 300))
+	(debug-mode   (debug:debug-mode 1))
+	(last-time    (current-seconds))
+	(no-sync-db   (db:open-no-sync-db))
+	(stmt-cache   (dbr:dbstruct-stmt-cache dbstruct))
+        (sync-duration 0) ;; run time of the sync in milliseconds
+        )
+    (set! *no-sync-db* no-sync-db) ;; make the no sync db available to api calls
+    (debug:print-info 2 *default-log-port* "Periodic sync thread started.")
+    (debug:print-info 3 *default-log-port* "watchdog starting. legacy-sync is " legacy-sync" pid="(current-process-id)  );;  " this-wd-num="this-wd-num)
+    (if (and legacy-sync (not (bdat-time-to-exit *bdat*)))
+	(let* (;;(dbstruct (db:setup))
+	       (mtdb       (dbr:dbstruct-mtdb dbstruct))
+	       (mtpath     (db:dbdat-get-path mtdb))
+	       (tmp-area   (common:get-db-tmp-area))
+	       (start-file (conc tmp-area "/.start-sync"))
+	       (end-file   (conc tmp-area "/.end-sync")))
+	  (debug:print-info 0 *default-log-port* "Server running, periodic sync started.")
+	  (let loop ()
+	    ;; sync for filesystem local db writes
+	    ;;
+	    (mutex-lock! *db-multi-sync-mutex*)
+	    (let* ((need-sync        (>= *db-last-access* *db-last-sync*)) ;; no sync since last write
+		   (sync-in-progress *db-sync-in-progress*)
+                   (min-intersync-delay (configf:lookup-number *configdat* "server" "minimum-intersync-delay" default: 5))
+		   (should-sync      (and (not (bdat-time-to-exit *bdat*))
+                                          (> (- (current-seconds) *db-last-sync*) min-intersync-delay))) ;; sync every five seconds minimum, deprecated logic, can probably be removed
+		   (start-time       (current-seconds))
+                   (cpu-load-adj     (alist-ref 'adj-proc-load (common:get-normalized-cpu-load #f)))
+		   (mt-mod-time      (file-modification-time mtpath))
+		   (last-sync-start  (if (common:file-exists? start-file)
+					 (file-modification-time start-file)
+					 0))
+		   (last-sync-end    (if (common:file-exists? end-file)
+					 (file-modification-time end-file)
+					 10))
+                   (sync-period      (+ 3 (* cpu-load-adj 30))) ;; as adjusted load increases increase the sync period
+		   (recently-synced  (and (< (- start-time mt-mod-time) sync-period) ;; not useful if sync didn't modify megatest.db!
+					  (< mt-mod-time last-sync-start)))
+		   (sync-done        (<= last-sync-start last-sync-end))
+                   (sync-stale       (> start-time (+ last-sync-start sync-stale-seconds)))
+		   (will-sync        (and (not (bdat-time-to-exit *bdat*))       ;; do not start a sync if we are in the process of exiting
+                                          (or need-sync should-sync)
+					  (or sync-done sync-stale)
+					  (not sync-in-progress)
+					  (not recently-synced))))
+              (debug:print-info 13 *default-log-port* "WD writable-watchdog top of loop.  need-sync="need-sync" sync-in-progress=" sync-in-progress
+				" should-sync="should-sync" start-time="start-time" mt-mod-time="mt-mod-time" recently-synced="recently-synced" will-sync="will-sync
+				" sync-done=" sync-done " sync-period=" sync-period)
+              (if (and (> sync-period 5)
+                       (common:low-noise-print 30 "sync-period"))
+                  (debug:print-info 0 *default-log-port* "Increased sync period due to long sync times, sync took: " sync-period " seconds."))
+	      ;; (if recently-synced (debug:print-info 0 *default-log-port* "Skipping sync due to recently-synced flag=" recently-synced))
+	      ;; (debug:print-info 0 *default-log-port* "need-sync: " need-sync " sync-in-progress: " sync-in-progress " should-sync: " should-sync " will-sync: " will-sync)
+	      (if will-sync (set! *db-sync-in-progress* #t))
+	      (mutex-unlock! *db-multi-sync-mutex*)
+	      (if will-sync
+                  (let (;; (max-sync-duration  (configf:lookup-number *configdat* "server" "max-sync-duration")) ;; KEEPING THIS AVAILABLE BUT SHOULD NOT USE, I'M PRETTY SURE IT DOES NOT WORK!
+                        (sync-start         (current-milliseconds)))
+		    (with-output-to-file start-file (lambda ()(print (current-process-id))))
+		    
+		    ;; put lock here
+		    
+                    ;; (if (or (not max-sync-duration)
+                    ;;        (< sync-duration max-sync-duration)) ;; NOTE: db:sync-to-megatest.db keeps track of time of last sync and syncs incrementally
+                        (let ((res        (db:sync-to-megatest.db dbstruct no-sync-db: no-sync-db))) ;; did we sync any data? If so need to set the db touched flag to keep the server alive
+                          (set! sync-duration (- (current-milliseconds) sync-start))
+                          (if (> res 0) ;; some records were transferred, keep the db alive
+                              (begin
+                                (mutex-lock! *heartbeat-mutex*)
+                                (set! *db-last-access* (current-seconds))
+                                (mutex-unlock! *heartbeat-mutex*)
+                                (debug:print-info 0 *default-log-port* "sync called, " res " records transferred."))
+                              (debug:print-info 2 *default-log-port* "sync called but zero records transferred")))))
+;;                         ;; TODO: factor this next routine out into a function
+;;                         (with-input-from-pipe ;; this should not block other threads but need to verify this
+;;                          (conc "megatest -sync-to-megatest.db -m testsuite:" (common:get-area-name) ":" *toppath*)
+;;                          (lambda ()
+;;                            (let loop ((inl (read-line))
+;;                                       (res #f))
+;;                              (if (eof-object? inl)
+;;                                  (begin
+;;                                    (set! sync-duration (- (current-milliseconds) sync-start))
+;;                                    (cond
+;;                                     ((not res)
+;;                                      (debug:print 0 *default-log-port* "ERROR: sync from /tmp db to megatest.db appears to have failed. Recommended that you stop your runs and run \"megatest -cleanup-db\""))
+;;                                     ((> res 0)
+;;                                      (mutex-lock! *heartbeat-mutex*)
+;;                                      (set! *db-last-access* (current-seconds))
+;;                                      (mutex-unlock! *heartbeat-mutex*))))
+;;                                  (let ((num-synced (let ((matches (string-match "^Synced (\\d+).*$" inl)))
+;;                                                      (if matches
+;;                                                          (string->number (cadr matches))
+;;                                                          #f))))
+;;                                    (loop (read-line)
+;;                                          (or num-synced res))))))))))
+	      (if will-sync
+		  (begin
+		    (mutex-lock! *db-multi-sync-mutex*)
+		    (set! *db-sync-in-progress* #f)
+		    (set! *db-last-sync* start-time)
+		    (with-output-to-file end-file (lambda ()(print (current-process-id))))
+
+		    ;; release lock here
+
+		    (mutex-unlock! *db-multi-sync-mutex*)))
+	      (if (and debug-mode
+		       (> (- start-time last-time) 60))
+		  (begin
+		    (set! last-time start-time)
+		    (debug:print-info 4 *default-log-port* "timestamp -> " (seconds->time-string (current-seconds)) ", time since start -> " (seconds->hr-min-sec (- (current-seconds) *time-zero*))))))
+	    
+	    ;; keep going unless time to exit
+	    ;;
+	    (if (not (bdat-time-to-exit *bdat*))
+		(let delay-loop ((count 0))
+                  ;;(debug:print-info 13 *default-log-port* "delay-loop top; count="count" pid="(current-process-id)" this-wd-num="this-wd-num" *time-to-exit*="(bdat-time-to-exit *bdat*))
+                                                            
+		  (if (and (not (bdat-time-to-exit *bdat*))
+			   (< count 6)) ;; was 11, changing to 4. 
+		      (begin
+			(thread-sleep! 1)
+			(delay-loop (+ count 1))))
+		  (if (not (bdat-time-to-exit *bdat*)) (loop))))
+	    ;; time to exit, close the no-sync db here
+	    (db:no-sync-close-db no-sync-db stmt-cache)
+	    (if (common:low-noise-print 30)
+		(debug:print-info 0 *default-log-port* "Exiting watchdog timer, *time-to-exit* = " (bdat-time-to-exit *bdat*)" pid="(current-process-id) ))))))) ;;" this-wd-num="this-wd-num)))))))
+
+(define (server:writable-watchdog-bruteforce dbstruct)
+  (thread-sleep! 1) ;; delay for startup
+  (let* ((do-a-sync  (server:get-bruteforce-syncer dbstruct))
+         (final-sync (server:get-bruteforce-syncer dbstruct fork-to-background: #t persist-until-sync: #t)))
+    (when (and (not (args:get-arg "-sync-to-megatest.db")) ;; conditions under which we do not run the sync
+	       (args:get-arg "-server"))
+      
+      (let loop ()
+	(do-a-sync)
+        (if (not (bdat-time-to-exit *bdat*)) (loop))) ;; keep going unless time to exit
+
+      ;; time to exit, close the no-sync db here
+      (final-sync)
+
+      (if (common:low-noise-print 30)
+	  (debug:print-info 0 *default-log-port* "Exiting watchdog timer, *time-to-exit* = "(bdat-time-to-exit *bdat*)" pid="(current-process-id)
+			    )))))
+
+;; moving this here as it needs access to db and cannot be in common.
+;;
+
+(define (server:get-bruteforce-syncer dbstruct #!key (fork-to-background #f) (persist-until-sync #f))
+  (let* ((sqlite-exe   (or (get-environment-variable "MT_SQLITE3_EXE"))) ;; defined in cfg.sh
+         (sync-log     (or (args:get-arg "-sync-log") (conc *toppath* "/logs/sync-" (current-process-id) "-" (get-host-name) ".log")))
+	 (tmp-area     (common:get-db-tmp-area))
+	 (tmp-db       (conc tmp-area "/megatest.db"))
+	 (staging-file (conc *toppath* "/.megatest.db"))
+	 (mtdbfile     (conc *toppath* "/megatest.db"))
+	 (lockfile     (common:get-sync-lock-filepath))
+         (sync-cmd-core     (conc sqlite-exe" " tmp-db " .dump | "sqlite-exe" " staging-file "&>"sync-log))
+         (sync-cmd     (if fork-to-background 
+                           (conc "/usr/bin/env NBFAKE_LOG="*toppath*"/logs/last-server-sync-"(current-process-id)".log nbfake \""sync-cmd-core" && /bin/mv -f " staging-file " " mtdbfile" \"")
+                           sync-cmd-core))
+         (default-min-intersync-delay 2)
+	 (min-intersync-delay (configf:lookup-number *configdat* "server" "minimum-intersync-delay" default: default-min-intersync-delay))
+         (default-duty-cycle 0.1)
+         (duty-cycle   (configf:lookup-number *configdat* "server" "sync-duty-cycle" default: default-duty-cycle))
+         (last-sync-seconds 10) ;; we will adjust this to a measurement and delay last-sync-seconds * (1 - duty-cycle)
+         (calculate-off-time (lambda (work-duration duty-cycle)
+                                  (* (/ (- 1 duty-cycle) duty-cycle) last-sync-seconds)))
+         (off-time min-intersync-delay) ;; adjusted in closure below.
+         (do-a-sync
+          (lambda ()
+            ;; (BB> "Start do-a-sync with fork-to-background="fork-to-background" persist-until-sync="persist-until-sync)
+            (let* ((finalres
+                    (let retry-loop ((num-tries 0))
+                         (if (common:simple-file-lock lockfile)
+	                     (begin
+                               (cond
+                                ((not (or fork-to-background persist-until-sync))
+                                 (debug:print 0 *default-log-port* "INFO: syncer thread sleeping for max of (server.minimum-intersync-delay="min-intersync-delay
+                                              " , off-time="off-time" seconds ]")
+                                 (thread-sleep! (max off-time min-intersync-delay)))
+                                (else
+                                 (debug:print 0 *default-log-port* "INFO: syncer thread NOT sleeping ; maybe time-to-exit...")))
+
+                               (if (not (configf:lookup *configdat* "server" "disable-db-snapshot"))
+                                   (common:snapshot-file mtdbfile subdir: ".db-snapshot"))
+		               (delete-file* staging-file)
+		               (let* ((start-time (current-milliseconds))
+                                      (res (system sync-cmd))
+                                      (dbbackupfile (conc mtdbfile ".backup"))
+                                      (res2 
+                                       (cond
+                                        ((eq? 0 res )
+                                         (handle-exceptions
+                                            exn
+                                            #f
+                                         (if (file-exists? dbbackupfile)
+		                           (delete-file* dbbackupfile)
+                                         )
+                                         (if (eq? 0 (file-size sync-log))
+                                             (delete-file* sync-log))
+		                         (system (conc "/bin/mv " staging-file " " mtdbfile))
+                                         
+                                         (set! last-sync-seconds (/ (- (current-milliseconds) start-time) 1000))
+                                         (set! off-time (calculate-off-time
+                                                         last-sync-seconds
+                                                         (cond
+                                                          ((and (number? duty-cycle) (> duty-cycle 0) (< duty-cycle 1))
+                                                           duty-cycle)
+                                                          (else
+                                                           (debug:print 0 *default-log-port* "WARNING: ["(common:human-time)"] server.sync-duty-cycle is invalid.  Should be a number between 0 and 1, but "duty-cycle" was specified.  Using default value: "default-duty-cycle)
+                                                           default-duty-cycle))))
+                                         
+                                         (debug:print 1 *default-log-port* "INFO: ["(common:human-time)"] pid="(current-process-id)" SYNC took "last-sync-seconds" sec")
+                                         (debug:print 1 *default-log-port* "INFO: ["(common:human-time)"] pid="(current-process-id)" SYNC took "last-sync-seconds" sec ; with duty-cycle of "duty-cycle" off time is now "off-time)
+                                         'sync-completed))
+                                        (else
+                                         (system (conc "/bin/cp "sync-log" "sync-log".fail"))
+                                         (debug:print 0 *default-log-port* "ERROR: ["(common:human-time)"] Sync failed. See log at "sync-log".fail")
+                                         (if (file-exists? (conc mtdbfile ".backup"))
+                                             (system (conc "/bin/cp "mtdbfile ".backup " mtdbfile)))
+                                         #f))))
+                                 (common:simple-file-release-lock lockfile)
+                                 ;; (BB> "released lockfile: " lockfile)
+                                 ;; (when (common:file-exists? lockfile)
+                                 ;;   (BB> "DID NOT ACTUALLY RELEASE LOCKFILE"))
+                                 res2) ;; end let
+                               );; end begin
+                             ;; else
+                             (cond
+                              (persist-until-sync
+                               (thread-sleep! 1)
+                               (debug:print 1 *default-log-port* "INFO: ["(common:human-time)"] pid="(current-process-id)" other SYNC in progress; we're in a fork-to-background so we need to succeed.  Let's wait a jiffy and and try again. num-tries="num-tries" (waiting for lockfile="lockfile" to disappear)")
+                               (retry-loop (add1 num-tries)))
+                              (else
+                               (thread-sleep! (max off-time (+ last-sync-seconds min-intersync-delay)))
+                               (debug:print 1 *default-log-port* "INFO: ["(common:human-time)"] pid="(current-process-id)" other SYNC in progress; not syncing.")
+                               'parallel-sync-in-progress))
+                             ) ;; end if got lockfile
+                         )
+                    ))
+              ;; (BB> "End do-a-sync with fork-to-background="fork-to-background" persist-until-sync="persist-until-sync" and result="finalres)
+              finalres)
+            ) ;; end lambda
+          ))
+    do-a-sync))
+
+
+)

DELETED margs.scm
Index: margs.scm
==================================================================
--- margs.scm
+++ /dev/null
@@ -1,88 +0,0 @@
-;; Copyright 2007-2010, Matthew Welland.
-;;
-;; This file is part of Megatest.
-;; 
-;;     Megatest is free software: you can redistribute it and/or modify
-;;     it under the terms of the GNU General Public License as published by
-;;     the Free Software Foundation, either version 3 of the License, or
-;;     (at your option) any later version.
-;; 
-;;     Megatest is distributed in the hope that it will be useful,
-;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;     GNU General Public License for more details.
-;; 
-;;     You should have received a copy of the GNU General Public License
-;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
-
-
-(declare (unit margs))
-;; (declare (uses common))
-
-(define args:arg-hash (make-hash-table))
-
-(define (args:get-arg arg . default)
-  (if (null? default)
-      (hash-table-ref/default args:arg-hash arg #f)
-      (hash-table-ref/default args:arg-hash arg (car default))))
-
-(define (args:any? . args)
-  (not (null? (filter (lambda (x) x)
-		      (map args:get-arg args)))))
-
-(define (args:get-arg-from ht arg . default)
-  (if (null? default)
-      (hash-table-ref/default ht arg #f)
-      (hash-table-ref/default ht arg (car default))))
-
-(define (args:usage . args)
-  (if (> (length args) 0)
-      (apply print "ERROR: " args))
-  (if (string? help)
-      (print help)
-      (print "Usage: " (car (argv)) " ... "))
-  (exit 0))
-
- ;; one-of args defined
-(define (args:any-defined? . param)
-  (let ((res #f))
-    (for-each 
-     (lambda (arg)
-       (if (args:get-arg arg)(set! res #t)))
-     param)
-    res))
-
-;; args: 
-(define (args:get-args args params switches arg-hash num-needed)
-  (let* ((numargs (length args))
-	 (adj-num-needed (if num-needed (+ num-needed 2) #f)))
-    (if (< numargs (if adj-num-needed adj-num-needed 2))
-	(if (>= num-needed 1)
-	    (args:usage "No arguments provided")
-	    '())
-	(let loop ((arg (cadr args))
-		   (tail (cddr args))
-		   (remargs '()))
-	  (cond 
-	   ((member arg params) ;; args with params
-	    (if (< (length tail) 1)
-		(args:usage "param given without argument " arg)
-		(let ((val     (car tail))
-		      (newtail (cdr tail)))
-		  (hash-table-set! arg-hash arg val)
-		  (if (null? newtail) remargs
-		      (loop (car newtail)(cdr newtail) remargs)))))
-	   ((member arg switches)         ;; args with no params (i.e. switches)
-	    (hash-table-set! arg-hash arg #t)
-	    (if (null? tail) remargs
-		(loop (car tail)(cdr tail) remargs)))
-	   (else
-	    (if (null? tail)(append remargs (list arg)) ;; return the non-used args
-		(loop (car tail)(cdr tail)(append remargs (list arg))))))))
-    ))
-
-(define (args:print-args remargs arg-hash)
-  (print "ARGS: " remargs)
-  (for-each (lambda (arg)
-	      (print "   " arg "   " (hash-table-ref/default arg-hash arg #f)))
-	    (hash-table-keys arg-hash)))

DELETED megatest-version.scm
Index: megatest-version.scm
==================================================================
--- megatest-version.scm
+++ /dev/null
@@ -1,23 +0,0 @@
-;;  Copyright 2006-2017, Matthew Welland.
-;; 
-;; This file is part of Megatest.
-;; 
-;;     Megatest is free software: you can redistribute it and/or modify
-;;     it under the terms of the GNU General Public License as published by
-;;     the Free Software Foundation, either version 3 of the License, or
-;;     (at your option) any later version.
-;; 
-;;     Megatest is distributed in the hope that it will be useful,
-;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;     GNU General Public License for more details.
-;; 
-;;     You should have received a copy of the GNU General Public License
-;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
-
-;; Always use two or four digit decimal
-;; 1.01, 1.02...1.10,1.11,1.1101 ... 1.99,2.00..
-
-;; (declare (unit megatest-version))
-
-(define megatest-version 1.6584)

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -14,89 +14,348 @@
 ;; 
 ;;     You should have received a copy of the GNU General Public License
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 ;;
 
-;; (include "common.scm")
-(include "megatest-version.scm")
+(declare (uses dbi))
+(declare (uses pkts))
+(declare (uses stml2))
+(declare (uses cookie))
+(declare (uses csv-xml))
+(declare (uses hostinfo))
+
+(declare (uses adjutant))
+(declare (uses archivemod))
+(declare (uses apimod))
+(declare (uses autoload))
+(declare (uses bigmod))
+(declare (uses commonmod))
+(declare (uses configfmod))
+(declare (uses dbmod))
+(declare (uses dbi))
+(declare (uses debugprint))
+(declare (uses ducttape-lib))
+(declare (uses ezstepsmod))
+(declare (uses http-transportmod))
+(declare (uses launchmod))
+(declare (uses mtargs))
+(declare (uses mtver))
+(declare (uses mutils))
+(declare (uses processmod))
+(declare (uses rmtmod))
+(declare (uses runsmod))
+(declare (uses servermod))
+(declare (uses testsmod))
+
+;; needed for configf scripts, scheme etc.
+(declare (uses apimod.import))
+(declare (uses debugprint.import))
+(declare (uses mtargs.import))
+(declare (uses commonmod.import))
+(declare (uses configfmod.import))
+(declare (uses bigmod.import))
+(declare (uses dbmod.import))
+(declare (uses rmtmod.import))
+(declare (uses servermod.import))
+(declare (uses http-transportmod.import))
+
+;; (include "call-with-environment-variables/call-with-environment-variables.scm")
+
+(module megatest-main
+	*
+
+  (import scheme
+	  chicken.base
+	  chicken.bitwise
+	  chicken.condition
+	  chicken.eval
+	  chicken.file
+	  chicken.file.posix
+	  chicken.format
+	  chicken.io
+	  chicken.irregex
+	  chicken.pathname
+	  chicken.port
+	  chicken.pretty-print
+	  chicken.process
+	  chicken.process-context
+	  chicken.process-context.posix
+	  chicken.process.signal
+	  chicken.random
+	  chicken.repl
+	  chicken.sort
+	  chicken.string
+	  chicken.tcp
+	  chicken.time
+	  chicken.time.posix
+	  
+	  (prefix base64 base64:)
+	  (prefix sqlite3 sqlite3:)
+	  (prefix sxml-modifications sxml-)
+	  address-info
+	  csv-abnf
+	  directory-utils
+	  fmt
+	  http-client
+	  intarweb
+	  json
+	  linenoise
+	  matchable
+	  md5
+	  message-digest
+	  queues
+	  regex
+	  regex-case
+	  s11n
+	  sparse-vectors
+	  spiffy
+	  spiffy-directory-listing
+	  spiffy-request-vars
+	  sql-de-lite
+	  stack
+	  sxml-modifications
+	  sxml-serializer
+	  sxml-transforms
+	  system-information
+	  typed-records
+	  uri-common
+	  z3
+	  
+	  srfi-1
+	  srfi-4
+	  srfi-18
+	  srfi-13
+	  srfi-98
+	  srfi-69
+
+	  ;; local modules
+	  autoload
+	  adjutant
+	  csv-xml
+	  ducttape-lib
+	  hostinfo
+	  mtver
+	  mutils
+	  cookie
+	  csv-xml
+	  ducttape-lib
+	  (prefix mtargs args:)
+	  pkts
+	  stml2
+	  (prefix dbi dbi:)
 
+	  apimod
+	  archivemod
+	  bigmod
+	  commonmod
+	  configfmod
+	  dbmod
+	  debugprint
+	  ezstepsmod
+	  http-transportmod
+	  launchmod
+	  processmod
+	  rmtmod
+	  runsmod
+	  servermod
+	  tasksmod
+	  testsmod
+	  
+	  )
+	
 ;; fake out readline usage of toplevel-command
 (define (toplevel-command . a) #f)
 
-(declare (uses common))
-;; (declare (uses megatest-version))
-(declare (uses margs))
-(declare (uses runs))
-(declare (uses launch))
-(declare (uses server))
-(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.
-(declare (uses env))
-(declare (uses diff-report))
-;; (declare (uses ftail))
-;; (import ftail)
-
 (define *db* #f) ;; this is only for the repl, do not use in general!!!!
 
-(include "common_records.scm")
-(include "key_records.scm")
-(include "db_records.scm")
+;; (include "common_records.scm")
+;; (include "key_records.scm")
+;; (include "db_records.scm")
 (include "run_records.scm")
-(include "megatest-fossil-hash.scm")
-
-(use (prefix sqlite3 sqlite3:) srfi-1 posix regex regex-case srfi-69 (prefix base64 base64:)
-     readline apropos json http-client directory-utils typed-records
-     http-client srfi-18 extras format)
-
-;; Added for csv stuff - will be removed
-;;
-(use sparse-vectors)
-
-(require-library mutils)
+;; (include "test_records.scm")
+
+(include "common.scm")
+(include "db.scm")
+(include "server.scm")
+(include "tests.scm")
+(include "genexample.scm")
+(include "tdb.scm")
+(include "env.scm")
+(include "diff-report.scm")
+(include "ods.scm")
 
 (define *usage-log-file* #f)    ;; put path to file for logging usage in this var in the ~/.megatestrc file
 (define *usage-use-seconds* #t) ;; for Epoc seconds in usage logging change this to #t in ~/.megatestrc file
 
-;; load the ~/.megatestrc file, put (use trace)(trace-call-sites #t)(trace function-you-want-to-trace) in this file
-;;
-(let ((debugcontrolf (conc (get-environment-variable "HOME") "/.megatestrc")))
-  (if (common:file-exists? debugcontrolf)
-      (load debugcontrolf)))
-
-;; usage logging, careful with this, it is not designed to deal with all real world challenges!
-;;
-(if (and *usage-log-file*
-         (file-write-access? *usage-log-file*))
-    (with-output-to-file
-        *usage-log-file*
-      (lambda ()
-        (print
-         (if *usage-use-seconds*
-             (current-seconds)
-             (time->string
-              (seconds->local-time (current-seconds))
-              "%Yww%V.%w %H:%M:%S"))
-         " "
-         (current-user-name) " "
-         (current-directory) " "
-         "\"" (string-intersperse (argv) " ") "\""))
-      #:append))
+     ;;======================================================================
+     ;; Test commands (i.e. for use inside tests)
+     ;;======================================================================
+     
+     (define (megatest:step step state status logfile msg)
+       (if (not (getenv "MT_CMDINFO"))
+           (begin
+     	(debug:print-error 0 *default-log-port* "MT_CMDINFO env var not set, -step must be called *inside* a megatest invoked environment!")
+     	(exit 5))
+           (let* ((cmdinfo   (common:read-encoded-string (getenv "MT_CMDINFO")))
+     	     (transport (assoc/default 'transport cmdinfo))
+     	     (testpath  (assoc/default 'testpath  cmdinfo))
+     	     (test-name (assoc/default 'test-name cmdinfo))
+     	     (runscript (assoc/default 'runscript cmdinfo))
+     	     (db-host   (assoc/default 'db-host   cmdinfo))
+     	     (run-id    (assoc/default 'run-id    cmdinfo))
+     	     (test-id   (assoc/default 'test-id   cmdinfo))
+     	     (itemdat   (assoc/default 'itemdat   cmdinfo))
+     	     (work-area (assoc/default 'work-area cmdinfo))
+     	     (db        #f))
+     	(change-directory testpath)
+     	(if (not (launch:setup))
+     	    (begin
+     	      (debug:print 0 *default-log-port* "Failed to setup, exiting")
+     	      (exit 1)))
+     	(if (and state status)
+     	    (let ((comment (launch:load-logpro-dat run-id test-id step)))
+     	      ;; (rmt:test-set-log! run-id test-id (conc stepname ".html"))))
+     	      (rmt:teststep-set-status! run-id test-id step state status (or comment msg) logfile))
+     	    (begin
+     	      (debug:print-error 0 *default-log-port* "You must specify :state and :status with every call to -step")
+     	      (exit 6))))))
+
+     ;;======================================================================
+     ;; full run
+     ;;======================================================================
+     
+     (define (handle-run-requests target runname keys keyvals need-clean)	 
+       (if (or (args:get-arg "-kill-rerun") (args:get-arg "-rerun-clean")) ;; first set states/statuses correct
+           ;; For rerun-clean do we or do we not support the testpatt?
+           (let ((states   (or (configf:lookup *configdat* "validvalues" "cleanrerun-states")
+     			  "KILLREQ,KILLED,UNKNOWN,INCOMPLETE,STUCK,NOT_STARTED"))
+     	    (statuses (or (configf:lookup *configdat* "validvalues" "cleanrerun-statuses")
+     			  "FAIL,INCOMPLETE,ABORT,CHECK,DEAD,PREQ_FAIL,PREQ_DISCARDED")))
+     	(hash-table-set! args:arg-hash "-preclean" #t)
+     	(runs:operate-on 'set-state-status
+     			 target
+     			 (common:args-get-runname)  ;; (or (args:get-arg "-runname")(args:get-arg ":runname"))
+     			 ;; "%" ;; (common:args-get-testpatt #f) ;; (args:get-arg "-testpatt")
+     			 (common:args-get-testpatt #f) ;; (args:get-arg "-testpatt")
+     			 state:  states
+     			 ;; status: statuses
+     			 new-state-status: "NOT_STARTED,n/a")
+     	(runs:clean-cache target runname *toppath*)
+     	(runs:operate-on 'set-state-status
+     			 target
+     			 (common:args-get-runname)  ;; (or (args:get-arg "-runname")(args:get-arg ":runname"))
+     			 ;; "%" ;; (common:args-get-testpatt #f) ;; (args:get-arg "-testpatt")
+     			 (common:args-get-testpatt #f) ;; (args:get-arg "-testpatt")
+     			 ;; state:  states
+     			 status: statuses
+     			 new-state-status: "NOT_STARTED,n/a")))
+       ;; RERUN ALL
+       (if (args:get-arg "-rerun-all") ;; first set states/statuses correct
+           (let* ((rconfig (full-runconfigs-read)))
+     	(hash-table-set! args:arg-hash "-preclean" #t)
+     	(runs:operate-on 'set-state-status
+     			 target
+     			 (common:args-get-runname)  ;; (or (args:get-arg "-runname")(args:get-arg ":runname"))
+     			 (common:args-get-testpatt rconfig) ;; (args:get-arg "-testpatt")
+     			 state:  #f
+     			 ;; status: statuses
+     			 new-state-status: "NOT_STARTED,n/a")
+     	(runs:clean-cache target runname *toppath*)
+     	(runs:operate-on 'set-state-status
+     			 target
+     			 (common:args-get-runname)  ;; (or (args:get-arg "-runname")(args:get-arg ":runname"))
+     			 (common:args-get-testpatt rconfig) ;; (args:get-arg "-testpatt")
+     			 ;; state:  states
+     			 status: #f
+     			 new-state-status: "NOT_STARTED,n/a")))
+       (let* ((config-reruns      (let ((x (configf:lookup *configdat* "setup" "reruns")))
+     			       (if x (string->number x) #f)))
+     	 (rerun-cnt (if config-reruns
+     			config-reruns
+     			1)))
+     
+         (runs:run-tests target
+     		    runname
+     		    #f ;; (common:args-get-testpatt #f)
+     		    ;; (or (args:get-arg "-testpatt")
+     		    ;;     "%")
+     		    (bdat-user *bdat*)
+     		    args:arg-hash
+     		    run-count: rerun-cnt)))
+
+     ;; csv processing record
+     (define (make-refdb:csv)
+       (vector 
+        (make-sparse-array)
+        (make-hash-table)
+        (make-hash-table)
+        0
+        0))
+     (define-inline (refdb:csv-get-svec     vec)    (vector-ref  vec 0))
+     (define-inline (refdb:csv-get-rows     vec)    (vector-ref  vec 1))
+     (define-inline (refdb:csv-get-cols     vec)    (vector-ref  vec 2))
+     (define-inline (refdb:csv-get-maxrow   vec)    (vector-ref  vec 3))
+     (define-inline (refdb:csv-get-maxcol   vec)    (vector-ref  vec 4))
+     (define-inline (refdb:csv-set-svec!    vec val)(vector-set! vec 0 val))
+     (define-inline (refdb:csv-set-rows!    vec val)(vector-set! vec 1 val))
+     (define-inline (refdb:csv-set-cols!    vec val)(vector-set! vec 2 val))
+     (define-inline (refdb:csv-set-maxrow!  vec val)(vector-set! vec 3 val))
+     (define-inline (refdb:csv-set-maxcol!  vec val)(vector-set! vec 4 val))
+     
+     (define (get-dat results sheetname)
+       (or (hash-table-ref/default results sheetname #f)
+           (let ((tmp-vec  (make-refdb:csv)))
+     	(hash-table-set! results sheetname tmp-vec)
+     	tmp-vec)))
+     
+     ;; bracket open-output-file with code to make leading directory if it does not exist and handle exceptions
+     (define (open-logfile logpath-in)
+       (condition-case
+        (let* ((log-dir (or (pathname-directory logpath-in) "."))
+     	  (fname   (pathname-strip-directory logpath-in))
+     	  (logpath (if (> (string-length fname) 250)
+     		       (let ((newlogf (conc log-dir "/" (common:get-signature fname) ".log")))
+     			 (debug:print 0 *default-log-port* "WARNING: log file " logpath-in " path too long, converted to " newlogf)
+     			 newlogf)
+     		       logpath-in)))
+          (if (not (directory-exists? log-dir))
+              (system (conc "mkdir -p " log-dir)))
+          (open-output-file logpath))
+        (exn ()
+             (debug:print-error 0 *default-log-port* "Could not open log file for write: "logpath-in)
+             (define *didsomething* #t)  
+             (exit 1))))
+
+(define (debug:setup)
+  (let ((debugstr (or (args:get-arg "-debug")
+      		      (args:get-arg "-debug-noprop")
+      		      (getenv "MT_DEBUG_MODE"))))
+    (set! *verbosity* (debug:calc-verbosity debugstr 'q))
+    (debug:check-verbosity *verbosity* debugstr)
+    ;; if we were handed a bad verbosity rule then we will override it with 1 and continue
+    (if (not *verbosity*)(set! *verbosity* 1))
+    (if (and (not (args:get-arg "-debug-noprop"))
+      	     (or (args:get-arg "-debug")
+      		 (not (getenv "MT_DEBUG_MODE"))))
+      	(setenv "MT_DEBUG_MODE" (if (list? *verbosity*)
+      				    (string-intersperse (map conc *verbosity*) ",")
+      				    (conc *verbosity*))))))
+
+;; check verbosity, #t is ok
+(define (debug:check-verbosity verbosity vstr)
+  (if (not (or (number? verbosity)
+     	       (list?   verbosity)))
+      (begin
+     	(print "ERROR: Invalid debug value \"" vstr "\"")
+     	#f)
+      #t))
 
 ;; Disabled help items
 ;;  -rollup                 : (currently disabled) fill run (set by :runname)  with latest test(s)
 ;;                            from prior runs with same keys
 ;;  -daemonize              : fork into background and disconnect from stdin/out
-
+     
 (define help (conc "
 Megatest, documentation at http://www.kiatoa.com/fossils/megatest
   version " megatest-version "
   license GPL, Copyright Matt Welland 2006-2017
  
@@ -264,2291 +523,2164 @@
 # Get test path, use '.' to get a single path or a specific path/file pattern
 megatest -test-files 'logs/*.log' -target ubuntu/n%/no% -runname w49% -testpatt test_mt%
 
 Called as " (string-intersperse (argv) " ") "
 Version " megatest-version ", built from " megatest-fossil-hash ))
-
-;;  -gui                    : start a gui interface
-;;  -config fname           : override the runconfigs file with fname
-
-;; process args
-(define remargs (args:get-args 
-		 (argv)
-		 (list  "-runtests"  ;; run a specific test
-			"-config"    ;; override the config file name
-			"-append-config"
-			"-execute"   ;; run the command encoded in the base64 parameter
-			"-step"
-			"-target"
-			"-reqtarg"
-			":runname"
-			"-runname"
-			":state"  
-			"-state"
-			":status"
-			"-status"
-			"-list-runs"
-                        "-testdata-csv"
-			"-testpatt"
-                        "--modepatt"
-                        "-modepatt"
-                        "-tagexpr"
-			"-itempatt"
-			"-setlog"
-			"-set-toplog"
-			"-runstep"
-			"-logpro"
-			"-m"
-			"-rerun"
-
-			"-days"
-			"-rename-run"
-			"-to"
-			"-dest"
-                        "-source" 
-                        "-time-stamp" 
-			;; values and messages
-			":category"
-			":variable"
-			":value"
-			":expected"
-			":tol"
-			":units"
-
-			;; misc
-			"-start-dir"
-                        "-run-patt"
-                        "-target-patt"   
-			"-contour"
-                        "-area-tag"  
-                        "-area"  
-			"-run-tag"
-			"-server"
-			"-adjutant"
-			"-transport"
-			"-port"
-			"-extract-ods"
-			"-pathmod"
-			"-env2file"
-			"-envcap"
-			"-envdelta"
-			"-setvars"
-			"-set-state-status"
-
-                        ;; move runs stuff here
-                        "-remove-keep"           
-			"-set-run-status"
-			"-age"
-
-			;; archive 
-			"-archive"
-			"-actions"
-			"-precmd"
-			"-include"
-			"-exclude-rx"
-			"-exclude-rx-from"
-			
-			"-debug" ;; for *verbosity* > 2
-			"-debug-noprop"
-			"-create-test"
-			"-override-timeout"
-			"-test-files"  ;; -test-paths is for listing all
-			"-load"        ;; load and exectute a scheme file
-			"-section"
-			"-var"
-			"-dumpmode"
-			"-run-id"
-			"-ping"
-			"-refdb2dat"
-			"-o"
-			"-log"
-                        "-sync-log"
-			"-since"
-			"-fields"
-			"-recover-test" ;; run-id,test-id - used internally to recover a test stuck in RUNNING state
-			"-sort"
-			"-target-db"
-			"-source-db"
-			"-prefix-target"
-
-                        "-src-target"
-                        "-src-runname"
-                        "-diff-email"
-			"-sync-to"			
-			"-pgsync"
-			"-kill-wait"    ;; wait this long before removing test (default is 10 sec)
-                        "-diff-html"
-
-			;; wizards, area capture, setup new ...
-			"-extract-skeleton"
-			)
- 		 (list  "-h" "-help" "--help"
-			"-manual"
-			"-version"
-		        "-force"
-		        "-xterm"
-		        "-showkeys"
-		        "-show-keys"
-		        "-test-status"
-			"-set-values"
-			"-load-test-data"
-			"-summarize-items"
-		        "-gui"
-			"-daemonize"
-			"-preclean"
-			"-rerun-clean"
-			"-rerun-all"
-			"-clean-cache"
-			"-no-cache"
-			"-cache-db"
-			"-cp-eventtime-to-publishtime"
-                        "-use-db-cache"
-                        "-prepend-contour"
-
-
-			;; misc
-			"-repl"
-			"-lock"
-			"-unlock"
-			"-list-servers"
-			"-kill-servers"
-                        "-run-wait"      ;; wait on a run to complete (i.e. no RUNNING)
-			"-one-pass"      ;;
-			"-local"         ;; run some commands using local db access
-			"-generate-html"
-			"-generate-html-structure" 
-			"-list-run-time"
-                        "-list-test-time"
-			
-			;; misc queries
-			"-list-disks"
-			"-list-targets"
-			"-list-db-targets"
-			"-show-runconfig"
-			"-show-config"
-			"-show-cmdinfo"
-			"-get-run-status"
-			"-list-waivers"
-
-			;; queries
-			"-test-paths" ;; get path(s) to a test, ordered by youngest first
-
-			"-runall"    ;; run all tests, respects -testpatt, defaults to %
-			"-run"       ;; alias for -runall
-			"-remove-runs"
-                        "-kill-runs"
-                        "-kill-rerun"
-                        "-keep-records" ;; use with -remove-runs to remove only the run data
-			"-rebuild-db"
-			"-cleanup-db"
-			"-rollup"
-			"-update-meta"
-			"-create-megatest-area"
-			"-mark-incompletes"
-
-			"-convert-to-norm"
-			"-convert-to-old"
-			"-import-megatest.db"
-			"-sync-to-megatest.db"
-                        "-sync-brute-force"
-			"-logging"
-			"-v" ;; verbose 2, more than normal (normal is 1)
-			"-q" ;; quiet 0, errors/warnings only
-
-                        "-diff-rep"
-
-			"-syscheck"
-			"-obfuscate"
-			;; junk placeholder
-			;; "-:p"
-			
-                        )
-		 args:arg-hash
-		 0))
-
-;; Add args that use remargs here
-;;
-(if (and (not (null? remargs))
-	 (not (or
-	       (args:get-arg "-runstep")
-	       (args:get-arg "-envcap")
-	       (args:get-arg "-envdelta")
-	       )
-	      ))
-    (debug:print-error 0 *default-log-port* "Unrecognised arguments: " (string-intersperse (if (list? remargs) remargs (argv))  " ")))
-
-;; before doing anything else change to the start-dir if provided
-;;
-(if (args:get-arg "-start-dir")
-    (if (common:file-exists? (args:get-arg "-start-dir"))
-        (let ((fullpath (common:real-path (args:get-arg "-start-dir"))))
-          (setenv "PWD" fullpath)
-          (change-directory fullpath))
-	(begin
-	  (debug:print-error 0 *default-log-port* "non-existant start dir " (args:get-arg "-start-dir") " specified, exiting.")
-	  (exit 1))))
-
-;; immediately set MT_TARGET if -reqtarg or -target are available
-;;
-(let ((targ (or (args:get-arg "-reqtarg")(args:get-arg "-target"))))
-  (if targ (setenv "MT_TARGET" targ)))
-
-;; The watchdog is to keep an eye on things like db sync etc.
-;;
-
-;; TODO: for multiple areas, we will have multiple watchdogs; and multiple threads to manage
-(define *watchdog* (make-thread
-		    (lambda ()
-		      (handle-exceptions
-			  exn
-			  (begin
-			    (print-call-chain)
-			    (print " message: " ((condition-property-accessor 'exn 'message) exn) ", exn=" exn))
-			(common:watchdog)))
-		    "Watchdog thread"))
-
-;;(if (not (args:get-arg "-server"))
-;;    (thread-start! *watchdog*)) ;; if starting a server; wait till we get to running state before kicking off watchdog
-(let* ((no-watchdog-args
-       '("-list-runs"
-         "-testdata-csv"
-         "-list-servers"
-         "-server"
-	 "-adjutant"
-         "-list-disks"
-         "-list-targets"
-         "-show-runconfig"
-         ;;"-list-db-targets"
-         "-show-runconfig"
-         "-show-config"
-         "-show-cmdinfo"
-	 "-cleanup-db"
-            ))
-       (no-watchdog-argvals (list '("-archive" . "replicate-db")))
-       (start-watchdog-specail-arg-val (let loop ((hed  (car no-watchdog-argvals))
-                                                  (tail (cdr   no-watchdog-argvals)))
-                                             ;; (print "hed" hed " arg " (args:get-arg (car hed)) " val:" (cdr hed)  " eql" (equal? (args:get-arg (car hed)) (cdr hed)))  
-                                             (if (equal? (args:get-arg (car hed)) (cdr hed))
-                                               #f
-                                               (if (null? tail)
-                                                 #t
-                                                 (loop (car tail) (cdr tail))))))      
-       (no-watchdog-args-vals (filter (lambda (x) x)
-                                      (map args:get-arg no-watchdog-args)))
-       (start-watchdog (and (null? no-watchdog-args-vals) start-watchdog-specail-arg-val)))
-       ;(print  "no-watchdog-args="no-watchdog-args "no-watchdog-args-vals="no-watchdog-args-vals " start-watchdog-specail-arg-val:" start-watchdog-specail-arg-val " start-watchdog:" start-watchdog) 
-  (if start-watchdog
-      (thread-start! *watchdog*)))
-
-
-;; bracket open-output-file with code to make leading directory if it does not exist and handle exceptions
-(define (open-logfile logpath-in)
-  (condition-case
-   (let* ((log-dir (or (pathname-directory logpath-in) "."))
-	  (fname   (pathname-strip-directory logpath-in))
-	  (logpath (if (> (string-length fname) 250)
-		       (let ((newlogf (conc log-dir "/" (common:get-signature fname) ".log")))
-			 (debug:print 0 *default-log-port* "WARNING: log file " logpath-in " path too long, converted to " newlogf)
-			 newlogf)
-		       logpath-in)))
-     (if (not (directory-exists? log-dir))
-         (system (conc "mkdir -p " log-dir)))
-     (open-output-file logpath))
-   (exn ()
-        (debug:print-error 0 *default-log-port* "Could not open log file for write: "logpath)
-        (define *didsomething* #t)  
-        (exit 1))))
-
-;; this segment will run launch:setup only if -log is not set. This is fairly safe as servers are not
-;; manually started and thus should never be started in a non-megatest area. Thus no need to handle situation
-;; where (launch:setup) returns #f?
-;;
-(if (or (args:get-arg "-log")(args:get-arg "-server")) ;; redirect the log always when a server
-    (handle-exceptions
-	exn
-	(begin
-	  (print "ERROR: Failed to switch to log output. " ((condition-property-accessor 'exn 'message) exn) ", exn=" exn)
-	  )
-      (let* ((tl   (or (args:get-arg "-log")(launch:setup)))   ;; run launch:setup if -server, ensure we do NOT run launch:setup if -log specified
-	     (logf (or (args:get-arg "-log") ;; use -log unless we are a server, then craft a logfile name
-		       (conc tl "/logs/server-" (current-process-id) "-" (get-host-name) ".log")))
-	     (oup  (open-logfile logf)))
-	(if (not (args:get-arg "-log"))
-	    (hash-table-set! args:arg-hash "-log" logf)) ;; fake out future queries of -log
-	(debug:print-info 0 *default-log-port* "Sending log output to " logf)
-	(set! *default-log-port* oup))))
-
-(if (or (args:get-arg "-h")
-	(args:get-arg "-help")
-	(args:get-arg "--help"))
-    (begin
-      (print help)
-      (exit)))
-
-(if (args:get-arg "-manual")
-    (let* ((htmlviewercmd (or (configf:lookup *configdat* "setup" "htmlviewercmd")
-			      (common:which '("firefox" "arora"))))
-	   (install-home  (common:get-install-area))
-	   (manual-html   (conc install-home "/share/docs/megatest_manual.html")))
-      (if (and install-home
-	       (common:file-exists? manual-html))
-	  (system (conc "(" htmlviewercmd " " manual-html " ) &"))
-	  (system (conc "(" htmlviewercmd " http://www.kiatoa.com/cgi-bin/fossils/megatest/doc/tip/docs/manual/megatest_manual.html ) &")))
-      (exit)))
-
-(if (args:get-arg "-version")
-    (begin
-      (print (common:version-signature)) ;; (print megatest-version)
-      (exit)))
-
-(define *didsomething* #f)
-
-;; Overall exit handling setup immediately
-;;
-(if (or (args:get-arg "-process-reap"))
-        ;; (args:get-arg "-runtests")
-	;; (args:get-arg "-execute")
-	;; (args:get-arg "-remove-runs")
-	;; (args:get-arg "-runstep"))
-    (let ((original-exit (exit-handler)))
-      (exit-handler (lambda (#!optional (exit-code 0))
-		      (printf "Preparing to exit with exit code ~A ...\n" exit-code)
-		      (for-each
-		       
-		       (lambda (pid)
-			 (handle-exceptions
-			     exn
-			   (begin
-			     (printf "process reap failed. exn=~A\n" exn)
-			     #t)
-			  (let-values (((pid-val exit-status exit-code) (process-wait pid #t)))
-				      (if (or (eq? pid-val pid)
-					      (eq? pid-val 0))
-					  (begin
-					    (printf "Sending signal/term to ~A\n" pid)
-					    (process-signal pid signal/term))))))
-		       (process:children #f))
-		      (original-exit exit-code)))))
-
-;; for some switches always print the command to stderr
-;;
-(if (args:any? "-run" "-runall" "-remove-runs" "-set-state-status" "-kill-runs" "-kill-rerun")
-    (debug:print 0 *default-log-port* (string-intersperse (argv) " ")))
-
-;; some switches imply homehost. Exit here if not on homehost
-;;
-(let ((homehost-required  (list "-cleanup-db" "-server")))
-  (if (apply args:any? homehost-required)
-      (if (not (common:on-homehost?))
-	  (for-each
-	   (lambda (switch)
-	     (if (args:get-arg switch)
-		 (begin
-		   (debug:print 0 *default-log-port* "ERROR: you must be on the homehost to run with " switch
-				", you can move homehost by removing the .homehost file but this will disrupt any runs in progress.")
-		   (exit 1))))
-	   homehost-required))))
-
-;;======================================================================
-;; Misc setup stuff
-;;======================================================================
-
-(debug:setup)
-
-(if (args:get-arg "-logging")(set! *logging* #t))
-
-;;(if (debug:debug-mode 3) ;; we are obviously debugging
-;;    (set! open-run-close open-run-close-no-exception-handling))
-
-(if (args:get-arg "-itempatt")
-    (let ((newval (conc (args:get-arg "-testpatt") "/" (args:get-arg "-itempatt"))))
-      (debug:print 0 *default-log-port* "WARNING: -itempatt has been deprecated, please use -testpatt testpatt/itempatt method, new testpatt is "newval)
-      (hash-table-set! args:arg-hash "-testpatt" newval)
-      (hash-table-delete! args:arg-hash "-itempatt")))
-
-(if (args:get-arg "-runtests")
-    (debug:print 0 *default-log-port* "WARNING: \"-runtests\" is deprecated. Use \"-run\" with \"-testpatt\" instead"))
-
-(on-exit std-exit-procedure)
-
-;;======================================================================
-;; Misc general calls
-;;======================================================================
-
-(if (and (args:get-arg "-cache-db")
-         (args:get-arg "-source-db"))
-    (let* ((temp-dir (or (args:get-arg "-target-db") (create-directory (conc "/tmp/" (getenv "USER") "/" (string-translate (current-directory) "/" "_")))))
-           (target-db (conc temp-dir "/cached.db"))
-           (source-db (args:get-arg "-source-db")))        
-      (db:cache-for-read-only source-db target-db)
-      (set! *didsomething* #t)))
-
-;; handle a clean-cache request as early as possible
-;;
-(if (args:get-arg "-clean-cache")
-    (let ((toppath  (launch:setup)))
-      (set! *didsomething* #t) ;; suppress the help output.
-      (runs:clean-cache (common:args-get-target)
-			(args:get-arg "-runname")
-			toppath)))
-	  
-(if (args:get-arg "-env2file")
-    (begin
-      (save-environment-as-files (args:get-arg "-env2file"))
-      (set! *didsomething* #t)))
-
-(if (args:get-arg "-list-disks")
-    (let ((toppath (launch:setup)))
-      (print 
-       (string-intersperse 
-	(map (lambda (x)
-	       (string-intersperse 
-		x
-		" => "))
-	     (common:get-disks *configdat*))
-	"\n"))
-      (set! *didsomething* #t)))
-
-;; csv processing record
-(define (make-refdb:csv)
-  (vector 
-   (make-sparse-array)
-   (make-hash-table)
-   (make-hash-table)
-   0
-   0))
-(define-inline (refdb:csv-get-svec     vec)    (vector-ref  vec 0))
-(define-inline (refdb:csv-get-rows     vec)    (vector-ref  vec 1))
-(define-inline (refdb:csv-get-cols     vec)    (vector-ref  vec 2))
-(define-inline (refdb:csv-get-maxrow   vec)    (vector-ref  vec 3))
-(define-inline (refdb:csv-get-maxcol   vec)    (vector-ref  vec 4))
-(define-inline (refdb:csv-set-svec!    vec val)(vector-set! vec 0 val))
-(define-inline (refdb:csv-set-rows!    vec val)(vector-set! vec 1 val))
-(define-inline (refdb:csv-set-cols!    vec val)(vector-set! vec 2 val))
-(define-inline (refdb:csv-set-maxrow!  vec val)(vector-set! vec 3 val))
-(define-inline (refdb:csv-set-maxcol!  vec val)(vector-set! vec 4 val))
-
-(define (get-dat results sheetname)
-  (or (hash-table-ref/default results sheetname #f)
-      (let ((tmp-vec  (make-refdb:csv)))
-	(hash-table-set! results sheetname tmp-vec)
-	tmp-vec)))
-
-(if (args:get-arg "-refdb2dat")
-    (let* ((input-db (args:get-arg "-refdb2dat"))
-	   (out-file (args:get-arg "-o"))
-	   (out-fmt  (or (args:get-arg "-dumpmode") "scheme"))
-	   (out-port (if (and out-file 
-			      (not (member out-fmt '("sqlite3" "csv"))))
-			 (open-output-file out-file)
-			 (current-output-port)))
-	   (res-data (configf:read-refdb input-db))
-	   (data     (car res-data))
-	   (msg      (cadr res-data)))
-      (if (not data)
-	  (debug:print 0 *default-log-port* "Bad input? data=" data) ;; some error occurred
-	  (with-output-to-port out-port
-	    (lambda ()
-	      (case (string->symbol out-fmt)
-		((scheme)(pp data))
-		((perl)
-		 ;; (print "%hash = (")
-		 ;;        key1 => 'value1',
-		 ;;        key2 => 'value2',
-		 ;;        key3 => 'value3',
-		 ;; );
-		 (configf:map-all-hier-alist 
-		  data 
-		  (lambda (sheetname sectionname varname val)
-		    (print "$data{\"" sheetname "\"}{\"" sectionname "\"}{\"" varname "\"} = \"" val "\";"))))
-		((python ruby)
-		 (print "data={}")
-		 (configf:map-all-hier-alist
-		  data
-		  (lambda (sheetname sectionname varname val)
-		    (print "data[\"" sheetname "\"][\"" sectionname "\"][\"" varname "\"] = \"" val "\""))
-		  initproc1:
-		  (lambda (sheetname)
-		    (print "data[\"" sheetname "\"] = {}"))
-		  initproc2:
-		  (lambda (sheetname sectionname)
-		    (print "data[\"" sheetname "\"][\"" sectionname "\"] = {}"))))
-		((csv)
-		 (let* ((results  (make-hash-table)) ;; (make-sparse-array)))
-			(row-cols (make-hash-table))) ;; hash of hashes where section => ht { row-<name> => num or col-<name> => num
-		   ;; (print "data=")
-		   ;; (pp data)
-		   (configf:map-all-hier-alist
-		    data
-		    (lambda (sheetname sectionname varname val)
-		      ;; (print "sheetname: " sheetname ", sectionname: " sectionname ", varname: " varname ", val: " val)
-		      (let* ((dat      (get-dat results sheetname))
-			     (vec      (refdb:csv-get-svec dat))
-			     (rownames (refdb:csv-get-rows dat))
-			     (colnames (refdb:csv-get-cols dat))
-			     (currrown (hash-table-ref/default rownames varname #f))
-			     (currcoln (hash-table-ref/default colnames sectionname #f))
-			     (rown     (or currrown 
-					   (let* ((lastn   (refdb:csv-get-maxrow dat))
-						  (newrown (+ lastn 1)))
-					     (refdb:csv-set-maxrow! dat newrown)
-					     newrown)))
-			     (coln     (or currcoln 
-					   (let* ((lastn   (refdb:csv-get-maxcol dat))
-						  (newcoln (+ lastn 1)))
-					     (refdb:csv-set-maxcol! dat newcoln)
-					     newcoln))))
-			(if (not (sparse-array-ref vec 0 coln)) ;; (eq? rown 0)
-			    (begin
-			      (sparse-array-set! vec 0 coln sectionname)
-			      ;; (print "sparse-array-ref " 0 "," coln "=" (sparse-array-ref vec 0 coln))
-			      ))
-			(if (not (sparse-array-ref vec rown 0)) ;; (eq? coln 0)
-			    (begin
-			      (sparse-array-set! vec rown 0 varname)
-			      ;; (print "sparse-array-ref " rown "," 0 "=" (sparse-array-ref vec rown 0))
-			      ))
-			(if (not currrown)(hash-table-set! rownames varname rown))
-			(if (not currcoln)(hash-table-set! colnames sectionname coln))
-			;; (print "dat=" dat ", rown=" rown ", coln=" coln)
-			(sparse-array-set! vec rown coln val)
-			;; (print "sparse-array-ref " rown "," coln "=" (sparse-array-ref vec rown coln))
-			)))
-		   (for-each
-		    (lambda (sheetname)
-		      (let* ((sheetdat (get-dat results sheetname))
-			     (svec     (refdb:csv-get-svec sheetdat))
-			     (maxrow   (refdb:csv-get-maxrow sheetdat))
-			     (maxcol   (refdb:csv-get-maxcol sheetdat))
-			     (fname    (if out-file 
-					   (string-substitute "%s" sheetname out-file) ;; "/foo/bar/%s.csv")
-					   (conc sheetname ".csv"))))
-			(with-output-to-file fname
-			  (lambda ()
-			    ;; (print "Sheetname: " sheetname)
-			    (let loop ((row       0)
-				       (col       0)
-				       (curr-row '())
-				       (result   '()))
-			      (let* ((val (sparse-array-ref svec row col))
-				     (disp-val (if val
-						   (conc "\"" val "\"")
-						   "")))
-				(if (> col 0)(display ","))
-				(display disp-val)
-				(cond
-				 ((> row maxrow)(display "\n") result)
-				 ((>= col maxcol)
-				  (display "\n")
-				  (loop (+ row 1) 0 '() (append result (list curr-row))))
-				 (else
-				  (loop row (+ col 1) (append curr-row (list val)) result)))))))))
-		    (hash-table-keys results))))
-		((sqlite3)
-		 (let* ((db-file   (or out-file (pathname-file input-db)))
-			(db-exists (common:file-exists? db-file))
-			(db        (sqlite3:open-database db-file)))
-		   (if (not db-exists)(sqlite3:execute db "CREATE TABLE data (sheet,section,var,val);"))
-		   (configf:map-all-hier-alist
-		    data
-		    (lambda (sheetname sectionname varname val)
-		      (sqlite3:execute db
-				       "INSERT OR REPLACE INTO data (sheet,section,var,val) VALUES (?,?,?,?);"
-				       sheetname sectionname varname val)))
-		   (sqlite3:finalize! db)))
-		(else
-		 (pp data))))))
-      (if out-file (close-output-port out-port))
-      (exit) ;; yes, bending the rules here - need to exit since this is a utility
-      ))
-
-(if (args:get-arg "-ping")
-    (let* ((server-id     (string->number (args:get-arg "-ping"))) ;; extract run-id (i.e. no ":"
-	   (host:port     (args:get-arg "-ping")))
-      (server:ping (or server-id host:port) #f do-exit: #t)))
-
-;;======================================================================
-;; Capture, save and manipulate environments
-;;======================================================================
-
-;; NOTE: Keep these above the section where the server or client code is setup
-
-(let ((envcap (args:get-arg "-envcap")))
-  (if envcap
-      (let* ((db      (env:open-db (if (null? remargs) "envdat.db" (car remargs)))))
-	(env:save-env-vars db envcap)
-	(env:close-database db)
-	(set! *didsomething* #t))))
-
-;; delta "language" will eventually be res=a+b-c but for now it is just res=a-b 
-;;
-(let ((envdelta (args:get-arg "-envdelta")))
-  (if envdelta
-      (let ((match (string-split envdelta "-")));; (string-match "([a-z0-9_]+)=([a-z0-9_\\-,]+)" envdelta)))
-	(if (not (null? match))
-	    (let* ((db        (env:open-db (if (null? remargs) "envdat.db" (car remargs))))
-		   ;; (resctx    (cadr match))
-		   ;; (equn      (caddr match))
-		   (parts     match) ;; (string-split equn "-"))
-		   (minuend   (car parts))
-		   (subtraend (cadr parts))
-		   (added     (env:get-added   db minuend subtraend))
-		   (removed   (env:get-removed db minuend subtraend))
-		   (changed   (env:get-changed db minuend subtraend)))
-	      ;; (pp (hash-table->alist added))
-	      ;; (pp (hash-table->alist removed))
-	      ;; (pp (hash-table->alist changed))
-	      (if (args:get-arg "-o")
-		  (with-output-to-file
-		      (args:get-arg "-o")
-		    (lambda ()
-		      (env:print added removed changed)))
-		  (env:print added removed changed))
-	      (env:close-database db)
-	      (set! *didsomething* #t))
-	    (debug:print-error 0 *default-log-port* "Parameter to -envdelta should be new=start-end")))))
-
-;;======================================================================
-;; Start the server - can be done in conjunction with -runall or -runtests (one day...)
-;;   we start the server if not running else start the client thread
-;;======================================================================
-
-;; Server? Start up here.
-;;
-(if (args:get-arg "-server")
-    (let ((tl        (launch:setup))
-          (transport-type (string->symbol (or (args:get-arg "-transport") "http"))))
-      (server:launch 0 transport-type)
-      (set! *didsomething* #t)))
-
-;; The adjutant is a bit different, it does NOT run (launch:setup) as it is not necessarily tied to
-;; a specific Megatest area. Detail are being hashed out and this may change.
-;;
-(if (args:get-arg "-adjutant")
-    (begin
-      (adjutant-run)
-      (set! *didsomething* #t)))
-
-(if (or (args:get-arg "-list-servers")
-        (args:get-arg "-kill-servers"))
-    (let ((tl (launch:setup)))
-      (if tl ;; all roads from here exit
-	  (let* ((servers (server:get-list *toppath*))
-		 (fmtstr  "~8a~22a~20a~20a~8a\n"))
-	    (format #t fmtstr "pid" "Interface:port" "age (hms)" "Last mod" "State")
-	    (format #t fmtstr "===" "==============" "=========" "========" "=====")
-	    (for-each ;;  ( mod-time host port start-time pid )
-	     (lambda (server)
-	       (let* ((mtm (any->number (car server)))
-		      (mod (if mtm (- (current-seconds) mtm) "unk"))
-		      (age (- (current-seconds)(or (any->number (list-ref server 3)) (current-seconds))))
-		      (url (conc (cadr server) ":" (caddr server)))
-		      (pid (list-ref server 4))
-		      (alv (if (number? mod)(< mod 10) #f)))
-		 (format #t
-			 fmtstr
-			 pid
-			 url
-			 (seconds->hr-min-sec age)
-			 (seconds->hr-min-sec mod)
-			 (if alv "alive" "dead"))
-		 (if (and alv
-			  (args:get-arg "-kill-servers"))
-		     (begin
-		       (debug:print-info 0 *default-log-port* "Attempting to kill server with pid " pid)
-		       (server:kill server)))))
-	     (sort servers (lambda (a b)
-			     (let ((ma (or (any->number (car a)) 9e9))
-				   (mb (or (any->number (car b)) 9e9)))
-			       (> ma mb)))))
-	    ;; (debug:print-info 1 *default-log-port* "Done with listservers")
-	    (set! *didsomething* #t)
-	    (exit))
-	  (exit))))
-      ;; must do, would have to add checks to many/all calls below
-
-;;======================================================================
-;; Weird special calls that need to run *after* the server has started?
-;;======================================================================
-
-(if (args:get-arg "-list-targets")
-    (if (launch:setup)
-        (let ((targets (common:get-runconfig-targets)))
-          ;; (debug:print 1 *default-log-port* "Found "(length targets) " targets")
-          (case (string->symbol (or (args:get-arg "-dumpmode") "alist"))
-            ((alist)
-             (for-each (lambda (x)
-                         ;; (print "[" x "]"))
-                         (print x))
-                       targets))
-            ((json)
-             (json-write targets))
-            (else
-             (debug:print-error 0 *default-log-port* "dump output format " (args:get-arg "-dumpmode") " not supported for -list-targets")))
-          (set! *didsomething* #t))))
-
-;; cache the runconfigs in $MT_LINKTREE/$MT_TARGET/$MT_RUNNAME/.runconfig
-;;
-(define (full-runconfigs-read)
-;; in the envprocessing branch the below code replaces the further below code
-;;  (if (eq? *configstatus* 'fulldata)
-;;      *runconfigdat*
-;;      (begin
-;;	(launch:setup)
-;;	*runconfigdat*)))
-
-  (let* ((rundir (if (and (getenv "MT_LINKTREE")(getenv "MT_TARGET")(getenv "MT_RUNNAME"))
-		     (conc (getenv "MT_LINKTREE") "/" (getenv "MT_TARGET") "/" (getenv "MT_RUNNAME"))
-		     #f))
-	 (cfgf   (if rundir (conc rundir "/.runconfig." megatest-version "-" megatest-fossil-hash) #f)))
-    (if (and cfgf
-	     (common:file-exists? cfgf)
-	     (file-write-access? cfgf)
-	     (common:use-cache?))
-	(configf:read-alist cfgf)
-	(let* ((keys   (rmt:get-keys))
-	       (target (common:args-get-target))
-	       (key-vals (if target (keys:target->keyval keys target) #f))
-	       (sections (if target (list "default" target) #f))
-	       (data     (begin
-			   (setenv "MT_RUN_AREA_HOME" *toppath*)
-			   (if key-vals
-			       (for-each (lambda (kt)
-					   (setenv (car kt) (cadr kt)))
-					 key-vals))
-			   ;; (read-config (conc *toppath* "/runconfigs.config") #f #t sections: sections))))
-                           (runconfig:read (conc *toppath* "/runconfigs.config") target #f))))
-	  (if (and rundir ;; have all needed variabless
-		   (directory-exists? rundir)
-		   (file-write-access? rundir))
-	      (begin
-                (if (not (common:in-running-test?))
-                    (configf:write-alist data cfgf))
-		;; force re-read of megatest.config - this resolves circular references between megatest.config
-		(launch:setup force-reread: #t)
-		;; (launch:cache-config) ;; there are two independent config cache locations, turning this one off for now. MRW.
-		)) ;; we can safely cache megatest.config since we have a valid runconfig
-	  data))))
-
-(if (args:get-arg "-show-runconfig")
-    (let ((tl (launch:setup)))
-      (push-directory *toppath*)
-      (let ((data (full-runconfigs-read)))
-	;; keep this one local
-	(cond
-	 ((and (args:get-arg "-section")
-	       (args:get-arg "-var"))
-	  (let ((val (or (configf:lookup data (args:get-arg "-section")(args:get-arg "-var"))
-			 (configf:lookup data "default" (args:get-arg "-var")))))
-	    (if val (print val))))
-	 ((or (not (args:get-arg "-dumpmode"))
-              (string=? (args:get-arg "-dumpmode") "ini"))
-	  (configf:config->ini data))
-	 ((string=? (args:get-arg "-dumpmode") "sexp")
-	  (pp (hash-table->alist data)))
-	 ((string=? (args:get-arg "-dumpmode") "json")
-	  (json-write data))
-	 (else
-	  (debug:print-error 0 *default-log-port* "-dumpmode of " (args:get-arg "-dumpmode") " not recognised")))
-	(set! *didsomething* #t))
-      (pop-directory)))
-
-(if (args:get-arg "-show-config")
-    (let ((tl   (launch:setup))
-	  (data *configdat*)) ;; (read-config "megatest.config" #f #t)))
-      (push-directory *toppath*)
-      ;; keep this one local
-      (cond 
-       ((and (args:get-arg "-section")
-	     (args:get-arg "-var"))
-	(let ((val (configf:lookup data (args:get-arg "-section")(args:get-arg "-var"))))
-	  (if val (print val))))
-
-       ;; print just a section if only -section
-
-       ((equal? (args:get-arg "-dumpmode") "sexp")
-	(pp (hash-table->alist data)))
-       ((equal? (args:get-arg "-dumpmode") "json")
-	(json-write data))
-       ((or (not (args:get-arg "-dumpmode"))
-	    (string=? (args:get-arg "-dumpmode") "ini"))
-	(configf:config->ini data))
-       (else
-	(debug:print-error 0 *default-log-port* "-dumpmode of " (args:get-arg "-dumpmode") " not recognised")))
-      (set! *didsomething* #t)
-      (pop-directory)
-      (set! *time-to-exit* #t)))
-
-(if (args:get-arg "-show-cmdinfo")
-    (if (or (args:get-arg ":value")(getenv "MT_CMDINFO"))
-	(let ((data (common:read-encoded-string (or (args:get-arg ":value")(getenv "MT_CMDINFO")))))
-	  (if (equal? (args:get-arg "-dumpmode") "json")
-	      (json-write data)
-	      (pp data))
-	  (set! *didsomething* #t))
-	(debug:print-info 0 *default-log-port* "environment variable MT_CMDINFO is not set")))
-
-;;======================================================================
-;; Remove old run(s)
-;;======================================================================
-
-;; since several actions can be specified on the command line the removal
-;; is done first
-(define (operate-on action #!key (mode #f)(target-in #f)(runname-in #f)(keys-in #f)(keyvals-in #f)) ;; #f is "use default"
-  (let* ((runrec (runs:runrec-make-record))
-	 (target (or target-in   (common:args-get-target))) ;; eventually get rid of the call to common:args-get-target
-	 (runname (or runname-in
-		      (args:get-arg "-runname"))) ;; eventually get rid of the get-arg calls
-	 (testpatt (or (args:get-arg "-testpatt")
-		       (and (eq? action 'archive) ;; if it is an archive command fallback to MT_TEST_NAME and MT_ITEMPATH
-			    (common:get-full-test-name))
-		       (and (eq? action 'kill-runs)
-			    "%/%") ;; I'm just guessing that this is correct :(
-		       (common:args-get-testpatt #f) ;; (args:get-arg "-testpatt")))
-		       ))) ;;
-    (cond
-     ((not target)
-      (debug:print-error 0 *default-log-port* "Missing required parameter for "
-			 action ", you must specify -target or -reqtarg")
-      (exit 1))
-     ((not runname)
-      (debug:print-error 0 *default-log-port* "Missing required parameter for "
-			 action ", you must specify the run name pattern with -runname patt")
-      (exit 2))
-     ((not testpatt)
-      (debug:print-error 0 *default-log-port* "Missing required parameter for "
-			 action ", you must specify the test pattern with -testpatt")
-      (exit 3))
-     (else
-      (if (not (car *configinfo*))
-	  (begin
-	    (debug:print-error 0 *default-log-port* "Attempted " action "on test(s) but run area config file not found")
-	    (exit 1))
-	  ;; put test parameters into convenient variables
-	  (begin
-	    ;; check for correct version, exit with message if not correct
-	    (common:exit-on-version-changed)
-	    (runs:operate-on  action
-			      target
-			      runname
-			      testpatt
-			      state:  (common:args-get-state)
-			      status: (common:args-get-status)
-			      new-state-status: (args:get-arg "-set-state-status")
-                              mode: mode)))
-      (set! *didsomething* #t)))))
-
-(if (args:get-arg "-kill-runs")
-    (general-run-call 
-     "-kill-runs"
-     "kill runs"
-     (lambda (target runname keys keyvals)
-       (operate-on 'kill-runs mode: #f)
-       )))
-
-(if (args:get-arg "-kill-rerun")
-    (let* ((target-patt (common:args-get-target))
-           (runname-patt (args:get-arg "-runname")))
-      (cond ((not target-patt)
-             (debug:print-error 0 *default-log-port* "Missing target, must specify target for -kill-rerun with -target <target name>")
-             (exit 1))
-            ((not runname-patt)
-             (debug:print-error 0 *default-log-port* "Missing runname, must specify runname for -kill-rerun with -runname <run name>")
-             (exit 1))
-            ((string-search "[ ,%]" target-patt)
-             (debug:print-error 0 *default-log-port* "Invalid target ["target-patt"], must specify exact target (no wildcards) for -kill-rerun with -target <target name>")
-             (exit 1))
-            ((string-search "[ ,%]" runname-patt)
-             (debug:print-error 0 *default-log-port* "Invalid runname ["runname-patt"], must specify exact runname (no wildcards) for -kill-rerun with -runname <runname name>")
-             (exit 1))
-            (else
-             (general-run-call 
-              "-kill-runs"
-              "kill runs"
-              (lambda (target runname keys keyvals)
-                (operate-on 'kill-runs mode: #f)
-                ))
-      
-             (thread-sleep! 15))
-            ;; fall thru and let "-run" loop fire
-            )))
-
-
-(if (args:get-arg "-remove-runs")
-    (general-run-call 
-     "-remove-runs"
-     "remove runs"
-     (lambda (target runname keys keyvals)
-       (operate-on 'remove-runs mode: (if (args:get-arg "-keep-records")
-                                          'remove-data-only
-                                          'remove-all)))))
-
-(if (args:get-arg "-remove-keep")
-    (general-run-call 
-     "-remove-keep"
-     "remove keep"
-     (lambda (target runname keys keyvals)
-       (let ((actions (map string->symbol
-                           (string-split
-			    (or (args:get-arg "-actions")
-				"print")
-			    ",")))) ;; default to printing the output
-         (runs:remove-all-but-last-n-runs-per-target target runname
-						     (string->number (args:get-arg "-remove-keep"))
-						     actions: actions)))))
-
-(if (args:get-arg "-set-state-status")
-    (general-run-call 
-     "-set-state-status"
-     "set state and status"
-     (lambda (target runname keys keyvals)
-       (operate-on 'set-state-status))))
-
-(if (or (args:get-arg "-set-run-status")
-	(args:get-arg "-get-run-status"))
-    (general-run-call
-     "-set-run-status"
-     "set run status"
-     (lambda (target runname keys keyvals)
-       (let* ((runsdat  (rmt:get-runs-by-patt keys runname 
-					(common:args-get-target)
-					#f #f #f #f))
-	      (header   (vector-ref runsdat 0))
-	      (rows     (vector-ref runsdat 1)))
-	 (if (null? rows)
-	     (begin
-	       (debug:print-info 0 *default-log-port* "No matching run found.")
-	       (exit 1))
-	     (let* ((row      (car (vector-ref runsdat 1)))
-		    (run-id   (db:get-value-by-header row header "id")))
-	       (if (args:get-arg "-set-run-status")
-		   (rmt:set-run-status run-id (args:get-arg "-set-run-status") msg: (args:get-arg "-m"))
-		   (print (rmt:get-run-status run-id))
-		   )))))))
-
-;;======================================================================
-;; Query runs
-;;======================================================================
-
-;; -fields runs:id,target,runname,comment+tests:id,testname,item_path+steps
-;;
-;; csi> (extract-fields-constraints "runs:id,target,runname,comment+tests:id,testname,item_path+steps")
-;;         => (("runs" "id" "target" "runname" "comment") ("tests" "id" "testname" "item_path") ("steps"))
-;;
-;;   NOTE: remember that the cdr will be the list you expect (cdr ("runs" "id" "target" "runname" "comment")) => ("id" "target" "runname" "comment")
-;;         and so alist-ref will yield what you expect
-;;
-(define (extract-fields-constraints fields-spec)
-  (map (lambda (table-spec) ;; runs:id,target,runname
-	 (let ((dat (string-split table-spec ":"))) ;; ("runs" "id,target,runname")
-	   (if (> (length dat) 1)
-	       (cons (car dat)(string-split (cadr dat) ",")) ;; "id,target,runname"
-	       dat)))
-       (string-split fields-spec "+")))
-
-(define (get-value-by-fieldname datavec test-field-index fieldname)
-  (let ((indx (hash-table-ref/default test-field-index fieldname #f)))
-    (if indx
-	(if (>= indx (vector-length datavec))
-	    #f ;; index too high, should raise an error I suppose
-	    (vector-ref datavec indx))
-	#f)))
-
-
-
-
-
-(when (args:get-arg "-testdata-csv")
-  (if (launch:setup)
-      (let* ((keys        (rmt:get-keys)) ;; (db:get-keys dbstruct))
-             (runpatt     (or (args:get-arg "-runname") "%"))
-             (testpatt    (common:args-get-testpatt #f))
-             (datapatt    (args:get-arg "-testdata-csv"))
-             (match-data  (string-match "^([^/]+)/(.*)" (args:get-arg "-testdata-csv")))
-             (categorypatt (if match-data (list-ref match-data 1) "%"))
-             (setvarpatt  (if match-data
-                              (list-ref match-data 2)
-                              (args:get-arg "-testdata-csv")))
-             (runsdat     (rmt:get-runs-by-patt keys (or runpatt "%") 
-                                                (common:args-get-target) #f #f '("id" "runname" "state" "status" "owner" "event_time" "comment") 0))
-             (header      (db:get-header runsdat))
-             (access-mode (db:get-access-mode))
-             (testpatt    (common:args-get-testpatt #f))
-             (fields-spec (if (args:get-arg "-fields")
-                              (extract-fields-constraints (args:get-arg "-fields"))
-                              (list (cons "runs" (append keys (list "id" "runname" "state" "status" "owner" "event_time" "comment" "fail_count" "pass_count")))
-                                    (cons "tests"  db:test-record-fields) ;; "id" "testname" "test_path")
-                                    (list "steps" "id" "stepname"))))
-             (tests-spec  (let ((t (alist-ref "tests" fields-spec equal?)))
-                            (if (and t (null? t)) ;; all fields
-                                db:test-record-fields
-                                t)))
-             (adj-tests-spec (delete-duplicates (if tests-spec (cons "id" tests-spec) db:test-record-fields))) 
-             (test-field-index (make-hash-table))
-             (runs (db:get-rows runsdat))
-             )
-        (if (and tests-spec (not (null? tests-spec))) ;; do some validation and processing of the test-spec
-            (let ((invalid-tests-spec (filter (lambda (x)(not (member x db:test-record-fields))) tests-spec)))
-              (if (null? invalid-tests-spec)
-                  ;; generate the lookup map test-field-name => index-number
-                  (let loop ((hed (car adj-tests-spec))
-                             (tal (cdr adj-tests-spec))
-                             (idx 0))
-                    (hash-table-set! test-field-index hed idx)
-                    (if (not (null? tal))(loop (car tal)(cdr tal)(+ idx 1))))
-                  (begin
-                    (debug:print-error 0 *default-log-port* "Invalid test fields specified: " (string-intersperse invalid-tests-spec ", "))
-                    (exit)))))
-        (let* ((table-header (string-split "target,run,test,itempath,category,var,value,comment" ","))
-               (table-rows
-                (apply append (map  
-                               (lambda (run)
-                                 (let* ((target (string-intersperse (map (lambda (x)
-							 (db:get-value-by-header run header x))
-						       keys) "/"))
-                                        (statuses (string-split (or (args:get-arg "-status") "") ","))
-                                        (run-id  (db:get-value-by-header run header "id"))
-                                        (runname (db:get-value-by-header run header "runname")) 
-                                        (states  (string-split (or (args:get-arg "-state") "") ","))
-                                        (tests   (if tests-spec
-                                                     (rmt:get-tests-for-run run-id testpatt states statuses #f #f #f 'testname 'asc ;; (db:get-tests-for-run dbstruct run-id testpatt '() '() #f #f #f 'testname 'asc 
-                                                                        ;; use qryvals if test-spec provided
-                                                                        (if tests-spec
-                                                                            (string-intersperse adj-tests-spec ",")
-                                                                            ;; db:test-record-fields
-                                                                            #f)
-                                                                        #f
-                                                                        'normal)
-                                                     '())))
-                                   (apply append
-                                          (map
-                                           (lambda (test)
-                                             (let* (
-                                                    (test-id      (if (member "id"           tests-spec)(get-value-by-fieldname test test-field-index "id"          ) #f)) ;; (db:test-get-id         test))
-                                                    (testname     (if (member "testname"     tests-spec)(get-value-by-fieldname test test-field-index "testname"    ) #f)) ;; (db:test-get-testname   test))
-                                                    (itempath     (if (member "item_path"    tests-spec)(get-value-by-fieldname test test-field-index "item_path"   ) #f)) ;; (db:test-get-item-path  test))
-                                                    (fullname     (conc testname
-                                                                        (if (equal? itempath "")
-                                                                            "" 
-                                                                            (conc "/" itempath ))))
-                                                    (testdat-raw (map vector->list (rmt:read-test-data-varpatt run-id test-id categorypatt setvarpatt)))
-                                                    (testdat (filter
-                                                              (lambda (x)
-                                                                (not (equal? "logpro"
-                                                                             (list-ref x 10))))
-                                                              testdat-raw)))
-                                               (map 
-                                                (lambda (item)
-                                                  (receive (id test_id category
-                                                               variable value expected
-                                                               tol units comment status type)
-                                                      (apply values item)
-                                                    (list target runname testname itempath category variable value comment)))
-                                                testdat)))
-                                           tests))))
-                               runs))))
-          (print (string-join table-header ","))
-          (for-each (lambda(table-row)
-                      (print (string-join (map ->string table-row) ",")))
-
-                    
-                            table-rows))))
-  (set! *didsomething* #t)
-  (set! *time-to-exit* #t))
-
-
-
-;; NOTE: list-runs and list-db-targets operate on local db!!!
-;;
-;; IDEA: megatest list -runname blah% ...
-;;
-(if (or (args:get-arg "-list-runs")
-	(args:get-arg "-list-db-targets"))
-    (if (launch:setup)
-	(let* (;; (dbstruct    (make-dbr:dbstruct path: *toppath* local: (args:get-arg "-local")))
-	       (runpatt     (args:get-arg "-list-runs"))
-               (access-mode (db:get-access-mode))
-	       (testpatt    (common:args-get-testpatt #f))
-	       ;; (if (args:get-arg "-testpatt") 
-	       ;;  	        (args:get-arg "-testpatt") 
-	       ;;  	        "%"))
-	       (keys        (rmt:get-keys)) ;; (db:get-keys dbstruct))
-	       ;; (runsdat  (db:get-runs dbstruct runpatt #f #f '()))
-	;; (runsdat     (rmt:get-runs-by-patt keys (or runpatt "%") (common:args-get-target) ;; (db:get-runs-by-patt dbstruct keys (or runpatt "%") (common:args-get-target)
-	;; 		           	 #f #f '("id" "runname" "state" "status" "owner" "event_time" "comment") 0))
-	       (runsdat     (rmt:get-runs-by-patt keys (or runpatt "%") 
-                                                  (common:args-get-target) #f #f '("id" "runname" "state" "status" "owner" "event_time" "comment") 0))
-	       (runstmp     (db:get-rows runsdat))
-	       (header      (db:get-header runsdat))
-	       ;; this is "-since" support. This looks at last mod times of <run-id>.db files
-	       ;; and collects those modified since the -since time.
-	       (runs        runstmp)
-                        ;; (if (and (not (null? runstmp))
-			;;        (args:get-arg "-since"))
-			;;   (let ((changed-ids (db:get-changed-run-ids (string->number (args:get-arg "-since")))))
-			;;     (let loop ((hed (car runstmp))
-			;;   	     (tal (cdr runstmp))
-			;;   	     (res '()))
-			;;       (let ((new-res (if (member (db:get-value-by-header hed header "id") changed-ids)
-			;;   		       (cons hed res)
-			;;   		       res)))
-			;;         (if (null? tal)
-			;;   	  (reverse new-res)
-			;;   	  (loop (car tal)(cdr tal) new-res)))))
-			;;   runstmp))
-	       (db-targets  (args:get-arg "-list-db-targets"))
-	       (seen        (make-hash-table))
-	       (dmode       (let ((d (args:get-arg "-dumpmode"))) ;; json, sexpr
-			      (if d (string->symbol d) #f)))
-	       (data        (make-hash-table))
-	       (fields-spec (if (args:get-arg "-fields")
-				(extract-fields-constraints (args:get-arg "-fields"))
-				(list (cons "runs" (append keys (list "id" "runname" "state" "status" "owner" "event_time" "comment" "fail_count" "pass_count")))
-				      (cons "tests"  db:test-record-fields) ;; "id" "testname" "test_path")
-				      (list "steps" "id" "stepname"))))
-	       (runs-spec   (let ((r (alist-ref "runs"  fields-spec equal?))) ;; the check is now unnecessary
-			      (if (and r (not (null? r))) r (list "id" ))))
-	       (tests-spec  (let ((t (alist-ref "tests" fields-spec equal?)))
-			      (if (and t (null? t)) ;; all fields
-				  db:test-record-fields
-				  t)))
-	       (adj-tests-spec (delete-duplicates (if tests-spec (cons "id" tests-spec) db:test-record-fields))) ;; '("id"))))
-	       (steps-spec  (alist-ref "steps" fields-spec equal?))
-	       (test-field-index (make-hash-table)))
-	  (if (and tests-spec (not (null? tests-spec))) ;; do some validation and processing of the test-spec
-	      (let ((invalid-tests-spec (filter (lambda (x)(not (member x db:test-record-fields))) tests-spec)))
-		(if (null? invalid-tests-spec)
-		    ;; generate the lookup map test-field-name => index-number
-		    (let loop ((hed (car adj-tests-spec))
-			       (tal (cdr adj-tests-spec))
-			       (idx 0))
-		      (hash-table-set! test-field-index hed idx)
-		      (if (not (null? tal))(loop (car tal)(cdr tal)(+ idx 1))))
-		    (begin
-		      (debug:print-error 0 *default-log-port* "Invalid test fields specified: " (string-intersperse invalid-tests-spec ", "))
-		      (exit)))))
-	  ;; Each run
-	  (for-each 
-	   (lambda (run)
-	     (let ((targetstr (string-intersperse (map (lambda (x)
-							 (db:get-value-by-header run header x))
-						       keys) "/")))
-	       (if db-targets
-		   (if (not (hash-table-ref/default seen targetstr #f))
-		       (begin
-			 (hash-table-set! seen targetstr #t)
-			 ;; (print "[" targetstr "]"))))
-			 (if (not dmode)
-			     (print targetstr)
-			     (hash-table-set! data "targets" (cons targetstr (hash-table-ref/default data "targets" '())))
-			     )))
-		   (let* ((run-id  (db:get-value-by-header run header "id"))
-			  (runname (db:get-value-by-header run header "runname")) 
-			  (states  (string-split (or (args:get-arg "-state") "") ","))
-			  (statuses (string-split (or (args:get-arg "-status") "") ","))
-			  (tests   (if tests-spec
-				       (rmt:get-tests-for-run run-id testpatt states statuses #f #f #f 'testname 'asc ;; (db:get-tests-for-run dbstruct run-id testpatt '() '() #f #f #f 'testname 'asc 
-							     ;; use qryvals if test-spec provided
-							     (if tests-spec
-								 (string-intersperse adj-tests-spec ",")
-								 ;; db:test-record-fields
-								 #f)
-							     #f
-							     'normal)
-				       '())))
-		     (case dmode
-		       ((json ods sexpr)
-			(if runs-spec
-			    (for-each 
-			     (lambda (field-name)
-			       (mutils:hierhash-set! data (conc (db:get-value-by-header run header field-name)) targetstr runname "meta" field-name))
-			     runs-spec)))
-			;; (mutils:hierhash-set! data (db:get-value-by-header run header "status")     targetstr runname "meta" "status"     )
-			;; (mutils:hierhash-set! data (db:get-value-by-header run header "state")      targetstr runname "meta" "state"      )
-			;; (mutils:hierhash-set! data (conc (db:get-value-by-header run header "id"))  targetstr runname "meta" "id"         )
-			;; (mutils:hierhash-set! data (db:get-value-by-header run header "event_time") targetstr runname "meta" "event_time" )
-			;; (mutils:hierhash-set! data (db:get-value-by-header run header "comment")    targetstr runname "meta" "comment"    )
-			;; ;; add last entry twice - seems to be a bug in hierhash?
-			;; (mutils:hierhash-set! data (db:get-value-by-header run header "comment")    targetstr runname "meta" "comment"    )
-		       (else
-			(if (null? runs-spec)
-			    (print "Run: " targetstr "/" runname 
-				   " status: " (db:get-value-by-header run header "state")
-				   " run-id: " run-id ", number tests: " (length tests)
-				   " event_time: " (db:get-value-by-header run header "event_time"))
-			    (begin
-			      (if (not (member "target" runs-spec))
-			          ;; (display (conc "Target: " targetstr))
-			          (display (conc "Run: " targetstr "/" runname " ")))
-			      (for-each
-			       (lambda (field-name)
-				 (if (equal? field-name "target")
-				     (display (conc "target: " targetstr " "))
-				     (display (conc field-name ": " (db:get-value-by-header run header (conc field-name)) " "))))
-			       runs-spec)
-			      (newline)))))
-		       
-		     (for-each 
-		      (lambda (test)
-		      	(common:debug-handle-exceptions #f
-			 exn
-			 (begin
-			   (debug:print-error 0 *default-log-port* "Bad data in test record? " test)
-			   (debug:print-error 5 *default-log-port* "exn=" (condition->list exn))
-			   (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
-			   (print-call-chain (current-error-port)))
-			 (let* ((test-id      (if (member "id"           tests-spec)(get-value-by-fieldname test test-field-index "id"          ) #f)) ;; (db:test-get-id         test))
-				(testname     (if (member "testname"     tests-spec)(get-value-by-fieldname test test-field-index "testname"    ) #f)) ;; (db:test-get-testname   test))
-				(itempath     (if (member "item_path"    tests-spec)(get-value-by-fieldname test test-field-index "item_path"   ) #f)) ;; (db:test-get-item-path  test))
-				(comment      (if (member "comment"      tests-spec)(get-value-by-fieldname test test-field-index "comment"     ) #f)) ;; (db:test-get-comment    test))
-				(tstate       (if (member "state"        tests-spec)(get-value-by-fieldname test test-field-index "state"       ) #f)) ;; (db:test-get-state      test))
-				(tstatus      (if (member "status"       tests-spec)(get-value-by-fieldname test test-field-index "status"      ) #f)) ;; (db:test-get-status     test))
-				(event-time   (if (member "event_time"   tests-spec)(get-value-by-fieldname test test-field-index "event_time"  ) #f)) ;; (db:test-get-event_time test))
-				(rundir       (if (member "rundir"       tests-spec)(get-value-by-fieldname test test-field-index "rundir"      ) #f)) ;; (db:test-get-rundir     test))
-				(final_logf   (if (member "final_logf"   tests-spec)(get-value-by-fieldname test test-field-index "final_logf"  ) #f)) ;; (db:test-get-final_logf test))
-				(run_duration (if (member "run_duration" tests-spec)(get-value-by-fieldname test test-field-index "run_duration") #f)) ;; (db:test-get-run_duration test))
-				(fullname     (conc testname
-						    (if (equal? itempath "")
-							"" 
-							(conc "(" itempath ")")))))
-			   (case dmode
-			     ((json ods sexpr)
-			      (if tests-spec
-				  (for-each
-				   (lambda (field-name)
-				     (mutils:hierhash-set! data  (get-value-by-fieldname test test-field-index field-name) targetstr runname "data" (conc test-id) field-name))
-				   tests-spec)))
-			     ;; ;; (mutils:hierhash-set! data  fullname   targetstr runname "data" (conc test-id) "tname"     )
-			     ;;  (mutils:hierhash-set! data  testname   targetstr runname "data" (conc test-id) "testname"  )
-			     ;;  (mutils:hierhash-set! data  itempath   targetstr runname "data" (conc test-id) "itempath"  )
-			     ;;  (mutils:hierhash-set! data  comment    targetstr runname "data" (conc test-id) "comment"   )
-			     ;;  (mutils:hierhash-set! data  tstate     targetstr runname "data" (conc test-id) "state"     )
-			     ;;  (mutils:hierhash-set! data  tstatus    targetstr runname "data" (conc test-id) "status"    )
-			     ;;  (mutils:hierhash-set! data  rundir     targetstr runname "data" (conc test-id) "rundir"    )
-			     ;;  (mutils:hierhash-set! data  final_logf targetstr runname "data" (conc test-id) "final_logf")
-			     ;;  (mutils:hierhash-set! data  run_duration targetstr runname "data" (conc test-id) "run_duration")
-			     ;;  (mutils:hierhash-set! data  event-time targetstr runname "data" (conc test-id) "event_time")
-			     ;;  ;; add last entry twice - seems to be a bug in hierhash?
-			     ;;  (mutils:hierhash-set! data  event-time targetstr runname "data" (conc test-id) "event_time")
-			     ;;  )
-			     (else
-			      (if (and tstate tstatus event-time)
-				  (format #t
-					  "  Test: ~25a State: ~15a Status: ~15a Runtime: ~5@as Time: ~22a Host: ~10a\n"
-					  (if fullname fullname "")
-					  (if tstate   tstate   "")
-					  (if tstatus  tstatus  "")
-					  (get-value-by-fieldname test test-field-index "run_duration");;(if test     (db:test-get-run_duration test) "")
-					  (if event-time event-time "")
-					  (get-value-by-fieldname test test-field-index "host")) ;;(if test (db:test-get-host test)) "")
-				  (print "  Test: " fullname
-					 (if tstate  (conc " State: "  tstate)  "")
-					 (if tstatus (conc " Status: " tstatus) "")
-					 (if (get-value-by-fieldname test test-field-index "run_duration")
-					     (conc " Runtime: " (get-value-by-fieldname test test-field-index "run_duration"))
-					     "")
-					 (if event-time (conc " Time: " event-time) "")
-					 (if (get-value-by-fieldname test test-field-index "host")
-					     (conc " Host: " (get-value-by-fieldname test test-field-index "host"))
-					     "")))
-			      (if (not (or (equal? (get-value-by-fieldname test test-field-index "status") "PASS")
-					   (equal? (get-value-by-fieldname test test-field-index "status") "WARN")
-					   (equal? (get-value-by-fieldname test test-field-index "state")  "NOT_STARTED")))
-				  (begin
-				    (print   (if (get-value-by-fieldname test test-field-index "cpuload")
-						 (conc "         cpuload:  "   (get-value-by-fieldname test test-field-index "cpuload"))
-						 "") ;; (db:test-get-cpuload test)
-					     (if (get-value-by-fieldname test test-field-index "diskfree")
-						 (conc "\n         diskfree: " (get-value-by-fieldname test test-field-index "diskfree")) ;; (db:test-get-diskfree test)
-						 "")
-					     (if (get-value-by-fieldname test test-field-index "uname")
-						 (conc "\n         uname:    " (get-value-by-fieldname test test-field-index "uname")) ;; (db:test-get-uname test)
-						 "")
-					     (if (get-value-by-fieldname test test-field-index "rundir")
-						 (conc "\n         rundir:   " (get-value-by-fieldname test test-field-index "rundir")) ;; (db:test-get-rundir test)
-						 "")
-;;					     "\n         rundir:   " (get-value-by-fieldname test test-field-index "") ;; (sdb:qry 'getstr ;; (filedb:get-path *fdb* 
-;; 					     (db:test-get-rundir test) ;; )
-					     )
-				    ;; Each test
-				    ;; DO NOT remote run
-				    (let ((steps (rmt:get-steps-for-test run-id (db:test-get-id test)))) ;; (db:get-steps-for-test dbstruct run-id (db:test-get-id test))))
-				      (for-each 
-				       (lambda (step)
-					 (format #t 
-						 "    Step: ~20a State: ~10a Status: ~10a Time ~22a\n"
-						 (tdb:step-get-stepname step)
-						 (tdb:step-get-state step)
-						 (tdb:step-get-status step)
-						 (tdb:step-get-event_time step)))
-				       steps)))))))))
-		      (if (args:get-arg "-sort")
-			  (sort tests
-				(lambda (a-test b-test)
-				  (let* ((key    (args:get-arg "-sort"))
-					 (first  (get-value-by-fieldname a-test test-field-index key))
-					 (second (get-value-by-fieldname b-test test-field-index key)))
-				    ((cond 
-				      ((and (number? first)(number? second)) <)
-				      ((and (string? first)(string? second)) string<=?)
-				      (else equal?))
-				     first second))))
-			  tests))))))
-	   runs)
-	  (case dmode
-	    ((json)  (json-write data))
-	    ((sexpr) (pp (common:to-alist data))))
-	  (let* ((metadat-fields (delete-duplicates
-				  (append keys '( "runname" "time" "owner" "pass_count" "fail_count" "state" "status" "comment" "id"))))
-		 (run-fields    '(
-				  "testname"
-				  "item_path"
-				  "state"
-				  "status"
-				  "comment"
-				  "event_time"
-				  "host"
-				  "run_id"
-				  "run_duration"
-				  "attemptnum"
-				  "id"
-				  "archived"
-				  "diskfree"
-				  "cpuload"
-				  "final_logf"
-				  "shortdir"
-				  "rundir"
-				  "uname"
-				  )
-				)
-		 (newdat          (common:to-alist data))
-		 (allrundat       (if (null? newdat)
-				      '()
-				      (car (map cdr newdat)))) ;; (car (map cdr (car (map cdr newdat)))))
-		 (runs            (append
-				   (list "runs" ;; sheetname
-					 metadat-fields)
-				   (map (lambda (run)
-					  ;; (print "run: " run)
-					  (let* ((runname (car run))
-						 (rundat  (cdr run))
-						 (metadat (let ((tmp (assoc "meta" rundat)))
-							    (if tmp (cdr tmp) #f))))
-					    ;; (print "runname: " runname "\n\nrundat: " )(pp rundat)(print "\n\nmetadat: ")(pp metadat)
-					    (if metadat
-						(map (lambda (field)
-						       (let ((tmp (assoc field metadat)))
-							 (if tmp (cdr tmp) "")))
-						     metadat-fields)
-						(begin
-						  (debug:print 0 *default-log-port* "WARNING: meta data for run " runname " not found")
-						  '()))))
-					allrundat)))
-		 ;; '( ( "target" ( "runname" ( "data" ( "runid" ( "id . "37" ) ( ... ))))
-		 (run-pages      (map (lambda (targdat)
-					(let* ((target  (car targdat))
-					       (runsdat (cdr targdat)))
-					  (if runsdat
-					      (map (lambda (rundat)
-						     (let* ((runname  (car rundat))
-							    (rundat   (cdr rundat))
-							    (testsdat (let ((tmp (assoc "data" rundat)))
-									(if tmp (cdr tmp) #f))))
-						       (if testsdat
-							   (let ((tests (map (lambda (test)
-									       (let* ((test-id  (car test))
-										      (test-dat (cdr test)))
-										 (map (lambda (field)
-											(let ((tmp (assoc field test-dat)))
-											  (if tmp (cdr tmp) "")))
-										      run-fields)))
-									     testsdat)))
-							     ;; (print "Target: " target "/" runname " tests:")
-							     ;; (pp tests)
-							     (cons (conc target "/" runname)
-								   (cons (list (conc target "/" runname))
-									 (cons '()
-									       (cons run-fields tests)))))
-							   (begin
-							     (debug:print 4 *default-log-port* "WARNING: run " target "/" runname " appears to have no data")
-							     ;; (pp rundat)
-							     '()))))
-						   runsdat)
-					      '())))
-				      newdat)) ;; we use newdat to get target
-		 (sheets         (filter (lambda (x)
-					   (not (null? x)))
-					 (cons runs (map car run-pages)))))
-	    ;; (print "allrundat:")
-	    ;; (pp allrundat)
-	    ;; (print "runs:")
-	    ;; (pp runs)
-	    ;(print "sheets: ")
-	    ;; (pp sheets)
-	    (if (eq? dmode 'ods)
-		(let* ((tempdir    (conc "/tmp/" (current-user-name) "/" (random 10000) "_" (current-process-id)))
-		       (outputfile (or (args:get-arg "-o") "out.ods"))
-		       (ouf        (if (string-match (regexp "^[/~]+.*") outputfile) ;; full path?
-				       outputfile
-				       (begin
-					 (debug:print 0 *default-log-port* "WARNING: path given, " outputfile " is relative, prefixing with current directory")
-					 (conc (current-directory) "/" outputfile)))))
-		  (create-directory tempdir #t)
-		  (ods:list->ods tempdir ouf sheets))))
-	  ;; (system (conc "rm -rf " tempdir))
-	  (set! *didsomething* #t)
-          (set! *time-to-exit* #t)
-          ) ;; end if true branch (end of a let)
-        ) ;; end if
-    ) ;; end if -list-runs
-
-;; list-waivers
-(if (and (args:get-arg "-list-waivers")
-	 (launch:setup))
-    (let* ((runpatt     (or (args:get-arg "-runname") "%"))
-	   (testpatt    (common:args-get-testpatt #f))
-	   (keys        (rmt:get-keys)) 
-	   (runsdat     (rmt:get-runs-by-patt
-			 keys runpatt 
-			 (common:args-get-target) #f #f
-			 '("id" "runname" "state" "status" "owner" "event_time" "comment") 0))
-	   (runs        (db:get-rows runsdat))
-	   (header      (db:get-header runsdat))
-	   (results     (make-hash-table))  ;; [target] ( (testname/itempath . "comment") ... )
-	   (addtest     (lambda (target testname itempath comment)
-			  (hash-table-set! results target (cons (cons (conc testname "/" itempath) comment)
-								(hash-table-ref/default results target '())))))
-	   (last-target #f))
-      (for-each
-       (lambda (run)
-	 (let* ((run-id  (db:get-value-by-header run header "id"))
-		(target  (rmt:get-target run-id))
-		(runname (db:get-value-by-header run header "runname")) 
-		(tests   (rmt:get-tests-for-run
-			  run-id testpatt '("COMPLETED") '("WAIVED") #f #f #f 'testname 'asc							     ;; use qryvals if test-spec provided
-			  #f #f #f)))
-	   (if (not (equal? target last-target))
-	       (print "[" target "]"))
-	   (set! last-target target)
-	   (print "# " runname)
-	   (for-each
-	    (lambda (testdat)
-	      (let* ((testfullname (conc (db:test-get-testname testdat)
-					 (if (equal? "" (db:test-get-item-path testdat))
-					     ""
-					     (conc "/" (db:test-get-item-path testdat)))
-					 )))
-	      (print testfullname " " (db:test-get-comment testdat))))
-	    tests)))
-       runs)
-      (set! *didsomething* #t)))
-      
-;;======================================================================
-;; full run
-;;======================================================================
-
-(define (handle-run-requests target runname keys keyvals need-clean)	 
-  (if (or (args:get-arg "-kill-rerun") (args:get-arg "-rerun-clean")) ;; first set states/statuses correct
-      ;; For rerun-clean do we or do we not support the testpatt?
-      (let ((states   (or (configf:lookup *configdat* "validvalues" "cleanrerun-states")
-			  "KILLREQ,KILLED,UNKNOWN,INCOMPLETE,STUCK,NOT_STARTED"))
-	    (statuses (or (configf:lookup *configdat* "validvalues" "cleanrerun-statuses")
-			  "FAIL,INCOMPLETE,ABORT,CHECK,DEAD,PREQ_FAIL,PREQ_DISCARDED")))
-	(hash-table-set! args:arg-hash "-preclean" #t)
-	(runs:operate-on 'set-state-status
-			 target
-			 (common:args-get-runname)  ;; (or (args:get-arg "-runname")(args:get-arg ":runname"))
-			 ;; "%" ;; (common:args-get-testpatt #f) ;; (args:get-arg "-testpatt")
-			 (common:args-get-testpatt #f) ;; (args:get-arg "-testpatt")
-			 state:  states
-			 ;; status: statuses
-			 new-state-status: "NOT_STARTED,n/a")
-	(runs:clean-cache target runname *toppath*)
-	(runs:operate-on 'set-state-status
-			 target
-			 (common:args-get-runname)  ;; (or (args:get-arg "-runname")(args:get-arg ":runname"))
-			 ;; "%" ;; (common:args-get-testpatt #f) ;; (args:get-arg "-testpatt")
-			 (common:args-get-testpatt #f) ;; (args:get-arg "-testpatt")
-			 ;; state:  states
-			 status: statuses
-			 new-state-status: "NOT_STARTED,n/a")))
-  ;; RERUN ALL
-  (if (args:get-arg "-rerun-all") ;; first set states/statuses correct
-      (let* ((rconfig (full-runconfigs-read)))
-	(hash-table-set! args:arg-hash "-preclean" #t)
-	(runs:operate-on 'set-state-status
-			 target
-			 (common:args-get-runname)  ;; (or (args:get-arg "-runname")(args:get-arg ":runname"))
-			 (common:args-get-testpatt rconfig) ;; (args:get-arg "-testpatt")
-			 state:  #f
-			 ;; status: statuses
-			 new-state-status: "NOT_STARTED,n/a")
-	(runs:clean-cache target runname *toppath*)
-	(runs:operate-on 'set-state-status
-			 target
-			 (common:args-get-runname)  ;; (or (args:get-arg "-runname")(args:get-arg ":runname"))
-			 (common:args-get-testpatt rconfig) ;; (args:get-arg "-testpatt")
-			 ;; state:  states
-			 status: #f
-			 new-state-status: "NOT_STARTED,n/a")))
-  (let* ((config-reruns      (let ((x (configf:lookup *configdat* "setup" "reruns")))
-			       (if x (string->number x) #f)))
-	 (rerun-cnt (if config-reruns
-			config-reruns
-			1)))
-
-    (runs:run-tests target
-		    runname
-		    #f ;; (common:args-get-testpatt #f)
-		    ;; (or (args:get-arg "-testpatt")
-		    ;;     "%")
-		    user
-		    args:arg-hash
-		    run-count: rerun-cnt)))
-
-;; get lock in db for full run for this directory
-;; for all tests with deps
-;;   walk tree of tests to find head tasks
-;;   add head tasks to task queue
-;;   add dependant tasks to task queue 
-;;   add remaining tasks to task queue
-;; for each task in task queue
-;;   if have adequate resources
-;;     launch task
-;;   else
-;;     put task in deferred queue
-;; if still ok to run tasks
-;;   process deferred tasks per above steps
-
-;; run all tests are are Not COMPLETED and PASS or CHECK
-(if (or (args:get-arg "-runall")
-	(args:get-arg "-run")
-	(args:get-arg "-rerun-clean")
-	(args:get-arg "-rerun-all")
-	(args:get-arg "-runtests")
-        (args:get-arg "-kill-rerun"))
-    (let ((need-clean (or (args:get-arg "-rerun-clean")
-                          (args:get-arg "-rerun-all")))
-	  (orig-cmdline (string-intersperse (argv) " ")))
-      (general-run-call 
-       "-runall"
-       "run all tests"
-       (lambda (target runname keys keyvals)
-	 (if (or (string-search "%" target)
-		 (string-search "%" runname)) ;; we are being asked to re-run multiple runs
-	     (let* ((run-specs (rmt:simple-get-runs runname #f #f target #f))) ;; list of simple-run records
-	       (debug:print-info 0 *default-log-port* "Pattern supplied for target or runname with "
-				 (length run-specs) " matches round. Running each in turn.")
-	       (if (null? run-specs)
-		   (debug:print 0 *default-log-port* "WARNING: No runs match target " target " and runname " runname))
-	       (for-each (lambda (spec) 
-			   (let* ((precmd     (if (args:get-arg "-precmd")(conc (args:get-arg "-precmd") " ") ""))
-				  (newcmdline (conc
-					       precmd
-					       (string-substitute
-						(conc "target " target)
-						(conc "target " (simple-run-target spec))
-						(string-substitute
-						 (conc "runname " runname)
-						 (conc "runname " (simple-run-runname spec))
-						 orig-cmdline)))))
-			     (debug:print 0 *default-log-port* "ORIG: " orig-cmdline)
-			     (debug:print 0 *default-log-port* "NEW:  " newcmdline)
-			     (system newcmdline)))
-			 run-specs))
-	     (handle-run-requests target runname keys keyvals need-clean))))))
-
-;;======================================================================
-;; run one test
-;;======================================================================
-
-;; 1. find the config file
-;; 2. change to the test directory
-;; 3. update the db with "test started" status, set running host
-;; 4. process launch the test
-;;    - monitor the process, update stats in the db every 2^n minutes
-;; 5. as the test proceeds internally it calls megatest as each step is
-;;    started and completed
-;;    - step started, timestamp
-;;    - step completed, exit status, timestamp
-;; 6. test phone home
-;;    - if test run time > allowed run time then kill job
-;;    - if cannot access db > allowed disconnect time then kill job
-
-;; == duplicated == (if (or (args:get-arg "-run")(args:get-arg "-runtests"))
-;; == duplicated ==   (general-run-call 
-;; == duplicated ==    "-runtests" 
-;; == duplicated ==    "run a test" 
-;; == duplicated ==    (lambda (target runname keys keyvals)
-;; == duplicated ==      ;;
-;; == duplicated ==      ;; May or may not implement it this way ...
-;; == duplicated ==      ;;
-;; == duplicated ==      ;; Insert this run into the tasks queue
-;; == duplicated ==      ;; (open-run-close tasks:add tasks:open-db 
-;; == duplicated ==      ;;    	     "runtests" 
-;; == duplicated ==      ;;    	     user
-;; == duplicated ==      ;;    	     target
-;; == duplicated ==      ;;    	     runname
-;; == duplicated ==      ;;    	     (args:get-arg "-runtests")
-;; == duplicated ==      ;;    	     #f))))
-;; == duplicated ==      (runs:run-tests target
-;; == duplicated == 		     runname
-;; == duplicated == 		     (common:args-get-testpatt #f) ;; (args:get-arg "-runtests")
-;; == duplicated == 		     user
-;; == duplicated == 		     args:arg-hash))))
-
-;;======================================================================
-;; Rollup into a run
-;;======================================================================
-
-(if (args:get-arg "-rollup")
-    (general-run-call 
-     "-rollup" 
-     "rollup tests" 
-     (lambda (target runname keys keyvals)
-       (runs:rollup-run keys
-			keyvals
-			(or (args:get-arg "-runname")(args:get-arg ":runname") )
-			user))))
-
-;;======================================================================
-;; Lock or unlock a run
-;;======================================================================
-
-(if (or (args:get-arg "-lock")(args:get-arg "-unlock"))
-    (general-run-call 
-     (if (args:get-arg "-lock") "-lock" "-unlock")
-     "lock/unlock tests" 
-     (lambda (target runname keys keyvals)
-       (runs:handle-locking 
-		  target
-		  keys
-		  (or (args:get-arg "-runname")(args:get-arg ":runname") )
-		  (args:get-arg "-lock")
-		  (args:get-arg "-unlock")
-		  user))))
-
-;;======================================================================
-;; Get paths to tests
-;;======================================================================
-;; Get test paths matching target, runname, and testpatt
-(if (or (args:get-arg "-test-files")(args:get-arg "-test-paths"))
-    ;; if we are in a test use the MT_CMDINFO data
-    (if (getenv "MT_CMDINFO")
-	(let* ((startingdir (current-directory))
-	       (cmdinfo   (common:read-encoded-string (getenv "MT_CMDINFO")))
-	       (transport (assoc/default 'transport cmdinfo))
-	       (testpath  (assoc/default 'testpath  cmdinfo))
-	       (test-name (assoc/default 'test-name cmdinfo))
-	       (runscript (assoc/default 'runscript cmdinfo))
-	       (db-host   (assoc/default 'db-host   cmdinfo))
-	       (run-id    (assoc/default 'run-id    cmdinfo))
-	       (itemdat   (assoc/default 'itemdat   cmdinfo))
-	       (state     (args:get-arg ":state"))
-	       (status    (args:get-arg ":status"))
-	       ;;(target    (args:get-arg "-target"))
-	       (target    (common:args-get-target))
-	       (toppath   (assoc/default 'toppath   cmdinfo)))
-	  (change-directory toppath)
-	  (if (not target)
-	      (begin
-		(debug:print-error 0 *default-log-port* "-target is required.")
-		(exit 1)))
-	  (if (not (launch:setup))
-	      (begin
-		(debug:print 0 *default-log-port* "Failed to setup, giving up on -test-paths or -test-files, exiting")
-		(exit 1)))
-	  (let* ((keys     (rmt:get-keys))
-		 ;; db:test-get-paths must not be run remote
-		 (paths    (tests:test-get-paths-matching keys target (args:get-arg "-test-files"))))
-	    (set! *didsomething* #t)
-	    (for-each (lambda (path)
-			(if (common:file-exists? path)
-			(print path)))	
-		      paths)))
-	;; else do a general-run-call
-	(general-run-call 
-	 "-test-files"
-	 "Get paths to test"
-	 (lambda (target runname keys keyvals)
-	   (let* ((db       #f)
-		  ;; DO NOT run remote
-		  (paths    (tests:test-get-paths-matching keys target (args:get-arg "-test-files"))))
-	     (for-each (lambda (path)
-			 (print path))
-		       paths))))))
-
-;;======================================================================
-;; Archive tests
-;;======================================================================
-;; Archive tests matching target, runname, and testpatt
-(if (equal? (args:get-arg "-archive") "replicate-db")
-    (begin
-          ;; check if source
-          ;; check if megatest.db exist
-         (launch:setup)
-         (if (not (args:get-arg "-source"))
-             (begin 
-             (debug:print-info 1 *default-log-port* "Missing required argument -source <archive path>")
-             (exit 1)))
-         (if (common:file-exists? (conc  *toppath* "/megatest.db"))
-             (begin  
-               (debug:print-info 1 *default-log-port* "File " (conc  *toppath* "/megatest.db") " already exists. Please remove it before trying to replicate db")
-               (exit 1)))
-         (if (and (common:get-db-tmp-area) (> (length (directory   (common:get-db-tmp-area) #f)) 0))
-           (begin
-           (debug:print-info 1 *default-log-port* (common:get-db-tmp-area) " not empty. Please remove it before trying to replicate db")
-           (exit 1)))    
-          ;; check if timestamp 
-          (let* ((source (args:get-arg "-source"))
-                (src     (if (not (equal? (substring source 0 1) "/"))
-                             (conc (current-directory) "/" source)
-                             source))
-                (ts (if (args:get-arg "-time-stamp")   (args:get-arg "-time-stamp") "latest")))
-              (if  (common:directory-exists? src)
-                  (begin 
-                  (archive:restore-db src ts)
-            (set! *didsomething* #t))
-       (begin
-         (debug:print-error 1 *default-log-port* "Path " source " not found")
-         (exit 1))))))   
-    ;; else do a general-run-call
-   (if (and (args:get-arg "-archive") (not (equal? (args:get-arg "-archive") "replicate-db"))) 
-    (begin
-      ;; for the archive get we need to preserve the starting dir as part of the target path
-      (if (and (args:get-arg "-dest")
-	       (not (equal? (substring (args:get-arg "-dest") 0 1) "/")))
-	  (let ((newpath  (conc (current-directory) "/" (args:get-arg "-dest"))))
-	    (debug:print-info 1 *default-log-port* "Preserving original path to destination, was " (args:get-arg "-dest") ", now " newpath)
-	    (hash-table-set! args:arg-hash "-dest" newpath)))
-      (general-run-call 
-       "-archive"
-       "Archive"
-       (lambda (target runname keys keyvals)
-	 (operate-on 'archive target-in: target runname-in: runname )))))
-
-;;======================================================================
-;; Extract a spreadsheet from the runs database
-;;======================================================================
-
-(if (args:get-arg "-extract-ods")
-    (general-run-call
-     "-extract-ods"
-     "Make ods spreadsheet"
-     (lambda (target runname keys keyvals)
-       (let ((dbstruct   (make-dbr:dbstruct path: *toppath* local: #t))
-	     (outputfile (args:get-arg "-extract-ods"))
-	     (runspatt   (or (args:get-arg "-runname")(args:get-arg ":runname")))
-	     (pathmod    (args:get-arg "-pathmod")))
-	     ;; (keyvalalist (keys->alist keys "%")))
-	 (debug:print 2 *default-log-port* "Extract ods, outputfile: " outputfile " runspatt: " runspatt " keyvals: " keyvals)
-	 (db:extract-ods-file dbstruct outputfile keyvals (if runspatt runspatt "%") pathmod)
-	 (db:close-all dbstruct)
-	 (set! *didsomething* #t)))))
-
-;;======================================================================
-;; execute the test
-;;    - gets called on remote host
-;;    - receives info from the -execute param
-;;    - passes info to steps via MT_CMDINFO env var (future is to use a dot file)
-;;    - gathers host info and 
-;;======================================================================
-
-(if (args:get-arg "-execute")
-    (begin
-      (launch:execute (args:get-arg "-execute"))
-      (set! *didsomething* #t)))
-
-;;======================================================================
-;; recover from a test where the managing mtest was killed but the underlying
-;; process might still be salvageable
-;;======================================================================
-
-(if (args:get-arg "-recover-test")
-    (let* ((params (string-split (args:get-arg "-recover-test") ",")))
-      (if (> (length params) 1) ;; run-id and test-id
-	  (let ((run-id (string->number (car params)))
-		(test-id (string->number (cadr params))))
-	    (if (and run-id test-id)
-		(begin
-		  (launch:recover-test run-id test-id)
-		  (set! *didsomething* #t))
-		(begin
-		  (debug:print-error 0 *default-log-port* "bad run-id or test-id, must be integers")
-		  (exit 1)))))))
-
-;;======================================================================
-;; Test commands (i.e. for use inside tests)
-;;======================================================================
-
-(define (megatest:step step state status logfile msg)
-  (if (not (getenv "MT_CMDINFO"))
-      (begin
-	(debug:print-error 0 *default-log-port* "MT_CMDINFO env var not set, -step must be called *inside* a megatest invoked environment!")
-	(exit 5))
-      (let* ((cmdinfo   (common:read-encoded-string (getenv "MT_CMDINFO")))
-	     (transport (assoc/default 'transport cmdinfo))
-	     (testpath  (assoc/default 'testpath  cmdinfo))
-	     (test-name (assoc/default 'test-name cmdinfo))
-	     (runscript (assoc/default 'runscript cmdinfo))
-	     (db-host   (assoc/default 'db-host   cmdinfo))
-	     (run-id    (assoc/default 'run-id    cmdinfo))
-	     (test-id   (assoc/default 'test-id   cmdinfo))
-	     (itemdat   (assoc/default 'itemdat   cmdinfo))
-	     (work-area (assoc/default 'work-area cmdinfo))
-	     (db        #f))
-	(change-directory testpath)
-	(if (not (launch:setup))
-	    (begin
-	      (debug:print 0 *default-log-port* "Failed to setup, exiting")
-	      (exit 1)))
-	(if (and state status)
-	    (let ((comment (launch:load-logpro-dat run-id test-id step)))
-	      ;; (rmt:test-set-log! run-id test-id (conc stepname ".html"))))
-	      (rmt:teststep-set-status! run-id test-id step state status (or comment msg) logfile))
-	    (begin
-	      (debug:print-error 0 *default-log-port* "You must specify :state and :status with every call to -step")
-	      (exit 6))))))
-
-(if (args:get-arg "-step")
-    (begin
-      (thread-sleep! 1.5)
-      (megatest:step 
-       (args:get-arg "-step")
-       (or (args:get-arg "-state")(args:get-arg ":state"))
-       (or (args:get-arg "-status")(args:get-arg ":status"))
-       (args:get-arg "-setlog")
-       (args:get-arg "-m"))
-      ;; (if db (sqlite3:finalize! db))
-      (set! *didsomething* #t)
-      (thread-sleep! 1.5)))
-    
-(if (or (args:get-arg "-setlog")       ;; since setting up is so costly lets piggyback on -test-status
-	;;     (not (args:get-arg "-step")))  ;; -setlog may have been processed already in the "-step" previous
-	;;     NEW POLICY - -setlog sets test overall log on every call.
-	(args:get-arg "-set-toplog")
-	(args:get-arg "-test-status")
-	(args:get-arg "-set-values")
-	(args:get-arg "-load-test-data")
-	(args:get-arg "-runstep")
-	(args:get-arg "-summarize-items"))
-    (if (not (getenv "MT_CMDINFO"))
-	(begin
-	  (debug:print-error 0 *default-log-port* "MT_CMDINFO env var not set, commands -test-status, -runstep and -setlog must be called *inside* a megatest environment!")
-	  (exit 5))
-	(let* ((startingdir (current-directory))
-	       (cmdinfo   (common:read-encoded-string (getenv "MT_CMDINFO")))
-	       (transport (assoc/default 'transport cmdinfo))
-	       (testpath  (assoc/default 'testpath  cmdinfo))
-	       (test-name (assoc/default 'test-name cmdinfo))
-	       (runscript (assoc/default 'runscript cmdinfo))
-	       (db-host   (assoc/default 'db-host   cmdinfo))
-	       (run-id    (assoc/default 'run-id    cmdinfo))
-	       (test-id   (assoc/default 'test-id   cmdinfo))
-	       (itemdat   (assoc/default 'itemdat   cmdinfo))
-	       (work-area (assoc/default 'work-area cmdinfo))
-	       (db        #f) ;; (open-db))
-	       (state     (args:get-arg ":state"))
-	       (status    (args:get-arg ":status"))
-	       (stepname  (args:get-arg "-step")))
-	  (if (not (launch:setup))
-	      (begin
-		(debug:print 0 *default-log-port* "Failed to setup, exiting")
-		(exit 1)))
-
-	  (if (args:get-arg "-runstep")(debug:print-info 1 *default-log-port* "Running -runstep, first change to directory " work-area))
-	  (change-directory work-area)
-	  ;; can setup as client for server mode now
-	  ;; (client:setup)
-
-	  (if (args:get-arg "-load-test-data")
-	      ;; has sub commands that are rdb:
-	      ;; DO NOT put this one into either rmt: or open-run-close
-	      (tdb:load-test-data run-id test-id))
-	  (if (args:get-arg "-setlog")
-	      (let ((logfname (args:get-arg "-setlog")))
-		(rmt:test-set-log! run-id test-id logfname)))
-	  (if (args:get-arg "-set-toplog")
-	      ;; DO NOT run remote
-	      (tests:test-set-toplog! run-id test-name (args:get-arg "-set-toplog")))
-	  (if (args:get-arg "-summarize-items")
-	      ;; DO NOT run remote
-	      (tests:summarize-items run-id test-id test-name #t)) ;; do force here
-	  (if (args:get-arg "-runstep")
-	      (if (null? remargs)
-		  (begin
-		    (debug:print-error 0 *default-log-port* "nothing specified to run!")
-		    (if db (sqlite3:finalize! db))
-		    (exit 6))
-		  (let* ((stepname   (args:get-arg "-runstep"))
-			 (logprofile (args:get-arg "-logpro"))
-			 (logfile    (conc stepname ".log"))
-			 (cmd        (if (null? remargs) #f (car remargs)))
-			 (params     (if cmd (cdr remargs) '()))
-			 (exitstat   #f)
-			 (shell      (let ((sh (get-environment-variable "SHELL") ))
-				       (if sh 
-					   (last (string-split sh "/"))
-					   "bash")))
-			 (redir      (case (string->symbol shell)
-				       ((tcsh csh ksh)    ">&")
-				       ((zsh bash sh ash) "2>&1 >")
-				       (else ">&")))
-			 (fullcmd    (conc "(" (string-intersperse 
-						(cons cmd params) " ")
-					   ") " redir " " logfile)))
-		    ;; mark the start of the test
-		    (rmt:teststep-set-status! run-id test-id stepname "start" "n/a" (args:get-arg "-m") logfile)
-		    ;; run the test step
-		    (debug:print-info 2 *default-log-port* "Running \"" fullcmd "\" in directory \"" startingdir)
-		    (change-directory startingdir)
-		    (set! exitstat (system fullcmd))
-		    (set! *globalexitstatus* exitstat)
-		    ;; (change-directory testpath)
-		    ;; run logpro if applicable ;; (process-run "ls" (list "/foo" "2>&1" "blah.log"))
-		    (if logprofile
-			(let* ((htmllogfile (conc stepname ".html"))
-			       (oldexitstat exitstat)
-			       (cmd         (string-intersperse (list "logpro" logprofile htmllogfile "<" logfile ">" (conc stepname "_logpro.log")) " ")))
-			  (debug:print-info 2 *default-log-port* "running \"" cmd "\"")
-			  (change-directory startingdir)
-			  (set! exitstat (system cmd))
-			  (set! *globalexitstatus* exitstat) ;; no necessary
-			  (change-directory testpath)
-			  (rmt:test-set-log! run-id test-id htmllogfile)))
-		    (let ((msg (args:get-arg "-m")))
-		      (rmt:teststep-set-status! run-id test-id stepname "end" exitstat msg logfile))
-		    )))
-	  (if (or (args:get-arg "-test-status")
-		  (args:get-arg "-set-values"))
-	      (let ((newstatus (cond
-				((number? status)       (if (equal? status 0) "PASS" "FAIL"))
-				((and (string? status)
-				      (string->number status))(if (equal? (string->number status) 0) "PASS" "FAIL"))
-				(else status)))
-		    ;; transfer relevant keys into a hash to be passed to test-set-status!
-		    ;; could use an assoc list I guess. 
-		    (otherdata (let ((res (make-hash-table)))
-				 (for-each (lambda (key)
-					     (if (args:get-arg key)
-						 (hash-table-set! res key (args:get-arg key))))
-					   (list ":value" ":tol" ":expected" ":first_err" ":first_warn" ":units" ":category" ":variable"))
-				 res)))
-		(if (and (args:get-arg "-test-status")
-			 (or (not state)
-			     (not status)))
-		    (begin
-		      (debug:print-error 0 *default-log-port* "You must specify :state and :status with every call to -test-status\n" help)
-		      (if (sqlite3:database? db)(sqlite3:finalize! db))
-		      (exit 6)))
-		(let* ((msg    (args:get-arg "-m"))
-		       (numoth (length (hash-table-keys otherdata))))
-		  ;; Convert to rpc inside the tests:test-set-status! call, not here
-		  (tests:test-set-status! run-id test-id state newstatus msg otherdata work-area: work-area))))
-	  (if (sqlite3:database? db)(sqlite3:finalize! db))
-	  (set! *didsomething* #t))))
-
-;;======================================================================
-;; Various helper commands can go below here
-;;======================================================================
-
-(if (or (args:get-arg "-showkeys")
-        (args:get-arg "-show-keys"))
-    (let ((db #f)
-	  (keys #f))
-      (if (not (launch:setup))
-	  (begin
-	    (debug:print 0 *default-log-port* "Failed to setup, exiting")
-	    (exit 1)))
-      (set! keys (rmt:get-keys)) ;;  db))
-      (debug:print 1 *default-log-port* "Keys: " (string-intersperse keys ", "))
-      (if (sqlite3:database? db)(sqlite3:finalize! db))
-      (set! *didsomething* #t)))
-
-(if (args:get-arg "-gui")
-    (begin
-      (debug:print 0 *default-log-port* "Look at the dashboard for now")
-      ;; (megatest-gui)
-      (set! *didsomething* #t)))
-
-(if (args:get-arg "-create-megatest-area")
-    (begin
-      (genexample:mk-megatest.config)
-      (set! *didsomething* #t)))
-
-(if (args:get-arg "-create-test")
-    (let ((testname (args:get-arg "-create-test")))
-      (genexample:mk-megatest-test testname)
-      (set! *didsomething* #t)))
-
-;;======================================================================
-;; Update the database schema, clean up the db
-;;======================================================================
-
-(if (args:get-arg "-rebuild-db")
-    (begin
-      (if (not (launch:setup))
-	  (begin
-	    (debug:print 0 *default-log-port* "Failed to setup, exiting") 
-	    (exit 1)))
-      ;; keep this one local
-      ;; (open-run-close patch-db #f)
-      (let ((dbstruct (db:setup #f areapath: *toppath*)))
-        (common:cleanup-db dbstruct full: #t))
-      (set! *didsomething* #t)))
-
-(if (args:get-arg "-cleanup-db")
-    (begin
-      (if (not (launch:setup))
-	  (begin
-	    (debug:print 0 *default-log-port* "Failed to setup, exiting") 
-	    (exit 1)))
-      (let ((dbstruct (db:setup #f areapath: *toppath*)))
-        (common:cleanup-db dbstruct))
-      (set! *didsomething* #t)))
-
-(if (args:get-arg "-mark-incompletes")
-    (begin
-      (if (not (launch:setup))
-	  (begin
-	    (debug:print 0 *default-log-port* "Failed to setup, exiting")
-	    (exit 1)))
-      (open-run-close db:find-and-mark-incomplete #f)
-      (set! *didsomething* #t)))
-
-;;======================================================================
-;; Update the tests meta data from the testconfig files
-;;======================================================================
-
-(if (args:get-arg "-update-meta")
-    (begin
-      (if (not (launch:setup))
-	  (begin
-	    (debug:print 0 *default-log-port* "Failed to setup, exiting") 
-	    (exit 1)))
-      (runs:update-all-test_meta #f)
-      (set! *didsomething* #t)))
-
-;;======================================================================
-;; Start a repl
-;;======================================================================
-
-;; fakeout readline
-(include "readline-fix.scm")
-
-
-(when (args:get-arg "-diff-rep")
-  (when (and
-         (not (args:get-arg "-diff-html"))
-         (not (args:get-arg "-diff-email")))
-    (debug:print 0 *default-log-port* "Must specify -diff-html or -diff-email with -diff-rep")
-    (set! *didsomething* 1)
-    (exit 1))
-  
-  (let* ((toppath (launch:setup)))
-    (do-diff-report
-     (args:get-arg "-src-target")
-     (args:get-arg "-src-runname")
-     (args:get-arg "-target")
-     (args:get-arg "-runname")
-     (args:get-arg "-diff-html")
-     (args:get-arg "-diff-email"))
-    (set! *didsomething* #t)
-    (exit 0)))
-
-(if (or (getenv "MT_RUNSCRIPT")
-	(args:get-arg "-repl")
-	(args:get-arg "-load"))
-    (let* ((toppath (launch:setup))
-	   (dbstruct (if (and toppath
-                              (common:on-homehost?))
-                         (db:setup #t)
-                         #f))) ;; make-dbr:dbstruct path: toppath local: (args:get-arg "-local")) #f)))
-      (if *toppath*
-	  (cond
-	   ((getenv "MT_RUNSCRIPT")
-	    ;; How to run megatest scripts
-	    ;;
-	    ;; #!/bin/bash
-	    ;;
-	    ;; export MT_RUNSCRIPT=yes
-	    ;; megatest << EOF
-	    ;; (print "Hello world")
-	    ;; (exit)
-	    ;; EOF
-
-	    (repl))
-	   (else
-	    (begin
-	      (set! *db* dbstruct)
-	      (import extras) ;; might not be needed
-	      ;; (import csi)
-	      (import readline)
-	      (import apropos)
-	      ;; (import (prefix sqlite3 sqlite3:)) ;; doesn't work ...
-
-	      (if *use-new-readline*
-		  (begin
-		    (install-history-file (get-environment-variable "HOME") ".megatest_history") ;;  [homedir] [filename] [nlines])
-		    (current-input-port (make-readline-port "megatest> ")))
-		  (begin
-		    (gnu-history-install-file-manager
-		     (string-append
-		      (or (get-environment-variable "HOME") ".") "/.megatest_history"))
-		    (current-input-port (make-gnu-readline-port "megatest> "))))
-	      (if (args:get-arg "-repl")
-		  (repl)
-		  (load (args:get-arg "-load")))
-	      ;; (db:close-all dbstruct) <= taken care of by on-exit call
-	      )
-	    (exit)))
-	  (set! *didsomething* #t))))
-
-;;======================================================================
-;; Wait on a run to complete
-;;======================================================================
-
-(if (and (args:get-arg "-run-wait")
-	 (not (or (args:get-arg "-run")
-		  (args:get-arg "-runtests")))) ;; run-wait is built into runtests now
-    (begin
-      (if (not (launch:setup))
-	  (begin
-	    (debug:print 0 *default-log-port* "Failed to setup, exiting") 
-	    (exit 1)))
-      (operate-on 'run-wait)
-      (set! *didsomething* #t)))
-
-;; ;; ;; redo me ;; Not converted to use dbstruct yet
-;; ;; ;; redo me ;;
-;; ;; ;; redo me (if (args:get-arg "-convert-to-norm")
-;; ;; ;; redo me     (let* ((toppath (setup-for-run))
-;; ;; ;; redo me 	   (dbstruct (if toppath (make-dbr:dbstruct path: toppath local: #t))))
-;; ;; ;; redo me       (for-each 
-;; ;; ;; redo me        (lambda (field)
-;; ;; ;; redo me 	 (let ((dat '()))
-;; ;; ;; redo me 	   (debug:print-info 0 *default-log-port* "Getting data for field " field)
-;; ;; ;; redo me 	   (sqlite3:for-each-row
-;; ;; ;; redo me 	    (lambda (id val)
-;; ;; ;; redo me 	      (set! dat (cons (list id val) dat)))
-;; ;; ;; redo me 	    (db:get-db db run-id)
-;; ;; ;; redo me 	    (conc "SELECT id," field " FROM tests;"))
-;; ;; ;; redo me 	   (debug:print-info 0 *default-log-port* "found " (length dat) " items for field " field)
-;; ;; ;; redo me 	   (let ((qry (sqlite3:prepare db (conc "UPDATE tests SET " field "=? WHERE id=?;"))))
-;; ;; ;; redo me 	     (for-each
-;; ;; ;; redo me 	      (lambda (item)
-;; ;; ;; redo me 		(let ((newval ;; (sdb:qry 'getid 
-;; ;; ;; redo me 		       (cadr item))) ;; )
-;; ;; ;; redo me 		  (if (not (equal? newval (cadr item)))
-;; ;; ;; redo me 		      (debug:print-info 0 *default-log-port* "Converting " (cadr item) " to " newval " for test #" (car item)))
-;; ;; ;; redo me 		  (sqlite3:execute qry newval (car item))))
-;; ;; ;; redo me 	      dat)
-;; ;; ;; redo me 	     (sqlite3:finalize! qry))))
-;; ;; ;; redo me        (db:close-all dbstruct)
-;; ;; ;; redo me        (list "uname" "rundir" "final_logf" "comment"))
-;; ;; ;; redo me       (set! *didsomething* #t)))
-
-(if (args:get-arg "-import-megatest.db")
-    (begin
-      (db:multi-db-sync 
-       (db:setup #f)
-       'killservers
-       'dejunk
-       'adj-testids
-       'old2new
-       ;; 'new2old
-       )
-      (set! *didsomething* #t)))
-
-(when (args:get-arg "-sync-brute-force")
-  ((server:get-bruteforce-syncer (db:setup #t) persist-until-sync: #t))
-  (set! *didsomething* #t))
-
-(if (args:get-arg "-sync-to-megatest.db")
-    (let* ((dbstruct (db:setup #f))
-	   (tmpdbpth (cdr (dbr:dbstruct-tmpdb dbstruct)))
-	   (lockfile (conc tmpdbpth ".lock"))
-	   (locked   (common:simple-file-lock lockfile)) 
-	   (res      (if locked
-			 (db:multi-db-sync 
-			  dbstruct
-			  'new2old)
-			 #f)))
-      (if res
-	  (begin
-	    (common:simple-file-release-lock lockfile)
-	    (print "Synced " res " records to megatest.db"))
-	  (print "Skipping sync, there is a sync in progress."))
-      (set! *didsomething* #t)))
-
-(if (args:get-arg "-sync-to")
-    (let ((toppath (launch:setup)))
-      (tasks:sync-to-postgres *configdat* (args:get-arg "-sync-to"))
-      (set! *didsomething* #t)))
-
-(if (args:get-arg "-list-test-time")
-     (let* ((toppath (launch:setup))) 
-     (task:get-test-times)  
-     (set! *didsomething* #t)))
-
-(if (args:get-arg "-list-run-time")
-     (let* ((toppath (launch:setup))) 
-     (task:get-run-times)  
-     (set! *didsomething* #t)))
-     
-(if (args:get-arg "-generate-html")
-    (let* ((toppath (launch:setup)))
-      (if (tests:create-html-tree #f)
-          (debug:print-info 0 *default-log-port* "HTML output created in " toppath "/lt/page0.html")
-          (debug:print 0 *default-log-port* "Failed to create HTML output in " toppath "/lt/runs-index.html"))
-      (set! *didsomething* #t)))
-
-(if (args:get-arg "-generate-html-structure")
-    (let* ((toppath (launch:setup)))
-      ;(if (tests:create-html-tree #f)
- 				(if (tests:create-html-summary #f)
-          (debug:print-info 0 *default-log-port* "HTML output created in " toppath "/lt/targets.html")
-          (debug:print 0 *default-log-port* "Failed to create HTML output in " toppath "/lt/runs-index.html"))
-      (set! *didsomething* #t)))
-
-(if (args:get-arg "-syscheck")
-    (begin
-      (mutils:syscheck common:raw-get-remote-host-load
-		       server:get-best-guess-address
-		       read-config)
-      (set! *didsomething* #t)))
-
-(if (args:get-arg "-extract-skeleton")
-    (let* ((toppath (launch:setup)))
-      (genexample:extract-skeleton-area (args:get-arg "-extract-skeleton"))
-      (set! *didsomething* #t)))
-
-;;======================================================================
-;; Exit and clean up
-;;======================================================================
-
-(if (not *didsomething*)
-    (debug:print 0 *default-log-port* help)
-    (set! *time-to-exit* #t)
-    )
-;;(debug:print-info 13 *default-log-port* "thread-join! watchdog")
-
-;; join the watchdog thread if it has been thread-start!ed  (it may not have been started in the case of a server that never enters running state)
-;;   (symbols returned by thread-state: created ready running blocked suspended sleeping terminated dead)
-;; TODO: for multiple areas, we will have multiple watchdogs; and multiple threads to manage
-(if (thread? *watchdog*)
-    (case (thread-state *watchdog*)
-      ((ready running blocked sleeping terminated dead)
-       (thread-join! *watchdog*))))
-
-(set! *time-to-exit* #t)
-
-(if (not (eq? *globalexitstatus* 0))
-    (if (or (args:get-arg "-run")(args:get-arg "-runtests")(args:get-arg "-runall"))
-        (begin
-           (debug:print 0 *default-log-port* "NOTE: Subprocesses with non-zero exit code detected: " *globalexitstatus*)
-           (exit 0))
-        (case *globalexitstatus*
-         ((0)(exit 0))
-         ((1)(exit 1))
-         ((2)(exit 2))
-         (else (exit 3)))))
+     
+(define (main)
+  (make-and-init-bigdata)
+
+  
+  ;; set up the functions in http transport
+  (hash-table-set! *http-functions* 'api:process-request          api:process-request)
+  (hash-table-set! *http-functions* 'http-transport:main-page     http-transport:main-page)
+  (hash-table-set! *http-functions* 'http-transport:show-jquery   http-transport:show-jquery)
+  (hash-table-set! *http-functions* 'http-transport:html-test-log http-transport:html-test-log)
+  (hash-table-set! *http-functions* 'http-transport:html-dboard   http-transport:html-dboard)
+  
+;; load the ~/.megatestrc file, put (use trace)(trace-call-sites #t)(trace function-you-want-to-trace) in this file
+;;
+(let ((debugcontrolf (conc (get-environment-variable "HOME") "/.megatestrc")))
+  (if (common:file-exists? debugcontrolf)
+      (load debugcontrolf)))
+
+;; usage logging, careful with this, it is not designed to deal with all real world challenges!
+;;
+(if (and *usage-log-file*
+	 (file-writable? *usage-log-file*))
+    (with-output-to-file
+	*usage-log-file*
+      (lambda ()
+	(print
+	 (if *usage-use-seconds*
+	     (current-seconds)
+	     (time->string
+	      (seconds->local-time (current-seconds))
+	      "%Yww%V.%w %H:%M:%S"))
+	 " "
+	 (current-user-name) " "
+	 (current-directory) " "
+	 "\"" (string-intersperse (argv) " ") "\""))
+      #:append))
+
+     ;;  -gui                    : start a gui interface
+     ;;  -config fname           : override the runconfigs file with fname
+     
+     ;; process args
+     (define remargs (args:get-args 
+     		 (argv)
+     		 (list  "-runtests"  ;; run a specific test
+     			"-config"    ;; override the config file name
+     			"-append-config"
+     			"-execute"   ;; run the command encoded in the base64 parameter
+     			"-step"
+     			"-target"
+     			"-reqtarg"
+     			":runname"
+     			"-runname"
+     			":state"  
+     			"-state"
+     			":status"
+     			"-status"
+     			"-list-runs"
+			"-testdata-csv"
+     			"-testpatt"
+			"--modepatt"
+			"-modepatt"
+			"-tagexpr"
+     			"-itempatt"
+     			"-setlog"
+     			"-set-toplog"
+     			"-runstep"
+     			"-logpro"
+     			"-m"
+     			"-rerun"
+     
+     			"-days"
+     			"-rename-run"
+     			"-to"
+     			"-dest"
+			"-source" 
+			"-time-stamp" 
+     			;; values and messages
+     			":category"
+     			":variable"
+     			":value"
+     			":expected"
+     			":tol"
+     			":units"
+     
+     			;; misc
+     			"-start-dir"
+			"-run-patt"
+			"-target-patt"   
+     			"-contour"
+			"-area-tag"  
+			"-area"  
+     			"-run-tag"
+     			"-server"
+			"-db"            ;; file name for setting up a server
+     			"-adjutant"
+     			"-transport"
+     			"-port"
+     			"-extract-ods"
+     			"-pathmod"
+     			"-env2file"
+     			"-envcap"
+     			"-envdelta"
+     			"-setvars"
+     			"-set-state-status"
+			
+			;; move runs stuff here
+			"-remove-keep"           
+     			"-set-run-status"
+     			"-age"
+     
+     			;; archive 
+     			"-archive"
+     			"-actions"
+     			"-precmd"
+     			"-include"
+     			"-exclude-rx"
+     			"-exclude-rx-from"
+     			
+     			"-debug" ;; for *verbosity* > 2
+     			"-debug-noprop"
+     			"-create-test"
+     			"-override-timeout"
+     			"-test-files"  ;; -test-paths is for listing all
+     			"-load"        ;; load and exectute a scheme file
+     			"-section"
+     			"-var"
+     			"-dumpmode"
+     			"-run-id"
+     			"-ping"
+     			"-refdb2dat"
+     			"-o"
+     			"-log"
+			"-sync-log"
+     			"-since"
+     			"-fields"
+     			"-recover-test" ;; run-id,test-id - used internally to recover a test stuck in RUNNING state
+     			"-sort"
+     			"-target-db"
+     			"-source-db"
+     			"-prefix-target"
+     
+			"-src-target"
+			"-src-runname"
+			"-diff-email"
+     			"-sync-to"			
+     			"-pgsync"
+     			"-kill-wait"    ;; wait this long before removing test (default is 10 sec)
+			"-diff-html"
+     
+     			;; wizards, area capture, setup new ...
+     			"-extract-skeleton"
+     			)
+      		 (list  "-h" "-help" "--help"
+     			"-manual"
+     			"-version"
+     		        "-force"
+     		        "-xterm"
+     		        "-showkeys"
+     		        "-show-keys"
+     		        "-test-status"
+     			"-set-values"
+     			"-load-test-data"
+     			"-summarize-items"
+     		        "-gui"
+     			"-daemonize"
+     			"-preclean"
+     			"-rerun-clean"
+     			"-rerun-all"
+     			"-clean-cache"
+     			"-no-cache"
+     			"-cache-db"
+     			"-cp-eventtime-to-publishtime"
+                             "-use-db-cache"
+                             "-prepend-contour"
+     
+     
+     			;; misc
+     			"-repl"
+     			"-lock"
+     			"-unlock"
+     			"-list-servers"
+     			"-kill-servers"
+			"-run-wait"      ;; wait on a run to complete (i.e. no RUNNING)
+     			"-one-pass"      ;;
+     			"-local"         ;; run some commands using local db access
+     			"-generate-html"
+     			"-generate-html-structure" 
+     			"-list-run-time"
+                             "-list-test-time"
+     			
+     			;; misc queries
+     			"-list-disks"
+     			"-list-targets"
+     			"-list-db-targets"
+     			"-show-runconfig"
+     			"-show-config"
+     			"-show-cmdinfo"
+     			"-get-run-status"
+     			"-list-waivers"
+     
+     			;; queries
+     			"-test-paths" ;; get path(s) to a test, ordered by youngest first
+     
+     			"-runall"    ;; run all tests, respects -testpatt, defaults to %
+     			"-run"       ;; alias for -runall
+     			"-remove-runs"
+                             "-kill-runs"
+                             "-kill-rerun"
+                             "-keep-records" ;; use with -remove-runs to remove only the run data
+     			"-rebuild-db"
+     			"-cleanup-db"
+     			"-rollup"
+     			"-update-meta"
+     			"-create-megatest-area"
+     			"-mark-incompletes"
+     
+     			"-convert-to-norm"
+     			"-convert-to-old"
+     			"-import-megatest.db"
+     			"-sync-to-megatest.db"
+                             "-sync-brute-force"
+     			"-logging"
+     			"-v" ;; verbose 2, more than normal (normal is 1)
+     			"-q" ;; quiet 0, errors/warnings only
+     
+                             "-diff-rep"
+     
+     			"-syscheck"
+     			"-obfuscate"
+     			;; junk placeholder
+     			;; "-:p"
+     			
+                             )
+     		 args:arg-hash
+     		 0))
+     
+     ;; Add args that use remargs here
+     ;;
+     (if (and (not (null? remargs))
+     	 (not (or
+     	       (args:get-arg "-runstep")
+     	       (args:get-arg "-envcap")
+     	       (args:get-arg "-envdelta")
+     	       )
+     	      ))
+         (debug:print-error 0 *default-log-port* "Unrecognised arguments: " (string-intersperse (if (list? remargs) remargs (argv))  " ")))
+     
+     ;; before doing anything else change to the start-dir if provided
+     ;;
+     (if (args:get-arg "-start-dir")
+         (if (common:file-exists? (args:get-arg "-start-dir"))
+             (let ((fullpath (common:real-path (args:get-arg "-start-dir"))))
+               (setenv "PWD" fullpath)
+               (change-directory fullpath))
+     	(begin
+     	  (debug:print-error 0 *default-log-port* "non-existant start dir " (args:get-arg "-start-dir") " specified, exiting.")
+     	  (exit 1))))
+     
+     ;; immediately set MT_TARGET if -reqtarg or -target are available
+     ;;
+     (let ((targ (or (args:get-arg "-reqtarg")(args:get-arg "-target"))))
+       (if targ (setenv "MT_TARGET" targ)))
+     
+     ;; The watchdog is to keep an eye on things like db sync etc.
+     ;;
+(init-watchdog)
+  
+;;      (define (debug:debug-mode n)
+;;        (cond
+;;         ((and (number? *verbosity*)   ;; number number
+;;      	 (number? n))
+;;          (<= n *verbosity*))
+;;         ((and (list? *verbosity*)     ;; list   number
+;;      	 (number? n))
+;;          (member n *verbosity*))
+;;         ((and (list? *verbosity*)     ;; list   list
+;;      	 (list? n))
+;;          (not (null? (lset-intersection! eq? *verbosity* n))))
+;;         ((and (number? *verbosity*)
+;;      	 (list? n))
+;;          (member *verbosity* n))))
+
+     ;; this segment will run launch:setup only if -log is not set. This is fairly safe as servers are not
+     ;; manually started and thus should never be started in a non-megatest area. Thus no need to handle situation
+     ;; where (launch:setup) returns #f?
+     ;;
+     (if (or (args:get-arg "-log")#;(args:get-arg "-server")) ;; redirect the log always when a server
+         (handle-exceptions
+     	exn
+     	(begin
+     	  (print "ERROR: Failed to switch to log output. " ((condition-property-accessor 'exn 'message) exn) ", exn=" exn)
+     	  )
+           (let* ((tl   (or (args:get-arg "-log")(launch:setup)))   ;; run launch:setup if -server, ensure we do NOT run launch:setup if -log specified
+     	     (logf (or (args:get-arg "-log") ;; use -log unless we are a server, then craft a logfile name
+     		       (conc tl "/logs/server-" (current-process-id) "-" (get-host-name) ".log")))
+     	     (oup  (open-logfile logf)))
+     	(if (not (args:get-arg "-log"))
+     	    (hash-table-set! args:arg-hash "-log" logf)) ;; fake out future queries of -log
+     	(debug:print-info 0 *default-log-port* "Sending log output to " logf)
+     	(set! *default-log-port* oup))))
+     
+     (if (or (args:get-arg "-h")
+     	(args:get-arg "-help")
+     	(args:get-arg "--help"))
+         (begin
+           (print help)
+           (exit)))
+     
+     (if (args:get-arg "-manual")
+         (let* ((htmlviewercmd (or (configf:lookup *configdat* "setup" "htmlviewercmd")
+     			      (common:which '("firefox" "arora"))))
+     	   (install-home  (common:get-install-area))
+     	   (manual-html   (conc install-home "/share/docs/megatest_manual.html")))
+           (if (and install-home
+     	       (common:file-exists? manual-html))
+     	  (system (conc "(" htmlviewercmd " " manual-html " ) &"))
+     	  (system (conc "(" htmlviewercmd " http://www.kiatoa.com/cgi-bin/fossils/megatest/doc/tip/docs/manual/megatest_manual.html ) &")))
+           (exit)))
+     
+     (if (args:get-arg "-version")
+         (begin
+           (print (common:version-signature)) ;; (print megatest-version)
+           (exit)))
+     
+     (define *didsomething* #f)
+     
+     ;; Overall exit handling setup immediately
+     ;;
+     (if (or (args:get-arg "-process-reap"))
+             ;; (args:get-arg "-runtests")
+     	;; (args:get-arg "-execute")
+     	;; (args:get-arg "-remove-runs")
+     	;; (args:get-arg "-runstep"))
+         (let ((original-exit (exit-handler)))
+           (exit-handler (lambda (#!optional (exit-code 0))
+     		      (printf "Preparing to exit with exit code ~A ...\n" exit-code)
+     		      (for-each
+     		       
+     		       (lambda (pid)
+     			 (handle-exceptions
+     			     exn
+     			   (begin
+     			     (printf "process reap failed. exn=~A\n" exn)
+     			     #t)
+     			  (let-values (((pid-val exit-status exit-code) (process-wait pid #t)))
+     				      (if (or (eq? pid-val pid)
+     					      (eq? pid-val 0))
+     					  (begin
+     					    (printf "Sending signal/term to ~A\n" pid)
+     					    (process-signal pid signal/term))))))
+     		       (process:children #f))
+     		      (original-exit exit-code)))))
+     
+     ;; for some switches always print the command to stderr
+     ;;
+     (if (args:any-defined? "-run" "-runall" "-remove-runs" "-set-state-status" "-kill-runs" "-kill-rerun")
+         (debug:print 0 *default-log-port* (string-intersperse (argv) " ")))
+     
+     ;; some switches imply homehost. Exit here if not on homehost
+     ;;
+     #;(let ((homehost-required  (list "-cleanup-db" "-server")))
+       (if (apply args:any-defined? homehost-required)
+           (if (not (common:on-homehost?))
+     	  (for-each
+     	   (lambda (switch)
+     	     (if (args:get-arg switch)
+     		 (begin
+     		   (debug:print 0 *default-log-port* "ERROR: you must be on the homehost to run with " switch
+     				", you can move homehost by removing the .homehost file but this will disrupt any runs in progress.")
+     		   (exit 1))))
+     	   homehost-required))))
+     
+     ;;======================================================================
+     ;; Misc setup stuff
+     ;;======================================================================
+     
+     (debug:setup)
+     
+     (if (args:get-arg "-logging")(set! *logging* #t))
+     
+     ;;(if (debug:debug-mode 3) ;; we are obviously debugging
+     ;;    (set! open-run-close open-run-close-no-exception-handling))
+     
+     (if (args:get-arg "-itempatt")
+         (let ((newval (conc (args:get-arg "-testpatt") "/" (args:get-arg "-itempatt"))))
+           (debug:print 0 *default-log-port* "WARNING: -itempatt has been deprecated, please use -testpatt testpatt/itempatt method, new testpatt is "newval)
+           (hash-table-set! args:arg-hash "-testpatt" newval)
+           (hash-table-delete! args:arg-hash "-itempatt")))
+     
+     (if (args:get-arg "-runtests")
+         (debug:print 0 *default-log-port* "WARNING: \"-runtests\" is deprecated. Use \"-run\" with \"-testpatt\" instead"))
+     
+     (on-exit std-exit-procedure)
+     
+     ;;======================================================================
+     ;; Misc general calls
+     ;;======================================================================
+
+;; TODO: Restore this functionality
+
+     #; (if (and (args:get-arg "-cache-db")
+              (args:get-arg "-source-db"))
+         (let* ((temp-dir (or (args:get-arg "-target-db") (create-directory (conc "/tmp/" (getenv "USER") "/" (string-translate (current-directory) "/" "_")))))
+                (target-db (conc temp-dir "/cached.db"))
+                (source-db (args:get-arg "-source-db")))        
+           (db:cache-for-read-only source-db target-db)
+           (set! *didsomething* #t)))
+     
+     ;; handle a clean-cache request as early as possible
+     ;;
+     (if (args:get-arg "-clean-cache")
+         (let ((toppath  (launch:setup)))
+           (set! *didsomething* #t) ;; suppress the help output.
+           (runs:clean-cache (common:args-get-target)
+     			(args:get-arg "-runname")
+     			toppath)))
+     	  
+     (if (args:get-arg "-env2file")
+         (begin
+           (save-environment-as-files (args:get-arg "-env2file"))
+           (set! *didsomething* #t)))
+     
+     (if (args:get-arg "-list-disks")
+         (let ((toppath (launch:setup)))
+           (print 
+            (string-intersperse 
+     	(map (lambda (x)
+     	       (string-intersperse 
+     		x
+     		" => "))
+     	     (common:get-disks *configdat*))
+     	"\n"))
+           (set! *didsomething* #t)))
+     
+     
+  (if (args:get-arg "-refdb2dat")
+         (let* ((input-db (args:get-arg "-refdb2dat"))
+     	   (out-file (args:get-arg "-o"))
+     	   (out-fmt  (or (args:get-arg "-dumpmode") "scheme"))
+     	   (out-port (if (and out-file 
+     			      (not (member out-fmt '("sqlite3" "csv"))))
+     			 (open-output-file out-file)
+     			 (current-output-port)))
+     	   (res-data (configf:read-refdb input-db))
+     	   (data     (car res-data))
+     	   (msg      (cadr res-data)))
+           (if (not data)
+     	  (debug:print 0 *default-log-port* "Bad input? data=" data) ;; some error occurred
+     	  (with-output-to-port out-port
+     	    (lambda ()
+     	      (case (string->symbol out-fmt)
+     		((scheme)(pp data))
+     		((perl)
+     		 ;; (print "%hash = (")
+     		 ;;        key1 => 'value1',
+     		 ;;        key2 => 'value2',
+     		 ;;        key3 => 'value3',
+     		 ;; );
+     		 (configf:map-all-hier-alist 
+     		  data 
+     		  (lambda (sheetname sectionname varname val)
+     		    (print "$data{\"" sheetname "\"}{\"" sectionname "\"}{\"" varname "\"} = \"" val "\";"))))
+     		((python ruby)
+     		 (print "data={}")
+     		 (configf:map-all-hier-alist
+     		  data
+     		  (lambda (sheetname sectionname varname val)
+     		    (print "data[\"" sheetname "\"][\"" sectionname "\"][\"" varname "\"] = \"" val "\""))
+     		  initproc1:
+     		  (lambda (sheetname)
+     		    (print "data[\"" sheetname "\"] = {}"))
+     		  initproc2:
+     		  (lambda (sheetname sectionname)
+     		    (print "data[\"" sheetname "\"][\"" sectionname "\"] = {}"))))
+     		((csv)
+     		 (let* ((results  (make-hash-table)) ;; (make-sparse-array)))
+     			(row-cols (make-hash-table))) ;; hash of hashes where section => ht { row-<name> => num or col-<name> => num
+     		   ;; (print "data=")
+     		   ;; (pp data)
+     		   (configf:map-all-hier-alist
+     		    data
+     		    (lambda (sheetname sectionname varname val)
+     		      ;; (print "sheetname: " sheetname ", sectionname: " sectionname ", varname: " varname ", val: " val)
+     		      (let* ((dat      (get-dat results sheetname))
+     			     (vec      (refdb:csv-get-svec dat))
+     			     (rownames (refdb:csv-get-rows dat))
+     			     (colnames (refdb:csv-get-cols dat))
+     			     (currrown (hash-table-ref/default rownames varname #f))
+     			     (currcoln (hash-table-ref/default colnames sectionname #f))
+     			     (rown     (or currrown 
+     					   (let* ((lastn   (refdb:csv-get-maxrow dat))
+     						  (newrown (+ lastn 1)))
+     					     (refdb:csv-set-maxrow! dat newrown)
+     					     newrown)))
+     			     (coln     (or currcoln 
+     					   (let* ((lastn   (refdb:csv-get-maxcol dat))
+     						  (newcoln (+ lastn 1)))
+     					     (refdb:csv-set-maxcol! dat newcoln)
+     					     newcoln))))
+     			(if (not (sparse-array-ref vec 0 coln)) ;; (eq? rown 0)
+     			    (begin
+     			      (sparse-array-set! vec 0 coln sectionname)
+     			      ;; (print "sparse-array-ref " 0 "," coln "=" (sparse-array-ref vec 0 coln))
+     			      ))
+     			(if (not (sparse-array-ref vec rown 0)) ;; (eq? coln 0)
+     			    (begin
+     			      (sparse-array-set! vec rown 0 varname)
+     			      ;; (print "sparse-array-ref " rown "," 0 "=" (sparse-array-ref vec rown 0))
+     			      ))
+     			(if (not currrown)(hash-table-set! rownames varname rown))
+     			(if (not currcoln)(hash-table-set! colnames sectionname coln))
+     			;; (print "dat=" dat ", rown=" rown ", coln=" coln)
+     			(sparse-array-set! vec rown coln val)
+     			;; (print "sparse-array-ref " rown "," coln "=" (sparse-array-ref vec rown coln))
+     			)))
+     		   (for-each
+     		    (lambda (sheetname)
+     		      (let* ((sheetdat (get-dat results sheetname))
+     			     (svec     (refdb:csv-get-svec sheetdat))
+     			     (maxrow   (refdb:csv-get-maxrow sheetdat))
+     			     (maxcol   (refdb:csv-get-maxcol sheetdat))
+     			     (fname    (if out-file 
+     					   (string-substitute "%s" sheetname out-file) ;; "/foo/bar/%s.csv")
+     					   (conc sheetname ".csv"))))
+     			(with-output-to-file fname
+     			  (lambda ()
+     			    ;; (print "Sheetname: " sheetname)
+     			    (let loop ((row       0)
+     				       (col       0)
+     				       (curr-row '())
+     				       (result   '()))
+     			      (let* ((val (sparse-array-ref svec row col))
+     				     (disp-val (if val
+     						   (conc "\"" val "\"")
+     						   "")))
+     				(if (> col 0)(display ","))
+     				(display disp-val)
+     				(cond
+     				 ((> row maxrow)(display "\n") result)
+     				 ((>= col maxcol)
+     				  (display "\n")
+     				  (loop (+ row 1) 0 '() (append result (list curr-row))))
+     				 (else
+     				  (loop row (+ col 1) (append curr-row (list val)) result)))))))))
+     		    (hash-table-keys results))))
+     		((sqlite3)
+     		 (let* ((db-file   (or out-file (pathname-file input-db)))
+     			(db-exists (common:file-exists? db-file))
+     			(db        (sqlite3:open-database db-file)))
+     		   (if (not db-exists)(sqlite3:execute db "CREATE TABLE data (sheet,section,var,val);"))
+     		   (configf:map-all-hier-alist
+     		    data
+     		    (lambda (sheetname sectionname varname val)
+     		      (sqlite3:execute db
+     				       "INSERT OR REPLACE INTO data (sheet,section,var,val) VALUES (?,?,?,?);"
+     				       sheetname sectionname varname val)))
+     		   (sqlite3:finalize! db)))
+     		(else
+     		 (pp data))))))
+           (if out-file (close-output-port out-port))
+           (exit) ;; yes, bending the rules here - need to exit since this is a utility
+           ))
+     
+     (if (args:get-arg "-ping")
+         (let* ((server-id     (string->number (args:get-arg "-ping"))) ;; extract run-id (i.e. no ":"
+     	   (host:port     (args:get-arg "-ping")))
+           (server:ping (or server-id host:port) #f do-exit: #t)))
+     
+     ;;======================================================================
+     ;; Capture, save and manipulate environments
+     ;;======================================================================
+     
+     ;; NOTE: Keep these above the section where the server or client code is setup
+     
+     (let ((envcap (args:get-arg "-envcap")))
+       (if envcap
+           (let* ((db      (env:open-db (if (null? remargs) "envdat.db" (car remargs)))))
+     	(env:save-env-vars db envcap)
+     	(env:close-database db)
+     	(set! *didsomething* #t))))
+     
+     ;; delta "language" will eventually be res=a+b-c but for now it is just res=a-b 
+     ;;
+     (let ((envdelta (args:get-arg "-envdelta")))
+       (if envdelta
+           (let ((match (string-split envdelta "-")));; (string-match "([a-z0-9_]+)=([a-z0-9_\\-,]+)" envdelta)))
+     	(if (not (null? match))
+     	    (let* ((db        (env:open-db (if (null? remargs) "envdat.db" (car remargs))))
+     		   ;; (resctx    (cadr match))
+     		   ;; (equn      (caddr match))
+     		   (parts     match) ;; (string-split equn "-"))
+     		   (minuend   (car parts))
+     		   (subtraend (cadr parts))
+     		   (added     (env:get-added   db minuend subtraend))
+     		   (removed   (env:get-removed db minuend subtraend))
+     		   (changed   (env:get-changed db minuend subtraend)))
+     	      ;; (pp (hash-table->alist added))
+     	      ;; (pp (hash-table->alist removed))
+     	      ;; (pp (hash-table->alist changed))
+     	      (if (args:get-arg "-o")
+     		  (with-output-to-file
+     		      (args:get-arg "-o")
+     		    (lambda ()
+     		      (env:print added removed changed)))
+     		  (env:print added removed changed))
+     	      (env:close-database db)
+     	      (set! *didsomething* #t))
+     	    (debug:print-error 0 *default-log-port* "Parameter to -envdelta should be new=start-end")))))
+     
+     ;;======================================================================
+     ;; Start the server - can be done in conjunction with -runall or -runtests (one day...)
+     ;;   we start the server if not running else start the client thread
+     ;;======================================================================
+     
+     ;; Server? Start up here.
+     ;;
+     (if (args:get-arg "-server")
+	 (if  (not (args:get-arg "-db"))
+	      (debug:print 0 *default-log-port* "ERROR: -db required to start server")
+	      (let ((tl        (launch:setup))
+		    (dbname    (args:get-arg "-db"))) ;; transport-type (string->symbol (or (args:get-arg "-transport") "http"))))
+		(server:launch dbname)
+		(set! *didsomething* #t))))
+	 
+     ;; The adjutant is a bit different, it does NOT run (launch:setup) as it is not necessarily tied to
+     ;; a specific Megatest area. Detail are being hashed out and this may change.
+     ;;
+     (if (args:get-arg "-adjutant")
+         (begin
+           (adjutant-run)
+           (set! *didsomething* #t)))
+     
+     (if (or (args:get-arg "-list-servers")
+             (args:get-arg "-kill-servers"))
+         (let ((tl (launch:setup)))
+           (if tl ;; all roads from here exit
+     	  (let* ((servers (server:get-list *toppath*))
+     		 (fmtstr  "~8a~22a~20a~20a~8a\n"))
+     	    (format #t fmtstr "pid" "Interface:port" "age (hms)" "Last mod" "State")
+     	    (format #t fmtstr "===" "==============" "=========" "========" "=====")
+     	    (for-each ;;  ( mod-time host port start-time pid )
+     	     (lambda (server)
+     	       (let* ((mtm (any->number (car server)))
+     		      (mod (if mtm (- (current-seconds) mtm) "unk"))
+     		      (age (- (current-seconds)(or (any->number (list-ref server 3)) (current-seconds))))
+     		      (url (conc (cadr server) ":" (caddr server)))
+     		      (pid (list-ref server 4))
+     		      (alv (if (number? mod)(< mod 10) #f)))
+     		 (format #t
+     			 fmtstr
+     			 pid
+     			 url
+     			 (seconds->hr-min-sec age)
+     			 (seconds->hr-min-sec mod)
+     			 (if alv "alive" "dead"))
+     		 (if (and alv
+     			  (args:get-arg "-kill-servers"))
+     		     (begin
+     		       (debug:print-info 0 *default-log-port* "Attempting to kill server with pid " pid)
+     		       (server:kill server)))))
+     	     (sort servers (lambda (a b)
+     			     (let ((ma (or (any->number (car a)) 9e9))
+     				   (mb (or (any->number (car b)) 9e9)))
+     			       (> ma mb)))))
+     	    ;; (debug:print-info 1 *default-log-port* "Done with listservers")
+     	    (set! *didsomething* #t)
+     	    (exit))
+     	  (exit))))
+           ;; must do, would have to add checks to many/all calls below
+     
+     ;;======================================================================
+     ;; Weird special calls that need to run *after* the server has started?
+     ;;======================================================================
+     
+     (if (args:get-arg "-list-targets")
+         (if (launch:setup)
+             (let ((targets (common:get-runconfig-targets)))
+               ;; (debug:print 1 *default-log-port* "Found "(length targets) " targets")
+               (case (string->symbol (or (args:get-arg "-dumpmode") "alist"))
+                 ((alist)
+                  (for-each (lambda (x)
+                              ;; (print "[" x "]"))
+                              (print x))
+                            targets))
+                 ((json)
+                  (json-write targets))
+                 (else
+                  (debug:print-error 0 *default-log-port* "dump output format " (args:get-arg "-dumpmode") " not supported for -list-targets")))
+               (set! *didsomething* #t))))
+
+
+     (if (args:get-arg "-show-runconfig")
+         (let ((tl (launch:setup)))
+           (push-directory *toppath*)
+           (let ((data (full-runconfigs-read)))
+     	;; keep this one local
+     	(cond
+     	 ((and (args:get-arg "-section")
+     	       (args:get-arg "-var"))
+     	  (let ((val (or (configf:lookup data (args:get-arg "-section")(args:get-arg "-var"))
+     			 (configf:lookup data "default" (args:get-arg "-var")))))
+     	    (if val (print val))))
+     	 ((or (not (args:get-arg "-dumpmode"))
+                   (string=? (args:get-arg "-dumpmode") "ini"))
+     	  (configf:config->ini data))
+     	 ((string=? (args:get-arg "-dumpmode") "sexp")
+     	  (pp (hash-table->alist data)))
+     	 ((string=? (args:get-arg "-dumpmode") "json")
+     	  (json-write data))
+     	 (else
+     	  (debug:print-error 0 *default-log-port* "-dumpmode of " (args:get-arg "-dumpmode") " not recognised")))
+     	(set! *didsomething* #t))
+           (pop-directory)))
+     
+     (if (args:get-arg "-show-config")
+         (let ((tl   (launch:setup))
+     	  (data *configdat*)) ;; (configf:read-config "megatest.config" #f #t)))
+           (push-directory *toppath*)
+           ;; keep this one local
+           (cond 
+            ((and (args:get-arg "-section")
+     	     (args:get-arg "-var"))
+     	(let ((val (configf:lookup data (args:get-arg "-section")(args:get-arg "-var"))))
+     	  (if val (print val))))
+     
+            ;; print just a section if only -section
+     
+            ((equal? (args:get-arg "-dumpmode") "sexp")
+     	(pp (hash-table->alist data)))
+            ((equal? (args:get-arg "-dumpmode") "json")
+     	(json-write data))
+            ((or (not (args:get-arg "-dumpmode"))
+     	    (string=? (args:get-arg "-dumpmode") "ini"))
+     	(configf:config->ini data))
+            (else
+     	(debug:print-error 0 *default-log-port* "-dumpmode of " (args:get-arg "-dumpmode") " not recognised")))
+           (set! *didsomething* #t)
+           (pop-directory)
+           (bdat-time-to-exit-set! *bdat* #t)))
+     
+     (if (args:get-arg "-show-cmdinfo")
+         (if (or (args:get-arg ":value")(getenv "MT_CMDINFO"))
+     	(let ((data (common:read-encoded-string (or (args:get-arg ":value")(getenv "MT_CMDINFO")))))
+     	  (if (equal? (args:get-arg "-dumpmode") "json")
+     	      (json-write data)
+     	      (pp data))
+     	  (set! *didsomething* #t))
+     	(debug:print-info 0 *default-log-port* "environment variable MT_CMDINFO is not set")))
+     
+     ;;======================================================================
+     ;; Remove old run(s)
+     ;;======================================================================
+     
+     ;; since several actions can be specified on the command line the removal
+     ;; is done first
+     (define (operate-on action #!key (mode #f)(target-in #f)(runname-in #f)(keys-in #f)(keyvals-in #f)) ;; #f is "use default"
+       (let* ((runrec (runs:runrec-make-record))
+     	 (target (or target-in   (common:args-get-target))) ;; eventually get rid of the call to common:args-get-target
+     	 (runname (or runname-in
+     		      (args:get-arg "-runname"))) ;; eventually get rid of the get-arg calls
+     	 (testpatt (or (args:get-arg "-testpatt")
+     		       (and (eq? action 'archive) ;; if it is an archive command fallback to MT_TEST_NAME and MT_ITEMPATH
+     			    (common:get-full-test-name))
+     		       (and (eq? action 'kill-runs)
+     			    "%/%") ;; I'm just guessing that this is correct :(
+     		       (common:args-get-testpatt #f) ;; (args:get-arg "-testpatt")))
+     		       ))) ;;
+         (cond
+          ((not target)
+           (debug:print-error 0 *default-log-port* "Missing required parameter for "
+     			 action ", you must specify -target or -reqtarg")
+           (exit 1))
+          ((not runname)
+           (debug:print-error 0 *default-log-port* "Missing required parameter for "
+     			 action ", you must specify the run name pattern with -runname patt")
+           (exit 2))
+          ((not testpatt)
+           (debug:print-error 0 *default-log-port* "Missing required parameter for "
+     			 action ", you must specify the test pattern with -testpatt")
+           (exit 3))
+          (else
+           (if (not (car *configinfo*))
+     	  (begin
+     	    (debug:print-error 0 *default-log-port* "Attempted " action "on test(s) but run area config file not found")
+     	    (exit 1))
+     	  ;; put test parameters into convenient variables
+     	  (begin
+     	    ;; check for correct version, exit with message if not correct
+
+	    ;; TODO: restore this functionality
+	    
+	    ;; (common:exit-on-version-changed)
+	    
+     	    (runs:operate-on  action
+     			      target
+     			      runname
+     			      testpatt
+     			      state:  (common:args-get-state)
+     			      status: (common:args-get-status)
+     			      new-state-status: (args:get-arg "-set-state-status")
+                                   mode: mode)))
+           (set! *didsomething* #t)))))
+     
+     (if (args:get-arg "-kill-runs")
+         (general-run-call 
+          "-kill-runs"
+          "kill runs"
+          (lambda (target runname keys keyvals)
+            (operate-on 'kill-runs mode: #f)
+            )))
+     
+     (if (args:get-arg "-kill-rerun")
+         (let* ((target-patt (common:args-get-target))
+                (runname-patt (args:get-arg "-runname")))
+           (cond ((not target-patt)
+                  (debug:print-error 0 *default-log-port* "Missing target, must specify target for -kill-rerun with -target <target name>")
+                  (exit 1))
+                 ((not runname-patt)
+                  (debug:print-error 0 *default-log-port* "Missing runname, must specify runname for -kill-rerun with -runname <run name>")
+                  (exit 1))
+                 ((string-search "[ ,%]" target-patt)
+                  (debug:print-error 0 *default-log-port* "Invalid target ["target-patt"], must specify exact target (no wildcards) for -kill-rerun with -target <target name>")
+                  (exit 1))
+                 ((string-search "[ ,%]" runname-patt)
+                  (debug:print-error 0 *default-log-port* "Invalid runname ["runname-patt"], must specify exact runname (no wildcards) for -kill-rerun with -runname <runname name>")
+                  (exit 1))
+                 (else
+                  (general-run-call 
+                   "-kill-runs"
+                   "kill runs"
+                   (lambda (target runname keys keyvals)
+                     (operate-on 'kill-runs mode: #f)
+                     ))
+           
+                  (thread-sleep! 15))
+                 ;; fall thru and let "-run" loop fire
+                 )))
+     
+     
+     (if (args:get-arg "-remove-runs")
+         (general-run-call 
+          "-remove-runs"
+          "remove runs"
+          (lambda (target runname keys keyvals)
+            (operate-on 'remove-runs mode: (if (args:get-arg "-keep-records")
+                                               'remove-data-only
+                                               'remove-all)))))
+     
+     (if (args:get-arg "-remove-keep")
+         (general-run-call 
+          "-remove-keep"
+          "remove keep"
+          (lambda (target runname keys keyvals)
+            (let ((actions (map string->symbol
+                                (string-split
+     			    (or (args:get-arg "-actions")
+     				"print")
+     			    ",")))) ;; default to printing the output
+              (runs:remove-all-but-last-n-runs-per-target target runname
+     						     (string->number (args:get-arg "-remove-keep"))
+     						     actions: actions)))))
+     
+     (if (args:get-arg "-set-state-status")
+         (general-run-call 
+          "-set-state-status"
+          "set state and status"
+          (lambda (target runname keys keyvals)
+            (operate-on 'set-state-status))))
+     
+     (if (or (args:get-arg "-set-run-status")
+     	(args:get-arg "-get-run-status"))
+         (general-run-call
+          "-set-run-status"
+          "set run status"
+          (lambda (target runname keys keyvals)
+            (let* ((runsdat  (rmt:get-runs-by-patt keys runname 
+     					(common:args-get-target)
+     					#f #f #f #f))
+     	      (header   (vector-ref runsdat 0))
+     	      (rows     (vector-ref runsdat 1)))
+     	 (if (null? rows)
+     	     (begin
+     	       (debug:print-info 0 *default-log-port* "No matching run found.")
+     	       (exit 1))
+     	     (let* ((row      (car (vector-ref runsdat 1)))
+     		    (run-id   (db:get-value-by-header row header "id")))
+     	       (if (args:get-arg "-set-run-status")
+     		   (rmt:set-run-status run-id (args:get-arg "-set-run-status") msg: (args:get-arg "-m"))
+     		   (print (rmt:get-run-status run-id))
+     		   )))))))
+     
+     ;;======================================================================
+     ;; Query runs
+     ;;======================================================================
+     
+     ;; -fields runs:id,target,runname,comment+tests:id,testname,item_path+steps
+     ;;
+     ;; csi> (extract-fields-constraints "runs:id,target,runname,comment+tests:id,testname,item_path+steps")
+     ;;         => (("runs" "id" "target" "runname" "comment") ("tests" "id" "testname" "item_path") ("steps"))
+     ;;
+     ;;   NOTE: remember that the cdr will be the list you expect (cdr ("runs" "id" "target" "runname" "comment")) => ("id" "target" "runname" "comment")
+     ;;         and so alist-ref will yield what you expect
+     ;;
+     (define (extract-fields-constraints fields-spec)
+       (map (lambda (table-spec) ;; runs:id,target,runname
+     	 (let ((dat (string-split table-spec ":"))) ;; ("runs" "id,target,runname")
+     	   (if (> (length dat) 1)
+     	       (cons (car dat)(string-split (cadr dat) ",")) ;; "id,target,runname"
+     	       dat)))
+            (string-split fields-spec "+")))
+     
+     (define (get-value-by-fieldname datavec test-field-index fieldname)
+       (let ((indx (hash-table-ref/default test-field-index fieldname #f)))
+         (if indx
+     	(if (>= indx (vector-length datavec))
+     	    #f ;; index too high, should raise an error I suppose
+     	    (vector-ref datavec indx))
+     	#f)))
+     
+     
+     
+     
+     
+     (when (args:get-arg "-testdata-csv")
+       (if (launch:setup)
+           (let* ((keys        (rmt:get-keys)) ;; (db:get-keys dbstruct))
+                  (runpatt     (or (args:get-arg "-runname") "%"))
+                  (testpatt    (common:args-get-testpatt #f))
+                  (datapatt    (args:get-arg "-testdata-csv"))
+                  (match-data  (string-match "^([^/]+)/(.*)" (args:get-arg "-testdata-csv")))
+                  (categorypatt (if match-data (list-ref match-data 1) "%"))
+                  (setvarpatt  (if match-data
+                                   (list-ref match-data 2)
+                                   (args:get-arg "-testdata-csv")))
+                  (runsdat     (rmt:get-runs-by-patt keys (or runpatt "%") 
+                                                     (common:args-get-target) #f #f '("id" "runname" "state" "status" "owner" "event_time" "comment") 0))
+                  (header      (db:get-header runsdat))
+                  (access-mode (db:get-access-mode))
+                  (testpatt    (common:args-get-testpatt #f))
+                  (fields-spec (if (args:get-arg "-fields")
+                                   (extract-fields-constraints (args:get-arg "-fields"))
+                                   (list (cons "runs" (append keys (list "id" "runname" "state" "status" "owner" "event_time" "comment" "fail_count" "pass_count")))
+                                         (cons "tests"  db:test-record-fields) ;; "id" "testname" "test_path")
+                                         (list "steps" "id" "stepname"))))
+                  (tests-spec  (let ((t (alist-ref "tests" fields-spec equal?)))
+                                 (if (and t (null? t)) ;; all fields
+                                     db:test-record-fields
+                                     t)))
+                  (adj-tests-spec (delete-duplicates (if tests-spec (cons "id" tests-spec) db:test-record-fields))) 
+                  (test-field-index (make-hash-table))
+                  (runs (db:get-rows runsdat))
+                  )
+             (if (and tests-spec (not (null? tests-spec))) ;; do some validation and processing of the test-spec
+                 (let ((invalid-tests-spec (filter (lambda (x)(not (member x db:test-record-fields))) tests-spec)))
+                   (if (null? invalid-tests-spec)
+                       ;; generate the lookup map test-field-name => index-number
+                       (let loop ((hed (car adj-tests-spec))
+                                  (tal (cdr adj-tests-spec))
+                                  (idx 0))
+                         (hash-table-set! test-field-index hed idx)
+                         (if (not (null? tal))(loop (car tal)(cdr tal)(+ idx 1))))
+                       (begin
+                         (debug:print-error 0 *default-log-port* "Invalid test fields specified: " (string-intersperse invalid-tests-spec ", "))
+                         (exit)))))
+             (let* ((table-header (string-split "target,run,test,itempath,category,var,value,comment" ","))
+                    (table-rows
+                     (apply append (map  
+                                    (lambda (run)
+                                      (let* ((target (string-intersperse (map (lambda (x)
+     							 (db:get-value-by-header run header x))
+     						       keys) "/"))
+                                             (statuses (string-split (or (args:get-arg "-status") "") ","))
+                                             (run-id  (db:get-value-by-header run header "id"))
+                                             (runname (db:get-value-by-header run header "runname")) 
+                                             (states  (string-split (or (args:get-arg "-state") "") ","))
+                                             (tests   (if tests-spec
+                                                          (rmt:get-tests-for-run run-id testpatt states statuses #f #f #f 'testname 'asc ;; (db:get-tests-for-run dbstruct run-id testpatt '() '() #f #f #f 'testname 'asc 
+                                                                             ;; use qryvals if test-spec provided
+                                                                             (if tests-spec
+                                                                                 (string-intersperse adj-tests-spec ",")
+                                                                                 ;; db:test-record-fields
+                                                                                 #f)
+                                                                             #f
+                                                                             'normal)
+                                                          '())))
+                                        (apply append
+                                               (map
+                                                (lambda (test)
+                                                  (let* (
+                                                         (test-id      (if (member "id"           tests-spec)(get-value-by-fieldname test test-field-index "id"          ) #f)) ;; (db:test-get-id         test))
+                                                         (testname     (if (member "testname"     tests-spec)(get-value-by-fieldname test test-field-index "testname"    ) #f)) ;; (db:test-get-testname   test))
+                                                         (itempath     (if (member "item_path"    tests-spec)(get-value-by-fieldname test test-field-index "item_path"   ) #f)) ;; (db:test-get-item-path  test))
+                                                         (fullname     (conc testname
+                                                                             (if (equal? itempath "")
+                                                                                 "" 
+                                                                                 (conc "/" itempath ))))
+                                                         (testdat-raw (map vector->list (rmt:read-test-data-varpatt run-id test-id categorypatt setvarpatt)))
+                                                         (testdat (filter
+                                                                   (lambda (x)
+                                                                     (not (equal? "logpro"
+                                                                                  (list-ref x 10))))
+                                                                   testdat-raw)))
+                                                    (map 
+                                                     (lambda (item)
+                                                       (receive (id test_id category
+                                                                    variable value expected
+                                                                    tol units comment status type)
+                                                           (apply values item)
+                                                         (list target runname testname itempath category variable value comment)))
+                                                     testdat)))
+                                                tests))))
+                                    runs))))
+               (print (string-join table-header ","))
+               (for-each (lambda(table-row)
+                           (print (string-join (map ->string table-row) ",")))
+     
+                         
+                                 table-rows))))
+       (set! *didsomething* #t)
+       (bdat-time-to-exit-set! *bdat* #t))
+     
+     
+     
+     ;; NOTE: list-runs and list-db-targets operate on local db!!!
+     ;;
+     ;; IDEA: megatest list -runname blah% ...
+     ;;
+     (if (or (args:get-arg "-list-runs")
+     	(args:get-arg "-list-db-targets"))
+         (if (launch:setup)
+     	(let* (;; (dbstruct    (make-dbr:dbstruct path: *toppath* local: (args:get-arg "-local")))
+     	       (runpatt     (args:get-arg "-list-runs"))
+                    (access-mode (db:get-access-mode))
+     	       (testpatt    (common:args-get-testpatt #f))
+     	       ;; (if (args:get-arg "-testpatt") 
+     	       ;;  	        (args:get-arg "-testpatt") 
+     	       ;;  	        "%"))
+     	       (keys        (rmt:get-keys)) ;; (db:get-keys dbstruct))
+     	       ;; (runsdat  (db:get-runs dbstruct runpatt #f #f '()))
+     	;; (runsdat     (rmt:get-runs-by-patt keys (or runpatt "%") (common:args-get-target) ;; (db:get-runs-by-patt dbstruct keys (or runpatt "%") (common:args-get-target)
+     	;; 		           	 #f #f '("id" "runname" "state" "status" "owner" "event_time" "comment") 0))
+     	       (runsdat     (rmt:get-runs-by-patt keys (or runpatt "%") 
+                                                       (common:args-get-target) #f #f '("id" "runname" "state" "status" "owner" "event_time" "comment") 0))
+     	       (runstmp     (db:get-rows runsdat))
+     	       (header      (db:get-header runsdat))
+     	       ;; this is "-since" support. This looks at last mod times of <run-id>.db files
+     	       ;; and collects those modified since the -since time.
+     	       (runs        runstmp)
+                             ;; (if (and (not (null? runstmp))
+     			;;        (args:get-arg "-since"))
+     			;;   (let ((changed-ids (db:get-changed-run-ids (string->number (args:get-arg "-since")))))
+     			;;     (let loop ((hed (car runstmp))
+     			;;   	     (tal (cdr runstmp))
+     			;;   	     (res '()))
+     			;;       (let ((new-res (if (member (db:get-value-by-header hed header "id") changed-ids)
+     			;;   		       (cons hed res)
+     			;;   		       res)))
+     			;;         (if (null? tal)
+     			;;   	  (reverse new-res)
+     			;;   	  (loop (car tal)(cdr tal) new-res)))))
+     			;;   runstmp))
+     	       (db-targets  (args:get-arg "-list-db-targets"))
+     	       (seen        (make-hash-table))
+     	       (dmode       (let ((d (args:get-arg "-dumpmode"))) ;; json, sexpr
+     			      (if d (string->symbol d) #f)))
+     	       (data        (make-hash-table))
+     	       (fields-spec (if (args:get-arg "-fields")
+     				(extract-fields-constraints (args:get-arg "-fields"))
+     				(list (cons "runs" (append keys (list "id" "runname" "state" "status" "owner" "event_time" "comment" "fail_count" "pass_count")))
+     				      (cons "tests"  db:test-record-fields) ;; "id" "testname" "test_path")
+     				      (list "steps" "id" "stepname"))))
+     	       (runs-spec   (let ((r (alist-ref "runs"  fields-spec equal?))) ;; the check is now unnecessary
+     			      (if (and r (not (null? r))) r (list "id" ))))
+     	       (tests-spec  (let ((t (alist-ref "tests" fields-spec equal?)))
+     			      (if (and t (null? t)) ;; all fields
+     				  db:test-record-fields
+     				  t)))
+     	       (adj-tests-spec (delete-duplicates (if tests-spec (cons "id" tests-spec) db:test-record-fields))) ;; '("id"))))
+     	       (steps-spec  (alist-ref "steps" fields-spec equal?))
+     	       (test-field-index (make-hash-table)))
+     	  (if (and tests-spec (not (null? tests-spec))) ;; do some validation and processing of the test-spec
+     	      (let ((invalid-tests-spec (filter (lambda (x)(not (member x db:test-record-fields))) tests-spec)))
+     		(if (null? invalid-tests-spec)
+     		    ;; generate the lookup map test-field-name => index-number
+     		    (let loop ((hed (car adj-tests-spec))
+     			       (tal (cdr adj-tests-spec))
+     			       (idx 0))
+     		      (hash-table-set! test-field-index hed idx)
+     		      (if (not (null? tal))(loop (car tal)(cdr tal)(+ idx 1))))
+     		    (begin
+     		      (debug:print-error 0 *default-log-port* "Invalid test fields specified: " (string-intersperse invalid-tests-spec ", "))
+     		      (exit)))))
+     	  ;; Each run
+     	  (for-each 
+     	   (lambda (run)
+     	     (let ((targetstr (string-intersperse (map (lambda (x)
+     							 (db:get-value-by-header run header x))
+     						       keys) "/")))
+     	       (if db-targets
+     		   (if (not (hash-table-ref/default seen targetstr #f))
+     		       (begin
+     			 (hash-table-set! seen targetstr #t)
+     			 ;; (print "[" targetstr "]"))))
+     			 (if (not dmode)
+     			     (print targetstr)
+     			     (hash-table-set! data "targets" (cons targetstr (hash-table-ref/default data "targets" '())))
+     			     )))
+     		   (let* ((run-id  (db:get-value-by-header run header "id"))
+     			  (runname (db:get-value-by-header run header "runname")) 
+     			  (states  (string-split (or (args:get-arg "-state") "") ","))
+     			  (statuses (string-split (or (args:get-arg "-status") "") ","))
+     			  (tests   (if tests-spec
+     				       (rmt:get-tests-for-run run-id testpatt states statuses #f #f #f 'testname 'asc ;; (db:get-tests-for-run dbstruct run-id testpatt '() '() #f #f #f 'testname 'asc 
+     							     ;; use qryvals if test-spec provided
+     							     (if tests-spec
+     								 (string-intersperse adj-tests-spec ",")
+     								 ;; db:test-record-fields
+     								 #f)
+     							     #f
+     							     'normal)
+     				       '())))
+     		     (case dmode
+     		       ((json ods sexpr)
+     			(if runs-spec
+     			    (for-each 
+     			     (lambda (field-name)
+     			       (mutils:hierhash-set! data (conc (db:get-value-by-header run header field-name)) targetstr runname "meta" field-name))
+     			     runs-spec)))
+     			;; (mutils:hierhash-set! data (db:get-value-by-header run header "status")     targetstr runname "meta" "status"     )
+     			;; (mutils:hierhash-set! data (db:get-value-by-header run header "state")      targetstr runname "meta" "state"      )
+     			;; (mutils:hierhash-set! data (conc (db:get-value-by-header run header "id"))  targetstr runname "meta" "id"         )
+     			;; (mutils:hierhash-set! data (db:get-value-by-header run header "event_time") targetstr runname "meta" "event_time" )
+     			;; (mutils:hierhash-set! data (db:get-value-by-header run header "comment")    targetstr runname "meta" "comment"    )
+     			;; ;; add last entry twice - seems to be a bug in hierhash?
+     			;; (mutils:hierhash-set! data (db:get-value-by-header run header "comment")    targetstr runname "meta" "comment"    )
+     		       (else
+     			(if (null? runs-spec)
+     			    (print "Run: " targetstr "/" runname 
+     				   " status: " (db:get-value-by-header run header "state")
+     				   " run-id: " run-id ", number tests: " (length tests)
+     				   " event_time: " (db:get-value-by-header run header "event_time"))
+     			    (begin
+     			      (if (not (member "target" runs-spec))
+     			          ;; (display (conc "Target: " targetstr))
+     			          (display (conc "Run: " targetstr "/" runname " ")))
+     			      (for-each
+     			       (lambda (field-name)
+     				 (if (equal? field-name "target")
+     				     (display (conc "target: " targetstr " "))
+     				     (display (conc field-name ": " (db:get-value-by-header run header (conc field-name)) " "))))
+     			       runs-spec)
+     			      (newline)))))
+     		       
+     		     (for-each 
+     		      (lambda (test)
+     		      	(handle-exceptions
+     			 exn
+     			 (begin
+     			   (debug:print-error 0 *default-log-port* "Bad data in test record? " test)
+     			   (debug:print-error 5 *default-log-port* "exn=" (condition->list exn))
+     			   (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
+     			   (print-call-chain (current-error-port)))
+     			 (let* ((test-id      (if (member "id"           tests-spec)(get-value-by-fieldname test test-field-index "id"          ) #f)) ;; (db:test-get-id         test))
+     				(testname     (if (member "testname"     tests-spec)(get-value-by-fieldname test test-field-index "testname"    ) #f)) ;; (db:test-get-testname   test))
+     				(itempath     (if (member "item_path"    tests-spec)(get-value-by-fieldname test test-field-index "item_path"   ) #f)) ;; (db:test-get-item-path  test))
+     				(comment      (if (member "comment"      tests-spec)(get-value-by-fieldname test test-field-index "comment"     ) #f)) ;; (db:test-get-comment    test))
+     				(tstate       (if (member "state"        tests-spec)(get-value-by-fieldname test test-field-index "state"       ) #f)) ;; (db:test-get-state      test))
+     				(tstatus      (if (member "status"       tests-spec)(get-value-by-fieldname test test-field-index "status"      ) #f)) ;; (db:test-get-status     test))
+     				(event-time   (if (member "event_time"   tests-spec)(get-value-by-fieldname test test-field-index "event_time"  ) #f)) ;; (db:test-get-event_time test))
+     				(rundir       (if (member "rundir"       tests-spec)(get-value-by-fieldname test test-field-index "rundir"      ) #f)) ;; (db:test-get-rundir     test))
+     				(final_logf   (if (member "final_logf"   tests-spec)(get-value-by-fieldname test test-field-index "final_logf"  ) #f)) ;; (db:test-get-final_logf test))
+     				(run_duration (if (member "run_duration" tests-spec)(get-value-by-fieldname test test-field-index "run_duration") #f)) ;; (db:test-get-run_duration test))
+     				(fullname     (conc testname
+     						    (if (equal? itempath "")
+     							"" 
+     							(conc "(" itempath ")")))))
+     			   (case dmode
+     			     ((json ods sexpr)
+     			      (if tests-spec
+     				  (for-each
+     				   (lambda (field-name)
+     				     (mutils:hierhash-set! data  (get-value-by-fieldname test test-field-index field-name) targetstr runname "data" (conc test-id) field-name))
+     				   tests-spec)))
+     			     ;; ;; (mutils:hierhash-set! data  fullname   targetstr runname "data" (conc test-id) "tname"     )
+     			     ;;  (mutils:hierhash-set! data  testname   targetstr runname "data" (conc test-id) "testname"  )
+     			     ;;  (mutils:hierhash-set! data  itempath   targetstr runname "data" (conc test-id) "itempath"  )
+     			     ;;  (mutils:hierhash-set! data  comment    targetstr runname "data" (conc test-id) "comment"   )
+     			     ;;  (mutils:hierhash-set! data  tstate     targetstr runname "data" (conc test-id) "state"     )
+     			     ;;  (mutils:hierhash-set! data  tstatus    targetstr runname "data" (conc test-id) "status"    )
+     			     ;;  (mutils:hierhash-set! data  rundir     targetstr runname "data" (conc test-id) "rundir"    )
+     			     ;;  (mutils:hierhash-set! data  final_logf targetstr runname "data" (conc test-id) "final_logf")
+     			     ;;  (mutils:hierhash-set! data  run_duration targetstr runname "data" (conc test-id) "run_duration")
+     			     ;;  (mutils:hierhash-set! data  event-time targetstr runname "data" (conc test-id) "event_time")
+     			     ;;  ;; add last entry twice - seems to be a bug in hierhash?
+     			     ;;  (mutils:hierhash-set! data  event-time targetstr runname "data" (conc test-id) "event_time")
+     			     ;;  )
+     			     (else
+     			      (if (and tstate tstatus event-time)
+     				  (format #t
+     					  "  Test: ~25a State: ~15a Status: ~15a Runtime: ~5@as Time: ~22a Host: ~10a\n"
+     					  (if fullname fullname "")
+     					  (if tstate   tstate   "")
+     					  (if tstatus  tstatus  "")
+     					  (get-value-by-fieldname test test-field-index "run_duration");;(if test     (db:test-get-run_duration test) "")
+     					  (if event-time event-time "")
+     					  (get-value-by-fieldname test test-field-index "host")) ;;(if test (db:test-get-host test)) "")
+     				  (print "  Test: " fullname
+     					 (if tstate  (conc " State: "  tstate)  "")
+     					 (if tstatus (conc " Status: " tstatus) "")
+     					 (if (get-value-by-fieldname test test-field-index "run_duration")
+     					     (conc " Runtime: " (get-value-by-fieldname test test-field-index "run_duration"))
+     					     "")
+     					 (if event-time (conc " Time: " event-time) "")
+     					 (if (get-value-by-fieldname test test-field-index "host")
+     					     (conc " Host: " (get-value-by-fieldname test test-field-index "host"))
+     					     "")))
+     			      (if (not (or (equal? (get-value-by-fieldname test test-field-index "status") "PASS")
+     					   (equal? (get-value-by-fieldname test test-field-index "status") "WARN")
+     					   (equal? (get-value-by-fieldname test test-field-index "state")  "NOT_STARTED")))
+     				  (begin
+     				    (print   (if (get-value-by-fieldname test test-field-index "cpuload")
+     						 (conc "         cpuload:  "   (get-value-by-fieldname test test-field-index "cpuload"))
+     						 "") ;; (db:test-get-cpuload test)
+     					     (if (get-value-by-fieldname test test-field-index "diskfree")
+     						 (conc "\n         diskfree: " (get-value-by-fieldname test test-field-index "diskfree")) ;; (db:test-get-diskfree test)
+     						 "")
+     					     (if (get-value-by-fieldname test test-field-index "uname")
+     						 (conc "\n         uname:    " (get-value-by-fieldname test test-field-index "uname")) ;; (db:test-get-uname test)
+     						 "")
+     					     (if (get-value-by-fieldname test test-field-index "rundir")
+     						 (conc "\n         rundir:   " (get-value-by-fieldname test test-field-index "rundir")) ;; (db:test-get-rundir test)
+     						 "")
+     ;;					     "\n         rundir:   " (get-value-by-fieldname test test-field-index "") ;; (sdb:qry 'getstr ;; (filedb:get-path *fdb* 
+     ;; 					     (db:test-get-rundir test) ;; )
+     					     )
+     				    ;; Each test
+     				    ;; DO NOT remote run
+     				    (let ((steps (rmt:get-steps-for-test run-id (db:test-get-id test)))) ;; (db:get-steps-for-test dbstruct run-id (db:test-get-id test))))
+     				      (for-each 
+     				       (lambda (step)
+     					 (format #t 
+     						 "    Step: ~20a State: ~10a Status: ~10a Time ~22a\n"
+     						 (tdb:step-get-stepname step)
+     						 (tdb:step-get-state step)
+     						 (tdb:step-get-status step)
+     						 (tdb:step-get-event_time step)))
+     				       steps)))))))))
+     		      (if (args:get-arg "-sort")
+     			  (sort tests
+     				(lambda (a-test b-test)
+     				  (let* ((key    (args:get-arg "-sort"))
+     					 (first  (get-value-by-fieldname a-test test-field-index key))
+     					 (second (get-value-by-fieldname b-test test-field-index key)))
+     				    ((cond 
+     				      ((and (number? first)(number? second)) <)
+     				      ((and (string? first)(string? second)) string<=?)
+     				      (else equal?))
+     				     first second))))
+     			  tests))))))
+     	   runs)
+     	  (case dmode
+     	    ((json)  (json-write data))
+     	    ((sexpr) (pp (common:to-alist data))))
+     	  (let* ((metadat-fields (delete-duplicates
+     				  (append keys '( "runname" "time" "owner" "pass_count" "fail_count" "state" "status" "comment" "id"))))
+     		 (run-fields    '(
+     				  "testname"
+     				  "item_path"
+     				  "state"
+     				  "status"
+     				  "comment"
+     				  "event_time"
+     				  "host"
+     				  "run_id"
+     				  "run_duration"
+     				  "attemptnum"
+     				  "id"
+     				  "archived"
+     				  "diskfree"
+     				  "cpuload"
+     				  "final_logf"
+     				  "shortdir"
+     				  "rundir"
+     				  "uname"
+     				  )
+     				)
+     		 (newdat          (common:to-alist data))
+     		 (allrundat       (if (null? newdat)
+     				      '()
+     				      (car (map cdr newdat)))) ;; (car (map cdr (car (map cdr newdat)))))
+     		 (runs            (append
+     				   (list "runs" ;; sheetname
+     					 metadat-fields)
+     				   (map (lambda (run)
+     					  ;; (print "run: " run)
+     					  (let* ((runname (car run))
+     						 (rundat  (cdr run))
+     						 (metadat (let ((tmp (assoc "meta" rundat)))
+     							    (if tmp (cdr tmp) #f))))
+     					    ;; (print "runname: " runname "\n\nrundat: " )(pp rundat)(print "\n\nmetadat: ")(pp metadat)
+     					    (if metadat
+     						(map (lambda (field)
+     						       (let ((tmp (assoc field metadat)))
+     							 (if tmp (cdr tmp) "")))
+     						     metadat-fields)
+     						(begin
+     						  (debug:print 0 *default-log-port* "WARNING: meta data for run " runname " not found")
+     						  '()))))
+     					allrundat)))
+     		 ;; '( ( "target" ( "runname" ( "data" ( "runid" ( "id . "37" ) ( ... ))))
+     		 (run-pages      (map (lambda (targdat)
+     					(let* ((target  (car targdat))
+     					       (runsdat (cdr targdat)))
+     					  (if runsdat
+     					      (map (lambda (rundat)
+     						     (let* ((runname  (car rundat))
+     							    (rundat   (cdr rundat))
+     							    (testsdat (let ((tmp (assoc "data" rundat)))
+     									(if tmp (cdr tmp) #f))))
+     						       (if testsdat
+     							   (let ((tests (map (lambda (test)
+     									       (let* ((test-id  (car test))
+     										      (test-dat (cdr test)))
+     										 (map (lambda (field)
+     											(let ((tmp (assoc field test-dat)))
+     											  (if tmp (cdr tmp) "")))
+     										      run-fields)))
+     									     testsdat)))
+     							     ;; (print "Target: " target "/" runname " tests:")
+     							     ;; (pp tests)
+     							     (cons (conc target "/" runname)
+     								   (cons (list (conc target "/" runname))
+     									 (cons '()
+     									       (cons run-fields tests)))))
+     							   (begin
+     							     (debug:print 4 *default-log-port* "WARNING: run " target "/" runname " appears to have no data")
+     							     ;; (pp rundat)
+     							     '()))))
+     						   runsdat)
+     					      '())))
+     				      newdat)) ;; we use newdat to get target
+     		 (sheets         (filter (lambda (x)
+     					   (not (null? x)))
+     					 (cons runs (map car run-pages)))))
+     	    ;; (print "allrundat:")
+     	    ;; (pp allrundat)
+     	    ;; (print "runs:")
+     	    ;; (pp runs)
+     	    ;(print "sheets: ")
+     	    ;; (pp sheets)
+     	    (if (eq? dmode 'ods)
+     		(let* ((tempdir    (conc "/tmp/" (current-user-name) "/" (pseudo-random-integer 10000) "_" (current-process-id)))
+     		       (outputfile (or (args:get-arg "-o") "out.ods"))
+     		       (ouf        (if (string-match (regexp "^[/~]+.*") outputfile) ;; full path?
+     				       outputfile
+     				       (begin
+     					 (debug:print 0 *default-log-port* "WARNING: path given, " outputfile " is relative, prefixing with current directory")
+     					 (conc (current-directory) "/" outputfile)))))
+     		  (create-directory tempdir #t)
+     		  (ods:list->ods tempdir ouf sheets))))
+     	  ;; (system (conc "rm -rf " tempdir))
+     	  (set! *didsomething* #t)
+	  (bdat-time-to-exit-set! *bdat* #t)
+	  ) ;; end if true branch (end of a let)
+	) ;; end if
+         ) ;; end if -list-runs
+
+     ;; list-waivers
+     (if (and (args:get-arg "-list-waivers")
+     	 (launch:setup))
+         (let* ((runpatt     (or (args:get-arg "-runname") "%"))
+     	   (testpatt    (common:args-get-testpatt #f))
+     	   (keys        (rmt:get-keys)) 
+     	   (runsdat     (rmt:get-runs-by-patt
+     			 keys runpatt 
+     			 (common:args-get-target) #f #f
+     			 '("id" "runname" "state" "status" "owner" "event_time" "comment") 0))
+     	   (runs        (db:get-rows runsdat))
+     	   (header      (db:get-header runsdat))
+     	   (results     (make-hash-table))  ;; [target] ( (testname/itempath . "comment") ... )
+     	   (addtest     (lambda (target testname itempath comment)
+     			  (hash-table-set! results target (cons (cons (conc testname "/" itempath) comment)
+     								(hash-table-ref/default results target '())))))
+     	   (last-target #f))
+           (for-each
+            (lambda (run)
+     	 (let* ((run-id  (db:get-value-by-header run header "id"))
+     		(target  (rmt:get-target run-id))
+     		(runname (db:get-value-by-header run header "runname")) 
+     		(tests   (rmt:get-tests-for-run
+     			  run-id testpatt '("COMPLETED") '("WAIVED") #f #f #f 'testname 'asc							     ;; use qryvals if test-spec provided
+     			  #f #f #f)))
+     	   (if (not (equal? target last-target))
+     	       (print "[" target "]"))
+     	   (set! last-target target)
+     	   (print "# " runname)
+     	   (for-each
+     	    (lambda (testdat)
+     	      (let* ((testfullname (conc (db:test-get-testname testdat)
+     					 (if (equal? "" (db:test-get-item-path testdat))
+     					     ""
+     					     (conc "/" (db:test-get-item-path testdat)))
+     					 )))
+     	      (print testfullname " " (db:test-get-comment testdat))))
+     	    tests)))
+            runs)
+           (set! *didsomething* #t)))
+           
+     
+     ;; get lock in db for full run for this directory
+     ;; for all tests with deps
+     ;;   walk tree of tests to find head tasks
+     ;;   add head tasks to task queue
+     ;;   add dependant tasks to task queue 
+     ;;   add remaining tasks to task queue
+     ;; for each task in task queue
+     ;;   if have adequate resources
+     ;;     launch task
+     ;;   else
+     ;;     put task in deferred queue
+     ;; if still ok to run tasks
+     ;;   process deferred tasks per above steps
+     
+     ;; run all tests are are Not COMPLETED and PASS or CHECK
+     (if (or (args:get-arg "-runall")
+     	(args:get-arg "-run")
+     	(args:get-arg "-rerun-clean")
+     	(args:get-arg "-rerun-all")
+     	(args:get-arg "-runtests")
+             (args:get-arg "-kill-rerun"))
+         (let ((need-clean (or (args:get-arg "-rerun-clean")
+                               (args:get-arg "-rerun-all")))
+     	  (orig-cmdline (string-intersperse (argv) " ")))
+           (general-run-call 
+            "-runall"
+            "run all tests"
+            (lambda (target runname keys keyvals)
+     	 (if (or (string-search "%" target)
+     		 (string-search "%" runname)) ;; we are being asked to re-run multiple runs
+     	     (let* ((run-specs (rmt:simple-get-runs runname #f #f target #f))) ;; list of simple-run records
+     	       (debug:print-info 0 *default-log-port* "Pattern supplied for target or runname with "
+     				 (length run-specs) " matches round. Running each in turn.")
+     	       (if (null? run-specs)
+     		   (debug:print 0 *default-log-port* "WARNING: No runs match target " target " and runname " runname))
+     	       (for-each (lambda (spec) 
+     			   (let* ((precmd     (if (args:get-arg "-precmd")(conc (args:get-arg "-precmd") " ") ""))
+     				  (newcmdline (conc
+     					       precmd
+     					       (string-substitute
+     						(conc "target " target)
+     						(conc "target " (simple-run-target spec))
+     						(string-substitute
+     						 (conc "runname " runname)
+     						 (conc "runname " (simple-run-runname spec))
+     						 orig-cmdline)))))
+     			     (debug:print 0 *default-log-port* "ORIG: " orig-cmdline)
+     			     (debug:print 0 *default-log-port* "NEW:  " newcmdline)
+     			     (system newcmdline)))
+     			 run-specs))
+     	     (handle-run-requests target runname keys keyvals need-clean))))))
+     
+     ;;======================================================================
+     ;; run one test
+     ;;======================================================================
+     
+     ;; 1. find the config file
+     ;; 2. change to the test directory
+     ;; 3. update the db with "test started" status, set running host
+     ;; 4. process launch the test
+     ;;    - monitor the process, update stats in the db every 2^n minutes
+     ;; 5. as the test proceeds internally it calls megatest as each step is
+     ;;    started and completed
+     ;;    - step started, timestamp
+     ;;    - step completed, exit status, timestamp
+     ;; 6. test phone home
+     ;;    - if test run time > allowed run time then kill job
+     ;;    - if cannot access db > allowed disconnect time then kill job
+     
+     ;; == duplicated == (if (or (args:get-arg "-run")(args:get-arg "-runtests"))
+     ;; == duplicated ==   (general-run-call 
+     ;; == duplicated ==    "-runtests" 
+     ;; == duplicated ==    "run a test" 
+     ;; == duplicated ==    (lambda (target runname keys keyvals)
+     ;; == duplicated ==      ;;
+     ;; == duplicated ==      ;; May or may not implement it this way ...
+     ;; == duplicated ==      ;;
+     ;; == duplicated ==      ;; Insert this run into the tasks queue
+     ;; == duplicated ==      ;; (open-run-close tasks:add tasks:open-db 
+     ;; == duplicated ==      ;;    	     "runtests" 
+     ;; == duplicated ==      ;;    	     user
+     ;; == duplicated ==      ;;    	     target
+     ;; == duplicated ==      ;;    	     runname
+     ;; == duplicated ==      ;;    	     (args:get-arg "-runtests")
+     ;; == duplicated ==      ;;    	     #f))))
+     ;; == duplicated ==      (runs:run-tests target
+     ;; == duplicated == 		     runname
+     ;; == duplicated == 		     (common:args-get-testpatt #f) ;; (args:get-arg "-runtests")
+     ;; == duplicated == 		     user
+     ;; == duplicated == 		     args:arg-hash))))
+     
+     ;;======================================================================
+     ;; Rollup into a run
+     ;;======================================================================
+     
+     ;; (if (args:get-arg "-rollup")
+     ;;     (general-run-call 
+     ;;      "-rollup" 
+     ;;      "rollup tests" 
+     ;;      (lambda (target runname keys keyvals)
+     ;;        (runs:rollup-run keys
+     ;; 			keyvals
+     ;; 			(or (args:get-arg "-runname")(args:get-arg ":runname") )
+     ;; 			user))))
+     
+     ;;======================================================================
+     ;; Lock or unlock a run
+     ;;======================================================================
+     
+     (if (or (args:get-arg "-lock")(args:get-arg "-unlock"))
+         (general-run-call 
+          (if (args:get-arg "-lock") "-lock" "-unlock")
+          "lock/unlock tests" 
+          (lambda (target runname keys keyvals)
+            (runs:handle-locking 
+     		  target
+     		  keys
+     		  (or (args:get-arg "-runname")(args:get-arg ":runname") )
+     		  (args:get-arg "-lock")
+     		  (args:get-arg "-unlock")
+     		  (bdat-user *bdat*)))))
+     
+     ;;======================================================================
+     ;; Get paths to tests
+     ;;======================================================================
+     ;; Get test paths matching target, runname, and testpatt
+     (if (or (args:get-arg "-test-files")(args:get-arg "-test-paths"))
+         ;; if we are in a test use the MT_CMDINFO data
+         (if (getenv "MT_CMDINFO")
+     	(let* ((startingdir (current-directory))
+     	       (cmdinfo   (common:read-encoded-string (getenv "MT_CMDINFO")))
+     	       (transport (assoc/default 'transport cmdinfo))
+     	       (testpath  (assoc/default 'testpath  cmdinfo))
+     	       (test-name (assoc/default 'test-name cmdinfo))
+     	       (runscript (assoc/default 'runscript cmdinfo))
+     	       (db-host   (assoc/default 'db-host   cmdinfo))
+     	       (run-id    (assoc/default 'run-id    cmdinfo))
+     	       (itemdat   (assoc/default 'itemdat   cmdinfo))
+     	       (state     (args:get-arg ":state"))
+     	       (status    (args:get-arg ":status"))
+     	       ;;(target    (args:get-arg "-target"))
+     	       (target    (common:args-get-target))
+     	       (toppath   (assoc/default 'toppath   cmdinfo)))
+     	  (change-directory toppath)
+     	  (if (not target)
+     	      (begin
+     		(debug:print-error 0 *default-log-port* "-target is required.")
+     		(exit 1)))
+     	  (if (not (launch:setup))
+     	      (begin
+     		(debug:print 0 *default-log-port* "Failed to setup, giving up on -test-paths or -test-files, exiting")
+     		(exit 1)))
+     	  (let* ((keys     (rmt:get-keys))
+     		 ;; db:test-get-paths must not be run remote
+     		 (paths    (tests:test-get-paths-matching keys target (args:get-arg "-test-files"))))
+     	    (set! *didsomething* #t)
+     	    (for-each (lambda (path)
+     			(if (common:file-exists? path)
+     			(print path)))	
+     		      paths)))
+     	;; else do a general-run-call
+     	(general-run-call 
+     	 "-test-files"
+     	 "Get paths to test"
+     	 (lambda (target runname keys keyvals)
+     	   (let* ((db       #f)
+     		  ;; DO NOT run remote
+     		  (paths    (tests:test-get-paths-matching keys target (args:get-arg "-test-files"))))
+     	     (for-each (lambda (path)
+     			 (print path))
+     		       paths))))))
+     
+     ;;======================================================================
+     ;; Archive tests
+     ;;======================================================================
+     ;; Archive tests matching target, runname, and testpatt
+     (if (equal? (args:get-arg "-archive") "replicate-db")
+         (begin
+               ;; check if source
+               ;; check if megatest.db exist
+              (launch:setup)
+              (if (not (args:get-arg "-source"))
+                  (begin 
+                  (debug:print-info 1 *default-log-port* "Missing required argument -source <archive path>")
+                  (exit 1)))
+              (if (common:file-exists? (conc  *toppath* "/megatest.db"))
+                  (begin  
+                    (debug:print-info 1 *default-log-port* "File " (conc  *toppath* "/megatest.db") " already exists. Please remove it before trying to replicate db")
+                    (exit 1)))
+              (if (and (common:get-db-tmp-area) (> (length (directory   (common:get-db-tmp-area) #f)) 0))
+                (begin
+                (debug:print-info 1 *default-log-port* (common:get-db-tmp-area) " not empty. Please remove it before trying to replicate db")
+                (exit 1)))    
+               ;; check if timestamp 
+               (let* ((source (args:get-arg "-source"))
+                     (src     (if (not (equal? (substring source 0 1) "/"))
+                                  (conc (current-directory) "/" source)
+                                  source))
+                     (ts (if (args:get-arg "-time-stamp")   (args:get-arg "-time-stamp") "latest")))
+                   (if  (common:directory-exists? src)
+                       (begin 
+                       (archive:restore-db src ts)
+                 (set! *didsomething* #t))
+            (begin
+              (debug:print-error 1 *default-log-port* "Path " source " not found")
+              (exit 1))))))   
+         ;; else do a general-run-call
+        (if (and (args:get-arg "-archive") (not (equal? (args:get-arg "-archive") "replicate-db"))) 
+         (begin
+           ;; for the archive get we need to preserve the starting dir as part of the target path
+           (if (and (args:get-arg "-dest")
+     	       (not (equal? (substring (args:get-arg "-dest") 0 1) "/")))
+     	  (let ((newpath  (conc (current-directory) "/" (args:get-arg "-dest"))))
+     	    (debug:print-info 1 *default-log-port* "Preserving original path to destination, was " (args:get-arg "-dest") ", now " newpath)
+     	    (hash-table-set! args:arg-hash "-dest" newpath)))
+           (general-run-call 
+            "-archive"
+            "Archive"
+            (lambda (target runname keys keyvals)
+     	 (operate-on 'archive target-in: target runname-in: runname )))))
+     
+     ;;======================================================================
+     ;; Extract a spreadsheet from the runs database
+     ;;======================================================================
+
+;; TODO: Reenable this functionality
+
+     #;(if (args:get-arg "-extract-ods")
+         (general-run-call
+          "-extract-ods"
+          "Make ods spreadsheet"
+          (lambda (target runname keys keyvals)
+            (let ((dbstruct   (make-dbr:dbstruct path: *toppath* local: #t))
+     	     (outputfile (args:get-arg "-extract-ods"))
+     	     (runspatt   (or (args:get-arg "-runname")(args:get-arg ":runname")))
+     	     (pathmod    (args:get-arg "-pathmod")))
+     	     ;; (keyvalalist (keys->alist keys "%")))
+     	 (debug:print 2 *default-log-port* "Extract ods, outputfile: " outputfile " runspatt: " runspatt " keyvals: " keyvals)
+     	 (db:extract-ods-file dbstruct outputfile keyvals (if runspatt runspatt "%") pathmod)
+     	 (db:close-all dbstruct)
+     	 (set! *didsomething* #t)))))
+     
+     ;;======================================================================
+     ;; execute the test
+     ;;    - gets called on remote host
+     ;;    - receives info from the -execute param
+     ;;    - passes info to steps via MT_CMDINFO env var (future is to use a dot file)
+     ;;    - gathers host info and 
+     ;;======================================================================
+     
+     (if (args:get-arg "-execute")
+         (begin
+           (launch:execute (args:get-arg "-execute"))
+           (set! *didsomething* #t)))
+     
+     ;;======================================================================
+     ;; recover from a test where the managing mtest was killed but the underlying
+     ;; process might still be salvageable
+     ;;======================================================================
+     
+     (if (args:get-arg "-recover-test")
+         (let* ((params (string-split (args:get-arg "-recover-test") ",")))
+           (if (> (length params) 1) ;; run-id and test-id
+     	  (let ((run-id (string->number (car params)))
+     		(test-id (string->number (cadr params))))
+     	    (if (and run-id test-id)
+     		(begin
+     		  (launch:recover-test run-id test-id)
+     		  (set! *didsomething* #t))
+     		(begin
+     		  (debug:print-error 0 *default-log-port* "bad run-id or test-id, must be integers")
+     		  (exit 1)))))))
+     
+  (if (args:get-arg "-step")
+      (begin
+           (thread-sleep! 1.5)
+           (megatest:step 
+            (args:get-arg "-step")
+            (or (args:get-arg "-state")(args:get-arg ":state"))
+            (or (args:get-arg "-status")(args:get-arg ":status"))
+            (args:get-arg "-setlog")
+            (args:get-arg "-m"))
+           ;; (if db (sqlite3:finalize! db))
+           (set! *didsomething* #t)
+           (thread-sleep! 1.5)))
+         
+     (if (or (args:get-arg "-setlog")       ;; since setting up is so costly lets piggyback on -test-status
+     	;;     (not (args:get-arg "-step")))  ;; -setlog may have been processed already in the "-step" previous
+     	;;     NEW POLICY - -setlog sets test overall log on every call.
+     	(args:get-arg "-set-toplog")
+     	(args:get-arg "-test-status")
+     	(args:get-arg "-set-values")
+     	(args:get-arg "-load-test-data")
+     	(args:get-arg "-runstep")
+     	(args:get-arg "-summarize-items"))
+         (if (not (getenv "MT_CMDINFO"))
+     	(begin
+     	  (debug:print-error 0 *default-log-port* "MT_CMDINFO env var not set, commands -test-status, -runstep and -setlog must be called *inside* a megatest environment!")
+     	  (exit 5))
+     	(let* ((startingdir (current-directory))
+     	       (cmdinfo   (common:read-encoded-string (getenv "MT_CMDINFO")))
+     	       (transport (assoc/default 'transport cmdinfo))
+     	       (testpath  (assoc/default 'testpath  cmdinfo))
+     	       (test-name (assoc/default 'test-name cmdinfo))
+     	       (runscript (assoc/default 'runscript cmdinfo))
+     	       (db-host   (assoc/default 'db-host   cmdinfo))
+     	       (run-id    (assoc/default 'run-id    cmdinfo))
+     	       (test-id   (assoc/default 'test-id   cmdinfo))
+     	       (itemdat   (assoc/default 'itemdat   cmdinfo))
+     	       (work-area (assoc/default 'work-area cmdinfo))
+     	       (db        #f) ;; (open-db))
+     	       (state     (args:get-arg ":state"))
+     	       (status    (args:get-arg ":status"))
+     	       (stepname  (args:get-arg "-step")))
+     	  (if (not (launch:setup))
+     	      (begin
+     		(debug:print 0 *default-log-port* "Failed to setup, exiting")
+     		(exit 1)))
+     
+     	  (if (args:get-arg "-runstep")(debug:print-info 1 *default-log-port* "Running -runstep, first change to directory " work-area))
+     	  (change-directory work-area)
+     	  ;; can setup as client for server mode now
+     	  ;; (client:setup)
+     
+     	  (if (args:get-arg "-load-test-data")
+     	      ;; has sub commands that are rdb:
+     	      ;; DO NOT put this one into either rmt: or open-run-close
+     	      (tdb:load-test-data run-id test-id))
+     	  (if (args:get-arg "-setlog")
+     	      (let ((logfname (args:get-arg "-setlog")))
+     		(rmt:test-set-log! run-id test-id logfname)))
+     	  (if (args:get-arg "-set-toplog")
+     	      ;; DO NOT run remote
+     	      (tests:test-set-toplog! run-id test-name (args:get-arg "-set-toplog")))
+     	  (if (args:get-arg "-summarize-items")
+     	      ;; DO NOT run remote
+     	      (tests:summarize-items run-id test-id test-name #t)) ;; do force here
+     	  (if (args:get-arg "-runstep")
+     	      (if (null? remargs)
+     		  (begin
+     		    (debug:print-error 0 *default-log-port* "nothing specified to run!")
+     		    (if db (sqlite3:finalize! db))
+     		    (exit 6))
+     		  (let* ((stepname   (args:get-arg "-runstep"))
+     			 (logprofile (args:get-arg "-logpro"))
+     			 (logfile    (conc stepname ".log"))
+     			 (cmd        (if (null? remargs) #f (car remargs)))
+     			 (params     (if cmd (cdr remargs) '()))
+     			 (exitstat   #f)
+     			 (shell      (let ((sh (get-environment-variable "SHELL") ))
+     				       (if sh 
+     					   (last (string-split sh "/"))
+     					   "bash")))
+     			 (redir      (case (string->symbol shell)
+     				       ((tcsh csh ksh)    ">&")
+     				       ((zsh bash sh ash) "2>&1 >")
+     				       (else ">&")))
+     			 (fullcmd    (conc "(" (string-intersperse 
+     						(cons cmd params) " ")
+     					   ") " redir " " logfile)))
+     		    ;; mark the start of the test
+     		    (rmt:teststep-set-status! run-id test-id stepname "start" "n/a" (args:get-arg "-m") logfile)
+     		    ;; run the test step
+     		    (debug:print-info 2 *default-log-port* "Running \"" fullcmd "\" in directory \"" startingdir)
+     		    (change-directory startingdir)
+     		    (set! exitstat (system fullcmd))
+     		    (set! *globalexitstatus* exitstat)
+     		    ;; (change-directory testpath)
+     		    ;; run logpro if applicable ;; (process-run "ls" (list "/foo" "2>&1" "blah.log"))
+     		    (if logprofile
+     			(let* ((htmllogfile (conc stepname ".html"))
+     			       (oldexitstat exitstat)
+     			       (cmd         (string-intersperse (list "logpro" logprofile htmllogfile "<" logfile ">" (conc stepname "_logpro.log")) " ")))
+     			  (debug:print-info 2 *default-log-port* "running \"" cmd "\"")
+     			  (change-directory startingdir)
+     			  (set! exitstat (system cmd))
+     			  (set! *globalexitstatus* exitstat) ;; no necessary
+     			  (change-directory testpath)
+     			  (rmt:test-set-log! run-id test-id htmllogfile)))
+     		    (let ((msg (args:get-arg "-m")))
+     		      (rmt:teststep-set-status! run-id test-id stepname "end" exitstat msg logfile))
+     		    )))
+     	  (if (or (args:get-arg "-test-status")
+     		  (args:get-arg "-set-values"))
+     	      (let ((newstatus (cond
+     				((number? status)       (if (equal? status 0) "PASS" "FAIL"))
+     				((and (string? status)
+     				      (string->number status))(if (equal? (string->number status) 0) "PASS" "FAIL"))
+     				(else status)))
+     		    ;; transfer relevant keys into a hash to be passed to test-set-status!
+     		    ;; could use an assoc list I guess. 
+     		    (otherdata (let ((res (make-hash-table)))
+     				 (for-each (lambda (key)
+     					     (if (args:get-arg key)
+     						 (hash-table-set! res key (args:get-arg key))))
+     					   (list ":value" ":tol" ":expected" ":first_err" ":first_warn" ":units" ":category" ":variable"))
+     				 res)))
+     		(if (and (args:get-arg "-test-status")
+     			 (or (not state)
+     			     (not status)))
+     		    (begin
+     		      (debug:print-error 0 *default-log-port* "You must specify :state and :status with every call to -test-status\n" help)
+     		      (if (sqlite3:database? db)(sqlite3:finalize! db))
+     		      (exit 6)))
+     		(let* ((msg    (args:get-arg "-m"))
+     		       (numoth (length (hash-table-keys otherdata))))
+     		  ;; Convert to rpc inside the tests:test-set-status! call, not here
+     		  (tests:test-set-status! run-id test-id state newstatus msg otherdata work-area: work-area))))
+     	  (if (sqlite3:database? db)(sqlite3:finalize! db))
+     	  (set! *didsomething* #t))))
+     
+     ;;======================================================================
+     ;; Various helper commands can go below here
+     ;;======================================================================
+     
+     (if (or (args:get-arg "-showkeys")
+             (args:get-arg "-show-keys"))
+         (let ((db #f)
+     	  (keys #f))
+           (if (not (launch:setup))
+     	  (begin
+     	    (debug:print 0 *default-log-port* "Failed to setup, exiting")
+     	    (exit 1)))
+           (set! keys (rmt:get-keys)) ;;  db))
+           (debug:print 1 *default-log-port* "Keys: " (string-intersperse keys ", "))
+           (if (sqlite3:database? db)(sqlite3:finalize! db))
+           (set! *didsomething* #t)))
+     
+     (if (args:get-arg "-gui")
+         (begin
+           (debug:print 0 *default-log-port* "Look at the dashboard for now")
+           ;; (megatest-gui)
+           (set! *didsomething* #t)))
+     
+     (if (args:get-arg "-create-megatest-area")
+         (begin
+           (genexample:mk-megatest.config)
+           (set! *didsomething* #t)))
+     
+     (if (args:get-arg "-create-test")
+         (let ((testname (args:get-arg "-create-test")))
+           (genexample:mk-megatest-test testname)
+           (set! *didsomething* #t)))
+     
+     ;;======================================================================
+     ;; Update the database schema, clean up the db
+     ;;======================================================================
+
+;; TODO: Restore this functionality
+
+      #;(if (args:get-arg "-rebuild-db")
+         (begin
+           (if (not (launch:setup))
+     	  (begin
+     	    (debug:print 0 *default-log-port* "Failed to setup, exiting") 
+     	    (exit 1)))
+           ;; keep this one local
+           ;; (open-run-close patch-db #f)
+           (let ((dbstruct (db:setup #f areapath: *toppath*)))
+             (common:cleanup-db dbstruct full: #t))
+           (set! *didsomething* #t)))
+     
+     #;(if (args:get-arg "-cleanup-db")
+         (begin
+           (if (not (launch:setup))
+     	  (begin
+     	    (debug:print 0 *default-log-port* "Failed to setup, exiting") 
+     	    (exit 1)))
+           (let ((dbstruct (db:setup #f areapath: *toppath*)))
+             (common:cleanup-db dbstruct))
+           (set! *didsomething* #t)))
+     
+     (if (args:get-arg "-mark-incompletes")
+         (begin
+           (if (not (launch:setup))
+     	  (begin
+     	    (debug:print 0 *default-log-port* "Failed to setup, exiting")
+     	    (exit 1)))
+           (runs:find-and-mark-incomplete-and-check-end-of-run #f)
+           (set! *didsomething* #t)))
+     
+     ;;======================================================================
+     ;; Update the tests meta data from the testconfig files
+     ;;======================================================================
+     
+     (if (args:get-arg "-update-meta")
+         (begin
+           (if (not (launch:setup))
+     	  (begin
+     	    (debug:print 0 *default-log-port* "Failed to setup, exiting") 
+     	    (exit 1)))
+           (runs:update-all-test_meta #f)
+           (set! *didsomething* #t)))
+     
+     ;;======================================================================
+     ;; Start a repl
+     ;;======================================================================
+     
+     ;; fakeout readline
+     ;; (include "readline-fix.scm")
+     
+     
+     (when (args:get-arg "-diff-rep")
+       (when (and
+              (not (args:get-arg "-diff-html"))
+              (not (args:get-arg "-diff-email")))
+         (debug:print 0 *default-log-port* "Must specify -diff-html or -diff-email with -diff-rep")
+         (set! *didsomething* 1)
+         (exit 1))
+       
+       (let* ((toppath (launch:setup)))
+         (do-diff-report
+          (args:get-arg "-src-target")
+          (args:get-arg "-src-runname")
+          (args:get-arg "-target")
+          (args:get-arg "-runname")
+          (args:get-arg "-diff-html")
+          (args:get-arg "-diff-email"))
+         (set! *didsomething* #t)
+         (exit 0)))
+     
+     (if (or (getenv "MT_RUNSCRIPT")
+     	(args:get-arg "-repl")
+     	(args:get-arg "-load"))
+         (let* ((toppath (launch:setup)))
+		
+     	        ;; (dbstruct (if (and toppath
+		;; 	      #;(common:on-homehost?))
+		;; 	 (db:setup #f) ;; sets up main.db
+		;; 	 #f))) ;; make-dbr:dbstruct path: toppath local: (args:get-arg "-local")) #f)))
+	   (if *toppath*
+	       (cond
+		((getenv "MT_RUNSCRIPT")
+		 ;; How to run megatest scripts
+		 ;;
+		 ;; #!/bin/bash
+		 ;;
+		 ;; export MT_RUNSCRIPT=yes
+		 ;; megatest << EOF
+		 ;; (print "Hello world")
+		 ;; (exit)
+		 ;; EOF
+		 
+		 (repl))
+		(else
+		 (begin
+		   ;; (set! *db* dbstruct)
+		   ;; (import extras) ;; might not be needed
+		   ;; (import csi)
+		   ;; (import readline)
+		   (import apropos
+			   archivemod
+			   commonmod
+			   configfmod
+			   dbmod
+			   debugprint
+			   ezstepsmod
+			   http-transportmod
+			   launchmod
+			   processmod
+			   rmtmod
+			   runsmod
+			   servermod
+			   tasksmod
+			   testsmod)
+		   
+		   (set-history-length! 300)
+		   
+		   (load-history-from-file ".megatest_history")
+		   
+		   (current-input-port (make-linenoise-port))
+		   ;; (import (prefix sqlite3 sqlite3:)) ;; doesn't work ...
+		   
+		   ;; (if *use-new-readline*
+		   ;; 	  (begin
+		   ;; 	    (install-history-file (get-environment-variable "HOME") ".megatest_history") ;;  [homedir] [filename] [nlines])
+		   ;; 	    (current-input-port (make-readline-port "megatest> ")))
+		   ;; 	  (begin
+		   ;; 	    (gnu-history-install-file-manager
+		   ;; 	     (string-append
+		   ;; 	      (or (get-environment-variable "HOME") ".") "/.megatest_history"))
+		   ;; 	    (current-input-port (make-gnu-readline-port "megatest> "))))
+		   (if (args:get-arg "-repl")
+		       (repl)
+		       (load (args:get-arg "-load")))
+		   ;; (db:close-all dbstruct) <= taken care of by on-exit call
+		   )
+		 (exit)))
+	       (set! *didsomething* #t))))
+     
+     ;;======================================================================
+     ;; Wait on a run to complete
+     ;;======================================================================
+     
+     (if (and (args:get-arg "-run-wait")
+     	 (not (or (args:get-arg "-run")
+     		  (args:get-arg "-runtests")))) ;; run-wait is built into runtests now
+         (begin
+           (if (not (launch:setup))
+     	  (begin
+     	    (debug:print 0 *default-log-port* "Failed to setup, exiting") 
+     	    (exit 1)))
+           (operate-on 'run-wait)
+           (set! *didsomething* #t)))
+     
+     ;; ;; ;; redo me ;; Not converted to use dbstruct yet
+     ;; ;; ;; redo me ;;
+     ;; ;; ;; redo me (if (args:get-arg "-convert-to-norm")
+     ;; ;; ;; redo me     (let* ((toppath (setup-for-run))
+     ;; ;; ;; redo me 	   (dbstruct (if toppath (make-dbr:dbstruct path: toppath local: #t))))
+     ;; ;; ;; redo me       (for-each 
+     ;; ;; ;; redo me        (lambda (field)
+     ;; ;; ;; redo me 	 (let ((dat '()))
+     ;; ;; ;; redo me 	   (debug:print-info 0 *default-log-port* "Getting data for field " field)
+     ;; ;; ;; redo me 	   (sqlite3:for-each-row
+     ;; ;; ;; redo me 	    (lambda (id val)
+     ;; ;; ;; redo me 	      (set! dat (cons (list id val) dat)))
+     ;; ;; ;; redo me 	    (db:get-db db run-id)
+     ;; ;; ;; redo me 	    (conc "SELECT id," field " FROM tests;"))
+     ;; ;; ;; redo me 	   (debug:print-info 0 *default-log-port* "found " (length dat) " items for field " field)
+     ;; ;; ;; redo me 	   (let ((qry (sqlite3:prepare db (conc "UPDATE tests SET " field "=? WHERE id=?;"))))
+     ;; ;; ;; redo me 	     (for-each
+     ;; ;; ;; redo me 	      (lambda (item)
+     ;; ;; ;; redo me 		(let ((newval ;; (sdb:qry 'getid 
+     ;; ;; ;; redo me 		       (cadr item))) ;; )
+     ;; ;; ;; redo me 		  (if (not (equal? newval (cadr item)))
+     ;; ;; ;; redo me 		      (debug:print-info 0 *default-log-port* "Converting " (cadr item) " to " newval " for test #" (car item)))
+     ;; ;; ;; redo me 		  (sqlite3:execute qry newval (car item))))
+     ;; ;; ;; redo me 	      dat)
+     ;; ;; ;; redo me 	     (sqlite3:finalize! qry))))
+     ;; ;; ;; redo me        (db:close-all dbstruct)
+     ;; ;; ;; redo me        (list "uname" "rundir" "final_logf" "comment"))
+     ;; ;; ;; redo me       (set! *didsomething* #t)))
+
+;; TODO: restore this functionality
+
+     #;(if (args:get-arg "-import-megatest.db")
+         (begin
+           (db:multi-db-sync 
+            (db:setup #f)
+            'killservers
+            'dejunk
+            'adj-testids
+            'old2new
+            ;; 'new2old
+            )
+           (set! *didsomething* #t)))
+     
+     (when (args:get-arg "-sync-brute-force")
+       ((server:get-bruteforce-syncer (db:setup #t) persist-until-sync: #t))
+       (set! *didsomething* #t))
+     
+     #;(if (args:get-arg "-sync-to-megatest.db")
+         (let* ((dbstruct (db:setup #f))
+     	   (tmpdbpth (cdr (dbr:dbstruct-tmpdb dbstruct)))
+     	   (lockfile (conc tmpdbpth ".lock"))
+     	   (locked   (common:simple-file-lock lockfile)) 
+     	   (res      (if locked
+     			 (db:multi-db-sync 
+     			  dbstruct
+     			  'new2old)
+     			 #f)))
+           (if res
+     	  (begin
+     	    (common:simple-file-release-lock lockfile)
+     	    (print "Synced " res " records to megatest.db"))
+     	  (print "Skipping sync, there is a sync in progress."))
+           (set! *didsomething* #t)))
+     
+     (if (args:get-arg "-sync-to")
+         (let ((toppath (launch:setup)))
+           (tasks:sync-to-postgres *configdat* (args:get-arg "-sync-to"))
+           (set! *didsomething* #t)))
+     
+     (if (args:get-arg "-list-test-time")
+          (let* ((toppath (launch:setup))) 
+          (task:get-test-times)  
+          (set! *didsomething* #t)))
+     
+     (if (args:get-arg "-list-run-time")
+          (let* ((toppath (launch:setup))) 
+          (task:get-run-times)  
+          (set! *didsomething* #t)))
+          
+     (if (args:get-arg "-generate-html")
+         (let* ((toppath (launch:setup)))
+           (if (tests:create-html-tree #f)
+               (debug:print-info 0 *default-log-port* "HTML output created in " toppath "/lt/page0.html")
+               (debug:print 0 *default-log-port* "Failed to create HTML output in " toppath "/lt/runs-index.html"))
+           (set! *didsomething* #t)))
+     
+     (if (args:get-arg "-generate-html-structure")
+         (let* ((toppath (launch:setup)))
+           ;(if (tests:create-html-tree #f)
+      				(if (tests:create-html-summary #f)
+               (debug:print-info 0 *default-log-port* "HTML output created in " toppath "/lt/targets.html")
+               (debug:print 0 *default-log-port* "Failed to create HTML output in " toppath "/lt/runs-index.html"))
+           (set! *didsomething* #t)))
+     
+     (if (args:get-arg "-syscheck")
+         (begin
+           (mutils:syscheck common:raw-get-remote-host-load
+     		       server:get-best-guess-address
+     		       configf:read-config)
+           (set! *didsomething* #t)))
+     
+     (if (args:get-arg "-extract-skeleton")
+         (let* ((toppath (launch:setup)))
+           (genexample:extract-skeleton-area (args:get-arg "-extract-skeleton"))
+           (set! *didsomething* #t)))
+     
+     ;;======================================================================
+     ;; Exit and clean up
+     ;;======================================================================
+     
+     (if (not *didsomething*)
+         (debug:print 0 *default-log-port* help)
+         (bdat-time-to-exit-set! *bdat* #t)
+         )
+     ;;(debug:print-info 13 *default-log-port* "thread-join! watchdog")
+     
+     ;; join the watchdog thread if it has been thread-start!ed  (it may not have been started in the case of a server that never enters running state)
+     ;;   (symbols returned by thread-state: created ready running blocked suspended sleeping terminated dead)
+     ;; TODO: for multiple areas, we will have multiple watchdogs; and multiple threads to manage
+     (let* ((watchdog (bdat-watchdog *bdat*)))
+       (if (thread? watchdog)
+	   (case (thread-state watchdog)
+	     ((ready running blocked sleeping terminated dead)
+	      (thread-join! watchdog)))))
+     
+     (bdat-time-to-exit-set! *bdat* #t)
+     
+     (if (not (eq? *globalexitstatus* 0))
+         (if (or (args:get-arg "-run")(args:get-arg "-runtests")(args:get-arg "-runall"))
+             (begin
+	       (debug:print 0 *default-log-port* "NOTE: Subprocesses with non-zero exit code detected: " *globalexitstatus*)
+	       (exit 0))
+             (case *globalexitstatus*
+	       ((0)(exit 0))
+	       ((1)(exit 1))
+	       ((2)(exit 2))
+	       (else (exit 3)))))
+     )
+
+)
+
+(import megatest-main)
+(import commonmod)
+(main)
+

DELETED mockup-cached-writes.scm
Index: mockup-cached-writes.scm
==================================================================
--- mockup-cached-writes.scm
+++ /dev/null
@@ -1,48 +0,0 @@
-;;  Copyright 2006-2017, Matthew Welland.
-;; 
-;; This file is part of Megatest.
-;; 
-;;     Megatest is free software: you can redistribute it and/or modify
-;;     it under the terms of the GNU General Public License as published by
-;;     the Free Software Foundation, either version 3 of the License, or
-;;     (at your option) any later version.
-;; 
-;;     Megatest is distributed in the hope that it will be useful,
-;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;     GNU General Public License for more details.
-;; 
-;;     You should have received a copy of the GNU General Public License
-;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
-;;
-
-
-(define (make-cached-writer the-db)
-  (let ((db    the-db)
-	(queue '()))
-    (lambda (cacheable . qry-params) ;; fn qry
-      (if cacheable
-	  (begin
-	    (set! queue (cons qry-params queue))
-	    (call/cc))
-	  (begin
-	    (print "Starting transaction")
-	    (for-each
-	     (lambda (queue-item)
-	       (let ((fn  (car queue-item))
-		     (qry (cdr queue-item)))
-		 (print "WRITE to " db ": " qry)
-		 )
-	     (reverse queue))
-	    (print "End transaction")
-	    (print "READ from " db ": " qry-params))))))
-
-(define *cw* (make-cached-writer "the db"))
-
-(define (dbcall cacheable query)
-  (*cw* cacheable query))
-
-(dbcall #t "insert abc")
-(dbcall #t "insert def")
-(dbcall #t "insert hij")
-(dbcall #f "select foo")

DELETED mt.scm
Index: mt.scm
==================================================================
--- mt.scm
+++ /dev/null
@@ -1,305 +0,0 @@
-;; Copyright 2006-2013, Matthew Welland.
-;; 
-;; This file is part of Megatest.
-;; 
-;;     Megatest is free software: you can redistribute it and/or modify
-;;     it under the terms of the GNU General Public License as published by
-;;     the Free Software Foundation, either version 3 of the License, or
-;;     (at your option) any later version.
-;; 
-;;     Megatest is distributed in the hope that it will be useful,
-;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;     GNU General Public License for more details.
-;; 
-;;     You should have received a copy of the GNU General Public License
-;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
-;;
-
-
-(use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking (srfi 18) posix-extras directory-utils call-with-environment-variables)
-(import (prefix sqlite3 sqlite3:))
-
-(declare (unit mt))
-(declare (uses db))
-(declare (uses common))
-(declare (uses items))
-(declare (uses runconfig))
-(declare (uses tests))
-(declare (uses server))
-(declare (uses runs))
-(declare (uses rmt))
-;; (declare (uses filedb))
-
-(include "common_records.scm")
-(include "key_records.scm")
-(include "db_records.scm")
-(include "run_records.scm")
-(include "test_records.scm")
-
-;; This is the Megatest API. All generally "useful" routines will be wrapped or extended
-;; here.
-
-;;======================================================================
-;;  R U N S
-;;======================================================================
-
-;; runs:get-runs-by-patt
-;; get runs by list of criteria
-;; register a test run with the db
-;;
-;; Use: (db-get-value-by-header (db:get-header runinfo)(db:get-rows runinfo))
-;;  to extract info from the structure returned
-;;
-(define (mt:get-runs-by-patt keys runnamepatt targpatt)
-  (let loop ((runsdat  (rmt:get-runs-by-patt keys runnamepatt targpatt 0 500 #f 0))
-	     (res      '())
-	     (offset   0)
-	     (limit    500))
-    ;; (print "runsdat: " runsdat)
-    (let* ((header    (vector-ref runsdat 0))
-	   (runslst   (vector-ref runsdat 1))
-	   (full-list (append res runslst))
-	   (have-more (eq? (length runslst) limit)))
-      ;; (debug:print 0 *default-log-port* "header: " header " runslst: " runslst " have-more: " have-more)
-      (if have-more 
-	  (let ((new-offset (+ offset limit))
-		(next-batch (rmt:get-runs-by-patt keys runnamepatt targpatt offset limit #f 0)))
-	    (debug:print-info 4 *default-log-port* "More than " limit " runs, have " (length full-list) " runs so far.")
-	    (debug:print-info 0 *default-log-port* "next-batch: " next-batch)
-	    (loop next-batch
-		  full-list
-		  new-offset
-		  limit))
-	 (vector header full-list)))))
-
-;;======================================================================
-;;  T E S T S
-;;======================================================================
-
-(define (mt:get-tests-for-run run-id testpatt states status #!key (not-in #t) (sort-by 'event_time) (sort-order "ASC") (qryvals #f)(last-update #f))
-  (let loop ((testsdat (rmt:get-tests-for-run run-id testpatt states status 0 500 not-in sort-by sort-order qryvals last-update 'normal))
-	     (res      '())
-	     (offset   0)
-	     (limit    500))
-    (let* ((full-list (append res testsdat))
-	   (have-more (eq? (length testsdat) limit)))
-      (if have-more 
-	  (let ((new-offset (+ offset limit)))
-	    (debug:print-info 4 *default-log-port* "More than " limit " tests, have " (length full-list) " tests so far.")
-	    (loop (rmt:get-tests-for-run run-id testpatt states status new-offset limit not-in sort-by sort-order qryvals last-update 'normal)
-		  full-list
-		  new-offset
-		  limit))
-	  full-list))))
-
-(define (mt:lazy-get-prereqs-not-met run-id waitons ref-item-path #!key (mode '(normal))(itemmaps #f) )
-  (let* ((key    (list run-id waitons ref-item-path mode))
-	 (res    (hash-table-ref/default *pre-reqs-met-cache* key #f))
-	 (useres (let ((last-time (if (vector? res) (vector-ref res 0) #f)))
-		   (if last-time
-		       (< (current-seconds)(+ last-time 5))
-		       #f))))
-    (if useres
-	(let ((result (vector-ref res 1)))
-	  (debug:print 4 *default-log-port* "Using lazy value res: " result)
-	  result)
-	(let ((newres (rmt:get-prereqs-not-met run-id waitons ref-item-path mode: mode itemmaps: itemmaps)))
-	  (hash-table-set! *pre-reqs-met-cache* key (vector (current-seconds) newres))
-	  newres))))
-
-(define (mt:get-run-stats dbstruct run-id)
-;;  Get run stats from local access, move this ... but where?
-  (db:get-run-stats dbstruct run-id))
-
-(define (mt:discard-blocked-tests run-id failed-test tests test-records)
-  (if (null? tests)
-      tests
-      (begin
-	(debug:print-info 1 *default-log-port* "Discarding tests from " tests " that are waiting on " failed-test)
-	(let loop ((testn (car tests))
-		   (remt  (cdr tests))
-		   (res   '()))
-	  (let* ((test-dat (hash-table-ref/default test-records testn (vector #f #f '())))
-		 (waitons  (vector-ref test-dat 2)))
-	    ;; (print "mt:discard-blocked-tests run-id: " run-id " failed-test: " failed-test " testn: " testn " with waitons: " waitons)
-	    (if (null? remt)
-		(let ((new-res (reverse res)))
-		  ;; (print "       new-res: " new-res)
-		  new-res)
-		(loop (car remt)
-		      (cdr remt)
-		      (if (member failed-test waitons)
-			  (begin
-			    (debug:print 0 *default-log-port* "Discarding test " testn "(" test-dat ") due to " failed-test)
-			    res)
-			  (cons testn res)))))))))
-
-;;======================================================================
-;;  T R I G G E R S
-;;======================================================================
-
-(define (mt:run-trigger cmd test-id test-rundir trigger logname test-name item-path event-time actual-state actual-status)
-  ;; Putting the commandline into ( )'s means no control over the shell. 
-  ;; stdout and stderr will be caught in the NBFAKE or mt_launch.log files
-  ;; or equivalent. No need to do this. Just run it?
-  (let* ((fullcmd (conc "nbfake "
-			cmd           " "
-			test-id       " "
-			test-rundir   " "
-			trigger       " "
-			test-name     " "
-			item-path     " " ;; has / prepended to deal with toplevel tests
-			actual-state  " "
-			actual-status " "
-			event-time
-			))
-	 (prev-nbfake-log (get-environment-variable "NBFAKE_LOG")))
-    (setenv "NBFAKE_LOG" (conc (cond
-				((and (directory-exists? test-rundir)
-				      (file-write-access? test-rundir))
-				 test-rundir)
-				((and (directory-exists? *toppath*)
-				      (file-write-access? *toppath*))
-				 *toppath*)
-				(else (conc "/tmp/" (current-user-name))))
-			       "/" logname))
-    (debug:print-info 0 *default-log-port* "TRIGGERED on " trigger ", running command " fullcmd " output at " (get-environment-variable "NBFAKE_LOG"))
-    ;; (call-with-environment-variables
-    ;;  `(("NBFAKE_LOG" . ,(conc test-rundir "/" logname)))
-    ;;  (lambda ()
-    (process-run fullcmd)
-    (if prev-nbfake-log
-	(setenv "NBFAKE_LOG" prev-nbfake-log)
-	(unsetenv "NBFAKE_LOG"))
-    )) ;; ))
-
-(define (mt:process-triggers dbstruct run-id test-id newstate newstatus)
-  (if test-id 
-      (let* ((test-dat      (db:get-test-info-by-id dbstruct run-id test-id)))
-	(if test-dat
-	    (let* ((test-rundir   (db:test-get-rundir       test-dat)) ;; ) ;; )
-		   (test-name     (db:test-get-testname     test-dat))
-		   (item-path     (db:test-get-item-path    test-dat))
-		   (duration      (db:test-get-run_duration test-dat))
-		   (comment       (db:test-get-comment      test-dat))
-		   (event-time    (db:test-get-event_time   test-dat))
-		   (tconfig       #f)
-		   (state         (if newstate  newstate  (db:test-get-state  test-dat)))
-		   (status        (if newstatus newstatus (db:test-get-status test-dat))))
-	      ;; (mutex-lock! *triggers-mutex*)
-              (handle-exceptions
-               exn
-               (begin
-                 (debug:print-error 0 *default-log-port* " Exception in mt:process-triggers for run-id="run-id" test-id="test-id" newstate="newstate" newstatus="newstatus
-                                    "\n   error: " ((condition-property-accessor 'exn 'message) exn) ", exn=" exn
-                                    "\n   test-rundir="test-rundir
-                                    "\n   test-name="test-name
-                                    "\n   item-path="item-path
-                                    "\n   state="state
-                                    "\n   status="status
-                                    "\n")
-                 (print-call-chain (current-error-port))
-                 #f)
-               (if (and test-name
-                        test-rundir)   ;; #f means no dir set yet
-                   ;; (common:file-exists? test-rundir)
-                   ;; (directory? test-rundir))
-                   (call-with-environment-variables
-                    (list (cons "MT_TEST_NAME"    (or test-name "no such test"))
-                          (cons "MT_TEST_RUN_DIR" (or test-rundir "no test directory yet"))
-                          (cons "MT_ITEMPATH"     (or item-path "")))
-                    (lambda ()
-                      (if (directory-exists? test-rundir)
-                          (push-directory test-rundir)
-                          (push-directory *toppath*))
-                      (set! tconfig (mt:lazy-read-test-config test-name))
-                      (for-each (lambda (trigger)
-                                  (let* ((munged-trigger (string-translate trigger "/ " "--"))
-					(logname        (conc "last-trigger-" munged-trigger ".log")))
-                                    ;; first any triggers from the testconfig
-                                    (let ((cmd  (configf:lookup tconfig "triggers" trigger)))
-                                      (if cmd (mt:run-trigger cmd test-id test-rundir trigger (conc "tconfig-" logname) test-name item-path event-time state status)))
-                                    ;; next any triggers from megatest.config
-                                    (let ((cmd  (configf:lookup *configdat* "triggers" trigger)))
-                                      (if cmd (mt:run-trigger cmd test-id test-rundir trigger (conc "mtconfig-" logname) test-name item-path event-time state status)))))
-                                (list
-                                 (conc state "/" status)
-                                 (conc state "/")
-                                 (conc "/" status)))
-		     (pop-directory))
-                    )))
-	      ;; (mutex-unlock! *triggers-mutex*)
-	      )))))
-
-;;======================================================================
-;;  S T A T E   A N D   S T A T U S   F O R   T E S T S 
-;;======================================================================
-
-;; speed up for common cases with a little logic
-(define (mt:test-set-state-status-by-id run-id test-id newstate newstatus newcomment)
-  (if (not (and run-id test-id))
-      (begin
-	(debug:print-error 0 *default-log-port* "bad data handed to mt:test-set-state-status-by-id, run-id=" run-id ", test-id=" test-id ", newstate=" newstate)
-	(print-call-chain (current-error-port))
-	#f)
-      (begin
-	;; cond
-	;; ((and newstate newstatus newcomment)
-	;;  (rmt:general-call 'state-status-msg run-id newstate newstatus newcomment test-id))
-	;; ((and newstate newstatus)
-	;;  (rmt:general-call 'state-status run-id newstate newstatus test-id))
-	;; (else
-	;;  (if newstate   (rmt:general-call 'set-test-state   run-id newstate   test-id))
-	;;  (if newstatus  (rmt:general-call 'set-test-status  run-id newstatus  test-id))
-	;;  (if newcomment (rmt:general-call 'set-test-comment run-id newcomment test-id))))
-	(rmt:set-state-status-and-roll-up-items run-id test-id #f newstate newstatus newcomment)
-	;; (mt:process-triggers run-id test-id newstate newstatus)
-	#t)))
-
-
-(define (mt:test-set-state-status-by-id-unless-completed run-id test-id newstate newstatus newcomment)
-  (let* ((test-vec   (rmt:get-testinfo-state-status run-id test-id))
-         (state     (vector-ref test-vec 3)))
-    (if (equal? state "COMPLETED")
-        #t
-        (rmt:set-state-status-and-roll-up-items run-id test-id #f newstate newstatus newcomment))))
-
-  
-(define (mt:test-set-state-status-by-testname run-id test-name item-path new-state new-status new-comment)
-  ;(let ((test-id (rmt:get-test-id run-id test-name item-path)))
-  (rmt:set-state-status-and-roll-up-items run-id test-name item-path new-state new-status new-comment)
-  ;; (mt:process-triggers run-id test-id new-state new-status)
-  #t);)
-	;;(mt:test-set-state-status-by-id run-id test-id new-state new-status new-comment)))
-
-(define (mt:test-set-state-status-by-testname-unless-completed run-id test-name item-path new-state new-status new-comment)
-  (let ((test-id (rmt:get-test-id run-id test-name item-path)))
-    (mt:test-set-state-status-by-id-unless-completed run-id test-id new-state new-status new-comment)))
-    
-(define (mt:lazy-read-test-config test-name)
-  (let ((tconf (hash-table-ref/default *testconfigs* test-name #f)))
-    (if tconf
-	tconf
-	(let ((test-dirs (tests:get-tests-search-path *configdat*)))
-	  (let loop ((hed (car test-dirs))
-		     (tal (cdr test-dirs)))
-	    ;; Setting MT_LINKTREE here is almost certainly unnecessary. 
-	    (let ((tconfig-file (conc hed "/" test-name "/testconfig")))
-	      (if (and (common:file-exists? tconfig-file)
-		       (file-read-access? tconfig-file))
-		  (let ((link-tree-path (common:get-linktree)) ;; (configf:lookup *configdat* "setup" "linktree"))
-			(old-link-tree  (get-environment-variable "MT_LINKTREE")))
-		    (if link-tree-path (setenv "MT_LINKTREE" link-tree-path))
-		    (let ((newtcfg (read-config tconfig-file #f #f))) ;; NOTE: Does NOT run [system ...]
-		      (hash-table-set! *testconfigs* test-name newtcfg)
-		      (if old-link-tree 
-			  (setenv "MT_LINKTREE" old-link-tree)
-			  (unsetenv "MT_LINKTREE"))
-		      newtcfg))
-		  (if (null? tal)
-		      (begin
-			(debug:print-error 0 *default-log-port* "No readable testconfig found for " test-name)
-			#f)
-		      (loop (car tal)(cdr tal))))))))))
-

Index: mtargs/mtargs.scm
==================================================================
--- mtargs/mtargs.scm
+++ mtargs/mtargs.scm
@@ -26,12 +26,11 @@
      print-args
      any-defined?
      help
      )
 
-(import scheme chicken data-structures extras posix ports files)
-(use srfi-69 srfi-1)
+(import scheme chicken.base chicken.process-context srfi-69 srfi-1)
 
 (define arg-hash (make-hash-table))
 (define help "")
 
 (define (get-arg arg . default)

ADDED   mtmod.scm
Index: mtmod.scm
==================================================================
--- /dev/null
+++ mtmod.scm
@@ -0,0 +1,240 @@
+;;======================================================================
+;; Copyright 2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
+
+;;======================================================================
+
+(declare (unit mtmod))
+
+(declare (uses debugprint))
+(declare (uses commonmod))
+(declare (uses configfmod))
+
+(module mtmod
+	*
+	
+(import scheme
+
+	chicken.base
+	chicken.condition
+	chicken.file
+	chicken.io
+	chicken.pathname
+	chicken.port
+	chicken.pretty-print
+	chicken.process
+	chicken.process-context
+	chicken.sort
+	chicken.string
+	chicken.time
+
+	debugprint
+	commonmod
+	configfmod
+	
+	(prefix base64 base64:)
+	(prefix dbi dbi:)
+	(prefix sqlite3 sqlite3:)
+	(srfi 18)
+	directory-utils
+	format
+	matchable
+	md5
+	message-digest
+	regex
+	regex-case
+	sparse-vectors
+	srfi-1
+	srfi-13
+	srfi-69
+	stack
+	typed-records
+	z3
+	
+	)
+
+;; This is the Megatest API. All generally "useful" routines will be wrapped or extended
+;; here.
+
+(define (mt:discard-blocked-tests run-id failed-test tests test-records)
+  (if (null? tests)
+      tests
+      (begin
+	(debug:print-info 1 *default-log-port* "Discarding tests from " tests " that are waiting on " failed-test)
+	(let loop ((testn (car tests))
+		   (remt  (cdr tests))
+		   (res   '()))
+	  (let* ((test-dat (hash-table-ref/default test-records testn (vector #f #f '())))
+		 (waitons  (vector-ref test-dat 2)))
+	    ;; (print "mt:discard-blocked-tests run-id: " run-id " failed-test: " failed-test " testn: " testn " with waitons: " waitons)
+	    (if (null? remt)
+		(let ((new-res (reverse res)))
+		  ;; (print "       new-res: " new-res)
+		  new-res)
+		(loop (car remt)
+		      (cdr remt)
+		      (if (member failed-test waitons)
+			  (begin
+			    (debug:print 0 *default-log-port* "Discarding test " testn "(" test-dat ") due to " failed-test)
+			    res)
+			  (cons testn res)))))))))
+
+;;======================================================================
+;; read a config file, loading only the section pertinent
+;; to this run field1val/field2val/field3val ...
+;;======================================================================
+
+;; (use format directory-utils)
+;; 
+;; (declare (unit runconfig))
+;; (declare (uses common))
+;; 
+;; (include "common_records.scm")
+
+;; NB// to process a runconfig ensure to use environ-patt with target!
+;;
+(define (setup-env-defaults fname run-id already-seen keyvals #!key (environ-patt #f)(change-env #t))
+  (let* ((keys    (map car keyvals))
+	 (thekey  (if keyvals 
+		      (string-intersperse (map (lambda (x)(if x x "-na-")) (map cadr keyvals)) "/")
+		      (or (common:args-get-target)
+			  (get-environment-variable "MT_TARGET")
+			  (begin
+			    (debug:print-error 0 *default-log-port* "setup-env-defaults called with no run-id or -target or -reqtarg")
+			    "nothing matches this I hope"))))
+	 ;; Why was system disallowed in the reading of the runconfigs file?
+	 ;; NOTE: Should be setting env vars based on (target|default)
+	 (confdat   (runconfig:read fname thekey environ-patt))
+	 (whatfound (make-hash-table))
+	 (finaldat  (make-hash-table))
+	 (sections (list "default" thekey)))
+    (if (not (bdat-target *bdat*))(bdat-target-set! *bdat* thekey)) ;; may save a db access or two but repeats db:get-target code
+    (debug:print 4 *default-log-port* "Using key=\"" thekey "\"")
+
+    (if change-env
+	(for-each ;; NB// This can be simplified with new content of keyvals having all that is needed.
+	 (lambda (keyval)
+	   (safe-setenv (car keyval)(cadr keyval)))
+	 keyvals))
+	
+    (for-each 
+     (lambda (section)
+       (let ((section-dat (hash-table-ref/default confdat section #f)))
+	 (if section-dat
+	     (for-each 
+	      (lambda (envvar)
+		(let ((val (cadr (assoc envvar section-dat))))
+		(hash-table-set! whatfound section (+ (hash-table-ref/default whatfound section 0) 1))
+		(if (and (string? envvar)
+			 (string? val)
+			 change-env)
+		    (safe-setenv envvar val))
+		(hash-table-set! finaldat envvar val)))
+	      (map car section-dat)))))
+     sections)
+    (if already-seen
+	(begin
+	  (debug:print 2 *default-log-port* "Key settings found in runconfigs.config:")
+	  (for-each (lambda (fullkey)
+		      (debug:print 2 *default-log-port* (format #f "~20a ~a\n" fullkey (hash-table-ref/default whatfound fullkey 0))))
+		    sections)
+	  (debug:print 2 *default-log-port* "---")
+	  (set! *already-seen-runconfig-info* #t)))
+    ;; finaldat ;; was returning this "finaldat" which would be good but conflicts with other uses
+    confdat
+    ))
+
+(define (set-run-config-vars run-id keyvals targ-from-db)
+  (push-directory *toppath*) ;; the push/pop doesn't appear to do anything ...
+  (let ((runconfigf (conc  *toppath* "/runconfigs.config"))
+	(targ       (or (common:args-get-target)
+			targ-from-db
+			(get-environment-variable "MT_TARGET"))))
+    (pop-directory)
+    (if (common:file-exists? runconfigf)
+	(setup-env-defaults runconfigf run-id #t keyvals
+			    environ-patt: (conc "(default"
+						(if targ
+						    (conc "|" targ ")")
+						    ")")))
+	(debug:print 0 *default-log-port* "WARNING: You do not have a run config file: " runconfigf))))
+
+;; given (a (b c) d) return ((a b d)(a c d))
+;; NOTE: this feels like it has been done before - perhaps with items handling?
+;;
+(define (runconfig:combinations inlst)
+  (let loop ((hed (car inlst))
+	     (tal (cdr inlst))
+	     (res '()))
+    ;; (print "res: " res " hed: " hed)
+    (if (list? hed)
+	(let ((newres (if (null? res) ;; first time through convert incoming items to list of items
+			  (map list hed)
+			  (apply append
+				 (map (lambda (r)  ;; iterate over items in res
+					(map (lambda (h) ;; iterate over items in hed
+					       (append r (list h)))
+					     hed))
+				      res)))))
+	  ;; (print "newres1: " newres)
+	  (if (null? tal)
+	      newres
+	      (loop (car tal)(cdr tal) newres)))
+	(let ((newres (if (null? res)
+			  (list (list hed))
+			  (map (lambda (r)
+				 (append r (list hed)))
+			       res))))
+	  ;; (print "newres2: " newres)
+	  (if (null? tal)
+	      newres
+	      (loop (car tal)(cdr tal) newres))))))
+
+;; multi-part expand
+;; Given a/b,c,d/e,f return a/b/e a/b/f a/c/e a/c/f a/d/e a/d/f
+;;
+(define (runconfig:expand target)
+  (let* ((parts (map (lambda (x)
+		       (string-split x ","))
+		     (string-split target "/"))))
+    (map (lambda (x)
+	   (string-intersperse x "/"))
+	 (runconfig:combinations parts))))
+
+;; multi-target expansion
+;; a/b/c/x,y,z a/b/d/x,y => a/b/c/x a/b/c/y a/b/c/z a/b/d/x a/b/d/y
+;; 
+(define (runconfig:expand-target target-strs)
+  (delete-duplicates
+   (apply append (map runconfig:expand (string-split target-strs " ")))))
+
+#|
+  (if (null? target-strs)
+      '()
+      (let loop ((hed (car target-strs))
+		 (tal (cdr target-strs))
+		 (res '()))
+	;; first break all parts into individual target patterns
+	(if (string-index hed " ") ;; this is a multi-target target
+	    (let ((newres (append (string-split hed " ") res)))
+	      (runconfig:expand-target newres))
+	    (if (string-index hed ",") ;; this is a multi-target where one or more parts are comma separated
+		  
+|#
+
+
+)

ADDED   mtver.scm
Index: mtver.scm
==================================================================
--- /dev/null
+++ mtver.scm
@@ -0,0 +1,29 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
+
+;; Always use two or four digit decimal
+;; 1.01, 1.02...1.10,1.11,1.1101 ... 1.99,2.00..
+
+(declare (unit mtver))
+
+(module mtver *
+
+(import scheme chicken.module)
+
+(define megatest-version 1.6584)
+
+)

Index: mutils/mutils.scm
==================================================================
--- mutils/mutils.scm
+++ mutils/mutils.scm
@@ -12,22 +12,37 @@
 ;;
 
 (module mutils
     *
 
-  (import chicken scheme
+  (import scheme
+
+	  chicken.base
+	  chicken.file
+	  chicken.file.posix
+	  chicken.port
+	  chicken.process
+	  chicken.process-context
+	  chicken.random
+	  chicken.condition
+	  chicken.io
+	  chicken.time
+	  chicken.string
+	  
 	  ;; data-structures posix
 	  srfi-1
 	  ;; srfi-13
 	  srfi-69
-	  ports
-	  extras
+	  srfi-98
+
 	  regex
-	  posix
-	  data-structures
 	  matchable
+	  sparse-vectors
+	  system-information
+	  
 	  )
+
 
 (define (mutils:hierhash-ref hh . keys)
   (if (null? keys)
       #f
       (let loop ((ht   hh)
@@ -90,12 +105,10 @@
 	  (if (or (string-match comment l)
 		  (string-match blank l))
 	      (loop (read-line fh) res)
 	      (loop (read-line fh) (cons l res)))))))
 
-(use sparse-vectors)
-
 ;; this is a simple two dimensional sparse array
 
 ;; ONLY TWO DIMENSIONS!!! SEE ARRAY-LIB IF YOUR NEEDS ARE GREATER!!
 ;;
 (define (mutils:make-sparse-array)
@@ -189,12 +202,13 @@
 ;;======================================================================
 ;; Other utils
 ;;======================================================================
 
 (define (check-write-create fpath)
-  (and (file-write-access? fpath)
-       (let ((fname (conc fpath "/.junk-" (current-seconds) "-" (random 10000))))
+  (and (file-writable? fpath)
+       (let ((fname (conc fpath "/.junk-" (current-seconds) "-"
+			  (pseudo-random-integer 10000))))
 	 ;;(print "trying to create/remove " fname)
 	 (handle-exceptions
 	  exn
 	  #f
 	  (begin

Index: ods.scm
==================================================================
--- ods.scm
+++ ods.scm
@@ -14,13 +14,13 @@
 ;; 
 ;;     You should have received a copy of the GNU General Public License
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 ;;
 
-(use csv-xml regex)
-(declare (unit ods))
-(declare (uses common))
+;; (use csv-xml regex)
+;; (declare (unit ods))
+;; (declare (uses common))
 
 (define ods:dirs
   '("Configurations2"
     "Configurations2/toolpanel"
     "Configurations2/menubar"

ADDED   pgdb.scm
Index: pgdb.scm
==================================================================
--- /dev/null
+++ pgdb.scm
@@ -0,0 +1,32 @@
+(declare (unit pgdb))
+(declare (uses dbi))
+(declare (uses configfmod))
+(declare (uses mtargs))
+(declare (uses debugprint))
+
+(module pgdb
+	*
+	
+(import scheme
+	chicken.base
+	chicken.condition
+	chicken.string
+	chicken.sort
+	
+	list-utils
+	postgresql
+	srfi-1
+	srfi-69
+	typed-records
+	
+	(prefix dbi dbi:)
+	configfmod
+	(prefix mtargs args:)
+	debugprint
+	
+	)	
+
+(include "cgisetup/models/pgdb.scm")
+
+)
+

Index: pkts.scm
==================================================================
--- pkts.scm
+++ pkts.scm
@@ -17,7 +17,7 @@
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;======================================================================
 
 (declare (unit pkts))
-
+(declare (uses dbi))
 (include "pkts/pkts.scm")

Index: pkts/pkts.scm
==================================================================
--- pkts/pkts.scm
+++ pkts/pkts.scm
@@ -162,12 +162,13 @@
 ;; utility procs
 increment-string ;; used to get indexes for strings in ref pkts
 make-report      ;; make a .dot file 
 )
 
-(import chicken scheme data-structures posix srfi-1 regex srfi-13 srfi-69 ports extras)
-(use crypt sha1 message-digest (prefix dbi dbi:) typed-records)
+(import (chicken base) scheme (chicken process) (chicken time posix) (chicken io) (chicken file))
+(import chicken.process-context.posix (chicken string) (chicken time) (chicken sort) (chicken file posix) (chicken condition) srfi-1 regex srfi-13 srfi-69 (chicken port) )
+(import crypt sha1 message-digest (prefix dbi dbi:) typed-records)
 
 ;;======================================================================
 ;; DATA MANIPULATION UTILS
 ;;======================================================================
 
@@ -695,11 +696,11 @@
 	(cond
 	 ((not (file-exists? pktsdir))
 	  (print "ERROR: packets directory " pktsdir " does not exist."))
 	 ((not (directory? pktsdir))
 	  (print "ERROR: packets directory path " pktsdir " is not a directory."))
-	 ((not (file-read-access? pktsdir))
+	 ((not (file-readable? pktsdir))
 	  (print "ERROR: packets directory path " pktsdir " is not readable."))
 	 (else
 	  ;; (print "INFO: Loading packets found in " pktsdir)
 	  (let ((pkts (glob (conc pktsdir "/*.pkt"))))
 	    (for-each

DELETED portlogger-example.scm
Index: portlogger-example.scm
==================================================================
--- portlogger-example.scm
+++ /dev/null
@@ -1,21 +0,0 @@
-;;  Copyright 2006-2017, Matthew Welland.
-;; 
-;; This file is part of Megatest.
-;; 
-;;     Megatest is free software: you can redistribute it and/or modify
-;;     it under the terms of the GNU General Public License as published by
-;;     the Free Software Foundation, either version 3 of the License, or
-;;     (at your option) any later version.
-;; 
-;;     Megatest is distributed in the hope that it will be useful,
-;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;     GNU General Public License for more details.
-;; 
-;;     You should have received a copy of the GNU General Public License
-;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
-
-
-(declare (uses portlogger))
-
-(print (apply portlogger:main (cdr (argv))))

DELETED portlogger.scm
Index: portlogger.scm
==================================================================
--- portlogger.scm
+++ /dev/null
@@ -1,188 +0,0 @@
-
-;; Copyright 2006-2014, Matthew Welland.
-;; 
-;; This file is part of Megatest.
-;; 
-;;     Megatest is free software: you can redistribute it and/or modify
-;;     it under the terms of the GNU General Public License as published by
-;;     the Free Software Foundation, either version 3 of the License, or
-;;     (at your option) any later version.
-;; 
-;;     Megatest is distributed in the hope that it will be useful,
-;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;     GNU General Public License for more details.
-;; 
-;;     You should have received a copy of the GNU General Public License
-;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
-;;
-
-(require-extension (srfi 18) extras tcp s11n)
-
-(use sqlite3 srfi-1 posix srfi-69 hostinfo dot-locking z3)
-(import (prefix sqlite3 sqlite3:))
-
-(declare (unit portlogger))
-(declare (uses db))
-
-;; lsof -i
-
-(define (portlogger:open-db fname)
-  (let* ((avail    (tasks:wait-on-journal fname 5 remove: #t)) ;; wait up to about 10 seconds for the journal to go away
-	 (exists   (common:file-exists? fname))
-	 (db       (if avail 
-		       (sqlite3:open-database fname)
-		       (begin
-			 (system (conc "rm -f " fname))
-			 (sqlite3:open-database fname))))
-	 (handler  (sqlite3:make-busy-timeout 136000))
-	 (canwrite (file-write-access? fname)))
-	 ;; (db-init  (lambda ()
-	 ;;             (sqlite3:execute 
-	 ;;              db
-	 ;;              "CREATE TABLE IF NOT EXISTS ports (
-         ;;                 port INTEGER PRIMARY KEY,
-         ;;                 state TEXT DEFAULT 'not-used',
-         ;;                 fail_count INTEGER DEFAULT 0,
-         ;;                 update_time TIMESTAMP DEFAULT (strftime('%s','now')) );"))))
-    (sqlite3:set-busy-handler! db handler)
-    (db:set-sync db) ;; (sqlite3:execute db "PRAGMA synchronous = 0;")
-    ;; (if (not exists) ;; needed with IF NOT EXISTS?
-    (sqlite3:execute 
-     db
-     "CREATE TABLE IF NOT EXISTS ports (
-            port INTEGER PRIMARY KEY,
-            state TEXT DEFAULT 'not-used',
-            fail_count INTEGER DEFAULT 0,
-            update_time TIMESTAMP DEFAULT (strftime('%s','now')) );")
-    db))
-
-(define (portlogger:open-run-close proc . params)
-  (let* ((fname  (conc "/tmp/." (current-user-name) "-portlogger.db"))
-	 (avail  (tasks:wait-on-journal fname 10))) ;; wait up to about 10 seconds for the journal to go away
-    (handle-exceptions
-     exn
-     (begin
-       ;; (release-dot-lock fname)
-       (debug:print-error 0 *default-log-port* "portlogger:open-run-close failed. " proc " " params)
-       (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
-       (debug:print 5 *default-log-port* "exn=" (condition->list exn))
-       (if (common:file-exists? fname)(delete-file fname)) ;; brutally get rid of it
-       (print-call-chain (current-error-port)))
-     (let* (;; (lock   (obtain-dot-lock fname 2 9 10))
-	    (db     (portlogger:open-db fname))
-	    (res    (apply proc db params)))
-       (sqlite3:finalize! db)
-       ;; (release-dot-lock fname)
-       res))))
-
-;; (fold-row PROC INIT DATABASE SQL . PARAMETERS) 
-(define (portlogger:take-port db portnum)
-  (let* ((qry1 (sqlite3:prepare db "INSERT INTO ports (port,state) VALUES (?,?);"))
-	 (qry2 (sqlite3:prepare db "UPDATE ports SET state=?,update_time=strftime('%s','now') WHERE port=?;"))
-	 (qry3 (sqlite3:prepare db "SELECT state FROM ports WHERE port=?;"))
-	 (res  (sqlite3:with-transaction
-		db
-		(lambda ()
-		  ;; (fold-row (lambda (var curr) (or var curr)) #f db "SELECT var FROM foo WHERE id=100;")
-		  (let* ((curr #f)
-			 (res  #f))
-		    (set! curr (sqlite3:fold-row
-				(lambda (var curr)
-				  (or curr var curr))
-				"not-tried"
-				qry3
-				portnum))
-		    ;; (print "curr=" curr)
-		    (set! res (case (string->symbol curr)
-				((released)  (sqlite3:execute qry2 "taken" portnum) 'taken)
-				((not-tried) (sqlite3:execute qry1 portnum "taken") 'taken)
-				((taken)                                            'already-taken)
-				((failed)                                           'failed)
-				(else                                               'error)))
-		    ;; (print "res=" res)
-		    res)))))
-    (sqlite3:finalize! qry1)
-    (sqlite3:finalize! qry2)
-    (sqlite3:finalize! qry3)
-    res))
-
-(define (portlogger:get-prev-used-port db)
-  (handle-exceptions
-      exn
-      (begin
-	(debug:print 0 *default-log-port* "EXCEPTION: portlogger database probably overloaded or unreadable. If you see this message again remove /tmp/.$USER-portlogger.db")
-	(debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
-	(debug:print 5 *default-log-port* "exn=" (condition->list exn))
-	(print-call-chain (current-error-port))
-	(debug:print 0 *default-log-port* "Continuing anyway.")
-	#f)
-    (sqlite3:fold-row
-     (lambda (var curr)
-       (or curr var curr))
-     #f
-     db
-     "SELECT (port) FROM ports WHERE state='released' LIMIT 1;")))
-
-(define (portlogger:find-port db)
-  (let* ((lowport (let ((val (configf:lookup *configdat* "server" "lowport")))
-		    (if (and val 
-			     (string->number val))
-			(string->number val)
-			32768)))
-	 (portnum (or (portlogger:get-prev-used-port db)
-		      (+ lowport ;; top of registered ports is 49152 but lets use ports in the registered range
-			 (random (- 64000 lowport))))))
-    (handle-exceptions
-     exn
-     (begin
-       (debug:print 0 *default-log-port* "EXCEPTION: portlogger database probably overloaded or unreadable. If you see this message again remove /tmp/.$USER-portlogger.db")
-       (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
-       (debug:print 5 *default-log-port* "exn=" (condition->list exn))
-       (print-call-chain (current-error-port))
-       (debug:print 0 *default-log-port* "Continuing anyway."))
-     (portlogger:take-port db portnum))
-    portnum))
-
-;; set port to "released", "failed" etc.
-;; 
-(define (portlogger:set-port db portnum value)
-  (sqlite3:execute db "UPDATE ports SET state=?,update_time=strftime('%s','now') WHERE port=?;" value portnum))
-
-;; set port to failed (attempted to take but got error)
-;;
-(define (portlogger:set-failed db portnum)
-  (sqlite3:execute db "UPDATE ports SET state='failed',fail_count=fail_count+1,update_time=strftime('%s','now') WHERE port=?;" portnum))
-
-;;======================================================================
-;; MAIN
-;;======================================================================
-
-(define (portlogger:main . args)
-  (let* ((dbfname (conc "/tmp/." (current-user-name) "-portlogger.db"))
-	 (db      (portlogger:open-db dbfname))
-	 (numargs (length args))
-	 (result  
-	  (handle-exceptions
-	   exn
-	   (begin
-	     (debug:print 0 *default-log-port* "EXCEPTION: portlogger database at " dbfname " probably overloaded or unreadable. Try removing it.")
-	     (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
-	     (debug:print 5 *default-log-port* "exn=" (condition->list exn))
-	     (debug:print 0 *default-log-port* " status:  " ((condition-property-accessor 'sqlite3 'status) exn))
-	     (print-call-chain (current-error-port))
-	     #f)
-	   (case (string->symbol (car args)) ;; commands with two or more params
-	     ((take)(portlogger:take-port db (string->number (cadr args))))
-	     ((find)(portlogger:find-port db))
-	     ((set) (let ((port  (cadr  args))
-			  (state (caddr args)))
-		      (portlogger:set-port db 
-					   (if (number? port) port (string->number port))
-					   state)
-		      state))
-	     ((failed)(portlogger:set-failed db (string->number (cadr args))) 'failed)))))
-    (sqlite3:finalize! db)
-    result))
-     
-;; (print (apply portlogger:main (cdr (argv))))

ADDED   portloggermod.scm
Index: portloggermod.scm
==================================================================
--- /dev/null
+++ portloggermod.scm
@@ -0,0 +1,237 @@
+;;======================================================================
+;; Copyright 2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
+
+;;======================================================================
+
+(declare (unit portloggermod))
+(declare (uses debugprint))
+(declare (uses commonmod))
+(declare (uses configfmod))
+(declare (uses tasksmod))
+(declare (uses dbmod))
+
+(module portloggermod
+	*
+	
+(import scheme
+	(prefix sqlite3 sqlite3:)
+	chicken.base
+	chicken.condition
+	chicken.random
+	chicken.file
+	chicken.file.posix
+	chicken.format
+	chicken.io
+	chicken.pathname
+	chicken.port
+	chicken.pretty-print
+	chicken.process
+	chicken.process-context
+	chicken.process-context.posix
+	chicken.sort
+	chicken.string
+	chicken.time
+	chicken.time.posix
+
+	(prefix base64 base64:)
+	csv-xml
+	directory-utils
+	matchable
+	regex
+	s11n
+	srfi-1
+	srfi-13
+	srfi-18
+	srfi-69
+	stack
+	system-information
+	typed-records
+	z3
+
+	(prefix mtargs args:)
+	commonmod
+	configfmod
+	debugprint
+	tasksmod
+	dbmod
+	
+	)
+;; lsof -i
+
+(define (portlogger:open-db fname)
+  (let* ((avail    (tasks:wait-on-journal fname 5 remove: #t)) ;; wait up to about 10 seconds for the journal to go away
+	 (exists   (common:file-exists? fname))
+	 (db       (if avail 
+		       (sqlite3:open-database fname)
+		       (begin
+			 (system (conc "rm -f " fname))
+			 (sqlite3:open-database fname))))
+	 (handler  (sqlite3:make-busy-timeout 136000))
+	 (canwrite (file-writable? fname)))
+	 ;; (db-init  (lambda ()
+	 ;;             (sqlite3:execute 
+	 ;;              db
+	 ;;              "CREATE TABLE IF NOT EXISTS ports (
+         ;;                 port INTEGER PRIMARY KEY,
+         ;;                 state TEXT DEFAULT 'not-used',
+         ;;                 fail_count INTEGER DEFAULT 0,
+         ;;                 update_time TIMESTAMP DEFAULT (strftime('%s','now')) );"))))
+    (sqlite3:set-busy-handler! db handler)
+    (db:set-sync db) ;; (sqlite3:execute db "PRAGMA synchronous = 0;")
+    ;; (if (not exists) ;; needed with IF NOT EXISTS?
+    (sqlite3:execute 
+     db
+     "CREATE TABLE IF NOT EXISTS ports (
+            port INTEGER PRIMARY KEY,
+            state TEXT DEFAULT 'not-used',
+            fail_count INTEGER DEFAULT 0,
+            update_time TIMESTAMP DEFAULT (strftime('%s','now')) );")
+    db))
+
+(define (portlogger:open-run-close proc . params)
+  (let* ((fname  (conc "/tmp/." (current-user-name) "-portlogger.db"))
+	 (avail  (tasks:wait-on-journal fname 10))) ;; wait up to about 10 seconds for the journal to go away
+    (handle-exceptions
+     exn
+     (begin
+       ;; (release-dot-lock fname)
+       (debug:print-error 0 *default-log-port* "portlogger:open-run-close failed. " proc " " params)
+       (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
+       (debug:print 5 *default-log-port* "exn=" (condition->list exn))
+       (if (common:file-exists? fname)(delete-file fname)) ;; brutally get rid of it
+       (print-call-chain (current-error-port)))
+     (let* (;; (lock   (obtain-dot-lock fname 2 9 10))
+	    (db     (portlogger:open-db fname))
+	    (res    (apply proc db params)))
+       (sqlite3:finalize! db)
+       ;; (release-dot-lock fname)
+       res))))
+
+;; (fold-row PROC INIT DATABASE SQL . PARAMETERS) 
+(define (portlogger:take-port db portnum)
+  (let* ((qry1 (sqlite3:prepare db "INSERT INTO ports (port,state) VALUES (?,?);"))
+	 (qry2 (sqlite3:prepare db "UPDATE ports SET state=?,update_time=strftime('%s','now') WHERE port=?;"))
+	 (qry3 (sqlite3:prepare db "SELECT state FROM ports WHERE port=?;"))
+	 (res  (sqlite3:with-transaction
+		db
+		(lambda ()
+		  ;; (fold-row (lambda (var curr) (or var curr)) #f db "SELECT var FROM foo WHERE id=100;")
+		  (let* ((curr #f)
+			 (res  #f))
+		    (set! curr (sqlite3:fold-row
+				(lambda (var curr)
+				  (or curr var curr))
+				"not-tried"
+				qry3
+				portnum))
+		    ;; (print "curr=" curr)
+		    (set! res (case (string->symbol curr)
+				((released)  (sqlite3:execute qry2 "taken" portnum) 'taken)
+				((not-tried) (sqlite3:execute qry1 portnum "taken") 'taken)
+				((taken)                                            'already-taken)
+				((failed)                                           'failed)
+				(else                                               'error)))
+		    ;; (print "res=" res)
+		    res)))))
+    (sqlite3:finalize! qry1)
+    (sqlite3:finalize! qry2)
+    (sqlite3:finalize! qry3)
+    res))
+
+(define (portlogger:get-prev-used-port db)
+  (handle-exceptions
+      exn
+      (begin
+	(debug:print 0 *default-log-port* "EXCEPTION: portlogger database probably overloaded or unreadable. If you see this message again remove /tmp/.$USER-portlogger.db")
+	(debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
+	(debug:print 5 *default-log-port* "exn=" (condition->list exn))
+	(print-call-chain (current-error-port))
+	(debug:print 0 *default-log-port* "Continuing anyway.")
+	#f)
+    (sqlite3:fold-row
+     (lambda (var curr)
+       (or curr var curr))
+     #f
+     db
+     "SELECT (port) FROM ports WHERE state='released' LIMIT 1;")))
+
+(define (portlogger:find-port db)
+  (let* ((lowport (let ((val (configf:lookup *configdat* "server" "lowport")))
+		    (if (and val 
+			     (string->number val))
+			(string->number val)
+			32768)))
+	 (portnum (or (portlogger:get-prev-used-port db)
+		      (+ lowport ;; top of registered ports is 49152 but lets use ports in the registered range
+			 (pseudo-random-integer (- 64000 lowport))))))
+    (handle-exceptions
+     exn
+     (begin
+       (debug:print 0 *default-log-port* "EXCEPTION: portlogger database probably overloaded or unreadable. If you see this message again remove /tmp/.$USER-portlogger.db")
+       (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
+       (debug:print 5 *default-log-port* "exn=" (condition->list exn))
+       (print-call-chain (current-error-port))
+       (debug:print 0 *default-log-port* "Continuing anyway."))
+     (portlogger:take-port db portnum))
+    portnum))
+
+;; set port to "released", "failed" etc.
+;; 
+(define (portlogger:set-port db portnum value)
+  (sqlite3:execute db "UPDATE ports SET state=?,update_time=strftime('%s','now') WHERE port=?;" value portnum))
+
+;; set port to failed (attempted to take but got error)
+;;
+(define (portlogger:set-failed db portnum)
+  (sqlite3:execute db "UPDATE ports SET state='failed',fail_count=fail_count+1,update_time=strftime('%s','now') WHERE port=?;" portnum))
+
+;;======================================================================
+;; MAIN
+;;======================================================================
+
+(define (portlogger:main . args)
+  (let* ((dbfname (conc "/tmp/." (current-user-name) "-portlogger.db"))
+	 (db      (portlogger:open-db dbfname))
+	 (numargs (length args))
+	 (result  
+	  (handle-exceptions
+	   exn
+	   (begin
+	     (debug:print 0 *default-log-port* "EXCEPTION: portlogger database at " dbfname " probably overloaded or unreadable. Try removing it.")
+	     (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
+	     (debug:print 5 *default-log-port* "exn=" (condition->list exn))
+	     (debug:print 0 *default-log-port* " status:  " ((condition-property-accessor 'sqlite3 'status) exn))
+	     (print-call-chain (current-error-port))
+	     #f)
+	   (case (string->symbol (car args)) ;; commands with two or more params
+	     ((take)(portlogger:take-port db (string->number (cadr args))))
+	     ((find)(portlogger:find-port db))
+	     ((set) (let ((port  (cadr  args))
+			  (state (caddr args)))
+		      (portlogger:set-port db 
+					   (if (number? port) port (string->number port))
+					   state)
+		      state))
+	     ((failed)(portlogger:set-failed db (string->number (cadr args))) 'failed)))))
+    (sqlite3:finalize! db)
+    result))
+     
+;; (print (apply portlogger:main (cdr (argv))))
+
+
+)

DELETED process.scm
Index: process.scm
==================================================================
--- process.scm
+++ /dev/null
@@ -1,227 +0,0 @@
-;;======================================================================
-;; Copyright 2006-2012, Matthew Welland.
-;; 
-;; This file is part of Megatest.
-;; 
-;;     Megatest is free software: you can redistribute it and/or modify
-;;     it under the terms of the GNU General Public License as published by
-;;     the Free Software Foundation, either version 3 of the License, or
-;;     (at your option) any later version.
-;; 
-;;     Megatest is distributed in the hope that it will be useful,
-;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;     GNU General Public License for more details.
-;; 
-;;     You should have received a copy of the GNU General Public License
-;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
-
-;;======================================================================
-
-;;======================================================================
-;; Process convience utils
-;;======================================================================
-
-(use regex directory-utils)
-(declare (unit process))
-
-(define (process:conservative-read port)
-  (let loop ((res ""))
-    (if (not (eof-object? (peek-char port)))
-	(loop (conc res (read-char port)))
-	res)))
-
-(define (process:cmd-run-with-stderr->list cmd . params)
-  ;; (print "Called with cmd=" cmd ", proc=" proc ", params=" params)
-;;  (handle-exceptions
-;;   exn
-;;   (begin
-;;     (print "ERROR:  Failed to run command: " cmd " " (string-intersperse params " "))
-;;     (print "       " ((condition-property-accessor 'exn 'message) exn))
-;;     #f)
-   (let-values (((fh fho pid fhe) (if (null? params)
-				      (process* cmd)
-				      (process* cmd params))))
-       (let loop ((curr (read-line fh))
-		  (result  '()))
-	 (let ((errstr (process:conservative-read fhe)))
-	   (if (not (string=? errstr ""))
-	       (set! result (append result (list errstr)))))
-       (if (not (eof-object? curr))
-	   (loop (read-line fh)
-		 (append result (list curr)))
-	   (begin
-	     (close-input-port fh)
-	     (close-input-port fhe)
-	     (close-output-port fho)
-	     result))))) ;; )
-
-(define (process:cmd-run-with-stderr-and-exitcode->list cmd . params)
-  ;; (print "Called with cmd=" cmd ", proc=" proc ", params=" params)
-;;  (handle-exceptions
-;;   exn
-;;   (begin
-;;     (print "ERROR:  Failed to run command: " cmd " " (string-intersperse params " "))
-;;     (print "       " ((condition-property-accessor 'exn 'message) exn))
-;;     #f)
-   (let-values (((fh fho pid fhe) (if (null? params)
-				      (process* cmd)
-				      (process* cmd params))))
-       (let loop ((curr (read-line fh))
-		  (result  '()))
-	 (let ((errstr (process:conservative-read fhe)))
-	   (if (not (string=? errstr ""))
-	       (set! result (append result (list errstr)))))
-       (if (not (eof-object? curr))
-	   (loop (read-line fh)
-		 (append result (list curr)))
-	   (begin
-             (let-values (((anotherpid normalexit? exitstatus)  (process-wait pid)))
-	     (close-input-port fh)
-	     (close-input-port fhe)
-	     (close-output-port fho)
-               (list result (if normalexit? exitstatus -1))))))))
-
-(define (process:cmd-run-proc-each-line cmd proc . params)
-  ;; (print "Called with cmd=" cmd ", proc=" proc ", params=" params)
-  (handle-exceptions
-   exn
-   (begin
-     (print "ERROR:  Failed to run command: " cmd " " (string-intersperse params " "))
-     (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
-     (debug:print 5 *default-log-port* "exn=" (condition->list exn))
-     #f)
-   (let-values (((fh fho pid) (if (null? params)
-				  (process cmd)
-				  (process cmd params))))
-       (let loop ((curr (read-line fh))
-		(result  '()))
-       (if (not (eof-object? curr))
-	   (loop (read-line fh)
-		 (append result (list (proc curr))))
-	   (begin
-	     (close-input-port fh)
-	     ;;(close-input-port fhe)
-	     (close-output-port fho)
-	     result))))))
-
-(define (process:cmd-run-proc-each-line-alt cmd proc)
-  (let* ((fh (open-input-pipe cmd))
-         (res (port-proc->list fh proc))
-         (status (close-input-pipe fh)))
-    (if (eq? status 0) res #f)))
-
-(define (process:cmd-run->list cmd #!key (delta-env-alist-or-hash-table '()))
-  (common:with-env-vars
-   delta-env-alist-or-hash-table
-   (lambda ()
-     (let* ((fh (open-input-pipe cmd))
-            (res (port->list fh))
-            (status (close-input-pipe fh)))
-       (list res status)))))
-   
-(define (port->list fh)
-  (if (eof-object? fh) #f
-      (let loop ((curr (read-line fh))
-                 (result '()))
-        (if (not (eof-object? curr))
-            (loop (read-line fh)
-                  (append result (list curr)))
-            result))))
-
-(define (port-proc->list fh proc)
-  (if (eof-object? fh) #f
-      (let loop ((curr (proc (read-line fh)))
-                 (result '()))
-        (if (not (eof-object? curr))
-            (loop (let ((l (read-line fh)))
-                    (if (eof-object? l) l (proc l)))
-                  (append result (list curr)))
-            result))))
-
-;; here is an example line where the shell is sh or bash
-;; "find / -print 2&>1 > findall.log"
-(define (run-n-wait cmdline #!key (params #f)(print-cmd #f)(run-dir #f))
-  (if print-cmd 
-      (debug:print 0 *default-log-port* 
-		   (if (string? print-cmd)
-		       print-cmd
-		       "")
-		   (if run-dir (conc "Run in " run-dir ";") "")
-		   cmdline
-		   (if params
-		       (conc " " (string-intersperse params " "))
-		       "")))
-  (if (and run-dir
-	   (directory-exists? run-dir))
-      (push-directory run-dir))
-  (let ((pid (if params
-		 (process-run cmdline params)
-		 (process-run cmdline))))
-    (let loop ((i 0))
-      (let-values (((pid-val exit-status exit-code) (process-wait pid #t)))
-         (if (eq? pid-val 0)
-	     (begin
-	       (thread-sleep! 2)
-	       (loop (+ i 1)))
-	     (begin
-	       (if (and run-dir
-			(directory-exists? run-dir))
-		   (pop-directory))
-	       (values pid-val exit-status exit-code)))))))
-  
-;;======================================================================
-;; MISC PROCESS RELATED STUFF
-;;======================================================================
-
-(define (process:children proc)
-  (with-input-from-pipe
-   (conc "ps h --ppid " (current-process-id) " -o pid")
-   (lambda ()
-     (let loop ((inl (read-line))
-		(res '()))
-       (if (eof-object? inl)
-	   (reverse res)
-	   (let ((pid (string->number inl)))
-	     (if proc (proc pid))
-	     (loop (read-line) (cons pid res))))))))
-
-(define (process:alive? pid)
-  (handle-exceptions
-   exn
-   ;; possibly pid is a process not a child, look in /proc to see if it is running still
-   (common:file-exists? (conc "/proc/" pid))
-   (let-values (((rpid exit-type exit-signal)(process-wait pid #t)))
-       (and (number? rpid)
-	    (equal? rpid pid)))))
-
-(define (process:alive-on-host? host pid)
-  (let ((cmd (conc "ssh " host " ps -o pid= -p " pid)))
-    (handle-exceptions
-	exn
-      (begin
-	(debug:print 0 *default-log-port* "failed to identify if process " pid ", on host " host " is alive. exn=" exn)
-	#f) ;; anything goes wrong - assume the process in NOT running.
-     (with-input-from-pipe 
-      cmd
-      (lambda ()
-	(let loop ((inl (read-line)))
-	  (if (eof-object? inl)
-	      #f
-	      (let* ((clean-str (string-substitute "^[^\\d]*([0-9]+)[^\\d]*$" "\\1" inl))
-		     (innum     (string->number clean-str)))
-		(and innum
-		     (eq? pid innum))))))))))
-
-(define (process:get-sub-pids pid)
-  (with-input-from-pipe
-   (conc "pstree -A -p " pid) ;; | tr 'a-z\\-+`()\\.' ' ' " pid)
-   (lambda ()
-     (let loop ((inl (read-line))
-		(res '()))
-       (if (eof-object? inl)
-	   (reverse res)
-	   (let ((nums (map string->number
-			    (string-split-fields "\\d+" inl))))
-	     (loop (read-line)
-		   (append res nums))))))))

ADDED   processmod.scm
Index: processmod.scm
==================================================================
--- /dev/null
+++ processmod.scm
@@ -0,0 +1,321 @@
+;;======================================================================
+;; Copyright 2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
+
+;;======================================================================
+
+(declare (unit processmod))
+;; (declare (uses mtver))
+(declare (uses debugprint))
+;; (declare (uses stml2))
+;; (declare (uses pkts))
+
+(module processmod
+	*
+	
+(import scheme
+	chicken.base
+ 	chicken.condition
+ 	chicken.file
+;; 	chicken.time
+;; 	chicken.file.posix
+ 	chicken.pathname
+;; 	chicken.port
+ 	chicken.process
+ 	chicken.process-context
+ 	chicken.process-context.posix
+ 	chicken.process.signal
+;; 	chicken.pretty-print
+;; 	chicken.random
+ 	chicken.io
+ 	chicken.string
+;; 	chicken.sort
+;; 	chicken.time.posix
+;; 	
+;; 	(prefix base64 base64:)
+;; 	(prefix sqlite3 sqlite3:)
+	directory-utils
+;; 	matchable
+;; 	md5
+;; 	message-digest
+ 	regex
+;; 	regex-case
+;; 	sparse-vectors
+ 	srfi-1
+;; 	srfi-13
+ 	srfi-18
+ 	srfi-69
+;; 	system-information
+;; 	typed-records
+;; 	z3
+;; 
+;; 	mtver
+ 	debugprint
+;; 	stml2
+;; 	pkts
+	)
+
+;;======================================================================
+;; Process convience utils
+;;======================================================================
+
+;;======================================================================
+;; accept an alist or hash table containing envvar/env value pairs (value of #f causes unset) 
+;;   execute thunk in context of environment modified as per this list
+;;   restore env to prior state then return value of eval'd thunk.
+;;   ** this is not thread safe **
+(define (common:with-env-vars delta-env-alist-or-hash-table thunk)
+  (let* ((delta-env-alist (if (hash-table? delta-env-alist-or-hash-table)
+                              (hash-table->alist delta-env-alist-or-hash-table)
+                              delta-env-alist-or-hash-table))
+         (restore-thunks
+          (filter
+           identity
+           (map (lambda (env-pair)
+                  (let* ((env-var     (car env-pair))
+                         (new-val     (let ((tmp (cdr env-pair)))
+                                        (if (list? tmp) (car tmp) tmp)))
+                         (current-val (get-environment-variable env-var))
+                         (restore-thunk
+                          (cond
+                           ((not current-val) (lambda () (unset-environment-variable! env-var)))
+                           ((not (string? new-val)) #f)
+                           ((eq? current-val new-val) #f)
+                           (else 
+                            (lambda () (set-environment-variable! env-var current-val))))))
+                    ;;(when (not (string? new-val))
+                    ;;    (debug:print 0 *default-log-port* " PROBLEM: not a string: "new-val"\n from env-alist:\n"delta-env-alist)
+                    ;;    (pp delta-env-alist)
+                    ;;    (exit 1))
+                        
+                    
+                    (cond
+                     ((not new-val)  ;; modify env here
+                      (unset-environment-variable! env-var))
+                     ((string? new-val)
+                      (set-environment-variable! env-var new-val)))
+                    restore-thunk))
+                delta-env-alist))))
+    (let ((rv (thunk)))
+      (for-each (lambda (x) (x)) restore-thunks) ;; restore env to original state
+      rv)))
+
+;;  (use regex directory-utils)
+;;  (declare (unit process))
+
+(define (process:conservative-read port)
+  (let loop ((res ""))
+    (if (not (eof-object? (peek-char port)))
+	(loop (conc res (read-char port)))
+	res)))
+
+(define (process:cmd-run-with-stderr->list cmd . params)
+  ;; (print "Called with cmd=" cmd ", proc=" proc ", params=" params)
+;;  (handle-exceptions
+;;   exn
+;;   (begin
+;;     (print "ERROR:  Failed to run command: " cmd " " (string-intersperse params " "))
+;;     (print "       " ((condition-property-accessor 'exn 'message) exn))
+;;     #f)
+   (let-values (((fh fho pid fhe) (if (null? params)
+				      (process* cmd)
+				      (process* cmd params))))
+       (let loop ((curr (read-line fh))
+		  (result  '()))
+	 (let ((errstr (process:conservative-read fhe)))
+	   (if (not (string=? errstr ""))
+	       (set! result (append result (list errstr)))))
+       (if (not (eof-object? curr))
+	   (loop (read-line fh)
+		 (append result (list curr)))
+	   (begin
+	     (close-input-port fh)
+	     (close-input-port fhe)
+	     (close-output-port fho)
+	     result))))) ;; )
+
+(define (process:cmd-run-with-stderr-and-exitcode->list cmd . params)
+  ;; (print "Called with cmd=" cmd ", proc=" proc ", params=" params)
+;;  (handle-exceptions
+;;   exn
+;;   (begin
+;;     (print "ERROR:  Failed to run command: " cmd " " (string-intersperse params " "))
+;;     (print "       " ((condition-property-accessor 'exn 'message) exn))
+;;     #f)
+   (let-values (((fh fho pid fhe) (if (null? params)
+				      (process* cmd)
+				      (process* cmd params))))
+       (let loop ((curr (read-line fh))
+		  (result  '()))
+	 (let ((errstr (process:conservative-read fhe)))
+	   (if (not (string=? errstr ""))
+	       (set! result (append result (list errstr)))))
+       (if (not (eof-object? curr))
+	   (loop (read-line fh)
+		 (append result (list curr)))
+	   (begin
+             (let-values (((anotherpid normalexit? exitstatus)  (process-wait pid)))
+	     (close-input-port fh)
+	     (close-input-port fhe)
+	     (close-output-port fho)
+               (list result (if normalexit? exitstatus -1))))))))
+
+(define (process:cmd-run-proc-each-line cmd proc . params)
+  ;; (print "Called with cmd=" cmd ", proc=" proc ", params=" params)
+  (handle-exceptions
+   exn
+   (begin
+     (print "ERROR:  Failed to run command: " cmd " " (string-intersperse params " "))
+     (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
+     (debug:print 5 *default-log-port* "exn=" (condition->list exn))
+     #f)
+   (let-values (((fh fho pid) (if (null? params)
+				  (process cmd)
+				  (process cmd params))))
+       (let loop ((curr (read-line fh))
+		(result  '()))
+       (if (not (eof-object? curr))
+	   (loop (read-line fh)
+		 (append result (list (proc curr))))
+	   (begin
+	     (close-input-port fh)
+	     ;;(close-input-port fhe)
+	     (close-output-port fho)
+	     result))))))
+
+(define (process:cmd-run-proc-each-line-alt cmd proc)
+  (let* ((fh (open-input-pipe cmd))
+         (res (port-proc->list fh proc))
+         (status (close-input-pipe fh)))
+    (if (eq? status 0) res #f)))
+
+(define (process:cmd-run->list cmd #!key (delta-env-alist-or-hash-table '()))
+  (common:with-env-vars
+   delta-env-alist-or-hash-table
+   (lambda ()
+     (let* ((fh (open-input-pipe cmd))
+            (res (port->list fh))
+            (status (close-input-pipe fh)))
+       (list res status)))))
+   
+(define (port->list fh)
+  (if (eof-object? fh) #f
+      (let loop ((curr (read-line fh))
+                 (result '()))
+        (if (not (eof-object? curr))
+            (loop (read-line fh)
+                  (append result (list curr)))
+            result))))
+
+(define (port-proc->list fh proc)
+  (if (eof-object? fh) #f
+      (let loop ((curr (proc (read-line fh)))
+                 (result '()))
+        (if (not (eof-object? curr))
+            (loop (let ((l (read-line fh)))
+                    (if (eof-object? l) l (proc l)))
+                  (append result (list curr)))
+            result))))
+
+;; here is an example line where the shell is sh or bash
+;; "find / -print 2&>1 > findall.log"
+(define (run-n-wait cmdline #!key (params #f)(print-cmd #f)(run-dir #f))
+  (if print-cmd 
+      (debug:print 0 *default-log-port* 
+		   (if (string? print-cmd)
+		       print-cmd
+		       "")
+		   (if run-dir (conc "Run in " run-dir ";") "")
+		   cmdline
+		   (if params
+		       (conc " " (string-intersperse params " "))
+		       "")))
+  (if (and run-dir
+	   (directory-exists? run-dir))
+      (push-directory run-dir))
+  (let ((pid (if params
+		 (process-run cmdline params)
+		 (process-run cmdline))))
+    (let loop ((i 0))
+      (let-values (((pid-val exit-status exit-code) (process-wait pid #t)))
+         (if (eq? pid-val 0)
+	     (begin
+	       (thread-sleep! 2)
+	       (loop (+ i 1)))
+	     (begin
+	       (if (and run-dir
+			(directory-exists? run-dir))
+		   (pop-directory))
+	       (values pid-val exit-status exit-code)))))))
+  
+;;======================================================================
+;; MISC PROCESS RELATED STUFF
+;;======================================================================
+
+(define (process:children proc)
+  (with-input-from-pipe
+   (conc "ps h --ppid " (current-process-id) " -o pid")
+   (lambda ()
+     (let loop ((inl (read-line))
+		(res '()))
+       (if (eof-object? inl)
+	   (reverse res)
+	   (let ((pid (string->number inl)))
+	     (if proc (proc pid))
+	     (loop (read-line) (cons pid res))))))))
+
+(define (process:alive? pid)
+  (handle-exceptions
+   exn
+   ;; possibly pid is a process not a child, look in /proc to see if it is running still
+   (file-exists? (conc "/proc/" pid))
+   (let-values (((rpid exit-type exit-signal)(process-wait pid #t)))
+       (and (number? rpid)
+	    (equal? rpid pid)))))
+
+(define (process:alive-on-host? host pid)
+  (let ((cmd (conc "ssh " host " ps -o pid= -p " pid)))
+    (handle-exceptions
+	exn
+      (begin
+	(debug:print 0 *default-log-port* "failed to identify if process " pid ", on host " host " is alive. exn=" exn)
+	#f) ;; anything goes wrong - assume the process in NOT running.
+     (with-input-from-pipe 
+      cmd
+      (lambda ()
+	(let loop ((inl (read-line)))
+	  (if (eof-object? inl)
+	      #f
+	      (let* ((clean-str (string-substitute "^[^\\d]*([0-9]+)[^\\d]*$" "\\1" inl))
+		     (innum     (string->number clean-str)))
+		(and innum
+		     (eq? pid innum))))))))))
+
+(define (process:get-sub-pids pid)
+  (with-input-from-pipe
+   (conc "pstree -A -p " pid) ;; | tr 'a-z\\-+`()\\.' ' ' " pid)
+   (lambda ()
+     (let loop ((inl (read-line))
+		(res '()))
+       (if (eof-object? inl)
+	   (reverse res)
+	   (let ((nums (map string->number
+			    (string-split-fields "\\d+" inl))))
+	     (loop (read-line)
+		   (append res nums))))))))
+
+)

DELETED rmt.scm
Index: rmt.scm
==================================================================
--- rmt.scm
+++ /dev/null
@@ -1,1036 +0,0 @@
-;;======================================================================
-;; Copyright 2006-2017, Matthew Welland.
-;; 
-;; This file is part of Megatest.
-;; 
-;;     Megatest is free software: you can redistribute it and/or modify
-;;     it under the terms of the GNU General Public License as published by
-;;     the Free Software Foundation, either version 3 of the License, or
-;;     (at your option) any later version.
-;; 
-;;     Megatest is distributed in the hope that it will be useful,
-;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;     GNU General Public License for more details.
-;; 
-;;     You should have received a copy of the GNU General Public License
-;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
-;;
-;;======================================================================
-
-(use format typed-records) ;; RADT => purpose of json format??
-
-(declare (unit rmt))
-(declare (uses api))
-(declare (uses http-transport))
-(include "common_records.scm")
-;; (declare (uses rmtmod))
-
-;; (import rmtmod)
-
-;;
-;; THESE ARE ALL CALLED ON THE CLIENT SIDE!!!
-;;
-
-;; generate entries for ~/.megatestrc with the following
-;;
-;;  grep define ../rmt.scm | grep rmt: |perl -pi -e 's/\(define\s+\((\S+)\W.*$/\1/'|sort -u
-
-;;======================================================================
-;;  S U P P O R T   F U N C T I O N S
-;;======================================================================
-
-;; if a server is either running or in the process of starting call client:setup
-;; else return #f to let the calling proc know that there is no server available
-;;
-(define (rmt:get-connection-info areapath #!key (area-dat #f)) ;; TODO: push areapath down.
-  (let* ((runremote (or area-dat *runremote*))
-	 (cinfo     (if (remote? runremote)
-			(remote-conndat runremote)
-			#f)))
-	  (if cinfo
-	      cinfo
-	      (if (server:check-if-running areapath)
-		  (client:setup areapath)
-		  #f))))
-
-;;======================================================================
-
-(define *send-receive-mutex* (make-mutex)) ;; should have separate mutex per run-id
-
-;; RA => e.g. usage (rmt:send-receive 'get-var #f (list varname))
-;;
-(define (rmt:send-receive cmd rid params #!key (attemptnum 1)(area-dat #f)) ;; start attemptnum at 1 so the modulo below works as expected
-
-  #;(common:telemetry-log (conc "rmt:"(->string cmd))
-                        payload: `((rid . ,rid)
-                                   (params . ,params)))
-                          
-  (if (> attemptnum 2)
-      (debug:print 0 *default-log-port* "INFO: attemptnum in rmt:send-receive is " attemptnum))
-    
-  (cond
-   ((> attemptnum 2) (thread-sleep! 0.05))
-   ((> attemptnum 10) (thread-sleep! 0.5))
-   ((> attemptnum 20) (thread-sleep! 1)))
-  (if (and (> attemptnum 5) (= 0 (modulo attemptnum 15)))  
-    (begin (server:run *toppath*) (thread-sleep! 3))) 
-  
-  
-  ;;DOT digraph megatest_state_status {
-  ;;DOT   ranksep=0;
-  ;;DOT   // rankdir=LR;
-  ;;DOT   node [shape="box"];
-  ;;DOT "rmt:send-receive" -> MUTEXLOCK;
-  ;;DOT { edge [style=invis];"case 1" -> "case 2" -> "case 3" -> "case 4" -> "case 5" -> "case 6" -> "case 7" -> "case 8" -> "case 9" -> "case 10" -> "case 11"; }
-  ;; do all the prep locked under the rmt-mutex
-  (mutex-lock! *rmt-mutex*)
-  
-  ;; 1. check if server is started IFF cmd is a write OR if we are not on the homehost, store in runremote
-  ;; 2. check the age of the connections. refresh the connection if it is older than timeout-20 seconds.
-  ;; 3. do the query, if on homehost use local access
-  ;;
-  (let* ((start-time    (current-seconds)) ;; snapshot time so all use cases get same value
-         (areapath      *toppath*);; TODO - resolve from dbstruct to be compatible with multiple areas
-	 (runremote     (or area-dat
-			    *runremote*))
-         (attemptnum    (+ 1 attemptnum))
-	 (readonly-mode (rmtmod:calc-ro-mode runremote *toppath*)))
-
-    ;; DOT INIT_RUNREMOTE; // leaving off - doesn't really add to the clarity
-    ;; DOT MUTEXLOCK -> INIT_RUNREMOTE [label="no remote?"];
-    ;; DOT INIT_RUNREMOTE -> MUTEXLOCK;
-    ;; ensure we have a record for our connection for given area
-    (if (not runremote)                   ;; can remove this one. should never get here.         
-	(begin
-	  (set! *runremote* (make-remote))
-          (let* ((server-info (remote-server-info *runremote*))) 
-            (if server-info
-		(begin
-			(remote-server-url-set! *runremote* (server:record->url server-info))
-			(remote-server-id-set! *runremote* (server:record->id server-info)))))  
-	  (set! runremote   *runremote*))) ;; new runremote will come from this on next iteration
-    
-    ;; DOT SET_HOMEHOST; // leaving off - doesn't really add to the clarity
-    ;; DOT MUTEXLOCK -> SET_HOMEHOST [label="no homehost?"];
-    ;; DOT SET_HOMEHOST -> MUTEXLOCK;
-    ;; ensure we have a homehost record
-    (if (not (pair? (remote-hh-dat runremote)))  ;; not on homehost
-	(thread-sleep! 0.1) ;; since we shouldn't get here, delay a little
-	(remote-hh-dat-set! runremote (common:get-homehost)))
-    
-    ;;(print "BB> readonly-mode is "readonly-mode" dbfile is "dbfile)
-    (cond
-     ;;DOT EXIT;
-     ;;DOT MUTEXLOCK -> EXIT [label="> 15 attempts"]; {rank=same "case 1" "EXIT" }
-     ;; give up if more than 150 attempts
-     ((> attemptnum 150)
-      (debug:print 0 *default-log-port* "ERROR: 150 tries to start/connect to server. Giving up.")
-      (exit 1))
-
-     ;;DOT CASE2 [label="local\nreadonly\nquery"];
-     ;;DOT MUTEXLOCK -> CASE2; {rank=same "case 2" CASE2}
-     ;;DOT CASE2 -> "rmt:open-qry-close-locally";
-     ;; readonly mode, read request-  handle it - case 2
-     ((and readonly-mode
-           (member cmd api:read-only-queries)) 
-      (mutex-unlock! *rmt-mutex*)
-      (debug:print-info 12 *default-log-port* "rmt:send-receive, case 2")
-      (rmt:open-qry-close-locally cmd 0 params)
-      )
-
-     ;;DOT CASE3 [label="write in\nread-only mode"];
-     ;;DOT MUTEXLOCK -> CASE3 [label="readonly\nmode?"]; {rank=same "case 3" CASE3}
-     ;;DOT CASE3 -> "#f";
-     ;; readonly mode, write request.  Do nothing, return #f
-     (readonly-mode (extras-readonly-mode *rmt-mutex* *default-log-port* cmd params))
-
-     ;; This block was for pre-emptively resetting the connection if there had been no communication for some time.
-     ;; I don't think it adds any value. If the server is not there, just fail and start a new connection.
-     ;; also, the expire-time calculation might not be correct. We want, time-since-last-server-access > (server:get-timeout)
-     ;;
-     ;;DOT CASE4 [label="reset\nconnection"];
-     ;;DOT MUTEXLOCK -> CASE4 [label="have connection,\nlast_access > expire_time"]; {rank=same "case 4" CASE4}
-     ;;DOT CASE4 -> "rmt:send-receive";
-     ;; reset the connection if it has been unused too long
-     ((and runremote
-           (remote-conndat runremote)
-	   (> (current-seconds) ;; if it has been more than server-timeout seconds since last contact, close this connection and start a new on
-	      (+ (http-transport:server-dat-get-last-access (remote-conndat runremote))
-		 (remote-server-timeout runremote))))
-      (debug:print-info 0 *default-log-port* "Connection to " (remote-server-url runremote) " expired due to no accesses, forcing new connection.")
-      (http-transport:close-connections area-dat: runremote)
-      (remote-conndat-set! runremote #f) ;; invalidate the connection, thus forcing a new connection.
-      (mutex-unlock! *rmt-mutex*)
-      (rmt:send-receive cmd rid params attemptnum: attemptnum))
-     
-     ;;DOT CASE5 [label="local\nread"];
-     ;;DOT MUTEXLOCK -> CASE5 [label="server not required,\non homehost,\nread-only query"]; {rank=same "case 5" CASE5};
-     ;;DOT CASE5 -> "rmt:open-qry-close-locally";
-
-     ;; on homehost and this is a read
-     ((and (not (remote-force-server runremote)) ;; honor forced use of server, i.e. server NOT required
-	   (cdr (remote-hh-dat runremote))       ;; on homehost
-           (member cmd api:read-only-queries))   ;; this is a read
-      (mutex-unlock! *rmt-mutex*)
-      (debug:print-info 12 *default-log-port* "rmt:send-receive, case  5")
-      (rmt:open-qry-close-locally cmd 0 params))
-
-     ;;DOT CASE6 [label="init\nremote"];
-     ;;DOT MUTEXLOCK -> CASE6 [label="on homehost,\nwrite query,\nhave server,\ncan't reach it"]; {rank=same "case 6" CASE6};
-     ;;DOT CASE6 -> "rmt:send-receive";
-     ;; on homehost and this is a write, we already have a server, but server has died
-     ((and (cdr (remote-hh-dat runremote))           ;; on homehost
-           (not (member cmd api:read-only-queries))  ;; this is a write
-           (remote-server-url runremote)             ;; have a server
-           (not (server:ping (remote-server-url runremote) (remote-server-id runremote))))  ;; server has died. NOTE: this is not a cheap call! Need better approach.
-      (set! *runremote* (make-remote))
-      (let* ((server-info (remote-server-info *runremote*))) 
-            (if server-info
-		(begin
-		  (remote-server-url-set! *runremote* (server:record->url server-info))
-                  (remote-server-id-set! *runremote* (server:record->id server-info)))))
-      (remote-force-server-set! runremote (common:force-server?))
-      (mutex-unlock! *rmt-mutex*)
-      (debug:print-info 12 *default-log-port* "rmt:send-receive, case  6")
-      (rmt:send-receive cmd rid params attemptnum: attemptnum))
-
-     ;;DOT CASE7 [label="homehost\nwrite"];
-     ;;DOT MUTEXLOCK -> CASE7 [label="server not required,\non homehost,\na write,\nhave a server"]; {rank=same "case 7" CASE7};
-     ;;DOT CASE7 -> "rmt:open-qry-close-locally";
-     ;; on homehost and this is a write, we already have a server
-     ((and (not (remote-force-server runremote))     ;; honor forced use of server, i.e. server NOT required
-	   (cdr (remote-hh-dat runremote))           ;; on homehost
-           (not (member cmd api:read-only-queries))  ;; this is a write
-           (remote-server-url runremote))            ;; have a server
-      (mutex-unlock! *rmt-mutex*)
-      (debug:print-info 12 *default-log-port* "rmt:send-receive, case  4.1")
-      (rmt:open-qry-close-locally cmd 0 params))
-
-     ;;DOT CASE8 [label="force\nserver"];
-     ;;DOT MUTEXLOCK -> CASE8 [label="server not required,\nhave homehost info,\nno connection yet,\nnot a read-only query"]; {rank=same "case 8" CASE8};
-     ;;DOT CASE8 -> "rmt:open-qry-close-locally";
-     ;;  on homehost, no server contact made and this is a write, passively start a server 
-     ((and (not (remote-force-server runremote))     ;; honor forced use of server, i.e. server NOT required
-	   (cdr (remote-hh-dat runremote))           ;; have homehost
-           (not (remote-server-url runremote))       ;; no connection yet
-	   (not (member cmd api:read-only-queries))) ;; not a read-only query
-      (debug:print-info 12 *default-log-port* "rmt:send-receive, case  8")
-      (let ((server-info  (server:check-if-running *toppath*))) ;; (server:read-dotserver->url *toppath*))) ;; (server:check-if-running *toppath*))) ;; Do NOT want to run server:check-if-running - very expensive to do for every write call
-	(if server-info
-	    (begin
-              (remote-server-url-set! runremote (server:record->url server-info)) ;; the string can be consumed by the client setup if needed
-              (remote-server-id-set! runremote (server:record->id server-info)))  
-	    (if (common:force-server?)
-		(server:start-and-wait *toppath*)
-		(server:kind-run *toppath*)))
-      (remote-force-server-set! runremote (common:force-server?))
-      (mutex-unlock! *rmt-mutex*)
-      (debug:print-info 12 *default-log-port* "rmt:send-receive, case  8.1")
-      (rmt:open-qry-close-locally cmd 0 params)))
-
-     ;;DOT CASE9 [label="force server\nnot on homehost"];
-     ;;DOT MUTEXLOCK -> CASE9 [label="no connection\nand either require server\nor not on homehost"]; {rank=same "case 9" CASE9};
-     ;;DOT CASE9 -> "start\nserver" -> "rmt:send-receive";
-     ((or (and (remote-force-server runremote)              ;; we are forcing a server and don't yet have a connection to one
-	       (not (remote-conndat runremote)))
-	  (and (not (cdr (remote-hh-dat runremote)))        ;; not on a homehost 
-	       (not (remote-conndat runremote))))           ;; and no connection
-      (debug:print-info 12 *default-log-port* "rmt:send-receive, case 9, hh-dat: " (remote-hh-dat runremote) " conndat: " (remote-conndat runremote))
-      (mutex-unlock! *rmt-mutex*)
-      (if (not (server:check-if-running *toppath*)) ;; who knows, maybe one has started up?
-	  (server:start-and-wait *toppath*))
-      (remote-conndat-set! runremote (rmt:get-connection-info *toppath*)) ;; calls client:setup which calls client:setup-http
-      (rmt:send-receive cmd rid params attemptnum: attemptnum)) ;; TODO: add back-off timeout as
-
-     ;;DOT CASE10 [label="on homehost"];
-     ;;DOT MUTEXLOCK -> CASE10 [label="server not required,\non homehost"]; {rank=same "case 10" CASE10};
-     ;;DOT CASE10 -> "rmt:open-qry-close-locally";
-     ;; all set up if get this far, dispatch the query
-     ((and (not (remote-force-server runremote))
-	   (cdr (remote-hh-dat runremote))) ;; we are on homehost
-      (mutex-unlock! *rmt-mutex*)
-      (debug:print-info 12 *default-log-port* "rmt:send-receive, case 10")
-      (rmt:open-qry-close-locally cmd (if rid rid 0) params))
-
-     ;;DOT CASE11 [label="send_receive"];
-     ;;DOT MUTEXLOCK -> CASE11 [label="else"]; {rank=same "case 11" CASE11};
-     ;;DOT CASE11 -> "rmt:send-receive" [label="call failed"];
-     ;;DOT CASE11 -> "RESULT" [label="call succeeded"];
-     ;; not on homehost, do server query
-     (else (extras-case-11 *default-log-port* runremote cmd params attemptnum rid)))))
-    ;;DOT }
-
-;; bunch of small functions factored out of send-receive to make debug easier
-;;
-
-(define (extras-case-11 *default-log-port* runremote cmd params attemptnum rid)
-  ;; (mutex-unlock! *rmt-mutex*)
-  (debug:print-info 12 *default-log-port* "rmt:send-receive, case  9")
-  ;; (mutex-lock! *rmt-mutex*)
-  (let* ((conninfo (remote-conndat runremote))
-	 (dat-in      (case (remote-transport runremote)
-		     ((http) (condition-case ;; handling here has
-					     ;; caused a lot of
-					     ;; problems. However it
-					     ;; is needed to deal with
-					     ;; attemtped
-					     ;; communication to
-					     ;; servers that have gone
-					     ;; away
-			      (http-transport:client-api-send-receive 0 conninfo cmd params)
-                              ((servermismatch)  (vector #f "Server id mismatch" ))
-			      ((commfail)(vector #f "communications fail"))
-			      ((exn)(vector #f "other fail" (print-call-chain)))))
-		     (else
-		      (debug:print 0 *default-log-port* "ERROR: transport " (remote-transport runremote) " not supported")
-		      (exit))))
-
-;; No Title 
-;; Error: (vector-ref) out of range
-;; #(#<condition: (exn type)> (#("db.scm:3740: regex#regexp" #f #f) #("db.scm:3739: regex#string-substitute" #f #f) #("db.scm:3738: base64#base64-decode" #f #f) #("db.scm:3737: z3#z3:decode-buffer" #f #f) #("db.scm:3736: with-input-from-string" #f #f) #("db.scm:3741: s11n#deserialize" #f #f) #("api.scm:374: api:execute-requests" #f #f) #("api.scm:139: call-with-current-continuation" #f #f) #("api.scm:139: with-exception-handler" #f #f) #("api.scm:139: ##sys#call-with-values" #f #f) #("api.scm:158: string->symbol" #f #f) #("api.scm:160: current-milliseconds" #f #f) #("api.scm:161: dbr:dbstruct-read-only" #f #f) #("api.scm:139: k15" #f #f) #("api.scm:139: g19" #f #f) #("api.scm:142: get-call-chain" #f #f)) #("get-test-info-by-id" (1102 507299)))
-;; 6
-;; 
-;; 	Call history:
-;; 
-;; 	http-transport.scm:306: thread-terminate!	  
-;; 	http-transport.scm:307: debug:print-info	  
-;; 	common_records.scm:235: debug:debug-mode	  
-;; 	rmt.scm:259: k587	  
-;; 	rmt.scm:259: g591	  
-;; 	rmt.scm:276: http-transport:server-dat-update-last-access	  
-;; 	http-transport.scm:364: current-seconds	  
-;; 	rmt.scm:282: debug:print-info	  
-;; 	common_records.scm:235: debug:debug-mode	  
-;; 	rmt.scm:283: mutex-unlock!	  
-;; 	rmt.scm:287: extras-transport-succeded	  	<--
-;; +-----------------------------------------------------------------------------+
-;; | Exit Status    : 70  
-;;  
-
-	 (dat      (if (and (vector? dat-in) ;; ... check it is a correct size
-			    (> (vector-length dat-in) 1))
-		       dat-in
-		       (vector #f (conc "communications fail (type 2), dat-in=" dat-in))))
-	 (success  (if (vector? dat) (vector-ref dat 0) #f))
-	 (res      (if (vector? dat) (vector-ref dat 1) #f)))
-    (if (and (vector? conninfo) (< 5 (vector-length conninfo)))
-	(http-transport:server-dat-update-last-access conninfo) ;; refresh access time
-	(begin
-	  (debug:print 0 *default-log-port* "INFO: Should not get here! conninfo=" conninfo)
-	  (set! conninfo #f)
-	  (remote-conndat-set! *runremote* #f) ;; NOTE: *runremote* is global copy of runremote. Purpose: factor out global.
-	  (http-transport:close-connections  area-dat: runremote)))
-    (debug:print-info 13 *default-log-port* "rmt:send-receive, case  9. conninfo=" conninfo " dat=" dat " runremote = " runremote)
-    (mutex-unlock! *rmt-mutex*)
-    (if success ;; success only tells us that the transport was
-	;; successful, have to examine the data to see if
-	;; there was a detected issue at the other end
-	(extras-transport-succeded *default-log-port* *rmt-mutex* attemptnum runremote res params rid cmd)
-	(begin
-           (debug:print-error 0 *default-log-port* " dat=" dat) 
-           (extras-transport-failed *default-log-port* *rmt-mutex* attemptnum runremote cmd rid params))
-	)))
-
-(define (rmt:print-db-stats)
-  (let ((fmtstr "~40a~7-d~9-d~20,2-f")) ;; "~20,2-f"
-    (debug:print 18 *default-log-port* "DB Stats\n========")
-    (debug:print 18 *default-log-port* (format #f "~40a~8a~10a~10a" "Cmd" "Count" "TotTime" "Avg"))
-    (for-each (lambda (cmd)
-		(let ((cmd-dat (hash-table-ref *db-stats* cmd)))
-		  (debug:print 18 *default-log-port* (format #f fmtstr cmd (vector-ref cmd-dat 0) (vector-ref cmd-dat 1) (/ (vector-ref cmd-dat 1)(vector-ref cmd-dat 0))))))
-	      (sort (hash-table-keys *db-stats*)
-		    (lambda (a b)
-		      (> (vector-ref (hash-table-ref *db-stats* a) 0)
-			 (vector-ref (hash-table-ref *db-stats* b) 0)))))))
-
-(define (rmt:get-max-query-average run-id)
-  (mutex-lock! *db-stats-mutex*)
-  (let* ((runkey (conc "run-id=" run-id " "))
-	 (cmds   (filter (lambda (x)
-			   (substring-index runkey x))
-			 (hash-table-keys *db-stats*)))
-	 (res    (if (null? cmds)
-		     (cons 'none 0)
-		     (let loop ((cmd (car cmds))
-				(tal (cdr cmds))
-				(max-cmd (car cmds))
-				(res 0))
-		       (let* ((cmd-dat (hash-table-ref *db-stats* cmd))
-			      (tot     (vector-ref cmd-dat 0))
-			      (curravg (/ (vector-ref cmd-dat 1) (vector-ref cmd-dat 0))) ;; count is never zero by construction
-			      (currmax (max res curravg))
-			      (newmax-cmd (if (> curravg res) cmd max-cmd)))
-			 (if (null? tal)
-			     (if (> tot 10)
-				 (cons newmax-cmd currmax)
-				 (cons 'none 0))
-			     (loop (car tal)(cdr tal) newmax-cmd currmax)))))))
-    (mutex-unlock! *db-stats-mutex*)
-    res))
-
-(define (rmt:open-qry-close-locally cmd run-id params #!key (remretries 5))
-  (let* ((qry-is-write   (not (member cmd api:read-only-queries)))
-	 (db-file-path   (db:dbfile-path)) ;;  0))
-	 (dbstruct-local (db:setup #t))  ;; make-dbr:dbstruct path:  dbdir local: #t)))
-	 (read-only      (not (file-write-access? db-file-path)))
-	 (start          (current-milliseconds))
-	 (resdat         (if (not (and read-only qry-is-write))
-			     (let ((v (api:execute-requests dbstruct-local (vector (symbol->string cmd) params))))
-			       (handle-exceptions ;; there has been a long history of receiving strange errors from values returned by the client when things go wrong..
-				exn               ;;  This is an attempt to detect that situation and recover gracefully
-				(begin
-				  (debug:print 0 *default-log-port* "ERROR: bad data from server " v " message: "  ((condition-property-accessor 'exn 'message) exn) ", exn=" exn)
-				  (vector #t '())) ;; should always get a vector but if something goes wrong return a dummy
-				(if (and (vector? v)
-					 (> (vector-length v) 1))
-				    (let ((newvec (vector (vector-ref v 0)(vector-ref v 1))))
-				      newvec)           ;; by copying the vector while inside the error handler we should force the detection of a corrupted record
-				    (vector #t '()))))  ;; we could also check that the returned types are valid
-			     (vector #t '())))
-	 (success        (vector-ref resdat 0))
-	 (res            (vector-ref resdat 1))
-	 (duration       (- (current-milliseconds) start)))
-    (if (and read-only qry-is-write)
-        (debug:print 0 *default-log-port* "ERROR: attempt to write to read-only database ignored. cmd=" cmd))
-    (if (not success)
-	(if (> remretries 0)
-	    (begin
-	      (debug:print-error 0 *default-log-port* "local query failed. Trying again.")
-	      (thread-sleep! (/ (random 5000) 1000)) ;; some random delay 
-	      (rmt:open-qry-close-locally cmd run-id params remretries: (- remretries 1)))
-	    (begin
-	      (debug:print-error 0 *default-log-port* "too many retries in rmt:open-qry-close-locally, giving up")
-	      #f))
-	(begin
-	  ;; (rmt:update-db-stats run-id cmd params duration)
-	  ;; mark this run as dirty if this was a write, the watchdog is responsible for syncing it
-	  (if qry-is-write
-	      (let ((start-time (current-seconds)))
-		(mutex-lock! *db-multi-sync-mutex*)
-/		(set! *db-last-access* start-time)  ;; THIS IS PROBABLY USELESS? (we are on a client)
-                (mutex-unlock! *db-multi-sync-mutex*)))))
-    res))
-
-(define (rmt:send-receive-no-auto-client-setup connection-info cmd run-id params)
-  (let* ((run-id   (if run-id run-id 0))
-	 (res  	   (handle-exceptions
-		       exn
-		     (begin
-		       (print "transport failed. exn=" exn)
-		       #f)
-		     (http-transport:client-api-send-receive run-id connection-info cmd params))))
-    (if (and res (vector-ref res 0))
-	(vector-ref res 1) ;;; YES!! THIS IS CORRECT!! CHANGE IT HERE, THEN CHANGE rmt:send-receive ALSO!!!
-	#f)))
-
-;;======================================================================
-;;
-;; A C T U A L   A P I   C A L L S  
-;;
-;;======================================================================
-
-;;======================================================================
-;;  S E R V E R
-;;======================================================================
-
-(define (rmt:kill-server run-id)
-  (rmt:send-receive 'kill-server run-id (list run-id)))
-
-(define (rmt:start-server run-id)
-  (rmt:send-receive 'start-server 0 (list run-id)))
-
-;;======================================================================
-;;  M I S C
-;;======================================================================
-
-(define (rmt:login run-id)
-  (rmt:send-receive 'login run-id (list *toppath* megatest-version *my-client-signature*)))
-
-;; This login does no retries under the hood - it acts a bit like a ping.
-;; Deprecated for nmsg-transport.
-;;
-(define (rmt:login-no-auto-client-setup connection-info)
-  (case *transport-type* ;; run-id of 0 is just a placeholder
-    ((http)(rmt:send-receive-no-auto-client-setup connection-info 'login 0 (list *toppath* megatest-version *my-client-signature*)))
-    ;;((nmsg)(nmsg-transport:client-api-send-receive run-id connection-info 'login (list *toppath* megatest-version run-id *my-client-signature*)))
-    ))
-
-;; hand off a call to one of the db:queries statements
-;; added run-id to make looking up the correct db possible 
-;;
-(define (rmt:general-call stmtname run-id . params)
-  (rmt:send-receive 'general-call run-id (append (list stmtname run-id) params)))
-
-
-;; given a hostname, return a pair of cpu load and update time representing latest intelligence from tests running on that host
-(define (rmt:get-latest-host-load hostname)
-  (rmt:send-receive 'get-latest-host-load 0 (list hostname)))
-
-(define (rmt:sdb-qry qry val run-id)
-  ;; add caching if qry is 'getid or 'getstr
-  (rmt:send-receive 'sdb-qry run-id (list qry val)))
-
-;; NOT COMPLETED
-(define (rmt:runtests user run-id testpatt params)
-  (rmt:send-receive 'runtests run-id testpatt))
-
-(define (rmt:get-run-record-ids  target run keynames test-patt)
-  (rmt:send-receive 'get-run-record-ids #f (list target run keynames test-patt)))
-
-(define (rmt:get-changed-record-ids since-time)
-  (rmt:send-receive 'get-changed-record-ids #f (list since-time)) )
-
-(define (rmt:drop-all-triggers)
-     (rmt:send-receive 'drop-all-triggers #f '()))
-
-(define (rmt:create-all-triggers)
-     (rmt:send-receive 'create-all-triggers #f '()))
-
-;;======================================================================
-;;  T E S T   M E T A 
-;;======================================================================
-
-(define (rmt:get-tests-tags)
-  (rmt:send-receive 'get-tests-tags #f '()))
-
-;;======================================================================
-;;  K E Y S 
-;;======================================================================
-
-;; These require run-id because the values come from the run!
-;;
-(define (rmt:get-key-val-pairs run-id)
-  (rmt:send-receive 'get-key-val-pairs run-id (list run-id)))
-
-(define (rmt:get-keys)
-  (if *db-keys* *db-keys* 
-     (let ((res (rmt:send-receive 'get-keys #f '())))
-       (set! *db-keys* res)
-       res)))
-
-(define (rmt:get-keys-write) ;; dummy query to force server start
-  (let ((res (rmt:send-receive 'get-keys-write #f '())))
-    (set! *db-keys* res)
-    res))
-
-;; we don't reuse run-id's (except possibly *after* a db cleanup) so it is safe
-;; to cache the resuls in a hash
-;;
-(define (rmt:get-key-vals run-id)
-  (or (hash-table-ref/default *keyvals* run-id #f)
-      (let ((res (rmt:send-receive 'get-key-vals #f (list run-id))))
-        (hash-table-set! *keyvals* run-id res)
-        res)))
-
-(define (rmt:get-targets)
-  (rmt:send-receive 'get-targets #f '()))
-
-(define (rmt:get-target run-id)
-  (rmt:send-receive 'get-target run-id (list run-id)))
-
-(define (rmt:get-run-times runpatt targetpatt)
-  (rmt:send-receive 'get-run-times #f (list runpatt targetpatt ))) 
-
-
-;;======================================================================
-;;  T E S T S
-;;======================================================================
-
-;; Just some syntatic sugar
-(define (rmt:register-test run-id test-name item-path)
-  (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
-;;
-(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))
-      (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)))
-
-(define (rmt:test-get-rundir-from-test-id run-id test-id)
-  (rmt:send-receive 'test-get-rundir-from-test-id run-id (list run-id test-id)))
-
-(define (rmt:open-test-db-by-test-id run-id test-id #!key (work-area #f))
-  (let* ((test-path (if (string? work-area)
-			work-area
-			(rmt:test-get-rundir-from-test-id run-id test-id))))
-    (debug:print 3 *default-log-port* "TEST PATH: " test-path)
-    (open-test-db test-path)))
-
-;; WARNING: This currently bypasses the transaction wrapped writes system
-(define (rmt:test-set-state-status-by-id run-id test-id newstate newstatus newcomment)
-  (rmt:send-receive 'test-set-state-status-by-id run-id (list run-id test-id newstate newstatus newcomment)))
-
-(define (rmt:set-tests-state-status run-id                      testnames currstate currstatus newstate newstatus)
-  (rmt:send-receive 'set-tests-state-status run-id (list run-id testnames currstate currstatus newstate newstatus)))
-
-(define (rmt:get-tests-for-run run-id testpatt states statuses offset limit not-in sort-by sort-order qryvals last-update mode)
-  ;; (if (number? run-id)
-  (rmt:send-receive 'get-tests-for-run run-id (list run-id testpatt states statuses offset limit not-in sort-by sort-order qryvals last-update mode)))
-  ;;    (begin
-  ;;	(debug:print-error 0 *default-log-port* "rmt:get-tests-for-run called with bad run-id=" run-id)
-  ;;	(print-call-chain (current-error-port))
-  ;;	'())))
-
-(define (rmt:get-tests-for-run-state-status run-id testpatt last-update)
-  (rmt:send-receive 'get-tests-for-run-state-status run-id (list run-id testpatt last-update)))
-
-;; get stuff via synchash 
-(define (rmt:synchash-get run-id proc synckey keynum params)
-  (rmt:send-receive 'synchash-get run-id (list run-id proc synckey keynum params)))
-
-(define (rmt:get-tests-for-run-mindata run-id testpatt states status not-in)
-  (rmt:send-receive 'get-tests-for-run-mindata run-id (list run-id testpatt states status not-in)))
-  
-;; IDEA: Threadify these - they spend a lot of time waiting ...
-;;
-(define (rmt:get-tests-for-runs-mindata run-ids testpatt states status not-in)
-  (let ((multi-run-mutex (make-mutex))
-	(run-id-list (if run-ids
-			 run-ids
-			 (rmt:get-all-run-ids)))
-	(result      '()))
-    (if (null? run-id-list)
-	'()
-	(let loop ((hed     (car run-id-list))
-		   (tal     (cdr run-id-list))
-		   (threads '()))
-	  (if (> (length threads) 5)
-	      (loop hed tal (filter (lambda (th)(not (member (thread-state th) '(terminated dead)))) threads))
-	      (let* ((newthread (make-thread
-				 (lambda ()
-				   (let ((res (rmt:send-receive 'get-tests-for-run-mindata hed (list hed testpatt states status not-in))))
-				     (if (list? res)
-					 (begin
-					   (mutex-lock! multi-run-mutex)
-					   (set! result (append result res))
-					   (mutex-unlock! multi-run-mutex))
-					 (debug:print-error 0 *default-log-port* "get-tests-for-run-mindata failed for run-id " hed ", testpatt " testpatt ", states " states ", status " status ", not-in " not-in))))
-				 (conc "multi-run-thread for run-id " hed)))
-		     (newthreads (cons newthread threads)))
-		(thread-start! newthread)
-		(thread-sleep! 0.05) ;; give that thread some time to start
-		(if (null? tal)
-		    newthreads
-		    (loop (car tal)(cdr tal) newthreads))))))
-    result))
-
-;; ;; IDEA: Threadify these - they spend a lot of time waiting ...
-;; ;;
-;; (define (rmt:get-tests-for-runs-mindata run-ids testpatt states status not-in)
-;;   (let ((run-id-list (if run-ids
-;; 			 run-ids
-;; 			 (rmt:get-all-run-ids))))
-;;     (apply append (map (lambda (run-id)
-;; 			 (rmt:send-receive 'get-tests-for-run-mindata run-id (list run-ids testpatt states status not-in)))
-;; 		       run-id-list))))
-
-(define (rmt:delete-test-records run-id test-id)
-  (rmt:send-receive 'delete-test-records run-id (list run-id test-id)))
-
-(define (rmt:test-set-state-status run-id test-id state status msg)
-  (rmt:send-receive 'test-set-state-status run-id (list run-id test-id state status msg)))
-
-(define (rmt:test-toplevel-num-items run-id test-name)
-  (rmt:send-receive 'test-toplevel-num-items run-id (list run-id test-name)))
-
-;; (define (rmt:get-previous-test-run-record run-id test-name item-path)
-;;   (rmt:send-receive 'get-previous-test-run-record run-id (list run-id test-name item-path)))
-
-(define (rmt:get-matching-previous-test-run-records run-id test-name item-path)
-  (rmt:send-receive 'get-matching-previous-test-run-records run-id (list run-id test-name item-path)))
-
-(define (rmt:test-get-logfile-info run-id test-name)
-  (rmt:send-receive 'test-get-logfile-info run-id (list run-id test-name)))
-
-(define (rmt:test-get-records-for-index-file run-id test-name)
-  (rmt:send-receive 'test-get-records-for-index-file run-id (list run-id test-name)))
-
-(define (rmt:get-testinfo-state-status run-id test-id)
-  (rmt:send-receive 'get-testinfo-state-status run-id (list run-id test-id)))
-
-(define (rmt:test-set-log! run-id test-id logf)
-  (if (string? logf)(rmt:general-call 'test-set-log run-id logf test-id)))
-
-(define (rmt:test-set-top-process-pid run-id test-id pid)
-  (rmt:send-receive 'test-set-top-process-pid run-id (list run-id test-id pid)))
-
-(define (rmt:test-get-top-process-pid run-id test-id)
-  (rmt:send-receive 'test-get-top-process-pid run-id (list run-id test-id)))
-
-(define (rmt:get-run-ids-matching-target keynames target res runname testpatt statepatt statuspatt)
-  (rmt:send-receive 'get-run-ids-matching-target #f (list keynames target res runname testpatt statepatt statuspatt)))
-
-;; NOTE: This will open and access ALL run databases. 
-;;
-(define (rmt:test-get-paths-matching-keynames-target-new keynames target res testpatt statepatt statuspatt runname)
-  (let ((run-ids (rmt:get-run-ids-matching-target keynames target res runname testpatt statepatt statuspatt)))
-    (apply append 
-	   (map (lambda (run-id)
-		  (rmt:send-receive 'test-get-paths-matching-keynames-target-new run-id (list run-id keynames target res testpatt statepatt statuspatt runname)))
-	   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)
-  (rmt:send-receive 'get-count-tests-running-for-run-id run-id (list run-id)))
-
-(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)
-  (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)
-  (rmt:send-receive 'get-count-tests-running-in-jobgroup run-id (list run-id jobgroup)))
-
-;; state and status are extra hints not usually used in the calculation
-;;
-(define (rmt:set-state-status-and-roll-up-items run-id test-name item-path state status comment)
-  (rmt:send-receive 'set-state-status-and-roll-up-items run-id (list run-id test-name item-path state status comment)))
-
-(define (rmt:set-state-status-and-roll-up-run run-id state status)
-  (rmt:send-receive 'set-state-status-and-roll-up-run run-id (list run-id state status)))
-
-
-(define (rmt:update-pass-fail-counts run-id test-name)
-  (rmt:general-call 'update-pass-fail-counts run-id test-name test-name test-name))
-
-(define (rmt:top-test-set-per-pf-counts run-id test-name)
-  (rmt:send-receive 'top-test-set-per-pf-counts run-id (list run-id test-name)))
-
-(define (rmt:get-raw-run-stats run-id)
-  (rmt:send-receive 'get-raw-run-stats run-id (list run-id)))
-
-(define (rmt:get-test-times runname target)
-  (rmt:send-receive 'get-test-times #f (list runname target ))) 
-
-;;======================================================================
-;;  R U N S
-;;======================================================================
-
-(define (rmt:get-run-info run-id)
-  (rmt:send-receive 'get-run-info run-id (list run-id)))
-
-(define (rmt:get-num-runs runpatt)
-  (rmt:send-receive 'get-num-runs #f (list runpatt)))
-
-(define (rmt:get-runs-cnt-by-patt runpatt targetpatt keys)
-  (rmt:send-receive 'get-runs-cnt-by-patt #f (list runpatt  targetpatt keys)))
-
-;; Use the special run-id == #f scenario here since there is no run yet
-(define (rmt:register-run keyvals runname state status user contour)
-  (rmt:send-receive 'register-run #f (list keyvals runname state status user contour)))
-    
-(define (rmt:get-run-name-from-id run-id)
-  (rmt:send-receive 'get-run-name-from-id run-id (list run-id)))
-
-(define (rmt:delete-run run-id)
-  (rmt:send-receive 'delete-run run-id (list run-id)))
-
-(define (rmt:update-run-stats run-id stats)
-  (rmt:send-receive 'update-run-stats #f (list run-id stats)))
-
-(define (rmt:delete-old-deleted-test-records)
-  (rmt:send-receive 'delete-old-deleted-test-records #f '()))
-
-(define (rmt:get-runs runpatt count offset keypatts)
-  (rmt:send-receive 'get-runs #f (list runpatt count offset keypatts)))
-
-(define (rmt:simple-get-runs runpatt count offset target last-update)
-  (rmt:send-receive 'simple-get-runs #f (list runpatt count offset target last-update)))
-
-(define (rmt:get-all-run-ids)
-  (rmt:send-receive 'get-all-run-ids #f '()))
-
-(define (rmt:get-prev-run-ids run-id)
-  (rmt:send-receive 'get-prev-run-ids #f (list run-id)))
-
-(define (rmt:lock/unlock-run run-id lock unlock user)
-  (rmt:send-receive 'lock/unlock-run #f (list run-id lock unlock user)))
-
-;; set/get status
-(define (rmt:get-run-status run-id)
-  (rmt:send-receive 'get-run-status #f (list run-id)))
-
-(define (rmt:get-run-state run-id)
-  (rmt:send-receive 'get-run-state #f (list run-id)))
-
-
-(define (rmt:set-run-status run-id run-status #!key (msg #f))
-  (rmt:send-receive 'set-run-status #f (list run-id run-status msg)))
-
-(define (rmt:set-run-state-status run-id state status )
-  (rmt:send-receive 'set-run-state-status #f (list run-id state status)))
-
-(define (rmt:update-tesdata-on-repilcate-db old-lt new-lt)
-(rmt:send-receive 'update-tesdata-on-repilcate-db #f (list old-lt new-lt)))
-
-(define (rmt:update-run-event_time run-id)
-  (rmt:send-receive 'update-run-event_time #f (list run-id)))
-
-(define (rmt:get-runs-by-patt  keys runnamepatt targpatt offset limit fields last-runs-update  #!key  (sort-order "asc")) ;; fields of #f uses default
-  (rmt:send-receive 'get-runs-by-patt #f (list keys runnamepatt targpatt offset limit fields last-runs-update sort-order)))
-
-(define (rmt:find-and-mark-incomplete run-id ovr-deadtime)
-  ;; (if (rmt:send-receive 'have-incompletes? run-id (list run-id ovr-deadtime))
-  (rmt:send-receive 'mark-incomplete run-id (list run-id ovr-deadtime))) ;; )
-
-(define (rmt:get-main-run-stats run-id)
-  (rmt:send-receive 'get-main-run-stats #f (list run-id)))
-
-(define (rmt:get-var varname)
-  (rmt:send-receive 'get-var #f (list varname)))
-
-(define (rmt:del-var varname)
-  (rmt:send-receive 'del-var #f (list varname)))
-
-(define (rmt:set-var varname value)
-  (rmt:send-receive 'set-var #f (list varname value)))
-
-(define (rmt:inc-var varname)
-  (rmt:send-receive 'inc-var #f (list varname)))
-
-(define (rmt:dec-var varname)
-  (rmt:send-receive 'dec-var #f (list varname)))
-
-(define (rmt:add-var varname value)
-  (rmt:send-receive 'add-var #f (list varname value)))
-
-;;======================================================================
-;; M U L T I R U N   Q U E R I E S
-;;======================================================================
-
-;; Need to move this to multi-run section and make associated changes
-(define (rmt:find-and-mark-incomplete-all-runs #!key (ovr-deadtime #f))
-  (let ((run-ids (rmt:get-all-run-ids)))
-    (for-each (lambda (run-id)
-	       (rmt:find-and-mark-incomplete run-id ovr-deadtime))
-	     run-ids)))
-
-;; get the previous record for when this test was run where all keys match but runname
-;; returns #f if no such test found, returns a single test record if found
-;; 
-;; Run this at the client end since we have to connect to multiple run-id dbs
-;;
-(define (rmt:get-previous-test-run-record run-id test-name item-path)
-  (let* ((keyvals (rmt:get-key-val-pairs run-id))
-	 (keys    (rmt:get-keys))
-	 (selstr  (string-intersperse  keys ","))
-	 (qrystr  (string-intersperse (map (lambda (x)(conc x "=?")) keys) " AND ")))
-    (if (not keyvals)
-	#f
-	(let ((prev-run-ids (rmt:get-prev-run-ids run-id)))
-	  ;; for each run starting with the most recent look to see if there is a matching test
-	  ;; if found then return that matching test record
-	  (debug:print 4 *default-log-port* "selstr: " selstr ", qrystr: " qrystr ", keyvals: " keyvals ", previous run ids found: " prev-run-ids)
-	  (if (null? prev-run-ids) #f
-	      (let loop ((hed (car prev-run-ids))
-			 (tal (cdr prev-run-ids)))
-		(let ((results (rmt:get-tests-for-run hed (conc test-name "/" item-path) '() '() ;; run-id testpatt states statuses
-						      #f #f #f               ;; offset limit not-in hide/not-hide
-						      #f #f #f #f 'normal))) ;; sort-by sort-order qryvals last-update mode
-		  (debug:print 4 *default-log-port* "Got tests for run-id " run-id ", test-name " test-name ", item-path " item-path ": " results)
-		  (if (and (null? results)
-			   (not (null? tal)))
-		      (loop (car tal)(cdr tal))
-		      (if (null? results) #f
-			  (car results))))))))))
-
-(define (rmt:get-run-stats)
-  (rmt:send-receive 'get-run-stats #f '()))
-
-;;======================================================================
-;;  S T E P S
-;;======================================================================
-
-;; Getting steps is more complicated.
-;;
-;; If given work area 
-;;  1. Find the testdat.db file
-;;  2. Open the testdat.db file and do the query
-;; If not given the work area
-;;  1. Do a remote call to get the test path
-;;  2. Continue as above
-;; 
-;;(define (rmt:get-steps-for-test run-id test-id)
-;;  (rmt:send-receive 'get-steps-data run-id (list test-id)))
-
-(define (rmt:teststep-set-status! run-id test-id teststep-name state-in status-in comment logfile)
-  (let* ((state     (items:check-valid-items "state" state-in))
-	 (status    (items:check-valid-items "status" status-in)))
-    (if (or (not state)(not status))
-	(debug:print 3 *default-log-port* "WARNING: Invalid " (if status "status" "state")
-		     " value \"" (if status state-in status-in) "\", update your validvalues section in megatest.config"))
-    (rmt:send-receive 'teststep-set-status! run-id (list run-id test-id teststep-name state-in status-in comment logfile))))
-
-
-(define (rmt:delete-steps-for-test! run-id test-id)
-  (rmt:send-receive 'delete-steps-for-test! run-id (list run-id test-id)))
-
-(define (rmt:get-steps-for-test run-id test-id)
-  (rmt:send-receive 'get-steps-for-test run-id (list run-id test-id)))
-
-(define (rmt:get-steps-info-by-id test-step-id)
-  (rmt:send-receive 'get-steps-info-by-id #f (list test-step-id)))
-
-;;======================================================================
-;;  T E S T   D A T A 
-;;======================================================================
-
-(define (rmt:read-test-data run-id test-id categorypatt #!key (work-area #f)) 
-  (rmt:send-receive 'read-test-data run-id (list run-id test-id categorypatt)))
-
-(define (rmt:read-test-data-varpatt run-id test-id categorypatt varpatt #!key (work-area #f)) 
-  (rmt:send-receive 'read-test-data-varpatt run-id (list run-id test-id categorypatt varpatt)))
-
-(define (rmt:get-data-info-by-id test-data-id)
-   (rmt:send-receive 'get-data-info-by-id #f (list test-data-id)))
-
-(define (rmt:testmeta-add-record testname)
-  (rmt:send-receive 'testmeta-add-record #f (list testname)))
-
-(define (rmt:testmeta-get-record testname)
-  (rmt:send-receive 'testmeta-get-record #f (list testname)))
-
-(define (rmt:testmeta-update-field test-name fld val)
-  (rmt:send-receive 'testmeta-update-field #f (list test-name fld val)))
-
-(define (rmt:test-data-rollup run-id test-id status)
-  (rmt:send-receive 'test-data-rollup run-id (list run-id test-id status)))
-
-(define (rmt:csv->test-data run-id test-id csvdata)
-  (rmt:send-receive 'csv->test-data run-id (list run-id test-id csvdata)))
-
-;;======================================================================
-;;  T A S K S
-;;======================================================================
-
-(define (rmt:tasks-find-task-queue-records target run-name test-patt state-patt action-patt)
-  (rmt:send-receive 'find-task-queue-records #f (list target run-name test-patt state-patt action-patt)))
-
-(define (rmt:tasks-add action owner target runname testpatt params)
-  (rmt:send-receive 'tasks-add #f (list action owner target runname testpatt params)))
-
-(define (rmt:tasks-set-state-given-param-key param-key new-state)
-  (rmt:send-receive 'tasks-set-state-given-param-key #f (list  param-key new-state)))
-
-(define (rmt:tasks-get-last target runname)
-  (rmt:send-receive 'tasks-get-last #f (list target runname)))
-
-;;======================================================================
-;; N O   S Y N C   D B 
-;;======================================================================
-
-(define (rmt:no-sync-set var val)
-  (rmt:send-receive 'no-sync-set #f `(,var ,val)))
-
-(define (rmt:no-sync-get/default var default)
-  (rmt:send-receive 'no-sync-get/default #f `(,var ,default)))
-
-(define (rmt:no-sync-del! var)
-  (rmt:send-receive 'no-sync-del! #f `(,var)))
-
-(define (rmt:no-sync-get-lock keyname)
-  (rmt:send-receive 'no-sync-get-lock #f `(,keyname)))
-
-;;======================================================================
-;; A R C H I V E S
-;;======================================================================
-
-(define (rmt:archive-get-allocations  testname itempath dneeded)
-  (rmt:send-receive 'archive-get-allocations #f (list testname itempath dneeded)))
-
-(define (rmt:archive-register-block-name bdisk-id archive-path)
-  (rmt:send-receive 'archive-register-block-name #f (list bdisk-id archive-path)))
-
-(define (rmt:archive-allocate-testsuite/area-to-block block-id testsuite-name areakey)
-  (rmt:send-receive 'archive-allocate-test-to-block #f (list  block-id testsuite-name areakey)))
-
-(define (rmt:archive-register-disk bdisk-name bdisk-path df)
-  (rmt:send-receive 'archive-register-disk #f (list bdisk-name bdisk-path df)))
-
-(define (rmt:test-set-archive-block-id run-id test-id archive-block-id)
-  (rmt:send-receive 'test-set-archive-block-id run-id (list run-id test-id archive-block-id)))
-
-(define (rmt:test-get-archive-block-info archive-block-id)
-  (rmt:send-receive 'test-get-archive-block-info #f (list archive-block-id)))
-
-
-(define (rmtmod:calc-ro-mode runremote *toppath*)
-  (if (and runremote
-	   (remote-ro-mode-checked runremote))
-      (remote-ro-mode runremote)
-      (let* ((dbfile  (conc *toppath* "/megatest.db"))
-	     (ro-mode (not (file-write-access? dbfile)))) ;; TODO: use dbstruct or runremote to figure this out in future
-	(if runremote
-	    (begin
-	      (remote-ro-mode-set! runremote ro-mode)
-	      (remote-ro-mode-checked-set! runremote #t)
-	      ro-mode)
-	    ro-mode))))
-
-(define (extras-readonly-mode rmt-mutex log-port cmd params)
-  (mutex-unlock! rmt-mutex)
-  (debug:print-info 12 log-port "rmt:send-receive, case 3")
-  (debug:print 0 log-port "WARNING: write transaction requested on a readonly area.  cmd="cmd" params="params)
-  #f)
-
-(define (extras-transport-failed *default-log-port* *rmt-mutex* attemptnum runremote cmd rid params)
-  (debug:print 0 *default-log-port* "WARNING: communication failed. Trying again, try num: " attemptnum)
-  (mutex-lock! *rmt-mutex*)
-  (remote-conndat-set!    runremote #f)
-  (http-transport:close-connections area-dat: runremote)
-  (remote-server-url-set! runremote #f)
-  (mutex-unlock! *rmt-mutex*)
-  (debug:print-info 12 *default-log-port* "rmt:send-receive, case  9.1")
-  (rmt:send-receive cmd rid params attemptnum: (+ attemptnum 1)))
-  
-(define (extras-transport-succeded *default-log-port* *rmt-mutex* attemptnum runremote res params rid cmd)
-  (if (and (vector? res)
-	   (eq? (vector-length res) 2)
-	   (eq? (vector-ref res 1) 'overloaded)) ;; since we are
-						 ;; looking at the
-						 ;; data to carry the
-						 ;; error we'll use a
-						 ;; fairly obtuse
-						 ;; combo to minimise
-						 ;; the chances of
-						 ;; some sort of
-						 ;; collision.  this
-						 ;; is the case where
-						 ;; the returned data
-						 ;; is bad or the
-						 ;; server is
-						 ;; overloaded and we
-						 ;; want to ease off
-						 ;; the queries
-      (let ((wait-delay (+ attemptnum (* attemptnum 10))))
-	(debug:print 0 *default-log-port* "WARNING: server is overloaded. Delaying " wait-delay " seconds and trying call again.")
-	(mutex-lock! *rmt-mutex*)
-	(http-transport:close-connections area-dat: runremote)
-	(set! *runremote* #f) ;; force starting over
-	(mutex-unlock! *rmt-mutex*)
-	(thread-sleep! wait-delay)
-	(rmt:send-receive cmd rid params attemptnum: (+ attemptnum 1)))
-      res)) ;; All good, return res
-
-#;(set-functions rmt:send-receive                       remote-server-url-set!
-	       http-transport:close-connections	      remote-conndat-set!
-	       debug:print                            debug:print-info
-	       remote-ro-mode                         remote-ro-mode-set!
-	       remote-ro-mode-checked-set!            remote-ro-mode-checked)

Index: rmtmod.scm
==================================================================
--- rmtmod.scm
+++ rmtmod.scm
@@ -18,29 +18,72 @@
 
 ;;======================================================================
 
 (declare (unit rmtmod))
 (declare (uses commonmod))
+(declare (uses configfmod))
 (declare (uses apimod))
-;; (declare (uses apimod.import))
-(declare (uses ulex))
-
-;; (include "ulex/ulex.scm")
+(declare (uses itemsmod))
+(declare (uses debugprint))
+(declare (uses mtver))
+(declare (uses tasksmod))
+(declare (uses pgdb))
+(declare (uses mtargs))
+(declare (uses dbmod))
+(declare (uses http-transportmod))
+(declare (uses servermod))
+(declare (uses clientmod))
 
 (module rmtmod
 	*
 	
-(import scheme chicken data-structures extras)
-(import (prefix sqlite3 sqlite3:) posix typed-records srfi-18)
-(import (prefix commonmod cmod:))
-(import apimod)
-(import (prefix ulex ulex:))
+(import scheme 
+	chicken.random
+	chicken.string
+	chicken.base
+	chicken.condition
+	chicken.sort
+	chicken.time
+	chicken.base
+	chicken.file
+	chicken.format
+	chicken.process
+	chicken.file.posix
+	chicken.process-context.posix
+	chicken.process-context
+	chicken.io
+	
+	(prefix sqlite3 sqlite3:)
+	typed-records
+	srfi-1
+	srfi-13
+	srfi-18
+	srfi-69
+	commonmod
+	apimod
+	itemsmod
+	http-client
+	debugprint
+	mtver
+	regex
+	tasksmod
+	pgdb
+	(prefix mtargs args:)
+	dbmod
+	http-transportmod
+	servermod
+	clientmod
+	configfmod
+       
+	)
 
 (defstruct alldat
   (areapath #f)
   (ulexdat  #f)
   )
+
+;; (include "db_records.scm")
 
 ;;======================================================================
 ;; return the handle struct for sending queries to a specific database
 ;;  - initializes the connection object if this is the first access
 ;;    - finds the "captain" and asks who to talk to for the given dbfname
@@ -80,6 +123,1592 @@
     ;; (api:execute-requests dbstruct-local (vector (symbol->string cmd) params))))
     
     #;(with-input-from-string
 	(ulex:remote-request udata ulexconn 'immediate dbfile 'execute rid (with-output-to-string (lambda ()(serialize params))))
        (lambda ()(deserialize)))
+
+;;
+;; THESE ARE ALL CALLED ON THE CLIENT SIDE!!!
+;;
+
+;; generate entries for ~/.megatestrc with the following
+;;
+;;  grep define ../rmt.scm | grep rmt: |perl -pi -e 's/\(define\s+\((\S+)\W.*$/\1/'|sort -u
+
+;;======================================================================
+;;  S U P P O R T   F U N C T I O N S
+;;======================================================================
+
+;; ;; if a server is either running or in the process of starting call client:setup
+;; ;; else return #f to let the calling proc know that there is no server available
+;; ;;
+;; (define (rmt:get-connection-info areapath #!key (area-dat #f)) ;; TODO: push areapath down.
+;;   (let* ((runremote (or area-dat *runremote*))
+;; 	 (cinfo     (if (remote? runremote)
+;; 			(remote-conndat runremote)
+;; 			#f)))
+;; 	  (if cinfo
+;; 	      cinfo
+;; 	      (if (server:check-if-running areapath)
+;; 		  (client:setup areapath)
+;; 		  #f))))
+
+(defstruct rmt:remote
+  (conns (make-hash-table)) ;; apath/dbname => rmt:conn
+  )
+
+(defstruct rmt:conn
+  (apath    #f)
+  (dbname   #f)
+  (fullname #f)
+  (hostport #f)
+  (ipaddr   #f)
+  (port     #f)
+  (srvpkt   #f)
+  (lastmsg  0)
+  (expires  0))
+
+;; replaces *runremote*
+(define *rmt:remote* (make-rmt:remote))
+
+;; -> http://abc.com:900/<entrypoint>
+;;
+(define (rmt:conn->uri conn entrypoint)
+  (conc "http://"(rmt:conn-ipaddr conn)":"(rmt:conn-port conn)"/"entrypoint))
+
+;; set up the api proc, seems like there should be a better place for this?
+(api-proc api:process-request)
+
+;; do we have a connection to apath dbname and
+;; is it not expired? then return it
+;;
+;; else setup a connection
+;;
+;; if that fails, return '(#f "some reason") ;; NB// convert to raising an exception
+;;
+(define (rmt:get-connection remote apath dbname)
+  (let* ((fullname (db:dbname->path apath dbname)) ;; we'll switch to full name later
+	 (conn     (hash-table-ref/default (rmt:remote-conns remote) dbname #f)))
+    (if (and conn
+	     (< (current-seconds) (rmt:conn-expires conn)))
+	conn
+	#f)))
+
+(define (rmt:find-main-server apath dbname)
+  (let* ((pktsdir     (get-pkts-dir apath))
+	 (all-srvpkts (get-all-server-pkts pktsdir *srvpktspec*))
+	 (dbpath      (conc apath "/" dbname))
+	 (viable-srvs (get-viable-servers all-srvpkts dbpath)))
+    (get-the-server viable-srvs)))
+
+;; looks for a connection to main
+;; connections for other servers happens by requesting from main
+;;
+(define (rmt:open-main-connection remote apath)
+  (let* ((dbname         (db:run-id->dbname #f))
+	 (the-srv        (rmt:find-main-server apath dbname))
+	 (start-main-srv (lambda ()
+			   ;; srv not ready, delay a little and try again
+			   (api:run-server-process apath dbname)
+			   (thread-sleep! 2)
+			   (rmt:open-main-connection remote apath) ;; TODO: Add limit to number of tries
+			   )))
+    (if the-srv ;; yes, we have a server, now try connecting to it
+	(let* ((srv-addr (server-address the-srv))
+	       (ipaddr   (alist-ref 'ipaddr the-srv))
+	       (port     (alist-ref 'port   the-srv))
+	       (fullpath (db:dbname->path apath dbname))
+	       (srvready (server-ready? ipaddr port fullpath)))
+	  (if srvready
+	      (begin
+		(hash-table-set! (rmt:remote-conns remote)
+				 dbname ;; fullpath ;; yes, I'd prefer it to be fullpath - FIXME later
+				 (make-rmt:conn
+				  apath:   apath
+				  dbname:  dbname
+				  fullname: fullpath
+				  hostport: srv-addr
+				  ipaddr: ipaddr
+				  port: port
+				  srvpkt: the-srv
+				  lastmsg: (current-seconds)
+				  expires: (+ (current-seconds) 60) ;; this needs to be gathered during the ping
+				  ))
+		#t)
+	      (start-main-srv)))
+	(start-main-srv))))
+
+;; NB// remote is a rmt:remote struct
+;;
+(define (rmt:general-open-connection remote apath dbname)
+  (let  ((mainconn (rmt:get-connection remote apath (db:run-id->dbname #f))))
+    (debug:print 0 *default-log-port* "remote: " remote)
+    (if (not mainconn)
+	(begin
+	  (rmt:open-main-connection remote apath)
+	  (thread-sleep! 1)
+	  (rmt:general-open-connection remote apath dbname))
+	;; we have a connection to main, ask for contact info for dbname
+	(let* ((res (rmt:send-receive mainconn "querykeyhere" 'get-server `(,apath ,dbname))))
+	  (print "rmt:general-open-connection got res="res)
+	  res))))
+	  
+
+;;======================================================================
+
+;; Defaults to 
+;;
+(define (rmt:send-receive cmd rid params #!key (attemptnum 1)(area-dat #f))
+  (if (not *rmt:remote*)(set! *rmt:remote* (make-rmt:remote)))
+  (let* ((apath *toppath*)
+	 (conns *rmt:remote*)
+	 (dbname (db:run-id->dbname rid)))
+    (rmt:send-receive-real conns apath dbname rid cmd params)))
+
+;; db is at apath/.db/dbname, rid is an intermediary solution and will be removed
+;; sometime in the future
+;;
+(define (rmt:send-receive-real remote apath dbname rid cmd params)
+  (let* ((conn (rmt:get-connection remote apath dbname)))
+    (assert conn "FATAL: Unable to connect to db "apath"/"dbname)
+    (let* (;; (host    (rmt:conn-ipaddr conn))
+	   ;; (port    (rmt:conn-port   conn))
+	   (payload (sexpr->string params))
+	   (res      (with-input-from-request
+		      (rmt:conn->uri conn "api") ;; (conc "http://"host":"port"/api")
+		      `((params . ,payload)
+			(cmd    . ,cmd)
+			(key    . "nokey"))
+		      read-string)))
+      (string->sexpr res))))
+
+;; db is at apath/.db/dbname, rid is an intermediary solution and will be removed
+;; sometime in the future
+;;
+(define (rmt:send-receive-server-start remote apath dbname)
+  (let* ((conn (rmt:get-connection remote apath dbname)))
+    (assert conn "FATAL: Unable to connect to db "apath"/"dbname)
+    (let* (;; (host    (rmt:conn-ipaddr conn))
+	   ;; (port    (rmt:conn-port   conn))
+	   ;; (payload (sexpr->string params))
+	   (res      (with-input-from-request
+		      (rmt:conn->uri conn "api") ;; (conc "http://"host":"port"/api")
+		      `((params . (,apath ,dbname))
+			;; (cmd    . ,cmd)
+			#;(key    . "nokey"))
+		      read-string)))
+      (string->sexpr res))))
+
+(define (rmt:print-db-stats)
+  (let ((fmtstr "~40a~7-d~9-d~20,2-f")) ;; "~20,2-f"
+    (debug:print 18 *default-log-port* "DB Stats\n========")
+    (debug:print 18 *default-log-port* (format #f "~40a~8a~10a~10a" "Cmd" "Count" "TotTime" "Avg"))
+    (for-each (lambda (cmd)
+		(let ((cmd-dat (hash-table-ref *db-stats* cmd)))
+		  (debug:print 18 *default-log-port* (format #f fmtstr cmd (vector-ref cmd-dat 0) (vector-ref cmd-dat 1) (/ (vector-ref cmd-dat 1)(vector-ref cmd-dat 0))))))
+	      (sort (hash-table-keys *db-stats*)
+		    (lambda (a b)
+		      (> (vector-ref (hash-table-ref *db-stats* a) 0)
+			 (vector-ref (hash-table-ref *db-stats* b) 0)))))))
+
+(define (rmt:get-max-query-average run-id)
+  (mutex-lock! *db-stats-mutex*)
+  (let* ((runkey (conc "run-id=" run-id " "))
+	 (cmds   (filter (lambda (x)
+			   (substring-index runkey x))
+			 (hash-table-keys *db-stats*)))
+	 (res    (if (null? cmds)
+		     (cons 'none 0)
+		     (let loop ((cmd (car cmds))
+				(tal (cdr cmds))
+				(max-cmd (car cmds))
+				(res 0))
+		       (let* ((cmd-dat (hash-table-ref *db-stats* cmd))
+			      (tot     (vector-ref cmd-dat 0))
+			      (curravg (/ (vector-ref cmd-dat 1) (vector-ref cmd-dat 0))) ;; count is never zero by construction
+			      (currmax (max res curravg))
+			      (newmax-cmd (if (> curravg res) cmd max-cmd)))
+			 (if (null? tal)
+			     (if (> tot 10)
+				 (cons newmax-cmd currmax)
+				 (cons 'none 0))
+			     (loop (car tal)(cdr tal) newmax-cmd currmax)))))))
+    (mutex-unlock! *db-stats-mutex*)
+    res))
+
+
+;;======================================================================
+;;
+;; A C T U A L   A P I   C A L L S  
+;;
+;;======================================================================
+
+;;======================================================================
+;;  S E R V E R
+;;======================================================================
+
+(define (rmt:kill-server run-id)
+  (rmt:send-receive 'kill-server run-id (list run-id)))
+
+(define (rmt:start-server run-id)
+  (rmt:send-receive 'start-server 0 (list run-id)))
+
+;;======================================================================
+;;  M I S C
+;;======================================================================
+
+(define (rmt:login run-id)
+  (rmt:send-receive 'login run-id (list *toppath* megatest-version *my-client-signature*)))
+
+;; rmt:login-no-auto-client-setup
+;; rmt:send-receive-no-auto-client-setup
+
+;; hand off a call to one of the db:queries statements
+;; added run-id to make looking up the correct db possible 
+;;
+(define (rmt:general-call stmtname run-id . params)
+  (rmt:send-receive 'general-call run-id (append (list stmtname run-id) params)))
+
+
+;; given a hostname, return a pair of cpu load and update time representing latest intelligence from tests running on that host
+(define (rmt:get-latest-host-load hostname)
+  (rmt:send-receive 'get-latest-host-load 0 (list hostname)))
+
+(define (rmt:sdb-qry qry val run-id)
+  ;; add caching if qry is 'getid or 'getstr
+  (rmt:send-receive 'sdb-qry run-id (list qry val)))
+
+;; NOT COMPLETED
+(define (rmt:runtests user run-id testpatt params)
+  (rmt:send-receive 'runtests run-id testpatt))
+
+(define (rmt:get-run-record-ids  target run keynames test-patt)
+  (rmt:send-receive 'get-run-record-ids #f (list target run keynames test-patt)))
+
+(define (rmt:get-changed-record-ids since-time)
+  (rmt:send-receive 'get-changed-record-ids #f (list since-time)) )
+
+(define (rmt:drop-all-triggers)
+     (rmt:send-receive 'drop-all-triggers #f '()))
+
+(define (rmt:create-all-triggers)
+     (rmt:send-receive 'create-all-triggers #f '()))
+
+;;======================================================================
+;;  T E S T   M E T A 
+;;======================================================================
+
+(define (rmt:get-tests-tags)
+  (rmt:send-receive 'get-tests-tags #f '()))
+
+;;======================================================================
+;;  K E Y S 
+;;======================================================================
+
+;; These require run-id because the values come from the run!
+;;
+(define (rmt:get-key-val-pairs run-id)
+  (rmt:send-receive 'get-key-val-pairs run-id (list run-id)))
+
+(define (rmt:get-keys)
+  (if *db-keys* *db-keys* 
+     (let ((res (rmt:send-receive 'get-keys #f '())))
+       (set! *db-keys* res)
+       res)))
+
+(define (rmt:get-keys-write) ;; dummy query to force server start
+  (let ((res (rmt:send-receive 'get-keys-write #f '())))
+    (set! *db-keys* res)
+    res))
+
+;; we don't reuse run-id's (except possibly *after* a db cleanup) so it is safe
+;; to cache the resuls in a hash
+;;
+(define (rmt:get-key-vals run-id)
+  (or (hash-table-ref/default *keyvals* run-id #f)
+      (let ((res (rmt:send-receive 'get-key-vals #f (list run-id))))
+        (hash-table-set! *keyvals* run-id res)
+        res)))
+
+(define (rmt:get-targets)
+  (rmt:send-receive 'get-targets #f '()))
+
+(define (rmt:get-target run-id)
+  (rmt:send-receive 'get-target run-id (list run-id)))
+
+(define (rmt:get-run-times runpatt targetpatt)
+  (rmt:send-receive 'get-run-times #f (list runpatt targetpatt ))) 
+
+
+;;======================================================================
+;;  T E S T S
+;;======================================================================
+
+;; Just some syntatic sugar
+(define (rmt:register-test run-id test-name item-path)
+  (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
+;;
+(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))
+      (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)))
+
+(define (rmt:test-get-rundir-from-test-id run-id test-id)
+  (rmt:send-receive 'test-get-rundir-from-test-id run-id (list run-id test-id)))
+
+;; (define (rmt:open-test-db-by-test-id run-id test-id #!key (work-area #f))
+;;   (let* ((test-path (if (string? work-area)
+;; 			work-area
+;; 			(rmt:test-get-rundir-from-test-id run-id test-id))))
+;;     (debug:print 3 *default-log-port* "TEST PATH: " test-path)
+;;     (open-test-db test-path)))
+
+;; WARNING: This currently bypasses the transaction wrapped writes system
+(define (rmt:test-set-state-status-by-id run-id test-id newstate newstatus newcomment)
+  (rmt:send-receive 'test-set-state-status-by-id run-id (list run-id test-id newstate newstatus newcomment)))
+
+(define (rmt:set-tests-state-status run-id                      testnames currstate currstatus newstate newstatus)
+  (rmt:send-receive 'set-tests-state-status run-id (list run-id testnames currstate currstatus newstate newstatus)))
+
+(define (rmt:get-tests-for-run run-id testpatt states statuses offset limit not-in sort-by sort-order qryvals last-update mode)
+  ;; (if (number? run-id)
+  (rmt:send-receive 'get-tests-for-run run-id (list run-id testpatt states statuses offset limit not-in sort-by sort-order qryvals last-update mode)))
+  ;;    (begin
+  ;;	(debug:print-error 0 *default-log-port* "rmt:get-tests-for-run called with bad run-id=" run-id)
+  ;;	(print-call-chain (current-error-port))
+  ;;	'())))
+
+(define (rmt:get-tests-for-run-state-status run-id testpatt last-update)
+  (rmt:send-receive 'get-tests-for-run-state-status run-id (list run-id testpatt last-update)))
+
+;; get stuff via synchash 
+(define (rmt:synchash-get run-id proc synckey keynum params)
+  (rmt:send-receive 'synchash-get run-id (list run-id proc synckey keynum params)))
+
+(define (rmt:get-tests-for-run-mindata run-id testpatt states status not-in)
+  (rmt:send-receive 'get-tests-for-run-mindata run-id (list run-id testpatt states status not-in)))
+  
+;; IDEA: Threadify these - they spend a lot of time waiting ...
+;;
+(define (rmt:get-tests-for-runs-mindata run-ids testpatt states status not-in)
+  (let ((multi-run-mutex (make-mutex))
+	(run-id-list (if run-ids
+			 run-ids
+			 (rmt:get-all-run-ids)))
+	(result      '()))
+    (if (null? run-id-list)
+	'()
+	(let loop ((hed     (car run-id-list))
+		   (tal     (cdr run-id-list))
+		   (threads '()))
+	  (if (> (length threads) 5)
+	      (loop hed tal (filter (lambda (th)(not (member (thread-state th) '(terminated dead)))) threads))
+	      (let* ((newthread (make-thread
+				 (lambda ()
+				   (let ((res (rmt:send-receive 'get-tests-for-run-mindata hed (list hed testpatt states status not-in))))
+				     (if (list? res)
+					 (begin
+					   (mutex-lock! multi-run-mutex)
+					   (set! result (append result res))
+					   (mutex-unlock! multi-run-mutex))
+					 (debug:print-error 0 *default-log-port* "get-tests-for-run-mindata failed for run-id " hed ", testpatt " testpatt ", states " states ", status " status ", not-in " not-in))))
+				 (conc "multi-run-thread for run-id " hed)))
+		     (newthreads (cons newthread threads)))
+		(thread-start! newthread)
+		(thread-sleep! 0.054) ;; give that thread some time to start
+		(if (null? tal)
+		    newthreads
+		    (loop (car tal)(cdr tal) newthreads))))))
+    result))
+
+;; ;; IDEA: Threadify these - they spend a lot of time waiting ...
+;; ;;
+;; (define (rmt:get-tests-for-runs-mindata run-ids testpatt states status not-in)
+;;   (let ((run-id-list (if run-ids
+;; 			 run-ids
+;; 			 (rmt:get-all-run-ids))))
+;;     (apply append (map (lambda (run-id)
+;; 			 (rmt:send-receive 'get-tests-for-run-mindata run-id (list run-ids testpatt states status not-in)))
+;; 		       run-id-list))))
+
+(define (rmt:delete-test-records run-id test-id)
+  (rmt:send-receive 'delete-test-records run-id (list run-id test-id)))
+
+(define (rmt:test-set-state-status run-id test-id state status msg)
+  (rmt:send-receive 'test-set-state-status run-id (list run-id test-id state status msg)))
+
+(define (rmt:test-toplevel-num-items run-id test-name)
+  (rmt:send-receive 'test-toplevel-num-items run-id (list run-id test-name)))
+
+;; (define (rmt:get-previous-test-run-record run-id test-name item-path)
+;;   (rmt:send-receive 'get-previous-test-run-record run-id (list run-id test-name item-path)))
+
+(define (rmt:get-matching-previous-test-run-records run-id test-name item-path)
+  (rmt:send-receive 'get-matching-previous-test-run-records run-id (list run-id test-name item-path)))
+
+(define (rmt:test-get-logfile-info run-id test-name)
+  (rmt:send-receive 'test-get-logfile-info run-id (list run-id test-name)))
+
+(define (rmt:test-get-records-for-index-file run-id test-name)
+  (rmt:send-receive 'test-get-records-for-index-file run-id (list run-id test-name)))
+
+(define (rmt:get-testinfo-state-status run-id test-id)
+  (rmt:send-receive 'get-testinfo-state-status run-id (list run-id test-id)))
+
+(define (rmt:test-set-log! run-id test-id logf)
+  (if (string? logf)(rmt:general-call 'test-set-log run-id logf test-id)))
+
+(define (rmt:test-set-top-process-pid run-id test-id pid)
+  (rmt:send-receive 'test-set-top-process-pid run-id (list run-id test-id pid)))
+
+(define (rmt:test-get-top-process-pid run-id test-id)
+  (rmt:send-receive 'test-get-top-process-pid run-id (list run-id test-id)))
+
+(define (rmt:get-run-ids-matching-target keynames target res runname testpatt statepatt statuspatt)
+  (rmt:send-receive 'get-run-ids-matching-target #f (list keynames target res runname testpatt statepatt statuspatt)))
+
+;; NOTE: This will open and access ALL run databases. 
+;;
+(define (rmt:test-get-paths-matching-keynames-target-new keynames target res testpatt statepatt statuspatt runname)
+  (let ((run-ids (rmt:get-run-ids-matching-target keynames target res runname testpatt statepatt statuspatt)))
+    (apply append 
+	   (map (lambda (run-id)
+		  (rmt:send-receive 'test-get-paths-matching-keynames-target-new run-id (list run-id keynames target res testpatt statepatt statuspatt runname)))
+	   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)
+  (rmt:send-receive 'get-count-tests-running-for-run-id run-id (list run-id)))
+
+(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)
+  (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)
+  (rmt:send-receive 'get-count-tests-running-in-jobgroup run-id (list run-id jobgroup)))
+
+;; state and status are extra hints not usually used in the calculation
+;;
+(define (rmt:set-state-status-and-roll-up-items run-id test-name item-path state status comment)
+  (rmt:send-receive 'set-state-status-and-roll-up-items run-id (list run-id test-name item-path state status comment)))
+
+(define (rmt:set-state-status-and-roll-up-run run-id state status)
+  (rmt:send-receive 'set-state-status-and-roll-up-run run-id (list run-id state status)))
+
+
+(define (rmt:update-pass-fail-counts run-id test-name)
+  (rmt:general-call 'update-pass-fail-counts run-id test-name test-name test-name))
+
+(define (rmt:top-test-set-per-pf-counts run-id test-name)
+  (rmt:send-receive 'top-test-set-per-pf-counts run-id (list run-id test-name)))
+
+(define (rmt:get-raw-run-stats run-id)
+  (rmt:send-receive 'get-raw-run-stats run-id (list run-id)))
+
+(define (rmt:get-test-times runname target)
+  (rmt:send-receive 'get-test-times #f (list runname target ))) 
+
+;;======================================================================
+;;  R U N S
+;;======================================================================
+
+(define (rmt:get-run-info run-id)
+  (rmt:send-receive 'get-run-info run-id (list run-id)))
+
+(define (rmt:get-num-runs runpatt)
+  (rmt:send-receive 'get-num-runs #f (list runpatt)))
+
+(define (rmt:get-runs-cnt-by-patt runpatt targetpatt keys)
+  (rmt:send-receive 'get-runs-cnt-by-patt #f (list runpatt  targetpatt keys)))
+
+;; Use the special run-id == #f scenario here since there is no run yet
+(define (rmt:register-run keyvals runname state status user contour)
+  (rmt:send-receive 'register-run #f (list keyvals runname state status user contour)))
+    
+(define (rmt:get-run-name-from-id run-id)
+  (rmt:send-receive 'get-run-name-from-id run-id (list run-id)))
+
+(define (rmt:delete-run run-id)
+  (rmt:send-receive 'delete-run run-id (list run-id)))
+
+(define (rmt:update-run-stats run-id stats)
+  (rmt:send-receive 'update-run-stats #f (list run-id stats)))
+
+(define (rmt:delete-old-deleted-test-records)
+  (rmt:send-receive 'delete-old-deleted-test-records #f '()))
+
+(define (rmt:get-runs runpatt count offset keypatts)
+  (rmt:send-receive 'get-runs #f (list runpatt count offset keypatts)))
+
+(define (rmt:simple-get-runs runpatt count offset target last-update)
+  (rmt:send-receive 'simple-get-runs #f (list runpatt count offset target last-update)))
+
+(define (rmt:get-all-run-ids)
+  (rmt:send-receive 'get-all-run-ids #f '()))
+
+(define (rmt:get-prev-run-ids run-id)
+  (rmt:send-receive 'get-prev-run-ids #f (list run-id)))
+
+(define (rmt:lock/unlock-run run-id lock unlock user)
+  (rmt:send-receive 'lock/unlock-run #f (list run-id lock unlock user)))
+
+;; set/get status
+(define (rmt:get-run-status run-id)
+  (rmt:send-receive 'get-run-status #f (list run-id)))
+
+(define (rmt:get-run-state run-id)
+  (rmt:send-receive 'get-run-state #f (list run-id)))
+
+(define (rmt:set-run-status run-id run-status #!key (msg #f))
+  (rmt:send-receive 'set-run-status #f (list run-id run-status msg)))
+
+(define (rmt:set-run-state-status run-id state status )
+  (rmt:send-receive 'set-run-state-status #f (list run-id state status)))
+
+(define (rmt:update-tesdata-on-repilcate-db old-lt new-lt)
+(rmt:send-receive 'update-tesdata-on-repilcate-db #f (list old-lt new-lt)))
+
+(define (rmt:update-run-event_time run-id)
+  (rmt:send-receive 'update-run-event_time #f (list run-id)))
+
+(define (rmt:get-runs-by-patt  keys runnamepatt targpatt offset limit fields last-runs-update  #!key  (sort-order "asc")) ;; fields of #f uses default
+  (rmt:send-receive 'get-runs-by-patt #f (list keys runnamepatt targpatt offset limit fields last-runs-update sort-order)))
+
+(define (rmt:find-and-mark-incomplete run-id ovr-deadtime)
+  ;; (if (rmt:send-receive 'have-incompletes? run-id (list run-id ovr-deadtime))
+  (rmt:send-receive 'mark-incomplete run-id (list run-id ovr-deadtime))
+  ) ;; )
+
+(define (rmt:get-main-run-stats run-id)
+  (rmt:send-receive 'get-main-run-stats #f (list run-id)))
+
+(define (rmt:get-var varname)
+  (rmt:send-receive 'get-var #f (list varname)))
+
+(define (rmt:del-var varname)
+  (rmt:send-receive 'del-var #f (list varname)))
+
+(define (rmt:set-var varname value)
+  (rmt:send-receive 'set-var #f (list varname value)))
+
+(define (rmt:inc-var varname)
+  (rmt:send-receive 'inc-var #f (list varname)))
+
+(define (rmt:dec-var varname)
+  (rmt:send-receive 'dec-var #f (list varname)))
+
+(define (rmt:add-var varname value)
+  (rmt:send-receive 'add-var #f (list varname value)))
+
+;;======================================================================
+;; M U L T I R U N   Q U E R I E S
+;;======================================================================
+
+;; Need to move this to multi-run section and make associated changes
+(define (rmt:find-and-mark-incomplete-all-runs #!key (ovr-deadtime #f))
+  (let ((run-ids (rmt:get-all-run-ids)))
+    (for-each (lambda (run-id)
+	       (rmt:find-and-mark-incomplete run-id ovr-deadtime))
+	     run-ids)))
+
+;; get the previous record for when this test was run where all keys match but runname
+;; returns #f if no such test found, returns a single test record if found
+;; 
+;; Run this at the client end since we have to connect to multiple run-id dbs
+;;
+(define (rmt:get-previous-test-run-record run-id test-name item-path)
+  (let* ((keyvals (rmt:get-key-val-pairs run-id))
+	 (keys    (rmt:get-keys))
+	 (selstr  (string-intersperse  keys ","))
+	 (qrystr  (string-intersperse (map (lambda (x)(conc x "=?")) keys) " AND ")))
+    (if (not keyvals)
+	#f
+	(let ((prev-run-ids (rmt:get-prev-run-ids run-id)))
+	  ;; for each run starting with the most recent look to see if there is a matching test
+	  ;; if found then return that matching test record
+	  (debug:print 4 *default-log-port* "selstr: " selstr ", qrystr: " qrystr ", keyvals: " keyvals ", previous run ids found: " prev-run-ids)
+	  (if (null? prev-run-ids) #f
+	      (let loop ((hed (car prev-run-ids))
+			 (tal (cdr prev-run-ids)))
+		(let ((results (rmt:get-tests-for-run hed (conc test-name "/" item-path) '() '() ;; run-id testpatt states statuses
+						      #f #f #f               ;; offset limit not-in hide/not-hide
+						      #f #f #f #f 'normal))) ;; sort-by sort-order qryvals last-update mode
+		  (debug:print 4 *default-log-port* "Got tests for run-id " run-id ", test-name " test-name ", item-path " item-path ": " results)
+		  (if (and (null? results)
+			   (not (null? tal)))
+		      (loop (car tal)(cdr tal))
+		      (if (null? results) #f
+			  (car results))))))))))
+
+(define (rmt:get-run-stats)
+  (rmt:send-receive 'get-run-stats #f '()))
+
+;;======================================================================
+;;  S T E P S
+;;======================================================================
+
+;; Getting steps is more complicated.
+;;
+;; If given work area 
+;;  1. Find the testdat.db file
+;;  2. Open the testdat.db file and do the query
+;; If not given the work area
+;;  1. Do a remote call to get the test path
+;;  2. Continue as above
+;; 
+;;(define (rmt:get-steps-for-test run-id test-id)
+;;  (rmt:send-receive 'get-steps-data run-id (list test-id)))
+
+(define (rmt:teststep-set-status! run-id test-id teststep-name state-in status-in comment logfile)
+  (let* ((state     (items:check-valid-items "state" state-in))
+	 (status    (items:check-valid-items "status" status-in)))
+    (if (or (not state)(not status))
+	(debug:print 3 *default-log-port* "WARNING: Invalid " (if status "status" "state")
+		     " value \"" (if status state-in status-in) "\", update your validvalues section in megatest.config"))
+    (rmt:send-receive 'teststep-set-status! run-id (list run-id test-id teststep-name state-in status-in comment logfile))))
+
+
+(define (rmt:delete-steps-for-test! run-id test-id)
+  (rmt:send-receive 'delete-steps-for-test! run-id (list run-id test-id)))
+
+(define (rmt:get-steps-for-test run-id test-id)
+  (rmt:send-receive 'get-steps-for-test run-id (list run-id test-id)))
+
+(define (rmt:get-steps-info-by-id test-step-id)
+  (rmt:send-receive 'get-steps-info-by-id #f (list test-step-id)))
+
+;;======================================================================
+;;  T E S T   D A T A 
+;;======================================================================
+
+(define (rmt:read-test-data run-id test-id categorypatt #!key (work-area #f)) 
+  (rmt:send-receive 'read-test-data run-id (list run-id test-id categorypatt)))
+
+(define (rmt:read-test-data-varpatt run-id test-id categorypatt varpatt #!key (work-area #f)) 
+  (rmt:send-receive 'read-test-data-varpatt run-id (list run-id test-id categorypatt varpatt)))
+
+(define (rmt:get-data-info-by-id test-data-id)
+   (rmt:send-receive 'get-data-info-by-id #f (list test-data-id)))
+
+(define (rmt:testmeta-add-record testname)
+  (rmt:send-receive 'testmeta-add-record #f (list testname)))
+
+(define (rmt:testmeta-get-record testname)
+  (rmt:send-receive 'testmeta-get-record #f (list testname)))
+
+(define (rmt:testmeta-update-field test-name fld val)
+  (rmt:send-receive 'testmeta-update-field #f (list test-name fld val)))
+
+(define (rmt:test-data-rollup run-id test-id status)
+  (rmt:send-receive 'test-data-rollup run-id (list run-id test-id status)))
+
+(define (rmt:csv->test-data run-id test-id csvdata)
+  (rmt:send-receive 'csv->test-data run-id (list run-id test-id csvdata)))
+
+;;======================================================================
+;;  T A S K S
+;;======================================================================
+
+(define (rmt:tasks-find-task-queue-records target run-name test-patt state-patt action-patt)
+  (rmt:send-receive 'find-task-queue-records #f (list target run-name test-patt state-patt action-patt)))
+
+(define (rmt:tasks-add action owner target runname testpatt params)
+  (rmt:send-receive 'tasks-add #f (list action owner target runname testpatt params)))
+
+(define (rmt:tasks-set-state-given-param-key param-key new-state)
+  (rmt:send-receive 'tasks-set-state-given-param-key #f (list  param-key new-state)))
+
+(define (rmt:tasks-get-last target runname)
+  (rmt:send-receive 'tasks-get-last #f (list target runname)))
+
+;;======================================================================
+;; N O   S Y N C   D B 
+;;======================================================================
+
+(define (rmt:no-sync-set var val)
+  (rmt:send-receive 'no-sync-set #f `(,var ,val)))
+
+(define (rmt:no-sync-get/default var default)
+  (rmt:send-receive 'no-sync-get/default #f `(,var ,default)))
+
+(define (rmt:no-sync-del! var)
+  (rmt:send-receive 'no-sync-del! #f `(,var)))
+
+(define (rmt:no-sync-get-lock keyname)
+  (rmt:send-receive 'no-sync-get-lock #f `(,keyname)))
+
+;;======================================================================
+;; A R C H I V E S
+;;======================================================================
+
+(define (rmt:archive-get-allocations  testname itempath dneeded)
+  (rmt:send-receive 'archive-get-allocations #f (list testname itempath dneeded)))
+
+(define (rmt:archive-register-block-name bdisk-id archive-path)
+  (rmt:send-receive 'archive-register-block-name #f (list bdisk-id archive-path)))
+
+(define (rmt:archive-allocate-testsuite/area-to-block block-id testsuite-name areakey)
+  (rmt:send-receive 'archive-allocate-test-to-block #f (list  block-id testsuite-name areakey)))
+
+(define (rmt:archive-register-disk bdisk-name bdisk-path df)
+  (rmt:send-receive 'archive-register-disk #f (list bdisk-name bdisk-path df)))
+
+(define (rmt:test-set-archive-block-id run-id test-id archive-block-id)
+  (rmt:send-receive 'test-set-archive-block-id run-id (list run-id test-id archive-block-id)))
+
+(define (rmt:test-get-archive-block-info archive-block-id)
+  (rmt:send-receive 'test-get-archive-block-info #f (list archive-block-id)))
+
+;; gets mtpg-run-id and syncs the record if different
+;;
+(define (tasks:run-id->mtpg-run-id dbh cached-info run-id area-info smallest-last-update-time)
+  (let* ((runs-ht (hash-table-ref cached-info 'runs))
+	 (runinf  (hash-table-ref/default runs-ht run-id #f))
+         (area-id (vector-ref area-info 0)))
+       (if runinf
+	runinf ;; already cached
+	(let* ((run-dat    (rmt:get-run-info run-id))               ;; NOTE: get-run-info returns a vector < row header >
+	       (run-name   (rmt:get-run-name-from-id run-id))
+	       (row        (db:get-rows run-dat))                   ;; yes, this returns a single row
+	       (header     (db:get-header run-dat))
+	       (state      (db:get-value-by-header row header "state"))
+	       (status     (db:get-value-by-header row header "status"))
+	       (owner      (db:get-value-by-header row header "owner"))
+	       (event-time (db:get-value-by-header row header "event_time"))
+	       (comment    (db:get-value-by-header row header "comment"))
+	       (fail-count (db:get-value-by-header row header "fail_count"))
+	       (pass-count (db:get-value-by-header row header "pass_count"))
+               (db-contour (db:get-value-by-header row header "contour"))
+	       (contour    (if (args:get-arg "-prepend-contour") 
+                                 (if (and db-contour (not (equal? db-contour ""))  (string? db-contour )) 
+                                           (begin 
+                                            (debug:print-info 10 *default-log-port*  "db-contour" db-contour) 
+ 						db-contour)
+					    (args:get-arg "-contour"))))
+               (run-tag (if (args:get-arg "-run-tag")
+                            (args:get-arg "-run-tag")
+									""))
+               (last-update (db:get-value-by-header row header "last_update"))
+	       (keytarg    (if (or (args:get-arg "-prepend-contour") (args:get-arg "-prefix-target"))
+	       			(conc "MT_CONTOUR/MT_AREA/" (string-intersperse (rmt:get-keys) "/")) (string-intersperse (rmt:get-keys) "/"))) ;; e.g. version/iteration/platform
+               (base-target      (rmt:get-target run-id))
+	       (target     (if (or (args:get-arg "-prepend-contour") (args:get-arg "-prefix-target")) 
+	       			(conc (or (args:get-arg "-prefix-target") (conc contour "/" (common:get-area-name) "/")) base-target) base-target))                 ;; e.g. v1.63/a3e1/ubuntu
+	       (spec-id    (pgdb:get-ttype dbh keytarg))
+	       (publish-time (if (args:get-arg "-cp-eventtime-to-publishtime")
+                            event-time
+                           (current-seconds))) 
+	       (new-run-id (if (and run-name base-target) (pgdb:get-run-id dbh spec-id target run-name area-id) #f)))
+         (if new-run-id
+	         (begin ;; let ((run-record (pgdb:get-run-info dbh new-run-id))
+		        (hash-table-set! runs-ht run-id new-run-id)
+		;; ensure key fields are up to date
+     ;; if last_update == pgdb_last_update do not update smallest-last-update-time  
+    (let* ((pgdb-last-update (pgdb:get-run-last-update dbh new-run-id))
+           (smallest-time (hash-table-ref/default smallest-last-update-time "smallest-time" #f)))
+     (if (and  (> last-update pgdb-last-update) (or (not smallest-time) (< last-update smallest-time)))
+        (hash-table-set! smallest-last-update-time "smallest-time" last-update)))
+		(pgdb:refresh-run-info
+		 dbh
+		 new-run-id
+		 state status owner event-time comment fail-count pass-count area-id last-update publish-time)
+     (debug:print-info 4 *default-log-port* "Working on run-id " run-id " pgdb-id "  new-run-id )
+     (if (not (equal? run-tag ""))
+      (task:add-run-tag dbh new-run-id run-tag))
+		new-run-id) 
+      
+	      (if (or (not state) (equal? state "deleted"))
+          (begin 
+          (debug:print-info 1 *default-log-port*  "Warning: Run with id " run-id " was created after previous sync and deleted before the sync") #f)
+          (if (handle-exceptions
+		        exn
+		        (begin (print-call-chain)
+              (print ((condition-property-accessor 'exn 'message) exn))     
+			      #f)
+            
+            (pgdb:insert-run
+		     dbh
+		     spec-id target run-name state status owner event-time comment fail-count pass-count  area-id last-update publish-time))
+		       (let* ((smallest-time (hash-table-ref/default smallest-last-update-time "smallest-time" #f)))
+             (if (or (not smallest-time) (< last-update smallest-time))
+        				(hash-table-set! smallest-last-update-time "smallest-time" last-update))
+             (tasks:run-id->mtpg-run-id dbh cached-info run-id area-info smallest-last-update-time))
+		  #f)))))))
+(define (tasks:sync-test-gen-data dbh cached-info test-data-ids smallest-last-update-time)
+  (let ((test-ht (hash-table-ref cached-info 'tests))
+        (data-ht (hash-table-ref cached-info 'data)))
+    (for-each
+     (lambda (test-data-id)
+        (let* ((test-data-info  (rmt:get-data-info-by-id test-data-id))
+               (data-id (db:test-data-get-id  test-data-info))
+               (test-id  (db:test-data-get-test_id   test-data-info))   
+	       (category  (db:test-data-get-category  test-data-info))
+	       (variable  (db:test-data-get-variable test-data-info))	
+	       (value (db:test-data-get-value  test-data-info))	
+               (expected (db:test-data-get-expected  test-data-info))
+               (tol (db:test-data-get-tol  test-data-info))
+               (units (db:test-data-get-units  test-data-info))     
+	       (comment  (db:test-data-get-comment test-data-info))	
+               (status (db:test-data-get-status test-data-info))	
+	       (type (db:test-data-get-type test-data-info))
+				 (last-update (db:test-data-get-last_update test-data-info))
+				 (smallest-time (hash-table-ref/default smallest-last-update-time "smallest-time" #f))
+   	
+	       (pgdb-test-id  (hash-table-ref/default test-ht test-id #f))
+               (pgdb-data-id (if pgdb-test-id 
+                                 (pgdb:get-test-data-id dbh pgdb-test-id category variable)
+                                  #f)))
+    (if data-id
+      (begin
+        (if pgdb-test-id
+           (begin 
+                (if  pgdb-data-id
+                   (begin
+                    (debug:print-info 4 *default-log-port*  "Updating existing test-data with test-id: " test-id " and  data-id " data-id " pgdb test id: " pgdb-test-id " pgdb data id " pgdb-data-id)
+                    (let* ((pgdb-last-update (pgdb:get-test-data-last-update dbh pgdb-data-id)))
+         (if (and  (>  last-update pgdb-last-update) (or (not smallest-time) (< last-update smallest-time)))
+        (hash-table-set! smallest-last-update-time "smallest-time" last-update))) 
+                    (pgdb:update-test-data dbh pgdb-data-id pgdb-test-id  category variable value expected tol units comment status type last-update))
+                    (begin
+ 		      (debug:print-info 4 *default-log-port*  "Inserting test-data with test-id: " test-id " and data-id " data-id " pgdb test id: " pgdb-test-id)
+                       (if (handle-exceptions
+		      exn
+		      (begin (print-call-chain)
+                              (print ((condition-property-accessor 'exn 'message) exn))     
+			#f)
+                     
+                    (pgdb:insert-test-data dbh pgdb-test-id category variable value expected tol units comment status type last-update))
+		       ;(tasks:run-id->mtpg-run-id dbh cached-info run-id area-info)
+                      (begin
+                      ;(pgdb:insert-test-data dbh pgdb-test-id category variable value expected tol units comment status type )
+											(if (or (not smallest-time) (< last-update smallest-time))
+        								(hash-table-set! smallest-last-update-time "smallest-time" last-update))
+                      (set! pgdb-data-id  (pgdb:get-test-data-id dbh pgdb-test-id  category variable)))
+		   #f)))
+                (hash-table-set! data-ht data-id pgdb-data-id ))
+             (begin
+                 (debug:print-info 1 *default-log-port*  "Error: Test not in pgdb"))))
+
+      (debug:print-info 1 *default-log-port*  "Error: Could not get test data info for data id " test-data-id ))))	;; this is a wierd senario need to debug      	
+   test-data-ids)))
+
+
+ (define (task:get-test-times)
+   (let* ((runname (if (args:get-arg "-runname")
+                        (args:get-arg "-runname")
+                        #f))
+           (target (if (args:get-arg "-target")
+                        (args:get-arg "-target")
+                        #f))
+ 
+           (test-times  (rmt:get-test-times  runname target )))
+   (if (not runname)
+      (begin
+      (print "Error: Missing argument -runname")
+      (exit))) 
+    (if (string-contains runname "%")
+      (begin
+      (print "Error: Invalid runname, '%' not allowed  (" runname ") ")
+      (exit)))
+    (if (not target)
+      (begin
+      (print "Error: Missing argument -target")
+      (exit)))
+     (if  (string-contains target "%")
+      (begin
+      (print "Error: Invalid target, '%' not allowed  (" target ") ")
+      (exit)))
+ 
+   (if (eq? (length test-times) 0)
+     (begin
+       (print "Data not found!!")
+       (exit)))
+   (if (equal? (args:get-arg "-dumpmode") "json")
+       (task:print-testtime-as-json test-times)
+         (if (equal? (args:get-arg "-dumpmode") "csv")
+	     (task:print-testtime test-times ",")
+	     (task:print-testtime test-times "  ")))))
+
+
+
+(define (tasks:sync-test-steps dbh cached-info test-step-ids smallest-last-update-time)
+ ; (print "Sync Steps " test-step-ids )
+  (let ((test-ht (hash-table-ref cached-info 'tests))
+        (step-ht (hash-table-ref cached-info 'steps)))
+    (for-each
+     (lambda (test-step-id)
+        (let* ((test-step-info  (rmt:get-steps-info-by-id test-step-id))
+               (step-id (tdb:step-get-id test-step-info))
+               (test-id  (tdb:step-get-test_id    test-step-info))   
+	       (stepname (tdb:step-get-stepname  test-step-info))
+	       (state (tdb:step-get-state test-step-info))	
+	       (status (tdb:step-get-status test-step-info))	
+	       (event_time (tdb:step-get-event_time  test-step-info))	
+	       (comment  (tdb:step-get-comment test-step-info))	
+	       (logfile (tdb:step-get-logfile test-step-info))	
+         (last-update (tdb:step-get-last_update test-step-info))
+	       (pgdb-test-id  (hash-table-ref/default test-ht test-id #f))
+				 (smallest-time (hash-table-ref/default smallest-last-update-time "smallest-time" #f))
+         (pgdb-step-id (if pgdb-test-id 
+                         (pgdb:get-test-step-id dbh pgdb-test-id stepname state)
+                          #f)))
+    (if step-id
+      (begin  
+        (if pgdb-test-id
+           (begin 
+                (if  pgdb-step-id
+                   (begin
+                    (debug:print-info 4 *default-log-port*  "Updating existing test-step with test-id: " test-id " and step-id " step-id " pgdb test id: " pgdb-test-id " pgdb step id " pgdb-step-id )
+										(let* ((pgdb-last-update (pgdb:get-test-step-last-update dbh pgdb-step-id)))
+         (if (and  (> last-update pgdb-last-update) (or (not smallest-time) (< last-update smallest-time)))
+        (hash-table-set! smallest-last-update-time "smallest-time" last-update))) 
+                    (pgdb:update-test-step dbh pgdb-step-id pgdb-test-id stepname state status event_time comment logfile last-update))
+                    (begin
+ 		      (debug:print-info 4 *default-log-port*  "Inserting test-step with test-id: " test-id " and step-id " step-id  " pgdb test id: " pgdb-test-id)
+                     (if (or (not smallest-time) (< last-update smallest-time))
+        				      (hash-table-set! smallest-last-update-time "smallest-time" last-update))
+                      (pgdb:insert-test-step dbh pgdb-test-id stepname state status event_time comment logfile last-update )
+                      (set! pgdb-step-id  (pgdb:get-test-step-id dbh pgdb-test-id stepname state))))
+                (hash-table-set! step-ht step-id pgdb-step-id ))
+           (debug:print-info 1 *default-log-port*  "Error: Test not cashed")))
+      (debug:print-info 1 *default-log-port*  "Error: Could not get test step info for step id " test-step-id ))))	;; this is a wierd senario need to debug      	
+   test-step-ids)))
+
+
+(define (tasks:sync-tests-data dbh cached-info test-ids area-info smallest-last-update-time)
+  (let ((test-ht (hash-table-ref cached-info 'tests)))
+    (for-each
+     (lambda (test-id)
+      ; (print test-id)
+       (let* ((test-info    (rmt:get-test-info-by-id #f test-id))
+	      (run-id       (db:test-get-run_id    test-info)) ;; look these up in db_records.scm
+	      (test-id      (db:test-get-id        test-info))
+	      (test-name    (db:test-get-testname  test-info))
+	      (item-path    (db:test-get-item-path test-info))
+	      (state        (db:test-get-state     test-info))
+	      (status       (db:test-get-status    test-info))
+	      (host         (db:test-get-host      test-info))
+        (pid          (db:test-get-process_id test-info)) 
+	      (cpuload      (db:test-get-cpuload   test-info))
+	      (diskfree     (db:test-get-diskfree  test-info))
+	      (uname        (db:test-get-uname     test-info))
+	      (run-dir      (db:test-get-rundir    test-info))
+	      (log-file     (db:test-get-final_logf test-info))
+	      (run-duration (db:test-get-run_duration test-info))
+	      (comment      (db:test-get-comment   test-info))
+	      (event-time   (db:test-get-event_time test-info))
+	      (archived     (db:test-get-archived  test-info))
+        (last-update  (db:test-get-last_update  test-info))
+	      (pgdb-run-id  (tasks:run-id->mtpg-run-id dbh cached-info run-id area-info smallest-last-update-time))
+        (smallest-time (hash-table-ref/default smallest-last-update-time "smallest-time" #f))       
+	      (pgdb-test-id (if pgdb-run-id 
+				(begin
+                                  ;(print pgdb-run-id)    
+                                 (pgdb:get-test-id dbh pgdb-run-id test-name item-path))
+                                 #f)))
+	 ;; "id"           "run_id"        "testname"  "state"      "status"      "event_time"
+	 ;; "host"         "cpuload"       "diskfree"  "uname"      "rundir"      "item_path"
+	 ;; "run_duration" "final_logf"    "comment"   "shortdir"   "attemptnum"  "archived"
+         (if (or (not item-path) (string-null? item-path))
+             (debug:print-info 0 *default-log-port* "Working on Run id : " run-id "and test name : " test-name)) 
+         (if pgdb-run-id
+           (begin
+	   (if pgdb-test-id ;; have a record
+	     (begin ;; let ((key-name (conc run-id "/" test-name "/" item-path)))
+	       (debug:print-info 4 *default-log-port*  "Updating existing test with run-id: " run-id " and test-id: " test-id " pgdb run id: " pgdb-run-id "  pgdb-test-id "  pgdb-test-id)
+         (let* ((pgdb-last-update (pgdb:get-test-last-update dbh pgdb-test-id)))
+         (if (and  (>  last-update pgdb-last-update) (or (not smallest-time) (< last-update smallest-time))) ;;if last-update is same as pgdb-last-update then it is safe to assume the records are identical and we can use a larger last update time.
+        (hash-table-set! smallest-last-update-time "smallest-time" last-update))) 
+	       (pgdb:update-test dbh pgdb-test-id pgdb-run-id test-name item-path state status host cpuload diskfree uname run-dir log-file run-duration comment event-time archived last-update pid))
+	     (begin 
+           (debug:print-info 4 *default-log-port*  "Inserting test with run-id: " run-id " and test-id: " test-id  " pgdb run id: " pgdb-run-id)
+           (pgdb:insert-test dbh pgdb-run-id test-name item-path state status host cpuload diskfree uname run-dir log-file run-duration comment event-time archived last-update pid)
+            (if (or (not smallest-time) (< last-update smallest-time))
+        				(hash-table-set! smallest-last-update-time "smallest-time" last-update))
+           (set! pgdb-test-id (pgdb:get-test-id dbh pgdb-run-id test-name item-path))))
+           (hash-table-set! test-ht test-id pgdb-test-id))
+           (debug:print-info 1 *default-log-port*  "WARNING: Skipping run with run-id:" run-id ". This run was created after privious sync and removed before this sync."))))
+     test-ids)))
+
+
+;; get runs changed since last sync
+;; (define (tasks:sync-test-data dbh cached-info area-info)
+;;   (let* ((
+
+(define (tasks:sync-to-postgres configdat dest)
+  (print "In sync")
+  (let* ((dbh         (pgdb:open configdat dbname: dest))
+	 (area-info   (pgdb:get-area-by-path dbh *toppath*))
+	 (cached-info (make-hash-table))
+	 (start       (current-seconds))
+   (test-patt   (if (args:get-arg "-testpatt")
+											(args:get-arg "-testpatt")
+                      "%"))
+   (target         (if (args:get-arg "-target")
+														 (args:get-arg "-target")
+													#f))
+    (run-name         (if (args:get-arg "-runname")
+														 (args:get-arg "-runname")
+													#f)))
+     (if (and target  (not run-name))
+       (begin
+					(print "Error: Provide runname")
+          (exit 1)))
+     (if (and (not target)  run-name)
+       (begin
+					(print "Error: Provide target")
+          (exit 1)))
+    ;(print "123")
+    ;(exit 1) 
+    (for-each (lambda (dtype)
+		(hash-table-set! cached-info dtype (make-hash-table)))
+	      '(runs targets tests steps data))
+    (hash-table-set! cached-info 'start start) ;; when done we'll set sync times to this
+    (if area-info
+	(let* ((last-sync-time (vector-ref area-info 3))
+	       (smallest-last-update-time  (make-hash-table))
+         (changed      (if (and target run-name)
+                            (rmt:get-run-record-ids target run-name (rmt:get-keys) test-patt)
+                            (rmt:get-changed-record-ids last-sync-time)))
+	       (run-ids        (alist-ref 'runs       changed))
+	       (test-ids       (alist-ref 'tests      changed))
+	       (test-step-ids  (alist-ref 'test_steps changed))
+	       (test-data-ids  (alist-ref 'test_data  changed))
+	       (run-stat-ids   (alist-ref 'run_stats  changed))
+         (area-tag    (if (args:get-arg "-area-tag") 
+                                 (args:get-arg "-area-tag")
+                                 (if (args:get-arg "-area") 
+                                   (args:get-arg "-area") 
+                                   ""))))
+           (if (and (equal? area-tag "") (not (pgdb:is-area-taged dbh (vector-ref area-info 0))))
+            (set! area-tag *default-area-tag*)) 
+           (if (not (equal? area-tag "")) 
+             (task:add-area-tag dbh area-info area-tag)) 
+	  (if (or (not (null? test-ids)) (not (null? run-ids)))
+	      (begin
+                (debug:print-info 0 *default-log-port*  "syncing runs")   
+	              (tasks:sync-run-data dbh cached-info run-ids area-info smallest-last-update-time) 
+                (debug:print-info 0 *default-log-port*  "syncing tests")
+		            (tasks:sync-tests-data dbh cached-info test-ids area-info smallest-last-update-time)
+                (debug:print-info 0 *default-log-port*  "syncing test steps")
+                (tasks:sync-test-steps dbh cached-info test-step-ids smallest-last-update-time)
+								(debug:print-info 0 *default-log-port*  "syncing test data")
+                (tasks:sync-test-gen-data dbh cached-info test-data-ids smallest-last-update-time)
+                (print "----------done---------------")))
+     (let*  ((smallest-time (hash-table-ref/default smallest-last-update-time "smallest-time" (current-seconds))))
+     (debug:print-info 0 "smallest-time :" smallest-time  " last-sync-time " last-sync-time)
+    (if (not (and target run-name)) 
+	  (if (or (and smallest-time (> smallest-time last-sync-time)) (and smallest-time (eq? last-sync-time 0)))
+				(pgdb:write-sync-time dbh area-info smallest-time))))) ;;this needs to be changed
+	(if (tasks:set-area dbh configdat)
+	    (tasks:sync-to-postgres configdat dest)
+	    (begin
+	      (debug:print 0 *default-log-port* "ERROR: unable to create an area record")
+	      #f)))))
+
+
+(define (tasks:sync-run-data dbh cached-info run-ids area-info smallest-last-update-time) 
+  (for-each
+     (lambda (run-id)
+      (debug:print-info 4 *default-log-port*   "Check if run with " run-id " needs to be synced" )
+       (tasks:run-id->mtpg-run-id dbh cached-info run-id area-info smallest-last-update-time))
+run-ids))
+
+;;======================================================================
+;; simple lock. improve and converge on this one.
+;;
+(define (common:simple-lock keyname)
+  (rmt:no-sync-get-lock keyname))
+
+(define (common:simple-unlock keyname #!key (force #f))
+  (rmt:no-sync-del! keyname))
+
+;;======================================================================
+;;  S T A T E   A N D   S T A T U S   F O R   T E S T S 
+;;======================================================================
+
+;; speed up for common cases with a little logic
+(define (mt:test-set-state-status-by-id run-id test-id newstate newstatus newcomment)
+  (if (not (and run-id test-id))
+      (begin
+	(debug:print-error 0 *default-log-port* "bad data handed to mt:test-set-state-status-by-id, run-id=" run-id ", test-id=" test-id ", newstate=" newstate)
+	(print-call-chain (current-error-port))
+	#f)
+      (begin
+	;; cond
+	;; ((and newstate newstatus newcomment)
+	;;  (rmt:general-call 'state-status-msg run-id newstate newstatus newcomment test-id))
+	;; ((and newstate newstatus)
+	;;  (rmt:general-call 'state-status run-id newstate newstatus test-id))
+	;; (else
+	;;  (if newstate   (rmt:general-call 'set-test-state   run-id newstate   test-id))
+	;;  (if newstatus  (rmt:general-call 'set-test-status  run-id newstatus  test-id))
+	;;  (if newcomment (rmt:general-call 'set-test-comment run-id newcomment test-id))))
+	(rmt:set-state-status-and-roll-up-items run-id test-id #f newstate newstatus newcomment)
+	;; (mt:process-triggers run-id test-id newstate newstatus)
+	#t)))
+
+
+(define (mt:test-set-state-status-by-id-unless-completed run-id test-id newstate newstatus newcomment)
+  (let* ((test-vec   (rmt:get-testinfo-state-status run-id test-id))
+         (state     (vector-ref test-vec 3)))
+    (if (equal? state "COMPLETED")
+        #t
+        (rmt:set-state-status-and-roll-up-items run-id test-id #f newstate newstatus newcomment))))
+
+  
+(define (mt:test-set-state-status-by-testname run-id test-name item-path new-state new-status new-comment)
+  ;(let ((test-id (rmt:get-test-id run-id test-name item-path)))
+  (rmt:set-state-status-and-roll-up-items run-id test-name item-path new-state new-status new-comment)
+  ;; (mt:process-triggers run-id test-id new-state new-status)
+  #t);)
+	;;(mt:test-set-state-status-by-id run-id test-id new-state new-status new-comment)))
+
+(define (mt:test-set-state-status-by-testname-unless-completed run-id test-name item-path new-state new-status new-comment)
+  (let ((test-id (rmt:get-test-id run-id test-name item-path)))
+    (mt:test-set-state-status-by-id-unless-completed run-id test-id new-state new-status new-comment)))
+
+;;======================================================================
+;;  R U N S
+;;======================================================================
+
+;; runs:get-runs-by-patt
+;; get runs by list of criteria
+;; register a test run with the db
+;;
+;; Use: (db-get-value-by-header (db:get-header runinfo)(db:get-rows runinfo))
+;;  to extract info from the structure returned
+;;
+(define (mt:get-runs-by-patt keys runnamepatt targpatt)
+  (let loop ((runsdat  (rmt:get-runs-by-patt keys runnamepatt targpatt 0 500 #f 0))
+	     (res      '())
+	     (offset   0)
+	     (limit    500))
+    ;; (print "runsdat: " runsdat)
+    (let* ((header    (vector-ref runsdat 0))
+	   (runslst   (vector-ref runsdat 1))
+	   (full-list (append res runslst))
+	   (have-more (eq? (length runslst) limit)))
+      ;; (debug:print 0 *default-log-port* "header: " header " runslst: " runslst " have-more: " have-more)
+      (if have-more 
+	  (let ((new-offset (+ offset limit))
+		(next-batch (rmt:get-runs-by-patt keys runnamepatt targpatt offset limit #f 0)))
+	    (debug:print-info 4 *default-log-port* "More than " limit " runs, have " (length full-list) " runs so far.")
+	    (debug:print-info 0 *default-log-port* "next-batch: " next-batch)
+	    (loop next-batch
+		  full-list
+		  new-offset
+		  limit))
+	 (vector header full-list)))))
+
+;;======================================================================
+;;  T E S T S
+;;======================================================================
+
+(define (mt:get-tests-for-run run-id testpatt states status #!key (not-in #t) (sort-by 'event_time) (sort-order "ASC") (qryvals #f)(last-update #f))
+  (let loop ((testsdat (rmt:get-tests-for-run run-id testpatt states status 0 500 not-in sort-by sort-order qryvals last-update 'normal))
+	     (res      '())
+	     (offset   0)
+	     (limit    500))
+    (let* ((full-list (append res testsdat))
+	   (have-more (eq? (length testsdat) limit)))
+      (if have-more 
+	  (let ((new-offset (+ offset limit)))
+	    (debug:print-info 4 *default-log-port* "More than " limit " tests, have " (length full-list) " tests so far.")
+	    (loop (rmt:get-tests-for-run run-id testpatt states status new-offset limit not-in sort-by sort-order qryvals last-update 'normal)
+		  full-list
+		  new-offset
+		  limit))
+	  full-list))))
+
+(define (mt:lazy-get-prereqs-not-met run-id waitons ref-item-path #!key (mode '(normal))(itemmaps #f) )
+  (let* ((key    (list run-id waitons ref-item-path mode))
+	 (res    (hash-table-ref/default *pre-reqs-met-cache* key #f))
+	 (useres (let ((last-time (if (vector? res) (vector-ref res 0) #f)))
+		   (if last-time
+		       (< (current-seconds)(+ last-time 5))
+		       #f))))
+    (if useres
+	(let ((result (vector-ref res 1)))
+	  (debug:print 4 *default-log-port* "Using lazy value res: " result)
+	  result)
+	(let ((newres (rmt:get-prereqs-not-met run-id waitons ref-item-path mode: mode itemmaps: itemmaps)))
+	  (hash-table-set! *pre-reqs-met-cache* key (vector (current-seconds) newres))
+	  newres))))
+
+;;======================================================================
+;; from metadat lookup MEGATEST_VERSION
+;;
+(define (common:get-last-run-version) ;; RADT => How does this work in send-receive function??; assume it is the value saved in some DB
+  (rmt:get-var "MEGATEST_VERSION"))
+
+(define (common:get-last-run-version-number)
+  (string->number 
+   (substring (common:get-last-run-version) 0 6)))
+
+(define (common:set-last-run-version)
+  (rmt:set-var "MEGATEST_VERSION" (common:version-signature)))
+
+;;======================================================================
+;; faux-lock is deprecated. Please use simple-lock below
+;;
+(define (common:faux-lock keyname #!key (wait-time 8)(allow-lock-steal #t))
+  (if (rmt:no-sync-get/default keyname #f) ;; do not be tempted to compare to pid. locking is a one-shot action, if already locked for this pid it doesn't actually count
+      (if (> wait-time 0)
+	  (begin
+	    (thread-sleep! 1)
+	    (if (eq? wait-time 1) ;; only one second left, steal the lock
+		(begin
+		  (debug:print-info 0 *default-log-port* "stealing lock for " keyname)
+		  (common:faux-unlock keyname force: #t)))
+	    (common:faux-lock keyname wait-time: (- wait-time 1)))
+	  #f)
+      (begin
+        (rmt:no-sync-set keyname (conc (current-process-id)))
+        (equal? (conc (current-process-id)) (conc (rmt:no-sync-get/default keyname #f))))))
+
+(define (common:faux-unlock keyname #!key (force #f))
+  (if (or force (equal? (conc (current-process-id)) (conc (rmt:no-sync-get/default keyname #f))))
+      (begin
+        (if (rmt:no-sync-get/default keyname #f) (rmt:no-sync-del! keyname))
+        #t)
+      #f))
+
+;;======================================================================
+;; postive number if megatest version > db version
+;; negative number if megatest version < db version
+(define (common:version-db-delta)
+  (- megatest-version (common:get-last-run-version-number)))
+
+(define (common:version-changed?)
+  (not (equal? (common:get-last-run-version)
+               (common:version-signature))))
+
+(define (common:api-changed?)
+  (not (equal? (substring (->string megatest-version) 0 4)
+               (substring (conc (common:get-last-run-version)) 0 4))))
+
+;;======================================================================
+;; Move me elsewhere ...
+;; RADT => Why do we meed the version check here, this is called only if version misma
+;;
+#;(define (common:cleanup-db dbstruct #!key (full #f))
+  (apply db:multi-db-sync 
+   dbstruct
+   'schema
+   ;; 'new2old
+   'killservers
+   'adj-target
+   ;; 'old2new
+   'new2old
+   ;; (if full
+       '(dejunk)
+       ;; '())
+       )
+  (if (common:api-changed?)
+      (common:set-last-run-version)))
+
+;; This login does no retries under the hood - it acts a bit like a ping.
+;; Deprecated for nmsg-transport.
+;;
+;; (define (rmt:login-no-auto-client-setup connection-info)
+;;   (rmt:send-receive-no-auto-client-setup connection-info 'login 0 (list *toppath* megatest-version *my-client-signature*)))
+
+(define (std-exit-procedure)
+  ;;(common:telemetry-log-close)
+  (on-exit (lambda () 0))
+  ;;(debug:print-info 13 *default-log-port* "std-exit-procedure called; *time-to-exit*="*time-to-exit*)
+  (let ((no-hurry  (if (bdat-time-to-exit *bdat*) ;; hurry up
+		       #f
+		       (begin
+			 (bdat-time-to-exit-set! *bdat* #t)
+			 #t))))
+    (debug:print-info 4 *default-log-port* "starting exit process, finalizing databases.")
+    (if (and no-hurry (debug:debug-mode 18))
+	(rmt:print-db-stats))
+    (let ((th1 (make-thread (lambda () ;; thread for cleaning up, give it five seconds
+                              (if *dbstruct-db* (db:close-all *dbstruct-db*)) ;; one second allocated
+			      (if *server-info*
+				  (let ((pkt-file (conc (get-pkts-dir *toppath*)
+							"/" (servdat-uuid *server-info*)
+							".pkt"))
+					(dbfile   (servdat-dbfile *server-info*)))
+				    (debug:print-info 0 *default-log-port* "removing pkt "pkt-file)
+				    (delete-file* pkt-file)
+				    (if (and dbfile
+					     (string-match ".*/main.db$" dbfile))
+					(begin
+					  (debug:print-info 0 *default-log-port* "Releasing lock for "dbfile)
+					  (db:with-lock-db (servdat-dbfile *server-info*)
+							   (lambda (dbh dbfile)
+							     (db:release-lock dbh dbfile)))))))
+			      (if (bdat-task-db *bdat*)    ;; TODO: Check that this is correct for task db
+				  (let ((db (cdr (bdat-task-db *bdat*))))
+				    (if (sqlite3:database? db)
+					(begin
+					  (sqlite3:interrupt! db)
+					  (sqlite3:finalize! db #t)
+					  (bdat-task-db-set! *bdat* #f)))))
+                              (http-client#close-idle-connections!)
+                              (if (not (eq? *default-log-port* (current-error-port)))
+                                  (close-output-port *default-log-port*))
+			      (set! *default-log-port* (current-error-port))) "Cleanup db exit thread"))
+	  (th2 (make-thread (lambda ()
+			      (debug:print 4 *default-log-port* "Attempting clean exit. Please be patient and wait a few seconds...")
+			      (if no-hurry
+                                  (begin
+                                    (thread-sleep! 5)) ;; give the clean up few seconds to do it's stuff
+                                  (begin
+      				  (thread-sleep! 2)))
+      			      (debug:print 4 *default-log-port* " ... done")
+      			      )
+			    "clean exit")))
+      (thread-start! th1)
+      (thread-start! th2)
+      (thread-join! th1)
+      )
+    )
+
+  0)
+
+;;======================================================================
+;; Force a megatest cleanup-db if version is changed and skip-version-check not specified
+;; Do NOT check if not on homehost!
+;;
+#;(define (common:exit-on-version-changed)
+  (if (common:on-homehost?)
+      (if (common:api-changed?)
+	  (let* ((mtconf (conc (get-environment-variable "MT_RUN_AREA_HOME") "/megatest.config"))
+                (dbfile  (conc (get-environment-variable "MT_RUN_AREA_HOME") "/megatest.db"))
+                (read-only (not (file-writable? dbfile)))
+                (dbstruct (db:setup #t)))
+	    (debug:print 0 *default-log-port*
+			 "WARNING: Version mismatch!\n"
+			 "   expected: " (common:version-signature) "\n"
+			 "   got:      " (common:get-last-run-version))
+            (cond
+             ((get-environment-variable "MT_SKIP_DB_MIGRATE") #t)
+             ((and (common:file-exists? mtconf) (common:file-exists? dbfile) (not read-only)
+                   (eq? (current-user-id)(file-owner mtconf))) ;; safe to run -cleanup-db
+              (debug:print 0 *default-log-port* "   I see you are the owner of megatest.config, attempting to cleanup and reset to new version")
+              (handle-exceptions
+               exn
+               (begin
+                 (debug:print 0 *default-log-port* "Failed to switch versions. exn=" exn)
+                 (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
+                 (print-call-chain (current-error-port))
+                 (exit 1))
+               (common:cleanup-db dbstruct)))
+             ((not (common:file-exists? mtconf))
+              (debug:print 0 *default-log-port* "   megatest.config does not exist in this area.  Cannot proceed with megatest version migration.")
+              (exit 1))
+             ((not (common:file-exists? dbfile))
+              (debug:print 0 *default-log-port* "   megatest.db does not exist in this area.  Cannot proceed with megatest version migration.")
+              (exit 1))
+             ((not (eq? (current-user-id)(file-owner mtconf)))
+              (debug:print 0 *default-log-port* "   You do not own megatest.db in this area.  Cannot proceed with megatest version migration.")
+              (exit 1))
+             (read-only
+              (debug:print 0 *default-log-port* "   You have read-only access to this area.  Cannot proceed with megatest version migration.")
+              (exit 1))
+             (else
+              (debug:print 0 *default-log-port* " to switch versions you can run: \"megatest -cleanup-db\"")
+              (exit 1)))))))
+;;======================================================================
+;;      (begin
+;;	(debug:print 0 *default-log-port* "ERROR: cannot migrate version unless on homehost. Exiting.")
+;;	(exit 1))))
+
+(define (common:run-sync?)
+    ;; (and (common:on-homehost?)
+  (args:get-arg "-server"))
+
+
+
+
+;; this one seems to be the general entry point
+;;
+(define (server:start-and-wait areapath #!key (timeout 60))
+  (let ((give-up-time (+ (current-seconds) timeout)))
+    (let loop ((server-info (server:check-if-running areapath))
+	       (try-num    0))
+      (if (or server-info
+	      (> (current-seconds) give-up-time)) ;; server-url will be #f if no server available.
+	  (server:record->url server-info)
+	  (let ((num-ok (length (server:get-best (server:get-list areapath)))))
+	    (if (and (> try-num 0)  ;; first time through simply wait a little while then try again
+		     (< num-ok 1))  ;; if there are no decent candidates for servers then try starting a new one
+		(server:kind-run areapath))
+	    (thread-sleep! 5)
+	    (loop (server:check-if-running areapath)
+		  (+ try-num 1)))))))
+
+;; called in megatest.scm, host-port is string hostname:port
+;;
+;; NOTE: This is NOT called directly from clients as not all transports support a client running
+;;       in the same process as the server.
+;;
+(define (server:ping host port server-id #!key (do-exit #f))
+  (let* ((sdat       (servdat-init #f host port server-id)))
+    (rmt:send-receive sdat 'ping '())))
+
+;; ping the given server
+;;
+(define (server:check-server server-record)
+  (let* ((server-url (server:record->url server-record))
+         (server-id (server:record->id server-record)) 
+         (res       (server:ping server-url server-id)))
+    (if res
+        server-url
+	#f)))
+
+;; no longer care if multiple servers are started by accident. older
+;; servers will drop off in time.
+;;
+(define (server:check-if-running areapath) ;;  #!key (numservers "2"))
+  (let* ((ns            (server:get-num-servers))
+	 (servers       (server:get-best (server:get-list areapath))))
+    (if (or (and servers
+		 (null? servers))
+	    (not servers)
+	    (and (list? servers)
+		 (< (length servers) (pseudo-random-integer ns)))) ;; somewhere between 0 and numservers
+        #f
+        (let loop ((hed (car servers))
+                   (tal (cdr servers)))
+          (let ((res (server:check-server hed)))
+            (if res
+                hed
+                (if (null? tal)
+                    #f
+                    (loop (car tal)(cdr tal)))))))))
+
+;; kind start up of servers, wait 40 seconds before allowing another server for a given
+;; run-id to be launched
+;;
+(define (server:kind-run areapath)
+  ;; look for $MT_RUN_AREA_HOME/logs/server-start-last
+  ;; and wait for it to be at least 3 seconds old
+  ;; (server:wait-for-server-start-last-flag areapath)
+  (if (not (server:check-if-running areapath)) ;; why try if there is already a server running?
+      (let* ((last-run-dat (hash-table-ref/default *server-kind-run* areapath '(0 0))) ;; callnum, whenrun
+	     (call-num     (car last-run-dat))
+	     (when-run     (cadr last-run-dat))
+	     (run-delay    (+ (case call-num
+				((0)    0)
+				((1)   20)
+				((2)  300)
+				(else 600))
+			      (pseudo-random-integer 5)))   ;; add a small random number just in case a lot of jobs hit the work hosts simultaneously
+	     (lock-file    (conc areapath "/logs/server-start.lock")))
+	(if	(> (- (current-seconds) when-run) run-delay)
+		(let* ((start-flag (conc areapath "/logs/server-start-last")))
+		  (common:simple-file-lock-and-wait lock-file expire-time: 15)
+                  (debug:print-info  0 *default-log-port* "server:kind-run: touching " start-flag)
+		  (system (conc "touch " start-flag)) ;; lazy but safe
+		  (server:run areapath)
+		  (thread-sleep! 2) ;; don't release the lock for at least a few seconds
+		  (common:simple-file-release-lock lock-file)))
+	(hash-table-set! *server-kind-run* areapath (list (+ call-num 1)(current-seconds))))))
+
+#;(define (client:connect iface port)
+  (http-transport:client-connect iface port)
+  #;(case (server:get-transport)
+    ((rpc)  (rpc:client-connect  iface port))
+    ((http) (http:client-connect iface port))
+    ((zmq)  (zmq:client-connect  iface port))
+    (else   (rpc:client-connect  iface port))))
+
+(define (client:setup areapath #!key (remaining-tries 100) (failed-connects 0))
+  (print "got here")
+  ;; (client:setup-http areapath remaining-tries: remaining-tries failed-connects: failed-connects)
+  #;(case (server:get-transport)
+    ((rpc) (rpc-transport:client-setup remaining-tries: remaining-tries failed-connects: failed-connects)) ;;(client:setup-rpc run-id))
+    ((http)(client:setup-http areapath remaining-tries: remaining-tries failed-connects: failed-connects))
+    (else  (rpc-transport:client-setup remaining-tries: remaining-tries failed-connects: failed-connects)))) ;; (client:setup-rpc run-id))))
+
+;; Do all the connection work, look up the transport type and set up the
+;; connection if required.
+;;
+;; There are two scenarios. 
+;;   1. We are a test manager and we received *transport-type* and *runremote* via cmdline
+;;   2. We are a run tests, list runs or other interactive process and we must figure out
+;;      *transport-type* and *runremote* from the monitor.db
+;;
+;; client:setup
+;;
+;; lookup_server, need to remove *runremote* stuff
+;;
+
+#;(define (client:setup-http areapath #!key (remaining-tries 100) (failed-connects 0)(area-dat #f))
+  (debug:print-info 2 *default-log-port* "client:setup remaining-tries=" remaining-tries)
+  (server:start-and-wait areapath)
+  (if (<= remaining-tries 0)
+      (begin
+	(debug:print-error 0 *default-log-port* "failed to start or connect to server")
+	(exit 1))
+      ;;
+      ;; Alternatively here, we can get the list of candidate servers and work our way
+      ;; through them searching for a good one.
+      ;;
+      (let* ((server-dat (server:get-rand-best areapath)) ;; (server:get-first-best areapath))
+	     (runremote  (or area-dat *runremote*)))
+	(if (not server-dat) ;; no server found
+	    (client:setup-http areapath remaining-tries: (- remaining-tries 1))
+	    (let ((host  (cadr  server-dat))
+		  (port  (caddr server-dat))
+                  (server-id (caddr (cddr server-dat))))
+	      (debug:print-info 4 *default-log-port* "client:setup server-dat=" server-dat ", remaining-tries=" remaining-tries)
+	      (if (and (not area-dat)
+		       (not *runremote*))
+                  (begin       
+		    (set! *runremote* (make-and-init-remote))
+                    (let* ((server-info (remote-server-info *runremote*))) 
+                      (if server-info
+                        (begin
+                          (remote-server-url-set! *runremote* (server:record->url server-info))
+                          (remote-server-id-set! *runremote* (server:record->id server-info)))))))
+	      (if (and host port server-id)
+		  (let* ((start-res (case *transport-type*
+				      ((http)(http-transport:client-connect host port server-id))))
+			 (ping-res  (case *transport-type* 
+				      ((http)(rmt:login-no-auto-client-setup start-res)))))
+		    (if (and start-res
+			     ping-res)
+			(let ((runremote (or area-dat *runremote*))) ;; it might have been generated only a few statements ago
+			  (remote-conndat-set! runremote start-res) ;; (hash-table-set! runremote run-id start-res)
+			  (debug:print-info 2 *default-log-port* "connected to " (http-transport:server-dat-make-url start-res))
+			  start-res)
+			(begin    ;; login failed but have a server record, clean out the record and try again
+			  (debug:print-info 0 *default-log-port* "client:setup, login unsuccessful, will attempt to start server ... start-res=" start-res ", server-dat=" server-dat) ;; had runid.  Fixes part of Randy;s ticket 1405717332
+			  (case *transport-type* 
+			    ((http)(http-transport:close-connections)))
+			  (remote-conndat-set! runremote #f)  ;; (hash-table-delete! runremote run-id)
+			  (thread-sleep! 1)
+			  (client:setup-http areapath remaining-tries: (- remaining-tries 1))
+			  )))
+		  (begin    ;; no server registered
+		    ;; (server:kind-run areapath)
+		    (server:start-and-wait areapath)
+		    (debug:print-info 0 *default-log-port* "client:setup, no server registered, remaining-tries=" remaining-tries)
+		    (thread-sleep! 1) ;; (+ 5 (pseudo-random-integer (- 20 remaining-tries))))  ;; give server a little time to start up, randomize a little to avoid start storms.
+		    (client:setup-http areapath remaining-tries: (- remaining-tries 1)))))))))
+
 )

DELETED runconfig.scm
Index: runconfig.scm
==================================================================
--- runconfig.scm
+++ /dev/null
@@ -1,164 +0,0 @@
-;;  Copyright 2006-2017, Matthew Welland.
-;; 
-;; This file is part of Megatest.
-;; 
-;;     Megatest is free software: you can redistribute it and/or modify
-;;     it under the terms of the GNU General Public License as published by
-;;     the Free Software Foundation, either version 3 of the License, or
-;;     (at your option) any later version.
-;; 
-;;     Megatest is distributed in the hope that it will be useful,
-;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;     GNU General Public License for more details.
-;; 
-;;     You should have received a copy of the GNU General Public License
-;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
-
-;;======================================================================
-;; read a config file, loading only the section pertinent
-;; to this run field1val/field2val/field3val ...
-;;======================================================================
-
-(use format directory-utils)
-
-(declare (unit runconfig))
-(declare (uses common))
-
-(include "common_records.scm")
-
-(define (runconfig:read fname target environ-patt)
-  (let ((ht (make-hash-table)))
-    (if target (hash-table-set! ht target '()))
-    (read-config fname ht #t environ-patt: environ-patt sections: (if target (list "default" target) #f))))
-
-;; NB// to process a runconfig ensure to use environ-patt with target!
-;;
-(define (setup-env-defaults fname run-id already-seen keyvals #!key (environ-patt #f)(change-env #t))
-  (let* ((keys    (map car keyvals))
-	 (thekey  (if keyvals 
-		      (string-intersperse (map (lambda (x)(if x x "-na-")) (map cadr keyvals)) "/")
-		      (or (common:args-get-target)
-			  (get-environment-variable "MT_TARGET")
-			  (begin
-			    (debug:print-error 0 *default-log-port* "setup-env-defaults called with no run-id or -target or -reqtarg")
-			    "nothing matches this I hope"))))
-	 ;; Why was system disallowed in the reading of the runconfigs file?
-	 ;; NOTE: Should be setting env vars based on (target|default)
-	 (confdat   (runconfig:read fname thekey environ-patt))
-	 (whatfound (make-hash-table))
-	 (finaldat  (make-hash-table))
-	 (sections (list "default" thekey)))
-    (if (not *target*)(set! *target* thekey)) ;; may save a db access or two but repeats db:get-target code
-    (debug:print 4 *default-log-port* "Using key=\"" thekey "\"")
-
-    (if change-env
-	(for-each ;; NB// This can be simplified with new content of keyvals having all that is needed.
-	 (lambda (keyval)
-	   (safe-setenv (car keyval)(cadr keyval)))
-	 keyvals))
-	
-    (for-each 
-     (lambda (section)
-       (let ((section-dat (hash-table-ref/default confdat section #f)))
-	 (if section-dat
-	     (for-each 
-	      (lambda (envvar)
-		(let ((val (cadr (assoc envvar section-dat))))
-		(hash-table-set! whatfound section (+ (hash-table-ref/default whatfound section 0) 1))
-		(if (and (string? envvar)
-			 (string? val)
-			 change-env)
-		    (safe-setenv envvar val))
-		(hash-table-set! finaldat envvar val)))
-	      (map car section-dat)))))
-     sections)
-    (if already-seen
-	(begin
-	  (debug:print 2 *default-log-port* "Key settings found in runconfigs.config:")
-	  (for-each (lambda (fullkey)
-		      (debug:print 2 *default-log-port* (format #f "~20a ~a\n" fullkey (hash-table-ref/default whatfound fullkey 0))))
-		    sections)
-	  (debug:print 2 *default-log-port* "---")
-	  (set! *already-seen-runconfig-info* #t)))
-    ;; finaldat ;; was returning this "finaldat" which would be good but conflicts with other uses
-    confdat
-    ))
-
-(define (set-run-config-vars run-id keyvals targ-from-db)
-  (push-directory *toppath*) ;; the push/pop doesn't appear to do anything ...
-  (let ((runconfigf (conc  *toppath* "/runconfigs.config"))
-	(targ       (or (common:args-get-target)
-			targ-from-db
-			(get-environment-variable "MT_TARGET"))))
-    (pop-directory)
-    (if (common:file-exists? runconfigf)
-	(setup-env-defaults runconfigf run-id #t keyvals
-			    environ-patt: (conc "(default"
-						(if targ
-						    (conc "|" targ ")")
-						    ")")))
-	(debug:print 0 *default-log-port* "WARNING: You do not have a run config file: " runconfigf))))
-
-;; given (a (b c) d) return ((a b d)(a c d))
-;; NOTE: this feels like it has been done before - perhaps with items handling?
-;;
-(define (runconfig:combinations inlst)
-  (let loop ((hed (car inlst))
-	     (tal (cdr inlst))
-	     (res '()))
-    ;; (print "res: " res " hed: " hed)
-    (if (list? hed)
-	(let ((newres (if (null? res) ;; first time through convert incoming items to list of items
-			  (map list hed)
-			  (apply append
-				 (map (lambda (r)  ;; iterate over items in res
-					(map (lambda (h) ;; iterate over items in hed
-					       (append r (list h)))
-					     hed))
-				      res)))))
-	  ;; (print "newres1: " newres)
-	  (if (null? tal)
-	      newres
-	      (loop (car tal)(cdr tal) newres)))
-	(let ((newres (if (null? res)
-			  (list (list hed))
-			  (map (lambda (r)
-				 (append r (list hed)))
-			       res))))
-	  ;; (print "newres2: " newres)
-	  (if (null? tal)
-	      newres
-	      (loop (car tal)(cdr tal) newres))))))
-
-;; multi-part expand
-;; Given a/b,c,d/e,f return a/b/e a/b/f a/c/e a/c/f a/d/e a/d/f
-;;
-(define (runconfig:expand target)
-  (let* ((parts (map (lambda (x)
-		       (string-split x ","))
-		     (string-split target "/"))))
-    (map (lambda (x)
-	   (string-intersperse x "/"))
-	 (runconfig:combinations parts))))
-
-;; multi-target expansion
-;; a/b/c/x,y,z a/b/d/x,y => a/b/c/x a/b/c/y a/b/c/z a/b/d/x a/b/d/y
-;; 
-(define (runconfig:expand-target target-strs)
-  (delete-duplicates
-   (apply append (map runconfig:expand (string-split target-strs " ")))))
-
-#|
-  (if (null? target-strs)
-      '()
-      (let loop ((hed (car target-strs))
-		 (tal (cdr target-strs))
-		 (res '()))
-	;; first break all parts into individual target patterns
-	(if (string-index hed " ") ;; this is a multi-target target
-	    (let ((newres (append (string-split hed " ") res)))
-	      (runconfig:expand-target newres))
-	    (if (string-index hed ",") ;; this is a multi-target where one or more parts are comma separated
-		  
-|#

DELETED runs-launch-loop-test.scm
Index: runs-launch-loop-test.scm
==================================================================
--- runs-launch-loop-test.scm
+++ /dev/null
@@ -1,76 +0,0 @@
-;;  Copyright 2006-2017, Matthew Welland.
-;; 
-;; This file is part of Megatest.
-;; 
-;;     Megatest is free software: you can redistribute it and/or modify
-;;     it under the terms of the GNU General Public License as published by
-;;     the Free Software Foundation, either version 3 of the License, or
-;;     (at your option) any later version.
-;; 
-;;     Megatest is distributed in the hope that it will be useful,
-;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;     GNU General Public License for more details.
-;; 
-;;     You should have received a copy of the GNU General Public License
-;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
-;;
-(use srfi-69)
-
-(define (runs:queue-next-hed tal reg n regful)
-  (if regful
-      (car reg)
-      (car tal)))
-
-(define (runs:queue-next-tal tal reg n regful)
-  (if regful
-      tal
-      (let ((newtal (cdr tal)))
-	(if (null? newtal)
-	    reg
-	    newtal
-	    ))))
-
-(define (runs:queue-next-reg tal reg n regful)
-  (if regful
-      (cdr reg)
-      (if (eq? (length tal) 1)
-	  '()
-	  reg)))
-
-(use trace)
-(trace runs:queue-next-hed
-       runs:queue-next-tal
-       runs:queue-next-reg)
-
-
-(define tests '(1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20))
-
-(define test-registry (make-hash-table))
-
-(define n 3)
-
-(let loop ((hed   (car tests))
-           (tal   (cdr tests))
-           (reg   '()))
-  (let* ((reglen (length reg))
-	 (regful (> reglen n)))
-    (print "hed=" hed ", length reg=" (length reg) ", (> lenreg n)=" (> (length reg) n))
-    (let ((newtal (append tal (list hed)))) ;; used if we are not done with this test
-      (cond
-       ((not (hash-table-ref/default test-registry hed #f))
-	(hash-table-set! test-registry hed #t)
-	(print "Registering #" hed)
-	(if (not (null? tal))
-          (loop (runs:queue-next-hed tal reg n regful)
-                (runs:queue-next-tal tal reg n regful)
-		(let ((newl (append reg (list hed))))
-		  (if regful
-		      (cdr newl)
-		      newl)))))
-       (else
-	(print "Running #" hed)
-	(if (not (null? tal))
-	    (loop (runs:queue-next-hed tal reg n regful)
-		  (runs:queue-next-tal tal reg n regful)
-		  (runs:queue-next-reg tal reg n regful))))))))

DELETED runs.scm
Index: runs.scm
==================================================================
--- runs.scm
+++ /dev/null
@@ -1,3073 +0,0 @@
-;; Copyright 2006-2016, Matthew Welland.
-;; 
-;; This file is part of Megatest.
-;; 
-;;     Megatest is free software: you can redistribute it and/or modify
-;;     it under the terms of the GNU General Public License as published by
-;;     the Free Software Foundation, either version 3 of the License, or
-;;     (at your option) any later version.
-;; 
-;;     Megatest is distributed in the hope that it will be useful,
-;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;     GNU General Public License for more details.
-;; 
-;;     You should have received a copy of the GNU General Public License
-;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
-
-;;  strftime('%m/%d/%Y %H:%M:%S','now','localtime')
-
-(use (prefix sqlite3 sqlite3:) srfi-1 posix regex regex-case srfi-69 (srfi 18) 
-     posix-extras directory-utils pathname-expand typed-records format  sxml-serializer
-     sxml-modifications matchable)
-
-(declare (unit runs))
-(declare (uses db))
-(declare (uses common))
-(declare (uses items))
-(declare (uses runconfig))
-(declare (uses tests))
-(declare (uses server))
-(declare (uses mt))
-(declare (uses archive))
-;; (declare (uses filedb))
-
-(include "common_records.scm")
-(include "key_records.scm")
-(include "db_records.scm")
-(include "run_records.scm")
-(include "test_records.scm")
-
-;; (include "debugger.scm")
-
-;; use this struct to facilitate refactoring
-;;
-
-(defstruct runs:dat
-  reglen regfull
-  runname max-concurrent-jobs run-id
-  test-patts required-tests test-registry
-  registry-mutex flags keyvals run-info all-tests-registry
-  ;; stores results from last runs:can-run-more-tests 
-  (can-run-more-tests      #f) ;; (list can-run-more-flag num-running num-running-in-jobgroup max-concurrent-jobs job-group-limit)
-  ((can-run-more-tests-count 0) : fixnum)
-  (last-fuel-check         0)  ;; time when we last checked fuel
-  (beginning-of-time       (current-seconds))
-  (load-mgmt-function      #f)
-  (wait-for-jobs-function  #f)
-  (last-load-check-time    0)
-  (last-jobs-check-time    0)
-  )
-
-(defstruct runs:testdat
-  hed tal reg reruns  test-record
-  test-name item-path jobgroup
-  waitons testmode  newtal itemmaps prereqs-not-met)
-  
-;; look in the $MT_RUN_AREA_HOME/.softlocks directory for key-host-pid.softlock files
-;;  - remove any that are over 3600 seconds old
-;;  - if there are any that are younger than 10 seconds
-;;      * sleep 10 seconds
-;;      * touch my key-host-pid.softlock file
-;;      * return
-;;  - if there are no files younger than 10 seconds
-;;     * touch my key-host-pid.softlock file
-;;     * return
-;;  
-(define (runs:wait-on-softlock rdat key)
-  (if (not (and *toppath* (file-exists? *toppath*))) ;; don't seem to have toppath yet
-      (debug:print-info 0 *default-log-port* "Can't create softlocks - don't see MTRAH yet.")
-      (let* ((softlocks-dir (conc *toppath* "/.softlocks")))
-	(if (not (file-exists? softlocks-dir))
-	    (create-directory softlocks-dir #t))
-	(let* ((my-lock-file   (conc softlocks-dir "/" key "-" (get-host-name) "-" (current-process-id) ".softlock"))
-	       (lock-files     (filter (lambda (x)
-					 (not (equal? x my-lock-file)))
-				       (glob (conc softlocks-dir "/" key "*.softlock"))))
-	       (fresh-locks    (any (lambda (x) ;; do we have any locks younger than 10 seconds
-				      (let* ((mod-time (file-modification-time x))
-					     (age      (- (current-seconds) mod-time)))
-					(cond
-					 ((> age 3600) ;; too old to keep, remove it
-					  (delete-file* x) #f)
-					 ((< age 10)  #t)
-					 (else #f))))
-				    lock-files)))
-	  (if fresh-locks
-	      (begin
-		(if (runs:lownoise "runners-softlock-wait" 360)
-		    (debug:print-info 0 *default-log-port* "Other runners in flight, giving up some time..."))
-		(thread-sleep! 2))
-	      (begin
-		(if (runs:lownoise "runners-softlock-nowait" 360)
-		    (debug:print-info 0 *default-log-port* "No runners in flight, updating softlock"))
-		(let* ((ouf (open-output-file my-lock-file)))
-		  (with-output-to-port ouf
-		    (lambda ()(print (current-seconds))))
-		  (close-output-port ouf))))
-	  (runs:dat-last-fuel-check-set! rdat (current-seconds))))))
-  
-;; Fourth try, do accounting through time
-;;
-(define (runs:parallel-runners-mgmt rdat)
-  (let ((time-to-check (configf:lookup-number *configdat* "runners" "time-to-check" default: 10)) ;; 28
-	(time-to-wait  (configf:lookup-number *configdat* "runners" "time-to-wait" default: 30))
-	(now-time      (current-seconds)))
-    (if (> (- now-time (runs:dat-last-fuel-check rdat)) time-to-check) ;; time to check
-	(runs:wait-on-softlock rdat "runners"))))
-
-;; To test parallel-runners management start a repl:
-;;  megatest -repl
-;; then run:
-;;  (runs:test-parallel-runners 60)
-;;
-(define (runs:test-parallel-runners duration #!optional (proc #f))
-  (let* ((rdat   (make-runs:dat))
-	 (rtime  0)
-	 (startt (current-seconds))
-	 (endt   (+ startt duration)))
-    ((or proc runs:parallel-runners-mgmt) rdat)
-    (let loop ()
-      (let* ((wstart (current-seconds)))
-	(if (< wstart endt)
-	    (let* ((work-time (random 10)))
-	      #;(debug:print-info 0 *default-log-port* "working for " work-time
-				" seconds. Total work: " rtime ", elapsed time: " (- wstart startt))
-	      (thread-sleep! work-time)
-	      (set! rtime (+ rtime work-time))
-	      ((or proc runs:parallel-runners-mgmt) rdat)
-	      (loop)))))
-    (let* ((done-time (current-seconds)))
-      (debug:print-info 0 *default-log-port* "DONE: rtime=" rtime ", elapsed time=" (- done-time startt)
-			", ratio=" (/ rtime (- done-time startt))))))
-
-(define (runs:get-mt-env-alist run-id runname target testname itempath)
-  ;;(bb-check-path msg: "runs:set-megatest-env-vars entry")
-  `(("MT_TEST_NAME"     . ,testname)
-    
-    ("MT_ITEMPATH"      . ,itempath)
-
-    ("MT_TARGET"        . ,target)
-    
-    ("MT_RUNNAME"       . ,runname)
-    
-    ("MT_RUN_AREA_HOME" . ,*toppath*)
-    
-    ,@(let* ((link-tree (common:get-linktree))) ;; (configf:lookup *configdat* "setup" "linktree")))
-        (if link-tree
-            (list (cons "MT_LINKTREE" link-tree)
-                  
-                  (cons "MT_TEST_RUN_DIR"
-                        (conc link-tree  "/" target "/" runname "/" testname
-                              (if (and (string? itempath) (not (equal? itempath "")))
-                                  (conc "/" itempath)
-                                  "")))
-                  )
-            '()))
-    
-    ,@(map
-       (lambda (key)
-         (cons  (car key) (cadr key)))
-       (keys:target->keyval (rmt:get-keys) target))
-    
-    ,@(map (lambda (var)
-             (let ((val (configf:lookup *configdat* "env-override" var)))
-               (cons var val)))
-           (configf:section-vars *configdat* "env-override"))))
-    
-;; set up needed environment variables given a run-id and optionally a target, itempath etc.
-;;
-(define (runs:set-megatest-env-vars run-id #!key (inkeys #f)(inrunname #f)(inkeyvals #f)(intarget #f)(testname #f)(itempath #f))
-  ;;(bb-check-path msg: "runs:set-megatest-env-vars entry")
-  (let* ((target    (or intarget 
-			(common:args-get-target)
-			(get-environment-variable "MT_TARGET")))
-	 (keys      (if inkeys    inkeys    (rmt:get-keys)))
-	 (keyvals   (if inkeyvals inkeyvals (keys:target->keyval keys target)))
-	 (vals      (hash-table-ref/default *env-vars-by-run-id* run-id #f))
-	 (link-tree (common:get-linktree))) ;; (configf:lookup *configdat* "setup" "linktree")))
-    (if testname (setenv "MT_TEST_NAME" testname))
-    (if itempath (setenv "MT_ITEMPATH"  itempath))
-
-    ;; get the info from the db and put it in the cache
-    (if link-tree
-	(setenv "MT_LINKTREE" link-tree)
-	(debug:print-error 0 *default-log-port* "linktree not set, should be set in megatest.config in [setup] section."))
-    (if (not vals)
-	(let ((ht (make-hash-table)))
-	  (hash-table-set! *env-vars-by-run-id* run-id ht)
-	  (set! vals ht)
-	  (for-each
-	   (lambda (key)
-	     (hash-table-set! vals (car key) (cadr key)))
-	   keyvals)))
-    ;; from the cached data set the vars
-    
-    (hash-table-for-each
-     vals
-     (lambda (key val)
-       (debug:print 2 *default-log-port* "setenv " key " " val)
-       (safe-setenv key val)))
-    ;;(bb-check-path msg: "runs:set-megatest-env-vars block 1")
-    ;;(BB> "*env-vars-by-run-id*/runid("run-id" vals="(hash-table->alist vals))
-
-    (if (not (get-environment-variable "MT_TARGET"))(setenv "MT_TARGET" target))
-    ;; we had a case where there was an exception generated by the hash-table-ref
-    ;; due to *configdat* being #f Adding a handle and exit
-    (let fatal-loop ((count 0)) 
-      (handle-exceptions
-	  exn
-	  (let ((call-chain (get-call-chain))
-		(msg        ((condition-property-accessor 'exn 'message) exn)))
-	    (if (< count 5)
-		(begin ;; this call is colliding, do some crude stuff to fix it.
-		  (debug:print 0 *default-log-port* "ERROR: *configdat* was inaccessible! This should never happen. Retry #" count
-			       ", exn=" exn)
-		  (launch:setup force-reread: #t)
-		  (fatal-loop (+ count 1))) 
-		(begin
-		  (debug:print 0 *default-log-port* "FATAL: *configdat* was inaccessible! This should never happen. Retried " count
-			       " times. Message: " msg)
-		  (debug:print 0 *default-log-port* "Call chain:")
-		  (with-output-to-port *default-log-port*
-
-                    (lambda ()
-                      (print "*configdat* is >>"*configdat*"<<")
-                      (pp *configdat*)
-                      (pp call-chain)))
-                  
-		  (exit 1))))
-          ;;(bb-check-path msg: "runs:set-megatest-env-vars block 1.5")
-          (when (or (not *configdat*) (not (hash-table? *configdat*)))
-              (debug:print 0 *default-log-port* "WARNING: *configdat* was inaccessible! This should never happen.  Brute force reread.")
-              ;;(BB> "ERROR: *configdat* was inaccessible! This should never happen.  Brute force reread.")
-              (thread-sleep! 2) ;; assuming nfs lag.
-              (launch:setup force-reread: #t))
-          (alist->env-vars (hash-table-ref/default *configdat* "env-override" '())))) ;;;; environment is tainted HERE in this let block.
-    ;;(bb-check-path msg: "runs:set-megatest-env-vars block 2")
-    ;; Lets use this as an opportunity to put MT_RUNNAME in the environment
-    (let ((runname  (if inrunname inrunname (rmt:get-run-name-from-id run-id))))
-      (if runname
-	  (setenv "MT_RUNNAME" runname)
-	  (debug:print-error 0 *default-log-port* "no value for runname for id " run-id)))
-    (setenv "MT_RUN_AREA_HOME" *toppath*)
-    ;; if a testname and itempath are available set the remaining appropriate variables
-    (if testname (setenv "MT_TEST_NAME" testname))
-    (if itempath (setenv "MT_ITEMPATH"  itempath))
-    ;;(bb-check-path msg: "runs:set-megatest-env-vars block 3")
-    (if (and testname link-tree)
-	(setenv "MT_TEST_RUN_DIR" (conc (getenv "MT_LINKTREE")  "/"
-					(getenv "MT_TARGET")    "/"
-					(getenv "MT_RUNNAME")   "/"
-					(getenv "MT_TEST_NAME")
-					(if (and itempath
-						 (not (equal? itempath "")))
-					    (conc "/" itempath)
-					    ""))))))
-
-(define (set-item-env-vars itemdat)
-  (for-each (lambda (item)
-	      (debug:print 2 *default-log-port* "setenv " (car item) " " (cadr item))
-	      (setenv (car item) (cadr item)))
-	    itemdat))
-
-;; Every time can-run-more-tests is called increment the delay
-;;
-;; NOTE: We run this server-side!! Do not use this global except in the runs:can-run-more-tests routine
-;;
-(define *last-num-running-tests* 0)
-;; (define *runs:can-run-more-tests-count* 0)
-(define (runs:shrink-can-run-more-tests-count runsdat)
-  (runs:dat-can-run-more-tests-count-set! runsdat 0))
-
-(define (runs:inc-can-run-more-tests-count runsdat)
-  (runs:dat-can-run-more-tests-count-set!
-   runsdat
-   (+ (runs:dat-can-run-more-tests-count runsdat) 1)))
-
-;;  (set! *runs:can-run-more-tests-count* 0)) ;; (/ *runs:can-run-more-tests-count* 2)))
-
-;; Temporary globals. Move these into the logic or into common
-;;
-(define *seen-cant-run-tests* (make-hash-table)) ;; use to track tests that we suspect cannot be run
-(define (runs:inc-cant-run-tests testname)
-  (hash-table-set! *seen-cant-run-tests* testname
-		   (+ (hash-table-ref/default *seen-cant-run-tests* testname 0) 1)))
-
-(define (runs:can-keep-running? testname n)
-  (< (hash-table-ref/default *seen-cant-run-tests* testname 0) n))
-
-(define *runs:denoise* (make-hash-table)) ;; key => last-time-ran
-
-;; mechanism to limit printing info to the screen that is repetitive.
-;;
-;; Example: 
-;; (if (runs:lownoise "waiting on tasks" 60)
-;;     (debug:print-info 2 *default-log-port* "waiting for tasks to complete, sleeping briefly ..."))
-;;
-(define (runs:lownoise key waitval)
-  (let ((lasttime (hash-table-ref/default *runs:denoise* key 0))
-	(currtime (current-seconds)))
-    (if (> (- currtime lasttime) waitval)
-	(begin
-	  (hash-table-set! *runs:denoise* key currtime)
-	  #t)
-	#f)))
-
-(define (runs:can-run-more-tests runsdat run-id jobgroup max-concurrent-jobs)
-
-  ;; Take advantage of a good place to exit if running the one-pass methodology
-  (if (and (> (runs:dat-can-run-more-tests-count runsdat) 20)
-	   (args:get-arg "-one-pass"))
-      (exit 0))
-
-  (if (runs:dat-load-mgmt-function runsdat)((runs:dat-load-mgmt-function runsdat)))
-
-  (let* ((num-running             (rmt:get-count-tests-running run-id))
-	 (num-running-in-jobgroup (rmt:get-count-tests-running-in-jobgroup run-id jobgroup))
-	 (job-group-limit         (let ((jobg-count (configf:lookup *configdat* "jobgroups" jobgroup)))
-				    (if (string? jobg-count)
-					(string->number jobg-count)
-					jobg-count))))
-    (if (> (+ num-running num-running-in-jobgroup) 0)
-	(runs:inc-can-run-more-tests-count runsdat)) ;; (set! *runs:can-run-more-tests-count* (+ *runs:can-run-more-tests-count* 1)))
-    (if (not (eq? *last-num-running-tests* num-running))
-	(begin
-	  (debug:print 2 *default-log-port* "max-concurrent-jobs: " max-concurrent-jobs ", num-running: " num-running)
-	  (set! *last-num-running-tests* num-running)))
-    (if (not (eq? 0 *globalexitstatus*))
-	(list #f num-running num-running-in-jobgroup max-concurrent-jobs job-group-limit)
-	(let* ((can-not-run-more (cond
-				 ;; if max-concurrent-jobs is set and the number running is greater 
-				 ;; than it then cannot run more jobs
-				 ((and max-concurrent-jobs (>= num-running max-concurrent-jobs))
-				  (if (runs:lownoise "mcj msg" 60)
-				      (debug:print 0 *default-log-port* "WARNING: Max running jobs exceeded, current number running: " num-running 
-						   ", max_concurrent_jobs: " max-concurrent-jobs))
-				  #t)
-				 ;; if job-group-limit is set and number of jobs in the group is greater
-				 ;; than the limit then cannot run more jobs of this kind
-				 ((and job-group-limit
-				       (>= num-running-in-jobgroup job-group-limit))
-				  (if (runs:lownoise (conc "maxjobgroup " jobgroup) 60)
-				      (debug:print 1 *default-log-port* "WARNING: number of jobs " num-running-in-jobgroup 
-						   " in jobgroup \"" jobgroup "\" exceeds limit of " job-group-limit))
-				  #t)
-				 (else #f))))
-	  (list (not can-not-run-more) num-running num-running-in-jobgroup max-concurrent-jobs job-group-limit)))))
-
-(define (runs:run-pre-hook run-id)
-    (let* ((run-pre-hook   (configf:lookup *configdat* "runs" "pre-hook"))
-           (existing-tests (if run-pre-hook
-                               (rmt:get-tests-for-run run-id "%" '() '() ;; run-id testpatt states statuses
-                                                      #f #f ;; offset limit
-                                                      #f ;; not-in
-                                                      #f ;; sort-by
-                                                      #f ;; sort-order
-                                                      #f ;; get full data (not 'shortlist)
-                                                      0 ;; (runs:gendat-inc-results-last-update *runs:general-data*) ;; last update time
-                                                      'dashboard)
-                               '()))
-           (log-dir         (conc *toppath* "/logs"))
-           (log-file        (conc "pre-hook-" (string-translate (getenv "MT_TARGET") "/" "-") "-" (getenv "MT_RUNNAME") ".log"))
-           (full-log-fname  (conc log-dir "/" log-file)))
-      (if run-pre-hook
-          (if (null? existing-tests)
-              (let* ((use-log-dir (if (not (directory-exists? log-dir))
-                                      (handle-exceptions
-                                       exn
-                                       (begin
-                                         (debug:print 0 *default-log-port* "WARNING: Failed to create " log-dir ", exn=" exn)
-                                         #f)
-                                       (create-directory log-dir #t)
-                                       #t)
-                                      #t))
-                     (start-time   (current-seconds))
-                     (actual-logf  (if use-log-dir full-log-fname log-file)))
-                (handle-exceptions
-                 exn
-                 (begin
-                   (print-call-chain *default-log-port*)
-                   (debug:print 0 *default-log-port* "Message: " ((condition-property-accessor 'exn 'message) exn) ", exn=" exn)
-                   (debug:print 0 *default-log-port* "ERROR: failed to run pre-hook " run-pre-hook ", check the log " log-file))
-                 (debug:print-info 0 *default-log-port* "running run-pre-hook: \"" run-pre-hook "\", log is " actual-logf)
-                 (system (conc run-pre-hook " >> " actual-logf " 2>&1"))
-                 (debug:print-info 0 *default-log-port* "pre-hook \"" run-pre-hook "\" took " (- (current-seconds) start-time) " seconds to run.")))
-              (debug:print 0 *default-log-port* "Skipping pre-hook call \"" run-pre-hook "\" as there are existing tests for this run.")))))
-   
-
-
-(define (runs:run-post-hook run-id)
-    (let* ((run-post-hook   (configf:lookup *configdat* "runs" "post-hook"))
-           (existing-tests (if run-post-hook
-                               (rmt:get-tests-for-run run-id "%" '() '() ;; run-id testpatt states statuses
-                                                      #f #f ;; offset limit
-                                                      #f ;; not-in
-                                                      #f ;; sort-by
-                                                      #f ;; sort-order
-                                                      #f ;; get full data (not 'shortlist)
-                                                      0 ;; (runs:gendat-inc-results-last-update *runs:general-data*) ;; last update time
-                                                      'dashboard)
-                               '()))
-           (log-dir         (conc *toppath* "/logs"))
-           (log-file        (conc "post-hook-" (string-translate (getenv "MT_TARGET") "/" "-") "-" (getenv "MT_RUNNAME") ".log"))
-           (full-log-fname  (conc log-dir "/" log-file)))
-      (if run-post-hook
-          ;; (if (null? existing-tests)
-          ;;    (debug:print 0 *default-log-port* "Skipping post-hook call \"" run-post-hook "\" as there are existing tests for this run.")))))
-	  (let* ((use-log-dir (if (not (directory-exists? log-dir))
-				  (handle-exceptions
-				      exn
-				      (begin
-					(debug:print 0 *default-log-port* "WARNING: Failed to create " log-dir ", exn=" exn)
-					#f)
-				    (create-directory log-dir #t)
-				    #t)
-				  #t))
-		 (start-time   (current-seconds))
-		 (actual-logf  (if use-log-dir full-log-fname log-file)))
-	    (handle-exceptions
-		exn
-		(begin
-		  (print-call-chain *default-log-port*)
-		  (debug:print 0 *default-log-port* "Message: " ((condition-property-accessor 'exn 'message) exn) ", exn=" exn)
-		  (debug:print 0 *default-log-port* "ERROR: failed to run post-hook " run-post-hook ", check the log " log-file))
-	      (debug:print-info 0 *default-log-port* "running run-post-hook: \"" run-post-hook "\", log is " actual-logf)
-	      (system (conc run-post-hook " >> " actual-logf " 2>&1"))
-	      (debug:print-info 0 *default-log-port* "post-hook \"" run-post-hook "\" took " (- (current-seconds) start-time) " seconds to run."))))))
-
-
-(define (runs:rerun-hook test-id new-test-path testdat rerunlst)
-    (let* ((rerun-hook   (configf:lookup *configdat* "runs" "rerun-hook"))
-           (log-dir         (conc *toppath* "/reruns/logs"))
-           (target (getenv "MT_TARGET"))
-           (runname (common:args-get-runname))
-           (rundir (db:test-get-rundir testdat))
-           (tarfiledir (conc *toppath* "/reruns"))
-           (status (db:test-get-status testdat))
-           (comment (conc "\"" (db:test-get-comment testdat) "\"" ))
-           (testname (db:test-get-testname testdat))
-           (itempath (db:test-get-item-path testdat))
-           (file-body (conc status "-" (string-translate target "/" "-") "-" runname "." testname (if (not (string=? itempath "")) (conc  "." (string-translate itempath "/" "-")) "")))
-           (log-file (conc file-body ".log"))
-           ;; (log-file        (conc status "-" (string-translate target "/" "-") "-" runname "." testname (if (not (string=? itempath "")) (conc  "." (string-translate itempath "/" "-")) "") ".log"))
-           (full-log-fname  (conc log-dir "/" log-file))
-           (tarfilename (conc file-body ".tar"))
-           ;; (tarfilename (conc status "." (string-translate target "/" "-") "." runname "." testname (if (not (string=? itempath "")) (conc  "." (string-translate itempath "/" "-")) "") ".tar"))
-           )
-      (if rerun-hook
-	  (let* ((use-log-dir (if (not (directory-exists? log-dir))
-				  (handle-exceptions
-				      exn
-				      (begin
-					(debug:print 0 *default-log-port* "WARNING: Failed to create " log-dir ", exn=" exn)
-					#f)
-				    (create-directory log-dir #t)
-				    #t)
-				  #t))
-		 (start-time   (current-seconds))
-		 (actual-logf  (if use-log-dir full-log-fname log-file))
-                 (sys-call-text (conc rerun-hook " " tarfilename " " rundir " " actual-logf " " runname " " tarfiledir " " status " " target " " comment " " testname " " itempath " >> " actual-logf " 2>&1"))
-                 )
-	    (debug:print 2 *default-log-port* "Found rerun-hook in config:" rerun-hook)
-	    (handle-exceptions
-		exn
-		(begin
-		  (print-call-chain *default-log-port*)
-		  (debug:print 0 *default-log-port* "Message: " ((condition-property-accessor 'exn 'message) exn) ", exn=" exn)
-		  (debug:print 0 *default-log-port* "ERROR: failed to run rerun-hook " rerun-hook ", check the log " log-file))
-	      (debug:print-info 0 *default-log-port* "running rerun-hook: \"" rerun-hook "\", log is " actual-logf)
-              ;; call the hook
-              (debug:print-info 0 *default-log-port* "Calling rerun-hook for " test-id new-test-path testdat rerunlst)
-              (debug:print-info 0 *default-log-port* "rerun hook: " rerun-hook)
-              (debug:print-info 0 *default-log-port* "tarfilename: " tarfilename)
-              (debug:print-info 0 *default-log-port* "rundir: " rundir)
-              (debug:print-info 0 *default-log-port* "actual-logf: " actual-logf)
-              (debug:print-info 0 *default-log-port* "runname: " runname)
-              (debug:print-info 0 *default-log-port* "sys-call-text: " sys-call-text)
-	      (system sys-call-text)
-	      (debug:print-info 0 *default-log-port* "rerun-hook \"" rerun-hook "\" took " (- (current-seconds) start-time) " seconds to run."))))))
-
-
-
-
-;; return #t when all items in waitors-upon list are represented in test-patt, #f otherwise.
-(define (runs:testpatts-mention-waitors-upon? test-patt waitors-upon)
-  (null? (tests:filter-test-names-not-matched waitors-upon test-patt)))
-
-;;======================================================================
-;; runs:run-tests is called from megatest.scm and itself
-;;======================================================================
-;;
-;;  test-names: Comma separated patterns same as test-patts but used in selection 
-;;              of tests to run. The item portions are not respected.
-;;              FIXME: error out if /patt specified
-;;            
-(define (runs:run-tests target runname test-patts user flags #!key (run-count 1)) ;; test-names
-  (let* ((keys               (keys:config-get-fields *configdat*))
-	 (keyvals            (keys:target->keyval keys target))
-	 (run-id             (rmt:register-run keyvals runname "new" "n/a" user (args:get-arg "-contour")))  ;;  test-name)))
-	 ;; (deferred          '()) ;; delay running these since they have a waiton clause
-	 (runconfigf         (conc  *toppath* "/runconfigs.config"))
-         (dbfile             (conc  *toppath* "/megatest.db"))
-         (readonly-mode      (not (file-write-access? dbfile)))
-	 (test-records       (make-hash-table))
-	 ;; need to process runconfigs before generating these lists
-	 (all-tests-registry #f)  ;; (tests:get-all)) ;; (tests:get-valid-tests (make-hash-table) test-search-path)) ;; all valid tests to check waiton names
-	 (all-test-names     #f)  ;; (hash-table-keys all-tests-registry))
-	 (test-names         #f)  ;; Generated by a call to (tests:filter-test-names all-test-names test-patts))
-	 (required-tests     #f)  ;; Put fully qualified test/testpath names in this list to be done
-         (waitors-upon       (make-hash-table)) ;; given a test, return list of tests waiting upon this test.
-	 (task-key           (conc (hash-table->alist flags) " " (get-host-name) " " (current-process-id)))
-	 ;; (tdbdat             (tasks:open-db))
-	 (config-reruns      (let ((x (configf:lookup *configdat* "setup" "reruns")))
-			       (if x (string->number x) #f)))
-	 (allowed-tests      #f)
-	 (runconf            #f))
-
-    ;; check if readonly
-    (when readonly-mode
-      (debug:print-error 0 *default-log-port* "megatest.db is readonly.  Cannot proceed.")
-      (exit 1))
-
-    ;; per user request. If less than 100Meg space on dbdir partition, bail out with error
-    ;; this will reduce issues in database corruption
-    (common:check-db-dir-and-exit-if-insufficient)
-
-    ;; override the number of reruns from the configs
-    ;; this needs to be done at the place where is first runs:run-tests called 
-    ;(if (and config-reruns
-	  ;   (> run-count config-reruns))
- 	  ;(set! run-count config-reruns))
-
-    ;; (if (tasks:need-server run-id)(tasks:start-and-wait-for-server tdbdat run-id 10))
-
-    (let ((sighand (lambda (signum)
-		     ;; (signal-mask! signum) ;; to mask or not? seems to cause issues in exiting
-		     (set! *time-to-exit* #t)
-		     (print "Received signal " signum ", cleaning up before exit. Please wait...")
-		     (let ((th1 (make-thread (lambda ()
-					       ;; (let ((tdbdat (tasks:open-db)))
-						 (rmt:tasks-set-state-given-param-key task-key "killed") ;; )
-					       (print "Killed by signal " signum ". Exiting")
-					       (thread-sleep! 3)
-					       (exit))))
-			   (th2 (make-thread (lambda ()
-					       (thread-sleep! 5)
-					       (debug:print 0 *default-log-port* "Done")
-					       (exit 4)))))
-		       (thread-start! th2)
-		       (thread-start! th1)
-		       (thread-join! th2)))))
-      (set-signal-handler! signal/int sighand)
-      (set-signal-handler! signal/term sighand))
-
-    ;; force the starting of a server -- removed BB 17ww28 - no longer needed.
-    ;;(debug:print 0 *default-log-port* "waiting on server...")
-    ;;(server:start-and-wait *toppath*)
-    
-    (runs:set-megatest-env-vars run-id inkeys: keys inrunname: runname) ;; these may be needed by the launching process
-    (set! runconf (if (common:file-exists? runconfigf)
-		      (setup-env-defaults runconfigf run-id *already-seen-runconfig-info* keyvals target)
-		      (begin
-			(debug:print 0 *default-log-port* "WARNING: You do not have a run config file: " runconfigf)
-			#f)))
-
-    (if (not test-patts) ;; first time in - adjust testpatt
-	(set! test-patts (common:args-get-testpatt runconf)))
-    ;; if test-patts is #f at this point there is something wrong and we need to bail out
-    (if (not test-patts)
-	(begin
-	  (debug:print 0 *default-log-port* "WARNING: there is no test pattern for this run. Exiting now.")
-	  (exit 0)))
-    
-    (if (args:get-arg "-tagexpr")
-	(begin
-	  (set! allowed-tests (string-join (runs:get-tests-matching-tags (args:get-arg "-tagexpr")) ","))
-	  	  (debug:print-info 0 *default-log-port* "filtering initial test list with tagexpr: " (args:get-arg "-tagexpr") " => " allowed-tests)
-		  ));; tests will be ANDed with this list
-
-    ;; register this run in monitor.db
-    (rmt:tasks-add "run-tests" user target runname test-patts task-key) ;; params)
-    (rmt:tasks-set-state-given-param-key task-key "running")
-
-    #;(common:telemetry-log "run-tests"
-                          payload:
-                          `( (target . ,target)
-                             (run-name . ,runname)
-                             (test-patts . ,test-patts) ) )
-
-    
-    ;; Now generate all the tests lists
-    (set! all-tests-registry (tests:get-all))   ;; hash of testname => path-to-test
-    (set! all-test-names     (hash-table-keys all-tests-registry))
-    ;; filter first for allowed-tests (from -tagexpr) then for test-patts.
-    (set! test-names         (tests:filter-test-names
-			      (if allowed-tests
-				  (tests:filter-test-names all-test-names allowed-tests)
-				  all-test-names)
-			      test-patts))
-
-    ;; I think seeding required-tests with all test-names makes sense but lack analysis to back that up.
-
-    ;; NEW STRATEGY HERE:
-    ;; 1. fill required tests with test-patts
-    ;; 2. scan testconfigs and if waitons, itemwait, itempatt calc prior test test-patt
-    ;; 3. repeat until all deps propagated
-    
-    ;; any tests with direct mention in test-patts can be added to required
-    ;;(set! required-tests     (lset-intersection equal? (string-split test-patts ",") all-test-names))
-    (set! required-tests     (tests:filter-test-names all-test-names test-patts))
-    ;;
-    ;; (set! required-tests     (lset-intersection equal? test-names all-test-names))
-    
-    ;; look up all tests matching the comma separated list of globs in
-    ;; test-patts (using % as wildcard)
-
-    ;; (set! test-names (delete-duplicates (tests:get-valid-tests *toppath* test-patts)))
-    (debug:print-info 0 *default-log-port* "tests search path: " (string-intersperse (tests:get-tests-search-path *configdat*) " "))
-    (debug:print-info 0 *default-log-port* "all tests:         " (string-intersperse (sort all-test-names string<) " "))
-    (debug:print-info 0 *default-log-port* "test names:        " (string-intersperse (sort test-names string<) " "))
-    (debug:print-info 0 *default-log-port* "required tests:    " (string-intersperse (sort required-tests string<) " "))
-
-    ;; on the first pass or call to run-tests set FAILS to NOT_STARTED if
-    ;; -keepgoing is specified
-    (if (eq? *passnum* 0)
-	(begin
-	  ;; Is this still necessary? I think not. Unreachable tests are marked as such and 
-	  ;; should not cause problems here.
-	  ;;
-	  ;; have to delete test records where NOT_STARTED since they can cause -keepgoing to 
-	  ;; get stuck due to becoming inaccessible from a failed test. I.e. if test B depends 
-	  ;; on test A but test B reached the point on being registered as NOT_STARTED and test
-	  ;; A failed for some reason then on re-run using -keepgoing the run can never complete.
-	  ;;
-	  ;; (rmt:general-call 'delete-tests-in-state run-id "NOT_STARTED")
-	  
-	  ;; Now convert anything in allow-auto-rerun to NOT_STARTED
-	  ;;
-	  (for-each
-	   (lambda (state-status)
-	     (let* ((ss-lst (string-split-fields "/" state-status #:infix))
-		    (state  (if (> (length ss-lst) 0)(car  ss-lst) #f))
-		    (status (if (> (length ss-lst) 1)(cadr ss-lst) #f)))
-	       (rmt:set-tests-state-status run-id test-names state status "NOT_STARTED" status)))
-	   ;; list of state/status pairs separated by spaces
-	   (string-split (or (configf:lookup *configdat* "setup" "allow-auto-rerun") "")))))
-
-    ;; Ensure all tests are registered in the test_meta table
-    (runs:update-all-test_meta #f)
-
-    ;; run the run prehook if there are no tests yet run for this run:
-    ;;
-    (runs:run-pre-hook run-id)
-    ;; mark all test launched flag as false in the meta table 
-    (rmt:set-var (conc "lunch-complete-" run-id) "no")
-    (debug:print-info 1 *default-log-port* "Setting end-of-run to no")
-    (let* ((config-reruns      (let ((x (configf:lookup *configdat* "setup" "reruns")))
-			       (if x (string->number x) #f)))
-	  (config-rerun-cnt (if config-reruns
-			config-reruns
-			1)))
-    (if (eq? config-rerun-cnt run-count)
-      (rmt:set-var (conc "end-of-run-" run-id) "no")))
-
-    (rmt:set-run-state-status run-id "new" "n/a")
-    ;; now add non-directly referenced dependencies (i.e. waiton)
-    ;;======================================================================
-    ;; refactoring this block into tests:get-full-data
-    ;;
-    ;; What happended, this code is now duplicated in tests!?
-    ;;
-    ;;======================================================================
-    
-    (if (not (null? test-names)) ;; BEGIN test-names loop
-	(let loop ((hed (car test-names))   ;; NOTE: This is the main loop that iterates over the test-names
-		   (tal (cdr test-names)))         ;; 'return-procs tells the config reader to prep running system but return a proc
-          (debug:print-info 4 *default-log-port* "\n\ntestpatt elaboration loop => hed="hed " tal="tal" test-patts="test-patts" test-names="test-names)
-	  (change-directory *toppath*) ;; PLEASE OPTIMIZE ME!!! I think this should be a no-op but there are several places where change-directories could be happening.
-	  (setenv "MT_TEST_NAME" hed) ;; 
-	  (let*-values (((waitons waitors config) (tests:get-waitons hed all-tests-registry))
-
-			;; NOTE: Have the config - can extract [waitons] section
-			
-                        ((hed-mode)
-                         (let ((m (configf:lookup config "requirements" "mode")))
-                           (if m (map string->symbol (string-split m)) '(normal))))
-                        ((hed-itemized-waiton) ;; are items in hed waiting on items of waiton?
-                         (not (null? (lset-intersection eq? hed-mode '(itemmatch itemwait)))))
-                        )
-	    (debug:print-info 8 *default-log-port* "waitons: " waitons)
-	    ;; check for hed in waitons => this would be circular, remove it and issue an
-	    ;; error
-	    (if (or (member hed waitons)
-		    (member hed waitors))
-		(begin
-		  (debug:print-error 0 *default-log-port* "test " hed " has listed itself as a waiton or waitor, please correct this!")
-		  (set! waitons (filter (lambda (x)(not (equal? x hed))) waitons))
-		  (set! waitors (filter (lambda (x)(not (equal? x hed))) waitors))))
-	    
-	    ;; (items   (items:get-items-from-config config)))
-	    (if (not (hash-table-ref/default test-records hed #f)) ;; waiton-tconfig below will be #f until that test is visted here at least once
-		(hash-table-set! test-records ;; BB: we are doing a manual make-tests:testqueue
-				 hed (vector hed     ;; 0 ;; testname
-					     config  ;; 1 
-					     waitons ;; 2 
-					     (configf:lookup config "requirements" "priority")     ;; priority 3
-					     (tests:get-items config) ;; 4 ;; expand the [items] and or [itemstable] into explict items
-					     #f      ;; itemsdat 5
-					     #f      ;; spare - used for item-path
-					     waitors ;; 
-					     )))
-            ;; update waitors-upon here
-            (for-each
-             (lambda (waiton)
-               (let* ((current-waitors-upon (hash-table-ref/default waitors-upon waiton '())))
-                 (debug:print-info 8 *default-log-port* " current-waiters-upon["waiton"] is "current-waitors-upon )
-                 (when (not (member hed current-waitors-upon))
-                   (debug:print-info 8 *default-log-port* " current-waiters-upon["waiton"] << "hed  )
-                   (hash-table-set! waitors-upon waiton (cons hed current-waitors-upon)))))
-             (if (list? waitons) waitons '()))
-            (debug:print-info 8 *default-log-port* " process waitons&waitors of "hed": "(delete-duplicates (append waitons waitors)))
-            (for-each 
-	     (lambda (waiton)
-	       (if (and waiton (not (member waiton test-names)))
-		   (let* ((waitors-in-testpatt (runs:testpatts-mention-waitors-upon? test-patts (hash-table-ref/default waitors-upon waiton '())))
-                          (waiton-record   (hash-table-ref/default test-records waiton #f))
-			  (waiton-tconfig  (if waiton-record (vector-ref waiton-record 1) #f))
-			  (waiton-itemized (and waiton-tconfig
-						(or (hash-table-ref/default waiton-tconfig "items" #f)
-						    (hash-table-ref/default waiton-tconfig "itemstable" #f))))
-			  (itemmaps        (tests:get-itemmaps config))  ;; (configf:lookup config "requirements" "itemmap"))
-			  (new-test-patts  (tests:extend-test-patts test-patts hed waiton itemmaps hed-itemized-waiton))) 
-		     (debug:print-info 0 *default-log-port* "Test " waiton " has " (if waiton-record "a" "no") " waiton-record and" (if waiton-itemized " " " no ") "items")
-		     ;; need to account for test-patt here, if I am test "a", selected with a test-patt of "hed/b%"
-		     ;; and we are waiting on "waiton" we need to add "waiton/,waiton/b%" to test-patt
-		     ;; is this satisfied by merely appending "/" to the waiton name added to the list?
-		     ;;
-		     ;; This approach causes all of the items in an upstream test to be run 
-		     ;; if we have this waiton already processed once we can analzye it for extending
-		     ;; tests to be run, since we can't properly process waitons unless they have been
-		     ;; initially added we add them again to be processed on second round AND add the hed
-		     ;; back in to also be processed on second round
-		     (if waiton-tconfig ;; BB: waiter should be in test-patts as well as the waiton have a tconfig.
-                         (if waiton-itemized
-                             (if waitors-in-testpatt
-                                 (begin
-                                   (debug:print-info 0 *default-log-port* "New test patts: " new-test-patts ", prev test patts: " test-patts)
-                                   (set! test-names (cons waiton test-names)) ;; need to process this one, only add once the waiton tconfig read
-                                   (set! required-tests (cons (conc waiton "/") required-tests))
-                                   (set! test-patts new-test-patts))
-                                 (begin
-                                   (debug:print-info 0 *default-log-port* "Waitor(s) not yet on testpatt for " waiton ", setting up to re-process it")
-                                   (set! tal (append (cons waiton tal)(list hed)))))
-                             (begin
-                               (debug:print-info 0 *default-log-port* "Adding non-itemized test " waiton " to required-tests")
-                               (set! required-tests (cons waiton required-tests))
-                               (set! test-patts new-test-patts)))
-			 (begin
-			   (debug:print-info 0 *default-log-port* "No testconfig info yet for " waiton ", setting up to re-process it")
-			   (set! tal (append (cons waiton tal)(list hed))))) ;; (cons (conc waiton "/") required-tests))
-		     ;; NOPE: didn't work. required needs to be plain test names. Try tacking on to test-patts
-		     ;;  - doesn't work
-		     ;; (set! test-patts (conc test-patts "," waiton "/"))
-		     ;; (set! test-names (cons waiton test-names))))) ;; was an append, now a cons
-		     )))
-	     (delete-duplicates (append waitons waitors)))
-	    (let ((remtests (delete-duplicates (append waitons tal))))
-              (debug:print-info 8 *default-log-port* " remtests are "remtests)
-	      (if (not (null? remtests))
-		  (begin
-		    ;; (debug:print-info 0 *default-log-port* "Preprocessing continues for " (string-intersperse remtests ", "))
-		    (loop (car remtests)(cdr remtests)))))))) ;; END test-names loop
-
-    (if (not (null? required-tests))
-	(debug:print-info 1 *default-log-port* "Adding \"" (string-intersperse required-tests " ") "\" to the run queue"))
-    ;; NOTE: these are all parent tests, items are not expanded yet.
-    (debug:print-info 4 *default-log-port* "test-records=" (hash-table->alist test-records))
-    (let ((reglen (configf:lookup *configdat* "setup" "runqueue")))
-      (if (> (length (hash-table-keys test-records)) 0)
-	  (let* ((keep-going        #t)
-		 (run-queue-retries 5)
-		 #;(th1        (make-thread (lambda ()
-					    (handle-exceptions
-						exn
-						(begin
-						  (print-call-chain)
-						  (print " message: " ((condition-property-accessor 'exn 'message) exn)))
-					      (runs:run-tests-queue run-id runname test-records keyvals flags test-patts required-tests
-								    (any->number reglen) all-tests-registry)))
-					  "runs:run-tests-queue"))
-		 (th2        (make-thread (lambda ()			 ;; BBQ: why are we visiting ALL runs here?	    
-					    ;; (rmt:find-and-mark-incomplete-all-runs))))) CAN'T INTERRUPT IT ...
-					    (let ((run-ids (rmt:get-all-run-ids)))
-					      (for-each (lambda (run-id)
-							  (if keep-going
-							      (handle-exceptions
-							       exn
-							       (debug:print 0 *default-log-port* "error in calling find-and-mark-incomplete for run-id " run-id ", exn=" exn)
-							       (rmt:find-and-mark-incomplete run-id #f)))) ;; ovr-deadtime))) ;; could be root of https://hsdes.intel.com/appstore/article/#/220546828/main -- Title: Megatest jobs show DEAD even though they are still running (1.64/27)
-							run-ids)))
-					  "runs: mark-incompletes")))
-	    ;; (thread-start! th1)
-	    (thread-start! th2)
-	    ;; (thread-join! th1)
-	    ;; just do the main stuff in the main thread
-	    (runs:run-tests-queue run-id runname test-records keyvals flags test-patts required-tests
-								    (any->number reglen) all-tests-registry)
-	    (set! keep-going #f)
-	    (thread-join! th2)
-	    ;; if run-count > 0 call, set -preclean and -rerun STUCK/DEAD
-	    (if (> run-count 0) ;; handle reruns
-		(begin
-		  (if (not (hash-table-ref/default flags "-preclean" #f))
-		      (hash-table-set! flags "-preclean" #t))
-		  (if (not (hash-table-ref/default flags "-rerun" #f))
-		      (hash-table-set! flags "-rerun" "ABORT,STUCK/DEAD,n/a,ZERO_ITEMS"))
-		  ;; recursive call to self
-      (runs:run-tests target runname test-patts user flags run-count: (- run-count 1)))
-                  (launch:end-of-run-check run-id)))
-	  (debug:print-info 0 *default-log-port* "No tests to run")))
-    (debug:print-info 4 *default-log-port* "All done by here")
-    ;; TODO: try putting post hook call here
-      
-    ;  (debug:print-info 2 *default-log-port* " run-count " run-count)
-    ;  (runs:run-post-hook run-id))
-    ;  (debug:print-info 2 *default-log-port* "Not calling post hook runcount = " run-count ))   
-    (rmt:tasks-set-state-given-param-key task-key "done")
-     
-    ;; (sqlite3:finalize! tasks-db)
-    ))
-
-
-;; loop logic. These are used in runs:run-tests-queue to make it a bit more readable.
-;;
-;; If reg not full and have items in tal then loop with (car tal)(cdr tal) reg reruns
-;; If reg is full (i.e. length >= n
-;;   loop with (car reg) tal (cdr reg) reruns
-;; If tal is empty
-;;   but have items in reg; loop with (car reg)(cdr reg) '() reruns
-;;   If reg is empty => all done
-
-(define (runs:queue-next-hed tal reg n regfull)
-  (if regfull
-      (if (null? reg) #f (car reg))
-      (if (null? tal) ;; tal is used up, pop from reg
-	  (if (null? reg) #f (car reg))
-	  (car tal))))
-
-(define (runs:queue-next-tal tal reg n regfull)
-  (if regfull
-      tal
-      (if (null? tal) ;; must transfer from reg
-	  (if (null? reg) '() (cdr reg))
-	  (cdr tal))))
-
-(define (runs:queue-next-reg tal reg n regfull)
-  (if regfull
-      (if (null? reg) '() (cdr reg)) ;; EXPLORE: reorder (cdr reg) such that looping is more efficient
-      (if (null? tal) ;; if tal is null and reg not full then '() as reg contents moved to tal
-	  '()
-	  reg)))
-
-;; this is the list of parameters to the named loop "loop" near the top of runs:run-tests-queue, look around line 1216
-;;
-(define (runs:loop-values tal reg reglen regfull reruns)
-  (list (runs:queue-next-hed tal reg reglen regfull)      ;; hed
-        (runs:queue-next-tal tal reg reglen regfull)      ;; tal
-        (runs:queue-next-reg tal reg reglen regfull)      ;; reg
-        reruns))                                          ;; reruns
-
-;; objective - iterate thru tests
-;;    => want to prioritize tests we haven't seen before
-;;    => sometimes need to squeeze things in (added to reg)
-;;    => review of a previously seen test is higher priority of never visited test
-;; reg - list of previously visited tests
-;; tal - list of never visited tests
-;;   prefer next hed to be from reg than tal.
-
-(define runs:nothing-left-in-queue-count 0)
-
-;;======================================================================
-;; runs:expand-items is called by runs:run-tests-queue
-;;======================================================================
-;;
-;; return value of runs:expand-items is passed back to runs-tests-queue and is fed to named loop with this signature:
-;;    (let loop ((hed         (car sorted-test-names))
-;;	         (tal         (cdr sorted-test-names))
-;;	         (reg         '()) ;; registered, put these at the head of tal 
-;;	         (reruns      '()))
-(define (runs:expand-items hed tal reg reruns regfull newtal jobgroup max-concurrent-jobs run-id waitons item-path testmode test-record can-run-more items runname tconfig reglen test-registry test-records itemmaps)
-  (let* ((loop-list       (list hed tal reg reruns))
-	 (prereqs-not-met (let ((res (rmt:get-prereqs-not-met run-id waitons hed item-path mode: testmode itemmaps: itemmaps)))
-			    (if (list? res)
-				res
-				(begin
-				  (debug:print 0 *default-log-port*
-					       "ERROR: rmt:get-prereqs-not-met returned non-list!\n"
-					       "  res=" res " run-id=" run-id " waitons=" waitons " hed=" hed " item-path=" item-path " testmode=" testmode " itemmaps=" itemmaps)
-				  '()))))
-         (have-itemized (not (null? (lset-intersection eq? testmode '(itemmatch itemwait)))))
-	 ;; (prereqs-not-met (mt:lazy-get-prereqs-not-met run-id waitons item-path mode: testmode itemmap: itemmap))
-	 (fails           (runs:calc-fails prereqs-not-met))
-	 (prereq-fails    (runs:calc-prereq-fail prereqs-not-met))
-	 (non-completed   (runs:calc-not-completed prereqs-not-met))
-	 (runnables       (runs:calc-runnable prereqs-not-met))
-         (unexpanded-prereqs
-          (filter (lambda (testname)
-                    (let* ((test-rec (hash-table-ref test-records testname))
-                           (items       (tests:testqueue-get-items  test-rec)))
-                      ;;(BB> "HEY " testname "=>"items)
-                      (or (procedure? items)(eq? items 'have-procedure))))
-                  waitons))
-
-
-         )
-    (debug:print-info 4 *default-log-port* "START OF INNER COND #2 "
-		      "\n can-run-more:    " can-run-more
-		      "\n testname:        " hed
-		      "\n prereqs-not-met: " (runs:pretty-string prereqs-not-met)
-		      "\n non-completed:   " (runs:pretty-string non-completed) 
-		      "\n prereq-fails:    " (runs:pretty-string prereq-fails)
-		      "\n fails:           " (runs:pretty-string fails)
-		      "\n testmode:        " testmode
-		      "\n (member 'toplevel testmode): " (member 'toplevel testmode)
-		      "\n (null? non-completed):    " (null? non-completed)
-		      "\n reruns:          " reruns
-		      "\n items:           " items
-		      "\n can-run-more:    " can-run-more)
-
-   (cond
-     ;; all prereqs met, fire off the test
-     ;; or, if it is a 'toplevel test and all prereqs not met are COMPLETED then launch
-
-    ((and (not (member 'toplevel testmode))
-	   (member (hash-table-ref/default test-registry (db:test-make-full-name hed item-path) 'n/a)
-		   '(DONOTRUN removed CANNOTRUN))) ;; *common:cant-run-states-sym*) ;; '(COMPLETED KILLED WAIVED UNKNOWN INCOMPLETE)) ;; try to catch repeat processing of COMPLETED tests here
-      (debug:print-info 4 *default-log-port* "cond branch - "  "ei-1")
-      (debug:print-info 1 *default-log-port* "Test " hed " set to \"" (hash-table-ref test-registry (db:test-make-full-name hed item-path)) "\". Removing it from the queue")
-      (if (or (not (null? tal))
-	      (not (null? reg)))
-          (runs:loop-values tal reg reglen regfull reruns)
-	  (begin
-	    (debug:print-info 0 *default-log-port* "Nothing left in the queue!")
-	    ;; If get here twice then we know we've tried to expand all items
-	    ;; since there must be a logic issue with the handling of loops in the 
-	    ;; items expand phase we will brute force an exit here.
-	    (if (> runs:nothing-left-in-queue-count 2)
-		(begin
-		  (debug:print 0 *default-log-port* "WARNING: this condition is triggered when there were no items to expand and nothing to run. Please check your run for completeness")
-		  (exit 0))
-		(set! runs:nothing-left-in-queue-count (+ runs:nothing-left-in-queue-count 1)))
-	    #f)))
-
-     ;; desired result of below cond branch:
-     ;;   we want to expand items in our test of interest (hed) in the following cases:
-     ;;    case 1 - mode is itemmatch or itemwait: 
-     ;;       - all prereq tests have been expanded
-     ;;       - at least one prereq's items have completed
-     ;;    case 2 - mode is toplevel   
-     ;;       - prereqs are completed.
-     ;;       - or no prereqs can complete 
-     ;;    case 3 - mode not specified 
-     ;;       - prereqs are completed and passed (we could consider removing "and passed" -- it would change behavior from current)          
-    ((or (null? prereqs-not-met)
-	  (and (member 'toplevel testmode)
-	       (null? non-completed)))
-      (debug:print-info 4 *default-log-port* "cond branch - "  "ei-2")
-      (debug:print-info 4 *default-log-port* "runs:expand-items: (or (null? prereqs-not-met) (and (member 'toplevel testmode)(null? non-completed)))")
-      (let ((test-name (tests:testqueue-get-testname test-record)))
-	(setenv "MT_TEST_NAME" test-name) ;; 
-	(setenv "MT_RUNNAME"   runname)
-	(runs:set-megatest-env-vars run-id inrunname: runname) ;; these may be needed by the launching process
-	(let ((items-list (items:get-items-from-config tconfig)))
-	  (if (list? items-list)
-	      (begin
-		(if (null? items-list)
-		    (let ((test-id   (rmt:get-test-id run-id test-name ""))
-			  (num-items (rmt:test-toplevel-num-items run-id test-name)))
-		      (if (and test-id
-			       (not (> num-items 0)))
-			  (mt:test-set-state-status-by-id run-id test-id "NOT_STARTED" "ZERO_ITEMS" "Failed to run due to failed prerequisites"))))
-		(tests:testqueue-set-items! test-record items-list)
-		(list hed tal reg reruns))
-	      (begin
-		(debug:print-error 0 *default-log-port* "The proc from reading the items table did not yield a list - please report this")
-		(exit 1))))))
-
-    ((and (null? fails)
-	   (null? prereq-fails)
-	   (not (null? non-completed)))
-      (debug:print-info 4 *default-log-port* "cond branch - "  "ei-3")
-      (let* ((allinqueue (map (lambda (x)(if (string? x) x (db:test-get-testname x)))
-        		      (append newtal reruns)))
-	     ;; prereqstrs is a list of test names as strings that are prereqs for hed
-             (prereqstrs (delete-duplicates (map (lambda (x)(if (string? x) x (db:test-get-testname x)))
-						 prereqs-not-met)))
-	     ;; a prereq that is not found in allinqueue will be put in the notinqueue list
-	     ;; 
-             ;; (notinqueue (filter (lambda (x)
-             ;;    		   (not (member x allinqueue)))
-             ;;    		 prereqstrs))
-	     (give-up    #f))
-
-	;; We can get here when a prereq has not been run due to *it* having a prereq that failed.
-	;; We need to use this to dequeue this item as CANNOTRUN
-	;; 
-	(if (member 'toplevel testmode) ;; '(toplevel)) ;; NOTE: this probably should be (member 'toplevel testmode)
-	    (for-each (lambda (prereq)
-			(if (eq? (hash-table-ref/default test-registry prereq 'justfine) 'CANNOTRUN)
-			    (set! give-up #t)))
-		      prereqstrs))
-
-	(if (and give-up
-		 (not (and (null? tal)(null? reg))))
-	    (let ((trimmed-tal (mt:discard-blocked-tests run-id hed tal test-records))
-		  (trimmed-reg (mt:discard-blocked-tests run-id hed reg test-records)))
-	      (debug:print 1 *default-log-port* "WARNING: test " hed " has discarded prerequisites, removing it from the queue")
-
-	      (let ((test-id (rmt:get-test-id run-id hed "")))
-		(if test-id (mt:test-set-state-status-by-id run-id test-id "COMPLETED" "PREQ_DISCARDED" "Failed to run due to discarded prerequisites")))
-	      
-	      (if (and (null? trimmed-tal)
-		       (null? trimmed-reg))
-		  #f
-                  (runs:loop-values trimmed-tal trimmed-reg reglen regfull reruns)
-                  ))
-	      (list (car newtal)(append (cdr newtal) reg) '() reruns))))
-
-    ((and (null? fails) ;; have not-started tests, but unable to run them.  everything looks completed with no prospect of unsticking something that is stuck.  we should mark hed as moribund and exit or continue if there are more tests to consider
-	   (null? prereq-fails)
-	   (null? non-completed))
-     (debug:print-info 4 *default-log-port* "cond branch - "  "ei-4")
-      (if  (runs:can-keep-running? hed 20)
-	  (begin
-	    (runs:inc-cant-run-tests hed)
-	    (debug:print-info 0 *default-log-port* "no fails in prerequisites for " hed " but also none running, keeping " hed " for now. Try count: " (hash-table-ref/default *seen-cant-run-tests* hed 0) ", going to wait 60 sec.") ;; 
-	    ;; getting here likely means the system is way overloaded, kill a full minute before continuing
-	    ;; (thread-sleep! 60) ;; TODO: gate by normalized server load > 1.0 (maxload config thing) CHECKTHIS!!!
-	    ;; No runsdat, can't do this yet
-	    ;; (if (runs:dat-load-mgmt-function runsdat)((runs:dat-load-mgmt-function runsdat)))
-	    ;;
-	    (thread-sleep! 5) ;; TODO: gate by normalized server load > 1.0 (maxload config thing)
-	    ;; num-retries code was here
-	    ;; we use this opportunity to move contents of reg to tal
-	    (list (car newtal)(append (cdr newtal) reg) '() reruns)) ;; an issue with prereqs not yet met?
-	  (begin
-	    (debug:print-info 1 *default-log-port* "no fails in prerequisites for " hed " but nothing seen running in a while, dropping test " hed " from the run queue")
-	    (let ((test-id (rmt:get-test-id run-id hed "")))
-	      (if test-id (mt:test-set-state-status-by-id run-id test-id "NOT_STARTED" "TIMED_OUT" "Nothing seen running in a while.")))
-            (runs:loop-values tal reg reglen regfull reruns)
-            )))
-
-    ((and 
-       (or (not (null? fails))
-	   (not (null? prereq-fails)))
-       (member 'normal testmode))
-      (debug:print-info 4 *default-log-port* "cond branch - "  "ei-5")
-      (debug:print-info 1 *default-log-port* "test "  hed " (mode=" testmode ") has failed prerequisite(s); "
-			(string-intersperse (map (lambda (t)(conc (db:test-get-testname t) ":" (db:test-get-state t)"/"(db:test-get-status t))) fails) ", ")
-			", removing it from to-do list")
-      (let ((test-id (rmt:get-test-id run-id hed "")))
-	(if test-id
-	    (if (not (null? prereq-fails))
-		(mt:test-set-state-status-by-id-unless-completed run-id test-id "COMPLETED" "PREQ_DISCARDED" "Failed to run due to prior failed prerequisites")
-		(mt:test-set-state-status-by-id-unless-completed run-id test-id "COMPLETED" "PREQ_FAIL"      "Failed to run due to failed prerequisites"))))
-      ;; (debug:print 4 *default-log-port*"BB> set PREQ_FAIL on "hed)
-      ;; (mt:test-set-state-status-by-id run-id test-id "NOT_STARTED" "PREQ_FAIL"      "Failed to run due to failed prerequisites")))) ;; BB: this works, btu equivalent for itemwait mode does not work.
-      (if (or (not (null? reg))(not (null? tal)))
-	  (begin
-	    (hash-table-set! test-registry hed 'CANNOTRUN)
-            (runs:loop-values tal reg reglen regfull (cons hed reruns))
-            )
-	  #f)) ;; #f flags do not loop
-      
-     ((and (not (null? fails))(member 'toplevel testmode))
-      (debug:print-info 4 *default-log-port* "cond branch - "  "ei-6")
-      (if (or (not (null? reg))(not (null? tal)))
-	   (list (car newtal)(append (cdr newtal) reg) '() reruns)
-	  #f)) 
-     ((null? runnables)
-      (debug:print-info 4 *default-log-port* "cond branch - "  "ei-7")
-      #f) ;; if we get here and non-completed is null then it is all over.
-     (else
-      (debug:print-info 4 *default-log-port* "cond branch - "  "ei-8")
-      (debug:print 0 *default-log-port* "WARNING: FAILS or incomplete tests maybe preventing completion of this run. Watch for issues with test " hed ", continuing for now")
-      (list (car newtal)(cdr newtal) reg reruns)))))
-
-(define (runs:mixed-list-testname-and-testrec->list-of-strings inlst)
-  (if (null? inlst)
-      '()
-      (map (lambda (t)
-	     (cond
-	      ((vector? t)
-	       (let ((test-name (db:test-get-testname t))
-		     (item-path (db:test-get-item-path t))
-		     (test-state (db:test-get-state t))
-		     (test-status (db:test-get-status t)))
-		 (conc test-name (if (equal? item-path "") "" "/") item-path ":" test-state "/" test-status)))
-	      ((string? t)
-	       t)
-	      (else 
-	       (conc t))))
-	   inlst)))
-
-
-;;  hed tal reg reruns reglen regfull test-record runname test-name item-path jobgroup max-concurrent-jobs run-id waitons item-path testmode test-patts required-tests test-registry registry-mutex flags keyvals run-info newtal all-tests-registry itemmaps)
-(define (runs:process-expanded-tests runsdat testdat)
-  ;; unroll the contents of runsdat and testdat (due to ongoing refactoring).
-  (debug:print 2 *default-log-port* "runs:process-expanded-tests; testdat:" )
-  (debug:print 2 *default-log-port* (with-output-to-string
-                                            (lambda () (pp (runs:testdat->alist testdat) ))))
-  (let* ((hed                    (runs:testdat-hed testdat))
-	 (tal                    (runs:testdat-tal testdat))
-	 (reg                    (runs:testdat-reg testdat))
-	 (reruns                 (runs:testdat-reruns testdat))
-	 (test-name              (runs:testdat-test-name testdat))
-	 (item-path              (runs:testdat-item-path testdat))
-	 (jobgroup               (runs:testdat-jobgroup testdat))
-	 (waitons                (runs:testdat-waitons testdat))
-	 (item-path              (runs:testdat-item-path testdat))
-	 (testmode               (runs:testdat-testmode testdat))
-	 (newtal                 (runs:testdat-newtal testdat))
-	 (itemmaps               (runs:testdat-itemmaps testdat))
-	 (test-record            (runs:testdat-test-record testdat))
-	 (prereqs-not-met        (runs:testdat-prereqs-not-met testdat))
-
-	 (reglen                 (runs:dat-reglen runsdat))
-	 (regfull                (runs:dat-regfull runsdat))
-	 (runname                (runs:dat-runname runsdat))
-	 (max-concurrent-jobs    (runs:dat-max-concurrent-jobs runsdat))
-	 (run-id                 (runs:dat-run-id runsdat))
-	 (test-patts             (runs:dat-test-patts runsdat))
-	 (required-tests         (runs:dat-required-tests runsdat))
-	 (test-registry          (runs:dat-test-registry runsdat))
-	 (registry-mutex         (runs:dat-registry-mutex runsdat))
-	 (flags                  (runs:dat-flags runsdat))
-	 (keyvals                (runs:dat-keyvals runsdat))
-	 (run-info               (runs:dat-run-info runsdat))
-	 (all-tests-registry     (runs:dat-all-tests-registry runsdat))
-	 (run-limits-info        (runs:dat-can-run-more-tests runsdat))
-	 ;; (runs:can-run-more-tests run-id jobgroup max-concurrent-jobs)) ;; look at the test jobgroup and tot jobs running
-	 (have-resources         (car run-limits-info))
-	 (num-running            (list-ref run-limits-info 1))
-	 (num-running-in-jobgroup(list-ref run-limits-info 2)) 
-	 (max-concurrent-jobs    (list-ref run-limits-info 3))
-	 (job-group-limit        (list-ref run-limits-info 4))
-	 ;; (prereqs-not-met        (rmt:get-prereqs-not-met run-id waitons hed item-path mode: testmode itemmaps: itemmaps))
-	 ;; (prereqs-not-met         (mt:lazy-get-prereqs-not-met run-id waitons item-path mode: testmode itemmap: itemmap))
-	 (fails                  (if (list? prereqs-not-met) ;; TODO: rename fails to failed-prereqs
-				      (runs:calc-fails prereqs-not-met)
-				      (begin
-					(debug:print-error 0 *default-log-port* "prereqs-not-met is not a list! " prereqs-not-met)
-					'())))
-	 (non-completed           (filter (lambda (x)             ;; remove hed from not completed list, duh, of course it is not completed!
-					    (not (equal? x hed)))
-					  (runs:calc-not-completed prereqs-not-met)))
-	 (loop-list               (list hed tal reg reruns))
-	 ;; configure the load runner
-	 (maxload                 (string->number (or (configf:lookup *configdat* "jobtools" "maxload") "3.0")))         ;; use a non-number string to disable
-         (maxhomehostload         (string->number (or (configf:lookup *configdat* "jobtools" "maxhomehostload") "2.0"))) ;; use a non-number string to disable
-         (waitdelay               (string->number (or (configf:lookup *configdat* "jobtools" "waitdelay") "60"))))
-    (debug:print-info 4 *default-log-port* "have-resources: " have-resources " prereqs-not-met: (" 
-		      (string-intersperse 
-		       (map (lambda (t)
-			      (if (vector? t)
-				  (conc (db:test-get-state t) "/" (db:test-get-status t))
-				  (conc " WARNING: t is not a vector=" t )))
-			    prereqs-not-met)
-		       ", ") ") fails: " fails
-		       "\nregistered? " (hash-table-ref/default test-registry (db:test-make-full-name test-name item-path) #f))
-			    
-    ;; well, first lets see if cpu load throttling is enabled. If so wait around until the
-    ;; average cpu load is under the threshold before continuing
-    ;;
-    (if (runs:dat-load-mgmt-function runsdat)
-	((runs:dat-load-mgmt-function runsdat))
-	(runs:dat-load-mgmt-function-set!
-	 runsdat
-	 (lambda ()
-	   ;; jobtools maxload is useful for where the full Megatest run is done on one machine
-	   (if (and (not (common:on-homehost?))
-		    maxload) ;; only gate if maxload is specified, NOTE: maxload is normalized, i.e. load=1 means all cpus fully utilized
-	       (common:wait-for-normalized-load maxload "Waiting for load to drop before starting more tests" #f))
-	   
-	   ;; jobtools maxhomehostload is intended to prevent overloading on the homehost which can cause database corruption issues
-	   (if maxhomehostload
-	       (common:wait-for-homehost-load maxhomehostload
-					      (conc "Waiting for homehost load to drop below normalized value of " maxhomehostload))))))
-    
- 
-    
-    (if (and (not (null? prereqs-not-met))
-	     (runs:lownoise (conc "waiting on tests " prereqs-not-met hed) 60))
-	(debug:print-info 2 *default-log-port* "waiting on tests; " (string-intersperse (runs:mixed-list-testname-and-testrec->list-of-strings prereqs-not-met) ", ")))
-
-    ;; Don't know at this time if the test have been launched at some time in the past
-    ;; i.e. is this a re-launch?
-    (debug:print-info 4 *default-log-port* "run-limits-info = " run-limits-info)
-    
-    (cond ; cond 894- 1067
-     
-     ;; Check item path against item-patts, 
-     ;;
-     ((not (tests:match test-patts (tests:testqueue-get-testname test-record) item-path required: required-tests)) ;; This test/itempath is not to be run
-      ;; else the run is stuck, temporarily or permanently
-      ;; but should check if it is due to lack of resources vs. prerequisites
-      (debug:print-info 1 *default-log-port* "Skipping " (tests:testqueue-get-testname test-record) " " item-path " as it doesn't match " test-patts)
-      (if (or (not (null? tal))(not (null? reg)))
-	  (runs:loop-values tal reg reglen regfull reruns)
-	  #f))
-     
-     ;; Register tests 
-     ;;
-     ((not (hash-table-ref/default test-registry (db:test-make-full-name test-name item-path) #f))
-      (debug:print-info 4 *default-log-port* "Pre-registering test " test-name "/" item-path " to create placeholder" )
-      ;; always do firm registration now in v1.60 and greater ;; (eq? *transport-type* 'fs) ;; no point in parallel registration if use fs
-      (let register-loop ((numtries 15))
-	(rmt:register-test run-id test-name item-path)
-	(if (rmt:get-test-id run-id test-name item-path)
-	    (hash-table-set! test-registry (db:test-make-full-name test-name item-path) 'done)
-	    (if (> numtries 0)
-		(begin
-		  (thread-sleep! 0.5)
-		  (register-loop (- numtries 1)))
-		(debug:print-error 0 *default-log-port* "failed to register test " (db:test-make-full-name test-name item-path)))))
-      (if (not (eq? (hash-table-ref/default test-registry (db:test-make-full-name test-name "") #f) 'done))
-	  (begin
-	    (rmt:register-test run-id test-name "")
-	    (if (rmt:get-test-id run-id test-name "")
-		(hash-table-set! test-registry (db:test-make-full-name test-name "") 'done))))
-      (runs:shrink-can-run-more-tests-count runsdat)   ;; DELAY TWEAKER (still needed?)
-      (if (and (null? tal)(null? reg))
-	  (list hed tal (append reg (list hed)) reruns)
-	  (list (runs:queue-next-hed tal reg reglen regfull) ;; cannot replace with a call to runs:loop-values as the logic is different for reg
-		(runs:queue-next-tal tal reg reglen regfull)
-		;; NB// Here we are building reg as we register tests
-		;; if regfull we must pop the front item off reg
-		(if regfull
-		    (append (cdr reg) (list hed))
-		    (append reg (list hed)))
-		reruns)))
-     
-     ;; At this point hed test registration must be completed.
-     ;;
-     ((eq? (hash-table-ref/default test-registry (db:test-make-full-name test-name item-path) #f)
-	   'start)
-      (debug:print-info 0 *default-log-port* "Waiting on test registration(s): "
-			(string-intersperse 
-			 (filter (lambda (x)
-				   (eq? (hash-table-ref/default test-registry x #f) 'start))
-				 (hash-table-keys test-registry))
-			 ", "))
-      (thread-sleep! 0.051)
-      (list hed tal reg reruns))
-     
-     ;; If no resources are available just kill time and loop again
-     ;;
-     ((not have-resources) ;; simply try again after waiting a second
-      (if (runs:lownoise "no resources" 60)
-	  (debug:print-info 1 *default-log-port* "no resources to run new tests, waiting ..."))
-      ;; Have gone back and forth on this but db starvation is an issue.
-      ;; wait one second before looking again to run jobs.
-      (thread-sleep! 0.25)
-      ;; could have done hed tal here but doing car/cdr of newtal to rotate tests
-      (list (car newtal)(cdr newtal) reg reruns))
-     
-     ;; This is the final stage, everything is in place so launch the test
-     ;;
-     ((and have-resources
-	   (or (null? prereqs-not-met)
-	       (and (member 'toplevel testmode) ;;  'toplevel)
-		    (null? non-completed)
-		    (not (member 'exclusive testmode)))))
-      ;; (hash-table-delete! *max-tries-hash* (db:test-make-full-name test-name item-path))
-      ;; we are going to reset all the counters for test retries by setting a new hash table
-      ;; this means they will increment only when nothing can be run
-      (set! *max-tries-hash* (make-hash-table))
-      
-      (run:test run-id run-info keyvals runname test-record flags #f test-registry all-tests-registry runsdat testdat)
-      (runs:incremental-print-results run-id)
-      (hash-table-set! test-registry (db:test-make-full-name test-name item-path) 'running)
-      (runs:shrink-can-run-more-tests-count runsdat)  ;; DELAY TWEAKER (still needed?)
-      ;; (thread-sleep! *global-delta*)
-      (if (or (not (null? tal))(not (null? reg)))
-	  (runs:loop-values tal reg reglen regfull reruns) ;; hed should be dropped at this time
-	  #f))
-     
-     ;; must be we have unmet prerequisites
-     ;;
-     (else
-      (debug:print 4 *default-log-port* "FAILS: " fails)
-      ;; If one or more of the prereqs-not-met are FAIL then we can issue
-      ;; a message and drop hed from the items to be processed.
-      ;; (runs:mixed-list-testname-and-testrec->list-of-strings prereqs-not-met)
-      (if (and (not (null? prereqs-not-met))
-	       (runs:lownoise (conc "waiting on tests " prereqs-not-met hed) 60))
-	  (debug:print-info 1 *default-log-port* "waiting on tests; " (string-intersperse 
-						    (runs:mixed-list-testname-and-testrec->list-of-strings 
-						     prereqs-not-met) ", ")))
-      (if (or (null? fails)
-	      (member 'toplevel testmode))
-	  (begin
-	    ;; couldn't run, take a breather
-	    (if  (runs:lownoise "Waiting for more work to do..." 60)
-		 (debug:print-info 0 *default-log-port* "Waiting for more work to do..."))
-	    
-	    ;; (if (runs:dat-load-mgmt-function runsdat)((runs:dat-load-mgmt-function runsdat)))
-	    (thread-sleep! 5)
-	    (list (car newtal)(cdr newtal) reg reruns))
-	  ;; the waiton is FAIL so no point in trying to run hed ever again
-	  (begin
-            (let ((my-test-id (rmt:get-test-id run-id test-name item-path)))
-              (mt:test-set-state-status-by-id-unless-completed run-id my-test-id "COMPLETED" "PREQ_FAIL" "Failed to run due to failed prerequisites2"))            
-            (if (or (not (null? reg))(not (null? tal)))
-                (if (vector? hed)
-		  (begin
-		    (debug:print 1 *default-log-port* "WARNING: Dropping test " test-name "/" item-path
-				 " from the launch list as it has prerequistes that are FAIL")
-		    (let ((test-id (rmt:get-test-id run-id hed "")))
-		      (if test-id (mt:test-set-state-status-by-id-unless-completed run-id test-id "COMPLETED" "PREQ_FAIL" "Failed to run due to failed prerequisites")))
-		    (runs:shrink-can-run-more-tests-count runsdat) ;; DELAY TWEAKER (still needed?)
-		    ;; (thread-sleep! *global-delta*)
-		    ;; This next is for the items
-
-                    (if (not (null? fails))
-                        ;;(mt:test-set-state-status-by-testname run-id test-name item-path "NOT_STARTED" "PREQ_FAIL" #f)
-                        (rmt:set-state-status-and-roll-up-items run-id test-name item-path "NOT_STARTED" "PREQ_FAIL" #f) 
-                        ;;(mt:test-set-state-status-by-testname run-id test-name item-path "NOT_STARTED" "BLOCKED" #f)
-                        (rmt:set-state-status-and-roll-up-items run-id test-name item-path "NOT_STARTED" "BLOCKED" #f) )
-		    (hash-table-set! test-registry (db:test-make-full-name test-name item-path) 'removed)
-		    (runs:loop-values tal reg reglen regfull reruns))
-		  (let ((nth-try (hash-table-ref/default test-registry hed 0))) ;; hed not a vector...
-                    (debug:print 2 *default-log-port* "nth-try("hed")="nth-try)
-		    (cond
-		     ((member "RUNNING" (map db:test-get-state prereqs-not-met))
-		      (if (runs:lownoise (conc "possible RUNNING prerequistes " hed) 60)
-			  (debug:print 0 *default-log-port* "WARNING: test " hed " has possible RUNNING prerequisites, don't give up on it yet."))
-		      (thread-sleep! 0.1)
-		      (runs:loop-values tal reg reglen regfull reruns))
-		     ((or (not nth-try) ;; BB: condition on subsequent tries, condition below fires on first try 
-			  (and (number? nth-try)
-			       (< nth-try 2)))
-		      (hash-table-set! test-registry hed (if (number? nth-try)
-							     (+ nth-try 1)
-							     0))
-		      (if (runs:lownoise (conc "not removing test " hed) 60)
-			  (debug:print 1 *default-log-port* "WARNING: not removing test " hed " from queue although it may not be runnable due to FAILED prerequisites"))
-		      ;; may not have processed correctly. Could be a race condition in your test implementation? Dropping test " hed) ;;  " as it has prerequistes that are FAIL. (NOTE: hed is not a vector)")
-		      (runs:shrink-can-run-more-tests-count runsdat) ;; DELAY TWEAKER (still needed?)
-		      (runs:loop-values newtal reg reglen regfull reruns))
-		     ((symbol? nth-try) ;; BB: 'done matches here in one case where prereq itemwait failed.  This is first "try"
-		      (if (eq? nth-try 'removed) ;; removed is removed - drop it NOW
-			  (if (null? tal)
-			      #f ;; yes, really
-			      (list (car tal)(cdr tal) reg reruns))
-			  (begin
-			    (if (runs:lownoise (conc "FAILED prerequisites or other issue" hed) 60)
-				(debug:print 0 *default-log-port* "WARNING: test " hed " has FAILED prerequisites or other issue. Internal state >" nth-try "< will be overridden and we'll retry."))
-			    ;; was: (mt:test-set-state-status-by-testname run-id test-name item-path "NOT_STARTED" "KEEP_TRYING" #f)
-                            (mt:test-set-state-status-by-testname-unless-completed run-id test-name item-path "COMPLETED" "PREQ_FAIL" #f)
-			    (hash-table-set! test-registry hed 'removed) ;; was 0
-                            (if (not (and (null? reg) (null? tal)))
-                                (runs:loop-values tal reg reglen regfull reruns)
-                                #f))))
-		     (else
-		      (if (runs:lownoise (conc "FAILED prerequitests and we tried" hed) 60)
-			  (debug:print 0 *default-log-port* "WARNING: test " hed " has FAILED prerequitests and we've tried at least 10 times to run it. Giving up now."))
-		      ;; (debug:print 0 *default-log-port* "         prereqs: " prereqs-not-met)
-		      (hash-table-set! test-registry hed 'removed)
-		      (mt:test-set-state-status-by-testname run-id test-name item-path "NOT_STARTED" "TEN_STRIKES" #f)
-		      ;; I'm unclear on if this roll up is needed - it may be the root cause of the "all set to FAIL" bug.
-		      (rmt:set-state-status-and-roll-up-items run-id test-name item-path #f "FAIL" #f) ;; treat as FAIL
-		      (list (if (null? tal)(car newtal)(car tal))
-			    tal
-			    reg
-			    reruns)))))
-                ;; ELSE: can't drop this - maybe running? Just keep trying
-
-                ;;(if (not (or (not (null? reg))(not (null? tal)))) ;; old experiment
-                (let ((runable-tests (runs:runable-tests prereqs-not-met))) ;; SUSPICIOUS: Should look at more than just prereqs-not-met?
-                  (if (null? runable-tests)
-                      #f   ;; I think we are truly done here
-                      (runs:loop-values newtal reg reglen regfull reruns)))
-                ;;) ;;from old experiment
-                ) ;; end if (or (not (null? reg))(not (null? tal)))
-            ))))))
-
-;; scan a list of tests looking to see if any are potentially runnable
-;;
-(define (runs:runable-tests tests)
-  (filter (lambda (t)
-	    (if (not (vector? t))
-		t
-		(let ((state  (db:test-get-state t))
-		      (status (db:test-get-status t)))
-		  (case (string->symbol state)
-		    ((COMPLETED INCOMPLETE) #f)
-		    ((NOT_STARTED)
-		     (if (member status '("TEN_STRIKES" "BLOCKED" "PREQ_FAIL" "ZERO_ITEMS" "PREQ_DISCARDED" "TIMED_OUT" ))
-			 #f
-			 t))
-		    ((DELETED) #f)
-		    (else t)))))
-	  tests))
-
-;; move all the miscellanea into this struct
-;;
-(defstruct runs:gendat inc-results inc-results-last-update inc-results-fmt run-info runname target)
-
-(define *runs:general-data* 
-  (make-runs:gendat
-   inc-results: (make-hash-table)
-   inc-results-last-update: 0
-   inc-results-fmt: "~12a~12a~20a~12a~40a\n" ;; state status time duration test-name item-path
-   run-info: #f
-   runname: #f
-   target: #f
-   )
-  )
-
-(define (runs:incremental-print-results run-id)
-  (let ((curr-sec    (current-seconds))
-	(last-update (runs:gendat-inc-results-last-update *runs:general-data*)))
-    (if (> (- curr-sec last-update) 5) ;; at least five seconds since last update
-	(let* ((run-dat  (or (runs:gendat-run-info *runs:general-data*)(rmt:get-run-info run-id)))
-	       (runname  (or (runs:gendat-runname *runs:general-data*)
-			     (db:get-value-by-header (db:get-rows run-dat)
-						     (db:get-header run-dat) "runname")))
-	       (target   (or (runs:gendat-target *runs:general-data*)(rmt:get-target run-id)))
-	       (testsdat (let ((res (rmt:get-tests-for-run
-				     run-id "%" '() '() ;; run-id testpatt states statuses
-				     #f #f ;; offset limit
-				     #f ;; not-in
-				     #f ;; sort-by
-				     #f ;; sort-order
-				     #f ;; get full data (not 'shortlist)
-				     last-update
-				     'dashboard)))
-			   (if (list? res)
-			       res
-			       (begin
-				 (debug:print-error
-				  0 *default-log-port*
-				  "FAILED TO GET DATA using rmt:get-tests-for-run. Notify developers if you see this. result: " res)
-				 '())))))
-	  (runs:gendat-inc-results-last-update-set! *runs:general-data* (- curr-sec 1))
-	  (if (not (runs:gendat-run-info *runs:general-data*))
-	      (runs:gendat-run-info-set! *runs:general-data* run-dat))
-	  (if (not (runs:gendat-runname  *runs:general-data*))
-	      (runs:gendat-runname-set! *runs:general-data* runname))
-	  (if (not (runs:gendat-target *runs:general-data*))
-	      (runs:gendat-target-set! *runs:general-data* target))
-	  (for-each
-	   (lambda (testdat)
-	     (let* ((test-id    (db:test-get-id           testdat))
-		    (prevdat    (hash-table-ref/default   (runs:gendat-inc-results *runs:general-data*)
-							  (conc run-id "," test-id) #f))
-		    (test-name  (db:test-get-testname     testdat))
-		    (item-path  (db:test-get-item-path    testdat))
-		    (state      (db:test-get-state        testdat))
-		    (status     (db:test-get-status       testdat))
-		    (event-time (db:test-get-event_time   testdat))
-		    (duration   (db:test-get-run_duration testdat)))
-	       (if (and (not (member state '("DELETED" "REMOTEHOSTSTART" "RUNNING" "LAUNCHED""NOT_STARTED")))
-			(not (and prevdat
-				  (equal? state  (db:test-get-state  prevdat))
-				  (equal? status (db:test-get-status prevdat)))))
-		   (let ((fmt   (runs:gendat-inc-results-fmt *runs:general-data*))
-			 (dtime (seconds->year-work-week/day-time event-time))) 
-		     (if (runs:lownoise "inc-print" 600)
-			 (format #t fmt "State" "Status" "Start Time" "Duration" "Test path"))
-		     ;; (debug:print 0 *default-log-port* "fmt: " fmt " state: " state " status: " status " test-name: " test-name " item-path: " item-path " dtime: " dtime)
-		     ;; (debug:print 0 #f "event-time: " event-time " duration: " duration)
-		     (format #t fmt
-			     state
-			     status
-			     dtime
-			     (seconds->hr-min-sec duration)
-			     (conc "lt/" target "/" runname "/" test-name (if (string-null? item-path) "" (conc "/" item-path))))
-		     (hash-table-set! (runs:gendat-inc-results *runs:general-data*) (conc run-id "," test-id) testdat)))))
-	   testsdat)))
-
-    ;; I don't think this should be here? -- Matt
-    #;(runs:gendat-inc-results-last-update-set! *runs:general-data* (- curr-sec 10))
-
-    ))
-
-;; every time though the loop increment the test/itempatt val.
-;; when the min is > max-allowed and none running then force exit
-;;
-(define *max-tries-hash* (make-hash-table))
-
-(define (runs:pretty-long-list lst)
-   (if (> (length lst) 8)(append (take lst 3)(list "...")) lst))
-
-;;======================================================================
-;; runs:run-tests-queue is called by runs:run-tests
-;;======================================================================
-;;
-;; test-records is a hash table testname:item_path => vector < testname testconfig waitons priority items-info ... >
-(define (runs:run-tests-queue run-id runname test-records keyvals flags test-patts required-tests reglen-in all-tests-registry)
-  ;; At this point the list of parent tests is expanded 
-  ;; NB// Should expand items here and then insert into the run queue.
-  (debug:print 5 *default-log-port* "test-records: " test-records ", flags: " (hash-table->alist flags))
-
-  ;; Do mark-and-find clean up of db before starting runing of quue
-  ;;
-  ;; (rmt:find-and-mark-incomplete)
-
-  (let* ((run-info              (rmt:get-run-info run-id))
-         (tests-info            (mt:get-tests-for-run run-id #f '() '())) ;;  qryvals: "id,testname,item_path"))
-         (sorted-test-names     (tests:sort-by-priority-and-waiton test-records))
-         (test-registry         (make-hash-table))
-         (registry-mutex        (make-mutex))
-         (num-retries           0)
-         (max-retries           (configf:lookup *configdat* "setup" "maxretries"))
-         (max-concurrent-jobs   (configf:lookup-number *configdat* "setup" "max_concurrent_jobs" default: 50))
-         (reglen                (if (number? reglen-in) reglen-in 1))
-         (last-time-incomplete  (- (current-seconds) 900)) ;; force at least one clean up cycle
-         (last-time-some-running (current-seconds))
-         ;; (tdbdat                (tasks:open-db))
-         (runsdat (make-runs:dat
-                   ;; hed: hed
-                   ;; tal: tal
-                   ;; reg: reg
-                   ;; reruns: reruns
-                   reglen: reglen
-                   regfull: #f ;; regfull
-                   ;; test-record: test-record
-                   runname: runname
-                   ;; test-name: test-name
-                   ;; item-path: item-path
-                   ;; jobgroup: jobgroup
-                   max-concurrent-jobs: max-concurrent-jobs
-                   run-id: run-id
-                   ;; waitons: waitons
-                   ;; testmode: testmode
-                   test-patts: test-patts
-                   required-tests: required-tests
-                   test-registry: test-registry
-                   registry-mutex: registry-mutex
-                   flags: flags
-                   keyvals: keyvals
-                   run-info: run-info
-                   ;; newtal: newtal
-                   all-tests-registry: all-tests-registry
-                   ;; itemmaps: itemmaps
-                   ;; prereqs-not-met: (rmt:get-prereqs-not-met run-id waitons hed item-path mode: testmode itemmaps: itemmaps)
-                   ;; can-run-more-tests: (runs:can-run-more-tests run-id jobgroup max-concurrent-jobs) ;; look at the test jobgroup and tot jobs running
-                   )))
-
-    ;; Initialize the test-registery hash with tests that already have a record
-    ;; convert state to symbol and use that as the hash value
-    (for-each (lambda (trec)
-		(let ((id (db:test-get-id        trec))
-		      (tn (db:test-get-testname  trec))
-		      (ip (db:test-get-item-path trec))
-		      (st (db:test-get-state     trec)))
-		  (if (not (equal? st "DELETED"))
-		      (hash-table-set! test-registry (db:test-make-full-name tn ip) (string->symbol st)))))
-	      tests-info)
-    (set! max-retries (if (and max-retries (string->number max-retries))(string->number max-retries) 100))
-
-    (let loop ((hed         (car sorted-test-names))
-               (tal         (cdr sorted-test-names))
-	       (reg         '()) ;; registered, put these at the head of tal 
-	       (reruns      '()))
-
-      (runs:incremental-print-results run-id)
-
-      (if (not (null? reruns))(debug:print-info 4 *default-log-port* "reruns=" reruns))
-
-      ;; Here we mark any old defunct tests as incomplete. Do this every fifteen minutes
-      ;; moving this to a parallel thread and just run it once.
-      ;;
-      (if (> (current-seconds)(+ last-time-incomplete 900))
-          (begin
-            (set! last-time-incomplete (current-seconds))
-            ;; (rmt:find-and-mark-incomplete-all-runs)
-	    ))
-
-      ;; (print "Top of loop, hed=" hed ", tal=" tal " ,reruns=" reruns)
-      (let* ((test-record (hash-table-ref test-records hed))
-	     (test-name   (tests:testqueue-get-testname test-record))
-	     (tconfig     (tests:testqueue-get-testconfig test-record))
-	     (jobgroup    (configf:lookup tconfig "test_meta" "jobgroup"))
-	     (testmode    (let ((m (configf:lookup tconfig "requirements" "mode")))
-			    (if m (map string->symbol (string-split m)) '(normal))))
-	     (itemmaps    (tests:get-itemmaps tconfig)) ;;  (configf:lookup tconfig "requirements" "itemmap"))
-	     (priority    (tests:testqueue-get-priority   test-record))
-	     (itemdat     (tests:testqueue-get-itemdat    test-record)) ;; itemdat can be a string, list or #f
-	     (items       (tests:testqueue-get-items      test-record))
-	     (item-path   (item-list->path itemdat))
-	     (tfullname   (db:test-make-full-name test-name item-path))
-	      ;; these are hard coded item-item waits test/item-path => test/item-path2 ...
-	     (extra-waits (let* ((section (configf:get-section (tests:testqueue-get-testconfig test-record) "waitons"))
-				 (myextra (alist-ref tfullname section equal?)))
-			    (if myextra
-				(let ((extras (string-split (car myextra))))
-				  (if (runs:lownoise (conc tfullname "extra-waitons" tfullname) 60)
-				      (debug:print-info 0 *default-log-port* "HAVE EXTRA WAITONS for test " tfullname ": " myextra))
-				  (for-each
-				   (lambda (extra)
-				     ;; (debug:print 0 *default-log-port* "FYI: extra = " extra " reruns = " reruns)
-				     (let ((basetestname (car (string-split extra "/"))))
-				       #;(if (not (member extra tal))
-					   (set! reruns (append tal (list extra))))
-				       (if (not (member basetestname tal))
-					   (set! reruns (append tal (list basetestname))))
-				       ))
-				   extras)
-				  extras)
-				'())))
-	     (waitons     (delete-duplicates (append (tests:testqueue-get-waitons test-record) extra-waits) equal?))
-	     (newtal      (append tal (list hed)))
-	     (regfull     (>= (length reg) reglen))
-	     (num-running (rmt:get-count-tests-running-for-run-id run-id))
-	     (testdat     (make-runs:testdat
-			   hed: hed
-			   tal: tal
-			   reg: reg
-			   reruns: reruns
-			   test-record: test-record
-			   test-name:   test-name
-			   item-path:   item-path
-			   jobgroup:    jobgroup
-			   waitons:     waitons
-			   testmode:    testmode
-			   newtal:      newtal
-			   itemmaps:    itemmaps
-			   ;; prereqs-not-met: prereqs-not-met
-			   )))
-	(runs:dat-regfull-set! runsdat regfull)
-    
-	(if (> num-running 0)
-            (set! last-time-some-running (current-seconds)))
-
-        (if (> (current-seconds)(+ last-time-some-running (or (configf:lookup *configdat* "setup" "give-up-waiting") 36000)))
-            (hash-table-set! *max-tries-hash* tfullname (+ (hash-table-ref/default *max-tries-hash* tfullname 0) 1)))
-	;; (debug:print 0 *default-log-port* "max-tries-hash: " (hash-table->alist *max-tries-hash*))
-
-	;; Ensure all top level tests get registered. This way they show up as "NOT_STARTED" on the dashboard
-	;; and it is clear they *should* have run but did not.
-	(if (not (hash-table-ref/default test-registry (db:test-make-full-name test-name "") #f))
-	    (begin
-	      (rmt:register-test run-id test-name "")
-	      (hash-table-set! test-registry (db:test-make-full-name test-name "") 'done)))
-	
-	;; Fast skip of tests that are already "COMPLETED" - NO! Cannot do that as the items may not have been expanded yet :(
-	;;
-	(if (member (hash-table-ref/default test-registry tfullname #f) 
-		    '(DONOTRUN removed)) ;; *common:cant-run-states-sym*) ;; '(COMPLETED KILLED WAIVED UNKNOWN INCOMPLETE))
-	    (begin
-	      (if (runs:lownoise (conc "been marked do not run " tfullname) 60)
-		  (debug:print-info 0 *default-log-port* "Skipping test " tfullname " as it has been marked do not run due to being completed or not runnable"))
-	      (if (or (not (null? tal))(not (null? reg)))
-		  (loop (runs:queue-next-hed tal reg reglen regfull)
-			(runs:queue-next-tal tal reg reglen regfull)
-			(runs:queue-next-reg tal reg reglen regfull)
-			reruns))))
-        ;; (loop (car tal)(cdr tal) reg reruns))))
-
-	(runs:incremental-print-results run-id)
-	(debug:print 4 *default-log-port* "TOP OF LOOP => "
-		     "test-name: " test-name
-		     "\n  hed:         " hed
-		     "\n  tal:         " (runs:pretty-long-list tal)
-		     "\n  reg:         " reg
-                     "\n  test-record  " test-record
-                     "\n  itemdat:     " itemdat
-		     "\n  items:       " items
-		     "\n  item-path:   " item-path
-		     "\n  waitons:     " waitons
-		     "\n  num-retries: " num-retries
-                     "\n  reruns:      " reruns
-		     "\n  regfull:     " regfull
-		     "\n  reglen:      " reglen
-		     "\n  length reg:  " (length reg)
-                     )
-
-	;; (runs:parallel-runners-mgmt runsdat)
-
-	;; check for hed in waitons => this would be circular, remove it and issue an
-	;; error
-	(if (member test-name waitons)
-	    (begin
-	      (debug:print-error 0 *default-log-port* "test " test-name " has listed itself as a waiton, please correct this!")
-	      (set! waiton (filter (lambda (x)(not (equal? x hed))) waitons))))
-
-	(cond 
-	 
-	 ;; We want to catch tests that have waitons that are NOT in the queue and discard them IFF 
-	 ;; they have been through the wringer 10 or more times
-	 ((and (list? waitons)
-	       (not (null? waitons))
-	       (> (hash-table-ref/default *max-tries-hash* tfullname 0) 10)
-	       (not (null? (filter
-			    number?
-			    (map (lambda (waiton)
-				   (if (and (not (member waiton tal))            ;; this waiton is not in the list to be tried to run
-					    (not (member waiton reruns)))
-				       1
-				       #f))
-				 waitons))))) ;; could do this more elegantly with a marker....
-          (debug:print-info 4 *default-log-port* "cond branch - "  "rtq-1")
-	  (debug:print 0 *default-log-port* "WARNING: Marking test " tfullname " as not runnable. It is waiting on tests that cannot be run. Giving up now.")
-	  (hash-table-set! test-registry tfullname 'removed))
-
-	 ;; items is #f then the test is ok to be handed off to launch (but not before)
-	 ;; 
-	 ((not items)
-          (debug:print-info 4 *default-log-port* "cond branch - "  "rtq-2")
-	  (debug:print-info 4 *default-log-port* "OUTER COND: (not items)")
-	  (if (and (not (tests:match test-patts (tests:testqueue-get-testname test-record) item-path required: required-tests))
-		   (not (null? tal)))
-	      (loop (car tal)(cdr tal) reg reruns))
-
-	  ;; gonna try a strategy change here.
-	  ;;
-	  ;; check if can run more tests. if yes, continue, if no, rest until can run more
-	  ;; look at the test jobgroup and tot jobs running
-	  ;;
-	  ;; NOTE: This does NOT actually gate here, only captures the proc to be called later
-	  ;; 
-	  (if (not (runs:dat-wait-for-jobs-function runsdat))
-	      (runs:dat-wait-for-jobs-function-set!
-	       runsdat 
-	       (lambda (testdat-in)
-		 (let* ((jobgroup              (runs:testdat-jobgroup testdat-in))
-			(can-run-more-tests    (runs:dat-can-run-more-tests runsdat))
-			(last-jobs-check-time  (runs:dat-last-jobs-check-time runsdat))
-			(should-check-jobs     (match can-run-more-tests
-						 ((can-run-more-flag num-running nr-in-jobgroup max-concurrent-jobs . params)
-						  (if (< (- max-concurrent-jobs num-running) 25)
-						      (begin
-							(debug:print-info 0 *default-log-port*
-									  "less than 20 jobs headroom, ("max-concurrent-jobs
-									  "-"num-running")>20. Forcing prelaunch check.")
-							#t)
-						      #f))
-						 (else #f)))) ;; no record yet
-		   (if should-check-jobs
-		       (let loop-can-run-more
-			   ((res      (runs:can-run-more-tests runsdat run-id jobgroup max-concurrent-jobs))
-			    (remtries 1440)) ;; we can wait for up to two hours for jobs to get done
-			 (match res
-			   ((run-more num-running . rem)
-			    (if (or run-more
-				    (< remtries 1))
-				(begin
-				  (if (runs:lownoise "num-running" 30)
-				      (debug:print-info 0 *default-log-port* "Have "num-running" tests of max " max-concurrent-jobs))
-				  (runs:dat-can-run-more-tests-set! runsdat res)) ;; capture the result and then drop through
-				(begin
-				  (if (runs:lownoise "num-running" 10)
-				      (debug:print-info 0 *default-log-port* "Can't run more tests, have "num-running" tests of "
-							max-concurrent-jobs " allowed."))
-				  (thread-sleep! 5) ;; if we've hit max concurrent jobs take a breather, nb// make this configurable
-				  
-				  ;; wait for load here
-				  (if (runs:dat-load-mgmt-function runsdat)((runs:dat-load-mgmt-function runsdat)))
-				  (loop-can-run-more (runs:can-run-more-tests runsdat run-id jobgroup max-concurrent-jobs)
-						     (- remtries 1)))))))
-		       )))))
-
-	  ;; I'm not clear on why prereqs are gathered here TODO: verfiy this is needed
-	  (runs:testdat-prereqs-not-met-set! testdat (rmt:get-prereqs-not-met run-id waitons hed item-path mode: testmode itemmaps: itemmaps))
-
-	  ;; I'm not clear on why we'd capture running job counts here TODO: verify this is needed
-	  (runs:dat-can-run-more-tests-set! runsdat (runs:can-run-more-tests runsdat run-id jobgroup max-concurrent-jobs))
-
-	  (let ((loop-list (runs:process-expanded-tests runsdat testdat))) ;; in process-expanded-tests ultimately run:test -> launch-test -> test actually running
-            (if loop-list (apply loop loop-list))))
-
-	 ;; items processed into a list but not came in as a list been processed
-	 ;;
-	 ((and (list? items)     ;; thus we know our items are already calculated
-	       (not   itemdat))  ;; and not yet expanded into the list of things to be done
-          (debug:print-info 4 *default-log-port* "cond branch - "  "rtq-3")
-	  (debug:print-info 4 *default-log-port* "OUTER COND: (and (list? items)(not itemdat))")
-	  ;; Must determine if the items list is valid. Discard the test if it is not.
-	  (if (and (list? items)
-		   (> (length items) 0)
-		   (and (list? (car items))
-			(> (length (car items)) 0))
-		   (debug:debug-mode 1))
-	      (debug:print 2 *default-log-port* (map (lambda (row)
-                                                       (conc (string-intersperse
-                                                              (map (lambda (varval)
-                                                                     (string-intersperse varval "="))
-                                                                   row)
-                                                              " ")
-                                                             "\n"))
-                                                     items)))
-
-          (let* ((items-in-testpatt
-                  (filter
-                   (lambda (my-itemdat)
-                     (tests:match test-patts hed (item-list->path my-itemdat) ))
-                   ;; was: (tests:match test-patts hed (item-list->path my-itemdat) required: required-tests))
-                   items) ))
-            (if (null? items-in-testpatt)
-                (debug:print-error 0 *default-log-port* "Test " (tests:testqueue-get-testname test-record) " is itemized but has no items matching the test pattern")
-                
-                (for-each (lambda (my-itemdat)
-                            (let* ((new-test-record (let ((newrec (make-tests:testqueue)))
-                                                      (vector-copy! test-record newrec)
-                                                      newrec))
-                                   (my-item-path (item-list->path my-itemdat))
-
-                                   (newtestname (db:test-make-full-name hed my-item-path)))    ;; test names are unique on testname/item-path
-                              (tests:testqueue-set-items!     new-test-record #f)
-                              (tests:testqueue-set-itemdat!   new-test-record my-itemdat)
-                              (tests:testqueue-set-item_path! new-test-record my-item-path)
-                              (hash-table-set! test-records newtestname new-test-record)
-                              (set! tal (append tal (list newtestname)))))  ;; since these are itemized create new test names testname/itempath
-                          items-in-testpatt)))
-          
-          
-
-	  ;; At this point we have possibly added items to tal but all must be handed off to 
-	  ;; INNER COND logic. I think loop without rotating the queue 
-	  ;; (loop hed tal reg reruns))
-	  ;; (let ((newtal (append tal (list hed))))  ;; We should discard hed as it has been expanded into it's items? Yes, but only if this *is* an itemized test
-	  ;; (loop (car newtal)(cdr newtal) reg reruns)
-	  (if (null? tal)
-	      #f
-	      (loop (car tal)(cdr tal) reg reruns)))
-         
-	 ;; if items is a proc then need to run items:get-items-from-config, get the list and loop 
-	 ;;    - but only do that if resources exist to kick off the job
-	 ;; EXPAND ITEMS
-	 ((or (procedure? items)(eq? items 'have-procedure))
-          (debug:print-info 4 *default-log-port* "cond branch - "  "rtq-4")
-	  (let ((can-run-more    #f)) ;; (runs:can-run-more-tests runsdat run-id jobgroup max-concurrent-jobs)))
-	    (if (not can-run-more) #;(and (list? can-run-more)
-		(car can-run-more))
-		(let ((loop-list (runs:expand-items hed tal reg reruns regfull newtal jobgroup max-concurrent-jobs run-id waitons item-path testmode test-record can-run-more items runname tconfig reglen test-registry test-records itemmaps))) ;; itemized test expanded here
-		  (if loop-list
-		      (apply loop loop-list)
-                      (debug:print-info 4 *default-log-port* " -- Can't expand hed="hed)
-                      )
-                  )
-		;; if can't run more just loop with next possible test
-		(loop (car newtal)(cdr newtal) reg reruns))))
-         
-	 ;; this case should not happen, added to help catch any bugs
-	 ((and (list? items) itemdat)
-          (debug:print-info 4 *default-log-port* "cond branch - "  "rtq-5")
-	  (debug:print-error 0 *default-log-port* "Should not have a list of items in a test and the itemspath set - please report this")
-	  (exit 1))
-	 ((not (null? reruns))
-          (debug:print-info 4 *default-log-port* "cond branch - "  "rtq-6")
-	  (let* ((newlst (tests:filter-non-runnable run-id tal test-records)) ;; i.e. not FAIL, WAIVED, INCOMPLETE, PASS, KILLED,
-		 (junked (lset-difference equal? tal newlst)))
-	    (debug:print-info 4 *default-log-port* "full drop through, if reruns is less than 100 we will force retry them, reruns=" reruns ", tal=" tal)
-	    (if (< num-retries max-retries)
-		(set! newlst (append reruns newlst)))
-	    (set! num-retries (+ num-retries 1))
-	    ;; (thread-sleep! (+ 1 *global-delta*))
-	    (if (not (null? newlst))
-		;; since reruns have been tacked on to newlst create new reruns from junked
-		(loop (car newlst)(cdr newlst) reg (delete-duplicates junked)))))
-	 ((not (null? tal))
-          (debug:print-info 4 *default-log-port* "cond branch - "  "rtq-7")
-	  (debug:print-info 4 *default-log-port* "I'm pretty sure I shouldn't get here."))
-	 ((not (null? reg)) ;; could we get here with leftovers?
-          (debug:print-info 4 *default-log-port* "cond branch - "  "rtq-8")
-	  (debug:print-info 0 *default-log-port* "Have leftovers!")
-	  (loop (car reg)(cdr reg) '() reruns))
-	 (else
-          (debug:print-info 4 *default-log-port* "cond branch - "  "rtq-9")
-	  (debug:print-info 4 *default-log-port* "Exiting loop with...\n  hed=" hed "\n  tal=" tal "\n  reruns=" reruns))
-	 ))) ;; end loop on sorted test names
-    ;; this is the point where everything is launched and now you can mark the run in metadata table as all launched 
-    (rmt:set-var (conc "lunch-complete-" run-id) "yes")  
-        
-    ;; now *if* -run-wait we wait for all tests to be done
-    ;; Now wait for any RUNNING tests to complete (if in run-wait mode)
-    ;; (if (runs:dat-load-mgmt-function runsdat)((runs:dat-load-mgmt-function runsdat)))
-    (thread-sleep! 10) ;; I think there is a race condition here. Let states/statuses settle
-    
-    (let wait-loop ((num-running      (rmt:get-count-tests-running-for-run-id run-id))
-		    (prev-num-running 0))
-      ;; (debug:print-info 13 *default-log-port* "num-running=" num-running ", prev-num-running=" prev-num-running)
-      (if (and (or (args:get-arg "-run-wait")
-		   (equal? (configf:lookup *configdat* "setup" "run-wait") "yes"))
-	       (> num-running 0))
-	  (begin
-	    ;; Here we mark any old defunct tests as incomplete. Do this every fifteen minutes
-	    ;; (debug:print 0 *default-log-port* "Got here eh! num-running=" num-running " (> num-running 0) " (> num-running 0))
-	    (if (> (current-seconds)(+ last-time-incomplete 900))
-		(let ((actual-num-running (rmt:get-count-tests-running-for-run-id run-id)))
-		  (debug:print-info 0 *default-log-port* "Marking stuck tests as INCOMPLETE while waiting for run " run-id
-				    ". Running as pid " (current-process-id) " on " (get-host-name))
-		  (set! last-time-incomplete (current-seconds)) ;; FIXME, this might be causing slow down - use of set!
-		  (rmt:find-and-mark-incomplete run-id #f)
-		  (debug:print-info 0 *default-log-port* "run-wait specified, waiting on " actual-num-running
-				    " tests in RUNNING, REMOTEHOSTSTART or LAUNCHED state at "
-				    (time->string (seconds->local-time (current-seconds))))))
-	    ;; (if (runs:dat-load-mgmt-function runsdat)((runs:dat-load-mgmt-function runsdat)))
-	    (thread-sleep! 5) ;; (if (>= num-running max-concurrent-jobs) 5 1))
-	    (wait-loop (rmt:get-count-tests-running-for-run-id run-id)
-		       num-running))))
-    ;; LET* ((test-record
-    ;; we get here on "drop through". All done!
-    ;; this is moved to runs:run-testes since this function is getting called twice to ensure everthing is completed. 
-    ;; (debug:print-info 0 *default-log-port* "Calling Post Hook")    
-    ;; (runs:run-post-hook run-id)
-    (debug:print-info 1 *default-log-port* "All tests launched")))
-
-(define (runs:calc-fails prereqs-not-met)
-  (filter (lambda (test)
-	    (and (vector? test) ;; not (string? test))
-		 (member (db:test-get-state test) '("INCOMPLETE" "COMPLETED")) ;; TODO: pull from *common:stuff...*
-		 (not (member (db:test-get-status test)
-			      '("PASS" "WARN" "WAIVED" "SKIP")))))
-	  prereqs-not-met))
-
-(define (runs:calc-prereq-fail prereqs-not-met) ;; REMOVEME since NOT_STARTED/PREQ_FAIL is now COMPLETED/PREQ_FAIL
-  (filter (lambda (test)
-	    (and (vector? test) ;; not (string? test))
-		 (equal? (db:test-get-state test) "NOT_STARTED")
-		 (not (member (db:test-get-status test)
-			      '("n/a" "KEEP_TRYING")))))
-	  prereqs-not-met))
-
-(define (runs:calc-not-completed prereqs-not-met)
-  (filter
-   (lambda (t)
-     (or (not (vector? t))
-	 (not (member (db:test-get-state t) '("INCOMPLETE" "COMPLETED")))))
-   prereqs-not-met))
-
-;; (define (runs:calc-not-completed prereqs-not-met)
-;;   (filter
-;;    (lambda (t)
-;;      (or (not (vector? t))
-;; 	 (not (equal? "COMPLETED" (db:test-get-state t)))))
-;;    prereqs-not-met))
-
-(define (runs:calc-runnable prereqs-not-met)
-  (filter 
-   (lambda (t)
-     (or (not (vector? t))
-	 (and (equal? "NOT_STARTED" (db:test-get-state t))
-	      (member (db:test-get-status t)
-		      '("n/a" "KEEP_TRYING")))
-	 (and (equal? "RUNNING" (db:test-get-state t))))) ;; account for a test that is running
-   prereqs-not-met))
-
-(define (runs:pretty-string lst)
-  (map (lambda (t)
-	 (if (not (vector? t))
-	     (conc t)
-	     (conc (db:test-get-testname t) ":" (db:test-get-state t) "/" (db:test-get-status t))))
-       lst))
-
-;; parent-test is there as a placeholder for when parent-tests can be run as a setup step
-;;
-(define (run:test run-id run-info keyvals runname test-record flags parent-test test-registry all-tests-registry runsdat testdat-rec)
-  ;; All these vars might be referenced by the testconfig file reader
-  ;; 
-  ;; NEED to reprocess testconfig here, ensuring that item variables are available.
-  ;; This is for Tal's issue with item-specific env vars not being set for use in skip.
-  ;; HSD https://hsdes.intel.com/appstore/icf/index.html#/article?articleId=1408763273
-  ;;
-  (let* ((test-name    (tests:testqueue-get-testname   test-record))
-	 (test-waitons (tests:testqueue-get-waitons    test-record))
-	 (itemdat      (tests:testqueue-get-itemdat    test-record))
-	 (item-path     "")
-	 (db           #f)
-	 (full-test-name #f))
-
-    ;; setting itemdat to a list if it is #f
-    (if (not itemdat)(set! itemdat '()))
-    (set! item-path (item-list->path itemdat))
-    (set! full-test-name (db:test-make-full-name test-name item-path))
-    (runs:set-megatest-env-vars run-id inrunname: runname testname: test-name itempath: item-path) ;; these may be needed by the launching process
-
-   (let* ((test-conf ;; re-instate the tests:get-testconfig once the kinks are worked out. FIXME!!!
-	    ;; (tests:get-testconfig test-name item-path all-tests-registry #t force-create: #t))
-	    (tests:testqueue-get-testconfig test-record )) 
-	   (test-path    (hash-table-ref all-tests-registry test-name)) ;; (conc *toppath* "/tests/" test-name)) ;; could use tests:get-testconfig here ...
-
-	   (force        (hash-table-ref/default flags "-force" #f))
-	   (rerun        (hash-table-ref/default flags "-rerun" #f))
-	   (keepgoing    (hash-table-ref/default flags "-keepgoing" #f))
-	   (incomplete-timeout (string->number (or (configf:lookup *configdat* "setup" "incomplete-timeout") "x")))
-	   )
-
-    (debug:print-info 4 *default-log-port*
-		      "\nTESTNAME: " full-test-name 
-		      "\n   test-config: " (hash-table->alist test-conf)
-		      "\n   itemdat: " itemdat
-		      )
-    (debug:print 2 *default-log-port* "Attempting to launch test " full-test-name)
-    ;; (setenv "MT_TEST_NAME" test-name) ;; 
-    ;; (setenv "MT_ITEMPATH"  item-path)
-    ;; (setenv "MT_RUNNAME"   runname)
-    (change-directory *toppath*)
-
-    ;; Here is where the test_meta table is best updated
-    ;; Yes, another use of a global for caching. Need a better way?
-    ;;
-    ;; There is now a single call to runs:update-all-test_meta and this 
-    ;; per-test call is not needed. Given the delicacy of the move to 
-    ;; v1.55 this code is being left in place for the time being.
-    ;;
-    (if (not (hash-table-ref/default *test-meta-updated* test-name #f))
-        (begin
-          (hash-table-set! *test-meta-updated* test-name #t)
-          (runs:update-test_meta test-name test-conf)))
-    
-    ;; itemdat => ((ripeness "overripe") (temperature "cool") (season "summer"))
-    (let* ((new-test-path (string-intersperse (cons test-path (map cadr itemdat)) "/"))
-	   (test-id       (rmt:get-test-id run-id test-name item-path))
-	   (testdat       (if test-id (rmt:get-test-info-by-id run-id test-id) #f)))
-      (if (not testdat)
-	  (let loop ()
-	    ;; ensure that the path exists before registering the test
-	    ;; NOPE: Cannot! Don't know yet which disk area will be assigned....
-	    ;; (system (conc "mkdir -p " new-test-path))
-	    ;;
-	    ;; (open-run-close tests:register-test db run-id test-name item-path)
-	    ;;
-	    ;; NB// for the above line. I want the test to be registered long before this routine gets called!
-	    ;;
-	    (if (not test-id)(set! test-id (rmt:get-test-id run-id test-name item-path)))
-	    (if (not test-id)
-		(begin
-		  (debug:print 2 *default-log-port* "WARN: Test not pre-created? test-name=" test-name ", item-path=" item-path ", run-id=" run-id)
-		  (rmt:register-test run-id test-name item-path)
-		  (set! test-id (rmt:get-test-id run-id test-name item-path))))
-	    (debug:print-info 4 *default-log-port* "test-id=" test-id ", run-id=" run-id ", test-name=" test-name ", item-path=\"" item-path "\"")
-	    (set! testdat (rmt:get-test-info-by-id run-id test-id))
-	    (if (not testdat)
-		(begin
-		  (debug:print-info 0 *default-log-port* "WARNING: server is overloaded, trying again in two seconds")
-		  ;; (if (runs:dat-load-mgmt-function runsdat)((runs:dat-load-mgmt-function runsdat)))
-		  (thread-sleep! 2)
-		  (loop)))))
-      (if (not testdat) ;; should NOT happen
-	  (debug:print-error 0 *default-log-port* "failed to get test record for test-id " test-id))
-      (set! test-id (db:test-get-id testdat))
-      (if (common:file-exists? test-path)
-	  (change-directory test-path)
-	  (begin
-	    (debug:print-error 0 *default-log-port* "test run path not created before attempting to run the test. Perhaps you are running -remove-runs at the same time?")
-	    (change-directory *toppath*)))
-      (case (if force ;; (args:get-arg "-force")
-		'NOT_STARTED
-		(if testdat
-		    (string->symbol (test:get-state testdat))
-		    'failed-to-insert))
-	((failed-to-insert)
-	 (debug:print-error 0 *default-log-port* "Failed to insert the record into the db"))
-	((NOT_STARTED COMPLETED DELETED INCOMPLETE)
-	 (let ((runflag #f))
-	   (cond
-	    ;; -force, run no matter what
-	    (force (set! runflag #t))
-	    ;; NOT_STARTED, run no matter what
-	    ((member (test:get-state testdat) '("DELETED" "NOT_STARTED" "INCOMPLETE"))(set! runflag #t))
-	    ;; not -rerun and PASS, WARN or CHECK, do no run
-	    ((and (or (not rerun)
-		      keepgoing)
-		  ;; Require to force re-run for COMPLETED or *anything* + PASS,WARN or CHECK
-		  (or (member (test:get-status testdat) '("PASS" "WARN" "CHECK" "SKIP" "WAIVED"))
-		      (member (test:get-state  testdat) '("COMPLETED")))) 
-	     (debug:print-info 2 *default-log-port* "running test " test-name "/" item-path " suppressed as it is " (test:get-state testdat) " and " (test:get-status testdat))
-	     (hash-table-set! test-registry full-test-name 'DONOTRUN) ;; COMPLETED)
-	     (set! runflag #f))
-
-	    ;; -rerun and status is one of the specifed, run it
-	    ((and rerun
-		  (let* ((rerunlst   (string-split rerun ","))
-			 (must-rerun (member (test:get-status testdat) rerunlst)))
-		    (debug:print-info 3 *default-log-port* "-rerun list: " rerun ", test-status: " (test:get-status testdat)", must-rerun: " must-rerun)
-		    must-rerun))
-	     (debug:print-info 2 *default-log-port* "Rerun forced for test " test-name "/" item-path)
-	     (set! runflag #t)
-             (debug:print-info 2 *default-log-port* "Calling rerun hook")
-             (runs:rerun-hook test-id new-test-path testdat rerun)
-             )
-             
-
-	    
-            ;; -keepgoing, do not rerun FAIL
-	    ((and keepgoing
-		  (member (test:get-status testdat) '("FAIL")))
-	     (set! runflag #f))
-	    
-            ((and (not rerun)
-		  (member (test:get-status testdat) '("FAIL" "n/a")))
-	     (set! runflag #t))
-
-	    (else (set! runflag #f)))
-	   (debug:print 4 *default-log-port* "RUNNING => runflag: " runflag " STATE: " (test:get-state testdat) " STATUS: " (test:get-status testdat))
-	   (if (not runflag)
-	       (if (not parent-test)
-		   (if (runs:lownoise (conc "not starting test" full-test-name) 60)
-		       (debug:print 1 *default-log-port* "NOTE: Not starting test " full-test-name " as it is state \"" (test:get-state testdat) 
-				    "\" and status \"" (test:get-status testdat) "\", use -rerun \"" (test:get-status testdat)
-				    "\" or -force to override")))
-	       ;; NOTE: No longer be checking prerequisites here! Will never get here unless prereqs are
-	       ;;       already met.
-	       ;; This would be a great place to do the process-fork
-	       ;; 
-	       (let ((skip-test   #f)
-		     (skip-check  (configf:get-section test-conf "skip")))
-		 (cond 
-		  ;; Have to check for skip conditions. This one skips if there are same-named tests
-		  ;; currently running
-		  ((and skip-check
-			(configf:lookup test-conf "skip" "prevrunning"))
-		   ;; run-ids = #f means *all* runs
-		   (let ((running-tests (rmt:get-tests-for-runs-mindata #f full-test-name '("RUNNING" "REMOTEHOSTSTART" "LAUNCHED") '() #f)))
-		     (if (not (null? running-tests)) ;; have to skip 
-			 (set! skip-test "Skipping due to previous tests running"))))
-
- 		    ;; split the string and OR of file-exists?
-		    ((and skip-check
-			  (configf:lookup test-conf "skip" "fileexists"))
-		     (let* ((files    (string-split (configf:lookup test-conf "skip" "fileexists")))
-			    (existing (filter common:file-exists? files)))
-		       (if (not (null? existing)) ;; (common:file-exists? (configf:lookup test-conf "skip" "fileexists"))
-			   (set! skip-test (conc "Skipping due to existance of file(s) " (string-intersperse existing ", ")))))) ;; (configf:lookup test-conf "skip" "fileexists")))))
-
- 		    ((and skip-check
-			  (configf:lookup test-conf "skip" "filenotexists"))
-		      (let* ((files    (string-split (configf:lookup test-conf "skip" "filenotexists")))
-			      (existing (filter common:file-exists? files)))
-			      (if (null? existing) ;;  (common:file-exists? (configf:lookup test-conf "skip" "filenotexists")))
-			        (set! skip-test (conc "Skipping due to non existance of files " (string-intersperse files ", ")))))) ;; (configf:lookup test-conf "skip" "filenotexists")))))        
-		 
-       ((and skip-check
-			(configf:lookup test-conf "skip" "script"))
-		   (if (= (system (configf:lookup test-conf "skip" "script")) 0)
-                        (set! skip-test (conc "Skipping due to zero return value of script " (configf:lookup test-conf "skip" "script")))))
-      
-                  ((and skip-check
-			(configf:lookup test-conf "skip" "rundelay"))
-		   ;; run-ids = #f means *all* runs
-		   (let* ((numseconds      (common:hms-string->seconds (configf:lookup test-conf "skip" "rundelay")))
-			  (running-tests   (rmt:get-tests-for-runs-mindata #f full-test-name '("RUNNING" "REMOTEHOSTSTART" "LAUNCHED") '() #f))
-			  (completed-tests (rmt:get-tests-for-runs-mindata #f full-test-name '("COMPLETED" "INCOMPLETE") '("PASS" "FAIL" "ABORT") #f)) ;; ironically INCOMPLETE is same as COMPLETED in this contex
-			  (last-run-times  (map db:mintest-get-event_time completed-tests))
-			  (time-since-last (- (current-seconds) (if (null? last-run-times) 0 (common:max last-run-times)))))
-		     (if (or (not (null? running-tests)) ;; have to skip if test is running
-			     (> numseconds time-since-last))
-			 (set! skip-test (conc "Skipping due to previous test run less than " (configf:lookup test-conf "skip" "rundelay") " ago"))))))
-		 
-		 (if skip-test
-		     (begin
-		       (mt:test-set-state-status-by-id run-id test-id "COMPLETED" "SKIP" skip-test)
-		       (debug:print-info 1 *default-log-port* "SKIPPING Test " full-test-name " due to " skip-test))
-		     ;;
-		     ;; Here the test is handed off to launch.scm for launch-test to complete the launch process
-		     ;;
-		     (begin
-		       ;; wait for less than max jobs here
-		       (if (runs:dat-wait-for-jobs-function runsdat)
-			   ((runs:dat-wait-for-jobs-function runsdat) testdat-rec))
-		       
-		       (if (not (launch-test test-id run-id run-info keyvals runname test-conf test-name test-path itemdat flags))
-			   (begin
-			     (print "ERROR: Failed to launch the test. Exiting as soon as possible")
-			     (set! *globalexitstatus* 1) ;; 
-			     (process-signal (current-process-id) signal/kill))
-			   )
-		       ;; wait again here?
-		       ))))))
-	((KILLED) 
-	 (debug:print 1 *default-log-port* "NOTE: " full-test-name " is already running or was explictly killed, use -force to launch it.")
-	 (hash-table-set! test-registry (db:test-make-full-name test-name test-path) 'DONOTRUN)) ;; KILLED))
-	((LAUNCHED REMOTEHOSTSTART RUNNING)  
-	 (debug:print 2 *default-log-port* "NOTE: " test-name " is already running"))
-	;; (if (> (- (current-seconds)(+ (db:test-get-event_time testdat)
-	;; 			       (db:test-get-run_duration testdat)))
-	;; 	(or incomplete-timeout
-	;; 	    6000)) ;; i.e. no update for more than 6000 seconds
-	;;      (begin
-	;;        (debug:print 0 *default-log-port* "WARNING: Test " test-name " appears to be dead. Forcing it to state INCOMPLETE and status STUCK/DEAD")
-	;;        (tests:test-set-status! run-id test-id "INCOMPLETE" "STUCK/DEAD" "" #f))
-	;;        ;; (tests:test-set-status! test-id "INCOMPLETE" "STUCK/DEAD" "" #f))
-	;;      (debug:print 2 *default-log-port* "NOTE: " test-name " is already running")))
-	(else      
-	 (debug:print-error 0 *default-log-port* "Failed to launch test " full-test-name ". Unrecognised state " (test:get-state testdat))
-	 (case (string->symbol (test:get-state testdat)) 
-	   ((COMPLETED INCOMPLETE)
-	    (hash-table-set! test-registry (db:test-make-full-name test-name test-path) 'DONOTRUN))
-	   (else
-	    (hash-table-set! test-registry (db:test-make-full-name test-name test-path) 'DONOTRUN)))))))))
-
-;;======================================================================
-;; END OF NEW STUFF
-;;======================================================================
-
-(define (get-dir-up-n dir . params) 
-  (let ((dparts  (string-split dir "/"))
-	(count   (if (null? params) 1 (car params))))
-    (conc "/" (string-intersperse 
-	       (take dparts (- (length dparts) count))
-	       "/"))))
-
-(define (runs:recursive-delete-with-error-msg real-dir)
-  (if (> (system (conc "rm -rf " real-dir)) 0)
-      (begin
-	;; FAILED, possibly due to permissions, do chmod a+rwx then try one more time
-	(system (conc "chmod -R a+rwx " real-dir))
-	(if (> (system (conc "rm -rf " real-dir)) 0)
-	    (debug:print-error 0 *default-log-port* "There was a problem removing " real-dir " with rm -f")))))
-
-(define (runs:safe-delete-test-dir real-dir)
-  ;; first delete all sub-directories
-  (directory-fold 
-   (lambda (f x)
-     (let ((fullname (conc real-dir "/" f)))
-       (if (directory? fullname)(runs:recursive-delete-with-error-msg fullname)))
-     (+ 1 x))
-   0 real-dir)
-  ;; then files other than *testdat.db*
-  (directory-fold 
-   (lambda (f x)
-     (let ((fullname (conc real-dir "/" f)))
-       (if (not (string-search (regexp "testdat.db") f))
-	   (runs:recursive-delete-with-error-msg fullname)))
-     (+ 1 x))
-   0 real-dir #t)
-  ;; then the entire directory
-  (runs:recursive-delete-with-error-msg real-dir))
-
-;; cleanup often needs to remove all but the last N runs per target
-;;
-;; target-patts a1/b1/c1,a2/b2/c2 ...
-;;
-;; This will fail if called with empty target or a bad target (i.e. missing or extra fields)
-;;
-(define (runs:get-hash-by-target target-patts runpatt)
-  (let* ((targets (string-split target-patts ","))
-	 (keys    (rmt:get-keys))
-	 (res-ht  (make-hash-table))) ;; target -> ( runrecord1 runrecord2 ... )
-    (for-each
-     (lambda (target-patt)
-       (let ((runs     (rmt:simple-get-runs runpatt #f #f target-patt #f)))
-	 (for-each
-	  (lambda (run)
-	    (let ((target (simple-run-target run)))
-	      (hash-table-set! res-ht target (cons run (hash-table-ref/default res-ht target '())))))
-	  runs)))
-     targets)
-    res-ht))
-
-;; delete runs older than X (weeks, days, months years etc.)
-;; delete redundant runs within a target - N is the input
-;; delete redundant runs within a target IFF older than given date/time AND keep at least N
-;; 
-(define (runs:remove-all-but-last-n-runs-per-target target-patts runpatt num-to-keep #!key (actions '(print)))
-  (let* ((runs-ht  (runs:get-hash-by-target target-patts runpatt))
-	 (age      (if (args:get-arg "-age")(common:hms-string->seconds (args:get-arg "-age")) #f))
-	 (age-mark (if age (- (current-seconds) age) (+ (current-seconds) 86400)))
-	 (precmd   (or (args:get-arg "-precmd") ""))
-         (action-chk (member (string->symbol "remove-runs") actions)))
-     ;; check the sequence of actions  archive must comme before remove-runs
-     (if  (and action-chk (member (string->symbol "archive") action-chk))
-          (begin
-          (debug:print-error 0 *default-log-port* "action remove-runs must come after archive")
-          (exit 1))) 
-    (print "Actions: " actions " age: " age)
-    (for-each
-     (lambda (action)
-        (for-each
-         (lambda (target)
-            (let* ((runs      (hash-table-ref runs-ht target))
-	           (sorted    (sort runs (lambda (a b)(< (simple-run-event_time a)(simple-run-event_time b)))))
-	           (to-remove (let* ((len      (length sorted))
-                                     (trim-amt (- len num-to-keep)))
-                                 (if (> trim-amt 0)
-                                    (take sorted trim-amt)
-                                    '()))))
-	   (hash-table-set! runs-ht target to-remove)
-           (print target ":")
-           (for-each
-            (lambda (run)
-              (let ((remove (member run to-remove (lambda (a b)
-                                                    (eq? (simple-run-id a)
-                                                         (simple-run-id b))))))
-  	        (if (and age (> (simple-run-event_time run) age-mark))
-		     (print "Skipping handling of " target "/" (simple-run-runname run) " as it is younger than " (args:get-arg "-age"))
-		     (case action
-		       ((print)
-			(print " " (simple-run-runname run)
-			       " " (time->string (seconds->local-time (simple-run-event_time run)) "WW%V.%u %H:%M:%S")
-			       " " (if remove "REMOVE" "")))
-		       ((remove-runs)
-			(if remove (system (conc precmd " megatest -remove-runs -target " target " -runname " (simple-run-runname run) " -testpatt %"
-						 (if (member 'kill-runs actions) ;; if kill-runs is specified then set -kill-wait to 0
-						     " -kill-wait 0"
-						     "")))))
-		       ((archive)
-			(if remove (system (conc precmd " megatest -archive save-remove -target " target " -runname " (simple-run-runname run) " -testpatt %"))))
-		       ((kill-runs)
-			(if remove (system (conc precmd " megatest -kill-runs -target " target " -runname " (simple-run-runname run) " -testpatt %"))))))))
-            sorted)))
-         (hash-table-keys runs-ht)))
-      actions)
-    runs-ht))
-
-(define (remove-last-path-directory path-in)
-  (let* ((dparts  (string-split path-in "/"))
-    (path-out (conc "/" (string-intersperse (take dparts (- (length dparts) 1)) "/")))
-    )
-    path-out
-  )
-)
-
-
-(define (runs:operate-on action target runnamepatt testpatt #!key (state #f)(status #f)(new-state-status #f)(mode #f)(options '()))
-  (common:clear-caches) ;; clear all caches
-  (let* ((db           #f)
-	 ;; (tdbdat       (tasks:open-db))
-	 (keys         (rmt:get-keys))
-	 (rundat       (mt:get-runs-by-patt keys runnamepatt target))
-	 (header       (vector-ref rundat 0))
-	 (runs         (vector-ref rundat 1))
-	 (states       (if state  (string-split state  ",") '()))
-	 (statuses     (if status (string-split status ",") '()))
-	 (state-status (if (string? new-state-status) (string-split new-state-status ",") '(#f #f)))
-	 (rp-mutex     (make-mutex))
-	 (bup-mutex    (make-mutex))
-         (keep-records (args:get-arg "-keep-records")) ;; used in conjunction with -remove-runs to keep the records, TODO: consolidate this with "mode".
-	 (test-records '())) ;; for tasks that we wish to operate on all tests in one fell swoop
-
-    (let* ((write-access-actions '(remove-runs set-state-status archive run-wait kill-runs))
-           (dbfile             (conc  *toppath* "/megatest.db"))
-           (readonly-mode      (not (file-write-access? dbfile))))
-      (when (and readonly-mode
-                 (member action write-access-actions))
-        (debug:print-error 0 *default-log-port* "megatest.db is readonly.  Cannot proceed with action ["action"] in which write-access isrequired .")
-        (exit 1)))
-    
-    (debug:print-info 4 *default-log-port* "runs:operate-on => Header: " header " action: " action " new-state-status: " new-state-status)
-    (if (> 2 (length state-status))
-	(begin
-	  (debug:print-error 0 *default-log-port* "the parameter to -set-state-status is a comma delimited string. E.g. COMPLETED,FAIL")
-	  (exit)))
-    (for-each
-     (lambda (run)
-       (let ((runkey (string-intersperse (map (lambda (k)
-						(db:get-value-by-header run header k)) keys) "/"))
-	     (dirs-to-remove (make-hash-table))
-	     (proc-get-tests (lambda (run-id)
-                               (mt:get-tests-for-run run-id
-                                                     testpatt states statuses
-                                                     not-in:  #f
-                                                     sort-by: (case action
-                                                                ((remove-runs) 'rundir)
-                                                                (else          'event_time))))))
-	 (let* ((run-id    (db:get-value-by-header run header "id"))
-		(run-state (db:get-value-by-header run header "state"))
-		(run-name  (db:get-value-by-header run header "runname"))
-		(tests     (if (not (equal? run-state "locked"))
-			       (proc-get-tests run-id)
-			       '()))
-		(lasttpath "/does/not/exist/I/hope")
-		(lastrealpath "/does/not/exist/I/hope")
-                ;; there may be a number of different disks used in the same run.
-                (run-paths-hash (make-hash-table))
-		(worker-thread #f))
-	   (debug:print-info 4 *default-log-port* "runs:operate-on run=" run ", header=" header)
-	   (if (not (null? tests))
-	       (begin
-		 (case action
-                   ((kill-runs)
-                    (tasks:kill-runner target run-name "%")
-                    (debug:print 1 *default-log-port* "Killing tests for run: " runkey " " (db:get-value-by-header run header "runname"))
-                    )
-		   ((remove-runs)
-		    ;; (if (tasks:need-server run-id)(tasks:start-and-wait-for-server tdbdat run-id 10))
-		    ;; seek and kill in flight -runtests with % as testpatt here
-		    ;; (if (equal? testpatt "%")
-		    (tasks:kill-runner target run-name testpatt)
-		    ;; (debug:print 0 *default-log-port* "not attempting to kill any run launcher processes as testpatt is " testpatt))
-		    (debug:print 1 *default-log-port* "Removing tests for run: " runkey " " (db:get-value-by-header run header "runname")))
-		   ((set-state-status)
-		    ;; (if (tasks:need-server run-id)(tasks:start-and-wait-for-server tdbdat run-id 10))
-		    (debug:print 1 *default-log-port* "Modifying state and staus for tests for run: " runkey " " (db:get-value-by-header run header "runname")))
-		   ((print-run)
-		    (debug:print 1 *default-log-port* "Printing info for run " runkey ", run=" run ", tests=" tests ", header=" header)
-		    action)
-		   ((run-wait)
-		    (debug:print 1 *default-log-port* "Waiting for run " runkey ", run=" runnamepatt " to complete"))
-		   ((archive)
-		    (debug:print 1 *default-log-port* "Archiving/restoring (" (args:get-arg "-archive") ") data for run: " runkey " " (db:get-value-by-header run header "runname"))
-		    (let ((op (string->symbol (args:get-arg "-archive"))))
-		      (set! worker-thread
-			    (make-thread
-			     (lambda ()
-			       (case op
-				 ((save save-remove keep-html)
-				  (archive:run-bup op run-id run-name tests rp-mutex bup-mutex))
-				 ((restore)
-				  (archive:bup-restore op run-id run-name tests rp-mutex bup-mutex))
-				 ((get) ;;; NOTE: This is a special case. We wish to operate on ALL tests in one go
-				  (set! test-records (append tests test-records)))
-				 (else 
-				  (debug:print-error 0 *default-log-port* "unrecognised sub command " op " for -archive. Run \"megatest\" to see help")
-				  (exit))))
-			     "archive-bup-thread"))
-		      (thread-start! worker-thread)
-		      (if (eq? op 'get)
-			  (thread-join! worker-thread)) ;; we need the test-records set to not overlap
-		      ))
-		   (else
-		    (debug:print-info 0 *default-log-port* "action not recognised " action)))
-		 
-		 ;; actions that operate on one test at a time can be handled below
-		 ;;
-		 (let ((sorted-tests     (filter 
-					  vector?
-					  (sort tests (lambda (a b)(let ((dira ;; (rmt:sdb-qry 'getstr 
-									  (db:test-get-rundir a)) ;; )  ;; (filedb:get-path *fdb* (db:test-get-rundir a)))
-									 (dirb ;; (rmt:sdb-qry 'getstr 
-									  (db:test-get-rundir b))) ;; ) ;; ((filedb:get-path *fdb* (db:test-get-rundir b))))
-								     (if (and (string? dira)(string? dirb))
-									 (> (string-length dira)(string-length dirb))
-									 #f))))))
-		       (toplevel-retries (make-hash-table)) ;; try three times to loop through and remove top level tests
-		       (test-retry-time  (make-hash-table))
-                       (backgrounded-remove-status     (make-hash-table))
-                       (backgrounded-remove-last-visit (make-hash-table))
-                       (backgrounded-remove-result     (make-hash-table))
-		       (allow-run-time   (string->number (or (args:get-arg "-kill-wait") "10")))) ;; seconds to allow for killing tests before just brutally killing 'em
-		   (let loop ((test (car sorted-tests))
-			      (tal  (cdr sorted-tests)))
-		     (let* ((test-id       (db:test-get-id test))
-			    (new-test-dat  (rmt:get-test-info-by-id run-id test-id)))
-		       (if (not new-test-dat)
-			   (begin
-			     (debug:print-error 0 *default-log-port* "We have a test-id of " test-id " but no record was found. NOTE: No locking of records is done between processes, do not simultaneously remove the same run from two processes!")
-			     (if (not (null? tal))
-				 (loop (car tal)(cdr tal))))
-			   (let* ((item-path     (db:test-get-item-path new-test-dat))
-				  (test-name     (db:test-get-testname new-test-dat))
-				  (run-dir       ;;(filedb:get-path *fdb*
-				   ;; (rmt:sdb-qry 'getid 
-				   (db:test-get-rundir new-test-dat)) ;; )    ;; run dir is from the link tree
-                                  (has-subrun    (and (subrun:subrun-test-initialized? run-dir)
-                                                      (not (subrun:subrun-removed? run-dir))))
-				  (test-state    (db:test-get-state new-test-dat))
-                                  (test-status    (db:test-get-status new-test-dat))
-				  (test-fulln    (db:test-get-fullname new-test-dat))
-				  (uname         (db:test-get-uname    new-test-dat))
-				  (toplevel-with-children (and (db:test-get-is-toplevel test)
-							       (> (rmt:test-toplevel-num-items run-id test-name) 0))))
-                             
-			     (case action
-			       ((remove-runs)
-				;; if the test is a toplevel-with-children issue an error and do not remove
-				(cond
-                                 (toplevel-with-children
-                                  (debug:print 0 *default-log-port* "WARNING: skipping removal of " test-fulln " with run-id " run-id " as it has sub tests")
-                                  (hash-table-set! toplevel-retries test-fulln (+ (hash-table-ref/default toplevel-retries test-fulln 0) 1))
-                                  (if (> (hash-table-ref toplevel-retries test-fulln) 3)
-                                      (if (not (null? tal))
-                                          (loop (car tal)(cdr tal))) ;; no else clause - drop it if no more in queue and > 3 tries
-                                      (let ((newtal (append tal (list test))))
-                                        (loop (car newtal)(cdr newtal))))) ;; loop with test still in queue
-                                 (has-subrun
-                                  ;; 
-                                  (let ((last-visit (hash-table-ref/default backgrounded-remove-last-visit test-fulln 0))
-                                        (now        (current-seconds))
-                                        (rem-status (hash-table-ref/default backgrounded-remove-status test-fulln 'not-started)))
-                                    (case rem-status
-                                      ((not-started)
-                                       (debug:print 0 *default-log-port* "WARNING: postponing removal of " test-fulln " with run-id " run-id " as it has a subrun")
-                                       (hash-table-set! backgrounded-remove-status test-fulln 'started)
-                                       (hash-table-set! backgrounded-remove-last-visit test-fulln (current-seconds))
-                                       (common:send-thunk-to-background-thread
-                                        (lambda ()
-                                          (let* ((subrun-remove-succeeded
-                                                  (subrun:remove-subrun run-dir keep-records)))
-                                            (hash-table-set! backgrounded-remove-result test-fulln subrun-remove-succeeded)
-                                            (hash-table-set! backgrounded-remove-status test-fulln 'done)))
-                                        name: (conc "remove-subrun:"test-fulln))
-                                       
-                                       ;; send to back of line, loop
-                                       (let ((newtal (append tal (list test))))
-                                        (loop (car newtal)(cdr newtal)))
-                                       )
-                                      ((started)
-                                       ;; if last visit was within last second, sleep 1 second
-                                       (if (< (- now last-visit) 1.0)
-                                           (thread-sleep! 1.0))
-                                       (hash-table-set! backgrounded-remove-last-visit test-fulln (current-seconds))
-                                       ;; send to back of line, loop
-                                       (let ((newtal (append tal (list test))))
-                                         (loop (car newtal)(cdr newtal)))
-                                       )
-                                      ((done)
-                                       ;; drop this one; if remaining, loop, else finish
-                                       (hash-table-set! backgrounded-remove-last-visit test-fulln (current-seconds))
-                                       (let ((subrun-remove-succeeded (hash-table-ref/default backgrounded-remove-result test-fulln 'exception)))
-                                         (cond
-                                          ((eq? subrun-remove-succeeded 'exception)
-                                           (let* ((logfile (subrun:get-log-path run-dir "remove")))
-                                             (debug:print 0 *default-log-port* "ERROR: removing subrun of of " test-fulln " with run-id " run-id " ; see logfile @ "logfile))
-					   (if (not (null? tal))
-					       (loop (car tal)(cdr tal))))
-					  (subrun-remove-succeeded
-					   (debug:print 0 *default-log-port* "Now removing of " test-fulln " with run-id " run-id " since subrun was removed.")
-					   ;;(runs:remove-test-directory new-test-dat mode) ;; let normal case handle this. it will go thru loop again as non-subrun
-					   (let ((newtal (append tal (list test))))
-					     (loop (car newtal)(cdr newtal))))
-					  (else
-					   (let* ((logfile (subrun:get-log-path run-dir "remove")))
-					     (debug:print 0 *default-log-port* "WARNING: removal of subrun failed.  Please check "logfile" for details."))
-					   ;; send to back of line, loop (will not match has-subrun next time through)
-					    (if (not (null? tal))
-						(loop (car tal)(cdr tal))))))
-				       )
-				      ) ; end case rem-status
-                                    ) ; end let
-                                  ); end cond has-subrun
-
-                                 (else
-                                  ;; BB - TODO - consider backgrounding to threads to delete tests (work below) 
-                                  (debug:print-info 0 *default-log-port* "test: " test-name " itest-state: " test-state)
-                                  (if (member test-state (list "RUNNING" "LAUNCHED" "REMOTEHOSTSTART" "KILLREQ"))
-                                      (begin
-                                        (if (not (hash-table-ref/default test-retry-time test-fulln #f))
-                                            (begin
-                                              ;; want to set to REMOVING BUT CANNOT do it here?
-                                              (hash-table-set! test-retry-time test-fulln (current-seconds))))
-                                        (if (> (- (current-seconds)(hash-table-ref test-retry-time test-fulln)) allow-run-time)
-                                            ;; This test is not in a correct state for cleaning up. Let's try some graceful shutdown steps first
-                                            ;; Set the test to "KILLREQ" and wait five seconds then try again. Repeat up to five times then give
-                                            ;; up and blow it away.
-                                            (begin
-                                              (debug:print 0 *default-log-port* "WARNING: could not gracefully remove test " test-fulln ", tried to kill it to no avail. Forcing state to FAILEDKILL and continuing")
-                                              (mt:test-set-state-status-by-id run-id (db:test-get-id test) "FAILEDKILL" "n/a" #f)
-                                              (thread-sleep! 1))
-                                            (begin
-                                              (mt:test-set-state-status-by-id run-id (db:test-get-id test) "KILLREQ" "n/a" #f)
-                                              (thread-sleep! 1)))
-                                        ;; NOTE: This is suboptimal as the testdata will be used later and the state/status may have changed ...
-                                        (if (null? tal)
-                                            (loop new-test-dat tal)
-                                            (loop (car tal)(append tal (list new-test-dat)))))
-                                      (begin
-                                       (let ((rundir (db:test-get-rundir new-test-dat)))
-                                        (if (and (not (string=  rundir "/tmp/badname")) 
-                                             (file-exists? rundir)
-                                             (substring-index run-name rundir)
-                                             (tests:glob-like-match (conc "%/" target "/%") rundir)
-                                             )
-                                          (begin
-                                            (set! lasttpath (db:test-get-rundir new-test-dat)) ;; remember this path for run removal
-                                            (set! lastrealpath (remove-last-path-directory (resolve-pathname lasttpath)))
-                                            (hash-table-set! run-paths-hash lastrealpath 1)
-                                            (runs:remove-test-directory new-test-dat mode) ;; 'remove-all)
-                                          )
-                                          (begin
-                                            (debug:print 2 *default-log-port* "Not removing directory " rundir " because either it doesn't exist or has a bad name")
-                                            (debug:print 2 *default-log-port* "Is /tmp/badname: " (string=  rundir "/tmp/badname"))
-                                            (debug:print 2 *default-log-port* "Exists: " (file-exists? rundir))
-                                            (debug:print 2 *default-log-port* "Has run-name: " (substring-index run-name rundir))
-                                            (debug:print 2 *default-log-port* "Has target: " (tests:glob-like-match (conc "%/" target "/%") rundir))
-                                            (debug:print 2 *default-log-port* "Target: " target)
-
-                                            ;;PJH remove record from db no need to cleanup directory
-                                            (case mode
-                                               ((remove-data-only)(mt:test-set-state-status-by-id (db:test-get-run_id test)(db:test-get-id test) (db:test-get-state test)(db:test-get-status test) #f))
-                                               ((archive-remove)  (mt:test-set-state-status-by-id (db:test-get-run_id test)(db:test-get-id test) "ARCHIVED" #f #f))
-                                               (else (rmt:delete-test-records (db:test-get-run_id test) (db:test-get-id test))))
-
-                                          )
-                                        )
-                                      )
-
-                                      (if (not (null? tal))
-                                         (loop (car tal)(cdr tal)))))))
-				(rmt:update-run-stats run-id (rmt:get-raw-run-stats run-id)))
-                               ((kill-runs)
-                                ;; RUNNING -> KILLREQ
-                                ;; LAUNCHED,RUNNING,REMOTEHOSTSTART -> NOT STARTED
-                                (cond
-                                 ((and has-subrun (member test-state (list "RUNNING" "LAUNCHED" "REMOTEHOSTSTART" "KILLREQ")))
-                                  (common:send-thunk-to-background-thread
-                                   (lambda ()
-                                     (let* ((subrun-remove-succeeded
-                                             (subrun:kill-subrun run-dir keep-records)))
-                                       #t)))
-                                  (if (not (null? tal))
-				    (loop (car tal)(cdr tal)))
-                                  )
-                                 ((member test-state (list "RUNNING" "LAUNCHED" "REMOTEHOSTSTART" "KILLREQ"))
-                                  (debug:print 1 *default-log-port* "INFO: issuing killreq to test "test-fulln)
-                                  (mt:test-set-state-status-by-id run-id (db:test-get-id test) "KILLREQ" "n/a" #f)
-                                  (if (not (null? tal))
-				      (loop (car tal)(cdr tal))))
-                                 ((and (member test-status '("PREQ_FAIL" "PREQ_DISCARDED" "BLOCKED" "ZERO_ITEMS" "KEEP_TRYING" "TEN_STRIKES" "TIMED_OUT")))
-                                  (rmt:set-state-status-and-roll-up-items run-id (db:test-get-id test) 'foo "NOT_STARTED" "n/a" (conc "kill-run moved from "test-state":"test-status" to NOT_STARTED:n/a"))
-                                  ;;(mt:test-set-state-status-by-id run-id (db:test-get-id test) "NOT_STARTED" "n/a" (conc "kill-run moved from "test-state":"test-status" to NOT_STARTED:n/a"))
-                                  (if (not (null? tal))
-				      (loop (car tal)(cdr tal)))
-                                  )
-                                 (else
-                                  (if (not (null? tal))
-				      (loop (car tal)(cdr tal)))
-                                  )))
-			       ((set-state-status)
-                                (let* ((new-state (car state-status))
-                                       (new-status (cadr state-status))
-                                       (test-id (db:test-get-id test))
-                                       (test-run-dir (db:test-get-rundir new-test-dat))
-                                       (has-subrun (and (subrun:subrun-test-initialized? test-run-dir)
-                                                      (not (subrun:subrun-removed? test-run-dir)))))
-                                  (when has-subrun
-                                     (common:send-thunk-to-background-thread
-                                        (lambda ()
-                                          (subrun:set-state-status test-run-dir state status new-state-status)
-                                          )
-                                        )
-                                    )
-                                  (debug:print-info 2 *default-log-port* "new state " new-state ", new status " new-status )
-                                  (mt:test-set-state-status-by-id run-id test-id new-state new-status #f))
-				(if (not (null? tal))
-				    (loop (car tal)(cdr tal))))
-			       ((run-wait)
-                                ;; BB TODO - manage has-subrun case
-				(debug:print-info 2 *default-log-port* "still waiting, " (length tests) " tests still running")
-				(thread-sleep! 5)
-				(let ((new-tests (proc-get-tests run-id)))
-				  (if (null? new-tests)
-				      (debug:print-info 1 *default-log-port* "Run completed according to zero tests matching provided criteria.")
-				      (loop (car new-tests)(cdr new-tests)))))
-			       ((archive)
-                                ;; BB TODO - manage has-subrun case
-				(if (and run-dir (not toplevel-with-children))
-				    (let ((ddir (conc run-dir "/")))
-				      (case (string->symbol (args:get-arg "-archive"))
-					((save save-remove keep-html)
-					 (if (common:file-exists? ddir)
-					     (debug:print-info 0 *default-log-port* "Estimating disk space usage for " test-fulln ": " (common:get-disk-space-used ddir)))))))
-				(if (not (null? tal))
-				    (loop (car tal)(cdr tal))))
-			       )))
-		       )
-		     (if worker-thread (thread-join! worker-thread)))
-                   (common:join-backgrounded-threads))))
-	   
-	   ;; remove the run if zero tests remain
-	   (if (eq? action 'remove-runs)
-	       (let* ((run-id   (db:get-value-by-header run header "id")) ;; NB// masks run-id from above?
-                      (remtests (mt:get-tests-for-run run-id #f '("DELETED") '("n/a") not-in: #t)))
-		 (if (null? remtests) ;; no more tests remaining
-	           (let* ((linkspath (remove-last-path-directory lasttpath))
-                          (runpaths (hash-table-keys run-paths-hash))
-                    )
-
-                    (debug:print 2 *default-log-port* "run-paths-hash: " (hash-table-keys run-paths-hash))
-
-                    (debug:print 1 *default-log-port* "Removing target " target "run: " run-name)
-                    (if (not keep-records)
-                      (begin
-                        (debug:print 1 *default-log-port* "Removing DB records for the run.")
-                        (rmt:delete-run run-id)
-                        (rmt:delete-old-deleted-test-records))
-                    )
-                    (if (not (equal?  linkspath "/does/not/exist/I"))
-	               (begin 
-                         (debug:print 1 *default-log-port* "Recursively removing links dir " linkspath)
-                         (runs:recursive-delete-with-error-msg linkspath)))
-
-                   (for-each (lambda(runpath)
-                       (debug:print 1 *default-log-port* "Recursively removing runs dir " runpath)
-                       (runs:recursive-delete-with-error-msg runpath)
-                     )
-                     runpaths
-                   )
-		       )))))
-	 ))
-     runs)
-    ;; special case - archive get
-    (if (equal? (args:get-arg "-archive") "get")
-	(archive:bup-get-data "get" #f #f test-records rp-mutex bup-mutex))
-    (if (or (equal? (args:get-arg "-archive") "save") (equal? (args:get-arg "-archive") "save-remove"))
-        (begin 
-             (print "db archive started")  
-             (archive:megatest-db target runnamepatt)
-             (print "db archived")))
-    )
-  #t
-  )
-
-(define (runs:remove-test-directory test mode) ;; remove-data-only)
-  (let* ((run-dir       (db:test-get-rundir test))    ;; run dir is from the link tree
-	 (real-dir      (if (common:file-exists? run-dir)
-			    ;; (resolve-pathname run-dir)
-			    (common:nice-path run-dir)
-			    #f))
-         (clean-mode    (or mode 'remove-all))
-         (test-id       (db:test-get-id test))
-        ;; (lock-key      (conc "test-" test-id))
-        ;; (got-lock      (let loop ((lock        (rmt:no-sync-get-lock lock-key))
-	;; 			     (expire-time (+ (current-seconds) 30))) ;; give up on getting the lock and steal it after 15 seconds
-	;; 		    (if (car lock)
-	;; 			#t
-	;; 			(if (> (current-seconds) expire-time)
-	;; 			    (begin
-	;; 			      (debug:print-info 0 *default-log-port* "Timed out waiting for a lock to clean test with id " test-id)
-	;; 			      (rmt:no-sync-del! lock-key) ;; destroy the lock
-	;; 			      (loop (rmt:no-sync-get-lock lock-key) expire-time)) ;; 
-	;; 			    (begin
-	;; 			      (thread-sleep! 1)
-	 ;; 			      (loop (rmt:no-sync-get-lock lock-key) expire-time)))))))
-	 )
-    (case clean-mode
-      ((remove-data-only)(mt:test-set-state-status-by-id (db:test-get-run_id test)(db:test-get-id test) "CLEANING" "LOCKED" #f))
-      ((remove-all)      (mt:test-set-state-status-by-id (db:test-get-run_id test)(db:test-get-id test) "REMOVING" "LOCKED" #f))
-      ((archive-remove)  (mt:test-set-state-status-by-id (db:test-get-run_id test)(db:test-get-id test) "ARCHIVE_REMOVING" #f #f)))
-    (debug:print-info 1 *default-log-port* "Attempting to remove " (if real-dir (conc " dir " real-dir " and ") "") " link " run-dir)
-    (if (and real-dir 
-	     (> (string-length real-dir) 5)
-	     (common:file-exists? real-dir)) ;; bad heuristic but should prevent /tmp /home etc.
-	(let* ((realpath (resolve-pathname run-dir)))
-	  (debug:print-info 1 *default-log-port* "Recursively removing " realpath)
-	  (if (common:file-exists? realpath)
-	      (runs:safe-delete-test-dir realpath)
-	      (debug:print 0 *default-log-port* "WARNING: test dir " realpath " appears to not exist or is not readable")))
-	(if real-dir 
-	    (debug:print 0 *default-log-port* "WARNING: directory " real-dir " does not exist")
-	    (debug:print 0 *default-log-port* "WARNING: no real directory corrosponding to link " run-dir ", nothing done")))
-    (if (symbolic-link? run-dir)
-	(begin
-	  (debug:print-info 1 *default-log-port* "Removing symlink " run-dir)
-	  (handle-exceptions
-	   exn
-	   (debug:print-error 0 *default-log-port* " Failed to remove symlink " run-dir ((condition-property-accessor 'exn 'message) exn) ", attempting to continue, exn=" exn)
-	   (delete-file run-dir)))
-	(if (directory? run-dir)
-	    (if (> (directory-fold (lambda (f x)(+ 1 x)) 0 run-dir) 0)
-		(debug:print 0 *default-log-port* "WARNING: refusing to remove " run-dir " as it is not empty")
-		(handle-exceptions
-		 exn
-		 (debug:print-error 0 *default-log-port* " Failed to remove directory " run-dir ((condition-property-accessor 'exn 'message) exn) ", attempting to continue, exn=" exn)
-		 (delete-directory run-dir)))
-	    (if (and run-dir
-		     (not (member run-dir (list "n/a" "/tmp/badname"))))
-		(debug:print 0 *default-log-port* "WARNING: not removing " run-dir " as it either doesn't exist or is not a symlink")
-		(debug:print 0 *default-log-port* "NOTE: the run dir for this test is undefined. Test may have already been deleted."))
-	    ))
-    ;; Only delete the records *after* removing the directory. If things fail we have a record 
-    (case clean-mode
-      ((remove-data-only)(mt:test-set-state-status-by-id (db:test-get-run_id test)(db:test-get-id test) (db:test-get-state test)(db:test-get-status test) #f))
-      ((archive-remove)  (mt:test-set-state-status-by-id (db:test-get-run_id test)(db:test-get-id test) "ARCHIVED" #f #f))
-      (else (rmt:delete-test-records (db:test-get-run_id test) (db:test-get-id test))))
-    ;; (rmt:no-sync-del! lock-key)
-    ))
-
-;;======================================================================
-;; Routines for manipulating runs
-;;======================================================================
-
-;; Since many calls to a run require pretty much the same setup 
-;; this wrapper is used to reduce the replication of code
-(define (general-run-call switchname action-desc proc)
-  (let ((runname (common:args-get-runname))
-	(target  (common:args-get-target)))
-    (cond
-     ((not target)
-      (debug:print-error 0 *default-log-port* "Missing required parameter for " switchname ", you must specify the target with -target")
-      (exit 3))
-     ((not runname)
-      (debug:print-error 0 *default-log-port* "Missing required parameter for " switchname ", you must specify the run name with -runname runname")
-      (exit 3))
-     (else
-      (let (;; (db   #f)
-	    (keys #f))
-	(if (launch:setup)
-	    (begin
-	      (full-runconfigs-read) ;; cache the run config
-	      ;; (launch:cache-config) ;; there are two independent config cache locations, turning this one off for now. MRW.
-	      ) ;; do not cache here - need to be sure runconfigs is processed
-	    (begin 
-	      (debug:print 0 *default-log-port* "Failed to setup, exiting")
-	      (exit 1)))
-
-        
-	(set! keys (keys:config-get-fields *configdat*))
-	;; have enough to process -target or -reqtarg here
-	(if (args:get-arg "-reqtarg")
-	    (let* ((runconfigf (conc  *toppath* "/runconfigs.config")) ;; DO NOT EVALUATE ALL 
-		   (runconfig  (read-config runconfigf #f #t environ-patt: #f)))
-	      (if (hash-table-ref/default runconfig (args:get-arg "-reqtarg") #f)
-		  (keys:target-set-args keys (args:get-arg "-reqtarg") args:arg-hash)
-		    
-		  (begin
-		    (debug:print-error 0 *default-log-port* "[" (args:get-arg "-reqtarg") "] not found in " runconfigf)
-		    ;; (if db (sqlite3:finalize! db))
-		    (exit 1)
-		    )))
-	    (if (args:get-arg "-target")
-		(keys:target-set-args keys (args:get-arg "-target" args:arg-hash) args:arg-hash)))
-	(if (not (car *configinfo*))
-	    (begin
-	      (debug:print-error 0 *default-log-port* "Attempted to " action-desc " but run area config file not found")
-	      (exit 1))
-	    ;; Extract out stuff needed in most or many calls
-	    ;; here then call proc
-	    (let* ((keyvals    (keys:target->keyval keys target)))
-	      (proc target runname keys keyvals)))
-	;; (if db (sqlite3:finalize! db))
-	(set! *didsomething* #t))))))
-
-;;======================================================================
-;; Lock/unlock runs
-;;======================================================================
-
-(define (runs:handle-locking target keys runname lock unlock user)
-  (let* ((db       #f)
-	 (rundat   (mt:get-runs-by-patt keys runname target))
-	 (header   (vector-ref rundat 0))
-	 (runs     (vector-ref rundat 1)))
-    (for-each (lambda (run)
-		(let ((run-id (db:get-value-by-header run header "id"))
-           (str (if lock 
-									"lock"
-                  "unlock")))
-		  (if (or lock
-			  (and unlock
-			       (or (args:get-arg "-force")
-                (begin
-				 (print "Do you really wish to unlock run " run-id "?\n   y/n: ")
-				 (equal? "y" (read-line))))))
-          (begin 
-		      (rmt:lock/unlock-run run-id lock unlock user)
-					(debug:print-info 0 *default-log-port* "Done " str " on run id " run-id))
-		      (debug:print-info 0 *default-log-port* "Skipping lock/unlock on " run-id))))
-	      runs)))
-;;======================================================================
-;; Rollup runs
-;;======================================================================
-
-;; Update the test_meta table for this test
-(define (runs:update-test_meta test-name test-conf)
-  (let ((currrecord (rmt:testmeta-get-record test-name)))
-    (if (not currrecord)
-	(begin
-	  (set! currrecord (make-vector 11 #f))
-	  (rmt:testmeta-add-record test-name)))
-    (for-each 
-     (lambda (key)
-       (let* ((idx (cadr key))
-	      (fld (car  key))
-	      (val (configf:lookup test-conf "test_meta" fld)))
-	 ;; (debug:print 5 *default-log-port* "idx: " idx " fld: " fld " val: " val)
-	 (if (and val (not (equal? (vector-ref currrecord idx) val)))
-	     (begin
-	       (print "Updating " test-name " " fld " to " val)
-	       (rmt:testmeta-update-field test-name fld val)))))
-     '(("author" 2)("owner" 3)("description" 4)("reviewed" 5)("tags" 9)("jobgroup" 10)))))
-
-;; find tests with matching tags, tagpatt is a string "tagpatt1,tagpatt2%, ..."
-;;
-(define (runs:get-tests-matching-tags tagpatt)
-  (let* ((tagdata (rmt:get-tests-tags))
-         (res     '())) ;; list of tests that match one or more tags
-    (for-each
-     (lambda (row)
-       (let* ((tag (car row))
-              (tests (cdr row)))
-       (if (patt-list-match tag tagpatt)
-           (set! res (append tests res)))))
-     tagdata)
-    res))
-    
-
-;; Update test_meta for all tests
-(define (runs:update-all-test_meta db)
-  (let ((test-names (tests:get-all))) ;; (tests:get-valid-tests)))
-    (for-each 
-     (lambda (test-name)
-       (let* ((test-conf    (mt:lazy-read-test-config test-name)))
-	 (if test-conf (runs:update-test_meta test-name test-conf))))
-     (hash-table-keys test-names))))
-
-;; This could probably be refactored into one complex query ...
-;; NOT PORTED - DO NOT USE YET
-;;
-#;(define (runs:rollup-run keys runname user keyvals)
-  (debug:print 4 *default-log-port* "runs:rollup-run, keys: " keys " -runname " runname " user: " user)
-  (let* ((db              #f)
-	 ;; register run operates on the main db
-	 (new-run-id      (rmt:register-run keyvals runname "new" "n/a" user (args:get-arg "-contour")))
-	 (prev-tests      (rmt:get-matching-previous-test-run-records new-run-id "%" "%"))
-	 (curr-tests      (mt:get-tests-for-run new-run-id "%/%" '() '()))
-	 (curr-tests-hash (make-hash-table)))
-    (rmt:update-run-event_time new-run-id)
-    ;; index the already saved tests by testname and itemdat in curr-tests-hash
-    (for-each
-     (lambda (testdat)
-       (let* ((testname  (db:test-get-testname testdat))
-	      (item-path (db:test-get-item-path testdat))
-	      (full-name (conc testname "/" item-path)))
-	 (hash-table-set! curr-tests-hash full-name testdat)))
-     curr-tests)
-    ;; NOPE: Non-optimal approach. Try this instead.
-    ;;   1. tests are received in a list, most recent first
-    ;;   2. replace the rollup test with the new *always*
-    (for-each 
-     (lambda (testdat)
-       (let* ((testname  (db:test-get-testname testdat))
-	      (item-path (db:test-get-item-path testdat))
-	      (full-name (conc testname "/" item-path))
-	      (prev-test-dat (hash-table-ref/default curr-tests-hash full-name #f))
-	      (test-steps    (rmt:get-steps-for-test (db:test-get-id testdat)))
-	      (new-test-record #f))
-	 ;; replace these with insert ... select
-	 (apply sqlite3:execute 
-		db 
-		(conc "INSERT OR REPLACE INTO tests (run_id,testname,state,status,event_time,host,cpuload,diskfree,uname,rundir,item_path,run_duration,final_logf,comment) "
-		      "VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?);")
-		new-run-id (cddr (vector->list testdat)))
-	 (set! new-testdat (car (mt:get-tests-for-run new-run-id (conc testname "/" item-path) '() '())))
-	 (hash-table-set! curr-tests-hash full-name new-testdat) ;; this could be confusing, which record should go into the lookup table?
-	 ;; Now duplicate the test steps
-	 (debug:print 4 *default-log-port* "Copying records in test_steps from test_id=" (db:test-get-id testdat) " to " (db:test-get-id new-testdat))
-	 (cdb:remote-run ;; to be replaced, note: this routine is not used currently
-	  (lambda ()
-	    (sqlite3:execute 
-	     db 
-	     (conc "INSERT OR REPLACE INTO test_steps (test_id,stepname,state,status,event_time,comment) "
-		   "SELECT " (db:test-get-id new-testdat) ",stepname,state,status,event_time,comment FROM test_steps WHERE test_id=?;")
-	     (db:test-get-id testdat))
-	    ;; Now duplicate the test data
-	    (debug:print 4 *default-log-port* "Copying records in test_data from test_id=" (db:test-get-id testdat) " to " (db:test-get-id new-testdat))
-	    (sqlite3:execute 
-	     db 
-	     (conc "INSERT OR REPLACE INTO test_data (test_id,category,variable,value,expected,tol,units,comment) "
-		   "SELECT " (db:test-get-id new-testdat) ",category,variable,value,expected,tol,units,comment FROM test_data WHERE test_id=?;")
-	     (db:test-get-id testdat))))
-	 ))
-     prev-tests)))
-
-(define doc-template 
-  '(*TOP*
-    (*PI* xml "version='1.0'")
-    (testsuite)))
-
-(define (runs:update-junit-test-reporter-xml run-id)
-  (let*	(
-	 (junit-test-reporter	(configf:lookup *configdat* "runs" "junit-test-reporter-xml"))
-	 (junit-test-report-dir  (configf:lookup *configdat* "runs" "junit-test-report-dir"))
-	 (xml-dir		(if (and junit-test-reporter (equal? junit-test-reporter "yes" ))
-				    (if junit-test-report-dir
-					junit-test-report-dir
-					(conc (getenv "MT_LINKTREE") "/" (getenv "MT_TARGET") "/" (getenv "MT_RUNNAME")))
-				    #f))
-	 (xml-ts-name		(if xml-dir
-				    (conc (getenv "MT_TESTSUITENAME")"."(string-translate (getenv "MT_TARGET") "/" ".") "." (getenv "MT_RUNNAME"))
-				    #f))
-         (keyname               (if xml-ts-name (common:get-signature xml-ts-name) #f))
-	 (xml-path		(if xml-dir
-				    (conc xml-dir "/" keyname ".xml")
-				    #f))
-
-	 (test-data		(if xml-dir
-				    (rmt:get-tests-for-run run-id "%" '() '() ;; run-id testpatt states statuses
-							   #f #f ;; offset limit
-							   #f ;; not-in
-							   #f ;; sort-by
-							   #f ;; sort-order
-							   #f ;; get full data (not 'shortlist)
-							   0 ;; (runs:gendat-inc-results-last-update *runs:general-data*) ;; last update time
-							   #f)
-				    '()))
-	 (tests-count		(if xml-dir (length test-data) #f)))
-    (if (and junit-test-reporter (equal? junit-test-reporter "yes" ))
-	(begin
-					;((sxml-modify! `("testsuite" insert-into (@ (name ,xml-ts-name) (tests ,tests-count)))) doc)
-
-	  (let loop	((test		(car test-data))
-			 (tail		(cdr test-data))
-			 (doc		doc-template)
-			 (fail-cnt	0)
-			 (error-cnt	0))
-	    (let*	((test-name	(vector-ref test 2))
-			 (test-itempath	(vector-ref test 11))
-			 (tc-name	(conc test-name (if (and test-itempath (not (equal? test-itempath ""))) (conc "." (string-translate test-itempath "/" "." )) "")))
-			 (test-state	(vector-ref test 3))
-			 (comment	(vector-ref test 14))   
-			 (test-status	(vector-ref test 4))
-			 (exc-msg	(conc "No bucket for State " test-state " Status " test-status))
-			 (new-doc	(cond 
-						((member test-state (list "RUNNING" ))
-							((sxml-modify `("testsuite" insert-into (testcase (@ (name ,tc-name)) (inProgress)))) doc))
-						((member test-state (list "LAUNCHED" "REMOTEHOSTSTART"  "NOT_STARTED"))
-							((sxml-modify `("testsuite" insert-into (testcase (@ (name ,tc-name)) (inQueue)))) doc))
-						((member test-status (list "PASS" "WARN" "WAIVED"))
-							((sxml-modify `("testsuite" insert-into (testcase (@ (name ,tc-name))))) doc))
-						((member test-status (list "FAIL" "CHECK"))
-							((sxml-modify `("testsuite" insert-into (testcase (@ (name ,tc-name)) (failure (@ (message ,comment) (type "failure")))))) doc)) 
-						((member test-status (list "DEAD" "KILLED" "ABORT" "PREQ_FAIL" "PREQ_DISCARDED"))
-							((sxml-modify `("testsuite" insert-into (testcase (@ (name ,tc-name)) (failure (@ (message ,comment) (type "error")))))) doc))
-						((member test-status (list "SKIP"))
-							((sxml-modify `("testsuite" insert-into (testcase (@ (name ,tc-name)) (skipped (@ (type "skipped")))))) doc))
-						(else 
-							(debug:print 0 *default-log-port* (conc "What do I do with State " test-state " Status " test-status))
-							((sxml-modify `("testsuite" insert-into (testcase (@ (name ,tc-name)) (failure (@ (message ,exc-msg) (type "error")))))) doc))))
-			(new-error-cnt	(if (member test-status (list "DEAD" "KILLED" "ABORT" "PREQ_FAIL" "PREQ_DISCARDED"))
-						(+ error-cnt 1) 
-						error-cnt))
-			(new-fail-cnt	(if (member test-status (list "FAIL" "CHECK"))
-						(+ fail-cnt 1)
-						  fail-cnt)))
- 	      (if (null? tail)
-		    (let* ((final-doc ((sxml-modify `("testsuite" insert-into (@ (name ,xml-ts-name) (tests ,tests-count) (errors ,error-cnt) (failures ,fail-cnt)))) new-doc)))
-		    (debug:print 0 *default-log-port* "modify attrib error=" error-cnt " fail= " fail-cnt)
-		    (handle-exceptions
-		     exn
-		     (let*	((msg	((condition-property-accessor 'exn 'message) exn)))
-		       (debug:print 0 *default-log-port* (conc "WARNING: Failed to update file" xml-path". Message:" msg ", exn=" exn)))
-		     		   
-		     (if (not (file-exists? xml-dir)) 
-			 (create-directory xml-dir #t))
-                     (if (not (rmt:no-sync-get/default keyname #f)) 
-                       (begin
-			 (rmt:no-sync-set  keyname "on")
-			 (debug:print 0 *default-log-port* "creating xml at " xml-path)
-		         (with-output-to-file xml-path
-		         (lambda ()
-			   (print (sxml-serializer#serialize-sxml final-doc  ns-prefixes: (list (cons 'gnm "http://foo"))))))
-                           (rmt:no-sync-del! keyname))
-                          (debug:print 0 *default-log-port*  "Could not get the lock. Skip writing the xml file."))))
-		  (loop (car tail) (cdr tail) new-doc new-fail-cnt new-error-cnt))))))))
-	 
-     
-;; clean cache files
-(define (runs:clean-cache target runname toppath)
-  (if target
-      (if runname
-	  (let* ((linktree (common:get-linktree)) ;; (if toppath (configf:lookup *configdat* "setup" "linktree")))
-		 (runtop   (conc linktree "/" target "/" runname))
-		 (files    (if (common:file-exists? runtop)
-			       (append (glob (conc runtop "/.megatest*"))
-				       (glob (conc runtop "/.runconfig*")))
-			       '())))
-	    (if (null? files)
-		(debug:print-info 0 *default-log-port* "No cached megatest or runconfigs files found. None removed.")
-		(begin
-		  (debug:print-info 0 *default-log-port* "Removing cached files:\n    " (string-intersperse files "\n    "))
-		  (for-each 
-		   (lambda (f)
-		     (handle-exceptions
-			 exn
-			 (debug:print 0 *default-log-port* "WARNING: Failed to remove file " f ", exn=" exn)
-		       (delete-file f)))
-		   files))))
-	  (debug:print-error 0 *default-log-port* "-clean-cache requires -runname."))
-      (debug:print-error 0 *default-log-port* "-clean-cache requires -target or -reqtarg")))

ADDED   runsmod.scm
Index: runsmod.scm
==================================================================
--- /dev/null
+++ runsmod.scm
@@ -0,0 +1,2777 @@
+;;======================================================================
+;; Copyright 2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
+
+;;======================================================================
+
+(declare (unit runsmod))
+
+(declare (uses debugprint))
+(declare (uses commonmod))
+(declare (uses configfmod))
+(declare (uses mtargs))
+(declare (uses mtver))
+(declare (uses csv-xml))
+(declare (uses keysmod))
+(declare (uses mtmod))
+(declare (uses processmod))
+(declare (uses dbmod))
+(declare (uses rmtmod))
+(declare (uses testsmod))
+(declare (uses tasksmod))
+(declare (uses archivemod))
+(declare (uses launchmod))
+(declare (uses subrunmod))
+(declare (uses servermod))
+(declare (uses itemsmod))
+
+(module runsmod
+	*
+	
+(import scheme
+	(prefix sqlite3 sqlite3:)
+	chicken.base
+	chicken.condition
+	chicken.eval
+	chicken.file
+	chicken.file.posix
+	chicken.format
+	chicken.io
+	chicken.pathname
+	chicken.port
+	chicken.pretty-print
+	chicken.process
+	chicken.process-context
+	chicken.process-context.posix
+	chicken.sort
+	chicken.string
+	chicken.time
+	chicken.time.posix
+	chicken.random
+	chicken.process.signal
+	
+	(prefix base64 base64:)
+	csv-xml
+	directory-utils
+	matchable
+	regex
+	s11n
+	srfi-1
+	srfi-13
+	srfi-18
+	srfi-69
+	stack
+	sxml-modifications
+	system-information
+	typed-records
+	z3
+
+	(prefix mtargs args:)
+	commonmod
+	configfmod
+	debugprint
+	keysmod
+	mtmod
+	mtver
+	processmod
+	dbmod
+	rmtmod
+	testsmod
+	tasksmod
+	archivemod
+	launchmod
+	subrunmod
+	servermod
+	itemsmod
+	
+	)
+
+;; (include "db_records.scm")
+(include "run_records.scm")
+(include "test_records.scm")
+(include "key_records.scm")
+
+;; use this struct to facilitate refactoring
+;;
+
+(defstruct runs:dat
+  reglen regfull
+  runname max-concurrent-jobs run-id
+  test-patts required-tests test-registry
+  registry-mutex flags keyvals run-info all-tests-registry
+  ;; stores results from last runs:can-run-more-tests 
+  (can-run-more-tests      #f) ;; (list can-run-more-flag num-running num-running-in-jobgroup max-concurrent-jobs job-group-limit)
+  ((can-run-more-tests-count 0) : fixnum)
+  (last-fuel-check         0)  ;; time when we last checked fuel
+  (beginning-of-time       (current-seconds))
+  (load-mgmt-function      #f)
+  (wait-for-jobs-function  #f)
+  (last-load-check-time    0)
+  (last-jobs-check-time    0)
+  )
+
+(defstruct runs:testdat
+  hed tal reg reruns  test-record
+  test-name item-path jobgroup
+  waitons testmode  newtal itemmaps prereqs-not-met)
+  
+;; look in the $MT_RUN_AREA_HOME/.softlocks directory for key-host-pid.softlock files
+;;  - remove any that are over 3600 seconds old
+;;  - if there are any that are younger than 10 seconds
+;;      * sleep 10 seconds
+;;      * touch my key-host-pid.softlock file
+;;      * return
+;;  - if there are no files younger than 10 seconds
+;;     * touch my key-host-pid.softlock file
+;;     * return
+;;  
+(define (runs:wait-on-softlock rdat key)
+  (if (not (and *toppath* (file-exists? *toppath*))) ;; don't seem to have toppath yet
+      (debug:print-info 0 *default-log-port* "Can't create softlocks - don't see MTRAH yet.")
+      (let* ((softlocks-dir (conc *toppath* "/.softlocks")))
+	(if (not (file-exists? softlocks-dir))
+	    (create-directory softlocks-dir #t))
+	(let* ((my-lock-file   (conc softlocks-dir "/" key "-" (get-host-name) "-" (current-process-id) ".softlock"))
+	       (lock-files     (filter (lambda (x)
+					 (not (equal? x my-lock-file)))
+				       (glob (conc softlocks-dir "/" key "*.softlock"))))
+	       (fresh-locks    (any (lambda (x) ;; do we have any locks younger than 10 seconds
+				      (let* ((mod-time (file-modification-time x))
+					     (age      (- (current-seconds) mod-time)))
+					(cond
+					 ((> age 3600) ;; too old to keep, remove it
+					  (delete-file* x) #f)
+					 ((< age 10)  #t)
+					 (else #f))))
+				    lock-files)))
+	  (if fresh-locks
+	      (begin
+		(if (runs:lownoise "runners-softlock-wait" 360)
+		    (debug:print-info 0 *default-log-port* "Other runners in flight, giving up some time..."))
+		(thread-sleep! 2))
+	      (begin
+		(if (runs:lownoise "runners-softlock-nowait" 360)
+		    (debug:print-info 0 *default-log-port* "No runners in flight, updating softlock"))
+		(let* ((ouf (open-output-file my-lock-file)))
+		  (with-output-to-port ouf
+		    (lambda ()(print (current-seconds))))
+		  (close-output-port ouf))))
+	  (runs:dat-last-fuel-check-set! rdat (current-seconds))))))
+  
+;; Fourth try, do accounting through time
+;;
+(define (runs:parallel-runners-mgmt rdat)
+  (let ((time-to-check (configf:lookup-number *configdat* "runners" "time-to-check" default: 10)) ;; 28
+	(time-to-wait  (configf:lookup-number *configdat* "runners" "time-to-wait" default: 30))
+	(now-time      (current-seconds)))
+    (if (> (- now-time (runs:dat-last-fuel-check rdat)) time-to-check) ;; time to check
+	(runs:wait-on-softlock rdat "runners"))))
+
+;; To test parallel-runners management start a repl:
+;;  megatest -repl
+;; then run:
+;;  (runs:test-parallel-runners 60)
+;;
+(define (runs:test-parallel-runners duration #!optional (proc #f))
+  (let* ((rdat   (make-runs:dat))
+	 (rtime  0)
+	 (startt (current-seconds))
+	 (endt   (+ startt duration)))
+    ((or proc runs:parallel-runners-mgmt) rdat)
+    (let loop ()
+      (let* ((wstart (current-seconds)))
+	(if (< wstart endt)
+	    (let* ((work-time (pseudo-random-integer 10)))
+	      #;(debug:print-info 0 *default-log-port* "working for " work-time
+				" seconds. Total work: " rtime ", elapsed time: " (- wstart startt))
+	      (thread-sleep! work-time)
+	      (set! rtime (+ rtime work-time))
+	      ((or proc runs:parallel-runners-mgmt) rdat)
+	      (loop)))))
+    (let* ((done-time (current-seconds)))
+      (debug:print-info 0 *default-log-port* "DONE: rtime=" rtime ", elapsed time=" (- done-time startt)
+			", ratio=" (/ rtime (- done-time startt))))))
+
+;; Every time can-run-more-tests is called increment the delay
+;;
+;; NOTE: We run this server-side!! Do not use this global except in the runs:can-run-more-tests routine
+;;
+;; (define *runs:can-run-more-tests-count* 0)
+(define (runs:shrink-can-run-more-tests-count runsdat)
+  (runs:dat-can-run-more-tests-count-set! runsdat 0))
+
+(define (runs:inc-can-run-more-tests-count runsdat)
+  (runs:dat-can-run-more-tests-count-set!
+   runsdat
+   (+ (runs:dat-can-run-more-tests-count runsdat) 1)))
+
+;;  (set! *runs:can-run-more-tests-count* 0)) ;; (/ *runs:can-run-more-tests-count* 2)))
+
+;; Temporary globals. Move these into the logic or into common
+;;
+(define (runs:inc-cant-run-tests testname)
+  (hash-table-set! *seen-cant-run-tests* testname
+		   (+ (hash-table-ref/default *seen-cant-run-tests* testname 0) 1)))
+
+(define (runs:can-keep-running? testname n)
+  (< (hash-table-ref/default *seen-cant-run-tests* testname 0) n))
+
+;; mechanism to limit printing info to the screen that is repetitive.
+;;
+;; Example: 
+;; (if (runs:lownoise "waiting on tasks" 60)
+;;     (debug:print-info 2 *default-log-port* "waiting for tasks to complete, sleeping briefly ..."))
+;;
+(define (runs:lownoise key waitval)
+  (let ((lasttime (hash-table-ref/default *runs:denoise* key 0))
+	(currtime (current-seconds)))
+    (if (> (- currtime lasttime) waitval)
+	(begin
+	  (hash-table-set! *runs:denoise* key currtime)
+	  #t)
+	#f)))
+
+(define (runs:can-run-more-tests runsdat run-id jobgroup max-concurrent-jobs)
+
+  ;; Take advantage of a good place to exit if running the one-pass methodology
+  (if (and (> (runs:dat-can-run-more-tests-count runsdat) 20)
+	   (args:get-arg "-one-pass"))
+      (exit 0))
+
+  (if (runs:dat-load-mgmt-function runsdat)((runs:dat-load-mgmt-function runsdat)))
+
+  (let* ((num-running             (rmt:get-count-tests-running run-id))
+	 (num-running-in-jobgroup (rmt:get-count-tests-running-in-jobgroup run-id jobgroup))
+	 (job-group-limit         (let ((jobg-count (configf:lookup *configdat* "jobgroups" jobgroup)))
+				    (if (string? jobg-count)
+					(string->number jobg-count)
+					jobg-count))))
+    (if (> (+ num-running num-running-in-jobgroup) 0)
+	(runs:inc-can-run-more-tests-count runsdat)) ;; (set! *runs:can-run-more-tests-count* (+ *runs:can-run-more-tests-count* 1)))
+    (if (not (eq? *last-num-running-tests* num-running))
+	(begin
+	  (debug:print 2 *default-log-port* "max-concurrent-jobs: " max-concurrent-jobs ", num-running: " num-running)
+	  (set! *last-num-running-tests* num-running)))
+    (if (not (eq? 0 *globalexitstatus*))
+	(list #f num-running num-running-in-jobgroup max-concurrent-jobs job-group-limit)
+	(let* ((can-not-run-more (cond
+				 ;; if max-concurrent-jobs is set and the number running is greater 
+				 ;; than it then cannot run more jobs
+				 ((and max-concurrent-jobs (>= num-running max-concurrent-jobs))
+				  (if (runs:lownoise "mcj msg" 60)
+				      (debug:print 0 *default-log-port* "WARNING: Max running jobs exceeded, current number running: " num-running 
+						   ", max_concurrent_jobs: " max-concurrent-jobs))
+				  #t)
+				 ;; if job-group-limit is set and number of jobs in the group is greater
+				 ;; than the limit then cannot run more jobs of this kind
+				 ((and job-group-limit
+				       (>= num-running-in-jobgroup job-group-limit))
+				  (if (runs:lownoise (conc "maxjobgroup " jobgroup) 60)
+				      (debug:print 1 *default-log-port* "WARNING: number of jobs " num-running-in-jobgroup 
+						   " in jobgroup \"" jobgroup "\" exceeds limit of " job-group-limit))
+				  #t)
+				 (else #f))))
+	  (list (not can-not-run-more) num-running num-running-in-jobgroup max-concurrent-jobs job-group-limit)))))
+
+(define (runs:run-pre-hook run-id)
+    (let* ((run-pre-hook   (configf:lookup *configdat* "runs" "pre-hook"))
+           (existing-tests (if run-pre-hook
+                               (rmt:get-tests-for-run run-id "%" '() '() ;; run-id testpatt states statuses
+                                                      #f #f ;; offset limit
+                                                      #f ;; not-in
+                                                      #f ;; sort-by
+                                                      #f ;; sort-order
+                                                      #f ;; get full data (not 'shortlist)
+                                                      0 ;; (runs:gendat-inc-results-last-update *runs:general-data*) ;; last update time
+                                                      'dashboard)
+                               '()))
+           (log-dir         (conc *toppath* "/logs"))
+           (log-file        (conc "pre-hook-" (string-translate (getenv "MT_TARGET") "/" "-") "-" (getenv "MT_RUNNAME") ".log"))
+           (full-log-fname  (conc log-dir "/" log-file)))
+      (if run-pre-hook
+          (if (null? existing-tests)
+              (let* ((use-log-dir (if (not (directory-exists? log-dir))
+                                      (handle-exceptions
+                                       exn
+                                       (begin
+                                         (debug:print 0 *default-log-port* "WARNING: Failed to create " log-dir ", exn=" exn)
+                                         #f)
+                                       (create-directory log-dir #t)
+                                       #t)
+                                      #t))
+                     (start-time   (current-seconds))
+                     (actual-logf  (if use-log-dir full-log-fname log-file)))
+                (handle-exceptions
+                 exn
+                 (begin
+                   (print-call-chain *default-log-port*)
+                   (debug:print 0 *default-log-port* "Message: " ((condition-property-accessor 'exn 'message) exn) ", exn=" exn)
+                   (debug:print 0 *default-log-port* "ERROR: failed to run pre-hook " run-pre-hook ", check the log " log-file))
+                 (debug:print-info 0 *default-log-port* "running run-pre-hook: \"" run-pre-hook "\", log is " actual-logf)
+                 (system (conc run-pre-hook " >> " actual-logf " 2>&1"))
+                 (debug:print-info 0 *default-log-port* "pre-hook \"" run-pre-hook "\" took " (- (current-seconds) start-time) " seconds to run.")))
+              (debug:print 0 *default-log-port* "Skipping pre-hook call \"" run-pre-hook "\" as there are existing tests for this run.")))))
+   
+
+
+
+;; return #t when all items in waitors-upon list are represented in test-patt, #f otherwise.
+(define (runs:testpatts-mention-waitors-upon? test-patt waitors-upon)
+  (null? (tests:filter-test-names-not-matched waitors-upon test-patt)))
+
+;;======================================================================
+;; runs:run-tests is called from megatest.scm and itself
+;;======================================================================
+;;
+;;  test-names: Comma separated patterns same as test-patts but used in selection 
+;;              of tests to run. The item portions are not respected.
+;;              FIXME: error out if /patt specified
+;;            
+(define (runs:run-tests target runname test-patts user flags #!key (run-count 1)) ;; test-names
+  (let* ((keys               (keys:config-get-fields *configdat*))
+	 (keyvals            (keys:target->keyval keys target))
+	 (run-id             (rmt:register-run keyvals runname "new" "n/a" user (args:get-arg "-contour")))  ;;  test-name)))
+	 ;; (deferred          '()) ;; delay running these since they have a waiton clause
+	 (runconfigf         (conc  *toppath* "/runconfigs.config"))
+         (dbfile             (conc  *toppath* "/megatest.db"))
+         (readonly-mode      (not (file-writable? dbfile)))
+	 (test-records       (make-hash-table))
+	 ;; need to process runconfigs before generating these lists
+	 (all-tests-registry #f)  ;; (tests:get-all)) ;; (tests:get-valid-tests (make-hash-table) test-search-path)) ;; all valid tests to check waiton names
+	 (all-test-names     #f)  ;; (hash-table-keys all-tests-registry))
+	 (test-names         #f)  ;; Generated by a call to (tests:filter-test-names all-test-names test-patts))
+	 (required-tests     #f)  ;; Put fully qualified test/testpath names in this list to be done
+         (waitors-upon       (make-hash-table)) ;; given a test, return list of tests waiting upon this test.
+	 (task-key           (conc (hash-table->alist flags) " " (get-host-name) " " (current-process-id)))
+	 ;; (tdbdat             (tasks:open-db))
+	 (config-reruns      (let ((x (configf:lookup *configdat* "setup" "reruns")))
+			       (if x (string->number x) #f)))
+	 (allowed-tests      #f)
+	 (runconf            #f))
+
+    ;; check if readonly
+    (when readonly-mode
+      (debug:print-error 0 *default-log-port* "megatest.db is readonly.  Cannot proceed.")
+      (exit 1))
+
+    ;; per user request. If less than 100Meg space on dbdir partition, bail out with error
+    ;; this will reduce issues in database corruption
+    (common:check-db-dir-and-exit-if-insufficient)
+
+    ;; override the number of reruns from the configs
+    ;; this needs to be done at the place where is first runs:run-tests called 
+    ;(if (and config-reruns
+	  ;   (> run-count config-reruns))
+ 	  ;(set! run-count config-reruns))
+
+    ;; (if (tasks:need-server run-id)(tasks:start-and-wait-for-server tdbdat run-id 10))
+
+    (let ((sighand (lambda (signum)
+		     ;; (signal-mask! signum) ;; to mask or not? seems to cause issues in exiting
+		     (bdat-time-to-exit-set! *bdat* #t)
+		     (print "Received signal " signum ", cleaning up before exit. Please wait...")
+		     (let ((th1 (make-thread (lambda ()
+					       ;; (let ((tdbdat (tasks:open-db)))
+						 (rmt:tasks-set-state-given-param-key task-key "killed") ;; )
+					       (print "Killed by signal " signum ". Exiting")
+					       (thread-sleep! 3)
+					       (exit))))
+			   (th2 (make-thread (lambda ()
+					       (thread-sleep! 5)
+					       (debug:print 0 *default-log-port* "Done")
+					       (exit 4)))))
+		       (thread-start! th2)
+		       (thread-start! th1)
+		       (thread-join! th2)))))
+      (set-signal-handler! signal/int sighand)
+      (set-signal-handler! signal/term sighand))
+
+    ;; force the starting of a server -- removed BB 17ww28 - no longer needed.
+    ;;(debug:print 0 *default-log-port* "waiting on server...")
+    ;;(server:start-and-wait *toppath*)
+    
+    (runs:set-megatest-env-vars run-id inkeys: keys inrunname: runname) ;; these may be needed by the launching process
+    (set! runconf (if (common:file-exists? runconfigf)
+		      (setup-env-defaults runconfigf run-id *already-seen-runconfig-info* keyvals target)
+		      (begin
+			(debug:print 0 *default-log-port* "WARNING: You do not have a run config file: " runconfigf)
+			#f)))
+
+    (if (not test-patts) ;; first time in - adjust testpatt
+	(set! test-patts (common:args-get-testpatt runconf)))
+    ;; if test-patts is #f at this point there is something wrong and we need to bail out
+    (if (not test-patts)
+	(begin
+	  (debug:print 0 *default-log-port* "WARNING: there is no test pattern for this run. Exiting now.")
+	  (exit 0)))
+    
+    (if (args:get-arg "-tagexpr")
+	(begin
+	  (set! allowed-tests (string-join (runs:get-tests-matching-tags (args:get-arg "-tagexpr")) ","))
+	  	  (debug:print-info 0 *default-log-port* "filtering initial test list with tagexpr: " (args:get-arg "-tagexpr") " => " allowed-tests)
+		  ));; tests will be ANDed with this list
+
+    ;; register this run in monitor.db
+    (rmt:tasks-add "run-tests" user target runname test-patts task-key) ;; params)
+    (rmt:tasks-set-state-given-param-key task-key "running")
+
+    #;(common:telemetry-log "run-tests"
+                          payload:
+                          `( (target . ,target)
+                             (run-name . ,runname)
+                             (test-patts . ,test-patts) ) )
+
+    
+    ;; Now generate all the tests lists
+    (set! all-tests-registry (tests:get-all))   ;; hash of testname => path-to-test
+    (set! all-test-names     (hash-table-keys all-tests-registry))
+    ;; filter first for allowed-tests (from -tagexpr) then for test-patts.
+    (set! test-names         (tests:filter-test-names
+			      (if allowed-tests
+				  (tests:filter-test-names all-test-names allowed-tests)
+				  all-test-names)
+			      test-patts))
+
+    ;; I think seeding required-tests with all test-names makes sense but lack analysis to back that up.
+
+    ;; NEW STRATEGY HERE:
+    ;; 1. fill required tests with test-patts
+    ;; 2. scan testconfigs and if waitons, itemwait, itempatt calc prior test test-patt
+    ;; 3. repeat until all deps propagated
+    
+    ;; any tests with direct mention in test-patts can be added to required
+    ;;(set! required-tests     (lset-intersection equal? (string-split test-patts ",") all-test-names))
+    (set! required-tests     (tests:filter-test-names all-test-names test-patts))
+    ;;
+    ;; (set! required-tests     (lset-intersection equal? test-names all-test-names))
+    
+    ;; look up all tests matching the comma separated list of globs in
+    ;; test-patts (using % as wildcard)
+
+    ;; (set! test-names (delete-duplicates (tests:get-valid-tests *toppath* test-patts)))
+    (debug:print-info 0 *default-log-port* "tests search path: " (string-intersperse (tests:get-tests-search-path *configdat*) " "))
+    (debug:print-info 0 *default-log-port* "all tests:         " (string-intersperse (sort all-test-names string<) " "))
+    (debug:print-info 0 *default-log-port* "test names:        " (string-intersperse (sort test-names string<) " "))
+    (debug:print-info 0 *default-log-port* "required tests:    " (string-intersperse (sort required-tests string<) " "))
+
+    ;; on the first pass or call to run-tests set FAILS to NOT_STARTED if
+    ;; -keepgoing is specified
+    (if (eq? *passnum* 0)
+	(begin
+	  ;; Is this still necessary? I think not. Unreachable tests are marked as such and 
+	  ;; should not cause problems here.
+	  ;;
+	  ;; have to delete test records where NOT_STARTED since they can cause -keepgoing to 
+	  ;; get stuck due to becoming inaccessible from a failed test. I.e. if test B depends 
+	  ;; on test A but test B reached the point on being registered as NOT_STARTED and test
+	  ;; A failed for some reason then on re-run using -keepgoing the run can never complete.
+	  ;;
+	  ;; (rmt:general-call 'delete-tests-in-state run-id "NOT_STARTED")
+	  
+	  ;; Now convert anything in allow-auto-rerun to NOT_STARTED
+	  ;;
+	  (for-each
+	   (lambda (state-status)
+	     (let* ((ss-lst (string-split-fields "/" state-status #:infix))
+		    (state  (if (> (length ss-lst) 0)(car  ss-lst) #f))
+		    (status (if (> (length ss-lst) 1)(cadr ss-lst) #f)))
+	       (rmt:set-tests-state-status run-id test-names state status "NOT_STARTED" status)))
+	   ;; list of state/status pairs separated by spaces
+	   (string-split (or (configf:lookup *configdat* "setup" "allow-auto-rerun") "")))))
+
+    ;; Ensure all tests are registered in the test_meta table
+    (runs:update-all-test_meta #f)
+
+    ;; run the run prehook if there are no tests yet run for this run:
+    ;;
+    (runs:run-pre-hook run-id)
+    ;; mark all test launched flag as false in the meta table 
+    (rmt:set-var (conc "lunch-complete-" run-id) "no")
+    (debug:print-info 1 *default-log-port* "Setting end-of-run to no")
+    (let* ((config-reruns      (let ((x (configf:lookup *configdat* "setup" "reruns")))
+			       (if x (string->number x) #f)))
+	  (config-rerun-cnt (if config-reruns
+			config-reruns
+			1)))
+    (if (eq? config-rerun-cnt run-count)
+      (rmt:set-var (conc "end-of-run-" run-id) "no")))
+
+    (rmt:set-run-state-status run-id "new" "n/a")
+    ;; now add non-directly referenced dependencies (i.e. waiton)
+    ;;======================================================================
+    ;; refactoring this block into tests:get-full-data
+    ;;
+    ;; What happended, this code is now duplicated in tests!?
+    ;;
+    ;;======================================================================
+    
+    (if (not (null? test-names)) ;; BEGIN test-names loop
+	(let loop ((hed (car test-names))   ;; NOTE: This is the main loop that iterates over the test-names
+		   (tal (cdr test-names)))         ;; 'return-procs tells the config reader to prep running system but return a proc
+          (debug:print-info 4 *default-log-port* "\n\ntestpatt elaboration loop => hed="hed " tal="tal" test-patts="test-patts" test-names="test-names)
+	  (change-directory *toppath*) ;; PLEASE OPTIMIZE ME!!! I think this should be a no-op but there are several places where change-directories could be happening.
+	  (setenv "MT_TEST_NAME" hed) ;; 
+	  (let*-values (((waitons waitors config) (tests:get-waitons hed all-tests-registry))
+
+			;; NOTE: Have the config - can extract [waitons] section
+			
+                        ((hed-mode)
+                         (let ((m (configf:lookup config "requirements" "mode")))
+                           (if m (map string->symbol (string-split m)) '(normal))))
+                        ((hed-itemized-waiton) ;; are items in hed waiting on items of waiton?
+                         (not (null? (lset-intersection eq? hed-mode '(itemmatch itemwait)))))
+                        )
+	    (debug:print-info 8 *default-log-port* "waitons: " waitons)
+	    ;; check for hed in waitons => this would be circular, remove it and issue an
+	    ;; error
+	    (if (or (member hed waitons)
+		    (member hed waitors))
+		(begin
+		  (debug:print-error 0 *default-log-port* "test " hed " has listed itself as a waiton or waitor, please correct this!")
+		  (set! waitons (filter (lambda (x)(not (equal? x hed))) waitons))
+		  (set! waitors (filter (lambda (x)(not (equal? x hed))) waitors))))
+	    
+	    ;; (items   (items:get-items-from-config config)))
+	    (if (not (hash-table-ref/default test-records hed #f)) ;; waiton-tconfig below will be #f until that test is visted here at least once
+		(hash-table-set! test-records ;; BB: we are doing a manual make-tests:testqueue
+				 hed (vector hed     ;; 0 ;; testname
+					     config  ;; 1 
+					     waitons ;; 2 
+					     (configf:lookup config "requirements" "priority")     ;; priority 3
+					     (tests:get-items config) ;; 4 ;; expand the [items] and or [itemstable] into explict items
+					     #f      ;; itemsdat 5
+					     #f      ;; spare - used for item-path
+					     waitors ;; 
+					     )))
+            ;; update waitors-upon here
+            (for-each
+             (lambda (waiton)
+               (let* ((current-waitors-upon (hash-table-ref/default waitors-upon waiton '())))
+                 (debug:print-info 8 *default-log-port* " current-waiters-upon["waiton"] is "current-waitors-upon )
+                 (when (not (member hed current-waitors-upon))
+                   (debug:print-info 8 *default-log-port* " current-waiters-upon["waiton"] << "hed  )
+                   (hash-table-set! waitors-upon waiton (cons hed current-waitors-upon)))))
+             (if (list? waitons) waitons '()))
+            (debug:print-info 8 *default-log-port* " process waitons&waitors of "hed": "(delete-duplicates (append waitons waitors)))
+            (for-each 
+	     (lambda (waiton)
+	       (if (and waiton (not (member waiton test-names)))
+		   (let* ((waitors-in-testpatt (runs:testpatts-mention-waitors-upon? test-patts (hash-table-ref/default waitors-upon waiton '())))
+                          (waiton-record   (hash-table-ref/default test-records waiton #f))
+			  (waiton-tconfig  (if waiton-record (vector-ref waiton-record 1) #f))
+			  (waiton-itemized (and waiton-tconfig
+						(or (hash-table-ref/default waiton-tconfig "items" #f)
+						    (hash-table-ref/default waiton-tconfig "itemstable" #f))))
+			  (itemmaps        (tests:get-itemmaps config))  ;; (configf:lookup config "requirements" "itemmap"))
+			  (new-test-patts  (tests:extend-test-patts test-patts hed waiton itemmaps hed-itemized-waiton))) 
+		     (debug:print-info 0 *default-log-port* "Test " waiton " has " (if waiton-record "a" "no") " waiton-record and" (if waiton-itemized " " " no ") "items")
+		     ;; need to account for test-patt here, if I am test "a", selected with a test-patt of "hed/b%"
+		     ;; and we are waiting on "waiton" we need to add "waiton/,waiton/b%" to test-patt
+		     ;; is this satisfied by merely appending "/" to the waiton name added to the list?
+		     ;;
+		     ;; This approach causes all of the items in an upstream test to be run 
+		     ;; if we have this waiton already processed once we can analzye it for extending
+		     ;; tests to be run, since we can't properly process waitons unless they have been
+		     ;; initially added we add them again to be processed on second round AND add the hed
+		     ;; back in to also be processed on second round
+		     (if waiton-tconfig ;; BB: waiter should be in test-patts as well as the waiton have a tconfig.
+                         (if waiton-itemized
+                             (if waitors-in-testpatt
+                                 (begin
+                                   (debug:print-info 0 *default-log-port* "New test patts: " new-test-patts ", prev test patts: " test-patts)
+                                   (set! test-names (cons waiton test-names)) ;; need to process this one, only add once the waiton tconfig read
+                                   (set! required-tests (cons (conc waiton "/") required-tests))
+                                   (set! test-patts new-test-patts))
+                                 (begin
+                                   (debug:print-info 0 *default-log-port* "Waitor(s) not yet on testpatt for " waiton ", setting up to re-process it")
+                                   (set! tal (append (cons waiton tal)(list hed)))))
+                             (begin
+                               (debug:print-info 0 *default-log-port* "Adding non-itemized test " waiton " to required-tests")
+                               (set! required-tests (cons waiton required-tests))
+                               (set! test-patts new-test-patts)))
+			 (begin
+			   (debug:print-info 0 *default-log-port* "No testconfig info yet for " waiton ", setting up to re-process it")
+			   (set! tal (append (cons waiton tal)(list hed))))) ;; (cons (conc waiton "/") required-tests))
+		     ;; NOPE: didn't work. required needs to be plain test names. Try tacking on to test-patts
+		     ;;  - doesn't work
+		     ;; (set! test-patts (conc test-patts "," waiton "/"))
+		     ;; (set! test-names (cons waiton test-names))))) ;; was an append, now a cons
+		     )))
+	     (delete-duplicates (append waitons waitors)))
+	    (let ((remtests (delete-duplicates (append waitons tal))))
+              (debug:print-info 8 *default-log-port* " remtests are "remtests)
+	      (if (not (null? remtests))
+		  (begin
+		    ;; (debug:print-info 0 *default-log-port* "Preprocessing continues for " (string-intersperse remtests ", "))
+		    (loop (car remtests)(cdr remtests)))))))) ;; END test-names loop
+
+    (if (not (null? required-tests))
+	(debug:print-info 1 *default-log-port* "Adding \"" (string-intersperse required-tests " ") "\" to the run queue"))
+    ;; NOTE: these are all parent tests, items are not expanded yet.
+    (debug:print-info 4 *default-log-port* "test-records=" (hash-table->alist test-records))
+    (let ((reglen (configf:lookup *configdat* "setup" "runqueue")))
+      (if (> (length (hash-table-keys test-records)) 0)
+	  (let* ((keep-going        #t)
+		 (run-queue-retries 5)
+		 #;(th1        (make-thread (lambda ()
+					    (handle-exceptions
+						exn
+						(begin
+						  (print-call-chain)
+						  (print " message: " ((condition-property-accessor 'exn 'message) exn)))
+					      (runs:run-tests-queue run-id runname test-records keyvals flags test-patts required-tests
+								    (any->number reglen) all-tests-registry)))
+					  "runs:run-tests-queue"))
+		 (th2        (make-thread (lambda ()			 ;; BBQ: why are we visiting ALL runs here?	    
+					    ;; (rmt:find-and-mark-incomplete-all-runs))))) CAN'T INTERRUPT IT ...
+					    (let ((run-ids (rmt:get-all-run-ids)))
+					      (for-each (lambda (run-id)
+							  (if keep-going
+							      (handle-exceptions
+							       exn
+							       (debug:print 0 *default-log-port* "error in calling find-and-mark-incomplete for run-id " run-id ", exn=" exn)
+							       (runs:find-and-mark-incomplete-and-check-end-of-run run-id #f)))) ;; ovr-deadtime))) ;; could be root of https://hsdes.intel.com/appstore/article/#/220546828/main -- Title: Megatest jobs show DEAD even though they are still running (1.64/27)
+							run-ids)))
+					  "runs: mark-incompletes")))
+	    ;; (thread-start! th1)
+	    (thread-start! th2)
+	    ;; (thread-join! th1)
+	    ;; just do the main stuff in the main thread
+	    (runs:run-tests-queue run-id runname test-records keyvals flags test-patts required-tests
+								    (any->number reglen) all-tests-registry)
+	    (set! keep-going #f)
+	    (thread-join! th2)
+	    ;; if run-count > 0 call, set -preclean and -rerun STUCK/DEAD
+	    (if (> run-count 0) ;; handle reruns
+		(begin
+		  (if (not (hash-table-ref/default flags "-preclean" #f))
+		      (hash-table-set! flags "-preclean" #t))
+		  (if (not (hash-table-ref/default flags "-rerun" #f))
+		      (hash-table-set! flags "-rerun" "ABORT,STUCK/DEAD,n/a,ZERO_ITEMS"))
+		  ;; recursive call to self
+		  (runs:run-tests target runname test-patts user flags run-count: (- run-count 1)))
+		(runs:end-of-run-check run-id)))
+	  (debug:print-info 0 *default-log-port* "No tests to run")))
+    (debug:print-info 4 *default-log-port* "All done by here")
+    ;; TODO: try putting post hook call here
+      
+    ;  (debug:print-info 2 *default-log-port* " run-count " run-count)
+    ;  (runs:run-post-hook run-id))
+    ;  (debug:print-info 2 *default-log-port* "Not calling post hook runcount = " run-count ))   
+    (rmt:tasks-set-state-given-param-key task-key "done")
+     
+    ;; (sqlite3:finalize! tasks-db)
+    ))
+
+
+;; loop logic. These are used in runs:run-tests-queue to make it a bit more readable.
+;;
+;; If reg not full and have items in tal then loop with (car tal)(cdr tal) reg reruns
+;; If reg is full (i.e. length >= n
+;;   loop with (car reg) tal (cdr reg) reruns
+;; If tal is empty
+;;   but have items in reg; loop with (car reg)(cdr reg) '() reruns
+;;   If reg is empty => all done
+
+(define (runs:queue-next-hed tal reg n regfull)
+  (if regfull
+      (if (null? reg) #f (car reg))
+      (if (null? tal) ;; tal is used up, pop from reg
+	  (if (null? reg) #f (car reg))
+	  (car tal))))
+
+(define (runs:queue-next-tal tal reg n regfull)
+  (if regfull
+      tal
+      (if (null? tal) ;; must transfer from reg
+	  (if (null? reg) '() (cdr reg))
+	  (cdr tal))))
+
+(define (runs:queue-next-reg tal reg n regfull)
+  (if regfull
+      (if (null? reg) '() (cdr reg)) ;; EXPLORE: reorder (cdr reg) such that looping is more efficient
+      (if (null? tal) ;; if tal is null and reg not full then '() as reg contents moved to tal
+	  '()
+	  reg)))
+
+;; this is the list of parameters to the named loop "loop" near the top of runs:run-tests-queue, look around line 1216
+;;
+(define (runs:loop-values tal reg reglen regfull reruns)
+  (list (runs:queue-next-hed tal reg reglen regfull)      ;; hed
+        (runs:queue-next-tal tal reg reglen regfull)      ;; tal
+        (runs:queue-next-reg tal reg reglen regfull)      ;; reg
+        reruns))                                          ;; reruns
+
+;; objective - iterate thru tests
+;;    => want to prioritize tests we haven't seen before
+;;    => sometimes need to squeeze things in (added to reg)
+;;    => review of a previously seen test is higher priority of never visited test
+;; reg - list of previously visited tests
+;; tal - list of never visited tests
+;;   prefer next hed to be from reg than tal.
+
+(define runs:nothing-left-in-queue-count 0)
+
+;;======================================================================
+;; runs:expand-items is called by runs:run-tests-queue
+;;======================================================================
+;;
+;; return value of runs:expand-items is passed back to runs-tests-queue and is fed to named loop with this signature:
+;;    (let loop ((hed         (car sorted-test-names))
+;;	         (tal         (cdr sorted-test-names))
+;;	         (reg         '()) ;; registered, put these at the head of tal 
+;;	         (reruns      '()))
+(define (runs:expand-items hed tal reg reruns regfull newtal jobgroup max-concurrent-jobs run-id waitons item-path testmode test-record can-run-more items runname tconfig reglen test-registry test-records itemmaps)
+  (let* ((loop-list       (list hed tal reg reruns))
+	 (prereqs-not-met (let ((res (rmt:get-prereqs-not-met run-id waitons hed item-path mode: testmode itemmaps: itemmaps)))
+			    (if (list? res)
+				res
+				(begin
+				  (debug:print 0 *default-log-port*
+					       "ERROR: rmt:get-prereqs-not-met returned non-list!\n"
+					       "  res=" res " run-id=" run-id " waitons=" waitons " hed=" hed " item-path=" item-path " testmode=" testmode " itemmaps=" itemmaps)
+				  '()))))
+         (have-itemized (not (null? (lset-intersection eq? testmode '(itemmatch itemwait)))))
+	 ;; (prereqs-not-met (mt:lazy-get-prereqs-not-met run-id waitons item-path mode: testmode itemmap: itemmap))
+	 (fails           (runs:calc-fails prereqs-not-met))
+	 (prereq-fails    (runs:calc-prereq-fail prereqs-not-met))
+	 (non-completed   (runs:calc-not-completed prereqs-not-met))
+	 (runnables       (runs:calc-runnable prereqs-not-met))
+         (unexpanded-prereqs
+          (filter (lambda (testname)
+                    (let* ((test-rec (hash-table-ref test-records testname))
+                           (items       (tests:testqueue-get-items  test-rec)))
+                      ;;(BB> "HEY " testname "=>"items)
+                      (or (procedure? items)(eq? items 'have-procedure))))
+                  waitons))
+
+
+         )
+    (debug:print-info 4 *default-log-port* "START OF INNER COND #2 "
+		      "\n can-run-more:    " can-run-more
+		      "\n testname:        " hed
+		      "\n prereqs-not-met: " (runs:pretty-string prereqs-not-met)
+		      "\n non-completed:   " (runs:pretty-string non-completed) 
+		      "\n prereq-fails:    " (runs:pretty-string prereq-fails)
+		      "\n fails:           " (runs:pretty-string fails)
+		      "\n testmode:        " testmode
+		      "\n (member 'toplevel testmode): " (member 'toplevel testmode)
+		      "\n (null? non-completed):    " (null? non-completed)
+		      "\n reruns:          " reruns
+		      "\n items:           " items
+		      "\n can-run-more:    " can-run-more)
+
+   (cond
+     ;; all prereqs met, fire off the test
+     ;; or, if it is a 'toplevel test and all prereqs not met are COMPLETED then launch
+
+    ((and (not (member 'toplevel testmode))
+	   (member (hash-table-ref/default test-registry (db:test-make-full-name hed item-path) 'n/a)
+		   '(DONOTRUN removed CANNOTRUN))) ;; *common:cant-run-states-sym*) ;; '(COMPLETED KILLED WAIVED UNKNOWN INCOMPLETE)) ;; try to catch repeat processing of COMPLETED tests here
+      (debug:print-info 4 *default-log-port* "cond branch - "  "ei-1")
+      (debug:print-info 1 *default-log-port* "Test " hed " set to \"" (hash-table-ref test-registry (db:test-make-full-name hed item-path)) "\". Removing it from the queue")
+      (if (or (not (null? tal))
+	      (not (null? reg)))
+          (runs:loop-values tal reg reglen regfull reruns)
+	  (begin
+	    (debug:print-info 0 *default-log-port* "Nothing left in the queue!")
+	    ;; If get here twice then we know we've tried to expand all items
+	    ;; since there must be a logic issue with the handling of loops in the 
+	    ;; items expand phase we will brute force an exit here.
+	    (if (> runs:nothing-left-in-queue-count 2)
+		(begin
+		  (debug:print 0 *default-log-port* "WARNING: this condition is triggered when there were no items to expand and nothing to run. Please check your run for completeness")
+		  (exit 0))
+		(set! runs:nothing-left-in-queue-count (+ runs:nothing-left-in-queue-count 1)))
+	    #f)))
+
+     ;; desired result of below cond branch:
+     ;;   we want to expand items in our test of interest (hed) in the following cases:
+     ;;    case 1 - mode is itemmatch or itemwait: 
+     ;;       - all prereq tests have been expanded
+     ;;       - at least one prereq's items have completed
+     ;;    case 2 - mode is toplevel   
+     ;;       - prereqs are completed.
+     ;;       - or no prereqs can complete 
+     ;;    case 3 - mode not specified 
+     ;;       - prereqs are completed and passed (we could consider removing "and passed" -- it would change behavior from current)          
+    ((or (null? prereqs-not-met)
+	  (and (member 'toplevel testmode)
+	       (null? non-completed)))
+      (debug:print-info 4 *default-log-port* "cond branch - "  "ei-2")
+      (debug:print-info 4 *default-log-port* "runs:expand-items: (or (null? prereqs-not-met) (and (member 'toplevel testmode)(null? non-completed)))")
+      (let ((test-name (tests:testqueue-get-testname test-record)))
+	(setenv "MT_TEST_NAME" test-name) ;; 
+	(setenv "MT_RUNNAME"   runname)
+	(runs:set-megatest-env-vars run-id inrunname: runname) ;; these may be needed by the launching process
+	(let ((items-list (items:get-items-from-config tconfig)))
+	  (if (list? items-list)
+	      (begin
+		(if (null? items-list)
+		    (let ((test-id   (rmt:get-test-id run-id test-name ""))
+			  (num-items (rmt:test-toplevel-num-items run-id test-name)))
+		      (if (and test-id
+			       (not (> num-items 0)))
+			  (mt:test-set-state-status-by-id run-id test-id "NOT_STARTED" "ZERO_ITEMS" "Failed to run due to failed prerequisites"))))
+		(tests:testqueue-set-items! test-record items-list)
+		(list hed tal reg reruns))
+	      (begin
+		(debug:print-error 0 *default-log-port* "The proc from reading the items table did not yield a list - please report this")
+		(exit 1))))))
+
+    ((and (null? fails)
+	   (null? prereq-fails)
+	   (not (null? non-completed)))
+      (debug:print-info 4 *default-log-port* "cond branch - "  "ei-3")
+      (let* ((allinqueue (map (lambda (x)(if (string? x) x (db:test-get-testname x)))
+        		      (append newtal reruns)))
+	     ;; prereqstrs is a list of test names as strings that are prereqs for hed
+             (prereqstrs (delete-duplicates (map (lambda (x)(if (string? x) x (db:test-get-testname x)))
+						 prereqs-not-met)))
+	     ;; a prereq that is not found in allinqueue will be put in the notinqueue list
+	     ;; 
+             ;; (notinqueue (filter (lambda (x)
+             ;;    		   (not (member x allinqueue)))
+             ;;    		 prereqstrs))
+	     (give-up    #f))
+
+	;; We can get here when a prereq has not been run due to *it* having a prereq that failed.
+	;; We need to use this to dequeue this item as CANNOTRUN
+	;; 
+	(if (member 'toplevel testmode) ;; '(toplevel)) ;; NOTE: this probably should be (member 'toplevel testmode)
+	    (for-each (lambda (prereq)
+			(if (eq? (hash-table-ref/default test-registry prereq 'justfine) 'CANNOTRUN)
+			    (set! give-up #t)))
+		      prereqstrs))
+
+	(if (and give-up
+		 (not (and (null? tal)(null? reg))))
+	    (let ((trimmed-tal (mt:discard-blocked-tests run-id hed tal test-records))
+		  (trimmed-reg (mt:discard-blocked-tests run-id hed reg test-records)))
+	      (debug:print 1 *default-log-port* "WARNING: test " hed " has discarded prerequisites, removing it from the queue")
+
+	      (let ((test-id (rmt:get-test-id run-id hed "")))
+		(if test-id (mt:test-set-state-status-by-id run-id test-id "COMPLETED" "PREQ_DISCARDED" "Failed to run due to discarded prerequisites")))
+	      
+	      (if (and (null? trimmed-tal)
+		       (null? trimmed-reg))
+		  #f
+                  (runs:loop-values trimmed-tal trimmed-reg reglen regfull reruns)
+                  ))
+	      (list (car newtal)(append (cdr newtal) reg) '() reruns))))
+
+    ((and (null? fails) ;; have not-started tests, but unable to run them.  everything looks completed with no prospect of unsticking something that is stuck.  we should mark hed as moribund and exit or continue if there are more tests to consider
+	   (null? prereq-fails)
+	   (null? non-completed))
+     (debug:print-info 4 *default-log-port* "cond branch - "  "ei-4")
+      (if  (runs:can-keep-running? hed 20)
+	  (begin
+	    (runs:inc-cant-run-tests hed)
+	    (debug:print-info 0 *default-log-port* "no fails in prerequisites for " hed " but also none running, keeping " hed " for now. Try count: " (hash-table-ref/default *seen-cant-run-tests* hed 0) ", going to wait 60 sec.") ;; 
+	    ;; getting here likely means the system is way overloaded, kill a full minute before continuing
+	    ;; (thread-sleep! 60) ;; TODO: gate by normalized server load > 1.0 (maxload config thing) CHECKTHIS!!!
+	    ;; No runsdat, can't do this yet
+	    ;; (if (runs:dat-load-mgmt-function runsdat)((runs:dat-load-mgmt-function runsdat)))
+	    ;;
+	    (thread-sleep! 5) ;; TODO: gate by normalized server load > 1.0 (maxload config thing)
+	    ;; num-retries code was here
+	    ;; we use this opportunity to move contents of reg to tal
+	    (list (car newtal)(append (cdr newtal) reg) '() reruns)) ;; an issue with prereqs not yet met?
+	  (begin
+	    (debug:print-info 1 *default-log-port* "no fails in prerequisites for " hed " but nothing seen running in a while, dropping test " hed " from the run queue")
+	    (let ((test-id (rmt:get-test-id run-id hed "")))
+	      (if test-id (mt:test-set-state-status-by-id run-id test-id "NOT_STARTED" "TIMED_OUT" "Nothing seen running in a while.")))
+            (runs:loop-values tal reg reglen regfull reruns)
+            )))
+
+    ((and 
+       (or (not (null? fails))
+	   (not (null? prereq-fails)))
+       (member 'normal testmode))
+      (debug:print-info 4 *default-log-port* "cond branch - "  "ei-5")
+      (debug:print-info 1 *default-log-port* "test "  hed " (mode=" testmode ") has failed prerequisite(s); "
+			(string-intersperse (map (lambda (t)(conc (db:test-get-testname t) ":" (db:test-get-state t)"/"(db:test-get-status t))) fails) ", ")
+			", removing it from to-do list")
+      (let ((test-id (rmt:get-test-id run-id hed "")))
+	(if test-id
+	    (if (not (null? prereq-fails))
+		(mt:test-set-state-status-by-id-unless-completed run-id test-id "COMPLETED" "PREQ_DISCARDED" "Failed to run due to prior failed prerequisites")
+		(mt:test-set-state-status-by-id-unless-completed run-id test-id "COMPLETED" "PREQ_FAIL"      "Failed to run due to failed prerequisites"))))
+      ;; (debug:print 4 *default-log-port*"BB> set PREQ_FAIL on "hed)
+      ;; (mt:test-set-state-status-by-id run-id test-id "NOT_STARTED" "PREQ_FAIL"      "Failed to run due to failed prerequisites")))) ;; BB: this works, btu equivalent for itemwait mode does not work.
+      (if (or (not (null? reg))(not (null? tal)))
+	  (begin
+	    (hash-table-set! test-registry hed 'CANNOTRUN)
+            (runs:loop-values tal reg reglen regfull (cons hed reruns))
+            )
+	  #f)) ;; #f flags do not loop
+      
+     ((and (not (null? fails))(member 'toplevel testmode))
+      (debug:print-info 4 *default-log-port* "cond branch - "  "ei-6")
+      (if (or (not (null? reg))(not (null? tal)))
+	   (list (car newtal)(append (cdr newtal) reg) '() reruns)
+	  #f)) 
+     ((null? runnables)
+      (debug:print-info 4 *default-log-port* "cond branch - "  "ei-7")
+      #f) ;; if we get here and non-completed is null then it is all over.
+     (else
+      (debug:print-info 4 *default-log-port* "cond branch - "  "ei-8")
+      (debug:print 0 *default-log-port* "WARNING: FAILS or incomplete tests maybe preventing completion of this run. Watch for issues with test " hed ", continuing for now")
+      (list (car newtal)(cdr newtal) reg reruns)))))
+
+(define (runs:mixed-list-testname-and-testrec->list-of-strings inlst)
+  (if (null? inlst)
+      '()
+      (map (lambda (t)
+	     (cond
+	      ((vector? t)
+	       (let ((test-name (db:test-get-testname t))
+		     (item-path (db:test-get-item-path t))
+		     (test-state (db:test-get-state t))
+		     (test-status (db:test-get-status t)))
+		 (conc test-name (if (equal? item-path "") "" "/") item-path ":" test-state "/" test-status)))
+	      ((string? t)
+	       t)
+	      (else 
+	       (conc t))))
+	   inlst)))
+
+
+;;  hed tal reg reruns reglen regfull test-record runname test-name item-path jobgroup max-concurrent-jobs run-id waitons item-path testmode test-patts required-tests test-registry registry-mutex flags keyvals run-info newtal all-tests-registry itemmaps)
+(define (runs:process-expanded-tests runsdat testdat)
+  ;; unroll the contents of runsdat and testdat (due to ongoing refactoring).
+  (debug:print 2 *default-log-port* "runs:process-expanded-tests; testdat:" )
+  (debug:print 2 *default-log-port* (with-output-to-string
+                                            (lambda () (pp (runs:testdat->alist testdat) ))))
+  (let* ((hed                    (runs:testdat-hed testdat))
+	 (tal                    (runs:testdat-tal testdat))
+	 (reg                    (runs:testdat-reg testdat))
+	 (reruns                 (runs:testdat-reruns testdat))
+	 (test-name              (runs:testdat-test-name testdat))
+	 (item-path              (runs:testdat-item-path testdat))
+	 (jobgroup               (runs:testdat-jobgroup testdat))
+	 (waitons                (runs:testdat-waitons testdat))
+	 (item-path              (runs:testdat-item-path testdat))
+	 (testmode               (runs:testdat-testmode testdat))
+	 (newtal                 (runs:testdat-newtal testdat))
+	 (itemmaps               (runs:testdat-itemmaps testdat))
+	 (test-record            (runs:testdat-test-record testdat))
+	 (prereqs-not-met        (runs:testdat-prereqs-not-met testdat))
+
+	 (reglen                 (runs:dat-reglen runsdat))
+	 (regfull                (runs:dat-regfull runsdat))
+	 (runname                (runs:dat-runname runsdat))
+	 (max-concurrent-jobs    (runs:dat-max-concurrent-jobs runsdat))
+	 (run-id                 (runs:dat-run-id runsdat))
+	 (test-patts             (runs:dat-test-patts runsdat))
+	 (required-tests         (runs:dat-required-tests runsdat))
+	 (test-registry          (runs:dat-test-registry runsdat))
+	 (registry-mutex         (runs:dat-registry-mutex runsdat))
+	 (flags                  (runs:dat-flags runsdat))
+	 (keyvals                (runs:dat-keyvals runsdat))
+	 (run-info               (runs:dat-run-info runsdat))
+	 (all-tests-registry     (runs:dat-all-tests-registry runsdat))
+	 (run-limits-info        (runs:dat-can-run-more-tests runsdat))
+	 ;; (runs:can-run-more-tests run-id jobgroup max-concurrent-jobs)) ;; look at the test jobgroup and tot jobs running
+	 (have-resources         (car run-limits-info))
+	 (num-running            (list-ref run-limits-info 1))
+	 (num-running-in-jobgroup(list-ref run-limits-info 2)) 
+	 (max-concurrent-jobs    (list-ref run-limits-info 3))
+	 (job-group-limit        (list-ref run-limits-info 4))
+	 ;; (prereqs-not-met        (rmt:get-prereqs-not-met run-id waitons hed item-path mode: testmode itemmaps: itemmaps))
+	 ;; (prereqs-not-met         (mt:lazy-get-prereqs-not-met run-id waitons item-path mode: testmode itemmap: itemmap))
+	 (fails                  (if (list? prereqs-not-met) ;; TODO: rename fails to failed-prereqs
+				      (runs:calc-fails prereqs-not-met)
+				      (begin
+					(debug:print-error 0 *default-log-port* "prereqs-not-met is not a list! " prereqs-not-met)
+					'())))
+	 (non-completed           (filter (lambda (x)             ;; remove hed from not completed list, duh, of course it is not completed!
+					    (not (equal? x hed)))
+					  (runs:calc-not-completed prereqs-not-met)))
+	 (loop-list               (list hed tal reg reruns))
+	 ;; configure the load runner
+	 (maxload                 (string->number (or (configf:lookup *configdat* "jobtools" "maxload") "3.0")))         ;; use a non-number string to disable
+         (maxhomehostload         (string->number (or (configf:lookup *configdat* "jobtools" "maxhomehostload") "2.0"))) ;; use a non-number string to disable
+         (waitdelay               (string->number (or (configf:lookup *configdat* "jobtools" "waitdelay") "60"))))
+    (debug:print-info 4 *default-log-port* "have-resources: " have-resources " prereqs-not-met: (" 
+		      (string-intersperse 
+		       (map (lambda (t)
+			      (if (vector? t)
+				  (conc (db:test-get-state t) "/" (db:test-get-status t))
+				  (conc " WARNING: t is not a vector=" t )))
+			    prereqs-not-met)
+		       ", ") ") fails: " fails
+		       "\nregistered? " (hash-table-ref/default test-registry (db:test-make-full-name test-name item-path) #f))
+			    
+    ;; well, first lets see if cpu load throttling is enabled. If so wait around until the
+    ;; average cpu load is under the threshold before continuing
+    ;;
+    (if (runs:dat-load-mgmt-function runsdat)
+	((runs:dat-load-mgmt-function runsdat))
+	(runs:dat-load-mgmt-function-set!
+	 runsdat
+	 (lambda ()
+	   ;; jobtools maxload is useful for where the full Megatest run is done on one machine
+	   (if (and #;(not (common:on-homehost?))
+		    maxload) ;; only gate if maxload is specified, NOTE: maxload is normalized, i.e. load=1 means all cpus fully utilized
+	       (common:wait-for-normalized-load maxload "Waiting for load to drop before starting more tests" #f))
+	   
+	   ;; jobtools maxhomehostload is intended to prevent overloading on the homehost which can cause database corruption issues
+	   #;(if maxhomehostload
+	       (common:wait-for-homehost-load maxhomehostload
+					      (conc "Waiting for homehost load to drop below normalized value of " maxhomehostload))))))
+    
+ 
+    
+    (if (and (not (null? prereqs-not-met))
+	     (runs:lownoise (conc "waiting on tests " prereqs-not-met hed) 60))
+	(debug:print-info 2 *default-log-port* "waiting on tests; " (string-intersperse (runs:mixed-list-testname-and-testrec->list-of-strings prereqs-not-met) ", ")))
+
+    ;; Don't know at this time if the test have been launched at some time in the past
+    ;; i.e. is this a re-launch?
+    (debug:print-info 4 *default-log-port* "run-limits-info = " run-limits-info)
+    
+    (cond ; cond 894- 1067
+     
+     ;; Check item path against item-patts, 
+     ;;
+     ((not (tests:match test-patts (tests:testqueue-get-testname test-record) item-path required: required-tests)) ;; This test/itempath is not to be run
+      ;; else the run is stuck, temporarily or permanently
+      ;; but should check if it is due to lack of resources vs. prerequisites
+      (debug:print-info 1 *default-log-port* "Skipping " (tests:testqueue-get-testname test-record) " " item-path " as it doesn't match " test-patts)
+      (if (or (not (null? tal))(not (null? reg)))
+	  (runs:loop-values tal reg reglen regfull reruns)
+	  #f))
+     
+     ;; Register tests 
+     ;;
+     ((not (hash-table-ref/default test-registry (db:test-make-full-name test-name item-path) #f))
+      (debug:print-info 4 *default-log-port* "Pre-registering test " test-name "/" item-path " to create placeholder" )
+      ;; always do firm registration now in v1.60 and greater ;; (eq? *transport-type* 'fs) ;; no point in parallel registration if use fs
+      (let register-loop ((numtries 15))
+	(rmt:register-test run-id test-name item-path)
+	(if (rmt:get-test-id run-id test-name item-path)
+	    (hash-table-set! test-registry (db:test-make-full-name test-name item-path) 'done)
+	    (if (> numtries 0)
+		(begin
+		  (thread-sleep! 0.5)
+		  (register-loop (- numtries 1)))
+		(debug:print-error 0 *default-log-port* "failed to register test " (db:test-make-full-name test-name item-path)))))
+      (if (not (eq? (hash-table-ref/default test-registry (db:test-make-full-name test-name "") #f) 'done))
+	  (begin
+	    (rmt:register-test run-id test-name "")
+	    (if (rmt:get-test-id run-id test-name "")
+		(hash-table-set! test-registry (db:test-make-full-name test-name "") 'done))))
+      (runs:shrink-can-run-more-tests-count runsdat)   ;; DELAY TWEAKER (still needed?)
+      (if (and (null? tal)(null? reg))
+	  (list hed tal (append reg (list hed)) reruns)
+	  (list (runs:queue-next-hed tal reg reglen regfull) ;; cannot replace with a call to runs:loop-values as the logic is different for reg
+		(runs:queue-next-tal tal reg reglen regfull)
+		;; NB// Here we are building reg as we register tests
+		;; if regfull we must pop the front item off reg
+		(if regfull
+		    (append (cdr reg) (list hed))
+		    (append reg (list hed)))
+		reruns)))
+     
+     ;; At this point hed test registration must be completed.
+     ;;
+     ((eq? (hash-table-ref/default test-registry (db:test-make-full-name test-name item-path) #f)
+	   'start)
+      (debug:print-info 0 *default-log-port* "Waiting on test registration(s): "
+			(string-intersperse 
+			 (filter (lambda (x)
+				   (eq? (hash-table-ref/default test-registry x #f) 'start))
+				 (hash-table-keys test-registry))
+			 ", "))
+      (thread-sleep! 0.051)
+      (list hed tal reg reruns))
+     
+     ;; If no resources are available just kill time and loop again
+     ;;
+     ((not have-resources) ;; simply try again after waiting a second
+      (if (runs:lownoise "no resources" 60)
+	  (debug:print-info 1 *default-log-port* "no resources to run new tests, waiting ..."))
+      ;; Have gone back and forth on this but db starvation is an issue.
+      ;; wait one second before looking again to run jobs.
+      (thread-sleep! 0.253)
+      ;; could have done hed tal here but doing car/cdr of newtal to rotate tests
+      (list (car newtal)(cdr newtal) reg reruns))
+     
+     ;; This is the final stage, everything is in place so launch the test
+     ;;
+     ((and have-resources
+	   (or (null? prereqs-not-met)
+	       (and (member 'toplevel testmode) ;;  'toplevel)
+		    (null? non-completed)
+		    (not (member 'exclusive testmode)))))
+      ;; (hash-table-delete! *max-tries-hash* (db:test-make-full-name test-name item-path))
+      ;; we are going to reset all the counters for test retries by setting a new hash table
+      ;; this means they will increment only when nothing can be run
+      (set! *max-tries-hash* (make-hash-table))
+      
+      (run:test run-id run-info keyvals runname test-record flags #f test-registry all-tests-registry runsdat testdat)
+      (runs:incremental-print-results run-id)
+      (hash-table-set! test-registry (db:test-make-full-name test-name item-path) 'running)
+      (runs:shrink-can-run-more-tests-count runsdat)  ;; DELAY TWEAKER (still needed?)
+      ;; (thread-sleep! *global-delta*)
+      (if (or (not (null? tal))(not (null? reg)))
+	  (runs:loop-values tal reg reglen regfull reruns) ;; hed should be dropped at this time
+	  #f))
+     
+     ;; must be we have unmet prerequisites
+     ;;
+     (else
+      (debug:print 4 *default-log-port* "FAILS: " fails)
+      ;; If one or more of the prereqs-not-met are FAIL then we can issue
+      ;; a message and drop hed from the items to be processed.
+      ;; (runs:mixed-list-testname-and-testrec->list-of-strings prereqs-not-met)
+      (if (and (not (null? prereqs-not-met))
+	       (runs:lownoise (conc "waiting on tests " prereqs-not-met hed) 60))
+	  (debug:print-info 1 *default-log-port* "waiting on tests; " (string-intersperse 
+						    (runs:mixed-list-testname-and-testrec->list-of-strings 
+						     prereqs-not-met) ", ")))
+      (if (or (null? fails)
+	      (member 'toplevel testmode))
+	  (begin
+	    ;; couldn't run, take a breather
+	    (if  (runs:lownoise "Waiting for more work to do..." 60)
+		 (debug:print-info 0 *default-log-port* "Waiting for more work to do..."))
+	    
+	    ;; (if (runs:dat-load-mgmt-function runsdat)((runs:dat-load-mgmt-function runsdat)))
+	    (thread-sleep! 5)
+	    (list (car newtal)(cdr newtal) reg reruns))
+	  ;; the waiton is FAIL so no point in trying to run hed ever again
+	  (begin
+            (let ((my-test-id (rmt:get-test-id run-id test-name item-path)))
+              (mt:test-set-state-status-by-id-unless-completed run-id my-test-id "COMPLETED" "PREQ_FAIL" "Failed to run due to failed prerequisites2"))            
+            (if (or (not (null? reg))(not (null? tal)))
+                (if (vector? hed)
+		  (begin
+		    (debug:print 1 *default-log-port* "WARNING: Dropping test " test-name "/" item-path
+				 " from the launch list as it has prerequistes that are FAIL")
+		    (let ((test-id (rmt:get-test-id run-id hed "")))
+		      (if test-id (mt:test-set-state-status-by-id-unless-completed run-id test-id "COMPLETED" "PREQ_FAIL" "Failed to run due to failed prerequisites")))
+		    (runs:shrink-can-run-more-tests-count runsdat) ;; DELAY TWEAKER (still needed?)
+		    ;; (thread-sleep! *global-delta*)
+		    ;; This next is for the items
+
+                    (if (not (null? fails))
+                        ;;(mt:test-set-state-status-by-testname run-id test-name item-path "NOT_STARTED" "PREQ_FAIL" #f)
+                        (rmt:set-state-status-and-roll-up-items run-id test-name item-path "NOT_STARTED" "PREQ_FAIL" #f) 
+                        ;;(mt:test-set-state-status-by-testname run-id test-name item-path "NOT_STARTED" "BLOCKED" #f)
+                        (rmt:set-state-status-and-roll-up-items run-id test-name item-path "NOT_STARTED" "BLOCKED" #f) )
+		    (hash-table-set! test-registry (db:test-make-full-name test-name item-path) 'removed)
+		    (runs:loop-values tal reg reglen regfull reruns))
+		  (let ((nth-try (hash-table-ref/default test-registry hed 0))) ;; hed not a vector...
+                    (debug:print 2 *default-log-port* "nth-try("hed")="nth-try)
+		    (cond
+		     ((member "RUNNING" (map db:test-get-state prereqs-not-met))
+		      (if (runs:lownoise (conc "possible RUNNING prerequistes " hed) 60)
+			  (debug:print 0 *default-log-port* "WARNING: test " hed " has possible RUNNING prerequisites, don't give up on it yet."))
+		      (thread-sleep! 0.1)
+		      (runs:loop-values tal reg reglen regfull reruns))
+		     ((or (not nth-try) ;; BB: condition on subsequent tries, condition below fires on first try 
+			  (and (number? nth-try)
+			       (< nth-try 2)))
+		      (hash-table-set! test-registry hed (if (number? nth-try)
+							     (+ nth-try 1)
+							     0))
+		      (if (runs:lownoise (conc "not removing test " hed) 60)
+			  (debug:print 1 *default-log-port* "WARNING: not removing test " hed " from queue although it may not be runnable due to FAILED prerequisites"))
+		      ;; may not have processed correctly. Could be a race condition in your test implementation? Dropping test " hed) ;;  " as it has prerequistes that are FAIL. (NOTE: hed is not a vector)")
+		      (runs:shrink-can-run-more-tests-count runsdat) ;; DELAY TWEAKER (still needed?)
+		      (runs:loop-values newtal reg reglen regfull reruns))
+		     ((symbol? nth-try) ;; BB: 'done matches here in one case where prereq itemwait failed.  This is first "try"
+		      (if (eq? nth-try 'removed) ;; removed is removed - drop it NOW
+			  (if (null? tal)
+			      #f ;; yes, really
+			      (list (car tal)(cdr tal) reg reruns))
+			  (begin
+			    (if (runs:lownoise (conc "FAILED prerequisites or other issue" hed) 60)
+				(debug:print 0 *default-log-port* "WARNING: test " hed " has FAILED prerequisites or other issue. Internal state >" nth-try "< will be overridden and we'll retry."))
+			    ;; was: (mt:test-set-state-status-by-testname run-id test-name item-path "NOT_STARTED" "KEEP_TRYING" #f)
+                            (mt:test-set-state-status-by-testname-unless-completed run-id test-name item-path "COMPLETED" "PREQ_FAIL" #f)
+			    (hash-table-set! test-registry hed 'removed) ;; was 0
+                            (if (not (and (null? reg) (null? tal)))
+                                (runs:loop-values tal reg reglen regfull reruns)
+                                #f))))
+		     (else
+		      (if (runs:lownoise (conc "FAILED prerequitests and we tried" hed) 60)
+			  (debug:print 0 *default-log-port* "WARNING: test " hed " has FAILED prerequitests and we've tried at least 10 times to run it. Giving up now."))
+		      ;; (debug:print 0 *default-log-port* "         prereqs: " prereqs-not-met)
+		      (hash-table-set! test-registry hed 'removed)
+		      (mt:test-set-state-status-by-testname run-id test-name item-path "NOT_STARTED" "TEN_STRIKES" #f)
+		      ;; I'm unclear on if this roll up is needed - it may be the root cause of the "all set to FAIL" bug.
+		      (rmt:set-state-status-and-roll-up-items run-id test-name item-path #f "FAIL" #f) ;; treat as FAIL
+		      (list (if (null? tal)(car newtal)(car tal))
+			    tal
+			    reg
+			    reruns)))))
+                ;; ELSE: can't drop this - maybe running? Just keep trying
+
+                ;;(if (not (or (not (null? reg))(not (null? tal)))) ;; old experiment
+                (let ((runable-tests (runs:runable-tests prereqs-not-met))) ;; SUSPICIOUS: Should look at more than just prereqs-not-met?
+                  (if (null? runable-tests)
+                      #f   ;; I think we are truly done here
+                      (runs:loop-values newtal reg reglen regfull reruns)))
+                ;;) ;;from old experiment
+                ) ;; end if (or (not (null? reg))(not (null? tal)))
+            ))))))
+
+;; scan a list of tests looking to see if any are potentially runnable
+;;
+(define (runs:runable-tests tests)
+  (filter (lambda (t)
+	    (if (not (vector? t))
+		t
+		(let ((state  (db:test-get-state t))
+		      (status (db:test-get-status t)))
+		  (case (string->symbol state)
+		    ((COMPLETED INCOMPLETE) #f)
+		    ((NOT_STARTED)
+		     (if (member status '("TEN_STRIKES" "BLOCKED" "PREQ_FAIL" "ZERO_ITEMS" "PREQ_DISCARDED" "TIMED_OUT" ))
+			 #f
+			 t))
+		    ((DELETED) #f)
+		    (else t)))))
+	  tests))
+
+(define (runs:incremental-print-results run-id)
+  (let* ((curr-sec    (current-seconds))
+	 (runs-data   (bdat-runs-data *bdat*))
+	 (last-update (runs:gendat-inc-results-last-update runs-data))
+	 (runs-data   (bdat-runs-data *bdat*)))
+    (if (> (- curr-sec last-update) 5) ;; at least five seconds since last update
+	(let* ((run-dat  (or (runs:gendat-run-info runs-data)(rmt:get-run-info run-id)))
+	       (runname  (or (runs:gendat-runname runs-data)
+			     (db:get-value-by-header (db:get-rows run-dat)
+						     (db:get-header run-dat) "runname")))
+	       (target   (or (runs:gendat-target runs-data)(rmt:get-target run-id)))
+	       (testsdat (let ((res (rmt:get-tests-for-run
+				     run-id "%" '() '() ;; run-id testpatt states statuses
+				     #f #f ;; offset limit
+				     #f ;; not-in
+				     #f ;; sort-by
+				     #f ;; sort-order
+				     #f ;; get full data (not 'shortlist)
+				     last-update
+				     'dashboard)))
+			   (if (list? res)
+			       res
+			       (begin
+				 (debug:print-error
+				  0 *default-log-port*
+				  "FAILED TO GET DATA using rmt:get-tests-for-run. Notify developers if you see this. result: " res)
+				 '())))))
+	  (runs:gendat-inc-results-last-update-set! runs-data (- curr-sec 1))
+	  (if (not (runs:gendat-run-info runs-data))
+	      (runs:gendat-run-info-set! runs-data run-dat))
+	  (if (not (runs:gendat-runname  runs-data))
+	      (runs:gendat-runname-set! runs-data runname))
+	  (if (not (runs:gendat-target runs-data))
+	      (runs:gendat-target-set! runs-data target))
+	  (for-each
+	   (lambda (testdat)
+	     (let* ((test-id    (db:test-get-id           testdat))
+		    (prevdat    (hash-table-ref/default   (runs:gendat-inc-results runs-data)
+							  (conc run-id "," test-id) #f))
+		    (test-name  (db:test-get-testname     testdat))
+		    (item-path  (db:test-get-item-path    testdat))
+		    (state      (db:test-get-state        testdat))
+		    (status     (db:test-get-status       testdat))
+		    (event-time (db:test-get-event_time   testdat))
+		    (duration   (db:test-get-run_duration testdat)))
+	       (if (and (not (member state '("DELETED" "REMOTEHOSTSTART" "RUNNING" "LAUNCHED""NOT_STARTED")))
+			(not (and prevdat
+				  (equal? state  (db:test-get-state  prevdat))
+				  (equal? status (db:test-get-status prevdat)))))
+		   (let ((fmt   (runs:gendat-inc-results-fmt runs-data))
+			 (dtime (seconds->year-work-week/day-time event-time))) 
+		     (if (runs:lownoise "inc-print" 600)
+			 (format #t fmt "State" "Status" "Start Time" "Duration" "Test path"))
+		     ;; (debug:print 0 *default-log-port* "fmt: " fmt " state: " state " status: " status " test-name: " test-name " item-path: " item-path " dtime: " dtime)
+		     ;; (debug:print 0 #f "event-time: " event-time " duration: " duration)
+		     (format #t fmt
+			     state
+			     status
+			     dtime
+			     (seconds->hr-min-sec duration)
+			     (conc "lt/" target "/" runname "/" test-name (if (string-null? item-path) "" (conc "/" item-path))))
+		     (hash-table-set! (runs:gendat-inc-results runs-data) (conc run-id "," test-id) testdat)))))
+	   testsdat)))
+
+    ;; I don't think this should be here? -- Matt
+    #;(runs:gendat-inc-results-last-update-set! runs-data (- curr-sec 10))
+
+    ))
+
+;; every time though the loop increment the test/itempatt val.
+;; when the min is > max-allowed and none running then force exit
+;;
+
+(define (runs:pretty-long-list lst)
+   (if (> (length lst) 8)(append (take lst 3)(list "...")) lst))
+
+;;======================================================================
+;; runs:run-tests-queue is called by runs:run-tests
+;;======================================================================
+;;
+;; test-records is a hash table testname:item_path => vector < testname testconfig waitons priority items-info ... >
+(define (runs:run-tests-queue run-id runname test-records keyvals flags test-patts required-tests reglen-in all-tests-registry)
+  ;; At this point the list of parent tests is expanded 
+  ;; NB// Should expand items here and then insert into the run queue.
+  (debug:print 5 *default-log-port* "test-records: " test-records ", flags: " (hash-table->alist flags))
+
+  ;; Do mark-and-find clean up of db before starting runing of quue
+  ;;
+  ;; (rmt:find-and-mark-incomplete)
+
+  (let* ((run-info              (rmt:get-run-info run-id))
+         (tests-info            (mt:get-tests-for-run run-id #f '() '())) ;;  qryvals: "id,testname,item_path"))
+         (sorted-test-names     (tests:sort-by-priority-and-waiton test-records))
+         (test-registry         (make-hash-table))
+         (registry-mutex        (make-mutex))
+         (num-retries           0)
+         (max-retries           (configf:lookup *configdat* "setup" "maxretries"))
+         (max-concurrent-jobs   (configf:lookup-number *configdat* "setup" "max_concurrent_jobs" default: 50))
+         (reglen                (if (number? reglen-in) reglen-in 1))
+         (last-time-incomplete  (- (current-seconds) 900)) ;; force at least one clean up cycle
+         (last-time-some-running (current-seconds))
+         ;; (tdbdat                (tasks:open-db))
+         (runsdat (make-runs:dat
+                   ;; hed: hed
+                   ;; tal: tal
+                   ;; reg: reg
+                   ;; reruns: reruns
+                   reglen: reglen
+                   regfull: #f ;; regfull
+                   ;; test-record: test-record
+                   runname: runname
+                   ;; test-name: test-name
+                   ;; item-path: item-path
+                   ;; jobgroup: jobgroup
+                   max-concurrent-jobs: max-concurrent-jobs
+                   run-id: run-id
+                   ;; waitons: waitons
+                   ;; testmode: testmode
+                   test-patts: test-patts
+                   required-tests: required-tests
+                   test-registry: test-registry
+                   registry-mutex: registry-mutex
+                   flags: flags
+                   keyvals: keyvals
+                   run-info: run-info
+                   ;; newtal: newtal
+                   all-tests-registry: all-tests-registry
+                   ;; itemmaps: itemmaps
+                   ;; prereqs-not-met: (rmt:get-prereqs-not-met run-id waitons hed item-path mode: testmode itemmaps: itemmaps)
+                   ;; can-run-more-tests: (runs:can-run-more-tests run-id jobgroup max-concurrent-jobs) ;; look at the test jobgroup and tot jobs running
+                   )))
+
+    ;; Initialize the test-registery hash with tests that already have a record
+    ;; convert state to symbol and use that as the hash value
+    (for-each (lambda (trec)
+		(let ((id (db:test-get-id        trec))
+		      (tn (db:test-get-testname  trec))
+		      (ip (db:test-get-item-path trec))
+		      (st (db:test-get-state     trec)))
+		  (if (not (equal? st "DELETED"))
+		      (hash-table-set! test-registry (db:test-make-full-name tn ip) (string->symbol st)))))
+	      tests-info)
+    (set! max-retries (if (and max-retries (string->number max-retries))(string->number max-retries) 100))
+
+    (let loop ((hed         (car sorted-test-names))
+               (tal         (cdr sorted-test-names))
+	       (reg         '()) ;; registered, put these at the head of tal 
+	       (reruns      '()))
+
+      (runs:incremental-print-results run-id)
+
+      (if (not (null? reruns))(debug:print-info 4 *default-log-port* "reruns=" reruns))
+
+      ;; Here we mark any old defunct tests as incomplete. Do this every fifteen minutes
+      ;; moving this to a parallel thread and just run it once.
+      ;;
+      (if (> (current-seconds)(+ last-time-incomplete 900))
+          (begin
+            (set! last-time-incomplete (current-seconds))
+            ;; (rmt:find-and-mark-incomplete-all-runs)
+	    ))
+
+      ;; (print "Top of loop, hed=" hed ", tal=" tal " ,reruns=" reruns)
+      (let* ((test-record (hash-table-ref test-records hed))
+	     (test-name   (tests:testqueue-get-testname test-record))
+	     (tconfig     (tests:testqueue-get-testconfig test-record))
+	     (jobgroup    (configf:lookup tconfig "test_meta" "jobgroup"))
+	     (testmode    (let ((m (configf:lookup tconfig "requirements" "mode")))
+			    (if m (map string->symbol (string-split m)) '(normal))))
+	     (itemmaps    (tests:get-itemmaps tconfig)) ;;  (configf:lookup tconfig "requirements" "itemmap"))
+	     (priority    (tests:testqueue-get-priority   test-record))
+	     (itemdat     (tests:testqueue-get-itemdat    test-record)) ;; itemdat can be a string, list or #f
+	     (items       (tests:testqueue-get-items      test-record))
+	     (item-path   (item-list->path itemdat))
+	     (tfullname   (db:test-make-full-name test-name item-path))
+	      ;; these are hard coded item-item waits test/item-path => test/item-path2 ...
+	     (extra-waits (let* ((section (configf:get-section (tests:testqueue-get-testconfig test-record) "waitons"))
+				 (myextra (alist-ref tfullname section equal?)))
+			    (if myextra
+				(let ((extras (string-split (car myextra))))
+				  (if (runs:lownoise (conc tfullname "extra-waitons" tfullname) 60)
+				      (debug:print-info 0 *default-log-port* "HAVE EXTRA WAITONS for test " tfullname ": " myextra))
+				  (for-each
+				   (lambda (extra)
+				     ;; (debug:print 0 *default-log-port* "FYI: extra = " extra " reruns = " reruns)
+				     (let ((basetestname (car (string-split extra "/"))))
+				       #;(if (not (member extra tal))
+					   (set! reruns (append tal (list extra))))
+				       (if (not (member basetestname tal))
+					   (set! reruns (append tal (list basetestname))))
+				       ))
+				   extras)
+				  extras)
+				'())))
+	     (waitons     (delete-duplicates (append (tests:testqueue-get-waitons test-record) extra-waits) equal?))
+	     (newtal      (append tal (list hed)))
+	     (regfull     (>= (length reg) reglen))
+	     (num-running (rmt:get-count-tests-running-for-run-id run-id))
+	     (testdat     (make-runs:testdat
+			   hed: hed
+			   tal: tal
+			   reg: reg
+			   reruns: reruns
+			   test-record: test-record
+			   test-name:   test-name
+			   item-path:   item-path
+			   jobgroup:    jobgroup
+			   waitons:     waitons
+			   testmode:    testmode
+			   newtal:      newtal
+			   itemmaps:    itemmaps
+			   ;; prereqs-not-met: prereqs-not-met
+			   )))
+	(runs:dat-regfull-set! runsdat regfull)
+    
+	(if (> num-running 0)
+            (set! last-time-some-running (current-seconds)))
+
+        (if (> (current-seconds)(+ last-time-some-running (or (configf:lookup *configdat* "setup" "give-up-waiting") 36000)))
+            (hash-table-set! *max-tries-hash* tfullname (+ (hash-table-ref/default *max-tries-hash* tfullname 0) 1)))
+	;; (debug:print 0 *default-log-port* "max-tries-hash: " (hash-table->alist *max-tries-hash*))
+
+	;; Ensure all top level tests get registered. This way they show up as "NOT_STARTED" on the dashboard
+	;; and it is clear they *should* have run but did not.
+	(if (not (hash-table-ref/default test-registry (db:test-make-full-name test-name "") #f))
+	    (begin
+	      (rmt:register-test run-id test-name "")
+	      (hash-table-set! test-registry (db:test-make-full-name test-name "") 'done)))
+	
+	;; Fast skip of tests that are already "COMPLETED" - NO! Cannot do that as the items may not have been expanded yet :(
+	;;
+	(if (member (hash-table-ref/default test-registry tfullname #f) 
+		    '(DONOTRUN removed)) ;; *common:cant-run-states-sym*) ;; '(COMPLETED KILLED WAIVED UNKNOWN INCOMPLETE))
+	    (begin
+	      (if (runs:lownoise (conc "been marked do not run " tfullname) 60)
+		  (debug:print-info 0 *default-log-port* "Skipping test " tfullname " as it has been marked do not run due to being completed or not runnable"))
+	      (if (or (not (null? tal))(not (null? reg)))
+		  (loop (runs:queue-next-hed tal reg reglen regfull)
+			(runs:queue-next-tal tal reg reglen regfull)
+			(runs:queue-next-reg tal reg reglen regfull)
+			reruns))))
+        ;; (loop (car tal)(cdr tal) reg reruns))))
+
+	(runs:incremental-print-results run-id)
+	(debug:print 4 *default-log-port* "TOP OF LOOP => "
+		     "test-name: " test-name
+		     "\n  hed:         " hed
+		     "\n  tal:         " (runs:pretty-long-list tal)
+		     "\n  reg:         " reg
+                     "\n  test-record  " test-record
+                     "\n  itemdat:     " itemdat
+		     "\n  items:       " items
+		     "\n  item-path:   " item-path
+		     "\n  waitons:     " waitons
+		     "\n  num-retries: " num-retries
+                     "\n  reruns:      " reruns
+		     "\n  regfull:     " regfull
+		     "\n  reglen:      " reglen
+		     "\n  length reg:  " (length reg)
+                     )
+
+	;; (runs:parallel-runners-mgmt runsdat)
+
+	;; check for hed in waitons => this would be circular, remove it and issue an
+	;; error
+	(if (member test-name waitons)
+	    (begin
+	      (debug:print-error 0 *default-log-port* "test " test-name " has listed itself as a waiton, please correct this!")
+	      (set! waiton (filter (lambda (x)(not (equal? x hed))) waitons))))
+
+	(cond 
+	 
+	 ;; We want to catch tests that have waitons that are NOT in the queue and discard them IFF 
+	 ;; they have been through the wringer 10 or more times
+	 ((and (list? waitons)
+	       (not (null? waitons))
+	       (> (hash-table-ref/default *max-tries-hash* tfullname 0) 10)
+	       (not (null? (filter
+			    number?
+			    (map (lambda (waiton)
+				   (if (and (not (member waiton tal))            ;; this waiton is not in the list to be tried to run
+					    (not (member waiton reruns)))
+				       1
+				       #f))
+				 waitons))))) ;; could do this more elegantly with a marker....
+          (debug:print-info 4 *default-log-port* "cond branch - "  "rtq-1")
+	  (debug:print 0 *default-log-port* "WARNING: Marking test " tfullname " as not runnable. It is waiting on tests that cannot be run. Giving up now.")
+	  (hash-table-set! test-registry tfullname 'removed))
+
+	 ;; items is #f then the test is ok to be handed off to launch (but not before)
+	 ;; 
+	 ((not items)
+          (debug:print-info 4 *default-log-port* "cond branch - "  "rtq-2")
+	  (debug:print-info 4 *default-log-port* "OUTER COND: (not items)")
+	  (if (and (not (tests:match test-patts (tests:testqueue-get-testname test-record) item-path required: required-tests))
+		   (not (null? tal)))
+	      (loop (car tal)(cdr tal) reg reruns))
+
+	  ;; gonna try a strategy change here.
+	  ;;
+	  ;; check if can run more tests. if yes, continue, if no, rest until can run more
+	  ;; look at the test jobgroup and tot jobs running
+	  ;;
+	  ;; NOTE: This does NOT actually gate here, only captures the proc to be called later
+	  ;; 
+	  (if (not (runs:dat-wait-for-jobs-function runsdat))
+	      (runs:dat-wait-for-jobs-function-set!
+	       runsdat 
+	       (lambda (testdat-in)
+		 (let* ((jobgroup              (runs:testdat-jobgroup testdat-in))
+			(can-run-more-tests    (runs:dat-can-run-more-tests runsdat))
+			(last-jobs-check-time  (runs:dat-last-jobs-check-time runsdat))
+			(should-check-jobs     (match can-run-more-tests
+						 ((can-run-more-flag num-running nr-in-jobgroup max-concurrent-jobs . params)
+						  (if (< (- max-concurrent-jobs num-running) 25)
+						      (begin
+							(debug:print-info 0 *default-log-port*
+									  "less than 20 jobs headroom, ("max-concurrent-jobs
+									  "-"num-running")>20. Forcing prelaunch check.")
+							#t)
+						      #f))
+						 (else #f)))) ;; no record yet
+		   (if should-check-jobs
+		       (let loop-can-run-more
+			   ((res      (runs:can-run-more-tests runsdat run-id jobgroup max-concurrent-jobs))
+			    (remtries 1440)) ;; we can wait for up to two hours for jobs to get done
+			 (match res
+			   ((run-more num-running . rem)
+			    (if (or run-more
+				    (< remtries 1))
+				(begin
+				  (if (runs:lownoise "num-running" 30)
+				      (debug:print-info 0 *default-log-port* "Have "num-running" tests of max " max-concurrent-jobs))
+				  (runs:dat-can-run-more-tests-set! runsdat res)) ;; capture the result and then drop through
+				(begin
+				  (if (runs:lownoise "num-running" 10)
+				      (debug:print-info 0 *default-log-port* "Can't run more tests, have "num-running" tests of "
+							max-concurrent-jobs " allowed."))
+				  (thread-sleep! 5) ;; if we've hit max concurrent jobs take a breather, nb// make this configurable
+				  
+				  ;; wait for load here
+				  (if (runs:dat-load-mgmt-function runsdat)((runs:dat-load-mgmt-function runsdat)))
+				  (loop-can-run-more (runs:can-run-more-tests runsdat run-id jobgroup max-concurrent-jobs)
+						     (- remtries 1)))))))
+		       )))))
+
+	  ;; I'm not clear on why prereqs are gathered here TODO: verfiy this is needed
+	  (runs:testdat-prereqs-not-met-set! testdat (rmt:get-prereqs-not-met run-id waitons hed item-path mode: testmode itemmaps: itemmaps))
+
+	  ;; I'm not clear on why we'd capture running job counts here TODO: verify this is needed
+	  (runs:dat-can-run-more-tests-set! runsdat (runs:can-run-more-tests runsdat run-id jobgroup max-concurrent-jobs))
+
+	  (let ((loop-list (runs:process-expanded-tests runsdat testdat))) ;; in process-expanded-tests ultimately run:test -> launch-test -> test actually running
+            (if loop-list (apply loop loop-list))))
+
+	 ;; items processed into a list but not came in as a list been processed
+	 ;;
+	 ((and (list? items)     ;; thus we know our items are already calculated
+	       (not   itemdat))  ;; and not yet expanded into the list of things to be done
+          (debug:print-info 4 *default-log-port* "cond branch - "  "rtq-3")
+	  (debug:print-info 4 *default-log-port* "OUTER COND: (and (list? items)(not itemdat))")
+	  ;; Must determine if the items list is valid. Discard the test if it is not.
+	  (if (and (list? items)
+		   (> (length items) 0)
+		   (and (list? (car items))
+			(> (length (car items)) 0))
+		   (debug:debug-mode 1))
+	      (debug:print 2 *default-log-port* (map (lambda (row)
+                                                       (conc (string-intersperse
+                                                              (map (lambda (varval)
+                                                                     (string-intersperse varval "="))
+                                                                   row)
+                                                              " ")
+                                                             "\n"))
+                                                     items)))
+
+          (let* ((items-in-testpatt
+                  (filter
+                   (lambda (my-itemdat)
+                     (tests:match test-patts hed (item-list->path my-itemdat) ))
+                   ;; was: (tests:match test-patts hed (item-list->path my-itemdat) required: required-tests))
+                   items) ))
+            (if (null? items-in-testpatt)
+                (debug:print-error 0 *default-log-port* "Test " (tests:testqueue-get-testname test-record) " is itemized but has no items matching the test pattern")
+                
+                (for-each (lambda (my-itemdat)
+                            (let* ((new-test-record (let ((newrec (make-tests:testqueue)))
+                                                      (vector-copy! test-record newrec)
+                                                      newrec))
+                                   (my-item-path (item-list->path my-itemdat))
+
+                                   (newtestname (db:test-make-full-name hed my-item-path)))    ;; test names are unique on testname/item-path
+                              (tests:testqueue-set-items!     new-test-record #f)
+                              (tests:testqueue-set-itemdat!   new-test-record my-itemdat)
+                              (tests:testqueue-set-item_path! new-test-record my-item-path)
+                              (hash-table-set! test-records newtestname new-test-record)
+                              (set! tal (append tal (list newtestname)))))  ;; since these are itemized create new test names testname/itempath
+                          items-in-testpatt)))
+          
+          
+
+	  ;; At this point we have possibly added items to tal but all must be handed off to 
+	  ;; INNER COND logic. I think loop without rotating the queue 
+	  ;; (loop hed tal reg reruns))
+	  ;; (let ((newtal (append tal (list hed))))  ;; We should discard hed as it has been expanded into it's items? Yes, but only if this *is* an itemized test
+	  ;; (loop (car newtal)(cdr newtal) reg reruns)
+	  (if (null? tal)
+	      #f
+	      (loop (car tal)(cdr tal) reg reruns)))
+         
+	 ;; if items is a proc then need to run items:get-items-from-config, get the list and loop 
+	 ;;    - but only do that if resources exist to kick off the job
+	 ;; EXPAND ITEMS
+	 ((or (procedure? items)(eq? items 'have-procedure))
+          (debug:print-info 4 *default-log-port* "cond branch - "  "rtq-4")
+	  (let ((can-run-more    #f)) ;; (runs:can-run-more-tests runsdat run-id jobgroup max-concurrent-jobs)))
+	    (if (not can-run-more) #;(and (list? can-run-more)
+		(car can-run-more))
+		(let ((loop-list (runs:expand-items hed tal reg reruns regfull newtal jobgroup max-concurrent-jobs run-id waitons item-path testmode test-record can-run-more items runname tconfig reglen test-registry test-records itemmaps))) ;; itemized test expanded here
+		  (if loop-list
+		      (apply loop loop-list)
+                      (debug:print-info 4 *default-log-port* " -- Can't expand hed="hed)
+                      )
+                  )
+		;; if can't run more just loop with next possible test
+		(loop (car newtal)(cdr newtal) reg reruns))))
+         
+	 ;; this case should not happen, added to help catch any bugs
+	 ((and (list? items) itemdat)
+          (debug:print-info 4 *default-log-port* "cond branch - "  "rtq-5")
+	  (debug:print-error 0 *default-log-port* "Should not have a list of items in a test and the itemspath set - please report this")
+	  (exit 1))
+	 ((not (null? reruns))
+          (debug:print-info 4 *default-log-port* "cond branch - "  "rtq-6")
+	  (let* ((newlst (tests:filter-non-runnable run-id tal test-records)) ;; i.e. not FAIL, WAIVED, INCOMPLETE, PASS, KILLED,
+		 (junked (lset-difference equal? tal newlst)))
+	    (debug:print-info 4 *default-log-port* "full drop through, if reruns is less than 100 we will force retry them, reruns=" reruns ", tal=" tal)
+	    (if (< num-retries max-retries)
+		(set! newlst (append reruns newlst)))
+	    (set! num-retries (+ num-retries 1))
+	    ;; (thread-sleep! (+ 1 *global-delta*))
+	    (if (not (null? newlst))
+		;; since reruns have been tacked on to newlst create new reruns from junked
+		(loop (car newlst)(cdr newlst) reg (delete-duplicates junked)))))
+	 ((not (null? tal))
+          (debug:print-info 4 *default-log-port* "cond branch - "  "rtq-7")
+	  (debug:print-info 4 *default-log-port* "I'm pretty sure I shouldn't get here."))
+	 ((not (null? reg)) ;; could we get here with leftovers?
+          (debug:print-info 4 *default-log-port* "cond branch - "  "rtq-8")
+	  (debug:print-info 0 *default-log-port* "Have leftovers!")
+	  (loop (car reg)(cdr reg) '() reruns))
+	 (else
+          (debug:print-info 4 *default-log-port* "cond branch - "  "rtq-9")
+	  (debug:print-info 4 *default-log-port* "Exiting loop with...\n  hed=" hed "\n  tal=" tal "\n  reruns=" reruns))
+	 ))) ;; end loop on sorted test names
+    ;; this is the point where everything is launched and now you can mark the run in metadata table as all launched 
+    (rmt:set-var (conc "lunch-complete-" run-id) "yes")  
+        
+    ;; now *if* -run-wait we wait for all tests to be done
+    ;; Now wait for any RUNNING tests to complete (if in run-wait mode)
+    ;; (if (runs:dat-load-mgmt-function runsdat)((runs:dat-load-mgmt-function runsdat)))
+    (thread-sleep! 10) ;; I think there is a race condition here. Let states/statuses settle
+    
+    (let wait-loop ((num-running      (rmt:get-count-tests-running-for-run-id run-id))
+		    (prev-num-running 0))
+      ;; (debug:print-info 13 *default-log-port* "num-running=" num-running ", prev-num-running=" prev-num-running)
+      (if (and (or (args:get-arg "-run-wait")
+		   (equal? (configf:lookup *configdat* "setup" "run-wait") "yes"))
+	       (> num-running 0))
+	  (begin
+	    ;; Here we mark any old defunct tests as incomplete. Do this every fifteen minutes
+	    ;; (debug:print 0 *default-log-port* "Got here eh! num-running=" num-running " (> num-running 0) " (> num-running 0))
+	    (if (> (current-seconds)(+ last-time-incomplete 900))
+		(let ((actual-num-running (rmt:get-count-tests-running-for-run-id run-id)))
+		  (debug:print-info 0 *default-log-port* "Marking stuck tests as INCOMPLETE while waiting for run " run-id
+				    ". Running as pid " (current-process-id) " on " (get-host-name))
+		  (set! last-time-incomplete (current-seconds)) ;; FIXME, this might be causing slow down - use of set!
+		  (runs:find-and-mark-incomplete-and-check-end-of-run run-id #f)
+		  (debug:print-info 0 *default-log-port* "run-wait specified, waiting on " actual-num-running
+				    " tests in RUNNING, REMOTEHOSTSTART or LAUNCHED state at "
+				    (time->string (seconds->local-time (current-seconds))))))
+	    ;; (if (runs:dat-load-mgmt-function runsdat)((runs:dat-load-mgmt-function runsdat)))
+	    (thread-sleep! 5) ;; (if (>= num-running max-concurrent-jobs) 5 1))
+	    (wait-loop (rmt:get-count-tests-running-for-run-id run-id)
+		       num-running))))
+    ;; LET* ((test-record
+    ;; we get here on "drop through". All done!
+    ;; this is moved to runs:run-testes since this function is getting called twice to ensure everthing is completed. 
+    ;; (debug:print-info 0 *default-log-port* "Calling Post Hook")    
+    ;; (runs:run-post-hook run-id)
+    (debug:print-info 1 *default-log-port* "All tests launched")))
+
+(define (runs:calc-fails prereqs-not-met)
+  (filter (lambda (test)
+	    (and (vector? test) ;; not (string? test))
+		 (member (db:test-get-state test) '("INCOMPLETE" "COMPLETED")) ;; TODO: pull from *common:stuff...*
+		 (not (member (db:test-get-status test)
+			      '("PASS" "WARN" "WAIVED" "SKIP")))))
+	  prereqs-not-met))
+
+(define (runs:calc-prereq-fail prereqs-not-met) ;; REMOVEME since NOT_STARTED/PREQ_FAIL is now COMPLETED/PREQ_FAIL
+  (filter (lambda (test)
+	    (and (vector? test) ;; not (string? test))
+		 (equal? (db:test-get-state test) "NOT_STARTED")
+		 (not (member (db:test-get-status test)
+			      '("n/a" "KEEP_TRYING")))))
+	  prereqs-not-met))
+
+(define (runs:calc-not-completed prereqs-not-met)
+  (filter
+   (lambda (t)
+     (or (not (vector? t))
+	 (not (member (db:test-get-state t) '("INCOMPLETE" "COMPLETED")))))
+   prereqs-not-met))
+
+;; (define (runs:calc-not-completed prereqs-not-met)
+;;   (filter
+;;    (lambda (t)
+;;      (or (not (vector? t))
+;; 	 (not (equal? "COMPLETED" (db:test-get-state t)))))
+;;    prereqs-not-met))
+
+(define (runs:calc-runnable prereqs-not-met)
+  (filter 
+   (lambda (t)
+     (or (not (vector? t))
+	 (and (equal? "NOT_STARTED" (db:test-get-state t))
+	      (member (db:test-get-status t)
+		      '("n/a" "KEEP_TRYING")))
+	 (and (equal? "RUNNING" (db:test-get-state t))))) ;; account for a test that is running
+   prereqs-not-met))
+
+(define (runs:pretty-string lst)
+  (map (lambda (t)
+	 (if (not (vector? t))
+	     (conc t)
+	     (conc (db:test-get-testname t) ":" (db:test-get-state t) "/" (db:test-get-status t))))
+       lst))
+
+;; parent-test is there as a placeholder for when parent-tests can be run as a setup step
+;;
+(define (run:test run-id run-info keyvals runname test-record flags parent-test test-registry all-tests-registry runsdat testdat-rec)
+  ;; All these vars might be referenced by the testconfig file reader
+  ;; 
+  ;; NEED to reprocess testconfig here, ensuring that item variables are available.
+  ;; This is for Tal's issue with item-specific env vars not being set for use in skip.
+  ;; HSD https://hsdes.intel.com/appstore/icf/index.html#/article?articleId=1408763273
+  ;;
+  (let* ((test-name    (tests:testqueue-get-testname   test-record))
+	 (test-waitons (tests:testqueue-get-waitons    test-record))
+	 (itemdat      (tests:testqueue-get-itemdat    test-record))
+	 (item-path     "")
+	 (db           #f)
+	 (full-test-name #f))
+
+    ;; setting itemdat to a list if it is #f
+    (if (not itemdat)(set! itemdat '()))
+    (set! item-path (item-list->path itemdat))
+    (set! full-test-name (db:test-make-full-name test-name item-path))
+    (runs:set-megatest-env-vars run-id inrunname: runname testname: test-name itempath: item-path) ;; these may be needed by the launching process
+
+   (let* ((test-conf ;; re-instate the tests:get-testconfig once the kinks are worked out. FIXME!!!
+	    ;; (tests:get-testconfig test-name item-path all-tests-registry #t force-create: #t))
+	    (tests:testqueue-get-testconfig test-record )) 
+	   (test-path    (hash-table-ref all-tests-registry test-name)) ;; (conc *toppath* "/tests/" test-name)) ;; could use tests:get-testconfig here ...
+
+	   (force        (hash-table-ref/default flags "-force" #f))
+	   (rerun        (hash-table-ref/default flags "-rerun" #f))
+	   (keepgoing    (hash-table-ref/default flags "-keepgoing" #f))
+	   (incomplete-timeout (string->number (or (configf:lookup *configdat* "setup" "incomplete-timeout") "x")))
+	   )
+
+    (debug:print-info 4 *default-log-port*
+		      "\nTESTNAME: " full-test-name 
+		      "\n   test-config: " (hash-table->alist test-conf)
+		      "\n   itemdat: " itemdat
+		      )
+    (debug:print 2 *default-log-port* "Attempting to launch test " full-test-name)
+    ;; (setenv "MT_TEST_NAME" test-name) ;; 
+    ;; (setenv "MT_ITEMPATH"  item-path)
+    ;; (setenv "MT_RUNNAME"   runname)
+    (change-directory *toppath*)
+
+    ;; Here is where the test_meta table is best updated
+    ;; Yes, another use of a global for caching. Need a better way?
+    ;;
+    ;; There is now a single call to runs:update-all-test_meta and this 
+    ;; per-test call is not needed. Given the delicacy of the move to 
+    ;; v1.55 this code is being left in place for the time being.
+    ;;
+    (if (not (hash-table-ref/default *test-meta-updated* test-name #f))
+        (begin
+          (hash-table-set! *test-meta-updated* test-name #t)
+          (runs:update-test_meta test-name test-conf)))
+    
+    ;; itemdat => ((ripeness "overripe") (temperature "cool") (season "summer"))
+    (let* ((new-test-path (string-intersperse (cons test-path (map cadr itemdat)) "/"))
+	   (test-id       (rmt:get-test-id run-id test-name item-path))
+	   (testdat       (if test-id (rmt:get-test-info-by-id run-id test-id) #f)))
+      (if (not testdat)
+	  (let loop ()
+	    ;; ensure that the path exists before registering the test
+	    ;; NOPE: Cannot! Don't know yet which disk area will be assigned....
+	    ;; (system (conc "mkdir -p " new-test-path))
+	    ;;
+	    ;; (open-run-close tests:register-test db run-id test-name item-path)
+	    ;;
+	    ;; NB// for the above line. I want the test to be registered long before this routine gets called!
+	    ;;
+	    (if (not test-id)(set! test-id (rmt:get-test-id run-id test-name item-path)))
+	    (if (not test-id)
+		(begin
+		  (debug:print 2 *default-log-port* "WARN: Test not pre-created? test-name=" test-name ", item-path=" item-path ", run-id=" run-id)
+		  (rmt:register-test run-id test-name item-path)
+		  (set! test-id (rmt:get-test-id run-id test-name item-path))))
+	    (debug:print-info 4 *default-log-port* "test-id=" test-id ", run-id=" run-id ", test-name=" test-name ", item-path=\"" item-path "\"")
+	    (set! testdat (rmt:get-test-info-by-id run-id test-id))
+	    (if (not testdat)
+		(begin
+		  (debug:print-info 0 *default-log-port* "WARNING: server is overloaded, trying again in two seconds")
+		  ;; (if (runs:dat-load-mgmt-function runsdat)((runs:dat-load-mgmt-function runsdat)))
+		  (thread-sleep! 2)
+		  (loop)))))
+      (if (not testdat) ;; should NOT happen
+	  (debug:print-error 0 *default-log-port* "failed to get test record for test-id " test-id))
+      (set! test-id (db:test-get-id testdat))
+      (if (common:file-exists? test-path)
+	  (change-directory test-path)
+	  (begin
+	    (debug:print-error 0 *default-log-port* "test run path not created before attempting to run the test. Perhaps you are running -remove-runs at the same time?")
+	    (change-directory *toppath*)))
+      (case (if force ;; (args:get-arg "-force")
+		'NOT_STARTED
+		(if testdat
+		    (string->symbol (test:get-state testdat))
+		    'failed-to-insert))
+	((failed-to-insert)
+	 (debug:print-error 0 *default-log-port* "Failed to insert the record into the db"))
+	((NOT_STARTED COMPLETED DELETED INCOMPLETE)
+	 (let ((runflag #f))
+	   (cond
+	    ;; -force, run no matter what
+	    (force (set! runflag #t))
+	    ;; NOT_STARTED, run no matter what
+	    ((member (test:get-state testdat) '("DELETED" "NOT_STARTED" "INCOMPLETE"))(set! runflag #t))
+	    ;; not -rerun and PASS, WARN or CHECK, do no run
+	    ((and (or (not rerun)
+		      keepgoing)
+		  ;; Require to force re-run for COMPLETED or *anything* + PASS,WARN or CHECK
+		  (or (member (test:get-status testdat) '("PASS" "WARN" "CHECK" "SKIP" "WAIVED"))
+		      (member (test:get-state  testdat) '("COMPLETED")))) 
+	     (debug:print-info 2 *default-log-port* "running test " test-name "/" item-path " suppressed as it is " (test:get-state testdat) " and " (test:get-status testdat))
+	     (hash-table-set! test-registry full-test-name 'DONOTRUN) ;; COMPLETED)
+	     (set! runflag #f))
+
+	    ;; -rerun and status is one of the specifed, run it
+	    ((and rerun
+		  (let* ((rerunlst   (string-split rerun ","))
+			 (must-rerun (member (test:get-status testdat) rerunlst)))
+		    (debug:print-info 3 *default-log-port* "-rerun list: " rerun ", test-status: " (test:get-status testdat)", must-rerun: " must-rerun)
+		    must-rerun))
+	     (debug:print-info 2 *default-log-port* "Rerun forced for test " test-name "/" item-path)
+	     (set! runflag #t)
+             (debug:print-info 2 *default-log-port* "Calling rerun hook")
+             (runs:rerun-hook test-id new-test-path testdat rerun)
+             )
+             
+
+	    
+            ;; -keepgoing, do not rerun FAIL
+	    ((and keepgoing
+		  (member (test:get-status testdat) '("FAIL")))
+	     (set! runflag #f))
+	    
+            ((and (not rerun)
+		  (member (test:get-status testdat) '("FAIL" "n/a")))
+	     (set! runflag #t))
+
+	    (else (set! runflag #f)))
+	   (debug:print 4 *default-log-port* "RUNNING => runflag: " runflag " STATE: " (test:get-state testdat) " STATUS: " (test:get-status testdat))
+	   (if (not runflag)
+	       (if (not parent-test)
+		   (if (runs:lownoise (conc "not starting test" full-test-name) 60)
+		       (debug:print 1 *default-log-port* "NOTE: Not starting test " full-test-name " as it is state \"" (test:get-state testdat) 
+				    "\" and status \"" (test:get-status testdat) "\", use -rerun \"" (test:get-status testdat)
+				    "\" or -force to override")))
+	       ;; NOTE: No longer be checking prerequisites here! Will never get here unless prereqs are
+	       ;;       already met.
+	       ;; This would be a great place to do the process-fork
+	       ;; 
+	       (let ((skip-test   #f)
+		     (skip-check  (configf:get-section test-conf "skip")))
+		 (cond 
+		  ;; Have to check for skip conditions. This one skips if there are same-named tests
+		  ;; currently running
+		  ((and skip-check
+			(configf:lookup test-conf "skip" "prevrunning"))
+		   ;; run-ids = #f means *all* runs
+		   (let ((running-tests (rmt:get-tests-for-runs-mindata #f full-test-name '("RUNNING" "REMOTEHOSTSTART" "LAUNCHED") '() #f)))
+		     (if (not (null? running-tests)) ;; have to skip 
+			 (set! skip-test "Skipping due to previous tests running"))))
+
+ 		    ;; split the string and OR of file-exists?
+		    ((and skip-check
+			  (configf:lookup test-conf "skip" "fileexists"))
+		     (let* ((files    (string-split (configf:lookup test-conf "skip" "fileexists")))
+			    (existing (filter common:file-exists? files)))
+		       (if (not (null? existing)) ;; (common:file-exists? (configf:lookup test-conf "skip" "fileexists"))
+			   (set! skip-test (conc "Skipping due to existance of file(s) " (string-intersperse existing ", ")))))) ;; (configf:lookup test-conf "skip" "fileexists")))))
+
+ 		    ((and skip-check
+			  (configf:lookup test-conf "skip" "filenotexists"))
+		      (let* ((files    (string-split (configf:lookup test-conf "skip" "filenotexists")))
+			      (existing (filter common:file-exists? files)))
+			      (if (null? existing) ;;  (common:file-exists? (configf:lookup test-conf "skip" "filenotexists")))
+			        (set! skip-test (conc "Skipping due to non existance of files " (string-intersperse files ", ")))))) ;; (configf:lookup test-conf "skip" "filenotexists")))))        
+		 
+       ((and skip-check
+			(configf:lookup test-conf "skip" "script"))
+		   (if (= (system (configf:lookup test-conf "skip" "script")) 0)
+                        (set! skip-test (conc "Skipping due to zero return value of script " (configf:lookup test-conf "skip" "script")))))
+      
+                  ((and skip-check
+			(configf:lookup test-conf "skip" "rundelay"))
+		   ;; run-ids = #f means *all* runs
+		   (let* ((numseconds      (common:hms-string->seconds (configf:lookup test-conf "skip" "rundelay")))
+			  (running-tests   (rmt:get-tests-for-runs-mindata #f full-test-name '("RUNNING" "REMOTEHOSTSTART" "LAUNCHED") '() #f))
+			  (completed-tests (rmt:get-tests-for-runs-mindata #f full-test-name '("COMPLETED" "INCOMPLETE") '("PASS" "FAIL" "ABORT") #f)) ;; ironically INCOMPLETE is same as COMPLETED in this contex
+			  (last-run-times  (map db:mintest-get-event_time completed-tests))
+			  (time-since-last (- (current-seconds) (if (null? last-run-times) 0 (common:max last-run-times)))))
+		     (if (or (not (null? running-tests)) ;; have to skip if test is running
+			     (> numseconds time-since-last))
+			 (set! skip-test (conc "Skipping due to previous test run less than " (configf:lookup test-conf "skip" "rundelay") " ago"))))))
+		 
+		 (if skip-test
+		     (begin
+		       (mt:test-set-state-status-by-id run-id test-id "COMPLETED" "SKIP" skip-test)
+		       (debug:print-info 1 *default-log-port* "SKIPPING Test " full-test-name " due to " skip-test))
+		     ;;
+		     ;; Here the test is handed off to launch.scm for launch-test to complete the launch process
+		     ;;
+		     (begin
+		       ;; wait for less than max jobs here
+		       (if (runs:dat-wait-for-jobs-function runsdat)
+			   ((runs:dat-wait-for-jobs-function runsdat) testdat-rec))
+		       
+		       (if (not (launch-test test-id run-id run-info keyvals runname test-conf test-name test-path itemdat flags))
+			   (begin
+			     (print "ERROR: Failed to launch the test. Exiting as soon as possible")
+			     (set! *globalexitstatus* 1) ;; 
+			     (process-signal (current-process-id) signal/kill))
+			   )
+		       ;; wait again here?
+		       ))))))
+	((KILLED) 
+	 (debug:print 1 *default-log-port* "NOTE: " full-test-name " is already running or was explictly killed, use -force to launch it.")
+	 (hash-table-set! test-registry (db:test-make-full-name test-name test-path) 'DONOTRUN)) ;; KILLED))
+	((LAUNCHED REMOTEHOSTSTART RUNNING)  
+	 (debug:print 2 *default-log-port* "NOTE: " test-name " is already running"))
+	;; (if (> (- (current-seconds)(+ (db:test-get-event_time testdat)
+	;; 			       (db:test-get-run_duration testdat)))
+	;; 	(or incomplete-timeout
+	;; 	    6000)) ;; i.e. no update for more than 6000 seconds
+	;;      (begin
+	;;        (debug:print 0 *default-log-port* "WARNING: Test " test-name " appears to be dead. Forcing it to state INCOMPLETE and status STUCK/DEAD")
+	;;        (tests:test-set-status! run-id test-id "INCOMPLETE" "STUCK/DEAD" "" #f))
+	;;        ;; (tests:test-set-status! test-id "INCOMPLETE" "STUCK/DEAD" "" #f))
+	;;      (debug:print 2 *default-log-port* "NOTE: " test-name " is already running")))
+	(else      
+	 (debug:print-error 0 *default-log-port* "Failed to launch test " full-test-name ". Unrecognised state " (test:get-state testdat))
+	 (case (string->symbol (test:get-state testdat)) 
+	   ((COMPLETED INCOMPLETE)
+	    (hash-table-set! test-registry (db:test-make-full-name test-name test-path) 'DONOTRUN))
+	   (else
+	    (hash-table-set! test-registry (db:test-make-full-name test-name test-path) 'DONOTRUN)))))))))
+
+;;======================================================================
+;; END OF NEW STUFF
+;;======================================================================
+
+(define (get-dir-up-n dir . params) 
+  (let ((dparts  (string-split dir "/"))
+	(count   (if (null? params) 1 (car params))))
+    (conc "/" (string-intersperse 
+	       (take dparts (- (length dparts) count))
+	       "/"))))
+
+;; cleanup often needs to remove all but the last N runs per target
+;;
+;; target-patts a1/b1/c1,a2/b2/c2 ...
+;;
+;; This will fail if called with empty target or a bad target (i.e. missing or extra fields)
+;;
+(define (runs:get-hash-by-target target-patts runpatt)
+  (let* ((targets (string-split target-patts ","))
+	 (keys    (rmt:get-keys))
+	 (res-ht  (make-hash-table))) ;; target -> ( runrecord1 runrecord2 ... )
+    (for-each
+     (lambda (target-patt)
+       (let ((runs     (rmt:simple-get-runs runpatt #f #f target-patt #f)))
+	 (for-each
+	  (lambda (run)
+	    (let ((target (simple-run-target run)))
+	      (hash-table-set! res-ht target (cons run (hash-table-ref/default res-ht target '())))))
+	  runs)))
+     targets)
+    res-ht))
+
+;; delete runs older than X (weeks, days, months years etc.)
+;; delete redundant runs within a target - N is the input
+;; delete redundant runs within a target IFF older than given date/time AND keep at least N
+;; 
+(define (runs:remove-all-but-last-n-runs-per-target target-patts runpatt num-to-keep #!key (actions '(print)))
+  (let* ((runs-ht  (runs:get-hash-by-target target-patts runpatt))
+	 (age      (if (args:get-arg "-age")(common:hms-string->seconds (args:get-arg "-age")) #f))
+	 (age-mark (if age (- (current-seconds) age) (+ (current-seconds) 86400)))
+	 (precmd   (or (args:get-arg "-precmd") ""))
+         (action-chk (member (string->symbol "remove-runs") actions)))
+     ;; check the sequence of actions  archive must comme before remove-runs
+     (if  (and action-chk (member (string->symbol "archive") action-chk))
+          (begin
+          (debug:print-error 0 *default-log-port* "action remove-runs must come after archive")
+          (exit 1))) 
+    (print "Actions: " actions " age: " age)
+    (for-each
+     (lambda (action)
+        (for-each
+         (lambda (target)
+            (let* ((runs      (hash-table-ref runs-ht target))
+	           (sorted    (sort runs (lambda (a b)(< (simple-run-event_time a)(simple-run-event_time b)))))
+	           (to-remove (let* ((len      (length sorted))
+                                     (trim-amt (- len num-to-keep)))
+                                 (if (> trim-amt 0)
+                                    (take sorted trim-amt)
+                                    '()))))
+	   (hash-table-set! runs-ht target to-remove)
+           (print target ":")
+           (for-each
+            (lambda (run)
+              (let ((remove (member run to-remove (lambda (a b)
+                                                    (eq? (simple-run-id a)
+                                                         (simple-run-id b))))))
+  	        (if (and age (> (simple-run-event_time run) age-mark))
+		     (print "Skipping handling of " target "/" (simple-run-runname run) " as it is younger than " (args:get-arg "-age"))
+		     (case action
+		       ((print)
+			(print " " (simple-run-runname run)
+			       " " (time->string (seconds->local-time (simple-run-event_time run)) "WW%V.%u %H:%M:%S")
+			       " " (if remove "REMOVE" "")))
+		       ((remove-runs)
+			(if remove (system (conc precmd " megatest -remove-runs -target " target " -runname " (simple-run-runname run) " -testpatt %"
+						 (if (member 'kill-runs actions) ;; if kill-runs is specified then set -kill-wait to 0
+						     " -kill-wait 0"
+						     "")))))
+		       ((archive)
+			(if remove (system (conc precmd " megatest -archive save-remove -target " target " -runname " (simple-run-runname run) " -testpatt %"))))
+		       ((kill-runs)
+			(if remove (system (conc precmd " megatest -kill-runs -target " target " -runname " (simple-run-runname run) " -testpatt %"))))))))
+            sorted)))
+         (hash-table-keys runs-ht)))
+      actions)
+    runs-ht))
+
+(define (remove-last-path-directory path-in)
+  (let* ((dparts  (string-split path-in "/"))
+    (path-out (conc "/" (string-intersperse (take dparts (- (length dparts) 1)) "/")))
+    )
+    path-out
+  )
+)
+
+(define (runs:operate-on action target runnamepatt testpatt #!key (state #f)(status #f)(new-state-status #f)(mode #f)(options '()))
+  (common:clear-caches) ;; clear all caches
+  (let* ((db           #f)
+	 ;; (tdbdat       (tasks:open-db))
+	 (keys         (rmt:get-keys))
+	 (rundat       (mt:get-runs-by-patt keys runnamepatt target))
+	 (header       (vector-ref rundat 0))
+	 (runs         (vector-ref rundat 1))
+	 (states       (if state  (string-split state  ",") '()))
+	 (statuses     (if status (string-split status ",") '()))
+	 (state-status (if (string? new-state-status) (string-split new-state-status ",") '(#f #f)))
+	 (rp-mutex     (make-mutex))
+	 (bup-mutex    (make-mutex))
+         (keep-records (args:get-arg "-keep-records")) ;; used in conjunction with -remove-runs to keep the records, TODO: consolidate this with "mode".
+	 (test-records '())) ;; for tasks that we wish to operate on all tests in one fell swoop
+
+    (let* ((write-access-actions '(remove-runs set-state-status archive run-wait kill-runs))
+           (dbfile             (conc  *toppath* "/megatest.db"))
+           (readonly-mode      (not (file-writable? dbfile))))
+      (when (and readonly-mode
+                 (member action write-access-actions))
+        (debug:print-error 0 *default-log-port* "megatest.db is readonly.  Cannot proceed with action ["action"] in which write-access isrequired .")
+        (exit 1)))
+    
+    (debug:print-info 4 *default-log-port* "runs:operate-on => Header: " header " action: " action " new-state-status: " new-state-status)
+    (if (> 2 (length state-status))
+	(begin
+	  (debug:print-error 0 *default-log-port* "the parameter to -set-state-status is a comma delimited string. E.g. COMPLETED,FAIL")
+	  (exit)))
+    (for-each
+     (lambda (run)
+       (let ((runkey (string-intersperse (map (lambda (k)
+						(db:get-value-by-header run header k)) keys) "/"))
+	     (dirs-to-remove (make-hash-table))
+	     (proc-get-tests (lambda (run-id)
+                               (mt:get-tests-for-run run-id
+                                                     testpatt states statuses
+                                                     not-in:  #f
+                                                     sort-by: (case action
+                                                                ((remove-runs) 'rundir)
+                                                                (else          'event_time))))))
+	 (let* ((run-id    (db:get-value-by-header run header "id"))
+		(run-state (db:get-value-by-header run header "state"))
+		(run-name  (db:get-value-by-header run header "runname"))
+		(tests     (if (not (equal? run-state "locked"))
+			       (proc-get-tests run-id)
+			       '()))
+		(lasttpath "/does/not/exist/I/hope")
+		(lastrealpath "/does/not/exist/I/hope")
+                ;; there may be a number of different disks used in the same run.
+                (run-paths-hash (make-hash-table))
+		(worker-thread #f))
+	   (debug:print-info 4 *default-log-port* "runs:operate-on run=" run ", header=" header)
+	   (if (not (null? tests))
+	       (begin
+		 (case action
+                   ((kill-runs)
+                    (tasks:kill-runner target run-name "%")
+                    (debug:print 1 *default-log-port* "Killing tests for run: " runkey " " (db:get-value-by-header run header "runname"))
+                    )
+		   ((remove-runs)
+		    ;; (if (tasks:need-server run-id)(tasks:start-and-wait-for-server tdbdat run-id 10))
+		    ;; seek and kill in flight -runtests with % as testpatt here
+		    ;; (if (equal? testpatt "%")
+		    (tasks:kill-runner target run-name testpatt)
+		    ;; (debug:print 0 *default-log-port* "not attempting to kill any run launcher processes as testpatt is " testpatt))
+		    (debug:print 1 *default-log-port* "Removing tests for run: " runkey " " (db:get-value-by-header run header "runname")))
+		   ((set-state-status)
+		    ;; (if (tasks:need-server run-id)(tasks:start-and-wait-for-server tdbdat run-id 10))
+		    (debug:print 1 *default-log-port* "Modifying state and staus for tests for run: " runkey " " (db:get-value-by-header run header "runname")))
+		   ((print-run)
+		    (debug:print 1 *default-log-port* "Printing info for run " runkey ", run=" run ", tests=" tests ", header=" header)
+		    action)
+		   ((run-wait)
+		    (debug:print 1 *default-log-port* "Waiting for run " runkey ", run=" runnamepatt " to complete"))
+		   ((archive)
+		    (debug:print 1 *default-log-port* "Archiving/restoring (" (args:get-arg "-archive") ") data for run: " runkey " " (db:get-value-by-header run header "runname"))
+		    (let ((op (string->symbol (args:get-arg "-archive"))))
+		      (set! worker-thread
+			    (make-thread
+			     (lambda ()
+			       (case op
+				 ((save save-remove keep-html)
+				  (archive:run-bup op run-id run-name tests rp-mutex bup-mutex))
+				 ((restore)
+				  (archive:bup-restore op run-id run-name tests rp-mutex bup-mutex))
+				 ((get) ;;; NOTE: This is a special case. We wish to operate on ALL tests in one go
+				  (set! test-records (append tests test-records)))
+				 (else 
+				  (debug:print-error 0 *default-log-port* "unrecognised sub command " op " for -archive. Run \"megatest\" to see help")
+				  (exit))))
+			     "archive-bup-thread"))
+		      (thread-start! worker-thread)
+		      (if (eq? op 'get)
+			  (thread-join! worker-thread)) ;; we need the test-records set to not overlap
+		      ))
+		   (else
+		    (debug:print-info 0 *default-log-port* "action not recognised " action)))
+		 
+		 ;; actions that operate on one test at a time can be handled below
+		 ;;
+		 (let ((sorted-tests     (filter 
+					  vector?
+					  (sort tests (lambda (a b)(let ((dira ;; (rmt:sdb-qry 'getstr 
+									  (db:test-get-rundir a)) ;; )  ;; (filedb:get-path *fdb* (db:test-get-rundir a)))
+									 (dirb ;; (rmt:sdb-qry 'getstr 
+									  (db:test-get-rundir b))) ;; ) ;; ((filedb:get-path *fdb* (db:test-get-rundir b))))
+								     (if (and (string? dira)(string? dirb))
+									 (> (string-length dira)(string-length dirb))
+									 #f))))))
+		       (toplevel-retries (make-hash-table)) ;; try three times to loop through and remove top level tests
+		       (test-retry-time  (make-hash-table))
+                       (backgrounded-remove-status     (make-hash-table))
+                       (backgrounded-remove-last-visit (make-hash-table))
+                       (backgrounded-remove-result     (make-hash-table))
+		       (allow-run-time   (string->number (or (args:get-arg "-kill-wait") "10")))) ;; seconds to allow for killing tests before just brutally killing 'em
+		   (let loop ((test (car sorted-tests))
+			      (tal  (cdr sorted-tests)))
+		     (let* ((test-id       (db:test-get-id test))
+			    (new-test-dat  (rmt:get-test-info-by-id run-id test-id)))
+		       (if (not new-test-dat)
+			   (begin
+			     (debug:print-error 0 *default-log-port* "We have a test-id of " test-id " but no record was found. NOTE: No locking of records is done between processes, do not simultaneously remove the same run from two processes!")
+			     (if (not (null? tal))
+				 (loop (car tal)(cdr tal))))
+			   (let* ((item-path     (db:test-get-item-path new-test-dat))
+				  (test-name     (db:test-get-testname new-test-dat))
+				  (run-dir       ;;(filedb:get-path *fdb*
+				   ;; (rmt:sdb-qry 'getid 
+				   (db:test-get-rundir new-test-dat)) ;; )    ;; run dir is from the link tree
+                                  (has-subrun    (and (subrun:subrun-test-initialized? run-dir)
+                                                      (not (subrun:subrun-removed? run-dir))))
+				  (test-state    (db:test-get-state new-test-dat))
+                                  (test-status    (db:test-get-status new-test-dat))
+				  (test-fulln    (db:test-get-fullname new-test-dat))
+				  (uname         (db:test-get-uname    new-test-dat))
+				  (toplevel-with-children (and (db:test-get-is-toplevel test)
+							       (> (rmt:test-toplevel-num-items run-id test-name) 0))))
+                             
+			     (case action
+			       ((remove-runs)
+				;; if the test is a toplevel-with-children issue an error and do not remove
+				(cond
+                                 (toplevel-with-children
+                                  (debug:print 0 *default-log-port* "WARNING: skipping removal of " test-fulln " with run-id " run-id " as it has sub tests")
+                                  (hash-table-set! toplevel-retries test-fulln (+ (hash-table-ref/default toplevel-retries test-fulln 0) 1))
+                                  (if (> (hash-table-ref toplevel-retries test-fulln) 3)
+                                      (if (not (null? tal))
+                                          (loop (car tal)(cdr tal))) ;; no else clause - drop it if no more in queue and > 3 tries
+                                      (let ((newtal (append tal (list test))))
+                                        (loop (car newtal)(cdr newtal))))) ;; loop with test still in queue
+                                 (has-subrun
+                                  ;; 
+                                  (let ((last-visit (hash-table-ref/default backgrounded-remove-last-visit test-fulln 0))
+                                        (now        (current-seconds))
+                                        (rem-status (hash-table-ref/default backgrounded-remove-status test-fulln 'not-started)))
+                                    (case rem-status
+                                      ((not-started)
+                                       (debug:print 0 *default-log-port* "WARNING: postponing removal of " test-fulln " with run-id " run-id " as it has a subrun")
+                                       (hash-table-set! backgrounded-remove-status test-fulln 'started)
+                                       (hash-table-set! backgrounded-remove-last-visit test-fulln (current-seconds))
+                                       (common:send-thunk-to-background-thread
+                                        (lambda ()
+                                          (let* ((subrun-remove-succeeded
+                                                  (subrun:remove-subrun run-dir keep-records)))
+                                            (hash-table-set! backgrounded-remove-result test-fulln subrun-remove-succeeded)
+                                            (hash-table-set! backgrounded-remove-status test-fulln 'done)))
+                                        name: (conc "remove-subrun:"test-fulln))
+                                       
+                                       ;; send to back of line, loop
+                                       (let ((newtal (append tal (list test))))
+                                        (loop (car newtal)(cdr newtal)))
+                                       )
+                                      ((started)
+                                       ;; if last visit was within last second, sleep 1 second
+                                       (if (< (- now last-visit) 1.0)
+                                           (thread-sleep! 1.0))
+                                       (hash-table-set! backgrounded-remove-last-visit test-fulln (current-seconds))
+                                       ;; send to back of line, loop
+                                       (let ((newtal (append tal (list test))))
+                                         (loop (car newtal)(cdr newtal)))
+                                       )
+                                      ((done)
+                                       ;; drop this one; if remaining, loop, else finish
+                                       (hash-table-set! backgrounded-remove-last-visit test-fulln (current-seconds))
+                                       (let ((subrun-remove-succeeded (hash-table-ref/default backgrounded-remove-result test-fulln 'exception)))
+                                         (cond
+                                          ((eq? subrun-remove-succeeded 'exception)
+                                           (let* ((logfile (subrun:get-log-path run-dir "remove")))
+                                             (debug:print 0 *default-log-port* "ERROR: removing subrun of of " test-fulln " with run-id " run-id " ; see logfile @ "logfile))
+					   (if (not (null? tal))
+					       (loop (car tal)(cdr tal))))
+					  (subrun-remove-succeeded
+					   (debug:print 0 *default-log-port* "Now removing of " test-fulln " with run-id " run-id " since subrun was removed.")
+					   ;;(runs:remove-test-directory new-test-dat mode) ;; let normal case handle this. it will go thru loop again as non-subrun
+					   (let ((newtal (append tal (list test))))
+					     (loop (car newtal)(cdr newtal))))
+					  (else
+					   (let* ((logfile (subrun:get-log-path run-dir "remove")))
+					     (debug:print 0 *default-log-port* "WARNING: removal of subrun failed.  Please check "logfile" for details."))
+					   ;; send to back of line, loop (will not match has-subrun next time through)
+					    (if (not (null? tal))
+						(loop (car tal)(cdr tal))))))
+				       )
+				      ) ; end case rem-status
+                                    ) ; end let
+                                  ); end cond has-subrun
+
+                                 (else
+                                  ;; BB - TODO - consider backgrounding to threads to delete tests (work below) 
+                                  (debug:print-info 0 *default-log-port* "test: " test-name " itest-state: " test-state)
+                                  (if (member test-state (list "RUNNING" "LAUNCHED" "REMOTEHOSTSTART" "KILLREQ"))
+                                      (begin
+                                        (if (not (hash-table-ref/default test-retry-time test-fulln #f))
+                                            (begin
+                                              ;; want to set to REMOVING BUT CANNOT do it here?
+                                              (hash-table-set! test-retry-time test-fulln (current-seconds))))
+                                        (if (> (- (current-seconds)(hash-table-ref test-retry-time test-fulln)) allow-run-time)
+                                            ;; This test is not in a correct state for cleaning up. Let's try some graceful shutdown steps first
+                                            ;; Set the test to "KILLREQ" and wait five seconds then try again. Repeat up to five times then give
+                                            ;; up and blow it away.
+                                            (begin
+                                              (debug:print 0 *default-log-port* "WARNING: could not gracefully remove test " test-fulln ", tried to kill it to no avail. Forcing state to FAILEDKILL and continuing")
+                                              (mt:test-set-state-status-by-id run-id (db:test-get-id test) "FAILEDKILL" "n/a" #f)
+                                              (thread-sleep! 1))
+                                            (begin
+                                              (mt:test-set-state-status-by-id run-id (db:test-get-id test) "KILLREQ" "n/a" #f)
+                                              (thread-sleep! 1)))
+                                        ;; NOTE: This is suboptimal as the testdata will be used later and the state/status may have changed ...
+                                        (if (null? tal)
+                                            (loop new-test-dat tal)
+                                            (loop (car tal)(append tal (list new-test-dat)))))
+                                      (begin
+                                       (let ((rundir (db:test-get-rundir new-test-dat)))
+                                        (if (and (not (string=  rundir "/tmp/badname")) 
+                                             (file-exists? rundir)
+                                             (substring-index run-name rundir)
+                                             (tests:glob-like-match (conc "%/" target "/%") rundir)
+                                             )
+                                          (begin
+                                            (set! lasttpath (db:test-get-rundir new-test-dat)) ;; remember this path for run removal
+                                            (set! lastrealpath (remove-last-path-directory (realpath lasttpath)))
+                                            (hash-table-set! run-paths-hash lastrealpath 1)
+                                            (runs:remove-test-directory new-test-dat mode) ;; 'remove-all)
+                                          )
+                                          (begin
+                                            (debug:print 2 *default-log-port* "Not removing directory " rundir " because either it doesn't exist or has a bad name")
+                                            (debug:print 2 *default-log-port* "Is /tmp/badname: " (string=  rundir "/tmp/badname"))
+                                            (debug:print 2 *default-log-port* "Exists: " (file-exists? rundir))
+                                            (debug:print 2 *default-log-port* "Has run-name: " (substring-index run-name rundir))
+                                            (debug:print 2 *default-log-port* "Has target: " (tests:glob-like-match (conc "%/" target "/%") rundir))
+                                            (debug:print 2 *default-log-port* "Target: " target)
+
+                                            ;;PJH remove record from db no need to cleanup directory
+                                            (case mode
+                                               ((remove-data-only)(mt:test-set-state-status-by-id (db:test-get-run_id test)(db:test-get-id test) (db:test-get-state test)(db:test-get-status test) #f))
+                                               ((archive-remove)  (mt:test-set-state-status-by-id (db:test-get-run_id test)(db:test-get-id test) "ARCHIVED" #f #f))
+                                               (else (rmt:delete-test-records (db:test-get-run_id test) (db:test-get-id test))))
+
+                                          )
+                                        )
+                                      )
+
+                                      (if (not (null? tal))
+                                         (loop (car tal)(cdr tal)))))))
+				(rmt:update-run-stats run-id (rmt:get-raw-run-stats run-id)))
+                               ((kill-runs)
+                                ;; RUNNING -> KILLREQ
+                                ;; LAUNCHED,RUNNING,REMOTEHOSTSTART -> NOT STARTED
+                                (cond
+                                 ((and has-subrun (member test-state (list "RUNNING" "LAUNCHED" "REMOTEHOSTSTART" "KILLREQ")))
+                                  (common:send-thunk-to-background-thread
+                                   (lambda ()
+                                     (let* ((subrun-remove-succeeded
+                                             (subrun:kill-subrun run-dir keep-records)))
+                                       #t)))
+                                  (if (not (null? tal))
+				    (loop (car tal)(cdr tal)))
+                                  )
+                                 ((member test-state (list "RUNNING" "LAUNCHED" "REMOTEHOSTSTART" "KILLREQ"))
+                                  (debug:print 1 *default-log-port* "INFO: issuing killreq to test "test-fulln)
+                                  (mt:test-set-state-status-by-id run-id (db:test-get-id test) "KILLREQ" "n/a" #f)
+                                  (if (not (null? tal))
+				      (loop (car tal)(cdr tal))))
+                                 ((and (member test-status '("PREQ_FAIL" "PREQ_DISCARDED" "BLOCKED" "ZERO_ITEMS" "KEEP_TRYING" "TEN_STRIKES" "TIMED_OUT")))
+                                  (rmt:set-state-status-and-roll-up-items run-id (db:test-get-id test) 'foo "NOT_STARTED" "n/a" (conc "kill-run moved from "test-state":"test-status" to NOT_STARTED:n/a"))
+                                  ;;(mt:test-set-state-status-by-id run-id (db:test-get-id test) "NOT_STARTED" "n/a" (conc "kill-run moved from "test-state":"test-status" to NOT_STARTED:n/a"))
+                                  (if (not (null? tal))
+				      (loop (car tal)(cdr tal)))
+                                  )
+                                 (else
+                                  (if (not (null? tal))
+				      (loop (car tal)(cdr tal)))
+                                  )))
+			       ((set-state-status)
+                                (let* ((new-state (car state-status))
+                                       (new-status (cadr state-status))
+                                       (test-id (db:test-get-id test))
+                                       (test-run-dir (db:test-get-rundir new-test-dat))
+                                       (has-subrun (and (subrun:subrun-test-initialized? test-run-dir)
+                                                      (not (subrun:subrun-removed? test-run-dir)))))
+                                  (when has-subrun
+                                     (common:send-thunk-to-background-thread
+                                        (lambda ()
+                                          (subrun:set-state-status test-run-dir state status new-state-status)
+                                          )
+                                        )
+                                    )
+                                  (debug:print-info 2 *default-log-port* "new state " new-state ", new status " new-status )
+                                  (mt:test-set-state-status-by-id run-id test-id new-state new-status #f))
+				(if (not (null? tal))
+				    (loop (car tal)(cdr tal))))
+			       ((run-wait)
+                                ;; BB TODO - manage has-subrun case
+				(debug:print-info 2 *default-log-port* "still waiting, " (length tests) " tests still running")
+				(thread-sleep! 5)
+				(let ((new-tests (proc-get-tests run-id)))
+				  (if (null? new-tests)
+				      (debug:print-info 1 *default-log-port* "Run completed according to zero tests matching provided criteria.")
+				      (loop (car new-tests)(cdr new-tests)))))
+			       ((archive)
+                                ;; BB TODO - manage has-subrun case
+				(if (and run-dir (not toplevel-with-children))
+				    (let ((ddir (conc run-dir "/")))
+				      (case (string->symbol (args:get-arg "-archive"))
+					((save save-remove keep-html)
+					 (if (common:file-exists? ddir)
+					     (debug:print-info 0 *default-log-port* "Estimating disk space usage for " test-fulln ": " (common:get-disk-space-used ddir)))))))
+				(if (not (null? tal))
+				    (loop (car tal)(cdr tal))))
+			       )))
+		       )
+		     (if worker-thread (thread-join! worker-thread)))
+                   (common:join-backgrounded-threads))))
+	   
+	   ;; remove the run if zero tests remain
+	   (if (eq? action 'remove-runs)
+	       (let* ((run-id   (db:get-value-by-header run header "id")) ;; NB// masks run-id from above?
+                      (remtests (mt:get-tests-for-run run-id #f '("DELETED") '("n/a") not-in: #t)))
+		 (if (null? remtests) ;; no more tests remaining
+	           (let* ((linkspath (remove-last-path-directory lasttpath))
+                          (runpaths (hash-table-keys run-paths-hash))
+                    )
+
+                    (debug:print 2 *default-log-port* "run-paths-hash: " (hash-table-keys run-paths-hash))
+
+                    (debug:print 1 *default-log-port* "Removing target " target "run: " run-name)
+                    (if (not keep-records)
+                      (begin
+                        (debug:print 1 *default-log-port* "Removing DB records for the run.")
+                        (rmt:delete-run run-id)
+                        (rmt:delete-old-deleted-test-records))
+                    )
+                    (if (not (equal?  linkspath "/does/not/exist/I"))
+	               (begin 
+                         (debug:print 1 *default-log-port* "Recursively removing links dir " linkspath)
+                         (runs:recursive-delete-with-error-msg linkspath)))
+
+                   (for-each (lambda(runpath)
+                       (debug:print 1 *default-log-port* "Recursively removing runs dir " runpath)
+                       (runs:recursive-delete-with-error-msg runpath)
+                     )
+                     runpaths
+                   )
+		       )))))
+	 ))
+     runs)
+    ;; special case - archive get
+    (if (equal? (args:get-arg "-archive") "get")
+	(archive:bup-get-data "get" #f #f test-records rp-mutex bup-mutex))
+    (if (or (equal? (args:get-arg "-archive") "save") (equal? (args:get-arg "-archive") "save-remove"))
+        (begin 
+             (print "db archive started")  
+             (archive:megatest-db target runnamepatt)
+             (print "db archived")))
+    )
+  #t
+  )
+
+;;======================================================================
+;; Routines for manipulating runs
+;;======================================================================
+
+;; Since many calls to a run require pretty much the same setup 
+;; this wrapper is used to reduce the replication of code
+(define (general-run-call switchname action-desc proc)
+  (let ((runname (common:args-get-runname))
+	(target  (common:args-get-target)))
+    (cond
+     ((not target)
+      (debug:print-error 0 *default-log-port* "Missing required parameter for " switchname ", you must specify the target with -target")
+      (exit 3))
+     ((not runname)
+      (debug:print-error 0 *default-log-port* "Missing required parameter for " switchname ", you must specify the run name with -runname runname")
+      (exit 3))
+     (else
+      (let (;; (db   #f)
+	    (keys #f))
+	(if (launch:setup)
+	    (begin
+	      (full-runconfigs-read) ;; cache the run config
+	      ;; (launch:cache-config) ;; there are two independent config cache locations, turning this one off for now. MRW.
+	      ) ;; do not cache here - need to be sure runconfigs is processed
+	    (begin 
+	      (debug:print 0 *default-log-port* "Failed to setup, exiting")
+	      (exit 1)))
+
+        
+	(set! keys (keys:config-get-fields *configdat*))
+	;; have enough to process -target or -reqtarg here
+	(if (args:get-arg "-reqtarg")
+	    (let* ((runconfigf (conc  *toppath* "/runconfigs.config")) ;; DO NOT EVALUATE ALL 
+		   (runconfig  (configf:read-config runconfigf #f #t environ-patt: #f env-to-use: (module-environment 'bigmod))))
+	      (if (hash-table-ref/default runconfig (args:get-arg "-reqtarg") #f)
+		  (keys:target-set-args keys (args:get-arg "-reqtarg") args:arg-hash)
+		    
+		  (begin
+		    (debug:print-error 0 *default-log-port* "[" (args:get-arg "-reqtarg") "] not found in " runconfigf)
+		    ;; (if db (sqlite3:finalize! db))
+		    (exit 1)
+		    )))
+	    (if (args:get-arg "-target")
+		(keys:target-set-args keys (args:get-arg "-target" args:arg-hash) args:arg-hash)))
+	(if (not (car *configinfo*))
+	    (begin
+	      (debug:print-error 0 *default-log-port* "Attempted to " action-desc " but run area config file not found")
+	      (exit 1))
+	    ;; Extract out stuff needed in most or many calls
+	    ;; here then call proc
+	    (let* ((keyvals    (keys:target->keyval keys target)))
+	      (proc target runname keys keyvals)))
+	;; (if db (sqlite3:finalize! db))
+	(set! *didsomething* #t))))))
+
+;;======================================================================
+;; Lock/unlock runs
+;;======================================================================
+
+(define (runs:handle-locking target keys runname lock unlock user)
+  (let* ((db       #f)
+	 (rundat   (mt:get-runs-by-patt keys runname target))
+	 (header   (vector-ref rundat 0))
+	 (runs     (vector-ref rundat 1)))
+    (for-each (lambda (run)
+		(let ((run-id (db:get-value-by-header run header "id"))
+           (str (if lock 
+									"lock"
+                  "unlock")))
+		  (if (or lock
+			  (and unlock
+			       (or (args:get-arg "-force")
+                (begin
+				 (print "Do you really wish to unlock run " run-id "?\n   y/n: ")
+				 (equal? "y" (read-line))))))
+          (begin 
+		      (rmt:lock/unlock-run run-id lock unlock user)
+					(debug:print-info 0 *default-log-port* "Done " str " on run id " run-id))
+		      (debug:print-info 0 *default-log-port* "Skipping lock/unlock on " run-id))))
+	      runs)))
+;;======================================================================
+;; Rollup runs
+;;======================================================================
+
+;; Update the test_meta table for this test
+(define (runs:update-test_meta test-name test-conf)
+  (let ((currrecord (rmt:testmeta-get-record test-name)))
+    (if (not currrecord)
+	(begin
+	  (set! currrecord (make-vector 11 #f))
+	  (rmt:testmeta-add-record test-name)))
+    (for-each 
+     (lambda (key)
+       (let* ((idx (cadr key))
+	      (fld (car  key))
+	      (val (configf:lookup test-conf "test_meta" fld)))
+	 ;; (debug:print 5 *default-log-port* "idx: " idx " fld: " fld " val: " val)
+	 (if (and val (not (equal? (vector-ref currrecord idx) val)))
+	     (begin
+	       (print "Updating " test-name " " fld " to " val)
+	       (rmt:testmeta-update-field test-name fld val)))))
+     '(("author" 2)("owner" 3)("description" 4)("reviewed" 5)("tags" 9)("jobgroup" 10)))))
+
+;; find tests with matching tags, tagpatt is a string "tagpatt1,tagpatt2%, ..."
+;;
+(define (runs:get-tests-matching-tags tagpatt)
+  (let* ((tagdata (rmt:get-tests-tags))
+         (res     '())) ;; list of tests that match one or more tags
+    (for-each
+     (lambda (row)
+       (let* ((tag (car row))
+              (tests (cdr row)))
+       (if (patt-list-match tag tagpatt)
+           (set! res (append tests res)))))
+     tagdata)
+    res))
+    
+
+;; Update test_meta for all tests
+(define (runs:update-all-test_meta db)
+  (let ((test-names (tests:get-all))) ;; (tests:get-valid-tests)))
+    (for-each 
+     (lambda (test-name)
+       (let* ((test-conf    (mt:lazy-read-test-config test-name)))
+	 (if test-conf (runs:update-test_meta test-name test-conf))))
+     (hash-table-keys test-names))))
+
+;; This could probably be refactored into one complex query ...
+;; NOT PORTED - DO NOT USE YET
+;;
+#;(define (runs:rollup-run keys runname user keyvals)
+  (debug:print 4 *default-log-port* "runs:rollup-run, keys: " keys " -runname " runname " user: " user)
+  (let* ((db              #f)
+	 ;; register run operates on the main db
+	 (new-run-id      (rmt:register-run keyvals runname "new" "n/a" user (args:get-arg "-contour")))
+	 (prev-tests      (rmt:get-matching-previous-test-run-records new-run-id "%" "%"))
+	 (curr-tests      (mt:get-tests-for-run new-run-id "%/%" '() '()))
+	 (curr-tests-hash (make-hash-table)))
+    (rmt:update-run-event_time new-run-id)
+    ;; index the already saved tests by testname and itemdat in curr-tests-hash
+    (for-each
+     (lambda (testdat)
+       (let* ((testname  (db:test-get-testname testdat))
+	      (item-path (db:test-get-item-path testdat))
+	      (full-name (conc testname "/" item-path)))
+	 (hash-table-set! curr-tests-hash full-name testdat)))
+     curr-tests)
+    ;; NOPE: Non-optimal approach. Try this instead.
+    ;;   1. tests are received in a list, most recent first
+    ;;   2. replace the rollup test with the new *always*
+    (for-each 
+     (lambda (testdat)
+       (let* ((testname  (db:test-get-testname testdat))
+	      (item-path (db:test-get-item-path testdat))
+	      (full-name (conc testname "/" item-path))
+	      (prev-test-dat (hash-table-ref/default curr-tests-hash full-name #f))
+	      (test-steps    (rmt:get-steps-for-test (db:test-get-id testdat)))
+	      (new-test-record #f))
+	 ;; replace these with insert ... select
+	 (apply sqlite3:execute 
+		db 
+		(conc "INSERT OR REPLACE INTO tests (run_id,testname,state,status,event_time,host,cpuload,diskfree,uname,rundir,item_path,run_duration,final_logf,comment) "
+		      "VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?);")
+		new-run-id (cddr (vector->list testdat)))
+	 (set! new-testdat (car (mt:get-tests-for-run new-run-id (conc testname "/" item-path) '() '())))
+	 (hash-table-set! curr-tests-hash full-name new-testdat) ;; this could be confusing, which record should go into the lookup table?
+	 ;; Now duplicate the test steps
+	 (debug:print 4 *default-log-port* "Copying records in test_steps from test_id=" (db:test-get-id testdat) " to " (db:test-get-id new-testdat))
+	 (cdb:remote-run ;; to be replaced, note: this routine is not used currently
+	  (lambda ()
+	    (sqlite3:execute 
+	     db 
+	     (conc "INSERT OR REPLACE INTO test_steps (test_id,stepname,state,status,event_time,comment) "
+		   "SELECT " (db:test-get-id new-testdat) ",stepname,state,status,event_time,comment FROM test_steps WHERE test_id=?;")
+	     (db:test-get-id testdat))
+	    ;; Now duplicate the test data
+	    (debug:print 4 *default-log-port* "Copying records in test_data from test_id=" (db:test-get-id testdat) " to " (db:test-get-id new-testdat))
+	    (sqlite3:execute 
+	     db 
+	     (conc "INSERT OR REPLACE INTO test_data (test_id,category,variable,value,expected,tol,units,comment) "
+		   "SELECT " (db:test-get-id new-testdat) ",category,variable,value,expected,tol,units,comment FROM test_data WHERE test_id=?;")
+	     (db:test-get-id testdat))))
+	 ))
+     prev-tests)))
+
+;; clean cache files
+(define (runs:clean-cache target runname toppath)
+  (if target
+      (if runname
+	  (let* ((linktree (common:get-linktree)) ;; (if toppath (configf:lookup *configdat* "setup" "linktree")))
+		 (runtop   (conc linktree "/" target "/" runname))
+		 (files    (if (common:file-exists? runtop)
+			       (append (glob (conc runtop "/.megatest*"))
+				       (glob (conc runtop "/.runconfig*")))
+			       '())))
+	    (if (null? files)
+		(debug:print-info 0 *default-log-port* "No cached megatest or runconfigs files found. None removed.")
+		(begin
+		  (debug:print-info 0 *default-log-port* "Removing cached files:\n    " (string-intersperse files "\n    "))
+		  (for-each 
+		   (lambda (f)
+		     (handle-exceptions
+			 exn
+			 (debug:print 0 *default-log-port* "WARNING: Failed to remove file " f ", exn=" exn)
+		       (delete-file f)))
+		   files))))
+	  (debug:print-error 0 *default-log-port* "-clean-cache requires -runname."))
+      (debug:print-error 0 *default-log-port* "-clean-cache requires -target or -reqtarg")))
+
+;; kill any runner processes (i.e. processes handling -runtests) that match target/runname
+;; 
+;; do a remote call to get the task queue info but do the killing as self here.
+;;
+(define (tasks:kill-runner target run-name testpatt)
+  (let ((records    (rmt:tasks-find-task-queue-records target run-name testpatt "running" "run-tests"))
+	(hostpid-rx (regexp "\\s+(\\w+)\\s+(\\d+)$"))) ;; host pid is at end of param string
+    (if (null? records)
+	(debug:print 0 *default-log-port* "No run launching processes found for " target " / " run-name " with testpatt " (or testpatt "* no testpatt specified! *"))
+	(debug:print 0 *default-log-port* "Found " (length records) " run(s) to kill."))
+    (for-each 
+     (lambda (record)
+       (let* ((param-key (list-ref record 8))
+	      (match-dat (string-search hostpid-rx param-key)))
+	 (if match-dat
+	     (let ((hostname  (cadr match-dat))
+		   (pid       (string->number (caddr match-dat))))
+	       (debug:print 0 *default-log-port* "Sending SIGINT to process " pid " on host " hostname)
+	       (if (equal? (get-host-name) hostname)
+		   (if (process:alive? pid)
+		       (begin
+			 (handle-exceptions
+			  exn
+			  (begin
+			    (debug:print 0 *default-log-port* "Kill of process " pid " on host " hostname " failed.")
+			    (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
+			    #t)
+			  (process-signal pid signal/int)
+			  (thread-sleep! 5)
+			  (if (process:alive? pid)
+			      (process-signal pid signal/kill)))))
+		   ;;  (call-with-environment-variables
+		   (let ((old-targethost (getenv "TARGETHOST")))
+		     (setenv "TARGETHOST" hostname)
+		     (setenv "TARGETHOST_LOGF" "server-kills.log")
+		     (system (conc "nbfake kill " pid))
+		     (if old-targethost (setenv "TARGETHOST" old-targethost))
+		     (unsetenv "TARGETHOST")
+		     (unsetenv "TARGETHOST_LOGF"))))
+	     (debug:print-error 0 *default-log-port* "no record or improper record for " target "/" run-name " in tasks_queue in main.db"))))
+     records)))
+
+(define (task:get-run-times)
+   (let* ( 
+           (run-patt (if (args:get-arg "-run-patt")
+                        (args:get-arg "-run-patt")
+                        "%"))
+           (target-patt (if (args:get-arg "-target-patt")
+                        (args:get-arg "-target-patt")
+                        "%"))
+ 
+           (run-times  (rmt:get-run-times  run-patt target-patt )))
+   (if (eq? (length run-times) 0)
+     (begin
+       (print "Data not found!!")
+       (exit)))
+   (if (equal? (args:get-arg "-dumpmode") "json")
+       (task:print-runtime-as-json run-times)
+         (if (equal? (args:get-arg "-dumpmode") "csv")
+	     (task:print-runtime run-times ",")
+	     (task:print-runtime run-times "  ")))))
+
+
+
+)

Index: serialize-env.scm
==================================================================
--- serialize-env.scm
+++ serialize-env.scm
@@ -1,9 +1,21 @@
-(use z3)
-(use base64)
+(module serialize-env
+   *
+(import scheme
+	z3
+	base64
+	chicken.port
+	chicken.pretty-print
+	chicken.process-context
+	chicken.base
+	)
 
+(define (gen-output)
 (let* ((env-str        (with-output-to-string (lambda () (pp (get-environment-variables)))))
        (zipped-env-str (z3:encode-buffer env-str))
        (b64-env-str    (base64-encode zipped-env-str)))
   (print b64-env-str))
-
+)
+)
+(import serialize-env)
+(gen-output)
 

Index: server.scm
==================================================================
--- server.scm
+++ server.scm
@@ -14,37 +14,30 @@
 ;; 
 ;;     You should have received a copy of the GNU General Public License
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 ;;
 
-(require-extension (srfi 18) extras tcp s11n)
-
-(use srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest
-     directory-utils posix-extras matchable)
-
-(use spiffy uri-common intarweb http-client spiffy-request-vars)
-
-(declare (unit server))
-
-(declare (uses common))
-(declare (uses db))
-(declare (uses tasks)) ;; tasks are where stuff is maintained about what is running.
-;; (declare (uses synchash))
-(declare (uses http-transport))
-;;(declare (uses rpc-transport))
-(declare (uses launch))
-;; (declare (uses daemon))
-
-(include "common_records.scm")
-(include "db_records.scm")
-
-(define (server:make-server-url hostport)
-  (if (not hostport)
-      #f
-      (conc "http://" (car hostport) ":" (cadr hostport))))
-
-(define  *server-loop-heart-beat* (current-seconds))
+;; (require-extension (srfi 18) extras tcp s11n)
+;; 
+;; (use srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest
+;;      directory-utils posix-extras matchable)
+;; 
+;; (use spiffy uri-common intarweb http-client spiffy-request-vars)
+;; 
+;; (declare (unit server))
+;; 
+;; (declare (uses common))
+;; (declare (uses db))
+;; (declare (uses tasks)) ;; tasks are where stuff is maintained about what is running.
+;; ;; (declare (uses synchash))
+;; (declare (uses http-transport))
+;; ;;(declare (uses rpc-transport))
+;; (declare (uses launch))
+;; ;; (declare (uses daemon))
+;; 
+;; (include "common_records.scm")
+;; (include "db_records.scm")
 
 ;;======================================================================
 ;; P K T S   S T U F F 
 ;;======================================================================
 
@@ -54,797 +47,5 @@
 ;; P K T S   S T U F F 
 ;;======================================================================
 
 ;; ???
 
-;;======================================================================
-;; S E R V E R
-;;======================================================================
-
-;; Call this to start the actual server
-;;
-
-;; all routes though here end in exit ...
-;;
-;; start_server
-;;
-(define (server:launch run-id transport-type)
-  (case transport-type
-    ((http)(http-transport:launch))
-    ;;((nmsg)(nmsg-transport:launch run-id))
-    ;;((rpc)  (rpc-transport:launch run-id))
-    (else (debug:print-error 0 *default-log-port* "unknown server type " transport-type))))
-
-;;======================================================================
-;; S E R V E R   U T I L I T I E S 
-;;======================================================================
-
-;; Get the transport
-(define (server:get-transport)
-  (if *transport-type*
-      *transport-type*
-      (let ((ttype (string->symbol
-		    (or (args:get-arg "-transport")
-			(configf:lookup *configdat* "server" "transport")
-			"rpc"))))
-	(set! *transport-type* ttype)
-	ttype)))
-	    
-;; Generate a unique signature for this server
-(define (server:mk-signature)
-  (message-digest-string (md5-primitive) 
-			 (with-output-to-string
-			   (lambda ()
-			     (write (list (current-directory)
-                                          (current-process-id)
-					  (argv)))))))
-
-;; When using zmq this would send the message back (two step process)
-;; with spiffy or rpc this simply returns the return data to be returned
-;; 
-(define (server:reply return-addr query-sig success/fail result)
-  (debug:print-info 11 *default-log-port* "server:reply return-addr=" return-addr ", result=" result)
-  ;; (send-message pubsock target send-more: #t)
-  ;; (send-message pubsock 
-  (case (server:get-transport)
-    ((rpc)  (db:obj->string (vector success/fail query-sig result)))
-    ((http) (db:obj->string (vector success/fail query-sig result)))
-    ((fs)   result)
-    (else 
-     (debug:print-error 0 *default-log-port* "unrecognised transport type: " *transport-type*)
-     result)))
-
-;; Given a run id start a server process    ### NOTE ### > file 2>&1 
-;; if the run-id is zero and the target-host is set 
-;; try running on that host
-;;   incidental: rotate logs in logs/ dir.
-;;
-(define  (server:run areapath) ;; areapath is *toppath* for a given testsuite area
-  (let* ((curr-host   (get-host-name))
-         ;; (attempt-in-progress (server:start-attempted? areapath))
-         ;; (dot-server-url (server:check-if-running areapath))
-	 (curr-ip     (server:get-best-guess-address curr-host))
-	 (curr-pid    (current-process-id))
-	 (homehost    (common:get-homehost)) ;; configf:lookup *configdat* "server" "homehost" ))
-	 (target-host (car homehost))
-	 (testsuite   (common:get-testsuite-name))
-	 (logfile     (conc areapath "/logs/server.log")) ;; -" curr-pid "-" target-host ".log"))
-	 (profile-mode (or (configf:lookup *configdat* "misc" "profilesw")
-			   ""))
-	 (cmdln (conc (common:get-megatest-exe)
-		      " -server " (or target-host "-") (if (equal? (configf:lookup *configdat* "server" "daemonize") "yes")
-							   " -daemonize "
-							   "")
-		      ;; " -log " logfile
-		      " -m testsuite:" testsuite
-		      " " profile-mode
-		      )) ;; (conc " >> " logfile " 2>&1 &")))))
-	 (log-rotate  (make-thread common:rotate-logs  "server run, rotate logs thread")) ;; why are we rotating logs here? This is a sensitive location with a lot going on!?
-         (load-limit  (configf:lookup-number *configdat* "jobtools" "max-server-start-load" default: 3.0)))
-    ;; we want the remote server to start in *toppath* so push there
-    (push-directory areapath)
-    (debug:print 0 *default-log-port* "INFO: Trying to start server (" cmdln ") ...")
-    (thread-start! log-rotate)
-    
-    ;; host.domain.tld match host?
-    (if (and target-host 
-	     ;; look at target host, is it host.domain.tld or ip address and does it 
-	     ;; match current ip or hostname
-	     (not (string-match (conc "("curr-host "|" curr-host"\\..*)") target-host))
-	     (not (equal? curr-ip target-host)))
-	(begin
-	  (debug:print-info 0 *default-log-port* "Starting server on " target-host ", logfile is " logfile)
-	  (setenv "TARGETHOST" target-host)))
-      
-    (setenv "TARGETHOST_LOGF" logfile)
-    (thread-sleep! (/ (random 5000) 1000)) ;; add about a random (up to 5 seconds) initial delay. It seems pretty common that many running tests request a server at the same time
-    ;; (common:wait-for-normalized-load load-limit " delaying server start due to load" target-host) ;; do not try starting servers on an already overloaded machine, just wait forever
-    #;(common:wait-for-homehost-load load-limit (conc " delaying server start due to load on homehost. limit is " load-limit))
-    (system (conc "nbfake " cmdln))
-    (unsetenv "TARGETHOST_LOGF")
-    (if (get-environment-variable "TARGETHOST")(unsetenv "TARGETHOST"))
-    (thread-join! log-rotate)
-    (pop-directory)))
-
-;; given a path to a server log return: host port startseconds
-;; any changes to number of elements returned by this fuction will dirctly affect server:record->url,server:record->id,server:kill,server:get-num-alive which uses match let 
-
-(define (server:logf-get-start-info logf)
-  (let ((server-rx (regexp "^SERVER STARTED: (\\S+):(\\d+) AT ([\\d\\.]+) server-id: (\\S+)")) ;; SERVER STARTED: host:port AT timesecs server id
-        (dbprep-rx (regexp "^SERVER: dbprep"))
-        (dbprep-found 0)) 
-    (handle-exceptions
-	exn
-      (begin
-	(debug:print-info 0 *default-log-port* "Unable to get server info from " logf ", exn=" exn)
-	(list #f #f #f #f)) ;; no idea what went wrong, call it a bad server
-      (with-input-from-file
-	  logf
-	(lambda ()
-	  (let loop ((inl  (read-line))
-		     (lnum 0))
-	    (if (not (eof-object? inl))
-		(let ((mlst (string-match server-rx inl))
-                      (dbprep (string-match dbprep-rx inl))
-                      )
-                  (if dbprep
-                    (set! dbprep-found 1)
-                  )
-		  (if (not mlst)
-		      (if (< lnum 500) ;; give up if more than 500 lines of server log read
-			  (loop (read-line)(+ lnum 1))
-			  (begin 
-                           (debug:print-info 0 *default-log-port* "Unable to get server info from first 500 lines of " logf )
-                           (list #f #f #f #f)))
-		      (let ((dat  (cdr mlst)))
-			(list (car dat) ;; host
-			      (string->number (cadr dat)) ;; port
-			      (string->number (caddr dat))
-                              (cadr (cddr dat))))))
-                (begin 
-                   (if dbprep-found
-                      (begin
-                         (debug:print-info 0 *default-log-port* "Server is in dbprep at " (current-seconds))
-                         (thread-sleep! 25)
-                      )
-                      (debug:print-info 0 *default-log-port* "Unable to get server info from " logf " at " (current-seconds))
-                   )
-		    (list #f #f #f #f)))))))))
-
-;; get a list of servers with all relevant data
-;; ( mod-time host port start-time pid )
-;;
-(define (server:get-list areapath #!key (limit #f))
-  (let ((fname-rx    (regexp "^(|.*/)server-(\\d+)-(\\S+).log$"))
-	(day-seconds (* 24 60 60)))
-    ;; if the directory exists continue to get the list
-    ;; otherwise attempt to create the logs dir and then
-    ;; continue
-    (if (if (directory-exists? (conc areapath "/logs"))
-	    '()
-	    (if (file-write-access? areapath)
-		(begin
-		  (condition-case
-		   (create-directory (conc areapath "/logs") #t)
-		   (exn (i/o file)(debug:print 0 *default-log-port* "ERROR: Cannot create directory at " (conc areapath "/logs")))
-		   (exn ()(debug:print 0 *default-log-port* "ERROR: Unknown error attemtping to get server list. exn=" exn)))
-		  (directory-exists? (conc areapath "/logs")))
-		'()))
-
-        ;; Get the list of server logs that do not contain "exiting". Ignore logs for servers that have exited.
-	(let* ((server-logs-cmd  (conc "grep -iL exiting " areapath "/logs/server-*-*.log"))
-               (server-logs   (string-split (string-chomp (call-with-input-pipe server-logs-cmd read-all))))
-	       (num-serv-logs (length server-logs)))
-	  (if (or (null? server-logs) (= num-serv-logs 0))
-              (let ()
-                 (debug:print 1  *default-log-port* "There are no servers running")
-	         '()
-              )
-	      (let loop ((hed  (string-chomp (car server-logs)))
-			 (tal  (cdr server-logs))
-			 (res '()))
-		(let* ((mod-time  (handle-exceptions
-				   exn
-				   (begin
-				     (debug:print 0 *default-log-port* "failed to get modification time on " hed ", exn=" exn)
-				     (current-seconds)) ;; 0
-				   (file-modification-time hed))) ;; default to *very* old so log gets ignored if deleted
-		       (down-time (- (current-seconds) mod-time))
-		       (serv-dat  (if (or (< num-serv-logs 10)
-				  	  (< down-time 900)) ;; day-seconds))
-				      (server:logf-get-start-info hed)
-				      '())) ;; don't waste time processing server files not touched in the 15 minutes if there are more than ten servers to look at
-		       (serv-rec (cons mod-time serv-dat))
-		       (fmatch   (string-match fname-rx hed))
-		       (pid      (if fmatch (string->number (list-ref fmatch 2)) #f))
-		       (new-res  (if (null? serv-dat)
-				     res
-				     (cons (append serv-rec (list pid)) res)))) ;; any changes to number of elements in new-res will dirctly affect server:record->url,server:record->id,server:kill,server:get-num-alive which uses match let 
-		  (if (null? tal)
-		      (if (and limit
-			       (> (length new-res) limit))
-			  new-res ;; (take new-res limit)  <= need intelligent sorting before this will work
-			  new-res)
-		      (loop (string-chomp (car tal)) (cdr tal) new-res)))))))))
-
-(define (server:get-num-alive srvlst)
-  (let ((num-alive 0))
-    (for-each
-     (lambda (server)
-        (handle-exceptions
-          exn
-         (begin 
-          (debug:print-info 0 *default-log-port*  "Unable to get server start-time and/or mod-time from " server ", exn=" exn))
-       (match-let (((mod-time host port start-time server-id pid)
-		    server))
-	 (let* ((uptime  (- (current-seconds) mod-time))
-		(runtime (if start-time
-			     (- mod-time start-time)
-			     0)))
-	   (if (< uptime 5)(set! num-alive (+ num-alive 1)))))))
-     srvlst)
-    num-alive))
-
-;; given a list of servers get a list of valid servers, i.e. at least
-;; 10 seconds old, has started and is less than 1 hour old and is
-;; active (i.e. mod-time < 10 seconds
-;;
-;; mod-time host port start-time pid
-;;
-;; sort by start-time descending. I.e. get the oldest first. Young servers will thus drop off
-;; and servers should stick around for about two hours or so.
-;;
-(define (server:get-best srvlst)
-  (let* ((nums (server:get-num-servers))
-	 (now  (current-seconds))
-	 (slst (sort
-		(filter (lambda (rec)
-			  (if (and (list? rec)
-				   (> (length rec) 2))
-			      (let ((start-time (list-ref rec 3))
-				    (mod-time   (list-ref rec 0)))
-				;; (print "start-time: " start-time " mod-time: " mod-time)
-				(and start-time mod-time
-				     (> (- now start-time) 0)    ;; been running at least 0 seconds
-				     (< (- now mod-time)   16)   ;; still alive - file touched in last 16 seconds
-				     (or (not (configf:lookup *configdat* "server" "runtime")) ;; skip if not set
-					 (< (- now start-time)       
-					    (+ (- (string->number (configf:lookup *configdat* "server" "runtime"))
-					       180)
-					    (random 360)))) ;; under one hour running time +/- 180
-				     ))
-			      #f))
-			srvlst)
-		(lambda (a b)
-		  (< (list-ref a 3)
-		     (list-ref b 3))))))
-    (if (> (length slst) nums)
-	(take slst nums)
-	slst)))
-
-(define (server:get-first-best areapath)
-  (let ((srvrs (server:get-best (server:get-list areapath))))
-    (if (and srvrs
-	     (not (null? srvrs)))
-	(car srvrs)
-	#f)))
-
-(define (server:get-rand-best areapath)
-  (let ((srvrs (server:get-best (server:get-list areapath))))
-    (if (and (list? srvrs)
-	     (not (null? srvrs)))
-	(let* ((len (length srvrs))
-	       (idx (random len)))
-	  (list-ref srvrs idx))
-	#f)))
-
-(define (server:record->id servr)
-  (handle-exceptions
-   exn
-   (begin 
-     (debug:print-info 0 *default-log-port*  "Unable to get server id from " servr ", exn=" exn)     
-   #f)
-  (match-let (((mod-time host port start-time server-id pid)
-	       servr))
-    (if server-id
-	server-id
-	#f))))
-
-(define (server:record->url servr)
-  (handle-exceptions
-   exn
-   (begin 
-     (debug:print-info 0 *default-log-port*  "Unable to get server url from " servr ", exn=" exn)     
-   #f)
-  (match-let (((mod-time host port start-time server-id pid)
-	       servr))
-    (if (and host port)
-	(conc host ":" port)
-	#f))))
-
-(define (server:get-client-signature) ;; BB> why is this proc named "get-"?  it returns nothing -- set! has not return value.
-  (if *my-client-signature* *my-client-signature*
-      (let ((sig (server:mk-signature)))
-        (set! *my-client-signature* sig)
-        *my-client-signature*)))
-
-;; wait for server=start-last to be three seconds old
-;;
-(define (server:wait-for-server-start-last-flag areapath)
-  (let* ((start-flag (conc areapath "/logs/server-start-last"))
-	 ;;; THIS INTERACTS WITH [server] timeout. Suggest using 0.1 or above for timeout (6 seconds)
-	 (reftime    (configf:lookup-number *configdat* "server" "idletime" default: 4))
-	 (server-key (conc (get-host-name) "-" (current-process-id))))
-    (if (file-exists? start-flag)
-	(let* ((fmodtime (file-modification-time start-flag))
-	       (delta    (- (current-seconds) fmodtime))
-	       (all-go   (> delta reftime)))
-	  (if (and all-go
-		   (begin
-                     (debug:print-info 0 *default-log-port* "Writing " start-flag)
-		     (with-output-to-file start-flag
-		       (lambda ()
-			 (print server-key)))
-		     (thread-sleep! 0.25)
-		     (let ((res (with-input-from-file start-flag
-				  (lambda ()
-				    (read-line)))))
-		       (equal? server-key res))))
-	      #t ;; (system (conc "touch " start-flag)) ;; lazy but safe
-	      (begin
-		(debug:print-info 0 *default-log-port* "Gating server start, last start: "
-				  fmodtime ", delta: " delta ", reftime: " reftime ", all-go=" all-go)
-		(thread-sleep! reftime)
-		(server:wait-for-server-start-last-flag areapath)))))))
-
-;; kind start up of servers, wait 40 seconds before allowing another server for a given
-;; run-id to be launched
-;;
-(define (server:kind-run areapath)
-  ;; look for $MT_RUN_AREA_HOME/logs/server-start-last
-  ;; and wait for it to be at least 3 seconds old
-  (server:wait-for-server-start-last-flag areapath)
-  (if (not (server:check-if-running areapath)) ;; why try if there is already a server running?
-      (let* ((last-run-dat (hash-table-ref/default *server-kind-run* areapath '(0 0))) ;; callnum, whenrun
-	     (call-num     (car last-run-dat))
-	     (when-run     (cadr last-run-dat))
-	     (run-delay    (+ (case call-num
-				((0)    0)
-				((1)   20)
-				((2)  300)
-				(else 600))
-			      (random 5)))   ;; add a small random number just in case a lot of jobs hit the work hosts simultaneously
-	     (lock-file    (conc areapath "/logs/server-start.lock")))
-	(if	(> (- (current-seconds) when-run) run-delay)
-		(let* ((start-flag (conc areapath "/logs/server-start-last")))
-		  (common:simple-file-lock-and-wait lock-file expire-time: 15)
-                  (debug:print-info  0 *default-log-port* "server:kind-run: touching " start-flag)
-		  (system (conc "touch " start-flag)) ;; lazy but safe
-		  (server:run areapath)
-		  (thread-sleep! 2) ;; don't release the lock for at least a few seconds
-		  (common:simple-file-release-lock lock-file)))
-	(hash-table-set! *server-kind-run* areapath (list (+ call-num 1)(current-seconds))))))
-
-;; this one seems to be the general entry point
-;;
-(define (server:start-and-wait areapath #!key (timeout 60))
-  (let ((give-up-time (+ (current-seconds) timeout)))
-    (let loop ((server-info (server:check-if-running areapath))
-	       (try-num    0))
-      (if (or server-info
-	      (> (current-seconds) give-up-time)) ;; server-url will be #f if no server available.
-	  (server:record->url server-info)
-	  (let ((num-ok (length (server:get-best (server:get-list areapath)))))
-	    (if (and (> try-num 0)  ;; first time through simply wait a little while then try again
-		     (< num-ok 1))  ;; if there are no decent candidates for servers then try starting a new one
-		(server:kind-run areapath))
-	    (thread-sleep! 5)
-	    (loop (server:check-if-running areapath)
-		  (+ try-num 1)))))))
-
-(define server:try-running server:run) ;; there is no more per-run servers ;; REMOVE ME. BUG.
-
-(define (server:get-num-servers #!key (numservers 2))
-  (let ((ns (string->number
-	     (or (configf:lookup *configdat* "server" "numservers") "notanumber"))))
-    (or ns numservers)))
-
-;; no longer care if multiple servers are started by accident. older servers will drop off in time.
-;;
-(define (server:check-if-running areapath) ;;  #!key (numservers "2"))
-  (let* ((ns            (server:get-num-servers))
-	 (servers       (server:get-best (server:get-list areapath))))
-    (if (or (and servers
-		 (null? servers))
-	    (not servers)
-	    (and (list? servers)
-		 (< (length servers) (random ns)))) ;; somewhere between 0 and numservers
-        #f
-        (let loop ((hed (car servers))
-                   (tal (cdr servers)))
-          (let ((res (server:check-server hed)))
-            (if res
-                hed
-                (if (null? tal)
-                    #f
-                    (loop (car tal)(cdr tal)))))))))
-
-;; ping the given server
-;;
-(define (server:check-server server-record)
-  (let* ((server-url (server:record->url server-record))
-         (server-id (server:record->id server-record)) 
-         (res        (case *transport-type*
-                       ((http)(server:ping server-url server-id))
-                       ;; ((nmsg)(nmsg-transport:ping (tasks:hostinfo-get-interface server)
-                       )))
-    (if res
-        server-url
-	#f)))
-
-(define (server:kill servr)
-  (handle-exceptions
-    exn
-    (begin 
-      (debug:print-info 0 *default-log-port*  "Unable to get host and/or port from " servr ", exn=" exn)     
-    #f)
-  (match-let (((mod-time hostname port start-time server-id pid)
-	       servr))
-    (tasks:kill-server hostname pid))))
-
-;; called in megatest.scm, host-port is string hostname:port
-;;
-;; NOTE: This is NOT called directly from clients as not all transports support a client running
-;;       in the same process as the server.
-;;
-(define (server:ping host-port-in server-id #!key (do-exit #f))
-  (let ((host:port (if (not host-port-in) ;; use read-dotserver to find
-		       #f ;; (server:check-if-running *toppath*)
-		;; (if (number? host-port-in) ;; we were handed a server-id
-		;; 	   (let ((srec (tasks:get-server-by-id (db:delay-if-busy (tasks:open-db)) host-port-in)))
-		;; 	     ;; (print "srec: " srec " host-port-in: " host-port-in)
-		;; 	     (if srec
-		;; 		 (conc (vector-ref srec 3) ":" (vector-ref srec 4))
-		;; 		 (conc "no such server-id " host-port-in)))
-		       host-port-in))) ;; )
-    (let* ((host-port (if host:port
-			  (let ((slst (string-split   host:port ":")))
-			    (if (eq? (length slst) 2)
-				(list (car slst)(string->number (cadr slst)))
-				#f))
-			  #f)))
-;;	   (toppath       (launch:setup)))
-      ;; (print "host-port=" host-port)
-      (if (not host-port)
-	  (begin
-	    (if host-port-in
-		(debug:print 0 *default-log-port*  "ERROR: bad host:port"))
-	    (if do-exit (exit 1))
-	    #f)
-	  (let* ((iface      (car host-port))
-		 (port       (cadr host-port))
-		 (server-dat (http-transport:client-connect iface port server-id))
-		 (login-res  (rmt:login-no-auto-client-setup server-dat)))
-	    (if (and (list? login-res)
-		     (car login-res))
-		(begin
-		  ;; (print "LOGIN_OK")
-		  (if do-exit (exit 0))
-		  #t)
-		(begin
-		  ;; (print "LOGIN_FAILED")
-		  (if do-exit (exit 1))
-		  #f)))))))
-
-;; run ping in separate process, safest way in some cases
-;;
-(define (server:ping-server ifaceport)
-  (with-input-from-pipe 
-   (conc (common:get-megatest-exe) " -ping " ifaceport)
-   (lambda ()
-     (let loop ((inl (read-line))
-		(res "NOREPLY"))
-       (if (eof-object? inl)
-	   (case (string->symbol res)
-	     ((NOREPLY)  #f)
-	     ((LOGIN_OK) #t)
-	     (else       #f))
-	   (loop (read-line) inl))))))
-
-;; NOT USED (well, ok, reference in rpc-transport but otherwise not used).
-;;
-(define (server:login toppath)
-  (lambda (toppath)
-    (set! *db-last-access* (current-seconds)) ;; might not be needed.
-    (if (equal? *toppath* toppath)
-	#t
-	#f)))
-
-;; timeout is hms string: 1h 5m 3s, default is 1 minute
-;;
-(define (server:expiration-timeout)
-  (let ((tmo (configf:lookup *configdat* "server" "timeout")))
-    (if (and (string? tmo)
-	     (common:hms-string->seconds tmo)) ;; BUG: hms-string->seconds is broken, if given "10" returns 0. Also, it doesn't belong in this logic unless the string->number is changed below
-        (* 3600 (string->number tmo))
-	60)))
-
-(define (server:get-best-guess-address hostname)
-  (let ((res #f))
-    (for-each 
-     (lambda (adr)
-       (if (not (eq? (u8vector-ref adr 0) 127))
-	   (set! res adr)))
-     ;; NOTE: This can fail when there is no mention of the host in /etc/hosts. FIXME
-     (vector->list (hostinfo-addresses (hostname->hostinfo hostname))))
-    (string-intersperse 
-     (map number->string
-	  (u8vector->list
-	   (if res res (hostname->ip hostname)))) ".")))
-
-;; (define server:sync-lock-token "SERVER_SYNC_LOCK")
-;; (define (server:release-sync-lock)
-;;   (db:no-sync-del! *no-sync-db* server:sync-lock-token))
-;; (define (server:have-sync-lock?)
-;;   (let* ((have-lock-pair (db:no-sync-get-lock *no-sync-db* server:sync-lock-token))
-;;          (have-lock?     (car have-lock-pair))
-;;          (lock-time      (cdr have-lock-pair))
-;;          (lock-age       (- (current-seconds) lock-time)))
-;;     (cond
-;;      (have-lock? #t)
-;;      ((>lock-age
-;;        (* 3 (configf:lookup-number *configdat* "server" "minimum-intersync-delay" default: 180)))
-;;       (server:release-sync-lock)
-;;       (server:have-sync-lock?))
-;;      (else #f))))
-
-;; moving this here as it needs access to db and cannot be in common.
-;;
-
-(define (server:get-bruteforce-syncer dbstruct #!key (fork-to-background #f) (persist-until-sync #f))
-  (let* ((sqlite-exe   (or (get-environment-variable "MT_SQLITE3_EXE"))) ;; defined in cfg.sh
-         (sync-log     (or (args:get-arg "-sync-log") (conc *toppath* "/logs/sync-" (current-process-id) "-" (get-host-name) ".log")))
-	 (tmp-area     (common:get-db-tmp-area))
-	 (tmp-db       (conc tmp-area "/megatest.db"))
-	 (staging-file (conc *toppath* "/.megatest.db"))
-	 (mtdbfile     (conc *toppath* "/megatest.db"))
-	 (lockfile     (common:get-sync-lock-filepath))
-         (sync-cmd-core     (conc sqlite-exe" " tmp-db " .dump | "sqlite-exe" " staging-file "&>"sync-log))
-         (sync-cmd     (if fork-to-background 
-                           (conc "/usr/bin/env NBFAKE_LOG="*toppath*"/logs/last-server-sync-"(current-process-id)".log nbfake \""sync-cmd-core" && /bin/mv -f " staging-file " " mtdbfile" \"")
-                           sync-cmd-core))
-         (default-min-intersync-delay 2)
-	 (min-intersync-delay (configf:lookup-number *configdat* "server" "minimum-intersync-delay" default: default-min-intersync-delay))
-         (default-duty-cycle 0.1)
-         (duty-cycle   (configf:lookup-number *configdat* "server" "sync-duty-cycle" default: default-duty-cycle))
-         (last-sync-seconds 10) ;; we will adjust this to a measurement and delay last-sync-seconds * (1 - duty-cycle)
-         (calculate-off-time (lambda (work-duration duty-cycle)
-                                  (* (/ (- 1 duty-cycle) duty-cycle) last-sync-seconds)))
-         (off-time min-intersync-delay) ;; adjusted in closure below.
-         (do-a-sync
-          (lambda ()
-            (BB> "Start do-a-sync with fork-to-background="fork-to-background" persist-until-sync="persist-until-sync)
-            (let* ((finalres
-                    (let retry-loop ((num-tries 0))
-                         (if (common:simple-file-lock lockfile)
-	                     (begin
-                               (cond
-                                ((not (or fork-to-background persist-until-sync))
-                                 (debug:print 0 *default-log-port* "INFO: syncer thread sleeping for max of (server.minimum-intersync-delay="min-intersync-delay
-                                              " , off-time="off-time" seconds ]")
-                                 (thread-sleep! (max off-time min-intersync-delay)))
-                                (else
-                                 (debug:print 0 *default-log-port* "INFO: syncer thread NOT sleeping ; maybe time-to-exit...")))
-
-                               (if (not (configf:lookup *configdat* "server" "disable-db-snapshot"))
-                                   (common:snapshot-file mtdbfile subdir: ".db-snapshot"))
-		               (delete-file* staging-file)
-		               (let* ((start-time (current-milliseconds))
-                                      (res (system sync-cmd))
-                                      (dbbackupfile (conc mtdbfile ".backup"))
-                                      (res2 
-                                       (cond
-                                        ((eq? 0 res )
-                                         (handle-exceptions
-                                            exn
-                                            #f
-                                         (if (file-exists? dbbackupfile)
-		                           (delete-file* dbbackupfile)
-                                         )
-                                         (if (eq? 0 (file-size sync-log))
-                                             (delete-file* sync-log))
-		                         (system (conc "/bin/mv " staging-file " " mtdbfile))
-                                         
-                                         (set! last-sync-seconds (/ (- (current-milliseconds) start-time) 1000))
-                                         (set! off-time (calculate-off-time
-                                                         last-sync-seconds
-                                                         (cond
-                                                          ((and (number? duty-cycle) (> duty-cycle 0) (< duty-cycle 1))
-                                                           duty-cycle)
-                                                          (else
-                                                           (debug:print 0 *default-log-port* "WARNING: ["(common:human-time)"] server.sync-duty-cycle is invalid.  Should be a number between 0 and 1, but "duty-cycle" was specified.  Using default value: "default-duty-cycle)
-                                                           default-duty-cycle))))
-                                         
-                                         (debug:print 1 *default-log-port* "INFO: ["(common:human-time)"] pid="(current-process-id)" SYNC took "last-sync-seconds" sec")
-                                         (debug:print 1 *default-log-port* "INFO: ["(common:human-time)"] pid="(current-process-id)" SYNC took "last-sync-seconds" sec ; with duty-cycle of "duty-cycle" off time is now "off-time)
-                                         'sync-completed))
-                                        (else
-                                         (system (conc "/bin/cp "sync-log" "sync-log".fail"))
-                                         (debug:print 0 *default-log-port* "ERROR: ["(common:human-time)"] Sync failed. See log at "sync-log".fail")
-                                         (if (file-exists? (conc mtdbfile ".backup"))
-                                             (system (conc "/bin/cp "mtdbfile ".backup " mtdbfile)))
-                                         #f))))
-                                 (common:simple-file-release-lock lockfile)
-                                 (BB> "released lockfile: " lockfile)
-                                 (when (common:file-exists? lockfile)
-                                   (BB> "DID NOT ACTUALLY RELEASE LOCKFILE"))
-                                 res2) ;; end let
-                               );; end begin
-                             ;; else
-                             (cond
-                              (persist-until-sync
-                               (thread-sleep! 1)
-                               (debug:print 1 *default-log-port* "INFO: ["(common:human-time)"] pid="(current-process-id)" other SYNC in progress; we're in a fork-to-background so we need to succeed.  Let's wait a jiffy and and try again. num-tries="num-tries" (waiting for lockfile="lockfile" to disappear)")
-                               (retry-loop (add1 num-tries)))
-                              (else
-                               (thread-sleep! (max off-time (+ last-sync-seconds min-intersync-delay)))
-                               (debug:print 1 *default-log-port* "INFO: ["(common:human-time)"] pid="(current-process-id)" other SYNC in progress; not syncing.")
-                               'parallel-sync-in-progress))
-                             ) ;; end if got lockfile
-                         )
-                    ))
-              (BB> "End do-a-sync with fork-to-background="fork-to-background" persist-until-sync="persist-until-sync" and result="finalres)
-              finalres)
-            ) ;; end lambda
-          ))
-    do-a-sync))
-
-(define (server:writable-watchdog-bruteforce dbstruct)
-  (thread-sleep! 1) ;; delay for startup
-  (let* ((do-a-sync  (server:get-bruteforce-syncer dbstruct))
-         (final-sync (server:get-bruteforce-syncer dbstruct fork-to-background: #t persist-until-sync: #t)))
-    (when (and (not (args:get-arg "-sync-to-megatest.db")) ;; conditions under which we do not run the sync
-	       (args:get-arg "-server"))
-      
-      (let loop ()
-	(do-a-sync)
-        (if (not *time-to-exit*) (loop))) ;; keep going unless time to exit
-
-      ;; time to exit, close the no-sync db here
-      (final-sync)
-
-      (if (common:low-noise-print 30)
-	  (debug:print-info 0 *default-log-port* "Exiting watchdog timer, *time-to-exit* = " *time-to-exit*" pid="(current-process-id)
-			    )))))
-
-(define (server:writable-watchdog-deltasync dbstruct)
-  (thread-sleep! 0.05) ;; delay for startup
-  (let ((legacy-sync  (common:run-sync?))
-        (sync-stale-seconds (configf:lookup-number *configdat* "server" "sync-stale-seconds" default: 300))
-	(debug-mode   (debug:debug-mode 1))
-	(last-time    (current-seconds))
-	(no-sync-db   (db:open-no-sync-db))
-	(stmt-cache   (dbr:dbstruct-stmt-cache dbstruct))
-        (sync-duration 0) ;; run time of the sync in milliseconds
-        )
-    (set! *no-sync-db* no-sync-db) ;; make the no sync db available to api calls
-    (debug:print-info 2 *default-log-port* "Periodic sync thread started.")
-    (debug:print-info 3 *default-log-port* "watchdog starting. legacy-sync is " legacy-sync" pid="(current-process-id)  );;  " this-wd-num="this-wd-num)
-    (if (and legacy-sync (not *time-to-exit*))
-	(let* (;;(dbstruct (db:setup))
-	       (mtdb       (dbr:dbstruct-mtdb dbstruct))
-	       (mtpath     (db:dbdat-get-path mtdb))
-	       (tmp-area   (common:get-db-tmp-area))
-	       (start-file (conc tmp-area "/.start-sync"))
-	       (end-file   (conc tmp-area "/.end-sync")))
-	  (debug:print-info 0 *default-log-port* "Server running, periodic sync started.")
-	  (let loop ()
-	    ;; sync for filesystem local db writes
-	    ;;
-	    (mutex-lock! *db-multi-sync-mutex*)
-	    (let* ((need-sync        (>= *db-last-access* *db-last-sync*)) ;; no sync since last write
-		   (sync-in-progress *db-sync-in-progress*)
-                   (min-intersync-delay (configf:lookup-number *configdat* "server" "minimum-intersync-delay" default: 5))
-		   (should-sync      (and (not *time-to-exit*)
-                                          (> (- (current-seconds) *db-last-sync*) min-intersync-delay))) ;; sync every five seconds minimum, deprecated logic, can probably be removed
-		   (start-time       (current-seconds))
-                   (cpu-load-adj     (alist-ref 'adj-proc-load (common:get-normalized-cpu-load #f)))
-		   (mt-mod-time      (file-modification-time mtpath))
-		   (last-sync-start  (if (common:file-exists? start-file)
-					 (file-modification-time start-file)
-					 0))
-		   (last-sync-end    (if (common:file-exists? end-file)
-					 (file-modification-time end-file)
-					 10))
-                   (sync-period      (+ 3 (* cpu-load-adj 30))) ;; as adjusted load increases increase the sync period
-		   (recently-synced  (and (< (- start-time mt-mod-time) sync-period) ;; not useful if sync didn't modify megatest.db!
-					  (< mt-mod-time last-sync-start)))
-		   (sync-done        (<= last-sync-start last-sync-end))
-                   (sync-stale       (> start-time (+ last-sync-start sync-stale-seconds)))
-		   (will-sync        (and (not *time-to-exit*)       ;; do not start a sync if we are in the process of exiting
-                                          (or need-sync should-sync)
-					  (or sync-done sync-stale)
-					  (not sync-in-progress)
-					  (not recently-synced))))
-              (debug:print-info 13 *default-log-port* "WD writable-watchdog top of loop.  need-sync="need-sync" sync-in-progress=" sync-in-progress
-				" should-sync="should-sync" start-time="start-time" mt-mod-time="mt-mod-time" recently-synced="recently-synced" will-sync="will-sync
-				" sync-done=" sync-done " sync-period=" sync-period)
-              (if (and (> sync-period 5)
-                       (common:low-noise-print 30 "sync-period"))
-                  (debug:print-info 0 *default-log-port* "Increased sync period due to long sync times, sync took: " sync-period " seconds."))
-	      ;; (if recently-synced (debug:print-info 0 *default-log-port* "Skipping sync due to recently-synced flag=" recently-synced))
-	      ;; (debug:print-info 0 *default-log-port* "need-sync: " need-sync " sync-in-progress: " sync-in-progress " should-sync: " should-sync " will-sync: " will-sync)
-	      (if will-sync (set! *db-sync-in-progress* #t))
-	      (mutex-unlock! *db-multi-sync-mutex*)
-	      (if will-sync
-                  (let (;; (max-sync-duration  (configf:lookup-number *configdat* "server" "max-sync-duration")) ;; KEEPING THIS AVAILABLE BUT SHOULD NOT USE, I'M PRETTY SURE IT DOES NOT WORK!
-                        (sync-start         (current-milliseconds)))
-		    (with-output-to-file start-file (lambda ()(print (current-process-id))))
-		    
-		    ;; put lock here
-		    
-                    ;; (if (or (not max-sync-duration)
-                    ;;        (< sync-duration max-sync-duration)) ;; NOTE: db:sync-to-megatest.db keeps track of time of last sync and syncs incrementally
-                        (let ((res        (db:sync-to-megatest.db dbstruct no-sync-db: no-sync-db))) ;; did we sync any data? If so need to set the db touched flag to keep the server alive
-                          (set! sync-duration (- (current-milliseconds) sync-start))
-                          (if (> res 0) ;; some records were transferred, keep the db alive
-                              (begin
-                                (mutex-lock! *heartbeat-mutex*)
-                                (set! *db-last-access* (current-seconds))
-                                (mutex-unlock! *heartbeat-mutex*)
-                                (debug:print-info 0 *default-log-port* "sync called, " res " records transferred."))
-                              (debug:print-info 2 *default-log-port* "sync called but zero records transferred")))))
-;;                         ;; TODO: factor this next routine out into a function
-;;                         (with-input-from-pipe ;; this should not block other threads but need to verify this
-;;                          (conc "megatest -sync-to-megatest.db -m testsuite:" (common:get-area-name) ":" *toppath*)
-;;                          (lambda ()
-;;                            (let loop ((inl (read-line))
-;;                                       (res #f))
-;;                              (if (eof-object? inl)
-;;                                  (begin
-;;                                    (set! sync-duration (- (current-milliseconds) sync-start))
-;;                                    (cond
-;;                                     ((not res)
-;;                                      (debug:print 0 *default-log-port* "ERROR: sync from /tmp db to megatest.db appears to have failed. Recommended that you stop your runs and run \"megatest -cleanup-db\""))
-;;                                     ((> res 0)
-;;                                      (mutex-lock! *heartbeat-mutex*)
-;;                                      (set! *db-last-access* (current-seconds))
-;;                                      (mutex-unlock! *heartbeat-mutex*))))
-;;                                  (let ((num-synced (let ((matches (string-match "^Synced (\\d+).*$" inl)))
-;;                                                      (if matches
-;;                                                          (string->number (cadr matches))
-;;                                                          #f))))
-;;                                    (loop (read-line)
-;;                                          (or num-synced res))))))))))
-	      (if will-sync
-		  (begin
-		    (mutex-lock! *db-multi-sync-mutex*)
-		    (set! *db-sync-in-progress* #f)
-		    (set! *db-last-sync* start-time)
-		    (with-output-to-file end-file (lambda ()(print (current-process-id))))
-
-		    ;; release lock here
-
-		    (mutex-unlock! *db-multi-sync-mutex*)))
-	      (if (and debug-mode
-		       (> (- start-time last-time) 60))
-		  (begin
-		    (set! last-time start-time)
-		    (debug:print-info 4 *default-log-port* "timestamp -> " (seconds->time-string (current-seconds)) ", time since start -> " (seconds->hr-min-sec (- (current-seconds) *time-zero*))))))
-	    
-	    ;; keep going unless time to exit
-	    ;;
-	    (if (not *time-to-exit*)
-		(let delay-loop ((count 0))
-                  ;;(debug:print-info 13 *default-log-port* "delay-loop top; count="count" pid="(current-process-id)" this-wd-num="this-wd-num" *time-to-exit*="*time-to-exit*)
-                                                            
-		  (if (and (not *time-to-exit*)
-			   (< count 6)) ;; was 11, changing to 4. 
-		      (begin
-			(thread-sleep! 1)
-			(delay-loop (+ count 1))))
-		  (if (not *time-to-exit*) (loop))))
-	    ;; time to exit, close the no-sync db here
-	    (db:no-sync-close-db no-sync-db stmt-cache)
-	    (if (common:low-noise-print 30)
-		(debug:print-info 0 *default-log-port* "Exiting watchdog timer, *time-to-exit* = " *time-to-exit*" pid="(current-process-id) ))))))) ;;" this-wd-num="this-wd-num)))))))
-

ADDED   servermod.scm
Index: servermod.scm
==================================================================
--- /dev/null
+++ servermod.scm
@@ -0,0 +1,134 @@
+;;======================================================================
+;; Copyright 2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
+
+;;======================================================================
+
+(declare (unit servermod))
+(declare (uses commonmod))
+(declare (uses debugprint))
+(declare (uses configfmod))
+(declare (uses http-transportmod))
+(declare (uses pkts))
+
+(module servermod
+	*
+	
+(import scheme
+	chicken.base
+	chicken.string
+	chicken.process
+	chicken.io
+	chicken.time
+	chicken.condition
+	chicken.file
+	chicken.process-context
+	chicken.process-context.posix
+	chicken.random
+	chicken.file.posix
+	
+	system-information
+	(prefix sqlite3 sqlite3:)
+	typed-records
+	regex
+	directory-utils
+	matchable
+	
+	srfi-18
+	srfi-69
+
+	commonmod
+	debugprint
+	configfmod
+	http-transportmod
+	pkts
+	
+	)
+
+(define (server:make-server-url hostport)
+  (if (not hostport)
+      #f
+      (conc "http://" (car hostport) ":" (cadr hostport))))
+
+;; reuse this for server load?
+;;
+#;(define (common:wait-for-homehost-load maxnormload msg)
+  (let* ((hh-dat (if (common:on-homehost?) ;; if we are on the homehost then pass in #f so the calls are local.
+                     #f
+                     (common:get-homehost)))
+         (hh     (if hh-dat (car hh-dat) #f)))
+    (common:wait-for-normalized-load maxnormload msg hh)))
+
+
+;; Given a run id start a server process    ### NOTE ### > file 2>&1 
+;; if the run-id is zero and the target-host is set 
+;; try running on that host
+;;   incidental: rotate logs in logs/ dir.
+;;
+(define  (server:run areapath) ;; areapath is *toppath* for a given testsuite area
+  (let* ((curr-host   (get-host-name))
+	 (curr-ip     (server:get-best-guess-address curr-host))
+	 (curr-pid    (current-process-id))
+	 (testsuite   (common:get-area-name))
+	 (logfile     (conc areapath "/logs/server.log"))
+	 (profile-mode (or (configf:lookup *configdat* "misc" "profilesw")
+			   ""))
+	 (cmdln (conc
+		 (common:get-megatest-exe)
+		 " -server " (or (get-host-name) "-")
+		 (if (equal? (configf:lookup *configdat* "server" "daemonize")
+			     "yes")
+		     " -daemonize "
+		     "")
+		 ;; " -log " logfile
+		 " -m testsuite:" testsuite
+		 " " profile-mode
+		 ))
+         (load-limit  (configf:lookup-number *configdat* "jobtools" "max-server-start-load" default: 3.0)))
+    ;; we want the remote server to start in *toppath* so push there
+    (push-directory areapath)
+    (debug:print 0 *default-log-port* "INFO: Trying to start server (" cmdln ") ...")
+    (setenv "NBFAKE_LOG" logfile)
+    (system (conc "nbfake " cmdln))
+    (unsetenv "NBFAKE_LOG")
+    (pop-directory)))
+
+(define (server:record->url servr)
+  (handle-exceptions
+   exn
+   (begin 
+     (debug:print-info 0 *default-log-port*  "Unable to get server url from " servr ", exn=" exn)     
+   #f)
+  (match-let (((mod-time host port start-time server-id pid)
+	       servr))
+    (if (and host port)
+	(conc host ":" port)
+	#f))))
+
+
+(define (server:kill servr)
+  (handle-exceptions
+    exn
+    (begin 
+      (debug:print-info 0 *default-log-port*  "Unable to get host and/or port from " servr ", exn=" exn)     
+    #f)
+  (match-let (((mod-time hostname port start-time server-id pid)
+	       servr))
+    (tasks:kill-server hostname pid))))
+
+
+)

DELETED show-uncalled-procedures.scm
Index: show-uncalled-procedures.scm
==================================================================
--- show-uncalled-procedures.scm
+++ /dev/null
@@ -1,30 +0,0 @@
-;;  Copyright 2006-2017, Matthew Welland.
-;; 
-;; This file is part of Megatest.
-;; 
-;;     Megatest is free software: you can redistribute it and/or modify
-;;     it under the terms of the GNU General Public License as published by
-;;     the Free Software Foundation, either version 3 of the License, or
-;;     (at your option) any later version.
-;; 
-;;     Megatest is distributed in the hope that it will be useful,
-;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;     GNU General Public License for more details.
-;; 
-;;     You should have received a copy of the GNU General Public License
-;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
-;;
-(include "codescanlib.scm")
-
-(define (show-danglers)
-  (let* ((all-scm-files (glob "*.scm"))
-         (xref (get-xref all-scm-files))
-         (dangling-procs
-          (map car (filter (lambda (x) (equal? 1 (length x))) xref))))
-    (for-each print dangling-procs) ;; our product.
-    ))
-
-(show-danglers)
-
-    

Index: stml2.scm
==================================================================
--- stml2.scm
+++ stml2.scm
@@ -17,7 +17,9 @@
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;======================================================================
 
 (declare (unit stml2))
+(declare (uses cookie))
 
 (include "stml2/stml2.scm")
+

Index: stml2/cookie.scm
==================================================================
--- stml2/cookie.scm
+++ stml2/cookie.scm
@@ -45,11 +45,11 @@
 ;; (declare (unit cookie))
 
 (module cookie
     *
 
-(import chicken scheme data-structures extras srfi-13 ports posix)
+(import (chicken base) scheme queues srfi-13 (chicken port) (chicken io)(chicken file) (chicken format) (chicken string) (chicken time posix))
   
 (require-extension srfi-1 srfi-13 srfi-14 regex)
 ;; (use  srfi-1 srfi-13 srfi-14 regex)
 ;; (declare (export parse-cookie-string construct-cookie-string))
 

Index: stml2/stml2.scm
==================================================================
--- stml2/stml2.scm
+++ stml2/stml2.scm
@@ -12,17 +12,39 @@
 ;; (declare (unit stml))
 
 (module stml2
     *
 
-(import chicken scheme data-structures extras srfi-13 ports posix srfi-69 files srfi-1) 
+  (import
 
-(import cookie)
-(use (prefix dbi dbi:) (prefix crypt c:) typed-records)
+    (chicken base)
+    (chicken blob)
+    (chicken condition)
+    (chicken file)
+    (chicken format)
+    (chicken io)
+    (chicken pathname)
+    (chicken port)
+    (chicken process)
+    (chicken process-context posix)
+    (chicken process-context)
+    (chicken random)
+    (chicken string)
+    (chicken time posix)
+    (chicken time)
+    (prefix crypt c:)
+    (prefix dbi dbi:)
+    cookie
+    queues
+    regex
+    scheme
+    srfi-1
+    srfi-13
+    srfi-69
+    typed-records
 
-;; (declare (uses misc-stml))
-(use regex)
+    )
 
 ;; The (usually global) sdat contains everything about the session
 ;;
 (defstruct sdat
   ;; database
@@ -421,11 +443,11 @@
 ;;  (s:get-key 'n 1)     => "n99e1882" n=number 99e is the week number since 1970, remainder is random
 ;;  (s:key->val "n1882") => 1
 ;;
 ;;  first letter is a type: n=number, s=string, b=boolean
 (define (s:get-key key-type val)
-  (let ((mkrandstr (lambda (innum)(number->string (random innum) 16)))
+  (let ((mkrandstr (lambda (innum)(number->string (pseudo-random-integer innum) 16)))
 	(week      (number->string (quotient (current-seconds) (* 7 24 60 60)) 16)))
     (let loop ((siz 1000)
 	       (key (conc key-type week (mkrandstr 100)))
 	       (num 0))
       (if (s:session-var-get key) ;; have a collision
@@ -649,11 +671,11 @@
 
 #;(define (session:get-nth-char nth)
   (substring session:valid-chars nth  (+ nth 1)))
 
 #;(define (session:get-rand-char)
-  (session:get-nth-char (random session:num-valid-chars)))
+  (session:get-nth-char (pseudo-random-integer session:num-valid-chars)))
 
 #;(define (session:make-rand-string len)
   (let loop ((res "")
              (n   1))
     (if (> n len) res
@@ -664,11 +686,11 @@
 ;;
 #;(define (session:generic-make-rand-string len seed-string)
   (let ((num-chars (string-length seed-string)))
     (let loop ((res "")
 	       (n   1))
-      (let ((char-num (random num-chars)))
+      (let ((char-num (pseudo-random-integer num-chars)))
 	(if (> n len) res
 	    (loop (string-append res (substring seed-string char-num (+ char-num 1)))
 		  (+ n 1)))))))
 
 ;; Rely on crypt egg's default settings being secure enough, accept
@@ -732,12 +754,12 @@
    (else     #f)))
 
 ;; NB// this is *illegal* pgint
 (define (s:illegal-pgint val)
   (cond
-   ((> val 2147483647) 1)
-   ((< val -2147483648) -1)
+   ((> val 2147483640.0) 1)   ;;  2147483647
+   ((< val -2147483640.0) -1) ;; -2147483648
    (else #f)))
 
 (define (s:any->pgint val)
   (let ((n (s:any->number val)))
     (if n
@@ -1105,16 +1127,16 @@
 
 ;; (s:process-cgi-input (caaar dat))
 (define (formdat:load-all-port inp)
   (let* ((formdat        (make-formdat:formdat))
 	 (debugp         #f))
-			 ;; (open-output-file (conc "/tmp/delme-" (current-user-id) ".log"))))
+    ;; (open-output-file (conc "/tmp/delme-" (current-user-id) ".log"))))
     ;; (write-string (read-string #f inp) #f debugp)  ;; destroys all data!
     (formdat:initialize formdat)
-    (let ((alldats (formdat:dat->list inp 10e6 debug-port: debugp)))
+    (let ((alldats (formdat:dat->list inp 10e6 debug-port: #f debugp)))
       
-      (if debugp (format debugp "formdat : alldats: ~A\n" alldats))
+      #;(if debugp (format debugp "formdat : alldats: ~A\n" alldats))
 
       (let ((firstitem   (car alldats))
 	    (multipass #f)) 
 	(if (and (not (null? firstitem))
 		 (not (null? (car firstitem))))
@@ -1150,11 +1172,11 @@
 	    (if (and (not (null? alldats))
 		     (not (null? (car alldats)))
 		     (not (null? (caar alldats))))
 		(formdat:load formdat  (s:process-cgi-input (caaar alldats))))) ;; munged))
 	;;		    (format debugp "formdat : name: ~A content: ~A\n" name content)
-	(if debugp (close-output-port debugp))
+	#;(if debugp (close-output-port debugp))
 	;; (sdat-formdat-set! s:session formdat)
 	formdat))))
 		
 #|
 (define inp (open-input-file "tests/example.post.in"))
@@ -1429,11 +1451,11 @@
 
 (define (session:get-nth-char nth)
   (substring session:valid-chars nth  (+ nth 1)))
 
 (define (session:get-rand-char)
-  (session:get-nth-char (random session:num-valid-chars)))
+  (session:get-nth-char (pseudo-random-integer session:num-valid-chars)))
 
 (define (session:make-rand-string len)
   (let loop ((res "")
              (n   1))
     (if (> n len) res
@@ -1444,11 +1466,11 @@
 ;;
 (define (session:generic-make-rand-string len seed-string)
   (let ((num-chars (string-length seed-string)))
     (let loop ((res "")
 	       (n   1))
-      (let ((char-num (random num-chars)))
+      (let ((char-num (pseudo-random-integer num-chars)))
 	(if (> n len) res
 	    (loop (string-append res (substring seed-string char-num (+ char-num 1)))
 		  (+ n 1)))))))
 
 
@@ -1707,11 +1729,11 @@
 	  ;; The 'auto method will distribute dbs across the disk using hash
 	  ;; of user host and user. TODO
 	  ;; (if (eq? dbfname 'auto) ;; This is the auto assignment of a db based on hash of IP
 	  (let ((dbpath (pathname-directory dbfname)))  ;; do a couple sanity checks here to make setting up easier
 	    (if debugmode (session:log self "INFO: setting up for sqlite3 db access to " dbfname))
-	    (if (not (file-write-access? dbpath))
+	    (if (not (file-writable? dbpath))
 		(session:log self "WARNING: Cannot write to " dbpath)
 		(if debugmode (session:log self "INFO: " dbpath " is writeable")))
 	    (if (file-exists? dbfname)
 		(begin
 		  ;; (session:log self "setting dbexists to #t")

DELETED subrun.scm
Index: subrun.scm
==================================================================
--- subrun.scm
+++ /dev/null
@@ -1,265 +0,0 @@
-
-;; Copyright 2006-2016, Matthew Welland.
-;; 
-;; This file is part of Megatest.
-;; 
-;;     Megatest is free software: you can redistribute it and/or modify
-;;     it under the terms of the GNU General Public License as published by
-;;     the Free Software Foundation, either version 3 of the License, or
-;;     (at your option) any later version.
-;; 
-;;     Megatest is distributed in the hope that it will be useful,
-;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;     GNU General Public License for more details.
-;; 
-;;     You should have received a copy of the GNU General Public License
-;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
-
-;;  strftime('%m/%d/%Y %H:%M:%S','now','localtime')
-
-(use (prefix sqlite3 sqlite3:) srfi-1 posix regex regex-case srfi-69 (srfi 18) 
-     posix-extras directory-utils pathname-expand typed-records format
-     call-with-environment-variables)
-(declare (unit subrun))
-;;(declare (uses runs))
-(declare (uses db))
-(declare (uses common))
-;;(declare (uses items))
-;;(declare (uses runconfig))
-;;(declare (uses tests))
-;;(declare (uses server))
-(declare (uses mt))
-;;(declare (uses archive))
-;; (declare (uses filedb))
-
-;(include "common_records.scm")
-;;(include "key_records.scm")
-(include "db_records.scm") ;; provides db:test-get-id
-;;(include "run_records.scm")
-;;(include "test_records.scm")
-
-(define (subrun:subrun-test-initialized? test-run-dir)
-  (if (and (common:file-exists? (conc test-run-dir "/subrun-area") )
-           (common:file-exists? (conc test-run-dir "/testconfig.subrun") ))
-      #t
-      #f))
-
-(define (subrun:launch-dashboard test-run-dir)
-  (if (subrun:subrun-test-initialized? test-run-dir)
-      (let* ((subarea (subrun:get-runarea test-run-dir)))
-        (if (and subarea (common:file-exists? subarea))
-            (system (conc "cd " subarea ";env -i PATH=$PATH DISPLAY=$DISPLAY HOME=$HOME USER=$USER dashboard &"))))))
-
-(define (subrun:subrun-removed? test-run-dir)
-  (if (subrun:subrun-test-initialized? test-run-dir)
-      (let ((flagfile (conc test-run-dir "/subrun.removed")))
-        (if (common:file-exists? flagfile)
-            #t
-            #f))
-      #t))
-
-(define (subrun:set-subrun-removed test-run-dir)
-  (let ((flagfile (conc test-run-dir "/subrun.removed")))
-    (if (and (subrun:subrun-test-initialized? test-run-dir) (not (common:file-exists? flagfile)))
-        (with-output-to-file flagfile
-          (lambda () (print (current-seconds)))))))
-
-(define (subrun:unset-subrun-removed test-run-dir)
-  (let ((flagfile (conc test-run-dir "/subrun.removed")))
-    (if (and (subrun:subrun-test-initialized? test-run-dir) (common:file-exists? flagfile))
-        (delete-file flagfile))))
-
-
-(define (subrun:testconfig-defines-subrun? testconfig)
-  (configf:lookup testconfig "subrun" "runwait")) ;; we use runwait as the flag that a subrun is requested
-
-(define (subrun:initialize-toprun-test  testconfig test-run-dir)
-  (let ((ra (configf:lookup testconfig "subrun" "run-area"))
-        (logpro (configf:lookup testconfig "subrun" "logpro"))
-        (symlink-target (conc test-run-dir "/subrun-area"))
-        )
-    (if (not ra)      ;; when runarea is not set we default to *toppath*. However 
-	(let ((fallback-run-area (or *toppath* (conc test-run-dir "/subrun"))))
-	  ;; we need to force the setting in the testconfig so it will
-          ;; be preserved in the testconfig.subrun file
-	  (configf:set-section-var testconfig "subrun" "run-area" fallback-run-area)
-	  (set! ra fallback-run-area)))
-    (configf:set-section-var testconfig "logpro" "subrun" logpro) ;; append the logpro rules to the logpro section as stepname subrun
-    (if (common:file-exists? symlink-target)
-        (delete-file symlink-target))
-    (create-symbolic-link ra symlink-target)
-    (configf:write-alist testconfig "testconfig.subrun")))
-
-(define (subrun:set-state-status test-run-dir state status new-state-status)
-  (if (and (not (subrun:subrun-removed? test-run-dir)) (subrun:subrun-test-initialized? test-run-dir))
-      (let* ((action-switches-str
-              (conc "-set-state-status "new-state-status
-                    (if state (conc " -state "state) "")
-                    (if status (conc " -status "status) "")))
-             (log-prefix
-              (subrun:sanitize-path
-               (conc "set-state-status="new-state-status
-                     (if state (conc ":state="state) "")
-                     (if status (conc "+status="status) ""))))
-             (submt-result 
-              (subrun:exec-sub-megatest test-run-dir action-switches-str log-prefix)))
-        submt-result)))
-
-(define (subrun:remove-subrun test-run-dir keep-records )
-  (if (and (not (subrun:subrun-removed? test-run-dir)) (subrun:subrun-test-initialized? test-run-dir))
-      (let* ((action-switches-str
-              (conc "-remove-runs"
-                    (if keep-records "-keep-records " "")
-                    ))
-             (remove-result
-              (subrun:exec-sub-megatest test-run-dir action-switches-str "remove")))
-        (if remove-result
-            (begin
-              (subrun:set-subrun-removed test-run-dir)
-              #t)
-            #f))
-      #t))
-
-(define (subrun:kill-subrun test-run-dir )
-  (if (and (not (subrun:subrun-removed? test-run-dir)) (subrun:subrun-test-initialized? test-run-dir))
-      (let* ((action-switches-str
-              (conc "-kill-runs" ))
-             (kill-result
-              (subrun:exec-sub-megatest test-run-dir action-switches-str "kill")))
-        kill-result)
-      #t))
-
-(define (subrun:launch-cmd test-run-dir #!optional (sub-cmd "-run")) ;; BUG: "-run" should be changed to "-rerun-clean" but current doesn't work
-  (if (subrun:subrun-removed? test-run-dir)
-      (subrun:unset-subrun-removed test-run-dir))      
-
-  (let* ((log-prefix "run")
-         (switches (subrun:selector+log-switches test-run-dir log-prefix))
-         (run-wait #t)
-         (cmd      (conc "megatest " sub-cmd " " switches" "
-                         (if run-wait "-run-wait " ""))))
-    cmd))
-
-
-(define (subrun:sanitize-path inpath)
-  (let* ((insane-pattern (irregex "[^[a-zA-Z0-9_\\-]")))
-    (regex#string-substitute insane-pattern "_" inpath #t)))
-
-(define (subrun:get-runarea test-run-dir)
-  (if (subrun:subrun-test-initialized? test-run-dir)
-      (let* ((info-alist (subrun:selector+log-alist
-                          test-run-dir
-                          "foo"))
-             (run-area   (if (list? info-alist)
-                             (alist-ref "-start-dir" info-alist equal? #f)
-                             #f)))
-        run-area)
-      #f))
-
-(define (subrun:selector+log-alist test-run-dir log-prefix)
-  (let* ((switch-def-alist (common:get-param-mapping flavor: 'config))
-         (subrunfile   (conc test-run-dir "/testconfig.subrun" ))
-         (subrundata   (with-input-from-file subrunfile read))
-         (subrunconfig (configf:alist->config subrundata))
-         (run-area     (configf:lookup subrunconfig "subrun" "run-area"))
-         (defvals      `(("start-dir" . ,(or run-area  ;; default values if not specified in subrun section of tconf
-                                             (get-environment-variable "MT_RUN_AREA_HOME")
-                                             "/no/rundir/found")) 
-                         ("run-name"  . ,(or (get-environment-variable "MT_RUNNAME") "NO-RUNNAME"))
-                         ("target"    . ,(or (get-environment-variable "MT_TARGET")  "NO-TARGET"))))
-         (switch-alist-pre  (filter-map (lambda (item)
-                                          (let* ((config-key (car item))
-                                                 (switch     (cdr item))
-                                                 (defval     (alist-ref config-key defvals equal? #f))
-                                                 (val        (or (configf:lookup subrunconfig "subrun" config-key)
-                                                                 defval)))
-                                            (if val
-                                                (cons switch val)
-                                                #f)))
-                                        switch-def-alist))
-
-         ;; testpatt may be modified if all three of mode-patt, tag-expr, and testpatt are null
-         (mode-patt     (alist-ref "-modepatt" switch-alist-pre equal? #f))
-         (tag-expr      (alist-ref "-tagexpr" switch-alist-pre equal? #f))
-         (testpatt      (alist-ref "-testpatt" switch-alist-pre equal?
-                                   (if (not (or mode-patt tag-expr)) "%" #f))) ;; testpatt is % if not
-                                                                               ;; otherwise specified
-
-         ;; define compact-stem for logfile
-         (target        (alist-ref "-target" switch-alist-pre equal? #f)) ;; want data-structures alist-ref, not alist-lib alist-ref
-         (runname       (alist-ref "-runname" switch-alist-pre equal? #f))
-
-
-         (compact-stem  (subrun:sanitize-path
-                         (conc
-                          target
-                          "-"
-                          runname
-                          "-" (or testpatt mode-patt tag-expr "NO-TESTPATT"))))
-         (logfile       (conc
-                         test-run-dir "/"
-                         (if log-prefix
-                             (conc (subrun:sanitize-path log-prefix) "-")
-                             "")
-                         compact-stem
-                         ".log"))
-         ;; swap out testpatt with modified test-patt and add -log
-         (switch-alist  (cons
-                         (cons "-log" logfile)
-                         (map (lambda (item)
-                                (if (equal? (car item) "-testpatt")
-                                    (cons "-testpatt" testpatt)
-                                    item))
-                                switch-alist-pre))))
-    switch-alist))
-    ;; note - get precmd from subrun section
-    ;;   apply to submegatest commands
-
-(define (subrun:get-log-path test-run-dir log-prefix)
-  (let* ((alist (subrun:selector+log-alist test-run-dir log-prefix))
-         (res   (alist-ref "-log" alist equal? #f)))
-    res))
-
-(define (subrun:selector+log-switches test-run-dir log-prefix)
-  (let* ((switch-alist (subrun:selector+log-alist test-run-dir log-prefix))
-         (res
-          (string-intersperse
-           (apply
-            append
-            (map
-             (lambda (x)
-               (list (car x) (cdr x)))
-             switch-alist))
-           " ")))
-    res))
-
-(define (subrun:exec-sub-megatest test-run-dir action-switches-str log-prefix)
-  (let* ((selector-switches  (subrun:selector+log-switches test-run-dir log-prefix))
-         (cmd (conc "megatest " selector-switches " " action-switches-str ))
-         (pid #f)
-         (proc (lambda ()
-                 (debug:print-info 0 *default-log-port* "Running sub megatest command: "cmd)
-                 ;;(set! pid (process-run "/usr/bin/xterm" (list ))))))
-                 (set! pid (process-run "/bin/bash" (list "-c" cmd))))))
-    (call-with-environment-variables 
-     (list (cons "PATH" (conc (get-environment-variable "PATH") ":.")))
-     (lambda  ()
-       (common:without-vars proc "^MT_.*")))
-    (let processloop ((i 0))
-      (let-values (((pid-val exit-status exit-code)(process-wait pid #t)))
-        (if (eq? pid-val 0)
-            (begin
-              (thread-sleep! 2)
-              (processloop (+ i 1)))
-            (begin
-              (debug:print-info 0 *default-log-port* "sub megatest " action-switches-str " completed with exit code " exit-code)
-              (if (eq? 0 exit-code)
-                  (begin
-                    #t)
-                  (begin
-                    #f))))))))
-
-
-
-;; (subrun:exec-sub-megatest "/nfs/pdx/disks/icf_env_disk001/bjbarcla/gwa/issues/mtdev/165/megatest/ext-tests/tests/subrun-usecases/toparea/links/SYSTEM_val/RELEASE_val/go/toptest" "-foo" "foo")

ADDED   subrunmod.scm
Index: subrunmod.scm
==================================================================
--- /dev/null
+++ subrunmod.scm
@@ -0,0 +1,334 @@
+;;======================================================================
+;; Copyright 2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
+
+;;======================================================================
+
+(declare (unit subrunmod))
+(declare (uses debugprint))
+(declare (uses commonmod))
+(declare (uses configfmod))
+(declare (uses mtargs))
+(declare (uses mtver))
+(declare (uses csv-xml))
+(declare (uses keysmod))
+(declare (uses mtmod))
+(declare (uses rmtmod))
+(declare (uses testsmod))
+(declare (uses dbmod))
+
+(module subrunmod
+	*
+	
+(import scheme
+	(prefix sqlite3 sqlite3:)
+	chicken.base
+	chicken.condition
+	chicken.file
+	chicken.file.posix
+	chicken.format
+	chicken.io
+	chicken.pathname
+	chicken.port
+	chicken.pretty-print
+	chicken.process
+	chicken.process-context
+	chicken.process-context.posix
+	chicken.sort
+	chicken.string
+	chicken.time
+	chicken.time.posix
+	chicken.irregex
+
+	(prefix base64 base64:)
+	csv-xml
+	csv-abnf
+	directory-utils
+	matchable
+	regex
+	s11n
+	srfi-1
+	srfi-13
+	srfi-18
+	srfi-69
+	stack
+	typed-records
+	z3
+
+	(prefix mtargs args:)
+	commonmod
+	configfmod
+	debugprint
+;; 	keysmod
+	mtmod
+	mtver
+	rmtmod
+	testsmod
+	dbmod
+
+	)
+;;  strftime('%m/%d/%Y %H:%M:%S','now','localtime')
+
+;; (use (prefix sqlite3 sqlite3:) srfi-1 posix regex regex-case srfi-69 (srfi 18) 
+;;      posix-extras directory-utils pathname-expand typed-records format
+;;      call-with-environment-variables)
+;; (declare (unit subrun))
+;; ;;(declare (uses runs))
+;; (declare (uses db))
+;; (declare (uses common))
+;; ;;(declare (uses items))
+;; ;;(declare (uses runconfig))
+;; ;;(declare (uses tests))
+;; ;;(declare (uses server))
+;; (declare (uses mt))
+;; ;;(declare (uses archive))
+;; ;; (declare (uses filedb))
+;; 
+;; ;(include "common_records.scm")
+;; ;;(include "key_records.scm")
+;; (include "db_records.scm") ;; provides db:test-get-id
+;; ;;(include "run_records.scm")
+;; ;;(include "test_records.scm")
+
+(define (subrun:subrun-test-initialized? test-run-dir)
+  (if (and (common:file-exists? (conc test-run-dir "/subrun-area") )
+           (common:file-exists? (conc test-run-dir "/testconfig.subrun") ))
+      #t
+      #f))
+
+(define (subrun:launch-dashboard test-run-dir)
+  (if (subrun:subrun-test-initialized? test-run-dir)
+      (let* ((subarea (subrun:get-runarea test-run-dir)))
+        (if (and subarea (common:file-exists? subarea))
+            (system (conc "cd " subarea ";env -i PATH=$PATH DISPLAY=$DISPLAY HOME=$HOME USER=$USER dashboard &"))))))
+
+(define (subrun:subrun-removed? test-run-dir)
+  (if (subrun:subrun-test-initialized? test-run-dir)
+      (let ((flagfile (conc test-run-dir "/subrun.removed")))
+        (if (common:file-exists? flagfile)
+            #t
+            #f))
+      #t))
+
+(define (subrun:set-subrun-removed test-run-dir)
+  (let ((flagfile (conc test-run-dir "/subrun.removed")))
+    (if (and (subrun:subrun-test-initialized? test-run-dir) (not (common:file-exists? flagfile)))
+        (with-output-to-file flagfile
+          (lambda () (print (current-seconds)))))))
+
+(define (subrun:unset-subrun-removed test-run-dir)
+  (let ((flagfile (conc test-run-dir "/subrun.removed")))
+    (if (and (subrun:subrun-test-initialized? test-run-dir) (common:file-exists? flagfile))
+        (delete-file flagfile))))
+
+
+(define (subrun:testconfig-defines-subrun? testconfig)
+  (configf:lookup testconfig "subrun" "runwait")) ;; we use runwait as the flag that a subrun is requested
+
+(define (subrun:initialize-toprun-test  testconfig test-run-dir)
+  (let ((ra (configf:lookup testconfig "subrun" "run-area"))
+        (logpro (configf:lookup testconfig "subrun" "logpro"))
+        (symlink-target (conc test-run-dir "/subrun-area"))
+        )
+    (if (not ra)      ;; when runarea is not set we default to *toppath*. However 
+	(let ((fallback-run-area (or *toppath* (conc test-run-dir "/subrun"))))
+	  ;; we need to force the setting in the testconfig so it will
+          ;; be preserved in the testconfig.subrun file
+	  (configf:set-section-var testconfig "subrun" "run-area" fallback-run-area)
+	  (set! ra fallback-run-area)))
+    (configf:set-section-var testconfig "logpro" "subrun" logpro) ;; append the logpro rules to the logpro section as stepname subrun
+    (if (common:file-exists? symlink-target)
+        (delete-file symlink-target))
+    (create-symbolic-link ra symlink-target)
+    (configf:write-alist testconfig "testconfig.subrun")))
+
+(define (subrun:set-state-status test-run-dir state status new-state-status)
+  (if (and (not (subrun:subrun-removed? test-run-dir)) (subrun:subrun-test-initialized? test-run-dir))
+      (let* ((action-switches-str
+              (conc "-set-state-status "new-state-status
+                    (if state (conc " -state "state) "")
+                    (if status (conc " -status "status) "")))
+             (log-prefix
+              (subrun:sanitize-path
+               (conc "set-state-status="new-state-status
+                     (if state (conc ":state="state) "")
+                     (if status (conc "+status="status) ""))))
+             (submt-result 
+              (subrun:exec-sub-megatest test-run-dir action-switches-str log-prefix)))
+        submt-result)))
+
+(define (subrun:remove-subrun test-run-dir keep-records )
+  (if (and (not (subrun:subrun-removed? test-run-dir)) (subrun:subrun-test-initialized? test-run-dir))
+      (let* ((action-switches-str
+              (conc "-remove-runs"
+                    (if keep-records "-keep-records " "")
+                    ))
+             (remove-result
+              (subrun:exec-sub-megatest test-run-dir action-switches-str "remove")))
+        (if remove-result
+            (begin
+              (subrun:set-subrun-removed test-run-dir)
+              #t)
+            #f))
+      #t))
+
+(define (subrun:kill-subrun test-run-dir )
+  (if (and (not (subrun:subrun-removed? test-run-dir)) (subrun:subrun-test-initialized? test-run-dir))
+      (let* ((action-switches-str
+              (conc "-kill-runs" ))
+             (kill-result
+              (subrun:exec-sub-megatest test-run-dir action-switches-str "kill")))
+        kill-result)
+      #t))
+
+(define (subrun:launch-cmd test-run-dir #!optional (sub-cmd "-run")) ;; BUG: "-run" should be changed to "-rerun-clean" but current doesn't work
+  (if (subrun:subrun-removed? test-run-dir)
+      (subrun:unset-subrun-removed test-run-dir))      
+
+  (let* ((log-prefix "run")
+         (switches (subrun:selector+log-switches test-run-dir log-prefix))
+         (run-wait #t)
+         (cmd      (conc "megatest " sub-cmd " " switches" "
+                         (if run-wait "-run-wait " ""))))
+    cmd))
+
+
+(define (subrun:sanitize-path inpath)
+  (let* ((insane-pattern (irregex "[^[a-zA-Z0-9_\\-]")))
+    (regex#string-substitute insane-pattern "_" inpath #t)))
+
+(define (subrun:get-runarea test-run-dir)
+  (if (subrun:subrun-test-initialized? test-run-dir)
+      (let* ((info-alist (subrun:selector+log-alist
+                          test-run-dir
+                          "foo"))
+             (run-area   (if (list? info-alist)
+                             (alist-ref "-start-dir" info-alist equal? #f)
+                             #f)))
+        run-area)
+      #f))
+
+(define (subrun:selector+log-alist test-run-dir log-prefix)
+  (let* ((switch-def-alist (common:get-param-mapping flavor: 'config))
+         (subrunfile   (conc test-run-dir "/testconfig.subrun" ))
+         (subrundata   (with-input-from-file subrunfile read))
+         (subrunconfig (configf:alist->config subrundata))
+         (run-area     (configf:lookup subrunconfig "subrun" "run-area"))
+         (defvals      `(("start-dir" . ,(or run-area  ;; default values if not specified in subrun section of tconf
+                                             (get-environment-variable "MT_RUN_AREA_HOME")
+                                             "/no/rundir/found")) 
+                         ("run-name"  . ,(or (get-environment-variable "MT_RUNNAME") "NO-RUNNAME"))
+                         ("target"    . ,(or (get-environment-variable "MT_TARGET")  "NO-TARGET"))))
+         (switch-alist-pre  (filter-map (lambda (item)
+                                          (let* ((config-key (car item))
+                                                 (switch     (cdr item))
+                                                 (defval     (alist-ref config-key defvals equal? #f))
+                                                 (val        (or (configf:lookup subrunconfig "subrun" config-key)
+                                                                 defval)))
+                                            (if val
+                                                (cons switch val)
+                                                #f)))
+                                        switch-def-alist))
+
+         ;; testpatt may be modified if all three of mode-patt, tag-expr, and testpatt are null
+         (mode-patt     (alist-ref "-modepatt" switch-alist-pre equal? #f))
+         (tag-expr      (alist-ref "-tagexpr" switch-alist-pre equal? #f))
+         (testpatt      (alist-ref "-testpatt" switch-alist-pre equal?
+                                   (if (not (or mode-patt tag-expr)) "%" #f))) ;; testpatt is % if not
+                                                                               ;; otherwise specified
+
+         ;; define compact-stem for logfile
+         (target        (alist-ref "-target" switch-alist-pre equal? #f)) ;; want data-structures alist-ref, not alist-lib alist-ref
+         (runname       (alist-ref "-runname" switch-alist-pre equal? #f))
+
+
+         (compact-stem  (subrun:sanitize-path
+                         (conc
+                          target
+                          "-"
+                          runname
+                          "-" (or testpatt mode-patt tag-expr "NO-TESTPATT"))))
+         (logfile       (conc
+                         test-run-dir "/"
+                         (if log-prefix
+                             (conc (subrun:sanitize-path log-prefix) "-")
+                             "")
+                         compact-stem
+                         ".log"))
+         ;; swap out testpatt with modified test-patt and add -log
+         (switch-alist  (cons
+                         (cons "-log" logfile)
+                         (map (lambda (item)
+                                (if (equal? (car item) "-testpatt")
+                                    (cons "-testpatt" testpatt)
+                                    item))
+                                switch-alist-pre))))
+    switch-alist))
+    ;; note - get precmd from subrun section
+    ;;   apply to submegatest commands
+
+(define (subrun:get-log-path test-run-dir log-prefix)
+  (let* ((alist (subrun:selector+log-alist test-run-dir log-prefix))
+         (res   (alist-ref "-log" alist equal? #f)))
+    res))
+
+(define (subrun:selector+log-switches test-run-dir log-prefix)
+  (let* ((switch-alist (subrun:selector+log-alist test-run-dir log-prefix))
+         (res
+          (string-intersperse
+           (apply
+            append
+            (map
+             (lambda (x)
+               (list (car x) (cdr x)))
+             switch-alist))
+           " ")))
+    res))
+
+(define (subrun:exec-sub-megatest test-run-dir action-switches-str log-prefix)
+  (let* ((selector-switches  (subrun:selector+log-switches test-run-dir log-prefix))
+         (cmd (conc "megatest " selector-switches " " action-switches-str ))
+         (pid #f)
+         (proc (lambda ()
+                 (debug:print-info 0 *default-log-port* "Running sub megatest command: "cmd)
+                 ;;(set! pid (process-run "/usr/bin/xterm" (list ))))))
+                 (set! pid (process-run "/bin/bash" (list "-c" cmd))))))
+    (call-with-environment-variables 
+     (list (cons "PATH" (conc (get-environment-variable "PATH") ":.")))
+     (lambda  ()
+       (common:without-vars proc "^MT_.*")))
+    (let processloop ((i 0))
+      (let-values (((pid-val exit-status exit-code)(process-wait pid #t)))
+        (if (eq? pid-val 0)
+            (begin
+              (thread-sleep! 2)
+              (processloop (+ i 1)))
+            (begin
+              (debug:print-info 0 *default-log-port* "sub megatest " action-switches-str " completed with exit code " exit-code)
+              (if (eq? 0 exit-code)
+                  (begin
+                    #t)
+                  (begin
+                    #f))))))))
+
+
+
+;; (subrun:exec-sub-megatest "/nfs/pdx/disks/icf_env_disk001/bjbarcla/gwa/issues/mtdev/165/megatest/ext-tests/tests/subrun-usecases/toparea/links/SYSTEM_val/RELEASE_val/go/toptest" "-foo" "foo")
+
+
+
+)

DELETED tasks.scm
Index: tasks.scm
==================================================================
--- tasks.scm
+++ /dev/null
@@ -1,1100 +0,0 @@
-;; Copyright 2006-2012, Matthew Welland.
-;; 
-;; This file is part of Megatest.
-;; 
-;;     Megatest is free software: you can redistribute it and/or modify
-;;     it under the terms of the GNU General Public License as published by
-;;     the Free Software Foundation, either version 3 of the License, or
-;;     (at your option) any later version.
-;; 
-;;     Megatest is distributed in the hope that it will be useful,
-;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;     GNU General Public License for more details.
-;; 
-;;     You should have received a copy of the GNU General Public License
-;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
-;;
-
-;;  strftime('%m/%d/%Y %H:%M:%S','now','localtime')
-
-(use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking format)
-(import (prefix sqlite3 sqlite3:))
-
-(declare (unit tasks))
-(declare (uses db))
-(declare (uses rmt))
-(declare (uses common))
-(declare (uses pgdb))
-
-;; (import pgdb) ;; pgdb is a module
-
-(include "task_records.scm")
-(include "db_records.scm")
-
-;;======================================================================
-;; Tasks db
-;;======================================================================
-
-;; wait up to aprox n seconds for a journal to go away
-;;
-(define (tasks:wait-on-journal path n #!key (remove #f)(waiting-msg #f))
-  (if (not (string? path))
-      (debug:print-error 0 *default-log-port* "Called tasks:wait-on-journal with path=" path " (not a string)")
-      (let ((fullpath (conc path "-journal")))
-	(handle-exceptions
-	 exn
-	 (begin
-	   (print-call-chain (current-error-port))
-	   (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
-	   (debug:print 5 *default-log-port* " exn=" (condition->list exn))
-	   (debug:print 0 *default-log-port* "tasks:wait-on-journal failed. Continuing on, you can ignore this call-chain")
-	   #t) ;; if stuff goes wrong just allow it to move on
-	 (let loop ((journal-exists (common:file-exists? fullpath))
-		    (count          n)) ;; wait ten times ...
-	   (if journal-exists
-	       (begin
-		 (if (and waiting-msg
-			  (eq? (modulo n 30) 0))
-		     (debug:print 0 *default-log-port* waiting-msg))
-		 (if (> count 0)
-		     (begin
-		       (thread-sleep! 1)
-		       (loop (common:file-exists? fullpath)
-			     (- count 1)))
-		     (begin
-		       (debug:print 0 *default-log-port* "ERROR: removing the journal file " fullpath ", this is not good. Look for disk full, write access and other issues.")
-		       (if remove (system (conc "rm -rf " fullpath)))
-		       #f)))
-	       #t))))))
-
-(define (tasks:get-task-db-path)
-  (let ((dbdir  (or (configf:lookup *configdat* "setup" "monitordir")
-		    (configf:lookup *configdat* "setup" "dbdir")
-		    (conc (common:get-linktree) "/.db"))))
-    (handle-exceptions
-     exn
-     (begin
-       (debug:print-error 0 *default-log-port* "Couldn't create path to " dbdir ", exn=" exn)
-       (exit 1))
-     (if (not (directory? dbdir))(create-directory dbdir #t)))
-    dbdir))
-
-;; If file exists AND
-;;    file readable
-;;         ==> open it
-;; If file exists AND
-;;    file NOT readable
-;;         ==> open in-mem version
-;; If file NOT exists
-;;    ==> open in-mem version
-;;
-(define (tasks:open-db #!key (numretries 4))
-  (if *task-db*
-      *task-db*
-      (handle-exceptions
-       exn
-       (if (> numretries 0)
-	   (begin
-	     (print-call-chain (current-error-port))
-	     (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
-	     (debug:print 5 *default-log-port* " exn=" (condition->list exn))
-	     (thread-sleep! 1)
-	     (tasks:open-db numretries (- numretries 1)))
-	   (begin
-	     (print-call-chain (current-error-port))
-	     (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
-	     (debug:print 5 *default-log-port* " exn=" (condition->list exn))))
-       (let* ((dbpath        (db:dbfile-path )) ;; (tasks:get-task-db-path))
-	      (dbfile       (conc dbpath "/monitor.db"))
-	      (avail        (tasks:wait-on-journal dbpath 10)) ;; wait up to about 10 seconds for the journal to go away
-	      (exists       (common:file-exists? dbpath))
-	      (write-access (file-write-access? dbpath))
-	      (mdb          (cond ;; what the hek is *toppath* doing here?
-			     ((and (string? *toppath*)(file-write-access? *toppath*))
-			      (sqlite3:open-database dbfile))
-			     ((file-read-access? dbpath)    (sqlite3:open-database dbfile))
-			     (else (sqlite3:open-database ":memory:")))) ;; (never-give-up-open-db dbpath))
-	      (handler      (sqlite3:make-busy-timeout 36000)))
-	 (if (and exists
-		  (not write-access))
-	     (set! *db-write-access* write-access)) ;; only unset so other db's also can use this control
-	 (sqlite3:set-busy-handler! mdb handler)
-	 (db:set-sync mdb) ;; (sqlite3:execute mdb (conc "PRAGMA synchronous = 0;"))
-	 ;;  (if (or (and (not exists)
-	 ;; 	      (file-write-access? *toppath*))
-	 ;; 	 (not (file-read-access? dbpath)))
-	 ;;      (begin
-	 ;; 
-	 ;; TASKS QUEUE MOVED TO main.db
-	 ;;
-	 ;; (sqlite3:execute mdb "CREATE TABLE IF NOT EXISTS tasks_queue (id INTEGER PRIMARY KEY,
-         ;;                        action TEXT DEFAULT '',
-         ;;                        owner TEXT,
-         ;;                        state TEXT DEFAULT 'new',
-         ;;                        target TEXT DEFAULT '',
-         ;;                        name TEXT DEFAULT '',
-         ;;                        testpatt TEXT DEFAULT '',
-         ;;                        keylock TEXT,
-         ;;                        params TEXT,
-         ;;                        creation_time TIMESTAMP,
-         ;;                        execution_time TIMESTAMP);")
-	 (sqlite3:execute mdb "CREATE TABLE IF NOT EXISTS monitors (id INTEGER PRIMARY KEY,
-                                pid INTEGER,
-                                start_time TIMESTAMP,
-                                last_update TIMESTAMP,
-                                hostname TEXT,
-                                username TEXT,
-                               CONSTRAINT monitors_constraint UNIQUE (pid,hostname));")
-	 (sqlite3:execute mdb "CREATE TABLE IF NOT EXISTS servers (id INTEGER PRIMARY KEY,
-                                  pid INTEGER,
-                                  interface TEXT,
-                                  hostname TEXT,
-                                  port INTEGER,
-                                  pubport INTEGER,
-                                  start_time TIMESTAMP,
-                                  priority INTEGER,
-                                  state TEXT,
-                                  mt_version TEXT,
-                                  heartbeat TIMESTAMP,
-                                  transport TEXT,
-                                  run_id INTEGER);")
-	 ;;                               CONSTRAINT servers_constraint UNIQUE (pid,hostname,port));")
-	 (sqlite3:execute mdb "CREATE TABLE IF NOT EXISTS clients (id INTEGER PRIMARY KEY,
-                                  server_id INTEGER,
-                                  pid INTEGER,
-                                  hostname TEXT,
-                                  cmdline TEXT,
-                                  login_time TIMESTAMP,
-                                  logout_time TIMESTAMP DEFAULT -1,
-                                CONSTRAINT clients_constraint UNIQUE (pid,hostname));")
-	       
-	       ;))
-	 (set! *task-db* (cons mdb dbpath))
-	 *task-db*))))
-
-;;======================================================================
-;; Server and client management
-;;======================================================================
-
-;; make-vector-record tasks hostinfo id interface port pubport transport pid hostname
-(define (tasks:hostinfo-get-id          vec)    (vector-ref  vec 0))
-(define (tasks:hostinfo-get-interface   vec)    (vector-ref  vec 1))
-(define (tasks:hostinfo-get-port        vec)    (vector-ref  vec 2))
-(define (tasks:hostinfo-get-pubport     vec)    (vector-ref  vec 3))
-(define (tasks:hostinfo-get-transport   vec)    (vector-ref  vec 4))
-(define (tasks:hostinfo-get-pid         vec)    (vector-ref  vec 5))
-(define (tasks:hostinfo-get-hostname    vec)    (vector-ref  vec 6))
-
-(define (tasks:need-server run-id)
-  (equal? (configf:lookup *configdat* "server" "required") "yes"))
-
-;; no elegance here ...
-;;
-(define (tasks:kill-server hostname pid #!key (kill-switch ""))
-  (debug:print-info 0 *default-log-port* "Attempting to kill server process " pid " on host " hostname)
-  (setenv "TARGETHOST" hostname)
-  (let* ((logdir (if (directory-exists? "logs")
-                    "logs/"
-                    ""))
-         (logfile (if logdir (conc "logs/server-"pid"-"hostname".log") #f))
-         (gzfile  (if logfile (conc logfile ".gz"))))
-    (setenv "TARGETHOST_LOGF" (conc logdir "server-kills.log"))
-
-    (system (conc "nbfake kill "kill-switch" "pid))
-
-    (when logfile
-      (thread-sleep! 0.5)
-      (if (common:file-exists? gzfile) (delete-file gzfile))
-      (system (conc "gzip " logfile))
-      
-      (unsetenv "TARGETHOST_LOGF")
-      (unsetenv "TARGETHOST"))))
-    
- 
-;;======================================================================
-;; M O N I T O R S
-;;======================================================================
-
-(define (tasks:remove-monitor-record mdb)
-  (sqlite3:execute mdb "DELETE FROM monitors WHERE pid=? AND hostname=?;"
-		   (current-process-id)
-		   (get-host-name)))
-
-(define (tasks:get-monitors mdb)
-  (let ((res '()))
-    (sqlite3:for-each-row
-     (lambda (a . rem)
-       (set! res (cons (apply vector a rem) res)))
-     mdb
-     "SELECT id,pid,strftime('%m/%d/%Y %H:%M',datetime(start_time,'unixepoch'),'localtime'),strftime('%m/%d/%Y %H:%M:%S',datetime(last_update,'unixepoch'),'localtime'),hostname,username FROM monitors ORDER BY last_update ASC;")
-    (reverse res)
-    ))
-
-(define (tasks:monitors->text-table monitors)
-  (let ((fmtstr "~4a~8a~20a~20a~10a~10a"))
-    (conc (format #f fmtstr "id" "pid" "start time" "last update" "hostname" "user") "\n"
-	  (string-intersperse 
-	   (map (lambda (monitor)
-		  (format #f fmtstr
-			  (tasks:monitor-get-id          monitor)
-			  (tasks:monitor-get-pid         monitor)
-			  (tasks:monitor-get-start_time  monitor)
-			  (tasks:monitor-get-last_update monitor)
-			  (tasks:monitor-get-hostname    monitor)
-			  (tasks:monitor-get-username    monitor)))
-		monitors)
-	   "\n"))))
-   
-;; update the last_update field with the current time and
-;; if any monitors appear dead, remove them
-(define (tasks:monitors-update mdb)
-  (sqlite3:execute mdb "UPDATE monitors SET last_update=strftime('%s','now') WHERE pid=? AND hostname=?;"
-			  (current-process-id)
-			  (get-host-name))
-  (let ((deadlist '()))
-    (sqlite3:for-each-row
-     (lambda (id pid host last-update delta)
-       (print "Going to delete stale record for monitor with pid " pid " on host " host " last updated " delta " seconds ago")
-       (set! deadlist (cons id deadlist)))
-     mdb 
-     "SELECT id,pid,hostname,last_update,strftime('%s','now')-last_update AS delta FROM monitors WHERE delta > 700;")
-    (sqlite3:execute mdb (conc "DELETE FROM monitors WHERE id IN ('" (string-intersperse (map conc deadlist) "','") "');")))
-  )
-(define (tasks:register-monitor db port)
-  (let* ((pid (current-process-id))
-	 (hostname (get-host-name))
-	 (userinfo (user-information (current-user-id)))
-	 (username (car userinfo)))
-    (print "Register monitor, pid: " pid ", hostname: " hostname ", port: " port ", username: " username)
-    (sqlite3:execute db "INSERT INTO monitors (pid,start_time,last_update,hostname,username) VALUES (?,strftime('%s','now'),strftime('%s','now'),?,?);"
-		     pid hostname username)))
-
-(define (tasks:get-num-alive-monitors mdb)
-  (let ((res 0))
-    (sqlite3:for-each-row 
-     (lambda (count)
-       (set! res count))
-     mdb
-     "SELECT count(id) FROM monitors WHERE last_update < (strftime('%s','now') - 300) AND username=?;"
-     (car (user-information (current-user-id))))
-    res))
-
-;; 
-#;(define (tasks:start-monitor db mdb)
-  (if (> (tasks:get-num-alive-monitors mdb) 2) ;; have two running, no need for more
-      (debug:print-info 1 *default-log-port* "Not starting monitor, already have more than two running")
-      (let* ((megatestdb     (conc *toppath* "/megatest.db"))
-	     (monitordbf     (conc (db:dbfile-path #f) "/monitor.db"))
-	     (last-db-update 0)) ;; (file-modification-time megatestdb)))
-	(task:register-monitor mdb)
-	(let loop ((count      0)
-		   (next-touch 0)) ;; next-touch is the time where we need to update last_update
-	  ;; if the db has been modified we'd best look at the task queue
-	  (let ((modtime (file-modification-time megatestdbpath )))
-	    (if (> modtime last-db-update)
-		(tasks:process-queue db)) ;; BROKEN. mdb last-db-update megatestdb next-touch))
-	    ;; WARNING: Possible race conditon here!!
-	    ;; should this update be immediately after the task-get-action call above?
-	    (if (> (current-seconds) next-touch)
-		(begin
-		  (tasks:monitors-update mdb)
-		  (loop (+ count 1)(+ (current-seconds) 240)))
-		(loop (+ count 1) next-touch)))))))
-      
-;;======================================================================
-;; T A S K S   Q U E U E
-;;
-;;   NOTE:: These operate on task_queue which is in main.db
-;;
-;;======================================================================
-
-;; NOTE: It might be good to add one more layer of checking to ensure
-;;       that no task gets run in parallel.
-
-;; id INTEGER PRIMARY KEY,
-;; action TEXT DEFAULT '',
-;; owner TEXT,
-;; state TEXT DEFAULT 'new',
-;; target TEXT DEFAULT '',
-;; name TEXT DEFAULT '',
-;; testpatt TEXT DEFAULT '',
-;; keylock TEXT,
-;; params TEXT,
-;; creation_time TIMESTAMP DEFAULT (strftime('%s','now')),
-;; execution_time TIMESTAMP);
-
-
-;; register a task
-(define (tasks:add dbstruct action owner target runname testpatt params)
-  (db:with-db 
-   dbstruct #f #t
-   (lambda (db)
-     (sqlite3:execute db "INSERT INTO tasks_queue (action,owner,state,target,name,testpatt,params,creation_time,execution_time)
-                             VALUES (?,?,'new',?,?,?,?,strftime('%s','now'),0);" 
-		      action
-		      owner
-		      target
-		      runname
-		      testpatt
-		      (if params params "")))))
-
-(define (keys:key-vals-hash->target keys key-params)
-  (let ((tmp (hash-table-ref/default key-params (vector-ref (car keys) 0) "")))
-    (if (> (length keys) 1)
-	(for-each (lambda (key)
-		    (set! tmp (conc tmp "/" (hash-table-ref/default key-params (vector-ref key 0) ""))))
-		  (cdr keys)))
-    tmp))
-								
-;; for use from the gui, not ported
-;;
-;; (define (tasks:add-from-params mdb action keys key-params var-params)
-;;   (let ((target    (keys:key-vals-hash->target keys key-params))
-;; 	(owner     (car (user-information (current-user-id))))
-;; 	(runname   (hash-table-ref/default var-params "runname" #f))
-;; 	(testpatts (hash-table-ref/default var-params "testpatts" "%"))
-;; 	(params    (hash-table-ref/default var-params "params"    "")))
-;;     (tasks:add mdb action owner target runname testpatts params)))
-
-;; return one task from those who are 'new' OR 'waiting' AND more than 10sec old
-;;
-(define (tasks:snag-a-task dbstruct)
-  (let ((res    #f)
-	(keytxt (conc (current-process-id) "-" (get-host-name) "-" (car (user-information (current-user-id))))))
-    (db:with-db
-     dbstruct #f #t
-     (lambda (db)
-       ;; first randomly set a new to pid-hostname-hostname
-       (sqlite3:execute
-	db 
-	"UPDATE tasks_queue SET keylock=? WHERE id IN
-           (SELECT id FROM tasks_queue 
-              WHERE state='new' OR 
-                    (state='waiting' AND (strftime('%s','now')-execution_time) > 10) OR
-                    state='reset'
-              ORDER BY RANDOM() LIMIT 1);" keytxt)
-
-       (sqlite3:for-each-row
-	(lambda (id . rem)
-	  (set! res (apply vector id rem)))
-	db
-	"SELECT id,action,owner,state,target,name,test,item,params,creation_time,execution_time FROM tasks_queue WHERE keylock=? ORDER BY execution_time ASC LIMIT 1;" keytxt)
-       (if res ;; yep, have work to be done
-	   (begin
-	     (sqlite3:execute db "UPDATE tasks_queue SET state='inprogress',execution_time=strftime('%s','now') WHERE id=?;"
-			      (tasks:task-get-id res))
-	     res)
-	   #f)))))
-
-(define (tasks:reset-stuck-tasks dbstruct)
-  (let ((res '()))
-    (db:with-db
-     dbstruct #f #t
-     (lambda (db)
-       (sqlite3:for-each-row
-	(lambda (id delta)
-	  (set! res (cons id res)))
-	db
-	"SELECT id,strftime('%s','now')-execution_time AS delta FROM tasks_queue WHERE state='inprogress' AND delta>700 ORDER BY delta DESC LIMIT 2;")
-       (sqlite3:execute 
-	db 
-	(conc "UPDATE tasks_queue SET state='reset' WHERE id IN ('" (string-intersperse (map conc res) "','") "');")
-	)))))
-
-;; return all tasks in the tasks_queue table
-;;
-(define (tasks:get-tasks dbstruct types states)
-  (let ((res '()))
-    (db:with-db
-     dbstruct #f #f
-     (lambda (db)
-       (sqlite3:for-each-row
-	(lambda (id . rem)
-	  (set! res (cons (apply vector id rem) res)))
-	db
-	(conc "SELECT id,action,owner,state,target,name,test,item,params,creation_time,execution_time 
-                  FROM tasks_queue "
-	      ;; WHERE  
-	      ;;   state IN " statesstr " AND 
-	      ;;   action IN " actionsstr 
-	      " ORDER BY creation_time DESC;"))
-       res))))
-
-(define (tasks:get-last dbstruct target runname)
-  (let ((res #f))
-    (db:with-db
-     dbstruct #f #f
-     (lambda (db)
-       (sqlite3:for-each-row
-	(lambda (id . rem)
-	  (set! res (apply vector id rem)))
-	db
-	(conc "SELECT id,action,owner,state,target,name,testpatt,keylock,params,creation_time,execution_time 
-                  FROM tasks_queue 
- 	       WHERE  
-	        target = ? AND name =?
-	       ORDER BY creation_time DESC LIMIT 1;")
-	target runname)
-       res))))
-
-;; remove tasks given by a string of numbers comma separated
-(define (tasks:remove-queue-entries dbstruct task-ids)
-  (db:with-db
-   dbstruct #f #t
-   (lambda (db)
-     (sqlite3:execute db (conc "DELETE FROM tasks_queue WHERE id IN (" task-ids ");")))))
-
-#;(define (tasks:process-queue dbstruct)
-  (let* ((task   (tasks:snag-a-task dbstruct))
-	 (action (if task (tasks:task-get-action task) #f)))
-    (if action (print "tasks:process-queue task: " task))
-    (if action
-	(case (string->symbol action)
-	  ((run)       (tasks:start-run     dbstruct task))
-	  ((remove)    (tasks:remove-runs   dbstruct task))
-	  ((lock)      (tasks:lock-runs     dbstruct task))
-	  ;; ((monitor)   (tasks:start-monitor db task))
-	  #;((rollup)    (tasks:rollup-runs   dbstruct task))
-	  ((updatemeta)(tasks:update-meta   dbstruct task))
-	  #;((kill)      (tasks:kill-monitors dbstruct task))))))
-
-(define (tasks:tasks->text tasks)
-  (let ((fmtstr "~10a~10a~10a~12a~20a~12a~12a~10a"))
-    (conc (format #f fmtstr "id" "action" "owner" "state" "target" "runname" "testpatts" "params") "\n"
-	  (string-intersperse 
-	   (map (lambda (task)
-		  (format #f fmtstr
-			  (tasks:task-get-id     task)
-			  (tasks:task-get-action task)
-			  (tasks:task-get-owner  task)
-			  (tasks:task-get-state  task)
-			  (tasks:task-get-target task)
-			  (tasks:task-get-name   task)
-			  (tasks:task-get-testpatt task)
-			  ;; (tasks:task-get-item   task)
-			  (tasks:task-get-params task)))
-		tasks) "\n"))))
-   
-(define (tasks:set-state dbstruct task-id state)
-  (db:with-db 
-   dbstruct #f #t
-   (lambda (db)
-     (sqlite3:execute db "UPDATE tasks_queue SET state=? WHERE id=?;" 
-		      state 
-		      task-id))))
-
-;;======================================================================
-;; Access using task key (stored in params; (hash-table->alist flags) hostname pid
-;;======================================================================
-
-(define (tasks:param-key->id dbstruct task-params)
-  (db:with-db
-   dbstruct #f #f
-   (lambda (db)
-     (handle-exceptions
-      exn
-      #f
-      (sqlite3:first-result db "SELECT id FROM tasks_queue WHERE params LIKE ?;"
-			    task-params)))))
-
-(define (tasks:set-state-given-param-key dbstruct param-key new-state)
-  (db:with-db
-   dbstruct #f #t
-   (lambda (db)
-     (sqlite3:execute db "UPDATE tasks_queue SET state=? WHERE params LIKE ?;" new-state param-key))))
-
-(define (tasks:get-records-given-param-key dbstruct param-key state-patt action-patt test-patt)
-  (db:with-db
-   dbstruct #f #f
-   (lambda (db)
-     (handle-exceptions
-      exn
-      '()
-      (sqlite3:first-row db "SELECT id,action,owner,state,target,name,testpatt,keylock,params WHERE
-                               params LIKE ? AND state LIKE ? AND action LIKE ? AND testpatt LIKE ?;"
-			 param-key state-patt action-patt test-patt)))))
-
-(define (tasks:find-task-queue-records dbstruct target run-name test-patt state-patt action-patt)
-  ;; (handle-exceptions
-  ;;  exn
-  ;;  '()
-  ;;  (sqlite3:first-row
-  (let ((db (db:delay-if-busy (db:get-db dbstruct)))
-	(res '()))
-    (sqlite3:for-each-row 
-     (lambda (a . b)
-       (set! res (cons (cons a b) res)))
-     db "SELECT id,action,owner,state,target,name,testpatt,keylock,params FROM tasks_queue 
-           WHERE
-              target = ? AND name = ? AND state LIKE ? AND action LIKE ? AND testpatt LIKE ?;"
-     target run-name state-patt action-patt test-patt)
-    res)) ;; )
-
-;; kill any runner processes (i.e. processes handling -runtests) that match target/runname
-;; 
-;; do a remote call to get the task queue info but do the killing as self here.
-;;
-(define (tasks:kill-runner target run-name testpatt)
-  (let ((records    (rmt:tasks-find-task-queue-records target run-name testpatt "running" "run-tests"))
-	(hostpid-rx (regexp "\\s+(\\w+)\\s+(\\d+)$"))) ;; host pid is at end of param string
-    (if (null? records)
-	(debug:print 0 *default-log-port* "No run launching processes found for " target " / " run-name " with testpatt " (or testpatt "* no testpatt specified! *"))
-	(debug:print 0 *default-log-port* "Found " (length records) " run(s) to kill."))
-    (for-each 
-     (lambda (record)
-       (let* ((param-key (list-ref record 8))
-	      (match-dat (string-search hostpid-rx param-key)))
-	 (if match-dat
-	     (let ((hostname  (cadr match-dat))
-		   (pid       (string->number (caddr match-dat))))
-	       (debug:print 0 *default-log-port* "Sending SIGINT to process " pid " on host " hostname)
-	       (if (equal? (get-host-name) hostname)
-		   (if (process:alive? pid)
-		       (begin
-			 (handle-exceptions
-			  exn
-			  (begin
-			    (debug:print 0 *default-log-port* "Kill of process " pid " on host " hostname " failed.")
-			    (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
-			    #t)
-			  (process-signal pid signal/int)
-			  (thread-sleep! 5)
-			  (if (process:alive? pid)
-			      (process-signal pid signal/kill)))))
-		   ;;  (call-with-environment-variables
-		   (let ((old-targethost (getenv "TARGETHOST")))
-		     (setenv "TARGETHOST" hostname)
-		     (setenv "TARGETHOST_LOGF" "server-kills.log")
-		     (system (conc "nbfake kill " pid))
-		     (if old-targethost (setenv "TARGETHOST" old-targethost))
-		     (unsetenv "TARGETHOST")
-		     (unsetenv "TARGETHOST_LOGF"))))
-	     (debug:print-error 0 *default-log-port* "no record or improper record for " target "/" run-name " in tasks_queue in main.db"))))
-     records)))
-
-;; (define (tasks:start-run dbstruct mdb task)
-;;   (let ((flags (make-hash-table)))
-;;     (hash-table-set! flags "-rerun" "NOT_STARTED")
-;;     (if (not (string=? (tasks:task-get-params task) ""))
-;; 	(hash-table-set! flags "-setvars" (tasks:task-get-params task)))
-;;     (print "Starting run " task)
-;;     ;; sillyness, just call the damn routine with the task vector and be done with it. FIXME SOMEDAY
-;;     (runs:run-tests db
-;; 		    (tasks:task-get-target task)
-;; 		    (tasks:task-get-name   task)
-;; 		    (tasks:task-get-test   task)
-;; 		    (tasks:task-get-item   task)
-;; 		    (tasks:task-get-owner  task)
-;; 		    flags)
-;;     (tasks:set-state mdb (tasks:task-get-id task) "waiting")))
-;; 
-;; (define (tasks:rollup-runs db mdb task)
-;;   (let* ((flags (make-hash-table)) 
-;; 	 (keys  (db:get-keys db))
-;; 	 (keyvals (keys:target-keyval keys (tasks:task-get-target task))))
-;;     ;; (hash-table-set! flags "-rerun" "NOT_STARTED")
-;;     (print "Starting rollup " task)
-;;     ;; sillyness, just call the damn routine with the task vector and be done with it. FIXME SOMEDAY
-;;     (runs:rollup-run db
-;; 		     keys 
-;; 		     keyvals
-;; 		     (tasks:task-get-name  task)
-;; 		     (tasks:task-get-owner  task))
-;;     (tasks:set-state mdb (tasks:task-get-id task) "waiting")))
-
-;;======================================================================
-;;  S Y N C   T O   P O S T G R E S Q L
-;;======================================================================
-
-;; In the spirit of "dump your junk in the tasks module" I'll put the
-;; sync to postgres here for now.
-
-;; attempt to automatically set up an area. call only if get area by path
-;; returns naught of interest
-;;
-(define (tasks:set-area dbh configdat #!key (toppath #f)) ;; could I safely put *toppath* in for the default for toppath? when would it be evaluated?
-  (let loop ((area-name (or (configf:lookup configdat "setup" "area-name")
-			    (common:get-area-name)))
-	     (modifier  'none))
-    (let ((success (handle-exceptions
-		       exn
-		       (begin
-			 (debug:print 0 *default-log-port* "ERROR: cannot create area entry, " ((condition-property-accessor 'exn 'message) exn))
-			 #f) ;; FIXME: I don't care for now but I should look at *why* there was an exception
-		     (pgdb:add-area dbh area-name (or toppath *toppath*)))))
-      (or success
-	  (case modifier
-	    ((none)(loop (conc (current-user-name) "_" area-name) 'user))
-	    ((user)(loop (conc (substring (common:get-area-path-signature) 0 4)
-			       area-name) 'areasig))
-	    (else #f)))))) ;; give up
-
-(define (task:print-runtime run-times saperator)
-(for-each
-    (lambda (run-time-info)
-     (let* ((run-name  (vector-ref run-time-info 0))
-            (run-time  (vector-ref run-time-info 1))
-            (target  (vector-ref run-time-info 2)))
-        (print target saperator run-name saperator run-time )))
-   run-times))
-
-(define (task:print-runtime-as-json run-times)
- (let loop ((run-time-info (car run-times))
-            (rema (cdr run-times)) 
-            (str ""))
-     (let* ((run-name  (vector-ref run-time-info 0))
-            (run-time  (vector-ref run-time-info 1))
-            (target  (vector-ref run-time-info 2)))
-        ;(print (not (equal? str "")))
-        (if (not (equal? str "")) 
-            (set! str (conc str ",")))
-        (if (null? rema)
-		(print "[" str "{target:" target ",run-name:" run-name ", run-time:" run-time "}]")
-            (loop (car rema) (cdr rema) (conc str "{target:" target ", run-name:" run-name ", run-time:" run-time "}"))))))
-
-(define (task:get-run-times)
-   (let* ( 
-           (run-patt (if (args:get-arg "-run-patt")
-                        (args:get-arg "-run-patt")
-                        "%"))
-           (target-patt (if (args:get-arg "-target-patt")
-                        (args:get-arg "-target-patt")
-                        "%"))
- 
-           (run-times  (rmt:get-run-times  run-patt target-patt )))
-   (if (eq? (length run-times) 0)
-     (begin
-       (print "Data not found!!")
-       (exit)))
-   (if (equal? (args:get-arg "-dumpmode") "json")
-       (task:print-runtime-as-json run-times)
-         (if (equal? (args:get-arg "-dumpmode") "csv")
-	     (task:print-runtime run-times ",")
-	     (task:print-runtime run-times "  ")))))
-
-
-(define (task:print-testtime test-times saperator)
-(for-each
-    (lambda (test-time-info)
-     (let* ((test-name  (vector-ref test-time-info 0))
-            (test-time  (vector-ref test-time-info 2))
-            (test-item  (if (eq? (string-length (vector-ref test-time-info 1)) 0)
-                               "N/A"
-				(vector-ref test-time-info 1))))
-        (print  test-name saperator test-item saperator test-time )))
-   test-times))
-
-(define (task:print-testtime-as-json test-times)
- (let loop ((test-time-info (car test-times))
-            (rema (cdr test-times)) 
-            (str ""))
-     (let* ((test-name  (vector-ref test-time-info 0))
-            (test-time  (vector-ref test-time-info 2))
-            (item  (vector-ref test-time-info 1)))
-        ;(print (not (equal? str "")))
-        (if (not (equal? str "")) 
-            (set! str (conc str ",")))
-        (if (null? rema)
-		(print "[" str "{test-name:" test-name ", item-path:" item ", test-time:" test-time "}]")
-            (loop (car rema) (cdr rema) (conc str "{test-name:" test-name ", item-path:" item ", test-time:" test-time "}"))))))
-
-
- (define (task:get-test-times)
-   (let* ((runname (if (args:get-arg "-runname")
-                        (args:get-arg "-runname")
-                        #f))
-           (target (if (args:get-arg "-target")
-                        (args:get-arg "-target")
-                        #f))
- 
-           (test-times  (rmt:get-test-times  runname target )))
-   (if (not runname)
-      (begin
-      (print "Error: Missing argument -runname")
-      (exit))) 
-    (if (string-contains runname "%")
-      (begin
-      (print "Error: Invalid runname, '%' not allowed  (" runname ") ")
-      (exit)))
-    (if (not target)
-      (begin
-      (print "Error: Missing argument -target")
-      (exit)))
-     (if  (string-contains target "%")
-      (begin
-      (print "Error: Invalid target, '%' not allowed  (" target ") ")
-      (exit)))
- 
-   (if (eq? (length test-times) 0)
-     (begin
-       (print "Data not found!!")
-       (exit)))
-   (if (equal? (args:get-arg "-dumpmode") "json")
-       (task:print-testtime-as-json test-times)
-         (if (equal? (args:get-arg "-dumpmode") "csv")
-	     (task:print-testtime test-times ",")
-	     (task:print-testtime test-times "  ")))))
-
-
-
-;; gets mtpg-run-id and syncs the record if different
-;;
-(define (tasks:run-id->mtpg-run-id dbh cached-info run-id area-info smallest-last-update-time)
-  (let* ((runs-ht (hash-table-ref cached-info 'runs))
-	 (runinf  (hash-table-ref/default runs-ht run-id #f))
-         (area-id (vector-ref area-info 0)))
-       (if runinf
-	runinf ;; already cached
-	(let* ((run-dat    (rmt:get-run-info run-id))               ;; NOTE: get-run-info returns a vector < row header >
-	       (run-name   (rmt:get-run-name-from-id run-id))
-	       (row        (db:get-rows run-dat))                   ;; yes, this returns a single row
-	       (header     (db:get-header run-dat))
-	       (state      (db:get-value-by-header row header "state"))
-	       (status     (db:get-value-by-header row header "status"))
-	       (owner      (db:get-value-by-header row header "owner"))
-	       (event-time (db:get-value-by-header row header "event_time"))
-	       (comment    (db:get-value-by-header row header "comment"))
-	       (fail-count (db:get-value-by-header row header "fail_count"))
-	       (pass-count (db:get-value-by-header row header "pass_count"))
-               (db-contour (db:get-value-by-header row header "contour"))
-	       (contour    (if (args:get-arg "-prepend-contour") 
-                                 (if (and db-contour (not (equal? db-contour ""))  (string? db-contour )) 
-                                           (begin 
-                                            (debug:print-info 10 *default-log-port*  "db-contour" db-contour) 
- 						db-contour)
-					    (args:get-arg "-contour"))))
-               (run-tag (if (args:get-arg "-run-tag")
-                            (args:get-arg "-run-tag")
-									""))
-               (last-update (db:get-value-by-header row header "last_update"))
-	       (keytarg    (if (or (args:get-arg "-prepend-contour") (args:get-arg "-prefix-target"))
-	       			(conc "MT_CONTOUR/MT_AREA/" (string-intersperse (rmt:get-keys) "/")) (string-intersperse (rmt:get-keys) "/"))) ;; e.g. version/iteration/platform
-               (base-target      (rmt:get-target run-id))
-	       (target     (if (or (args:get-arg "-prepend-contour") (args:get-arg "-prefix-target")) 
-	       			(conc (or (args:get-arg "-prefix-target") (conc contour "/" (common:get-area-name) "/")) base-target) base-target))                 ;; e.g. v1.63/a3e1/ubuntu
-	       (spec-id    (pgdb:get-ttype dbh keytarg))
-	       (publish-time (if (args:get-arg "-cp-eventtime-to-publishtime")
-                            event-time
-                           (current-seconds))) 
-	       (new-run-id (if (and run-name base-target) (pgdb:get-run-id dbh spec-id target run-name area-id) #f)))
-         (if new-run-id
-	         (begin ;; let ((run-record (pgdb:get-run-info dbh new-run-id))
-		        (hash-table-set! runs-ht run-id new-run-id)
-		;; ensure key fields are up to date
-     ;; if last_update == pgdb_last_update do not update smallest-last-update-time  
-    (let* ((pgdb-last-update (pgdb:get-run-last-update dbh new-run-id))
-           (smallest-time (hash-table-ref/default smallest-last-update-time "smallest-time" #f)))
-     (if (and  (> last-update pgdb-last-update) (or (not smallest-time) (< last-update smallest-time)))
-        (hash-table-set! smallest-last-update-time "smallest-time" last-update)))
-		(pgdb:refresh-run-info
-		 dbh
-		 new-run-id
-		 state status owner event-time comment fail-count pass-count area-id last-update publish-time)
-     (debug:print-info 4 *default-log-port* "Working on run-id " run-id " pgdb-id "  new-run-id )
-     (if (not (equal? run-tag ""))
-      (task:add-run-tag dbh new-run-id run-tag))
-		new-run-id) 
-      
-	      (if (or (not state) (equal? state "deleted"))
-          (begin 
-          (debug:print-info 1 *default-log-port*  "Warning: Run with id " run-id " was created after previous sync and deleted before the sync") #f)
-          (if (handle-exceptions
-		        exn
-		        (begin (print-call-chain)
-              (print ((condition-property-accessor 'exn 'message) exn))     
-			      #f)
-            
-            (pgdb:insert-run
-		     dbh
-		     spec-id target run-name state status owner event-time comment fail-count pass-count  area-id last-update publish-time))
-		       (let* ((smallest-time (hash-table-ref/default smallest-last-update-time "smallest-time" #f)))
-             (if (or (not smallest-time) (< last-update smallest-time))
-        				(hash-table-set! smallest-last-update-time "smallest-time" last-update))
-             (tasks:run-id->mtpg-run-id dbh cached-info run-id area-info smallest-last-update-time))
-		  #f)))))))
-
-(define (task:add-run-tag dbh run-id tag) 
-  (let* ((tag-info (pgdb:get-tag-info-by-name dbh tag)))
-   (if (not tag-info)
-     (begin   
-     (if (handle-exceptions
-	   exn
-	   (begin 
-               (debug:print-info 1 *default-log-port*  ((condition-property-accessor 'exn 'message) exn))     
-	   #f)
-	   (pgdb:insert-tag  dbh   tag))
-                       (set! tag-info (pgdb:get-tag-info-by-name dbh tag))
-		  #f)))
-     ;;add to area_tags
-     (handle-exceptions
-	   exn
-	   (begin 
-               (debug:print-info 1 *default-log-port*  ((condition-property-accessor 'exn 'message) exn))     
-	   #f)
-           (if (not (pgdb:is-run-taged-with-a-tag dbh (vector-ref tag-info 0)  run-id))  
-	   (pgdb:insert-run-tag  dbh   (vector-ref tag-info 0)  run-id)))))
-
-
-(define (tasks:sync-test-steps dbh cached-info test-step-ids smallest-last-update-time)
- ; (print "Sync Steps " test-step-ids )
-  (let ((test-ht (hash-table-ref cached-info 'tests))
-        (step-ht (hash-table-ref cached-info 'steps)))
-    (for-each
-     (lambda (test-step-id)
-        (let* ((test-step-info  (rmt:get-steps-info-by-id test-step-id))
-               (step-id (tdb:step-get-id test-step-info))
-               (test-id  (tdb:step-get-test_id    test-step-info))   
-	       (stepname (tdb:step-get-stepname  test-step-info))
-	       (state (tdb:step-get-state test-step-info))	
-	       (status (tdb:step-get-status test-step-info))	
-	       (event_time (tdb:step-get-event_time  test-step-info))	
-	       (comment  (tdb:step-get-comment test-step-info))	
-	       (logfile (tdb:step-get-logfile test-step-info))	
-         (last-update (tdb:step-get-last_update test-step-info))
-	       (pgdb-test-id  (hash-table-ref/default test-ht test-id #f))
-				 (smallest-time (hash-table-ref/default smallest-last-update-time "smallest-time" #f))
-         (pgdb-step-id (if pgdb-test-id 
-                         (pgdb:get-test-step-id dbh pgdb-test-id stepname state)
-                          #f)))
-    (if step-id
-      (begin  
-        (if pgdb-test-id
-           (begin 
-                (if  pgdb-step-id
-                   (begin
-                    (debug:print-info 4 *default-log-port*  "Updating existing test-step with test-id: " test-id " and step-id " step-id " pgdb test id: " pgdb-test-id " pgdb step id " pgdb-step-id )
-										(let* ((pgdb-last-update (pgdb:get-test-step-last-update dbh pgdb-step-id)))
-         (if (and  (> last-update pgdb-last-update) (or (not smallest-time) (< last-update smallest-time)))
-        (hash-table-set! smallest-last-update-time "smallest-time" last-update))) 
-                    (pgdb:update-test-step dbh pgdb-step-id pgdb-test-id stepname state status event_time comment logfile last-update))
-                    (begin
- 		      (debug:print-info 4 *default-log-port*  "Inserting test-step with test-id: " test-id " and step-id " step-id  " pgdb test id: " pgdb-test-id)
-                     (if (or (not smallest-time) (< last-update smallest-time))
-        				      (hash-table-set! smallest-last-update-time "smallest-time" last-update))
-                      (pgdb:insert-test-step dbh pgdb-test-id stepname state status event_time comment logfile last-update )
-                      (set! pgdb-step-id  (pgdb:get-test-step-id dbh pgdb-test-id stepname state))))
-                (hash-table-set! step-ht step-id pgdb-step-id ))
-           (debug:print-info 1 *default-log-port*  "Error: Test not cashed")))
-      (debug:print-info 1 *default-log-port*  "Error: Could not get test step info for step id " test-step-id ))))	;; this is a wierd senario need to debug      	
-   test-step-ids)))
-
-(define (tasks:sync-test-gen-data dbh cached-info test-data-ids smallest-last-update-time)
-  (let ((test-ht (hash-table-ref cached-info 'tests))
-        (data-ht (hash-table-ref cached-info 'data)))
-    (for-each
-     (lambda (test-data-id)
-        (let* ((test-data-info  (rmt:get-data-info-by-id test-data-id))
-               (data-id (db:test-data-get-id  test-data-info))
-               (test-id  (db:test-data-get-test_id   test-data-info))   
-	       (category  (db:test-data-get-category  test-data-info))
-	       (variable  (db:test-data-get-variable test-data-info))	
-	       (value (db:test-data-get-value  test-data-info))	
-               (expected (db:test-data-get-expected  test-data-info))
-               (tol (db:test-data-get-tol  test-data-info))
-               (units (db:test-data-get-units  test-data-info))     
-	       (comment  (db:test-data-get-comment test-data-info))	
-               (status (db:test-data-get-status test-data-info))	
-	       (type (db:test-data-get-type test-data-info))
-				 (last-update (db:test-data-get-last_update test-data-info))
-				 (smallest-time (hash-table-ref/default smallest-last-update-time "smallest-time" #f))
-   	
-	       (pgdb-test-id  (hash-table-ref/default test-ht test-id #f))
-               (pgdb-data-id (if pgdb-test-id 
-                                 (pgdb:get-test-data-id dbh pgdb-test-id category variable)
-                                  #f)))
-    (if data-id
-      (begin
-        (if pgdb-test-id
-           (begin 
-                (if  pgdb-data-id
-                   (begin
-                    (debug:print-info 4 *default-log-port*  "Updating existing test-data with test-id: " test-id " and  data-id " data-id " pgdb test id: " pgdb-test-id " pgdb data id " pgdb-data-id)
-                    (let* ((pgdb-last-update (pgdb:get-test-data-last-update dbh pgdb-data-id)))
-         (if (and  (>  last-update pgdb-last-update) (or (not smallest-time) (< last-update smallest-time)))
-        (hash-table-set! smallest-last-update-time "smallest-time" last-update))) 
-                    (pgdb:update-test-data dbh pgdb-data-id pgdb-test-id  category variable value expected tol units comment status type last-update))
-                    (begin
- 		      (debug:print-info 4 *default-log-port*  "Inserting test-data with test-id: " test-id " and data-id " data-id " pgdb test id: " pgdb-test-id)
-                       (if (handle-exceptions
-		      exn
-		      (begin (print-call-chain)
-                              (print ((condition-property-accessor 'exn 'message) exn))     
-			#f)
-                     
-                    (pgdb:insert-test-data dbh pgdb-test-id category variable value expected tol units comment status type last-update))
-		       ;(tasks:run-id->mtpg-run-id dbh cached-info run-id area-info)
-                      (begin
-                      ;(pgdb:insert-test-data dbh pgdb-test-id category variable value expected tol units comment status type )
-											(if (or (not smallest-time) (< last-update smallest-time))
-        								(hash-table-set! smallest-last-update-time "smallest-time" last-update))
-                      (set! pgdb-data-id  (pgdb:get-test-data-id dbh pgdb-test-id  category variable)))
-		   #f)))
-                (hash-table-set! data-ht data-id pgdb-data-id ))
-             (begin
-                 (debug:print-info 1 *default-log-port*  "Error: Test not in pgdb"))))
-
-      (debug:print-info 1 *default-log-port*  "Error: Could not get test data info for data id " test-data-id ))))	;; this is a wierd senario need to debug      	
-   test-data-ids)))
-
-
-
-(define (tasks:sync-tests-data dbh cached-info test-ids area-info smallest-last-update-time)
-  (let ((test-ht (hash-table-ref cached-info 'tests)))
-    (for-each
-     (lambda (test-id)
-      ; (print test-id)
-       (let* ((test-info    (rmt:get-test-info-by-id #f test-id))
-	      (run-id       (db:test-get-run_id    test-info)) ;; look these up in db_records.scm
-	      (test-id      (db:test-get-id        test-info))
-	      (test-name    (db:test-get-testname  test-info))
-	      (item-path    (db:test-get-item-path test-info))
-	      (state        (db:test-get-state     test-info))
-	      (status       (db:test-get-status    test-info))
-	      (host         (db:test-get-host      test-info))
-        (pid          (db:test-get-process_id test-info)) 
-	      (cpuload      (db:test-get-cpuload   test-info))
-	      (diskfree     (db:test-get-diskfree  test-info))
-	      (uname        (db:test-get-uname     test-info))
-	      (run-dir      (db:test-get-rundir    test-info))
-	      (log-file     (db:test-get-final_logf test-info))
-	      (run-duration (db:test-get-run_duration test-info))
-	      (comment      (db:test-get-comment   test-info))
-	      (event-time   (db:test-get-event_time test-info))
-	      (archived     (db:test-get-archived  test-info))
-        (last-update  (db:test-get-last_update  test-info))
-	      (pgdb-run-id  (tasks:run-id->mtpg-run-id dbh cached-info run-id area-info smallest-last-update-time))
-        (smallest-time (hash-table-ref/default smallest-last-update-time "smallest-time" #f))       
-	      (pgdb-test-id (if pgdb-run-id 
-				(begin
-                                  ;(print pgdb-run-id)    
-                                 (pgdb:get-test-id dbh pgdb-run-id test-name item-path))
-                                 #f)))
-	 ;; "id"           "run_id"        "testname"  "state"      "status"      "event_time"
-	 ;; "host"         "cpuload"       "diskfree"  "uname"      "rundir"      "item_path"
-	 ;; "run_duration" "final_logf"    "comment"   "shortdir"   "attemptnum"  "archived"
-         (if (or (not item-path) (string-null? item-path))
-             (debug:print-info 0 *default-log-port* "Working on Run id : " run-id "and test name : " test-name)) 
-         (if pgdb-run-id
-           (begin
-	   (if pgdb-test-id ;; have a record
-	     (begin ;; let ((key-name (conc run-id "/" test-name "/" item-path)))
-	       (debug:print-info 4 *default-log-port*  "Updating existing test with run-id: " run-id " and test-id: " test-id " pgdb run id: " pgdb-run-id "  pgdb-test-id "  pgdb-test-id)
-         (let* ((pgdb-last-update (pgdb:get-test-last-update dbh pgdb-test-id)))
-         (if (and  (>  last-update pgdb-last-update) (or (not smallest-time) (< last-update smallest-time))) ;;if last-update is same as pgdb-last-update then it is safe to assume the records are identical and we can use a larger last update time.
-        (hash-table-set! smallest-last-update-time "smallest-time" last-update))) 
-	       (pgdb:update-test dbh pgdb-test-id pgdb-run-id test-name item-path state status host cpuload diskfree uname run-dir log-file run-duration comment event-time archived last-update pid))
-	     (begin 
-           (debug:print-info 4 *default-log-port*  "Inserting test with run-id: " run-id " and test-id: " test-id  " pgdb run id: " pgdb-run-id)
-           (pgdb:insert-test dbh pgdb-run-id test-name item-path state status host cpuload diskfree uname run-dir log-file run-duration comment event-time archived last-update pid)
-            (if (or (not smallest-time) (< last-update smallest-time))
-        				(hash-table-set! smallest-last-update-time "smallest-time" last-update))
-           (set! pgdb-test-id (pgdb:get-test-id dbh pgdb-run-id test-name item-path))))
-           (hash-table-set! test-ht test-id pgdb-test-id))
-           (debug:print-info 1 *default-log-port*  "WARNING: Skipping run with run-id:" run-id ". This run was created after privious sync and removed before this sync."))))
-     test-ids)))
-
-(define (task:add-area-tag dbh area-info tag) 
-  (let* ((tag-info (pgdb:get-tag-info-by-name dbh tag)))
-   (if (not tag-info)
-     (begin   
-     (if (handle-exceptions
-	   exn
-	   (begin 
-               (debug:print-info 1 *default-log-port*  ((condition-property-accessor 'exn 'message) exn))     
-	   #f)
-	   (pgdb:insert-tag  dbh   tag))
-                       (set! tag-info (pgdb:get-tag-info-by-name dbh tag))
-		  #f)))
-     ;;add to area_tags
-     (handle-exceptions
-	   exn
-	   (begin 
-               (debug:print-info 1 *default-log-port*  ((condition-property-accessor 'exn 'message) exn))     
-	   #f)
-           (if (not (pgdb:is-area-taged-with-a-tag dbh (vector-ref tag-info 0)  (vector-ref area-info 0)))  
-	   (pgdb:insert-area-tag  dbh   (vector-ref tag-info 0)  (vector-ref area-info 0))))))
-
-(define (tasks:sync-run-data dbh cached-info run-ids area-info smallest-last-update-time) 
-  (for-each
-     (lambda (run-id)
-      (debug:print-info 4 *default-log-port*   "Check if run with " run-id " needs to be synced" )
-       (tasks:run-id->mtpg-run-id dbh cached-info run-id area-info smallest-last-update-time))
-run-ids))
-
-
-;; get runs changed since last sync
-;; (define (tasks:sync-test-data dbh cached-info area-info)
-;;   (let* ((
-
-(define (tasks:sync-to-postgres configdat dest)
-  (print "In sync")
-  (let* ((dbh         (pgdb:open configdat dbname: dest))
-	 (area-info   (pgdb:get-area-by-path dbh *toppath*))
-	 (cached-info (make-hash-table))
-	 (start       (current-seconds))
-   (test-patt   (if (args:get-arg "-testpatt")
-											(args:get-arg "-testpatt")
-                      "%"))
-   (target         (if (args:get-arg "-target")
-														 (args:get-arg "-target")
-													#f))
-    (run-name         (if (args:get-arg "-runname")
-														 (args:get-arg "-runname")
-													#f)))
-     (if (and target  (not run-name))
-       (begin
-					(print "Error: Provide runname")
-          (exit 1)))
-     (if (and (not target)  run-name)
-       (begin
-					(print "Error: Provide target")
-          (exit 1)))
-    ;(print "123")
-    ;(exit 1) 
-    (for-each (lambda (dtype)
-		(hash-table-set! cached-info dtype (make-hash-table)))
-	      '(runs targets tests steps data))
-    (hash-table-set! cached-info 'start start) ;; when done we'll set sync times to this
-    (if area-info
-	(let* ((last-sync-time (vector-ref area-info 3))
-	       (smallest-last-update-time  (make-hash-table))
-         (changed      (if (and target run-name)
-                            (rmt:get-run-record-ids target run-name (rmt:get-keys) test-patt)
-                            (rmt:get-changed-record-ids last-sync-time)))
-	       (run-ids        (alist-ref 'runs       changed))
-	       (test-ids       (alist-ref 'tests      changed))
-	       (test-step-ids  (alist-ref 'test_steps changed))
-	       (test-data-ids  (alist-ref 'test_data  changed))
-	       (run-stat-ids   (alist-ref 'run_stats  changed))
-         (area-tag    (if (args:get-arg "-area-tag") 
-                                 (args:get-arg "-area-tag")
-                                 (if (args:get-arg "-area") 
-                                   (args:get-arg "-area") 
-                                   ""))))
-           (if (and (equal? area-tag "") (not (pgdb:is-area-taged dbh (vector-ref area-info 0))))
-            (set! area-tag *default-area-tag*)) 
-           (if (not (equal? area-tag "")) 
-             (task:add-area-tag dbh area-info area-tag)) 
-	  (if (or (not (null? test-ids)) (not (null? run-ids)))
-	      (begin
-                (debug:print-info 0 *default-log-port*  "syncing runs")   
-	              (tasks:sync-run-data dbh cached-info run-ids area-info smallest-last-update-time) 
-                (debug:print-info 0 *default-log-port*  "syncing tests")
-		            (tasks:sync-tests-data dbh cached-info test-ids area-info smallest-last-update-time)
-                (debug:print-info 0 *default-log-port*  "syncing test steps")
-                (tasks:sync-test-steps dbh cached-info test-step-ids smallest-last-update-time)
-								(debug:print-info 0 *default-log-port*  "syncing test data")
-                (tasks:sync-test-gen-data dbh cached-info test-data-ids smallest-last-update-time)
-                (print "----------done---------------")))
-     (let*  ((smallest-time (hash-table-ref/default smallest-last-update-time "smallest-time" (current-seconds))))
-     (debug:print-info 0 "smallest-time :" smallest-time  " last-sync-time " last-sync-time)
-    (if (not (and target run-name)) 
-	  (if (or (and smallest-time (> smallest-time last-sync-time)) (and smallest-time (eq? last-sync-time 0)))
-				(pgdb:write-sync-time dbh area-info smallest-time))))) ;;this needs to be changed
-	(if (tasks:set-area dbh configdat)
-	    (tasks:sync-to-postgres configdat dest)
-	    (begin
-	      (debug:print 0 *default-log-port* "ERROR: unable to create an area record")
-	      #f)))))
-

ADDED   tasksmod.scm
Index: tasksmod.scm
==================================================================
--- /dev/null
+++ tasksmod.scm
@@ -0,0 +1,727 @@
+;;======================================================================
+;; Copyright 2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
+
+;;======================================================================
+
+(declare (unit tasksmod))
+(declare (uses debugprint))
+(declare (uses commonmod))
+(declare (uses configfmod))
+(declare (uses mtargs))
+;; (declare (uses mtver))
+;; (declare (uses csv-xml))
+;; (declare (uses keysmod))
+;; (declare (uses mtmod))
+(declare (uses dbmod))
+(declare (uses pgdb))
+;; (declare (uses rmtmod))
+
+(module tasksmod
+	*
+	
+(import scheme
+	(prefix sqlite3 sqlite3:)
+	chicken.base
+	chicken.condition
+	chicken.file
+	chicken.file.posix
+	chicken.format
+	chicken.io
+	chicken.pathname
+	chicken.port
+	chicken.pretty-print
+	chicken.process
+	chicken.process-context
+	chicken.process-context.posix
+	chicken.sort
+	chicken.string
+	chicken.time
+	chicken.time.posix
+
+	(prefix base64 base64:)
+	;; csv-xml
+	directory-utils
+	matchable
+	regex
+	s11n
+	srfi-1
+	srfi-13
+	srfi-18
+	srfi-69
+	stack
+	system-information
+	typed-records
+	z3
+
+	(prefix mtargs args:)
+	commonmod
+	configfmod
+	debugprint
+	;; keysmod
+	;; mtmod
+	;; mtver
+	dbmod
+	pgdb
+	
+	)
+;;  strftime('%m/%d/%Y %H:%M:%S','now','localtime')
+
+;; (use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking format)
+;; (import (prefix sqlite3 sqlite3:))
+;; 
+;; (declare (unit tasks))
+;; (declare (uses db))
+;; (declare (uses rmt))
+;; (declare (uses common))
+;; (declare (uses pgdb))
+
+;; (import pgdb) ;; pgdb is a module
+
+(include "task_records.scm")
+;; (include "db_records.scm")
+
+;;======================================================================
+;; Tasks db
+;;======================================================================
+
+;; wait up to aprox n seconds for a journal to go away
+;;
+(define (tasks:wait-on-journal path n #!key (remove #f)(waiting-msg #f))
+  (if (not (string? path))
+      (debug:print-error 0 *default-log-port* "Called tasks:wait-on-journal with path=" path " (not a string)")
+      (let ((fullpath (conc path "-journal")))
+	(handle-exceptions
+	 exn
+	 (begin
+	   (print-call-chain (current-error-port))
+	   (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
+	   (debug:print 5 *default-log-port* " exn=" (condition->list exn))
+	   (debug:print 0 *default-log-port* "tasks:wait-on-journal failed. Continuing on, you can ignore this call-chain")
+	   #t) ;; if stuff goes wrong just allow it to move on
+	 (let loop ((journal-exists (common:file-exists? fullpath))
+		    (count          n)) ;; wait ten times ...
+	   (if journal-exists
+	       (begin
+		 (if (and waiting-msg
+			  (eq? (modulo n 30) 0))
+		     (debug:print 0 *default-log-port* waiting-msg))
+		 (if (> count 0)
+		     (begin
+		       (thread-sleep! 1)
+		       (loop (common:file-exists? fullpath)
+			     (- count 1)))
+		     (begin
+		       (debug:print 0 *default-log-port* "ERROR: removing the journal file " fullpath ", this is not good. Look for disk full, write access and other issues.")
+		       (if remove (system (conc "rm -rf " fullpath)))
+		       #f)))
+	       #t))))))
+
+(define (tasks:get-task-db-path)
+  (let ((dbdir  (or (configf:lookup *configdat* "setup" "monitordir")
+		    (configf:lookup *configdat* "setup" "dbdir")
+		    (conc (common:get-linktree) "/.db"))))
+    (handle-exceptions
+     exn
+     (begin
+       (debug:print-error 0 *default-log-port* "Couldn't create path to " dbdir ", exn=" exn)
+       (exit 1))
+     (if (not (directory? dbdir))(create-directory dbdir #t)))
+    dbdir))
+
+;; If file exists AND
+;;    file readable
+;;         ==> open it
+;; If file exists AND
+;;    file NOT readable
+;;         ==> open in-mem version
+;; If file NOT exists
+;;    ==> open in-mem version
+;;
+(define (tasks:open-db #!key (numretries 4))
+  (if (bdat-task-db *bdat*)
+      (bdat-task-db *bdat*)
+      (handle-exceptions
+       exn
+       (if (> numretries 0)
+	   (begin
+	     (print-call-chain (current-error-port))
+	     (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
+	     (debug:print 5 *default-log-port* " exn=" (condition->list exn))
+	     (thread-sleep! 1)
+	     (tasks:open-db numretries (- numretries 1)))
+	   (begin
+	     (print-call-chain (current-error-port))
+	     (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
+	     (debug:print 5 *default-log-port* " exn=" (condition->list exn))))
+       (let* ((dbpath        (common:get-db-tmp-area )) ;; (tasks:get-task-db-path))
+	      (dbfile       (conc dbpath "/monitor.db"))
+	      (avail        (tasks:wait-on-journal dbpath 10)) ;; wait up to about 10 seconds for the journal to go away
+	      (exists       (common:file-exists? dbpath))
+	      (write-access (file-writable? dbpath))
+	      (mdb          (cond ;; what the hek is *toppath* doing here?
+			     ((and (string? *toppath*)(file-writable? *toppath*))
+			      (sqlite3:open-database dbfile))
+			     ((file-readable? dbpath)    (sqlite3:open-database dbfile))
+			     (else (sqlite3:open-database ":memory:")))) ;; (never-give-up-open-db dbpath))
+	      (handler      (sqlite3:make-busy-timeout 36000)))
+	 (if (and exists
+		  (not write-access))
+	     (set! *db-write-access* write-access)) ;; only unset so other db's also can use this control
+	 (sqlite3:set-busy-handler! mdb handler)
+	 (db:set-sync mdb) ;; (sqlite3:execute mdb (conc "PRAGMA synchronous = 0;"))
+	 ;;  (if (or (and (not exists)
+	 ;; 	      (file-writable? *toppath*))
+	 ;; 	 (not (file-readable? dbpath)))
+	 ;;      (begin
+	 ;; 
+	 ;; TASKS QUEUE MOVED TO main.db
+	 ;;
+	 ;; (sqlite3:execute mdb "CREATE TABLE IF NOT EXISTS tasks_queue (id INTEGER PRIMARY KEY,
+         ;;                        action TEXT DEFAULT '',
+         ;;                        owner TEXT,
+         ;;                        state TEXT DEFAULT 'new',
+         ;;                        target TEXT DEFAULT '',
+         ;;                        name TEXT DEFAULT '',
+         ;;                        testpatt TEXT DEFAULT '',
+         ;;                        keylock TEXT,
+         ;;                        params TEXT,
+         ;;                        creation_time TIMESTAMP,
+         ;;                        execution_time TIMESTAMP);")
+	 (sqlite3:execute mdb "CREATE TABLE IF NOT EXISTS monitors (id INTEGER PRIMARY KEY,
+                                pid INTEGER,
+                                start_time TIMESTAMP,
+                                last_update TIMESTAMP,
+                                hostname TEXT,
+                                username TEXT,
+                               CONSTRAINT monitors_constraint UNIQUE (pid,hostname));")
+	 (sqlite3:execute mdb "CREATE TABLE IF NOT EXISTS servers (id INTEGER PRIMARY KEY,
+                                  pid INTEGER,
+                                  interface TEXT,
+                                  hostname TEXT,
+                                  port INTEGER,
+                                  pubport INTEGER,
+                                  start_time TIMESTAMP,
+                                  priority INTEGER,
+                                  state TEXT,
+                                  mt_version TEXT,
+                                  heartbeat TIMESTAMP,
+                                  transport TEXT,
+                                  run_id INTEGER);")
+	 ;;                               CONSTRAINT servers_constraint UNIQUE (pid,hostname,port));")
+	 (sqlite3:execute mdb "CREATE TABLE IF NOT EXISTS clients (id INTEGER PRIMARY KEY,
+                                  server_id INTEGER,
+                                  pid INTEGER,
+                                  hostname TEXT,
+                                  cmdline TEXT,
+                                  login_time TIMESTAMP,
+                                  logout_time TIMESTAMP DEFAULT -1,
+                                CONSTRAINT clients_constraint UNIQUE (pid,hostname));")
+	       
+	       ;))
+	 (bdat-task-db-set! *bdat* (cons mdb dbpath))
+	 (bdat-task-db *bdat*)))))
+
+;;======================================================================
+;; Server and client management
+;;======================================================================
+
+;; make-vector-record tasks hostinfo id interface port pubport transport pid hostname
+(define (tasks:hostinfo-get-id          vec)    (vector-ref  vec 0))
+(define (tasks:hostinfo-get-interface   vec)    (vector-ref  vec 1))
+(define (tasks:hostinfo-get-port        vec)    (vector-ref  vec 2))
+(define (tasks:hostinfo-get-pubport     vec)    (vector-ref  vec 3))
+(define (tasks:hostinfo-get-transport   vec)    (vector-ref  vec 4))
+(define (tasks:hostinfo-get-pid         vec)    (vector-ref  vec 5))
+(define (tasks:hostinfo-get-hostname    vec)    (vector-ref  vec 6))
+
+(define (tasks:need-server run-id)
+  (equal? (configf:lookup *configdat* "server" "required") "yes"))
+
+ 
+;;======================================================================
+;; M O N I T O R S
+;;======================================================================
+
+(define (tasks:remove-monitor-record mdb)
+  (sqlite3:execute mdb "DELETE FROM monitors WHERE pid=? AND hostname=?;"
+		   (current-process-id)
+		   (get-host-name)))
+
+(define (tasks:get-monitors mdb)
+  (let ((res '()))
+    (sqlite3:for-each-row
+     (lambda (a . rem)
+       (set! res (cons (apply vector a rem) res)))
+     mdb
+     "SELECT id,pid,strftime('%m/%d/%Y %H:%M',datetime(start_time,'unixepoch'),'localtime'),strftime('%m/%d/%Y %H:%M:%S',datetime(last_update,'unixepoch'),'localtime'),hostname,username FROM monitors ORDER BY last_update ASC;")
+    (reverse res)
+    ))
+
+(define (tasks:monitors->text-table monitors)
+  (let ((fmtstr "~4a~8a~20a~20a~10a~10a"))
+    (conc (format #f fmtstr "id" "pid" "start time" "last update" "hostname" "user") "\n"
+	  (string-intersperse 
+	   (map (lambda (monitor)
+		  (format #f fmtstr
+			  (tasks:monitor-get-id          monitor)
+			  (tasks:monitor-get-pid         monitor)
+			  (tasks:monitor-get-start_time  monitor)
+			  (tasks:monitor-get-last_update monitor)
+			  (tasks:monitor-get-hostname    monitor)
+			  (tasks:monitor-get-username    monitor)))
+		monitors)
+	   "\n"))))
+   
+;; update the last_update field with the current time and
+;; if any monitors appear dead, remove them
+(define (tasks:monitors-update mdb)
+  (sqlite3:execute mdb "UPDATE monitors SET last_update=strftime('%s','now') WHERE pid=? AND hostname=?;"
+			  (current-process-id)
+			  (get-host-name))
+  (let ((deadlist '()))
+    (sqlite3:for-each-row
+     (lambda (id pid host last-update delta)
+       (print "Going to delete stale record for monitor with pid " pid " on host " host " last updated " delta " seconds ago")
+       (set! deadlist (cons id deadlist)))
+     mdb 
+     "SELECT id,pid,hostname,last_update,strftime('%s','now')-last_update AS delta FROM monitors WHERE delta > 700;")
+    (sqlite3:execute mdb (conc "DELETE FROM monitors WHERE id IN ('" (string-intersperse (map conc deadlist) "','") "');")))
+  )
+(define (tasks:register-monitor db port)
+  (let* ((pid (current-process-id))
+	 (hostname (get-host-name))
+	 (userinfo (user-information (current-user-id)))
+	 (username (car userinfo)))
+    (print "Register monitor, pid: " pid ", hostname: " hostname ", port: " port ", username: " username)
+    (sqlite3:execute db "INSERT INTO monitors (pid,start_time,last_update,hostname,username) VALUES (?,strftime('%s','now'),strftime('%s','now'),?,?);"
+		     pid hostname username)))
+
+(define (tasks:get-num-alive-monitors mdb)
+  (let ((res 0))
+    (sqlite3:for-each-row 
+     (lambda (count)
+       (set! res count))
+     mdb
+     "SELECT count(id) FROM monitors WHERE last_update < (strftime('%s','now') - 300) AND username=?;"
+     (car (user-information (current-user-id))))
+    res))
+
+;; 
+#;(define (tasks:start-monitor db mdb)
+  (if (> (tasks:get-num-alive-monitors mdb) 2) ;; have two running, no need for more
+      (debug:print-info 1 *default-log-port* "Not starting monitor, already have more than two running")
+      (let* ((megatestdb     (conc *toppath* "/megatest.db"))
+	     (monitordbf     (conc (common:get-db-tmp-area) "/monitor.db"))
+	     (last-db-update 0)) ;; (file-modification-time megatestdb)))
+	(task:register-monitor mdb)
+	(let loop ((count      0)
+		   (next-touch 0)) ;; next-touch is the time where we need to update last_update
+	  ;; if the db has been modified we'd best look at the task queue
+	  (let ((modtime (file-modification-time megatestdbpath )))
+	    (if (> modtime last-db-update)
+		(tasks:process-queue db)) ;; BROKEN. mdb last-db-update megatestdb next-touch))
+	    ;; WARNING: Possible race conditon here!!
+	    ;; should this update be immediately after the task-get-action call above?
+	    (if (> (current-seconds) next-touch)
+		(begin
+		  (tasks:monitors-update mdb)
+		  (loop (+ count 1)(+ (current-seconds) 240)))
+		(loop (+ count 1) next-touch)))))))
+      
+;;======================================================================
+;; T A S K S   Q U E U E
+;;
+;;   NOTE:: These operate on task_queue which is in main.db
+;;
+;;======================================================================
+
+;; NOTE: It might be good to add one more layer of checking to ensure
+;;       that no task gets run in parallel.
+
+;; id INTEGER PRIMARY KEY,
+;; action TEXT DEFAULT '',
+;; owner TEXT,
+;; state TEXT DEFAULT 'new',
+;; target TEXT DEFAULT '',
+;; name TEXT DEFAULT '',
+;; testpatt TEXT DEFAULT '',
+;; keylock TEXT,
+;; params TEXT,
+;; creation_time TIMESTAMP DEFAULT (strftime('%s','now')),
+;; execution_time TIMESTAMP);
+
+
+;; register a task
+(define (tasks:add dbstruct action owner target runname testpatt params)
+  (db:with-db 
+   dbstruct #f #t
+   (lambda (db)
+     (sqlite3:execute db "INSERT INTO tasks_queue (action,owner,state,target,name,testpatt,params,creation_time,execution_time)
+                             VALUES (?,?,'new',?,?,?,?,strftime('%s','now'),0);" 
+		      action
+		      owner
+		      target
+		      runname
+		      testpatt
+		      (if params params "")))))
+
+(define (keys:key-vals-hash->target keys key-params)
+  (let ((tmp (hash-table-ref/default key-params (vector-ref (car keys) 0) "")))
+    (if (> (length keys) 1)
+	(for-each (lambda (key)
+		    (set! tmp (conc tmp "/" (hash-table-ref/default key-params (vector-ref key 0) ""))))
+		  (cdr keys)))
+    tmp))
+								
+;; for use from the gui, not ported
+;;
+;; (define (tasks:add-from-params mdb action keys key-params var-params)
+;;   (let ((target    (keys:key-vals-hash->target keys key-params))
+;; 	(owner     (car (user-information (current-user-id))))
+;; 	(runname   (hash-table-ref/default var-params "runname" #f))
+;; 	(testpatts (hash-table-ref/default var-params "testpatts" "%"))
+;; 	(params    (hash-table-ref/default var-params "params"    "")))
+;;     (tasks:add mdb action owner target runname testpatts params)))
+
+;; return one task from those who are 'new' OR 'waiting' AND more than 10sec old
+;;
+(define (tasks:snag-a-task dbstruct)
+  (let ((res    #f)
+	(keytxt (conc (current-process-id) "-" (get-host-name) "-" (car (user-information (current-user-id))))))
+    (db:with-db
+     dbstruct #f #t
+     (lambda (db)
+       ;; first randomly set a new to pid-hostname-hostname
+       (sqlite3:execute
+	db 
+	"UPDATE tasks_queue SET keylock=? WHERE id IN
+           (SELECT id FROM tasks_queue 
+              WHERE state='new' OR 
+                    (state='waiting' AND (strftime('%s','now')-execution_time) > 10) OR
+                    state='reset'
+              ORDER BY RANDOM() LIMIT 1);" keytxt)
+
+       (sqlite3:for-each-row
+	(lambda (id . rem)
+	  (set! res (apply vector id rem)))
+	db
+	"SELECT id,action,owner,state,target,name,test,item,params,creation_time,execution_time FROM tasks_queue WHERE keylock=? ORDER BY execution_time ASC LIMIT 1;" keytxt)
+       (if res ;; yep, have work to be done
+	   (begin
+	     (sqlite3:execute db "UPDATE tasks_queue SET state='inprogress',execution_time=strftime('%s','now') WHERE id=?;"
+			      (tasks:task-get-id res))
+	     res)
+	   #f)))))
+
+(define (tasks:reset-stuck-tasks dbstruct)
+  (let ((res '()))
+    (db:with-db
+     dbstruct #f #t
+     (lambda (db)
+       (sqlite3:for-each-row
+	(lambda (id delta)
+	  (set! res (cons id res)))
+	db
+	"SELECT id,strftime('%s','now')-execution_time AS delta FROM tasks_queue WHERE state='inprogress' AND delta>700 ORDER BY delta DESC LIMIT 2;")
+       (sqlite3:execute 
+	db 
+	(conc "UPDATE tasks_queue SET state='reset' WHERE id IN ('" (string-intersperse (map conc res) "','") "');")
+	)))))
+
+;; return all tasks in the tasks_queue table
+;;
+(define (tasks:get-tasks dbstruct types states)
+  (let ((res '()))
+    (db:with-db
+     dbstruct #f #f
+     (lambda (db)
+       (sqlite3:for-each-row
+	(lambda (id . rem)
+	  (set! res (cons (apply vector id rem) res)))
+	db
+	(conc "SELECT id,action,owner,state,target,name,test,item,params,creation_time,execution_time 
+                  FROM tasks_queue "
+	      ;; WHERE  
+	      ;;   state IN " statesstr " AND 
+	      ;;   action IN " actionsstr 
+	      " ORDER BY creation_time DESC;"))
+       res))))
+
+(define (tasks:get-last dbstruct target runname)
+  (let ((res #f))
+    (db:with-db
+     dbstruct #f #f
+     (lambda (db)
+       (sqlite3:for-each-row
+	(lambda (id . rem)
+	  (set! res (apply vector id rem)))
+	db
+	(conc "SELECT id,action,owner,state,target,name,testpatt,keylock,params,creation_time,execution_time 
+                  FROM tasks_queue 
+ 	       WHERE  
+	        target = ? AND name =?
+	       ORDER BY creation_time DESC LIMIT 1;")
+	target runname)
+       res))))
+
+;; remove tasks given by a string of numbers comma separated
+(define (tasks:remove-queue-entries dbstruct task-ids)
+  (db:with-db
+   dbstruct #f #t
+   (lambda (db)
+     (sqlite3:execute db (conc "DELETE FROM tasks_queue WHERE id IN (" task-ids ");")))))
+
+(define (tasks:process-queue dbstruct)
+  (let* ((task   (tasks:snag-a-task dbstruct))
+	 (action (if task (tasks:task-get-action task) #f)))
+    (if action (print "tasks:process-queue task: " task))
+    (if action
+	(case (string->symbol action)
+	  ;; ((run)       (tasks:start-run     dbstruct task))
+	  ;; ((remove)    (tasks:remove-runs   dbstruct task))
+	  ;; ((lock)      (tasks:lock-runs     dbstruct task))
+	  ;; ((monitor)   (tasks:start-monitor db task))
+	  #;((rollup)    (tasks:rollup-runs   dbstruct task))
+	  #;((updatemeta)(tasks:update-meta   dbstruct task))
+	  #;((kill)      (tasks:kill-monitors dbstruct task))
+	  (else (debug:print 0 *default-log-port* "tasks:process-queue called "action" but it is not implemented."))))))
+
+(define (tasks:tasks->text tasks)
+  (let ((fmtstr "~10a~10a~10a~12a~20a~12a~12a~10a"))
+    (conc (format #f fmtstr "id" "action" "owner" "state" "target" "runname" "testpatts" "params") "\n"
+	  (string-intersperse 
+	   (map (lambda (task)
+		  (format #f fmtstr
+			  (tasks:task-get-id     task)
+			  (tasks:task-get-action task)
+			  (tasks:task-get-owner  task)
+			  (tasks:task-get-state  task)
+			  (tasks:task-get-target task)
+			  (tasks:task-get-name   task)
+			  (tasks:task-get-testpatt task)
+			  ;; (tasks:task-get-item   task)
+			  (tasks:task-get-params task)))
+		tasks) "\n"))))
+   
+(define (tasks:set-state dbstruct task-id state)
+  (db:with-db 
+   dbstruct #f #t
+   (lambda (db)
+     (sqlite3:execute db "UPDATE tasks_queue SET state=? WHERE id=?;" 
+		      state 
+		      task-id))))
+
+;;======================================================================
+;; Access using task key (stored in params; (hash-table->alist flags) hostname pid
+;;======================================================================
+
+(define (tasks:param-key->id dbstruct task-params)
+  (db:with-db
+   dbstruct #f #f
+   (lambda (db)
+     (handle-exceptions
+      exn
+      #f
+      (sqlite3:first-result db "SELECT id FROM tasks_queue WHERE params LIKE ?;"
+			    task-params)))))
+
+(define (tasks:set-state-given-param-key dbstruct param-key new-state)
+  (db:with-db
+   dbstruct #f #t
+   (lambda (db)
+     (sqlite3:execute db "UPDATE tasks_queue SET state=? WHERE params LIKE ?;" new-state param-key))))
+
+(define (tasks:get-records-given-param-key dbstruct param-key state-patt action-patt test-patt)
+  (db:with-db
+   dbstruct #f #f
+   (lambda (db)
+     (handle-exceptions
+      exn
+      '()
+      (sqlite3:first-row db "SELECT id,action,owner,state,target,name,testpatt,keylock,params WHERE
+                               params LIKE ? AND state LIKE ? AND action LIKE ? AND testpatt LIKE ?;"
+			 param-key state-patt action-patt test-patt)))))
+
+(define (tasks:find-task-queue-records dbstruct target run-name test-patt state-patt action-patt)
+  ;; (handle-exceptions
+  ;;  exn
+  ;;  '()
+  ;;  (sqlite3:first-row
+  (let ((db   (db:get-inmem dbstruct #f)) ;; put tasks stuff in main.db
+	(res '()))
+    (sqlite3:for-each-row 
+     (lambda (a . b)
+       (set! res (cons (cons a b) res)))
+     db "SELECT id,action,owner,state,target,name,testpatt,keylock,params FROM tasks_queue 
+           WHERE
+              target = ? AND name = ? AND state LIKE ? AND action LIKE ? AND testpatt LIKE ?;"
+     target run-name state-patt action-patt test-patt)
+    res)) ;; )
+
+;; (define (tasks:start-run dbstruct mdb task)
+;;   (let ((flags (make-hash-table)))
+;;     (hash-table-set! flags "-rerun" "NOT_STARTED")
+;;     (if (not (string=? (tasks:task-get-params task) ""))
+;; 	(hash-table-set! flags "-setvars" (tasks:task-get-params task)))
+;;     (print "Starting run " task)
+;;     ;; sillyness, just call the damn routine with the task vector and be done with it. FIXME SOMEDAY
+;;     (runs:run-tests db
+;; 		    (tasks:task-get-target task)
+;; 		    (tasks:task-get-name   task)
+;; 		    (tasks:task-get-test   task)
+;; 		    (tasks:task-get-item   task)
+;; 		    (tasks:task-get-owner  task)
+;; 		    flags)
+;;     (tasks:set-state mdb (tasks:task-get-id task) "waiting")))
+;; 
+;; (define (tasks:rollup-runs db mdb task)
+;;   (let* ((flags (make-hash-table)) 
+;; 	 (keys  (db:get-keys db))
+;; 	 (keyvals (keys:target-keyval keys (tasks:task-get-target task))))
+;;     ;; (hash-table-set! flags "-rerun" "NOT_STARTED")
+;;     (print "Starting rollup " task)
+;;     ;; sillyness, just call the damn routine with the task vector and be done with it. FIXME SOMEDAY
+;;     (runs:rollup-run db
+;; 		     keys 
+;; 		     keyvals
+;; 		     (tasks:task-get-name  task)
+;; 		     (tasks:task-get-owner  task))
+;;     (tasks:set-state mdb (tasks:task-get-id task) "waiting")))
+
+;;======================================================================
+;;  S Y N C   T O   P O S T G R E S Q L
+;;======================================================================
+
+;; In the spirit of "dump your junk in the tasks module" I'll put the
+;; sync to postgres here for now.
+
+;; attempt to automatically set up an area. call only if get area by path
+;; returns naught of interest
+;;
+(define (tasks:set-area dbh configdat #!key (toppath #f)) ;; could I safely put *toppath* in for the default for toppath? when would it be evaluated?
+  (let loop ((area-name (or (configf:lookup configdat "setup" "area-name")
+			    (common:get-area-name)))
+	     (modifier  'none))
+    (let ((success (handle-exceptions
+		       exn
+		       (begin
+			 (debug:print 0 *default-log-port* "ERROR: cannot create area entry, " ((condition-property-accessor 'exn 'message) exn))
+			 #f) ;; FIXME: I don't care for now but I should look at *why* there was an exception
+		     (pgdb:add-area dbh area-name (or toppath *toppath*)))))
+      (or success
+	  (case modifier
+	    ((none)(loop (conc (current-user-name) "_" area-name) 'user))
+	    ((user)(loop (conc (substring (common:get-area-path-signature) 0 4)
+			       area-name) 'areasig))
+	    (else #f)))))) ;; give up
+
+(define (task:print-runtime run-times saperator)
+(for-each
+    (lambda (run-time-info)
+     (let* ((run-name  (vector-ref run-time-info 0))
+            (run-time  (vector-ref run-time-info 1))
+            (target  (vector-ref run-time-info 2)))
+        (print target saperator run-name saperator run-time )))
+   run-times))
+
+(define (task:print-runtime-as-json run-times)
+ (let loop ((run-time-info (car run-times))
+            (rema (cdr run-times)) 
+            (str ""))
+     (let* ((run-name  (vector-ref run-time-info 0))
+            (run-time  (vector-ref run-time-info 1))
+            (target  (vector-ref run-time-info 2)))
+        ;(print (not (equal? str "")))
+        (if (not (equal? str "")) 
+            (set! str (conc str ",")))
+        (if (null? rema)
+		(print "[" str "{target:" target ",run-name:" run-name ", run-time:" run-time "}]")
+            (loop (car rema) (cdr rema) (conc str "{target:" target ", run-name:" run-name ", run-time:" run-time "}"))))))
+
+
+(define (task:print-testtime test-times saperator)
+(for-each
+    (lambda (test-time-info)
+     (let* ((test-name  (vector-ref test-time-info 0))
+            (test-time  (vector-ref test-time-info 2))
+            (test-item  (if (eq? (string-length (vector-ref test-time-info 1)) 0)
+                               "N/A"
+				(vector-ref test-time-info 1))))
+        (print  test-name saperator test-item saperator test-time )))
+   test-times))
+
+(define (task:print-testtime-as-json test-times)
+ (let loop ((test-time-info (car test-times))
+            (rema (cdr test-times)) 
+            (str ""))
+     (let* ((test-name  (vector-ref test-time-info 0))
+            (test-time  (vector-ref test-time-info 2))
+            (item  (vector-ref test-time-info 1)))
+        ;(print (not (equal? str "")))
+        (if (not (equal? str "")) 
+            (set! str (conc str ",")))
+        (if (null? rema)
+		(print "[" str "{test-name:" test-name ", item-path:" item ", test-time:" test-time "}]")
+            (loop (car rema) (cdr rema) (conc str "{test-name:" test-name ", item-path:" item ", test-time:" test-time "}"))))))
+
+
+(define (task:add-run-tag dbh run-id tag) 
+  (let* ((tag-info (pgdb:get-tag-info-by-name dbh tag)))
+   (if (not tag-info)
+     (begin   
+     (if (handle-exceptions
+	   exn
+	   (begin 
+               (debug:print-info 1 *default-log-port*  ((condition-property-accessor 'exn 'message) exn))     
+	   #f)
+	   (pgdb:insert-tag  dbh   tag))
+                       (set! tag-info (pgdb:get-tag-info-by-name dbh tag))
+		  #f)))
+     ;;add to area_tags
+     (handle-exceptions
+	   exn
+	   (begin 
+               (debug:print-info 1 *default-log-port*  ((condition-property-accessor 'exn 'message) exn))     
+	   #f)
+           (if (not (pgdb:is-run-taged-with-a-tag dbh (vector-ref tag-info 0)  run-id))  
+	   (pgdb:insert-run-tag  dbh   (vector-ref tag-info 0)  run-id)))))
+
+(define (task:add-area-tag dbh area-info tag) 
+  (let* ((tag-info (pgdb:get-tag-info-by-name dbh tag)))
+   (if (not tag-info)
+     (begin   
+     (if (handle-exceptions
+	   exn
+	   (begin 
+               (debug:print-info 1 *default-log-port*  ((condition-property-accessor 'exn 'message) exn))     
+	   #f)
+	   (pgdb:insert-tag  dbh   tag))
+                       (set! tag-info (pgdb:get-tag-info-by-name dbh tag))
+		  #f)))
+     ;;add to area_tags
+     (handle-exceptions
+	   exn
+	   (begin 
+               (debug:print-info 1 *default-log-port*  ((condition-property-accessor 'exn 'message) exn))     
+	   #f)
+           (if (not (pgdb:is-area-taged-with-a-tag dbh (vector-ref tag-info 0)  (vector-ref area-info 0)))  
+	   (pgdb:insert-area-tag  dbh   (vector-ref tag-info 0)  (vector-ref area-info 0))))))
+
+
+
+)

Index: tcmt.scm
==================================================================
--- tcmt.scm
+++ tcmt.scm
@@ -292,11 +292,11 @@
 	 (tdelay  (string->number (or (args:get-arg "-delay") "15"))))
     (if (and target runname)
 	(begin
 	  (launch:setup)
 	  (set! keys (rmt:get-keys))))
-    (set! tsname  (common:get-testsuite-name))
+    (set! tsname  (common:get-area-name))
     (print "TCMT: for testsuite=" tsname " found runname=" runname ", target=" target ", keys=" keys " and successfully ran launch:setup. Using " flowid " as the flowId.")
     (let loop ()
       ;;;;;; (handle-exceptions
       ;;;;;;  exn
       ;;;;;;  ;; (print "Process done.")

Index: tdb.scm
==================================================================
--- tdb.scm
+++ tdb.scm
@@ -16,205 +16,12 @@
 ;;     You should have received a copy of the GNU General Public License
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 ;;
 ;;======================================================================
 
-;;======================================================================
-;; Database access
-;;======================================================================
-
-(require-extension (srfi 18) extras tcp)
-(use sqlite3 srfi-1 posix regex regex-case srfi-69 csv-xml s11n md5 message-digest base64)
-(import (prefix sqlite3 sqlite3:))
-(import (prefix base64 base64:))
-
-(declare (unit tdb))
-(declare (uses common))
-(declare (uses keys))
-(declare (uses ods))
-(declare (uses client))
-(declare (uses mt))
-(declare (uses db))
-
-(include "common_records.scm")
-(include "db_records.scm")
-(include "key_records.scm")
-(include "run_records.scm")
-
-;;======================================================================
-;;
-;; T E S T   D A T A B A S E S
-;;
-;;======================================================================
-
-;;======================================================================
-;; T E S T   S P E C I F I C   D B 
-;;======================================================================
-
-;; Create the sqlite db for the individual test(s)
-;;
-;; Moved these tables into <runid>.db
-;; THIS CODE TO BE REMOVED
-;;
-(define (open-test-db work-area) 
-  (debug:print-info 11 *default-log-port* "open-test-db " work-area)
-  (if (and work-area 
-	   (directory? work-area)
-	   (file-read-access? work-area))
-      (let* ((dbpath              (conc work-area "/testdat.db"))
-	     (dbexists            (common:file-exists? dbpath))
-	     (work-area-writeable (file-write-access? work-area))
-	     (db                  (handle-exceptions  ;; open the db if area writeable or db pre-existing. open in-mem otherwise. if exception, open in-mem
-				   exn
-				   (begin
-				     (print-call-chain (current-error-port))
-				     (debug:print 2 *default-log-port* "ERROR: problem accessing test db " work-area ", you probably should clean and re-run this test"
-						  ((condition-property-accessor 'exn 'message) exn))
-				     (set! dbexists #f) ;; must force re-creation of tables, more tom-foolery
-				     (sqlite3:open-database ":memory:")) ;; open an in-memory db to allow readonly access 
-				   (if (or work-area-writeable
-					   dbexists)
-				       (sqlite3:open-database dbpath)
-				       (sqlite3:open-database ":memory:"))))
-	     (tdb-writeable       (and (file-write-access? work-area)
-				       (file-write-access? dbpath)))
-	     (handler   (sqlite3:make-busy-timeout (if (args:get-arg "-override-timeout")
-						       (string->number (args:get-arg "-override-timeout"))
-						       136000))))
-	
-	(if (and tdb-writeable
-		 *db-write-access*)
-	    (sqlite3:set-busy-handler! db handler))
-	(if (not dbexists)
-	    (begin
-	      (db:set-sync db) ;; (sqlite3:execute db "PRAGMA synchronous = FULL;")
-	      (debug:print-info 11 *default-log-port* "Initialized test database " dbpath)
-	      (tdb:testdb-initialize db)))
-	;; (sqlite3:execute db "PRAGMA synchronous = 0;")
-	(debug:print-info 11 *default-log-port* "open-test-db END (sucessful)" work-area)
-	;; now let's test that everything is correct
-	(handle-exceptions
-	 exn
-	 (begin
-	   (print-call-chain (current-error-port))
-	   (debug:print-error 0 *default-log-port* "problem accessing test db " work-area ", you probably should clean and re-run this test or remove the file " 
-			dbpath ".\n  "
-			((condition-property-accessor 'exn 'message) exn))
-	   #f)
-	 ;; Is there a cheaper single line operation that will check for existance of a table
-	 ;; and raise an exception ?
-	 (sqlite3:execute db "SELECT id FROM test_data LIMIT 1;"))
-	db)
-      ;; no work-area or not readable - create a placeholder to fake rest of world out
-      (let ((baddb (sqlite3:open-database ":memory:")))
- 	(debug:print-info 11 *default-log-port* "open-test-db END (unsucessful)" work-area)
- 	;; provide an in-mem db (this is dangerous!)
- 	(tdb:testdb-initialize baddb)
- 	baddb)))
-
-;; find and open the testdat.db file for an existing test
-(define (tdb:open-test-db-by-test-id test-id #!key (work-area #f))
-  (let* ((test-path (if work-area
-			work-area
-			(rmt:test-get-rundir-from-test-id test-id))))
-    (debug:print 3 *default-log-port* "TEST PATH: " test-path)
-    (open-test-db test-path)))
-
-;; find and open the testdat.db file for an existing test
-(define (tdb:open-test-db-by-test-id-local dbstruct run-id test-id #!key (work-area #f))
-  (let* ((test-path (if work-area
-			work-area
-			(db:test-get-rundir-from-test-id dbstruct run-id test-id))))
-    (debug:print 3 *default-log-port* "TEST PATH: " test-path)
-    (open-test-db test-path)))
-
-;; find and open the testdat.db file for an existing test
-(define (tdb:open-run-close-db-by-test-id-local dbstruct run-id test-id work-area proc . params)
-  (let* ((test-path (if work-area
-			work-area
-			(db:test-get-rundir-from-test-id dbstruct run-id test-id)))
-	 (tdb        (open-test-db test-path)))
-    (apply proc tdb params)))
-
-(define (tdb:testdb-initialize db)
-  (debug:print 11 *default-log-port* "db:testdb-initialize START")
-  (sqlite3:with-transaction
-   db
-   (lambda ()
-     (for-each
-      (lambda (sqlcmd)
-	(sqlite3:execute db sqlcmd))
-      (list "CREATE TABLE IF NOT EXISTS test_rundat (
-              id INTEGER PRIMARY KEY,
-              update_time TIMESTAMP,
-              cpuload INTEGER DEFAULT -1,
-              diskfree INTEGER DEFAULT -1,
-              diskusage INTGER DEFAULT -1,
-              run_duration INTEGER DEFAULT 0);"
-	    "CREATE TABLE IF NOT EXISTS test_data (
-              id INTEGER PRIMARY KEY,
-              test_id INTEGER,
-              category TEXT DEFAULT '',
-              variable TEXT,
-	      value REAL,
-	      expected REAL,
-	      tol REAL,
-              units TEXT,
-              comment TEXT DEFAULT '',
-              status TEXT DEFAULT 'n/a',
-              type TEXT DEFAULT '',
-              CONSTRAINT test_data_constraint UNIQUE (test_id,category,variable));"
-	    "CREATE TABLE IF NOT EXISTS test_steps (
-              id INTEGER PRIMARY KEY,
-              test_id INTEGER, 
-              stepname TEXT, 
-              state TEXT DEFAULT 'NOT_STARTED', 
-              status TEXT DEFAULT 'n/a',
-              event_time TIMESTAMP,
-              comment TEXT DEFAULT '',
-              logfile TEXT DEFAULT '',
-              CONSTRAINT test_steps_constraint UNIQUE (test_id,stepname,state));"
-	    ;; test_meta can be used for handing commands to the test
-	    ;; e.g. KILLREQ
-	    ;;      the ackstate is set to 1 once the command has been completed
-	    "CREATE TABLE IF NOT EXISTS test_meta (
-              id INTEGER PRIMARY KEY,
-              var TEXT,
-              val TEXT,
-              ackstate INTEGER DEFAULT 0,
-              CONSTRAINT metadat_constraint UNIQUE (var));"))))
-  (debug:print 11 *default-log-port* "db:testdb-initialize END"))
-
-;; This routine moved to db:read-test-data
-;;
-(define (tdb:read-test-data tdb test-id categorypatt)
-  (let ((res '()))
-    (sqlite3:for-each-row 
-     (lambda (id test_id category variable value expected tol units comment status type)
-       (set! res (cons (vector id test_id category variable value expected tol units comment status type) res)))
-     tdb
-     "SELECT id,test_id,category,variable,value,expected,tol,units,comment,status,type FROM test_data WHERE test_id=? AND category LIKE ? ORDER BY category,variable;" test-id categorypatt)
-    (sqlite3:finalize! tdb)
-    (reverse res)))
-
-;;======================================================================
-;; T E S T   D A T A 
-;;======================================================================
-
-;; ;; get a list of test_data records matching categorypatt
-;; (define (tdb:read-test-data test-id categorypatt #!key (work-area #f))
-;;   (let ((tdb  (tdb:open-test-db-by-test-id test-id work-area: work-area)))
-;;     (if (sqlite3:database? tdb)
-;; 	(let ((res '()))
-;; 	  (sqlite3:for-each-row 
-;; 	   (lambda (id test_id category variable value expected tol units comment status type)
-;; 	     (set! res (cons (vector id test_id category variable value expected tol units comment status type) res)))
-;; 	   tdb
-;; 	   "SELECT id,test_id,category,variable,value,expected,tol,units,comment,status,type FROM test_data WHERE test_id=? AND category LIKE ? ORDER BY category,variable;" test-id categorypatt)
-;; 	  (sqlite3:finalize! tdb)
-;; 	  (reverse res))
-;; 	'())))
+
+;; All moved into dbmod.scm
 
 ;; NOTE: Run this local with #f for db !!!
 (define (tdb:load-test-data run-id test-id)
   (let loop ((lin (read-line)))
     (if (not (eof-object? lin))
@@ -240,175 +47,5 @@
 	  (loop (read-line)))))
   ;; roll up the current results.
   ;; FIXME: Add the status too 
   (rmt:test-data-rollup run-id test-id #f))
 
-(define (tdb:get-prev-tol-for-test tdb test-id category variable)
-  ;; Finish me?
-  (values #f #f #f))
-
-;;======================================================================
-;; S T E P S 
-;;======================================================================
-
-(define (tdb:step-get-time-as-string vec)
-  (seconds->time-string (tdb:step-get-event_time vec)))
-
-;; get a pretty table to summarize steps
-;; 
-;; NOT USED, WILL BE REMOVED
-;;
-(define (tdb:get-steps-table steps);; organise the steps for better readability
-  (let ((res (make-hash-table)))
-    (for-each 
-     (lambda (step)
-       (debug:print 6 *default-log-port* "step=" step)
-       (let ((record (hash-table-ref/default 
-		      res 
-		      (tdb:step-get-stepname step) 
-		      ;;        stepname                start end status Duration  Logfile 
-		      (vector (tdb:step-get-stepname step) ""   "" ""     ""        ""))))
-	 (debug:print 6 *default-log-port* "record(before) = " record 
-		      "\nid:       " (tdb:step-get-id step)
-		      "\nstepname: " (tdb:step-get-stepname step)
-		      "\nstate:    " (tdb:step-get-state step)
-		      "\nstatus:   " (tdb:step-get-status step)
-		      "\ntime:     " (tdb:step-get-event_time step))
-	 (case (string->symbol (tdb:step-get-state step))
-	   ((start)(vector-set! record 1 (tdb:step-get-event_time step))
-	    (vector-set! record 3 (if (equal? (vector-ref record 3) "")
-				      (tdb:step-get-status step)))
-	    (if (> (string-length (tdb:step-get-logfile step))
-		   0)
-		(vector-set! record 5 (tdb:step-get-logfile step))))
-	   ((end)  
-	    (vector-set! record 2 (any->number (tdb:step-get-event_time step)))
-	    (vector-set! record 3 (tdb:step-get-status step))
-	    (vector-set! record 4 (let ((startt (any->number (vector-ref record 1)))
-					(endt   (any->number (vector-ref record 2))))
-				    (debug:print 4 *default-log-port* "record[1]=" (vector-ref record 1) 
-						 ", startt=" startt ", endt=" endt
-						 ", get-status: " (tdb:step-get-status step))
-				    (if (and (number? startt)(number? endt))
-					(seconds->hr-min-sec (- endt startt)) "-1")))
-	    (if (> (string-length (tdb:step-get-logfile step))
-		   0)
-		(vector-set! record 5 (tdb:step-get-logfile step))))
-	   (else
-	    (vector-set! record 2 (tdb:step-get-state step))
-	    (vector-set! record 3 (tdb:step-get-status step))
-	    (vector-set! record 4 (tdb:step-get-event_time step))))
-	 (hash-table-set! res (tdb:step-get-stepname step) record)
-	 (debug:print 6 *default-log-port* "record(after)  = " record 
-		      "\nid:       " (tdb:step-get-id step)
-		      "\nstepname: " (tdb:step-get-stepname step)
-		      "\nstate:    " (tdb:step-get-state step)
-		      "\nstatus:   " (tdb:step-get-status step)
-		      "\ntime:     " (tdb:step-get-event_time step))))
-     ;; (else   (vector-set! record 1 (tdb:step-get-event_time step)))
-     (sort steps (lambda (a b)
-		   (cond
-		    ((<   (tdb:step-get-event_time a)(tdb:step-get-event_time b)) #t)
-		    ((eq? (tdb:step-get-event_time a)(tdb:step-get-event_time b)) 
-		     (<   (tdb:step-get-id a)        (tdb:step-get-id b)))
-		    (else #f)))))
-    res))
-
-;; Move this to steps.scm
-;;
-;; get a pretty table to summarize steps
-;;
-(define (tdb:get-steps-table-list steps)
-  ;; organise the steps for better readability
-  (let ((res (make-hash-table)))
-    (for-each 
-     (lambda (step)
-       (debug:print 6 *default-log-port* "step=" step)
-       (let ((record (hash-table-ref/default 
-		      res 
-		      (tdb:step-get-stepname step) 
-		      ;;        stepname                start end status    
-		      (vector (tdb:step-get-stepname step) ""   "" ""     "" ""))))
-	 (debug:print 6 *default-log-port* "record(before) = " record 
-		      "\nid:       " (tdb:step-get-id step)
-		      "\nstepname: " (tdb:step-get-stepname step)
-		      "\nstate:    " (tdb:step-get-state step)
-		      "\nstatus:   " (tdb:step-get-status step)
-		      "\ntime:     " (tdb:step-get-event_time step))
-	 (case (string->symbol (tdb:step-get-state step))
-	   ((start)(vector-set! record 1 (tdb:step-get-event_time step))
-	    (vector-set! record 3 (if (equal? (vector-ref record 3) "")
-				      (tdb:step-get-status step)))
-	    (if (> (string-length (tdb:step-get-logfile step))
-		   0)
-		(vector-set! record 5 (tdb:step-get-logfile step))))
-	   ((end)  
-	    (vector-set! record 2 (any->number (tdb:step-get-event_time step)))
-	    (vector-set! record 3 (tdb:step-get-status step))
-	    (vector-set! record 4 (let ((startt (any->number (vector-ref record 1)))
-					(endt   (any->number (vector-ref record 2))))
-				    (debug:print 4 *default-log-port* "record[1]=" (vector-ref record 1) 
-						 ", startt=" startt ", endt=" endt
-						 ", get-status: " (tdb:step-get-status step))
-				    (if (and (number? startt)(number? endt))
-					(seconds->hr-min-sec (- endt startt)) "-1")))
-	    (if (> (string-length (tdb:step-get-logfile step))
-		   0)
-		(vector-set! record 5 (tdb:step-get-logfile step))))
-	   (else
-	    (vector-set! record 2 (tdb:step-get-state step))
-	    (vector-set! record 3 (tdb:step-get-status step))
-	    (vector-set! record 4 (tdb:step-get-event_time step))))
-	 (hash-table-set! res (tdb:step-get-stepname step) record)
-	 (debug:print 6 *default-log-port* "record(after)  = " record 
-		      "\nid:       " (tdb:step-get-id step)
-		      "\nstepname: " (tdb:step-get-stepname step)
-		      "\nstate:    " (tdb:step-get-state step)
-		      "\nstatus:   " (tdb:step-get-status step)
-		      "\ntime:     " (tdb:step-get-event_time step))))
-     ;; (else   (vector-set! record 1 (tdb:step-get-event_time step)))
-     (sort steps (lambda (a b)
-		   (cond
-		    ((<   (tdb:step-get-event_time a)(tdb:step-get-event_time b)) #t)
-		    ((eq? (tdb:step-get-event_time a)(tdb:step-get-event_time b)) 
-		     (<   (tdb:step-get-id a)        (tdb:step-get-id b)))
-		    (else #f)))))
-    res))
-
-;;
-;; Move to steps.scm
-;;
-(define (tdb:get-compressed-steps comprsteps) ;; from tdb:get-steps-table
-  (map (lambda (x)
-	 ;; take advantage of the \n on time->string
-	 (vector
-	  (vector-ref x 0)
-	  (let ((s (vector-ref x 1)))
-	    (if (number? s)(seconds->time-string s) s))
-	  (let ((s (vector-ref x 2)))
-	    (if (number? s)(seconds->time-string s) s))
-	  (vector-ref x 3)    ;; status
-	  (vector-ref x 4)
-	  (vector-ref x 5)))  ;; time delta
-       (sort (hash-table-values comprsteps)
-	     (lambda (a b)
-	       (let ((time-a (vector-ref a 1))
-		     (time-b (vector-ref b 1)))
-		 (if (and (number? time-a)(number? time-b))
-		     (if (< time-a time-b)
-			 #t
-			 (if (eq? time-a time-b)
-			     (string<? (conc (vector-ref a 2))
-				       (conc (vector-ref b 2)))
-			     #f))
-		     (string<? (conc time-a)(conc time-b))))))))
-
-;; 
-(define (tdb:remote-update-testdat-meta-info run-id test-id work-area cpuload diskfree minutes)
-  (let ((tdb         (rmt:open-test-db-by-test-id run-id test-id work-area: work-area)))
-    (if (sqlite3:database? tdb)
-	(begin
-	  (sqlite3:execute tdb "INSERT INTO test_rundat (update_time,cpuload,diskfree,run_duration) VALUES (strftime('%s','now'),?,?,?);"
-			   cpuload diskfree minutes)
-	  (sqlite3:finalize! tdb))
-	(debug:print 2 *default-log-port* "Can't update testdat.db for test " test-id " read-only or non-existant"))))
-    

ADDED   testeval/Makefile
Index: testeval/Makefile
==================================================================
--- /dev/null
+++ testeval/Makefile
@@ -0,0 +1,14 @@
+CSCOPTS=
+SRCFILES=mod1.scm mod2.scm all.scm
+MOFILES = $(SRCFILES:%.scm=%.o)
+MOIMPFILES = $(SRCFILES:%.scm=%.import.o)
+
+%.import.o : %.import.scm
+	csc $(CSCOPTS) -unit $*.import -c $*.import.scm -o $*.import.o
+
+%.o : %.scm
+	csc $(CSCOPTS) -J -c $< -o $*.o
+
+mod3.o : mod1.o mod2.o all.o
+mod3 : mod3.scm $(MOFILES)
+	csc $(CSCOPTS) $(MOFILES) mod3.scm -o mod3

ADDED   testeval/all.scm
Index: testeval/all.scm
==================================================================
--- /dev/null
+++ testeval/all.scm
@@ -0,0 +1,13 @@
+(declare (unit all))
+
+(declare (uses mod1))
+(declare (uses mod2))
+
+(module all
+	()
+	(import scheme chicken.module mod1 mod2)
+	(reexport mod1 mod2)
+
+)
+	 
+ 

ADDED   testeval/mod1.scm
Index: testeval/mod1.scm
==================================================================
--- /dev/null
+++ testeval/mod1.scm
@@ -0,0 +1,11 @@
+(declare (unit mod1))
+
+(module mod1
+	*
+
+(import scheme)
+(define *mod1somevar* 1234)
+
+)
+	 
+ 

ADDED   testeval/mod2.scm
Index: testeval/mod2.scm
==================================================================
--- /dev/null
+++ testeval/mod2.scm
@@ -0,0 +1,11 @@
+(declare (unit mod2))
+
+(module mod2
+	*
+
+(import scheme)
+(define *mod2somevar* 4321)
+
+)
+	 
+ 

ADDED   testeval/mod3.scm
Index: testeval/mod3.scm
==================================================================
--- /dev/null
+++ testeval/mod3.scm
@@ -0,0 +1,35 @@
+
+(declare (uses mod1))
+(declare (uses mod2))
+
+(module mod3
+	*
+
+(import scheme
+	chicken.eval
+	mod1 mod2 all)
+
+(define (vars) ;; 
+  (- *mod2somevar* *mod1somevar*))
+
+(define (mod1ok)
+  (let ((modallenv (module-environment 'all)))
+    (eval '*mod1somevar* modallenv)))
+
+(define (mod2ok)
+   (let ((modallenv (module-environment 'all)))
+    (eval '*mod2somevar* modallenv)))
+			 
+(define (addsome)
+  (let ((modallenv (module-environment 'all)))
+    (eval '(+ *mod1somevar* *mod2somevar*) modallenv)))
+
+)
+
+(import mod3)
+
+(print "vars: "(vars))
+(print "mod1ok: "(mod1ok))
+(print "mod2ok: "(mod2ok))
+(print "addsome: "(addsome)) ;; => 5555
+

Index: tests.scm
==================================================================
--- tests.scm
+++ tests.scm
@@ -16,954 +16,23 @@
 ;;     You should have received a copy of the GNU General Public License
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 ;;
 ;;======================================================================
 
-;;======================================================================
-;; Tests
-;;======================================================================
-
-(declare (unit tests))
-(declare (uses lock-queue))
-(declare (uses db))
-(declare (uses tdb))
-(declare (uses common))
-;; (declare (uses dcommon)) ;; needed for the steps processing
-(declare (uses items))
-(declare (uses runconfig))
-;; (declare (uses sdb))
-(declare (uses server))
-;;(declare (uses stml2))
-
-(use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking tcp directory-utils)
-(import (prefix sqlite3 sqlite3:))
-(require-library stml)
-
-(include "common_records.scm")
-(include "key_records.scm")
-(include "db_records.scm")
-(include "run_records.scm")
-(include "test_records.scm")
-(include "js-path.scm")
-
-(define (init-java-script-lib)
-  (set! *java-script-lib* (conc  (common:get-install-area) "/share/js/jquery-3.1.0.slim.min.js"))
-  )
-
-;; Call this one to do all the work and get a standardized list of tests
-;;   gets paths from configs and finds valid tests 
-;;   returns hash of testname --> fullpath
-;;
-(define (tests:get-all)
-  (let* ((test-search-path   (tests:get-tests-search-path *configdat*)))
-    (tests:get-valid-tests (make-hash-table) test-search-path)))
-
-(define (tests:get-tests-search-path cfgdat)
-  (let ((paths (let ((section (if cfgdat
-				  (configf:get-section cfgdat "tests-paths")
-				  #f)))
-		 (if section
-		     (map cadr section)
-		     '()))))
-    (filter (lambda (d)
-	      (if (directory-exists? d)
-		  d
-		  (begin
-		    ;; (if (common:low-noise-print 60 "tests:get-tests-search-path" d)
-		    ;;	(debug:print 0 *default-log-port* "WARNING: problem with directory " d ", dropping it from tests path"))
-		    #f)))
-	    (append paths (list (conc *toppath* "/tests"))))))
-
-(define (tests:get-valid-tests test-registry tests-paths)
-  (if (null? tests-paths) 
-      test-registry
-      (let loop ((hed (car tests-paths))
-		 (tal (cdr tests-paths)))
-	(if (common:file-exists? hed)
-	    (for-each (lambda (test-path)
-			(let* ((tname   (last (string-split test-path "/")))
-			       (tconfig (conc test-path "/testconfig")))
-			  (if (and (not (hash-table-ref/default test-registry tname #f))
-				   (common:file-exists? tconfig))
-			      (hash-table-set! test-registry tname test-path))))
-		      (glob (conc hed "/*"))))
-	(if (null? tal)
-	    test-registry
-	    (loop (car tal)(cdr tal))))))
-
-(define (tests:filter-test-names-not-matched test-names test-patts)
-  (delete-duplicates
-   (filter (lambda (testname)
-	     (not (tests:match test-patts testname #f)))
-	   test-names)))
-
-
-(define (tests:filter-test-names test-names test-patts)
-  (delete-duplicates
-   (filter (lambda (testname)
-	     (tests:match test-patts testname #f))
-	   test-names)))
-
-;; itemmap is a list of testname patterns to maps
-;;     test1 .*/bar/(\d+) foo/\1
-;;     %     foo/([^/]+)  \1/bar
-;;
-;; # NOTE: the line with the single % could be the result of
-;; #       itemmap entry in requirements (legacy). The itemmap
-;; #       requirements entry is deprecated
-;;
-(define (tests:get-itemmaps tconfig)
-  (let ((base-itemmap  (configf:lookup tconfig "requirements" "itemmap"))
-	(itemmap-table (configf:get-section tconfig "itemmap")))
-    (append (if base-itemmap
-		(list (list "%" base-itemmap))
-		'())
-	    (if itemmap-table
-		itemmap-table
-		'()))))
-
-;; given a list of itemmaps (testname . map), return the first match
-;;
-(define (tests:lookup-itemmap itemmaps testname)
-  (let ((best-matches (filter (lambda (itemmap)
-				(tests:match (car itemmap) testname #f))
-			      itemmaps)))
-    (if (null? best-matches)
-	#f
-	(let ((res (car best-matches)))
-	  ;; (debug:print 0 *default-log-port* "res=" res)
-	  (cond
-	   ((string? res) res) ;;; FIX THE ROOT CAUSE HERE ....
-	   ((null? res)   #f)
-	   ((string? (cdr res)) (cdr res))  ;; it is a pair
-	   ((string? (cadr res))(cadr res)) ;; it is a list
-	   (else cadr res))))))
-
-;; return items given config
-;;
-(define (tests:get-items tconfig)
-  (let ((items      (hash-table-ref/default tconfig "items" #f)) ;; items 4
-	(itemstable (hash-table-ref/default tconfig "itemstable" #f))) 
-    ;; if either items or items table is a proc return it so test running
-    ;; process can know to call items:get-items-from-config
-    ;; if either is a list and none is a proc go ahead and call get-items
-    ;; otherwise return #f - this is not an iterated test
-    (cond
-     ((procedure? items)      
-      (debug:print-info 4 *default-log-port* "items is a procedure, will calc later")
-      items)            ;; calc later
-     ((procedure? itemstable)
-      (debug:print-info 4 *default-log-port* "itemstable is a procedure, will calc later")
-      itemstable)       ;; calc later
-     ((filter (lambda (x)
-		(let ((val (car x)))
-		  (if (procedure? val) val #f)))
-	      (append (if (list? items) items '())
-		      (if (list? itemstable) itemstable '())))
-      'have-procedure)
-     ((or (list? items)(list? itemstable)) ;; calc now
-      (debug:print-info 4 *default-log-port* "items and itemstable are lists, calc now\n"
-			"    items: " items " itemstable: " itemstable)
-      (items:get-items-from-config tconfig))
-     (else #f))))                           ;; not iterated
-
-
-;; returns waitons waitors tconfigdat
-;;
-(define (tests:get-waitons test-name all-tests-registry)
-   (let* ((config  (tests:get-testconfig test-name #f all-tests-registry 'return-procs))) ;; assuming no problems with immediate evaluation, this could be simplified ('return-procs -> #t)
-     (let ((instr (if config 
-		      (configf:lookup config "requirements" "waiton")
-		      (begin ;; No config means this is a non-existant test
-			(debug:print-error 0 *default-log-port* "non-existent required test \"" test-name "\"")
-			(exit 1))))
-	   (instr2 (if config
-		       (configf:lookup config "requirements" "waitor")
-		       "")))
-       (debug:print-info 8 *default-log-port* "waitons string is " instr ", waitors string is " instr2)
-       (let ((newwaitons
-	      (string-split (cond
-			     ((procedure? instr) ;; here 
-			      (let ((res (instr)))
-				(debug:print-info 8 *default-log-port* "waiton procedure results in string " res " for test " test-name)
-				res))
-			     ((string? instr)     instr)
-			     (else 
-			      ;; NOTE: This is actually the case of *no* waitons! ;; (debug:print-error 0 *default-log-port* "something went wrong in processing waitons for test " test-name)
-			      ""))))
-	     (newwaitors
-	      (string-split (cond
-			     ((procedure? instr2)
-			      (let ((res (instr2)))
-				(debug:print-info 8 *default-log-port* "waitor procedure results in string " res " for test " test-name)
-				res))
-			     ((string? instr2)     instr2)
-			     (else 
-			      ;; NOTE: This is actually the case of *no* waitons! ;; (debug:print-error 0 *default-log-port* "something went wrong in processing waitons for test " test-name)
-			      "")))))
-	 (values
-	  ;; the waitons
-	  (filter (lambda (x)
-		    (if (hash-table-ref/default all-tests-registry x #f)
-			#t
-			(begin
-			  (debug:print-error 0 *default-log-port* "test " test-name " has unrecognised waiton testname " x)
-			  #f)))
-		  newwaitons)
-	  (filter (lambda (x)
-		    (if (hash-table-ref/default all-tests-registry x #f)
-			#t
-			(begin
-			  (debug:print-error 0 *default-log-port* "test " test-name " has unrecognised waiton testname " x)
-			  #f)))
-		  newwaitors)
-	  config)))))
-					     
-;; given waiting-test that is waiting on waiton-test extend test-patt appropriately
-;;
-;;  genlib/testconfig               sim/testconfig
-;;  genlib/sch                      sim/sch/cell1
-;;
-;;  [requirements]                  [requirements]
-;;                                  mode itemwait
-;;                                  # trim off the cell to determine what to run for genlib
-;;                                  itemmap /.*
-;;
-;;                                  waiting-test is waiting on waiton-test so we need to create a pattern for waiton-test given waiting-test and itemmap
-;; BB> (tests:extend-test-patts "normal-second/2" "normal-second" "normal-first" '())
-;; observed -> "normal-first/2,normal-first/,normal-second/2,normal-second/"
-;; expected -> "normal-first,normal-second/2,normal-second/"
-;; testpatt = normal-second/2
-;; waiting-test = normal-second
-;; waiton-test = normal-first
-;; itemmaps = ()
-
-(define (tests:extend-test-patts test-patt waiting-test waiton-test itemmaps itemized-waiton)
-  (cond
-   (itemized-waiton
-    (let* ((itemmap          (tests:lookup-itemmap itemmaps waiton-test))
-           (patts            (string-split test-patt ","))
-           (waiting-test-len (+ (string-length waiting-test) 1))
-           (patts-waiton     (map (lambda (x)  ;; for each incoming patt that matches the waiting test
-                                    (let* ((modpatt (if itemmap (db:convert-test-itempath x itemmap) x)) 
-                                           (newpatt (conc waiton-test "/" (substring modpatt waiting-test-len (string-length modpatt)))))
-                                      ;; (conc waiting-test "/," waiting-test "/" (substring modpatt waiton-test-len (string-length modpatt)))))
-                                      ;; (print "in map, x=" x ", newpatt=" newpatt)
-                                      newpatt))
-                                  (filter (lambda (x)
-                                            (eq? (substring-index (conc waiting-test "/") x) 0)) ;; is this patt pertinent to the waiting test
-                                          patts)))
-           (extended-test-patt   (append patts (if (null? patts-waiton)
-                                                   (list (conc waiton-test "/%")) ;; really shouldn't add the waiton forcefully like this
-                                                   patts-waiton)))
-           (extended-test-patt-with-toplevels
-            (fold (lambda (testpatt-item accum )
-                    (let ((my-match (string-match "^([^%\\/]+)\\/.+$" testpatt-item)))
-                      (cons testpatt-item
-                            (if my-match
-                                (cons
-                                 (conc (cadr my-match) "/")
-                                 accum)
-                                accum))))
-                  '()
-                  extended-test-patt)))
-      (string-intersperse (delete-duplicates extended-test-patt-with-toplevels) ",")))
-   (else ;; not waiting on items, waiting on entire waiton test.
-    (let* ((patts (string-split test-patt ","))
-           (new-patts (if (member waiton-test patts)
-                          patts
-                          (cons waiton-test patts))))
-      (string-intersperse (delete-duplicates new-patts) ",")))))
-
-(define *glob-like-match-cache* (make-hash-table))
-(define (tests:cache-regexp str-in flag)
-  (let* ((key (conc str-in flag)))
-    (or (hash-table-ref/default *glob-like-match-cache* key #f)
-	(let* ((newrx (regexp str-in flag)))
-	  (hash-table-set! *glob-like-match-cache* key newrx)
-	  newrx))))
-
-;; tests:glob-like-match 
-(define (tests:glob-like-match patt str) 
-  (let* ((like     (substring-index "%" patt))
-	 (notpatt  (equal? (substring-index "~" patt) 0))
-	 (newpatt  (if notpatt (substring patt 1) patt))
-	 (finpatt  (if like
-		       (string-substitute (regexp "%") ".*" newpatt #f)
-		       (string-substitute (regexp "\\*") ".*" newpatt #f)))
-	 (rx       (tests:cache-regexp finpatt (if like #t #f)))
-	 (res      (string-match rx str)))
-    (if notpatt (not res) res)))
-
-;; if itempath is #f then look only at the testname part
-;;
-(define (tests:match patterns testname itempath #!key (required '()))
-  (if (string? patterns)
-      (let ((patts (append (string-split patterns ",") required)))
-	(if (null? patts) ;;; no pattern(s) means no match
-	    #f
-	    (let loop ((patt (car patts))
-		       (tal  (cdr patts)))
-	      ;; (print "loop: patt: " patt ", tal " tal)
-	      (if (string=? patt "")
-		  #f ;; nothing ever matches empty string - policy
-		  (let* ((patt-parts (string-match (regexp "^([^\\/]*)(\\/(.*)|)$") patt))
-			 (test-patt  (cadr patt-parts))
-			 (item-patt  (cadddr patt-parts)))
-		    ;; special case: test vs. test/
-		    ;;   test  => "test" "%"
-		    ;;   test/ => "test" ""
-		    (if (and (not (substring-index "/" patt)) ;; no slash in the original
-			     (or (not item-patt)
-				 (equal? item-patt "")))      ;; should always be true that item-patt is ""
-			(set! item-patt "%"))
-		    ;; (print "tests:match => patt-parts: " patt-parts ", test-patt: " test-patt ", item-patt: " item-patt)
-		    (if (and (tests:glob-like-match test-patt testname)
-			     (or (not itempath)
-				 (tests:glob-like-match (if item-patt item-patt "") itempath)))
-			#t
-			(if (null? tal)
-			    #f
-			    (loop (car tal)(cdr tal)))))))))))
-
-;; if itempath is #f then look only at the testname part
-;;
-(define (tests:match->sqlqry patterns)
-  (if (string? patterns)
-      (let ((patts (string-split patterns ",")))
-	(if (null? patts) ;;; no pattern(s) means no match, we will do no query
-	    #f
-	    (let loop ((patt (car patts))
-		       (tal  (cdr patts))
-		       (res  '()))
-	      ;; (print "loop: patt: " patt ", tal " tal)
-	      (let* ((patt-parts (string-match (regexp "^([^\\/]*)(\\/(.*)|)$") patt))
-		     (test-patt  (cadr patt-parts))
-		     (item-patt  (cadddr patt-parts))
-		     (test-qry   (db:patt->like "testname" test-patt))
-		     (item-qry   (db:patt->like "item_path" item-patt))
-		     (qry        (conc "(" test-qry " AND " item-qry ")")))
-		;; (print "tests:match => patt-parts: " patt-parts ", test-patt: " test-patt ", item-patt: " item-patt)
-		(if (null? tal)
-		    (string-intersperse (append (reverse res)(list qry)) " OR ")
-		    (loop (car tal)(cdr tal)(cons qry res)))))))
-      #f))
-
-;; Check for waiver eligibility
-;;
-(define (tests:check-waiver-eligibility testdat prev-testdat)
-  (let* ((test-registry (make-hash-table))
-	 (testconfig  (tests:get-testconfig (db:test-get-testname testdat) (db:test-get-item-path testdat) test-registry #f))
-	 (test-rundir ;; (sdb:qry 'passstr 
-	  (db:test-get-rundir testdat)) ;; )
-	 (prev-rundir ;; (sdb:qry 'passstr 
-	  (db:test-get-rundir prev-testdat)) ;; )
-	 (waivers     (if testconfig (configf:section-vars testconfig "waivers") '()))
-	 (waiver-rx   (regexp "^(\\S+)\\s+(.*)$"))
-	 (diff-rule   "diff %file1% %file2%")
-	 (logpro-rule "diff %file1% %file2% | logpro %waivername%.logpro %waivername%.html"))
-    (if (not (common:file-exists? test-rundir))
-	(begin
-	  (debug:print-error 0 *default-log-port* "test run directory is gone, cannot propagate waiver")
-	  #f)
-	(begin
-	  (push-directory test-rundir)
-	  (let ((result (if (null? waivers)
-			    #f
-			    (let loop ((hed (car waivers))
-				       (tal (cdr waivers)))
-			      (debug:print 0 *default-log-port* "INFO: Applying waiver rule \"" hed "\"")
-			      (let* ((waiver      (configf:lookup testconfig "waivers" hed))
-				     (wparts      (if waiver (string-match waiver-rx waiver) #f))
-				     (waiver-rule (if wparts (cadr wparts)  #f))
-				     (waiver-glob (if wparts (caddr wparts) #f))
-				     (logpro-file (if waiver
-						      (let ((fname (conc hed ".logpro")))
-							(if (common:file-exists? fname)
-							    fname 
-							    (begin
-							      (debug:print 0 *default-log-port* "INFO: No logpro file " fname " falling back to diff")
-							      #f)))
-						      #f))
-				     ;; if rule by name of waiver-rule is found in testconfig - use it
-				     ;; else if waivername.logpro exists use logpro-rule
-				     ;; else default to diff-rule
-				     (rule-string (let ((rule (configf:lookup testconfig "waiver_rules" waiver-rule)))
-						    (if rule
-							rule
-							(if logpro-file
-							    logpro-rule
-							    (begin
-							      (debug:print 0 *default-log-port* "INFO: No logpro file " logpro-file " found, using diff rule")
-							      diff-rule)))))
-				     ;; (string-substitute "%file1%" "foofoo.txt" "This is %file1% and so is this %file1%." #t)
-				     (processed-cmd (string-substitute 
-						     "%file1%" (conc test-rundir "/" waiver-glob)
-						     (string-substitute
-						      "%file2%" (conc prev-rundir "/" waiver-glob)
-						      (string-substitute
-						       "%waivername%" hed rule-string #t) #t) #t))
-				     (res            #f))
-				(debug:print 0 *default-log-port* "INFO: waiver command is \"" processed-cmd "\"")
-				(if (eq? (system processed-cmd) 0)
-				    (if (null? tal)
-					#t
-					(loop (car tal)(cdr tal)))
-				    #f))))))
-	    (pop-directory)
-	    result)))))
-
-;; Do not rpc this one, do the underlying calls!!!
-(define (tests:test-set-status! run-id test-id state status comment dat #!key (work-area #f))
-  (let* ((real-status status)
-	 (otherdat    (if dat dat (make-hash-table)))
-	 (testdat     (rmt:get-test-info-by-id run-id test-id))
-	 (test-name   (db:test-get-testname  testdat))
-	 (item-path   (db:test-get-item-path testdat))
-	 ;; before proceeding we must find out if the previous test (where all keys matched except runname)
-	 ;; was WAIVED if this test is FAIL
-
-	 ;; NOTES:
-	 ;;  1. Is the call to test:get-previous-run-record remotified?
-	 ;;  2. Add test for testconfig waiver propagation control here
-	 ;;
-	 (prev-test   (if (equal? status "FAIL")
-			  (rmt:get-previous-test-run-record run-id test-name item-path)
-			  #f))
-	 (waived   (if prev-test
-		       (if prev-test ;; true if we found a previous test in this run series
-			   (let ((prev-status  (db:test-get-status  prev-test))
-				 (prev-state   (db:test-get-state   prev-test))
-				 (prev-comment (db:test-get-comment prev-test)))
-			     (debug:print 4 *default-log-port* "prev-status " prev-status ", prev-state " prev-state ", prev-comment " prev-comment)
-			     (if (and (equal? prev-state  "COMPLETED")
-				      (equal? prev-status "WAIVED"))
-				 (if comment
-				     comment
-				     prev-comment) ;; waived is either the comment or #f
-				 #f))
-			   #f)
-		       #f)))
-    (if (and waived 
-	     (tests:check-waiver-eligibility testdat prev-test))
-	(set! real-status "WAIVED"))
-
-    (debug:print 4 *default-log-port* "real-status " real-status ", waived " waived ", status " status)
-
-    ;; update the primary record IF state AND status are defined
-    (if (and state status)
-	(begin
-	  (rmt:set-state-status-and-roll-up-items run-id test-id item-path state real-status (if waived waived comment))
-	  ;; (mt:process-triggers run-id test-id state real-status) ;; triggers are called in test-set-state-status
-	  ))
-    
-    ;; if status is "AUTO" then call rollup (note, this one modifies data in test
-    ;; run area, it does remote calls under the hood.
-    ;; (if (and test-id state status (equal? status "AUTO")) 
-    ;; 	(rmt:test-data-rollup run-id test-id status))
-
-    ;; add metadata (need to do this way to avoid SQL injection issues)
-
-    ;; :first_err
-    ;; (let ((val (hash-table-ref/default otherdat ":first_err" #f)))
-    ;;   (if val
-    ;;       (sqlite3:execute db "UPDATE tests SET first_err=? WHERE run_id=? AND testname=? AND item_path=?;" val run-id test-name item-path)))
-    ;; 
-    ;; ;; :first_warn
-    ;; (let ((val (hash-table-ref/default otherdat ":first_warn" #f)))
-    ;;   (if val
-    ;;       (sqlite3:execute db "UPDATE tests SET first_warn=? WHERE run_id=? AND testname=? AND item_path=?;" val run-id test-name item-path)))
-
-    (let ((category (hash-table-ref/default otherdat ":category" ""))
-	  (variable (hash-table-ref/default otherdat ":variable" ""))
-	  (value    (hash-table-ref/default otherdat ":value"    #f))
-	  (expected (hash-table-ref/default otherdat ":expected" "n/a"))
-	  (tol      (hash-table-ref/default otherdat ":tol"      "n/a"))
-	  (units    (hash-table-ref/default otherdat ":units"    ""))
-	  (type     (hash-table-ref/default otherdat ":type"     ""))
-	  (dcomment (hash-table-ref/default otherdat ":comment"  "")))
-      (debug:print 4 *default-log-port* 
-		   "category: " category ", variable: " variable ", value: " value
-		   ", expected: " expected ", tol: " tol ", units: " units)
-      (if (and value) ;; require only value; BB was- all three required
-	  (let ((dat (conc category ","
-			   variable ","
-			   value    ","
-			   expected ","
-			   tol      ","
-			   units    ","
-			   dcomment ",," ;; extra comma for status
-			   type     )))
-	    ;; This was run remote, don't think that makes sense. Perhaps not, but that is the easiest path for the moment.
-	    (rmt:csv->test-data run-id test-id
-				dat)
-	    ;; This was added in check-in a5adfa3f9a. Message was: "...added delay in set-values to allow for delayed write on server start"
-	    ;; I'm inserting an arbitrary rmt: call to force/ensure that the server is available to (hopefully) prevent a communication issue.
-	    (rmt:get-var "MEGATEST_VERSION") ;; this does NOTHING but ensure the server is reachable. This is almost certainly NOT needed :)
-            ;; BB - commentiong out arbitrary 10 second wait (thread-sleep! 10) ;; add 10 second delay before quit incase rmt needs time to start a server.
-            )))
-      
-    ;; need to update the top test record if PASS or FAIL and this is a subtest
-    ;;;;;; (if (not (equal? item-path ""))
-    ;;;;;;     (rmt:set-state-status-and-roll-up-items run-id test-name item-path state status #f) ;;;;;)
-
-    (if (or (and (string? comment)
-		 (string-match (regexp "\\S+") comment))
-	    waived)
-	(let ((cmt  (if waived waived comment)))
-	  (rmt:general-call 'set-test-comment run-id cmt test-id)))))
-
-(define (tests:test-set-toplog! run-id test-name logf) 
-  (rmt:general-call 'tests:test-set-toplog run-id logf run-id test-name))
-
-(define (tests:summarize-items run-id test-id test-name force)
-  ;; if not force then only update the record if one of these is true:
-  ;;   1. logf is "log/final.log
-  ;;   2. logf is same as outputfilename
-  (let* ((outputfilename (conc "megatest-rollup-" test-name ".html"))
-	 (orig-dir       (current-directory))
-	 (logf-info      (rmt:test-get-logfile-info run-id test-name))
-	 (logf           (if logf-info (cadr logf-info) #f))
-	 (path           (if logf-info (car  logf-info) #f)))
-    ;; This query finds the path and changes the directory to it for the test
-    (if (and (string? path)
-	     (directory? path)) ;; can get #f here under some wierd conditions. why, unknown ...
-	(begin
-	  (debug:print 4 *default-log-port* "Found path: " path)
-	  (change-directory path))
-	;; (set! outputfilename (conc path "/" outputfilename)))
-	(debug:print-error 0 *default-log-port* "summarize-items for run-id=" run-id ", test-name=" test-name ", no such path: " path))
-    (debug:print 4 *default-log-port* "summarize-items with logf " logf ", outputfilename " outputfilename " and force " force)
-    (if (or (equal? logf "logs/final.log")
-	    (equal? logf outputfilename)
-	    force)
-	(let ((my-start-time (current-seconds))
-	      (lockf         (conc outputfilename ".lock")))
-	  (let loop ((have-lock  (common:simple-file-lock lockf)))
-	    (if have-lock
-		(let ((script (configf:lookup *configdat* "testrollup" test-name)))
-		  (print "Obtained lock for " outputfilename)
-		  (rmt:set-state-status-and-roll-up-items run-id test-name "" #f #f #f)
-		  (if script
-		      (system (conc script " > " outputfilename " & "))
-		      (tests:generate-html-summary-for-iterated-test run-id test-id test-name outputfilename))
-		  (common:simple-file-release-lock lockf)
-		  (change-directory orig-dir)
-		  ;; NB// tests:test-set-toplog! is remote internal...
-		  (tests:test-set-toplog! run-id test-name outputfilename))
-		;; didn't get the lock, check to see if current update started later than this 
-		;; update, if so we can exit without doing any work
-		(if (> my-start-time (handle-exceptions
-					 exn
-				       (begin
-					 (print "failed to get mod time on " lockf ", exn=" exn)
-					 0)
-				       (file-modification-time lockf)))
-		    ;; we started since current re-gen in flight, delay a little and try again
-		    (begin
-		      (debug:print-info 1 *default-log-port* "Waiting to update " outputfilename ", another test currently updating it")
-		      (thread-sleep! (+ 5 (random 5))) ;; delay between 5 and 10 seconds
-		      (loop (common:simple-file-lock lockf))))))))))
-
-(define (tests:generate-html-summary-for-iterated-test run-id test-id test-name outputfilename)
-  (let ((counts              (make-hash-table))
-	(statecounts         (make-hash-table))
-	(outtxt              "")
-	(tot                 0)
-	(testdat             (rmt:test-get-records-for-index-file run-id test-name)))
-    (with-output-to-file outputfilename
-      (lambda ()
-	(set! outtxt (conc outtxt "<html><title>Summary: " test-name 
-			   "</title><body><h2>Summary for " test-name "</h2>"))
-	(for-each
-	 (lambda (testrecord)
-	   (let ((id             (vector-ref testrecord 0))
-		 (itempath       (vector-ref testrecord 1))
-		 (state          (vector-ref testrecord 2))
-		 (status         (vector-ref testrecord 3))
-		 (run_duration   (vector-ref testrecord 4))
-		 (logf           (vector-ref testrecord 5))
-		 (comment        (vector-ref testrecord 6)))
-	     (hash-table-set! counts status (+ 1 (hash-table-ref/default counts status 0)))
-	     (hash-table-set! statecounts state (+ 1 (hash-table-ref/default statecounts state 0)))
-	     (set! outtxt (conc outtxt "<tr>"
-				;; "<td><a href=\"" itempath "/" logf "\"> " itempath "</a></td>" 
-				"<td><a href=\"" itempath "/test-summary.html\"> " itempath "</a></td>" 
-				"<td>" state    "</td>" 
-				"<td><font color=" (common:get-color-from-status status)
-				">"   status   "</font></td>"
-				"<td>" (if (equal? comment "")
-					   "&nbsp;"
-					   comment) "</td>"
-					   "</tr>"))))
-	 (if (list? testdat)
-	     testdat
-	     (begin
-	       (print "ERROR: failed to get records with rmt:test-get-records-for-index-file run-id=" run-id "test-name=" test-name)
-	       '())))
-	
-	(print "<table><tr><td valign=\"top\">")
-	;; Print out stats for status
-	(set! tot 0)
-	(print "<table cellspacing=\"0\" border=\"1\"><tr><td colspan=\"2\"><h2>State stats</h2></td></tr>")
-	(for-each (lambda (state)
-		    (set! tot (+ tot (hash-table-ref statecounts state)))
-		    (print "<tr><td>" state "</td><td>" (hash-table-ref statecounts state) "</td></tr>"))
-		  (hash-table-keys statecounts))
-	(print "<tr><td>Total</td><td>" tot "</td></tr></table>")
-	(print "</td><td valign=\"top\">")
-	;; Print out stats for state
-	(set! tot 0)
-	(print "<table cellspacing=\"0\" border=\"1\"><tr><td colspan=\"2\"><h2>Status stats</h2></td></tr>")
-	(for-each (lambda (status)
-		    (set! tot (+ tot (hash-table-ref counts status)))
-		    (print "<tr><td><font color=\"" (common:get-color-from-status status) "\">" status
-			   "</font></td><td>" (hash-table-ref counts status) "</td></tr>"))
-		  (hash-table-keys counts))
-	(print "<tr><td>Total</td><td>" tot "</td></tr></table>")
-	(print "</td></td></tr></table>")
-	
-	(print "<table cellspacing=\"0\" border=\"1\">" 
-	       "<tr><td>Item</td><td>State</td><td>Status</td><td>Comment</td>"
-	       outtxt "</table></body></html>")
-	;; (release-dot-lock outputfilename)
-	;;(rmt:update-run-stats 
-	;; run-id
-	;; (hash-table-map
-	;;  state-status-counts
-	;;  (lambda (key val)
-	;;	(append key (list val)))))
-	))))
-
-(define tests:css-jscript-block
-#<<EOF
-<style type="text/css">
-ul.LinkedList { display: block; }
-/* ul.LinkedList ul { display: none; } */
-.HandCursorStyle { cursor: pointer; cursor: hand; }  /* For IE */
-th {background-color: #8c8c8c;}
-td.test {background-color: #d9dbdd;}
-td.PASS {background-color: #347533;}
-td.FAIL {background-color: #cc2812;}
-td.SKIP{background-color: #FFD733;}
-td.WARN {background-color: #EA8724;}
-td.WAIVED {background-color: #838A12;}
-td.ABORT{background-color: #EA24B7;}
-.PASS .link, .SKIP .link, .WARN .link,.WAIVED .link,.ABORT .link, .FAIL .link{color: #FFFFFF;}
-
-
-</style>
-
-
-  <script type="text/JavaScript">
-
-    function filtersome() {
-  $("tr").show();
-  $(".test").filter(
-    function() {
-      var names = $('#testname').val().split(',');
-      var good=1;
-      for (var i=0, len=names.length; i<len; i++) {
-        var uname=names[i];
-        console.log("Trying to check for " + uname); 
-        if($(this).text().indexOf(uname) != -1) {
-          good= 0;
-          console.log("Found "+uname);
-        }
-      }
-      return good; 
-    }
-  ).parent().hide();
-//  $(".sum").show();
-}
-  
-    // Add this to the onload event of the BODY element
-    function addEvents() {
-      activateTree(document.getElementById("LinkedList1"));
-    }
-
-    // This function traverses the list and add links 
-    // to nested list items
-    function activateTree(oList) {
-      // Collapse the tree
-      for (var i=0; i < oList.getElementsByTagName("ul").length; i++) {
-        oList.getElementsByTagName("ul")[i].style.display="none";            
-      }                                                                  
-      // Add the click-event handler to the list items
-      if (oList.addEventListener) {
-        oList.addEventListener("click", toggleBranch, false);
-      } else if (oList.attachEvent) { // For IE
-        oList.attachEvent("onclick", toggleBranch);
-      }
-      // Make the nested items look like links
-      addLinksToBranches(oList);
-    }
-
-    // This is the click-event handler
-    function toggleBranch(event) {
-      var oBranch, cSubBranches;
-      if (event.target) {
-        oBranch = event.target;
-      } else if (event.srcElement) { // For IE
-        oBranch = event.srcElement;
-      }
-      cSubBranches = oBranch.getElementsByTagName("ul");
-      if (cSubBranches.length > 0) {
-        if (cSubBranches[0].style.display == "block") {
-          cSubBranches[0].style.display = "none";
-        } else {
-          cSubBranches[0].style.display = "block";
-        }
-      }
-    }
-
-    // This function makes nested list items look like links
-    function addLinksToBranches(oList) {
-      var cBranches = oList.getElementsByTagName("li");
-      var i, n, cSubBranches;
-      if (cBranches.length > 0) {
-        for (i=0, n = cBranches.length; i < n; i++) {
-          cSubBranches = cBranches[i].getElementsByTagName("ul");
-          if (cSubBranches.length > 0) {
-            addLinksToBranches(cSubBranches[0]);
-            cBranches[i].className = "HandCursorStyle";
-            cBranches[i].style.color = "blue";
-            cSubBranches[0].style.color = "black";
-            cSubBranches[0].style.cursor = "auto";
-          }
-        }
-      }
-    }
-  </script>
-EOF
-)
-
-(define tests:css-jscript-block-dynamic 
-#<<EOF
-           <script src= ./jquery3.1.0.js></script> 
-EOF
-)
-
-(define  (test:js-block javascript-lib)
-   (conc  "<script src=" javascript-lib "></script>" ))
-
-
-(define tests:css-jscript-block-static (test:js-block *java-script-lib*))
-
-(define (tests:css-jscript-block-cond dynamic) 
-      (if (equal? dynamic  #t)
-       tests:css-jscript-block-dynamic
-       tests:css-jscript-block-static))
-
-       
-(define (tests:run-record->test-path run numkeys)
-   (append (take (vector->list run) numkeys)
-	   (list (vector-ref run (+ 1 numkeys)))))
-
-
-(define (tests:get-rest-data runs header numkeys)
-   (let ((resh (make-hash-table)))
-   (for-each
-     (lambda (run)
-        (let* ((run-id (db:get-value-by-header run header "id"))
-               (run-dir      (tests:run-record->test-path run numkeys))
-	       (test-data    (rmt:get-tests-for-run
-				   run-id
-                                   "%"       ;; testnamepatt
-				   '()        ;; states
-				   '()        ;; statuses
-				   #f         ;; offset
-				   #f         ;; num-to-get
-				   #f         ;; hide/not-hide
-				   #f         ;; sort-by
-				   #f         ;; sort-order
-				   #f         ;; 'shortlist                           ;; qrytype
-                                   0         ;; last update
-				   #f)))
-            
-            (map (lambda (test)
-                 (let* ((test-name (vector-ref test 2))
-                        (test-html-path (conc (vector-ref test 10) "/" (vector-ref test 13)))
-                        (test-item (conc test-name ":" (vector-ref test 11)))
-                        (test-status (vector-ref test 4)))
-                         
-                (if (not (hash-table-ref/default resh test-name  #f))
-                      (hash-table-set! resh test-name   (make-hash-table)))
-                (if (not (hash-table-ref/default (hash-table-ref/default resh test-name  #f)  test-item  #f))
-                       (hash-table-set! (hash-table-ref/default resh test-name  #f) test-item   (make-hash-table))) 
-               (hash-table-set!  (hash-table-ref/default (hash-table-ref/default resh test-name  #f) test-item #f) run-id (list test-status test-html-path)))) 
-        test-data)))
-      runs)
-   resh))
-
-
-;; tests:genrate dashboard body 
-;;
-
-(define (tests:dashboard-body page pg-size keys numkeys  total-runs linktree area-name get-prev-links get-next-links flag run-patt target-patt)
-  (let* ((start (* page pg-size)) 
-					;(runsdat   (rmt:get-runs "%" pg-size start (map (lambda (x)(list x "%")) keys)))
-         (runsdat   (rmt:get-runs-by-patt  keys run-patt target-patt start pg-size #f 0 sort-order: "desc"))
-					; db:get-runs-by-patt   keys runnamepatt targpatt offset limit fields last-update   
-	 (header    (vector-ref runsdat 0))
-	 (runs      (vector-ref runsdat 1))
-         (ctr 0)
-         (test-runs-hash (tests:get-rest-data runs header numkeys))
-         (test-list (hash-table-keys test-runs-hash))) 
-    
-    (s:html tests:css-jscript-block (tests:css-jscript-block-cond flag)
-	    (s:title "Summary for " area-name)
-	    (s:body 'onload "addEvents();"
-		    (get-prev-links page linktree)
-		    (get-next-links page linktree total-runs)
-		    
-		    (s:h1 "Summary for " area-name)
-		    (s:h3 "Filter" )
-		    (s:input 'type "text"  'name "testname" 'id "testname" 'length "30" 'onkeyup "filtersome()")
-		    ;; top list
-		    
-		    (s:table 'id "LinkedList1" 'border "1" 'cellspacing 0
-			     (map (lambda (key)
-				    (let* ((res (s:tr 'class "something" 
-						      (s:th key )
-						      (map (lambda (run)
-							     (s:th  (vector-ref run ctr)))
-							   runs))))
-				      (set! ctr (+ ctr 1))
-				      res))
-				  keys)
-			     (s:tr
-			      (s:th "Run Name")
-			      (map (lambda (run)
-				     (s:th (db:get-value-by-header run header "runname")))
-				   runs))
-			     
-			     (map (lambda (test-name)
-				    (let* ((item-hash (hash-table-ref/default test-runs-hash test-name  #f))
-					   (item-keys (sort (hash-table-keys item-hash) string<=?))) 
-				      (map (lambda (item-name)  
-  		                             (let* ((res (s:tr  'class item-name
-								(s:td  item-name 'class "test" )
-								(map (lambda (run)
-								       (let* ((run-test (hash-table-ref/default item-hash item-name  #f))
-									      (run-id (db:get-value-by-header run header "id"))
-									      (result (hash-table-ref/default run-test run-id "n/a"))
-					;(relative-path (get-relative-path)) 
-									      (status (if (string? result)
-											  result
-											  (car result)))
-									      (link (if (string? result)
-											result
-											(if (equal? flag #t) 
-											    (s:a (car result) 'href (conc "./test_log?runid=" run-id "&testname="  item-name ))
-											    (s:a (car result) 'href (string-substitute  (conc linktree "/")  "" (cadr result)  "-"))))))
-									 (s:td  link 'class status)))
-								     runs))))
-					       res))
-					   item-keys)))
-				  test-list)))))) 
-
-;; (tests:create-html-tree "test-index.html")
-;;
-(define (tests:create-html-tree outf)
-  (let* ((lockfile  (conc outf ".lock"))
-	 (runs-to-process '())
-         (linktree  (common:get-linktree))
-         (area-name (common:get-testsuite-name))
-	 (keys      (rmt:get-keys))
-	 (numkeys   (length keys))
-         (run-patt (or (args:get-arg "-run-patt")
-		       (args:get-arg "-runname")
-		       "%"))
-         (target (or  (args:get-arg "-target-patt") 
-		      (args:get-arg "-target")
-                      "%"))
-         (targlist (string-split target "/"))
-         (numtarg  (length targlist))  
-         (targtweaked (if (> numkeys numtarg)
-			  (append targlist (make-list (- numkeys numtarg) "%"))
-			  targlist))
-         (target-patt (string-join targtweaked "/"))
-					;(total-runs  (rmt:get-num-runs "%")) ;;this needs to be changed to filter by target
-	 (total-runs (rmt:get-runs-cnt-by-patt run-patt target-patt keys )) 
-         (pg-size 10))
-    (if (common:simple-file-lock lockfile)
-        (begin
-					;(print total-runs)    
-	  (let loop ((page 0))
-	    (let* ((oup            (open-output-file (or outf (conc linktree "/page" page ".html"))))
-		   (get-prev-links (lambda (page linktree )   
-				     (let* ((link  (if (not (eq? page 0))
-						       (s:a "&lt;&lt;prev" 'href (conc  "page" (- page 1) ".html"))
-						       (s:a "" 'href (conc   "page"  page ".html")))))
-				       link)))
-		   (get-next-links (lambda (page linktree total-runs)   
-				     (let* ((link  (if (> total-runs (+ 10 (* page pg-size)))
-						       (s:a "next&gt;&gt;" 'href (conc  "page"  (+ page 1) ".html"))
-						       (s:a "" 'href (conc   "page" page  ".html")))))
-				       link))) )
-	      (print "total runs: " total-runs) 
-	      (s:output-new
-	       oup
-	       (tests:dashboard-body page pg-size keys numkeys total-runs linktree area-name get-prev-links get-next-links #f run-patt target-patt)) ;; update this function
-	      (close-output-port oup)
-					; (set! page (+ 1 page))
-	      (if (> total-runs (* (+ 1 page) pg-size))
-		  (loop (+ 1  page)))))
-	  (common:simple-file-release-lock lockfile))
-	(begin
-	  (debug-print 0 *default-log-port* "Failed to get lock on file outf, lockfile: " lockfile) #f))))
-
-
-(define (tests:readlines filename)
-  (call-with-input-file filename
-    (lambda (p)
-      (let loop ((line (read-line p))
-                 (result '()))
-        (if (eof-object? line)
-            (reverse result)
-            (loop (read-line p) (cons line result)))))))
-
-(define (tests:get-test-log run-id test-name item-name)
-  (let* ((test-data    (rmt:get-tests-for-run
-				   (string->number run-id)
-                                    test-name      ;; testnamepatt
-				   '()        ;; states
-				   '()        ;; statuses
-				   #f         ;; offset
-				   #f         ;; num-to-get
-				   #f         ;; hide/not-hide
-				   #f         ;; sort-by
-				   #f         ;; sort-order
-				   #f         ;; 'shortlist                           ;; qrytype
-                                   0         ;; last update
-				   #f))
-         (path "")
-         (found 0))
-    (debug:print-info 0 *default-log-port* "found: " found )
-
-   (let loop ((hed (car test-data))
-		 (tal (cdr test-data)))
-          (debug:print-info 0 *default-log-port* "item: " (vector-ref hed 11) (vector-ref hed 10) "/" (vector-ref hed 13))
-
-	(if (equal? (vector-ref hed 11) item-name)
-            (begin
-              (set! found 1) 
-	      (set! path (conc (vector-ref hed 10) "/" (vector-ref hed 13)))))
-	    (if (and (not (null? tal)) (equal? found 0))
-		(loop (car tal)(cdr tal))))
-   (if (equal? path "")
-     "<H2>Data not found</H2>"
-     (string-join (tests:readlines path) "\n"))))
+	  
+
+;;======================================================================
+;; html output from server
+;;======================================================================
 
 
 (define (tests:dynamic-dboard page)
 ;(define (tests:create-html-tree o)
  (let* (
 ;(page "1")
           (linktree  (common:get-linktree))
-         (area-name (common:get-testsuite-name))
+         (area-name (common:get-area-name))
 	       (keys      (rmt:get-keys))
 	       (numkeys   (length keys))
          (targtweaked (make-list numkeys "%"))
          (target-patt (string-join targtweaked "/"))
          (total-runs  (rmt:get-num-runs "%"))
@@ -990,11 +59,11 @@
 
 (define (tests:create-html-summary outf)
  (let* ((lockfile  (conc outf ".lock"))
         (linktree  (common:get-linktree))
 				(keys      (rmt:get-keys))
-        (area-name (common:get-testsuite-name))
+        (area-name (common:get-area-name))
         (run-patt (or (args:get-arg "-run-patt")
                         (args:get-arg "-runname")
                         "%"))
         (target (or (args:get-arg "-target-patt")
                         (args:get-arg "-target")
@@ -1185,11 +254,11 @@
    (let* ((lockfile  (conc outf ".lock"))
 	 (runs-to-process '()))
     (if (common:simple-file-lock lockfile)
 	(let* ((linktree  (common:get-linktree))
 	       (oup       (open-output-file (or outf (conc linktree "/runs-index.html"))))
-	       (area-name (common:get-testsuite-name))
+	       (area-name (common:get-area-name))
 	       (keys      (rmt:get-keys))
 	       (numkeys   (length keys))
 	       (runsdat   (rmt:get-runs "%" #f #f (map (lambda (x)(list x "%")) keys)))
 	       (header    (vector-ref runsdat 0))
 	       (runs      (vector-ref runsdat 1))
@@ -1214,11 +283,11 @@
 							(let* ((targ-path (string-intersperse p "/"))
                                                                (full-path (conc linktree "/" targ-path))
                                                                (run-name  (car (reverse p))))
                                                           (if (and (common:file-exists? full-path)
                                                                    (directory?   full-path)
-                                                                   (file-write-access? full-path))
+                                                                   (file-writable? full-path))
                                                               (s:a run-name 'href (conc targ-path "/run-summary.html"))
                                                               (begin
                                                                 (debug:print 0 *default-log-port* "INFO: Can't create " targ-path "/run-summary.html")
                                                                 (conc run-name " (Not able to create summary at " targ-path ")")))))))))))
           (close-output-port oup)
@@ -1253,11 +322,11 @@
                     (tests-htree (common:list->htree tests-tree-dat))
                     (html-dir    (conc linktree "/" (string-intersperse run-dir "/")))
                     (html-path   (conc html-dir "/run-summary.html"))
                     (oup         (if (and (common:file-exists? html-dir)
                                           (directory?   html-dir)
-                                          (file-write-access? html-dir))
+                                          (file-writable? html-dir))
                                      (open-output-file  html-path)
                                      #f)))
                ;; (print "run-dir: " run-dir ", tests-tree-dat: " tests-tree-dat)
                (if oup
                    (begin
@@ -1285,11 +354,11 @@
                                                                                          alt-file
                                                                                          std-file))
                                                                           (run-name  (car (reverse p))))
                                                                      (if (and (not (common:file-exists? full-targ))
                                                                               (directory? full-targ)
-                                                                              (file-write-access? full-targ))
+                                                                              (file-writable? full-targ))
                                                                          (tests:summarize-test 
                                                                           run-id 
                                                                           (rmt:get-test-id run-id test-name item-path)))
                                                                      (if (common:file-exists? full-targ)
                                                                          (s:a run-name 'href html-file)
@@ -1300,702 +369,128 @@
                      (close-output-port oup)))))
            runs)
           #t)
 	#f)))
 
-
-
-
-
-
-
-;; CHECK - WAS THIS ADDED OR REMOVED? MANUAL MERGE WITH API STUFF!!!
-;;
-;; get a pretty table to summarize steps
-;;
-;; (define (dcommon:process-steps-table steps);; db test-id #!key (work-area #f))
-(define (tests:process-steps-table steps);; db test-id #!key (work-area #f))
-;;  (let ((steps   (db:get-steps-for-test db test-id work-area: work-area)))
-    ;; organise the steps for better readability
-    (let ((res (make-hash-table)))
-      (for-each 
-       (lambda (step)
-	 (debug:print 6 *default-log-port* "step=" step)
-	 (let ((record (hash-table-ref/default 
-			res 
-			(tdb:step-get-stepname step)
-			;;           0                      1    2    3       4         5       6       7
-			;;        stepname                start end status Duration  Logfile Comment  first-id
-			(vector (tdb:step-get-stepname step) ""   "" ""     ""        ""     ""       #f))))
-	   (debug:print 6 *default-log-port* "record(before) = " record 
-			"\nid:       " (tdb:step-get-id step)
-			"\nstepname: " (tdb:step-get-stepname step)
-			"\nstate:    " (tdb:step-get-state step)
-			"\nstatus:   " (tdb:step-get-status step)
-			"\ntime:     " (tdb:step-get-event_time step))
-	   (if (not (vector-ref record 7))(vector-set! record 7 (tdb:step-get-id step))) ;; do not clobber the id if previously set
-	   (case (string->symbol (tdb:step-get-state step))
-	     ((start)(vector-set! record 1 (tdb:step-get-event_time step))
-	      (vector-set! record 3 (if (equal? (vector-ref record 3) "")
-					(tdb:step-get-status step)))
-	      (if (> (string-length (tdb:step-get-logfile step))
-		     0)
-		  (vector-set! record 5 (tdb:step-get-logfile step))))
-	     ((end)  
-	      (vector-set! record 2 (any->number (tdb:step-get-event_time step)))
-	      (vector-set! record 3 (tdb:step-get-status step))
-	      (vector-set! record 4 (let ((startt (any->number (vector-ref record 1)))
-					  (endt   (any->number (vector-ref record 2))))
-				      (debug:print 4 *default-log-port* "record[1]=" (vector-ref record 1) 
-						   ", startt=" startt ", endt=" endt
-						   ", get-status: " (tdb:step-get-status step))
-				      (if (and (number? startt)(number? endt))
-					  (seconds->hr-min-sec (- endt startt)) "-1")))
-	      (if (> (string-length (tdb:step-get-logfile step))
-		     0)
-		  (vector-set! record 5 (tdb:step-get-logfile step)))
-	      (if (> (string-length (tdb:step-get-comment step))
-		     0)
-		  (vector-set! record 6 (tdb:step-get-comment step))))
-	     (else
-	      (vector-set! record 2 (tdb:step-get-state step))
-	      (vector-set! record 3 (tdb:step-get-status step))
-	      (vector-set! record 4 (tdb:step-get-event_time step))
-	      (vector-set! record 6 (tdb:step-get-comment step))))
-	   (hash-table-set! res (tdb:step-get-stepname step) record)
-	   (debug:print 6 *default-log-port* "record(after)  = " record 
-			"\nid:       " (tdb:step-get-id step)
-			"\nstepname: " (tdb:step-get-stepname step)
-			"\nstate:    " (tdb:step-get-state step)
-			"\nstatus:   " (tdb:step-get-status step)
-			"\ntime:     " (tdb:step-get-event_time step))))
-       ;; (else   (vector-set! record 1 (tdb:step-get-event_time step)))
-       (sort steps (lambda (a b)
-		     (cond
-		      ((<   (tdb:step-get-event_time a)(tdb:step-get-event_time b)) #t)
-		      ((eq? (tdb:step-get-event_time a)(tdb:step-get-event_time b)) 
-		       (<   (tdb:step-get-id a)        (tdb:step-get-id b)))
-		      (else #f)))))
-      res))
-
-;; 
-;;
-(define (tests:get-compressed-steps run-id test-id)
-  (let* ((steps-data  (rmt:get-steps-for-test run-id test-id)) ;;      0       1    2    3       4       5       6      7       
-	 (comprsteps  (tests:process-steps-table steps-data))) ;; #<stepname start end status Duration Logfile Comment id>
-    (map (lambda (x)
-	   ;; take advantage of the \n on time->string
-	   (vector    ;; we are constructing basically the original vector but collapsing start end records
-	    (vector-ref x 0)                              ;; id        0
-	    (let ((s (vector-ref x 1)))
-	      (if (number? s)(seconds->time-string s) s)) ;; starttime 1
-	    (let ((s (vector-ref x 2)))
-	      (if (number? s)(seconds->time-string s) s)) ;; endtime   2
-	    (vector-ref x 3)                              ;; status    3    
-	    (vector-ref x 4)                              ;; duration  4
-	    (vector-ref x 5)                              ;; logfile   5
-	    (vector-ref x 6)                              ;; comment   6
-	    (vector-ref x 7)))                            ;; id        7
-	 (sort (hash-table-values comprsteps)
-	       (lambda (a b)
-		 (let ((time-a (vector-ref a 1))
-		       (time-b (vector-ref b 1))
-		       (id-a   (vector-ref a 7))
-		       (id-b   (vector-ref b 7)))
-		   (if (and (number? time-a)(number? time-b))
-		       (if (< time-a time-b)
-			   #t
-			   (if (eq? time-a time-b)
-			       (< id-a id-b)
-			       ;; (string<? (conc (vector-ref a 2))
-			       ;;	    (conc (vector-ref b 2)))
-			       #f))
-		       (string<? (conc time-a)(conc time-b)))))))))
-
-
-;; Save test state and status in to a file .final-status in the test directory
-;;
-(define (tests:save-final-status run-id test-id)
-  (let* ((test-dat  (rmt:get-test-info-by-id run-id test-id))
-	 (out-dir   (db:test-get-rundir test-dat))
-	 (status-file  (conc out-dir "/.final-status"))
-   )
-    ;; first verify we are able to write the output file
-    (if (not (file-write-access? out-dir))
-	    (debug:print 0 *default-log-port* "ERROR: cannot write .final-status to " out-dir)
-	    (let* 
-         ((outp      (open-output-file status-file))
-	       (status    (db:test-get-status   test-dat))
-         (state     (db:test-get-state    test-dat)))
-        (fprintf outp "~S\n" state) 
-        (fprintf outp "~S\n" status) 
-        (close-output-port outp)))))
-
-
-;; summarize test in to a file test-summary.html in the test directory
-;;
-(define (tests:summarize-test run-id test-id)
-  (let* ((test-dat  (rmt:get-test-info-by-id run-id test-id))
-	 (out-dir   (db:test-get-rundir test-dat))
-	 (out-file  (conc out-dir "/test-summary.html")))
-    ;; first verify we are able to write the output file
-    (if (not (file-write-access? out-dir))
-	(debug:print 0 *default-log-port* "ERROR: cannot write test-summary.html to " out-dir)
-	(let* (;; (steps-dat (rmt:get-steps-for-test run-id test-id))
-	       (test-name (db:test-get-testname test-dat))
-	       (item-path (db:test-get-item-path test-dat))
-	       (full-name (db:test-make-full-name test-name item-path))
-	       (oup       (open-output-file out-file))
-	       (status    (db:test-get-status   test-dat))
-	       (color     (common:get-color-from-status status))
-	       (logf      (db:test-get-final_logf test-dat))
-	       (steps-dat (tests:get-compressed-steps run-id test-id)))
-	  ;; (dcommon:get-compressed-steps #f 1 30045)
-	  ;; (#("wasting_time" "23:36:13" "23:36:21" "0" "8.0s" "wasting_time.log"))
-	
-	  (s:output-new
-	   oup
-	   (s:html
-	    (s:title "Summary for " full-name)
-	    (s:body 
-	     (s:h2 "Summary for " full-name)
-	     (s:table 'cellspacing "0" 'border "1"
-		      (s:tr (s:td "run id")   (s:td (db:test-get-run_id   test-dat))
-			    (s:td "test id")  (s:td (db:test-get-id       test-dat)))
-		      (s:tr (s:td "testname") (s:td test-name)
-			    (s:td "itempath") (s:td item-path))
-		      (s:tr (s:td "state")    (s:td (db:test-get-state    test-dat))
-			    (s:td "status")   (s:td (s:a 'href logf (s:font 'color color status))))
-		      (s:tr (s:td "TestDate") (s:td (seconds->work-week/day-time 
-						     (db:test-get-event_time test-dat)))
-			    (s:td "Duration") (s:td (seconds->hr-min-sec (db:test-get-run_duration test-dat)))))
-	     (s:h3 "Log files")
-	     (s:table 
-	      'cellspacing "0" 'border "1"
-	      (s:tr (s:td "Final log")(s:td (s:a 'href logf logf))))
-	     (s:table
-	      'cellspacing "0" 'border "1"
-	      (s:tr (s:td "Step Name")(s:td "Start")(s:td "End")(s:td "Status")(s:td "Duration")(s:td "Log File"))
-	      (map (lambda (step-dat)
-		     (s:tr (s:td (tdb:steps-table-get-stepname step-dat))
-			   (s:td (tdb:steps-table-get-start    step-dat))
-			   (s:td (tdb:steps-table-get-end      step-dat))
-			   (s:td (tdb:steps-table-get-status   step-dat))
-			   (s:td (tdb:steps-table-get-runtime  step-dat))
-			   (s:td (let ((step-log (tdb:steps-table-get-log-file step-dat)))
-				   (s:a 'href step-log step-log)))))
-		   steps-dat))
-	     )))
-	  (close-output-port oup)))))
-	  
-	  
-;; MUST BE CALLED local!
-;;
-(define (tests:test-get-paths-matching keynames target fnamepatt #!key (res '()))
-  ;; BUG: Move the values derived from args to parameters and push to megatest.scm
-  (let* ((testpatt   (or (args:get-arg "-testpatt")(args:get-arg "-testpatt") "%"))
-	 (statepatt  (or (args:get-arg "-state")   (args:get-arg ":state")    "%"))
-	 (statuspatt (or (args:get-arg "-status")  (args:get-arg ":status")   "%"))
-	 (runname    (or (args:get-arg "-runname") (args:get-arg ":runname")  "%"))
-	 (paths-from-db (rmt:test-get-paths-matching-keynames-target-new keynames target res
-					testpatt
-					statepatt
-					statuspatt
-					runname)))
-    (if fnamepatt
-	(apply append 
-	       (map (lambda (p)
-		      (if (directory-exists? p)
-			  (let ((glob-query (conc p "/" fnamepatt)))
-			    (handle-exceptions
-				exn
-			      (begin
-				(print "built-in glob on " glob-query ", failed, try using the shell. exn=" exn)
-				(with-input-from-pipe
-				 (conc "echo " glob-query)
-				 read-lines))  ;; we aren't going to try too hard. If glob breaks it is likely because someone tried to do */*/*.log or similar
-			      (glob glob-query)))
-			  '()))
-		    paths-from-db))
-	paths-from-db)))
-
-			      
-;;======================================================================
-;; Gather data from test/task specifications
-;;======================================================================
-
-;; (define (tests:get-valid-tests testsdir test-patts) ;;  #!key (test-names '()))
-;;   (let ((tests (glob (conc testsdir "/tests/*")))) ;; " (string-translate patt "%" "*")))))
-;;     (set! tests (filter (lambda (test)(common:file-exists? (conc test "/testconfig"))) tests))
-;;     (delete-duplicates
-;;      (filter (lambda (testname)
-;; 	       (tests:match test-patts testname #f))
-;; 	     (map (lambda (testp)
-;; 		    (last (string-split testp "/")))
-;; 		  tests)))))
-
-(define (tests:get-test-path-from-environment)
-  (if (and (getenv "MT_LINKTREE")
-	   (getenv "MT_TARGET")
-	   (getenv "MT_RUNNAME")
-	   (getenv "MT_TEST_NAME")
-	   (getenv "MT_ITEMPATH"))
-      (conc (getenv "MT_LINKTREE")  "/"
-	    (getenv "MT_TARGET")    "/"
-	    (getenv "MT_RUNNAME")   "/"
-	    (getenv "MT_TEST_NAME")
-	    (if (and (getenv "MT_ITEMPATH")
-                     (not (string=? "" (getenv "MT_ITEMPATH"))))
-		(conc "/" (getenv "MT_ITEMPATH"))
-                ""))
-      #f))
-
-;; if .testconfig exists in test directory read and return it
-;; else if have cached copy in *testconfigs* return it IFF there is a section "have fulldata"
-;; else read the testconfig file
-;;   if have path to test directory save the config as .testconfig and return it
-;;
-(define (tests:get-testconfig test-name item-path test-registry system-allowed #!key (force-create #f)(allow-write-cache #t)(wait-a-minute #f))
-  (let* ((use-cache    (common:use-cache?))
-	 (cache-path   (tests:get-test-path-from-environment))
-	 (cache-file   (and cache-path (conc cache-path "/.testconfig")))
-	 (cache-exists (and cache-file
-			    (not force-create)  ;; if force-create then pretend there is no cache to read
-			    (common:file-exists? cache-file)))
-	 (cached-dat   (if (and (not force-create)
-				cache-exists
-				use-cache)
-			   (handle-exceptions
-			       exn
-			     (begin
-			       (debug:print 0 *default-log-port* "failed to read " cache-file ", exn=" exn)
-			       #f) ;; any issues, just give up with the cached version and re-read
-			     (configf:read-alist cache-file))
-			   #f))
-         (test-full-name (if (and item-path (not (string-null? item-path)))
-                             (conc test-name "/" item-path)
-                             test-name)))
-    (if cached-dat
-	cached-dat
-	(let ((dat (hash-table-ref/default *testconfigs* test-full-name #f)))
-	  (if (and  dat ;; have a locally cached version
-		    (hash-table-ref/default dat "have fulldata" #f)) ;; marked as good data?
-	      dat
-	      ;; no cached data available
-	      (let* ((treg         (or test-registry
-				       (tests:get-all)))
-		     (test-path    (or (hash-table-ref/default treg test-name #f)
-                                       (let* ((local-tcdir (conc (getenv "MT_LINKTREE") "/"
-                                                                 (getenv "MT_TARGET") "/"
-                                                                 (getenv "MT_RUNNAME") "/"
-                                                                 test-name "/" item-path))
-                                              (local-tcfg (conc local-tcdir "/testconfig")))
-                                         (if (common:file-exists? local-tcfg)
-                                             local-tcdir
-                                             #f))
-				       (conc *toppath* "/tests/" test-name)))
-		     (test-configf (conc test-path "/testconfig"))
-		     (testexists   (let loopa ((tries-left 30))
-                                     (cond
-                                      (
-                                       (and (common:file-exists? test-configf)(file-read-access? test-configf))
-                                       #t)
-                                      (
-                                       (common:file-exists? test-configf)
-                                       (debug:print 0 *default-log-port* "WARNING: Cannot read testconfig file: "test-configf)
-                                       #f)
-                                      (
-                                       (and wait-a-minute (> tries-left 0))
-                                       (thread-sleep! 10)
-                                       (debug:print 0 *default-log-port* "WARNING: testconfig file does not exist: "test-configf" will retry in 10 seconds.  Tries left: "tries-left) ;; BB: this fires
-                                       (loopa (sub1 tries-left)))
-                                      (else
-                                       (debug:print 0 *default-log-port* "WARNING: testconfig file does not exist: "test-configf) ;; BB: this fires
-                                       #f))))
-		     (tcfg         (if testexists
-				       (read-config test-configf #f system-allowed
-						    environ-patt: (if system-allowed
-								      "pre-launch-env-vars"
-								      #f))
-				       #f)))
-		(if (and tcfg cache-file) (hash-table-set! tcfg "have fulldata" #t)) ;; mark this as fully read data
-		(if tcfg (hash-table-set! *testconfigs* test-full-name tcfg))
-		(if (and testexists
-			 cache-file
-			 (file-write-access? cache-path)
-			 allow-write-cache)
-		    (let ((tpath (conc cache-path "/.testconfig")))
-		      (debug:print-info 1 *default-log-port* "Caching testconfig for " test-name " in " tpath)
-                      (if (and tcfg (not (common:in-running-test?)))
-                          (configf:write-alist tcfg tpath))))
-		tcfg))))))
-  
-;; sort tests by priority and waiton
-;; Move test specific stuff to a test unit FIXME one of these days
-(define (tests:sort-by-priority-and-waiton test-records)
-  (if (eq? (hash-table-size test-records) 0)
-      '()
-      (let* ((mungepriority (lambda (priority)
-			      (if priority
-				  (let ((tmp (any->number priority)))
-				    (if tmp tmp (begin (debug:print-error 0 *default-log-port* "bad priority value " priority ", using 0") 0)))
-				  0)))
-	     (all-tests      (hash-table-keys test-records))
-	     (all-waited-on  (let loop ((hed (car all-tests))
-					(tal (cdr all-tests))
-					(res '()))
-			       (let* ((trec    (hash-table-ref test-records hed))
-				      (waitons (or (tests:testqueue-get-waitons trec) '())))
-				 (if (null? tal)
-				     (append res waitons)
-				     (loop (car tal)(cdr tal)(append res waitons))))))
-	     (sort-fn1 
-	      (lambda (a b)
-		(let* ((a-record   (hash-table-ref test-records a))
-		       (b-record   (hash-table-ref test-records b))
-		       (a-waitons  (or (tests:testqueue-get-waitons a-record) '()))
-		       (b-waitons  (or (tests:testqueue-get-waitons b-record) '()))
-		       (a-config   (tests:testqueue-get-testconfig  a-record))
-		       (b-config   (tests:testqueue-get-testconfig  b-record))
-		       (a-raw-pri  (configf:lookup a-config "requirements" "priority"))
-		       (b-raw-pri  (configf:lookup b-config "requirements" "priority"))
-		       (a-priority (mungepriority a-raw-pri))
-		       (b-priority (mungepriority b-raw-pri)))
-		  (tests:testqueue-set-priority! a-record a-priority)
-		  (tests:testqueue-set-priority! b-record b-priority)
-		  ;; (debug:print 0 *default-log-port* "a=" a ", b=" b ", a-waitons=" a-waitons ", b-waitons=" b-waitons)
-		  (cond
-		   ;; is 
-		   ((member a b-waitons)          ;; is b waiting on a?
-		    ;; (debug:print 0 *default-log-port* "case1")
-		    #t)
-		   ((member b a-waitons)          ;; is a waiting on b?
-		    ;; (debug:print 0 *default-log-port* "case2")
-		    #f)
-		   ((and (not (null? a-waitons))  ;; both have waitons - do not disturb
-			 (not (null? b-waitons)))
-		    ;; (debug:print 0 *default-log-port* "case2.1")
-		    #t)
-		   ((and (null? a-waitons)        ;; no waitons for a but b has waitons
-			 (not (null? b-waitons)))
-		    ;; (debug:print 0 *default-log-port* "case3")
-		    #f)
-		   ((and (not (null? a-waitons))  ;; a has waitons but b does not
-			 (null? b-waitons)) 
-		    ;; (debug:print 0 *default-log-port* "case4")
-		    #t)
-		   ((not (eq? a-priority b-priority)) ;; use
-		    (> a-priority b-priority))
-		   (else
-		    ;; (debug:print 0 *default-log-port* "case5")
-		    (string>? a b))))))
-	     
-	     (sort-fn2
-	      (lambda (a b)
-		(> (mungepriority (tests:testqueue-get-priority (hash-table-ref test-records a)))
-		   (mungepriority (tests:testqueue-get-priority (hash-table-ref test-records b)))))))
-	;; (let ((dot-res (tests:run-dot (tests:tests->dot test-records) "plain")))
-	;;   (debug:print "dot-res=" dot-res))
-	;; (let ((data (map cdr (filter
-	;;     		  (lambda (x)(equal? "node" (car x)))
-	;;     		  (map string-split (tests:easy-dot test-records "plain"))))))
-	;;   (map car (sort data (lambda (a b)
-	;;     		    (> (string->number (caddr a))(string->number (caddr b)))))))
-	;; ))
-	(sort all-tests sort-fn1)))) ;; avoid dealing with deleted tests, look at the hash table
-
-(define (tests:easy-dot test-records outtype)
-  (let-values (((fd temp-path) (file-mkstemp (conc "/tmp/" (current-user-name) ".XXXXXX"))))
-    (let ((all-testnames (hash-table-keys test-records))
-	  (temp-port     (open-output-file* fd)))
-      ;; (format temp-port "This file is ~A.~%" temp-path)
-      (format temp-port "digraph tests {\n")
-      (format temp-port "  size=4,8\n")
-      ;; (format temp-port "   splines=none\n")
-      (for-each
-       (lambda (testname)
-	 (let* ((testrec (hash-table-ref test-records testname))
-		(waitons (or (tests:testqueue-get-waitons testrec) '())))
-	   (for-each
-	    (lambda (waiton)
-	      (format temp-port (conc "   " waiton " -> " testname " [splines=ortho]\n")))
-	    waitons)))
-       all-testnames)
-      (format temp-port "}\n")
-      (close-output-port temp-port)
-      (with-input-from-pipe
-       (conc "env -i PATH=$PATH dot -T" outtype " < " temp-path)
-       (lambda ()
-	 (let ((res (read-lines)))
-	   ;; (delete-file temp-path)
-	   res))))))
-
-(define (tests:write-dot-file test-records fname sizex sizey)
-  (if (file-write-access? (pathname-directory fname))
-      (with-output-to-file fname
-	(lambda ()
-	  (map print (tests:tests->dot test-records sizex sizey))))))
-
-(define (tests:tests->dot test-records sizex sizey)
-  (let ((all-testnames (hash-table-keys test-records)))
-    (if (null? all-testnames)
-	'()
-	(let loop ((hed (car all-testnames))
-		   (tal (cdr all-testnames))
-		   (res (list "digraph tests {"
-			      (conc " size=\"" (or sizex 11) "," (or sizey 11) "\";")
-			      " ratio=0.95;"
-			      )))
-	  (let* ((testrec (hash-table-ref test-records hed))
-		 (waitons (or (tests:testqueue-get-waitons testrec) '()))
-		 (newres  (append res
-				  (if (null? waitons)
-				      (list (conc "   \"" hed "\" [shape=box];"))
-				      (map (lambda (waiton)
-					     (conc "   \"" waiton "\" -> \"" hed "\" [shape=box];"))
-					   waitons)
-				      ))))
-	    (if (null? tal)
-		(append newres (list "}"))
-		(loop (car tal)(cdr tal) newres)
-		))))))
-
-;; (tests:run-dot (list "digraph tests {" "a -> b" "}") "plain")
-
-(define (tests:run-dot indat outtype) ;; outtype is plain, fig, dot, etc. http://www.graphviz.org/content/output-formats
-  (let-values (((inp oup pid)(process "env -i PATH=$PATH dot" (list "-T" outtype))))
-    (with-output-to-port oup
-      (lambda ()
-	(map print indat)))
-    (close-output-port oup)
-    (let ((res (with-input-from-port inp
-		 (lambda ()
-		   (read-lines)))))
-      (close-input-port inp)
-      res)))
-
-;; read data from tmp file or create if not exists
-;; if exists regen in background
-;;
-(define (tests:lazy-dot testrecords  outtype sizex sizey)
-  (let ((dfile (conc "/tmp/." (current-user-name) "-" (server:mk-signature) ".dot"))
-	(fname (conc "/tmp/." (current-user-name) "-" (server:mk-signature) ".dotdat")))
-    (tests:write-dot-file testrecords dfile sizex sizey)
-    (if (common:file-exists? fname)
-	(let ((res (with-input-from-file fname
-		     (lambda ()
-		       (read-lines)))))
-	  (system (conc "env -i PATH=$PATH dot -T " outtype " < " dfile " > " fname "&"))
-	  res)
-	(begin
-	  (system (conc "env -i PATH=$PATH dot -T " outtype " < " dfile " > " fname))
-	  (with-input-from-file fname
-	    (lambda ()
-	      (read-lines)))))))
-	  
-
-;; for each test:
-;;   
-(define (tests:filter-non-runnable run-id testkeynames testrecordshash)
-  (let ((runnables '()))
-    (for-each
-     (lambda (testkeyname)
-       (let* ((test-record (hash-table-ref testrecordshash testkeyname))
-	      (test-name   (tests:testqueue-get-testname  test-record))
-	      (itemdat     (tests:testqueue-get-itemdat   test-record))
-	      (item-path   (tests:testqueue-get-item_path test-record))
-	      (waitons     (tests:testqueue-get-waitons   test-record))
-	      (keep-test   #t)
-	      (test-id     (rmt:get-test-id run-id test-name item-path))
-	      (tdat        (rmt:get-testinfo-state-status run-id test-id))) ;; (cdb:get-test-info-by-id *runremote* test-id)))
-	 (if tdat
-	     (begin
-	       ;; Look at the test state and status
-	       (if (or (and (member (db:test-get-status tdat) 
-				    '("PASS" "WARN" "WAIVED" "CHECK" "SKIP"))
-			    (equal? (db:test-get-state tdat) "COMPLETED"))
-		       (member (db:test-get-state tdat)
-				    '("INCOMPLETE" "KILLED")))
-		   (set! keep-test #f))
-
-	       ;; examine waitons for any fails. If it is FAIL or INCOMPLETE then eliminate this test
-	       ;; from the runnable list
-	       (if keep-test
-		   (for-each (lambda (waiton)
-			       ;; for now we are waiting only on the parent test
-			       (let* ((parent-test-id (rmt:get-test-id run-id waiton ""))
-				      (wtdat          (rmt:get-testinfo-state-status run-id test-id))) ;; (cdb:get-test-info-by-id *runremote* test-id)))
-				 (if (or (and (equal? (db:test-get-state wtdat) "COMPLETED")
-					      (member (db:test-get-status wtdat) '("FAIL" "ABORT")))
-					 (member (db:test-get-status wtdat)  '("KILLED"))
-					 (member (db:test-get-state wtdat)   '("INCOMPETE")))
-				 ;; (if (or (member (db:test-get-status wtdat)
-				 ;;        	 '("FAIL" "KILLED"))
-				 ;;         (member (db:test-get-state wtdat)
-				 ;;        	 '("INCOMPETE")))
-				     (set! keep-test #f)))) ;; no point in running this one again
-			     waitons))))
-	 (if keep-test (set! runnables (cons testkeyname runnables)))))
-     testkeynames)
-    runnables))
-
-;;======================================================================
-;; refactoring this block into tests:get-full-data from line 263 of runs.scm
-;;======================================================================
-;; hed is the test name
-;; test-records is a hash of test-name => test record
-(define (tests:get-full-data test-names test-records required-tests all-tests-registry)
-  (if (not (null? test-names))
-      (let loop ((hed (car test-names))
-		 (tal (cdr test-names)))         ;; 'return-procs tells the config reader to prep running system but return a proc
-	(debug:print-info 4 *default-log-port* "hed=" hed " at top of loop")
-        ;; don't know item-path at this time, let the testconfig get the top level testconfig
-	(let* ((config  (tests:get-testconfig hed #f all-tests-registry 'return-procs))
-	       (waitons (let ((instr (if config 
-					 (configf:lookup config "requirements" "waiton")
-					 (begin ;; No config means this is a non-existant test
-					   (debug:print-error 0 *default-log-port* "non-existent required test \"" hed "\", grep through your testconfigs to find and remove or create the test. Discarding and continuing.")
-					     ""))))
-			  (debug:print-info 8 *default-log-port* "waitons string is " instr)
-			  (string-split (cond
-					 ((procedure? instr)
-					  (let ((res (instr)))
-					    (debug:print-info 8 *default-log-port* "waiton procedure results in string " res " for test " hed)
-					    res))
-					 ((string? instr)     instr)
-					 (else 
-					  ;; NOTE: This is actually the case of *no* waitons! ;; (debug:print-error 0 *default-log-port* "something went wrong in processing waitons for test " hed)
-					  ""))))))
-	  (if (not config) ;; this is a non-existant test called in a waiton. 
-	      (if (null? tal)
-		  test-records
-		  (loop (car tal)(cdr tal)))
-	      (begin
-		(debug:print-info 8 *default-log-port* "waitons: " waitons)
-		;; check for hed in waitons => this would be circular, remove it and issue an
-		;; error
-		(if (member hed waitons)
-		    (begin
-		      (debug:print-error 0 *default-log-port* "test " hed " has listed itself as a waiton, please correct this!")
-		      (set! waitons (filter (lambda (x)(not (equal? x hed))) waitons))))
-		
-		;; (items   (items:get-items-from-config config)))
-		(if (not (hash-table-ref/default test-records hed #f))
-		    (hash-table-set! test-records
-				     hed (vector hed     ;; 0
-						 config  ;; 1
-						 waitons ;; 2
-						 (configf:lookup config "requirements" "priority")     ;; priority 3
-						 (let ((items      (hash-table-ref/default config "items" #f)) ;; items 4
-						       (itemstable (hash-table-ref/default config "itemstable" #f))) 
-						   ;; if either items or items table is a proc return it so test running
-						   ;; process can know to call items:get-items-from-config
-						   ;; if either is a list and none is a proc go ahead and call get-items
-						   ;; otherwise return #f - this is not an iterated test
-						   (cond
-						    ((procedure? items)      
-						     (debug:print-info 4 *default-log-port* "items is a procedure, will calc later")
-						     items)            ;; calc later
-						    ((procedure? itemstable)
-						     (debug:print-info 4 *default-log-port* "itemstable is a procedure, will calc later")
-						     itemstable)       ;; calc later
-						    ((filter (lambda (x)
-							       (let ((val (car x)))
-								 (if (procedure? val) val #f)))
-							     (append (if (list? items) items '())
-								     (if (list? itemstable) itemstable '())))
-						     'have-procedure)
-						    ((or (list? items)(list? itemstable)) ;; calc now
-						     (debug:print-info 4 *default-log-port* "items and itemstable are lists, calc now\n"
-								       "    items: " items " itemstable: " itemstable)
-						     (items:get-items-from-config config))
-						    (else #f)))                           ;; not iterated
-						 #f      ;; itemsdat 5
-						 #f      ;; spare - used for item-path
-						 )))
-		(for-each 
-		 (lambda (waiton)
-		   (if (and waiton (not (member waiton test-names)))
-		       (begin
-			 (set! required-tests (cons waiton required-tests))
-			 (set! test-names (cons waiton test-names))))) ;; was an append, now a cons
-		 waitons)
-		(let ((remtests (delete-duplicates (append waitons tal))))
-		  (if (not (null? remtests))
-		      (loop (car remtests)(cdr remtests))
-		      test-records))))))))
-
-;;======================================================================
-;; test steps
-;;======================================================================
-
-;; teststep-set-status! used to be here
-
-(define (test-get-kill-request run-id test-id) ;; run-id test-name itemdat)
-  (let* ((testdat   (rmt:get-test-info-by-id run-id test-id)))
-    (and testdat
-	 (equal? (test:get-state testdat) "KILLREQ"))))
-
-(define (test:tdb-get-rundat-count tdb)
-  (if tdb
-      (let ((res 0))
-	(sqlite3:for-each-row
-	 (lambda (count)
-	   (set! res count))
-	 tdb
-	 "SELECT count(id) FROM test_rundat;")
-	res))
-  0)
-
-(define (tests:update-central-meta-info run-id test-id cpuload diskfree minutes uname hostname)
-  (rmt:general-call 'update-test-rundat run-id test-id (current-seconds) (or cpuload -1)(or diskfree -1) -1 (or minutes -1))
-  (if (and cpuload diskfree)
-      (rmt:general-call 'update-cpuload-diskfree run-id cpuload diskfree test-id))
-  (if minutes 
-      (rmt:general-call 'update-run-duration run-id minutes test-id))
-  (if (and uname hostname)
-      (rmt:general-call 'update-uname-host run-id uname hostname test-id)))
-  
-;; This one is for running with no db access (i.e. via rmt: internally)
-(define (tests:set-full-meta-info db test-id run-id minutes work-area remtries)
-;; (define (tests:set-full-meta-info test-id run-id minutes work-area)
-;;  (let ((remtries 10))
-  (let* ((cpuload  (get-cpu-load))
-	 (diskfree (get-df (current-directory)))
-	 (uname    (get-uname "-srvpio"))
-	 (hostname (get-host-name)))
-    (tests:update-central-meta-info run-id test-id cpuload diskfree minutes uname hostname)))
-    
-;; (define (tests:set-partial-meta-info test-id run-id minutes work-area)
-#;(define (tests:set-partial-meta-info test-id run-id minutes work-area remtries)
-  (let* ((cpuload  (get-cpu-load))
-	 (diskfree (get-df (current-directory)))
-	 (remtries 10))
-    (handle-exceptions
-     exn
-     (if (> remtries 0)
-	 (begin
-	   (print-call-chain (current-error-port))
-	   (debug:print-info 0 *default-log-port* "WARNING: failed to set meta info. Will try " remtries " more times")
-	   (set! remtries (- remtries 1))
-	   (thread-sleep! 10)
-	   (tests:set-full-meta-info db test-id run-id minutes work-area (- remtries 1)))
-	 (let ((err-status ((condition-property-accessor 'sqlite3 'status #f) exn)))
-	   (debug:print-error 0 *default-log-port* "tried for over a minute to update meta info and failed. Giving up")
-	   (debug:print 0 *default-log-port* "EXCEPTION: database probably overloaded or unreadable.")
-	   (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
-	   (debug:print 5 *default-log-port* "exn=" (condition->list exn))
-	   (debug:print 0 *default-log-port* " status:  " ((condition-property-accessor 'sqlite3 'status) exn))
-	   (print-call-chain (current-error-port))))
-     (tests:update-testdat-meta-info db test-id work-area cpuload diskfree minutes)
-  )))
-	 
-;;======================================================================
-;; A R C H I V I N G
-;;======================================================================
-
-(define (test:archive db test-id)
-  #f)
-
-(define (test:archive-tests db keynames target)
-  #f)
+;;======================================================================
+;; web pages
+;;======================================================================
+
+(define (http-transport:html-test-log $)
+   (let* ((run-id ($ 'runid))
+         (test-item ($ 'testname))
+         (parts (string-split test-item ":"))
+         (test-name (car parts))
+             
+         (item-name (if (equal? (length parts) 1)
+             ""
+             (cadr parts))))
+					;(print $) 
+     (tests:get-test-log run-id test-name item-name)))
+
+
+(define (http-transport:html-dboard $)
+  (let* ((page ($ 'page))
+         (oup       (open-output-string)) 
+         (bdy "--------------------------")
+
+         (ret  (tests:dynamic-dboard page)))
+    (s:output-new  oup  ret)
+   (close-output-port oup)
+
+  (set! bdy   (get-output-string oup))
+     (conc "<h1>Dashboard</h1>" bdy "<br/> <br/> "  )))
+
+(define (http-transport:main-page)
+  (let ((linkpath (root-path)))
+    (conc "<head><h1>" (pathname-strip-directory *toppath*) "</h1></head>"
+	  "<body>"
+	  "Run area: " *toppath*
+	  "<h2>Server Stats</h2>"
+	  (http-transport:stats-table) 
+	  "<hr>"
+	  (http-transport:runs linkpath)
+	  "<hr>"
+	  ;; (http-transport:run-stats)
+	  "</body>"
+	  )))
+
+(define (http-transport:stats-table)
+  (mutex-lock! *heartbeat-mutex*)
+  (let ((res 
+	 (conc "<table>"
+	       ;; "<tr><td>Max cached queries</td>        <td>" *max-cache-size* "</td></tr>"
+	       "<tr><td>Number of cached writes</td>   <td>" *number-of-writes* "</td></tr>"
+	       "<tr><td>Average cached write time</td> <td>" (if (eq? *number-of-writes* 0)
+								 "n/a (no writes)"
+								 (/ *writes-total-delay*
+								    *number-of-writes*))
+	       " ms</td></tr>"
+	       "<tr><td>Number non-cached queries</td> <td>"  *number-non-write-queries* "</td></tr>"
+	       ;; "<tr><td>Average non-cached time</td>   <td>" (if (eq? *number-non-write-queries* 0)
+	       ;; 							 "n/a (no queries)"
+	       ;; 							 (/ *total-non-write-delay* 
+	       ;; 							    *number-non-write-queries*))
+	       " ms</td></tr>"
+	       "<tr><td>Last access</td><td>"              (seconds->time-string *db-last-access*) "</td></tr>"
+	       "</table>")))
+    (mutex-unlock! *heartbeat-mutex*)
+    res))
+
+(define (http-transport:runs linkpath)
+  (conc "<h3>Runs</h3>"
+	(string-intersperse
+	 (let ((files (map pathname-strip-directory (glob (conc linkpath "/*")))))
+	   (map (lambda (p)
+		  (conc "<a href=\"" p "\">" p "</a><br>"))
+		files))
+	 " ")))
+
+#;(define (http-transport:run-stats)
+  (let ((stats (open-run-close db:get-running-stats #f)))
+    (conc "<table>"
+	  (string-intersperse
+	   (map (lambda (stat)
+		  (conc "<tr><td>" (car stat) "</td><td>" (cadr stat) "</td></tr>"))
+		stats)
+	   " ")
+	  "</table>")))
+
+(define (tests:get-test-log run-id test-name item-name)
+  (let* ((test-data    (rmt:get-tests-for-run
+				   (string->number run-id)
+                                    test-name      ;; testnamepatt
+				   '()        ;; states
+				   '()        ;; statuses
+				   #f         ;; offset
+				   #f         ;; num-to-get
+				   #f         ;; hide/not-hide
+				   #f         ;; sort-by
+				   #f         ;; sort-order
+				   #f         ;; 'shortlist                           ;; qrytype
+                                   0         ;; last update
+				   #f))
+         (path "")
+         (found 0))
+    (debug:print-info 0 *default-log-port* "found: " found )
+
+   (let loop ((hed (car test-data))
+		 (tal (cdr test-data)))
+          (debug:print-info 0 *default-log-port* "item: " (vector-ref hed 11) (vector-ref hed 10) "/" (vector-ref hed 13))
+
+	(if (equal? (vector-ref hed 11) item-name)
+            (begin
+              (set! found 1) 
+	      (set! path (conc (vector-ref hed 10) "/" (vector-ref hed 13)))))
+	    (if (and (not (null? tal)) (equal? found 0))
+		(loop (car tal)(cdr tal))))
+   (if (equal? path "")
+     "<H2>Data not found</H2>"
+     (string-join (tests:readlines path) "\n"))))
+
+;;===============================================
+;; Java script
+;;===============================================
+(define (http-transport:show-jquery)
+  (let* ((data  (tests:readlines *java-script-lib*)))
+(string-join data "\n")))
 

Index: tests/Makefile
==================================================================
--- tests/Makefile
+++ tests/Makefile
@@ -40,12 +40,13 @@
 TARGET     = "ubuntu/nfs/none"
 
 all : build unit test4
 # test1 test2 test3 test4 test5 test6 test7 test8 test9
 
-unit : all-rmt.log all-api.log
-# basicserver.log runs.log misc.log tests.log
+unit : basicserver.log
+# all-rmt.log all-api.log
+# runs.log misc.log tests.log
 
 # inter dependencies on the unit tests, I wish these could be "suggestions"
 all-rmt.log : all-api.log
 
 rel : 
@@ -52,13 +53,14 @@
 	cd release;dashboard -rows 25 &
 
 ## basicserver.log : unittests/basicserver.scm
 ## 	script -c "./rununittest.sh basicserver $(DEBUG)" basicserver.log
 
-%.log : build unittests/%.scm $(MTEST)
+%.log : unittests/%.scm ../bin/.*/mtest
 	script -c "./rununittest.sh $* $(DEBUG)" $*.log
-	if logpro unit.logpro $*.html < $*.log > /dev/null;then echo ALLPASS;else echo ALLFAIL;mv $*.log $*.log.FAIL;fi
+
+# if logpro unit.logpro $*.html < $*.log > /dev/null;then echo ALLPASS;else echo ALLFAIL;mv $*.log $*.log.FAIL;fi
 
 server :
 	cd fullrun;$(MEGATEST) -server - -debug $(DEBUG) -run-id $(RUNID)
 
 stopserver :

Index: tests/rununittest.sh
==================================================================
--- tests/rununittest.sh
+++ tests/rununittest.sh
@@ -26,14 +26,12 @@
  
 export PATH="${mtbindir}:$PATH"
 
 # Clean setup
 #
-dbdir=$(echo /tmp/$USER/megatest_localdb/simplerun/.[a-zA-Z]*/)
-echo "dbdir=$dbdir"
-rm -f simplerun/megatest.db simplerun/monitor.db simplerun/db/monitor.db
-rm -rf simplelinks/ simpleruns/ simplerun/db/ $dbdir
+rm -rf simplerun/megatest.db simplerun/.db simplerun/.meta
+rm -rf simplelinks/ simpleruns/ simplerun/db/
 mkdir -p simplelinks simpleruns
 (cd simplerun;cp ../../*_records.scm .;perl -pi.bak -e 's/define-inline/define/' *_records.scm)
 (cd simplerun;cp ../../altdb.scm .)
 
 # Run the test $1 is the unit test to run

Index: tests/tests.scm
==================================================================
--- tests/tests.scm
+++ tests/tests.scm
@@ -15,18 +15,11 @@
 ;;     You should have received a copy of the GNU General Public License
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 ;;
 ;;  strftime('%m/%d/%Y %H:%M:%S','now','localtime')
 
-(require-extension test)
-(require-extension regex)
-(require-extension srfi-18)
-(require-extension posix)
-(import posix)
-(import srfi-18)
-;; (require-extension zmq)
-;; (import zmq)
+(import srfi-18 test)
 
 (define test-work-dir (current-directory))
 
 ;; given list of lists
 ;;  ( ( msg expected param1 param2 ...)
@@ -43,24 +36,18 @@
            (test msg result (post-proc (apply proc params)))
            (test msg result (apply proc params)))))
    inlst))
 
 ;; read in all the _record files
-(let ((files (glob "*_records.scm")))
-  (for-each
-   (lambda (file)
-     (print "Loading " file)
-     (load file))
-   files))
+;; (let ((files (glob "*_records.scm")))
+;;   (for-each
+;;    (lambda (file)
+;;      (print "Loading " file)
+;;      (load file))
+;;    files))
 
 (let* ((unit-test-name (list-ref (argv) 4))
        (fname          (conc "../unittests/" unit-test-name ".scm")))
   (if (file-exists? fname)
       (load fname)
       (print "ERROR: Unit test " unit-test-name " not found in unittests directory")))
 
-;;; huh? why is this here?
-;; (list "abc" "abc/%" "ab%/c%" "~abc/c%" "abc/~c%" "a,b/c,%/d" "%/,%/a" "%/,%/a" "%/,%/a" "%" "%" "%/" "%/" "%abc%")
-;; (list "abc" "abc"   "abcd"   "abc"     "abc"     "a"         "abc"     "def"    "ghi"   "a" "a"  "a"  "a" "abc")
-;; (list   ""  ""      "cde"    "cde"     "cde"     ""            ""      "a"       "b"    ""  "b"  ""   "b" "abc")
-;; (list   #t    #t       #t    #f           #f      #t           #t       #t       #f     #t  #t   #t    #f #t)
-

Index: tests/unittests/basicserver.scm
==================================================================
--- tests/unittests/basicserver.scm
+++ tests/unittests/basicserver.scm
@@ -20,152 +20,183 @@
 
 ;; Run like this:
 ;;
 ;;  ./rununittest.sh server 1;(cd simplerun;megatest -stop-server 0)
 
-(delete-file* "logs/1.log")
-(define run-id 1)
-
-(test "setup for run" #t (begin (launch:setup)
- 				(string? (getenv "MT_RUN_AREA_HOME"))))
-
-(test #f #t (and (server:kind-run *toppath*) #t))
-
-
-(define user    (current-user-name))
-(define runname "mytestrun")
-(define keys    (rmt:get-keys))
-(define runinfo #f)
-(define keyvals '(("SYSTEM" "abc")("RELEASE" "def")))
-(define header  (list "SYSTEM" "RELEASE" "id" "runname" "state" "status" "owner" "event_time"))
-
-;; Setup
-;;
-;; (test #f #f  (not (client:setup run-id)))
-;; (test #f #f  (not (hash-table-ref/default *runremote* run-id #f)))
-
-;; Login
-;;
-(test #f'(#t "successful login")
-      (rmt:login run-id))
-
-;; Keys
-;;
-(test #f '("SYSTEM" "RELEASE")  (rmt:get-keys))
-
-;; No data in db
-;;
-(test #f '() (rmt:get-all-run-ids))
-(test #f #f  (rmt:get-run-name-from-id run-id))
-(test #f 
-      (vector
-       header
-       (vector #f #f #f #f))
-      (rmt:get-run-info run-id))
-
-;; Insert data into db
-;;
-(test #f 1 (rmt:register-run keyvals runname "new" "n/a" user))
-;; (test #f #f (rmt:get-runs-by-patt keys runname))
-(test #f #t (rmt:general-call 'register-test run-id run-id "test-one" ""))
-(define test-one-id #f)
-(test #f 1  (let ((test-id (rmt:get-test-id run-id "test-one" "")))
-	      (set! test-one-id test-id)
-	      test-id))
-(define test-one-rec #f)
-(test #f "test-one" (let ((test-rec (rmt:get-test-info-by-id run-id test-one-id)))
-		      (set! test-one-rec test-rec)
-		      (vector-ref test-rec 2)))
-
-;; With data in db
-;;
-(print "Using runame=" runname)
-(test #f '(1)    (rmt:get-all-run-ids))
-(test #f runname (rmt:get-run-name-from-id run-id))
-(test #f 
-      runname
-      (let ((run-info (rmt:get-run-info run-id)))
-	(db:get-value-by-header (db:get-rows run-info)
-				(db:get-header run-info)
-				"runname")))
-
-;; test killing server
-;;
-(for-each
- (lambda (run-id)
-   (test #f #t (and (tasks:kill-server-run-id run-id) #t))
-   (test #f #f (tasks:server-running-or-starting? (db:delay-if-busy (tasks:open-db)) run-id)))
- (list 0 1))
-
-;; Tests to assess reading/writing while servers are starting/stopping
-;; NO LONGER APPLICABLE
-
-;; Server tests go here
-(define (server-tests-dont-run-right-now)
-(for-each
- (lambda (run-id)
-   (test #f #f (tasks:server-running-or-starting? (db:delay-if-busy (tasks:open-db)) run-id))
-   (server:kind-run run-id)
-   (test "did server start within 20 seconds?"
-	 #t
-	 (let loop ((remtries 20)
-		    (running (tasks:server-running-or-starting? (db:delay-if-busy
-								 (tasks:open-db))
-								run-id)))
-	   (if running 
-	       (> running 0)
-	       (if (> remtries 0)
-		   (begin
-		     (thread-sleep! 1)
-		     (loop (- remtries 1)
-			   (tasks:server-running-or-starting? (db:delay-if-busy
-							       (tasks:open-db))
-							      run-id)))))))
-   
-   (test "did server become available" #t
-	 (let loop ((remtries 10)
-		    (res      (tasks:get-server (db:delay-if-busy (tasks:open-db)) run-id)))
-	   (if res
-	       (vector? res)
-	       (begin
-		 (if (> remtries 0)
-		     (begin
-		       (thread-sleep! 1.1)
-		       (loop (- remtries 1)(tasks:get-server (db:delay-if-busy (tasks:open-db)) run-id)))
-		     res)))))
-   )
- (list 0 1)))
-
-(define start-time (current-seconds))
-(define (reading-writing-while-server-starting-stopping-dont-run-now)
-(let loop ((test-state 'start))
-  (let* ((server-dats (tasks:get-server-records (db:delay-if-busy (tasks:open-db)) run-id))
-	 (first-dat   (if (not (null? server-dats))
-			  (car server-dats)
-			  #f)))
-    (map (lambda (dat)
-	   (apply print (intersperse (vector->list dat) ", ")))
-	 server-dats)
-    (test #f test-one-rec (rmt:get-test-info-by-id run-id test-one-id))
-    (thread-sleep! 1)
-    (case test-state
-      ((start)
-       (print "Trying to start server")
-       (server:kind-run run-id)
-       (loop 'server-started))
-      ((server-started)
-       (case (if first-dat (vector-ref first-dat 0) 'blah)
-	 ((running)
-	  (print "Server appears to be running. Now ask it to shutdown")
-	  (rmt:kill-server run-id)
-	  (loop 'server-shutdown))
-	 ((shutting-down)
-	  (loop test-state))
-	 (else (print "Don't know what to do if get here"))))
-      ((server-shutdown)
-       (loop test-state)))))
-)
+(import rmtmod trace http-transportmod http-client apimod dbmod)
+(trace-call-sites #t)
+(trace
+ ;; db:get-dbdat
+ ;; rmt:find-main-server
+ )
+
+(test #f #t (rmt:remote? (let ((r (make-rmt:remote)))
+			   (set! *rmt:remote* r)
+			   r)))
+(test #f #f (rmt:get-connection *rmt:remote* *toppath* ".db/main.db"))
+(test #f #f (rmt:find-main-server *toppath* ".db/main.db"))
+(test #f #t (rmt:open-main-connection *rmt:remote* *toppath*))
+(pp (hash-table->alist (rmt:remote-conns *rmt:remote*)))
+(test #f #t (rmt:conn? (rmt:get-connection *rmt:remote* *toppath* ".db/main.db")))
+
+(define *main*  (rmt:get-connection *rmt:remote* *toppath* ".db/main.db"))
+
+(test #f 'a (loop-test (rmt:conn-ipaddr *main*)(rmt:conn-port *main*) 'a))
+(trace
+ rmt:send-receive
+ with-input-from-request
+ rmt:get-connection
+ with-input-from-request
+ )
+
+(define *db* (db:setup #f))
+(test #f 'server-started (api:execute-requests *db* 'get-server (list *toppath* ".db/1.db")))
+(test #f #f (rmt:general-open-connection *rmt:remote* *toppath* ".db/1.db"))
+
+;; (delete-file* "logs/1.log")
+;; (define run-id 1)
+
+;; (test "setup for run" #t (begin (launch:setup)
+;;  				(string? (getenv "MT_RUN_AREA_HOME"))))
+;; 
+;; (test #f #t (and (server:kind-run *toppath*) #t))
+;; 
+;; 
+;; (define user    (current-user-name))
+;; (define runname "mytestrun")
+;; (define keys    (rmt:get-keys))
+;; (define runinfo #f)
+;; (define keyvals '(("SYSTEM" "abc")("RELEASE" "def")))
+;; (define header  (list "SYSTEM" "RELEASE" "id" "runname" "state" "status" "owner" "event_time"))
+;; 
+;; ;; Setup
+;; ;;
+;; ;; (test #f #f  (not (client:setup run-id)))
+;; ;; (test #f #f  (not (hash-table-ref/default *runremote* run-id #f)))
+;; 
+;; ;; Login
+;; ;;
+;; (test #f'(#t "successful login")
+;;       (rmt:login run-id))
+;; 
+;; ;; Keys
+;; ;;
+;; (test #f '("SYSTEM" "RELEASE")  (rmt:get-keys))
+;; 
+;; ;; No data in db
+;; ;;
+;; (test #f '() (rmt:get-all-run-ids))
+;; (test #f #f  (rmt:get-run-name-from-id run-id))
+;; (test #f 
+;;       (vector
+;;        header
+;;        (vector #f #f #f #f))
+;;       (rmt:get-run-info run-id))
+;; 
+;; ;; Insert data into db
+;; ;;
+;; (test #f 1 (rmt:register-run keyvals runname "new" "n/a" user))
+;; ;; (test #f #f (rmt:get-runs-by-patt keys runname))
+;; (test #f #t (rmt:general-call 'register-test run-id run-id "test-one" ""))
+;; (define test-one-id #f)
+;; (test #f 1  (let ((test-id (rmt:get-test-id run-id "test-one" "")))
+;; 	      (set! test-one-id test-id)
+;; 	      test-id))
+;; (define test-one-rec #f)
+;; (test #f "test-one" (let ((test-rec (rmt:get-test-info-by-id run-id test-one-id)))
+;; 		      (set! test-one-rec test-rec)
+;; 		      (vector-ref test-rec 2)))
+;; 
+;; ;; With data in db
+;; ;;
+;; (print "Using runame=" runname)
+;; (test #f '(1)    (rmt:get-all-run-ids))
+;; (test #f runname (rmt:get-run-name-from-id run-id))
+;; (test #f 
+;;       runname
+;;       (let ((run-info (rmt:get-run-info run-id)))
+;; 	(db:get-value-by-header (db:get-rows run-info)
+;; 				(db:get-header run-info)
+;; 				"runname")))
+;; 
+;; ;; test killing server
+;; ;;
+;; (for-each
+;;  (lambda (run-id)
+;;    (test #f #t (and (tasks:kill-server-run-id run-id) #t))
+;;    (test #f #f (tasks:server-running-or-starting? (db:delay-if-busy (tasks:open-db)) run-id)))
+;;  (list 0 1))
+;; 
+;; ;; Tests to assess reading/writing while servers are starting/stopping
+;; ;; NO LONGER APPLICABLE
+;; 
+;; ;; Server tests go here
+;; (define (server-tests-dont-run-right-now)
+;; (for-each
+;;  (lambda (run-id)
+;;    (test #f #f (tasks:server-running-or-starting? (db:delay-if-busy (tasks:open-db)) run-id))
+;;    (server:kind-run run-id)
+;;    (test "did server start within 20 seconds?"
+;; 	 #t
+;; 	 (let loop ((remtries 20)
+;; 		    (running (tasks:server-running-or-starting? (db:delay-if-busy
+;; 								 (tasks:open-db))
+;; 								run-id)))
+;; 	   (if running 
+;; 	       (> running 0)
+;; 	       (if (> remtries 0)
+;; 		   (begin
+;; 		     (thread-sleep! 1)
+;; 		     (loop (- remtries 1)
+;; 			   (tasks:server-running-or-starting? (db:delay-if-busy
+;; 							       (tasks:open-db))
+;; 							      run-id)))))))
+;;    
+;;    (test "did server become available" #t
+;; 	 (let loop ((remtries 10)
+;; 		    (res      (tasks:get-server (db:delay-if-busy (tasks:open-db)) run-id)))
+;; 	   (if res
+;; 	       (vector? res)
+;; 	       (begin
+;; 		 (if (> remtries 0)
+;; 		     (begin
+;; 		       (thread-sleep! 1.1)
+;; 		       (loop (- remtries 1)(tasks:get-server (db:delay-if-busy (tasks:open-db)) run-id)))
+;; 		     res)))))
+;;    )
+;;  (list 0 1)))
+;; 
+;; (define start-time (current-seconds))
+;; (define (reading-writing-while-server-starting-stopping-dont-run-now)
+;; (let loop ((test-state 'start))
+;;   (let* ((server-dats (tasks:get-server-records (db:delay-if-busy (tasks:open-db)) run-id))
+;; 	 (first-dat   (if (not (null? server-dats))
+;; 			  (car server-dats)
+;; 			  #f)))
+;;     (map (lambda (dat)
+;; 	   (apply print (intersperse (vector->list dat) ", ")))
+;; 	 server-dats)
+;;     (test #f test-one-rec (rmt:get-test-info-by-id run-id test-one-id))
+;;     (thread-sleep! 1)
+;;     (case test-state
+;;       ((start)
+;;        (print "Trying to start server")
+;;        (server:kind-run run-id)
+;;        (loop 'server-started))
+;;       ((server-started)
+;;        (case (if first-dat (vector-ref first-dat 0) 'blah)
+;; 	 ((running)
+;; 	  (print "Server appears to be running. Now ask it to shutdown")
+;; 	  (rmt:kill-server run-id)
+;; 	  (loop 'server-shutdown))
+;; 	 ((shutting-down)
+;; 	  (loop test-state))
+;; 	 (else (print "Don't know what to do if get here"))))
+;;       ((server-shutdown)
+;;        (loop test-state)))))
+;; )
+
 ;;======================================================================
 ;; END OF TESTS
 ;;======================================================================
 
 

ADDED   testsmod.scm
Index: testsmod.scm
==================================================================
--- /dev/null
+++ testsmod.scm
@@ -0,0 +1,1530 @@
+;;======================================================================
+;; Copyright 2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
+
+;;======================================================================
+
+(declare (unit testsmod))
+(declare (uses mtargs))
+(declare (uses debugprint))
+(declare (uses commonmod))
+(declare (uses configfmod))
+(declare (uses itemsmod))
+(declare (uses rmtmod))
+(declare (uses http-transportmod))
+(declare (uses stml2))
+(declare (uses dbmod))
+(declare (uses tasksmod))
+
+(module testsmod
+	*
+	
+(import scheme
+
+	chicken.base
+	chicken.condition
+	chicken.file
+	chicken.io
+	chicken.pathname
+	chicken.eval
+	chicken.file.posix
+	chicken.process-context.posix
+	chicken.format
+	chicken.port
+	chicken.pretty-print
+	chicken.process
+	chicken.process-context
+	chicken.sort
+	chicken.string
+	chicken.time
+	chicken.random
+	
+	(prefix base64 base64:)
+	(prefix dbi dbi:)
+	(prefix sqlite3 sqlite3:)
+	(srfi 18)
+	directory-utils
+	format
+	matchable
+	md5
+	message-digest
+	regex
+	regex-case
+	sparse-vectors
+	system-information
+	srfi-1
+	srfi-13
+	srfi-69
+	stack
+	typed-records
+	z3
+	
+	debugprint
+	(prefix mtargs args:)
+	commonmod
+	pkts
+	itemsmod
+	rmtmod
+	http-transportmod
+	configfmod
+	stml2
+	dbmod
+	tasksmod
+	
+	)
+
+;;======================================================================
+;; Tests
+;;======================================================================
+
+;; (declare (unit tests))
+;; (declare (uses lock-queue))
+;; (declare (uses db))
+;; (declare (uses tdb))
+;; (declare (uses common))
+;; ;; (declare (uses dcommon)) ;; needed for the steps processing
+;; (declare (uses items))
+;; (declare (uses runconfig))
+;; ;; (declare (uses sdb))
+;; (declare (uses server))
+;; ;;(declare (uses stml2))
+;; 
+;; (use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking tcp directory-utils)
+;; (import (prefix sqlite3 sqlite3:))
+;; (require-library stml)
+;; 
+;; (include "common_records.scm")
+;; (include "key_records.scm")
+;; (include "db_records.scm")
+(include "run_records.scm")
+(include "test_records.scm")
+(include "js-path.scm")
+
+(define (init-java-script-lib)
+  (set! *java-script-lib* (conc  (common:get-install-area) "/share/js/jquery-3.1.0.slim.min.js"))
+  )
+
+;; Call this one to do all the work and get a standardized list of tests
+;;   gets paths from configs and finds valid tests 
+;;   returns hash of testname --> fullpath
+;;
+(define (tests:get-all)
+  (let* ((test-search-path   (tests:get-tests-search-path *configdat*)))
+    (tests:get-valid-tests (make-hash-table) test-search-path)))
+
+
+(define (tests:get-valid-tests test-registry tests-paths)
+  (if (null? tests-paths) 
+      test-registry
+      (let loop ((hed (car tests-paths))
+		 (tal (cdr tests-paths)))
+	(if (common:file-exists? hed)
+	    (for-each (lambda (test-path)
+			(let* ((tname   (last (string-split test-path "/")))
+			       (tconfig (conc test-path "/testconfig")))
+			  (if (and (not (hash-table-ref/default test-registry tname #f))
+				   (common:file-exists? tconfig))
+			      (hash-table-set! test-registry tname test-path))))
+		      (glob (conc hed "/*"))))
+	(if (null? tal)
+	    test-registry
+	    (loop (car tal)(cdr tal))))))
+
+(define (tests:filter-test-names-not-matched test-names test-patts)
+  (delete-duplicates
+   (filter (lambda (testname)
+	     (not (tests:match test-patts testname #f)))
+	   test-names)))
+
+
+(define (tests:filter-test-names test-names test-patts)
+  (delete-duplicates
+   (filter (lambda (testname)
+	     (tests:match test-patts testname #f))
+	   test-names)))
+
+
+;; returns waitons waitors tconfigdat
+;;
+(define (tests:get-waitons test-name all-tests-registry)
+   (let* ((config  (tests:get-testconfig test-name #f all-tests-registry 'return-procs))) ;; assuming no problems with immediate evaluation, this could be simplified ('return-procs -> #t)
+     (let ((instr (if config 
+		      (configf:lookup config "requirements" "waiton")
+		      (begin ;; No config means this is a non-existant test
+			(debug:print-error 0 *default-log-port* "non-existent required test \"" test-name "\"")
+			(exit 1))))
+	   (instr2 (if config
+		       (configf:lookup config "requirements" "waitor")
+		       "")))
+       (debug:print-info 8 *default-log-port* "waitons string is " instr ", waitors string is " instr2)
+       (let ((newwaitons
+	      (string-split (cond
+			     ((procedure? instr) ;; here 
+			      (let ((res (instr)))
+				(debug:print-info 8 *default-log-port* "waiton procedure results in string " res " for test " test-name)
+				res))
+			     ((string? instr)     instr)
+			     (else 
+			      ;; NOTE: This is actually the case of *no* waitons! ;; (debug:print-error 0 *default-log-port* "something went wrong in processing waitons for test " test-name)
+			      ""))))
+	     (newwaitors
+	      (string-split (cond
+			     ((procedure? instr2)
+			      (let ((res (instr2)))
+				(debug:print-info 8 *default-log-port* "waitor procedure results in string " res " for test " test-name)
+				res))
+			     ((string? instr2)     instr2)
+			     (else 
+			      ;; NOTE: This is actually the case of *no* waitons! ;; (debug:print-error 0 *default-log-port* "something went wrong in processing waitons for test " test-name)
+			      "")))))
+	 (values
+	  ;; the waitons
+	  (filter (lambda (x)
+		    (if (hash-table-ref/default all-tests-registry x #f)
+			#t
+			(begin
+			  (debug:print-error 0 *default-log-port* "test " test-name " has unrecognised waiton testname " x)
+			  #f)))
+		  newwaitons)
+	  (filter (lambda (x)
+		    (if (hash-table-ref/default all-tests-registry x #f)
+			#t
+			(begin
+			  (debug:print-error 0 *default-log-port* "test " test-name " has unrecognised waiton testname " x)
+			  #f)))
+		  newwaitors)
+	  config)))))
+					     
+;; given waiting-test that is waiting on waiton-test extend test-patt appropriately
+;;
+;;  genlib/testconfig               sim/testconfig
+;;  genlib/sch                      sim/sch/cell1
+;;
+;;  [requirements]                  [requirements]
+;;                                  mode itemwait
+;;                                  # trim off the cell to determine what to run for genlib
+;;                                  itemmap /.*
+;;
+;;                                  waiting-test is waiting on waiton-test so we need to create a pattern for waiton-test given waiting-test and itemmap
+;; BB> (tests:extend-test-patts "normal-second/2" "normal-second" "normal-first" '())
+;; observed -> "normal-first/2,normal-first/,normal-second/2,normal-second/"
+;; expected -> "normal-first,normal-second/2,normal-second/"
+;; testpatt = normal-second/2
+;; waiting-test = normal-second
+;; waiton-test = normal-first
+;; itemmaps = ()
+
+(define (tests:extend-test-patts test-patt waiting-test waiton-test itemmaps itemized-waiton)
+  (cond
+   (itemized-waiton
+    (let* ((itemmap          (tests:lookup-itemmap itemmaps waiton-test))
+           (patts            (string-split test-patt ","))
+           (waiting-test-len (+ (string-length waiting-test) 1))
+           (patts-waiton     (map (lambda (x)  ;; for each incoming patt that matches the waiting test
+                                    (let* ((modpatt (if itemmap (db:convert-test-itempath x itemmap) x)) 
+                                           (newpatt (conc waiton-test "/" (substring modpatt waiting-test-len (string-length modpatt)))))
+                                      ;; (conc waiting-test "/," waiting-test "/" (substring modpatt waiton-test-len (string-length modpatt)))))
+                                      ;; (print "in map, x=" x ", newpatt=" newpatt)
+                                      newpatt))
+                                  (filter (lambda (x)
+                                            (eq? (substring-index (conc waiting-test "/") x) 0)) ;; is this patt pertinent to the waiting test
+                                          patts)))
+           (extended-test-patt   (append patts (if (null? patts-waiton)
+                                                   (list (conc waiton-test "/%")) ;; really shouldn't add the waiton forcefully like this
+                                                   patts-waiton)))
+           (extended-test-patt-with-toplevels
+            (fold (lambda (testpatt-item accum )
+                    (let ((my-match (string-match "^([^%\\/]+)\\/.+$" testpatt-item)))
+                      (cons testpatt-item
+                            (if my-match
+                                (cons
+                                 (conc (cadr my-match) "/")
+                                 accum)
+                                accum))))
+                  '()
+                  extended-test-patt)))
+      (string-intersperse (delete-duplicates extended-test-patt-with-toplevels) ",")))
+   (else ;; not waiting on items, waiting on entire waiton test.
+    (let* ((patts (string-split test-patt ","))
+           (new-patts (if (member waiton-test patts)
+                          patts
+                          (cons waiton-test patts))))
+      (string-intersperse (delete-duplicates new-patts) ",")))))
+
+;; Check for waiver eligibility
+;;
+(define (tests:check-waiver-eligibility testdat prev-testdat)
+  (let* ((test-registry (make-hash-table))
+	 (testconfig  (tests:get-testconfig (db:test-get-testname testdat) (db:test-get-item-path testdat) test-registry #f))
+	 (test-rundir ;; (sdb:qry 'passstr 
+	  (db:test-get-rundir testdat)) ;; )
+	 (prev-rundir ;; (sdb:qry 'passstr 
+	  (db:test-get-rundir prev-testdat)) ;; )
+	 (waivers     (if testconfig (configf:section-vars testconfig "waivers") '()))
+	 (waiver-rx   (regexp "^(\\S+)\\s+(.*)$"))
+	 (diff-rule   "diff %file1% %file2%")
+	 (logpro-rule "diff %file1% %file2% | logpro %waivername%.logpro %waivername%.html"))
+    (if (not (common:file-exists? test-rundir))
+	(begin
+	  (debug:print-error 0 *default-log-port* "test run directory is gone, cannot propagate waiver")
+	  #f)
+	(begin
+	  (push-directory test-rundir)
+	  (let ((result (if (null? waivers)
+			    #f
+			    (let loop ((hed (car waivers))
+				       (tal (cdr waivers)))
+			      (debug:print 0 *default-log-port* "INFO: Applying waiver rule \"" hed "\"")
+			      (let* ((waiver      (configf:lookup testconfig "waivers" hed))
+				     (wparts      (if waiver (string-match waiver-rx waiver) #f))
+				     (waiver-rule (if wparts (cadr wparts)  #f))
+				     (waiver-glob (if wparts (caddr wparts) #f))
+				     (logpro-file (if waiver
+						      (let ((fname (conc hed ".logpro")))
+							(if (common:file-exists? fname)
+							    fname 
+							    (begin
+							      (debug:print 0 *default-log-port* "INFO: No logpro file " fname " falling back to diff")
+							      #f)))
+						      #f))
+				     ;; if rule by name of waiver-rule is found in testconfig - use it
+				     ;; else if waivername.logpro exists use logpro-rule
+				     ;; else default to diff-rule
+				     (rule-string (let ((rule (configf:lookup testconfig "waiver_rules" waiver-rule)))
+						    (if rule
+							rule
+							(if logpro-file
+							    logpro-rule
+							    (begin
+							      (debug:print 0 *default-log-port* "INFO: No logpro file " logpro-file " found, using diff rule")
+							      diff-rule)))))
+				     ;; (string-substitute "%file1%" "foofoo.txt" "This is %file1% and so is this %file1%." #t)
+				     (processed-cmd (string-substitute 
+						     "%file1%" (conc test-rundir "/" waiver-glob)
+						     (string-substitute
+						      "%file2%" (conc prev-rundir "/" waiver-glob)
+						      (string-substitute
+						       "%waivername%" hed rule-string #t) #t) #t))
+				     (res            #f))
+				(debug:print 0 *default-log-port* "INFO: waiver command is \"" processed-cmd "\"")
+				(if (eq? (system processed-cmd) 0)
+				    (if (null? tal)
+					#t
+					(loop (car tal)(cdr tal)))
+				    #f))))))
+	    (pop-directory)
+	    result)))))
+
+;; Do not rpc this one, do the underlying calls!!!
+(define (tests:test-set-status! run-id test-id state status comment dat #!key (work-area #f))
+  (let* ((real-status status)
+	 (otherdat    (if dat dat (make-hash-table)))
+	 (testdat     (rmt:get-test-info-by-id run-id test-id))
+	 (test-name   (db:test-get-testname  testdat))
+	 (item-path   (db:test-get-item-path testdat))
+	 ;; before proceeding we must find out if the previous test (where all keys matched except runname)
+	 ;; was WAIVED if this test is FAIL
+
+	 ;; NOTES:
+	 ;;  1. Is the call to test:get-previous-run-record remotified?
+	 ;;  2. Add test for testconfig waiver propagation control here
+	 ;;
+	 (prev-test   (if (equal? status "FAIL")
+			  (rmt:get-previous-test-run-record run-id test-name item-path)
+			  #f))
+	 (waived   (if prev-test
+		       (if prev-test ;; true if we found a previous test in this run series
+			   (let ((prev-status  (db:test-get-status  prev-test))
+				 (prev-state   (db:test-get-state   prev-test))
+				 (prev-comment (db:test-get-comment prev-test)))
+			     (debug:print 4 *default-log-port* "prev-status " prev-status ", prev-state " prev-state ", prev-comment " prev-comment)
+			     (if (and (equal? prev-state  "COMPLETED")
+				      (equal? prev-status "WAIVED"))
+				 (if comment
+				     comment
+				     prev-comment) ;; waived is either the comment or #f
+				 #f))
+			   #f)
+		       #f)))
+    (if (and waived 
+	     (tests:check-waiver-eligibility testdat prev-test))
+	(set! real-status "WAIVED"))
+
+    (debug:print 4 *default-log-port* "real-status " real-status ", waived " waived ", status " status)
+
+    ;; update the primary record IF state AND status are defined
+    (if (and state status)
+	(begin
+	  (rmt:set-state-status-and-roll-up-items run-id test-id item-path state real-status (if waived waived comment))
+	  ;; (mt:process-triggers run-id test-id state real-status) ;; triggers are called in test-set-state-status
+	  ))
+    
+    ;; if status is "AUTO" then call rollup (note, this one modifies data in test
+    ;; run area, it does remote calls under the hood.
+    ;; (if (and test-id state status (equal? status "AUTO")) 
+    ;; 	(rmt:test-data-rollup run-id test-id status))
+
+    ;; add metadata (need to do this way to avoid SQL injection issues)
+
+    ;; :first_err
+    ;; (let ((val (hash-table-ref/default otherdat ":first_err" #f)))
+    ;;   (if val
+    ;;       (sqlite3:execute db "UPDATE tests SET first_err=? WHERE run_id=? AND testname=? AND item_path=?;" val run-id test-name item-path)))
+    ;; 
+    ;; ;; :first_warn
+    ;; (let ((val (hash-table-ref/default otherdat ":first_warn" #f)))
+    ;;   (if val
+    ;;       (sqlite3:execute db "UPDATE tests SET first_warn=? WHERE run_id=? AND testname=? AND item_path=?;" val run-id test-name item-path)))
+
+    (let ((category (hash-table-ref/default otherdat ":category" ""))
+	  (variable (hash-table-ref/default otherdat ":variable" ""))
+	  (value    (hash-table-ref/default otherdat ":value"    #f))
+	  (expected (hash-table-ref/default otherdat ":expected" "n/a"))
+	  (tol      (hash-table-ref/default otherdat ":tol"      "n/a"))
+	  (units    (hash-table-ref/default otherdat ":units"    ""))
+	  (type     (hash-table-ref/default otherdat ":type"     ""))
+	  (dcomment (hash-table-ref/default otherdat ":comment"  "")))
+      (debug:print 4 *default-log-port* 
+		   "category: " category ", variable: " variable ", value: " value
+		   ", expected: " expected ", tol: " tol ", units: " units)
+      (if (and value) ;; require only value; BB was- all three required
+	  (let ((dat (conc category ","
+			   variable ","
+			   value    ","
+			   expected ","
+			   tol      ","
+			   units    ","
+			   dcomment ",," ;; extra comma for status
+			   type     )))
+	    ;; This was run remote, don't think that makes sense. Perhaps not, but that is the easiest path for the moment.
+	    (rmt:csv->test-data run-id test-id
+				dat)
+	    ;; This was added in check-in a5adfa3f9a. Message was: "...added delay in set-values to allow for delayed write on server start"
+	    ;; I'm inserting an arbitrary rmt: call to force/ensure that the server is available to (hopefully) prevent a communication issue.
+	    (rmt:get-var "MEGATEST_VERSION") ;; this does NOTHING but ensure the server is reachable. This is almost certainly NOT needed :)
+            ;; BB - commentiong out arbitrary 10 second wait (thread-sleep! 10) ;; add 10 second delay before quit incase rmt needs time to start a server.
+            )))
+      
+    ;; need to update the top test record if PASS or FAIL and this is a subtest
+    ;;;;;; (if (not (equal? item-path ""))
+    ;;;;;;     (rmt:set-state-status-and-roll-up-items run-id test-name item-path state status #f) ;;;;;)
+
+    (if (or (and (string? comment)
+		 (string-match (regexp "\\S+") comment))
+	    waived)
+	(let ((cmt  (if waived waived comment)))
+	  (rmt:general-call 'set-test-comment run-id cmt test-id)))))
+
+(define (tests:test-set-toplog! run-id test-name logf) 
+  (rmt:general-call 'tests:test-set-toplog run-id logf run-id test-name))
+
+(define (tests:summarize-items run-id test-id test-name force)
+  ;; if not force then only update the record if one of these is true:
+  ;;   1. logf is "log/final.log
+  ;;   2. logf is same as outputfilename
+  (let* ((outputfilename (conc "megatest-rollup-" test-name ".html"))
+	 (orig-dir       (current-directory))
+	 (logf-info      (rmt:test-get-logfile-info run-id test-name))
+	 (logf           (if logf-info (cadr logf-info) #f))
+	 (path           (if logf-info (car  logf-info) #f)))
+    ;; This query finds the path and changes the directory to it for the test
+    (if (and (string? path)
+	     (directory? path)) ;; can get #f here under some wierd conditions. why, unknown ...
+	(begin
+	  (debug:print 4 *default-log-port* "Found path: " path)
+	  (change-directory path))
+	;; (set! outputfilename (conc path "/" outputfilename)))
+	(debug:print-error 0 *default-log-port* "summarize-items for run-id=" run-id ", test-name=" test-name ", no such path: " path))
+    (debug:print 4 *default-log-port* "summarize-items with logf " logf ", outputfilename " outputfilename " and force " force)
+    (if (or (equal? logf "logs/final.log")
+	    (equal? logf outputfilename)
+	    force)
+	(let ((my-start-time (current-seconds))
+	      (lockf         (conc outputfilename ".lock")))
+	  (let loop ((have-lock  (common:simple-file-lock lockf)))
+	    (if have-lock
+		(let ((script (configf:lookup *configdat* "testrollup" test-name)))
+		  (print "Obtained lock for " outputfilename)
+		  (rmt:set-state-status-and-roll-up-items run-id test-name "" #f #f #f)
+		  (if script
+		      (system (conc script " > " outputfilename " & "))
+		      (tests:generate-html-summary-for-iterated-test run-id test-id test-name outputfilename))
+		  (common:simple-file-release-lock lockf)
+		  (change-directory orig-dir)
+		  ;; NB// tests:test-set-toplog! is remote internal...
+		  (tests:test-set-toplog! run-id test-name outputfilename))
+		;; didn't get the lock, check to see if current update started later than this 
+		;; update, if so we can exit without doing any work
+		(if (> my-start-time (handle-exceptions
+					 exn
+				       (begin
+					 (print "failed to get mod time on " lockf ", exn=" exn)
+					 0)
+				       (file-modification-time lockf)))
+		    ;; we started since current re-gen in flight, delay a little and try again
+		    (begin
+		      (debug:print-info 1 *default-log-port* "Waiting to update " outputfilename ", another test currently updating it")
+		      (thread-sleep! (+ 5 (pseudo-random-integer 5))) ;; delay between 5 and 10 seconds
+		      (loop (common:simple-file-lock lockf))))))))))
+
+(define (tests:generate-html-summary-for-iterated-test run-id test-id test-name outputfilename)
+  (let ((counts              (make-hash-table))
+	(statecounts         (make-hash-table))
+	(outtxt              "")
+	(tot                 0)
+	(testdat             (rmt:test-get-records-for-index-file run-id test-name)))
+    (with-output-to-file outputfilename
+      (lambda ()
+	(set! outtxt (conc outtxt "<html><title>Summary: " test-name 
+			   "</title><body><h2>Summary for " test-name "</h2>"))
+	(for-each
+	 (lambda (testrecord)
+	   (let ((id             (vector-ref testrecord 0))
+		 (itempath       (vector-ref testrecord 1))
+		 (state          (vector-ref testrecord 2))
+		 (status         (vector-ref testrecord 3))
+		 (run_duration   (vector-ref testrecord 4))
+		 (logf           (vector-ref testrecord 5))
+		 (comment        (vector-ref testrecord 6)))
+	     (hash-table-set! counts status (+ 1 (hash-table-ref/default counts status 0)))
+	     (hash-table-set! statecounts state (+ 1 (hash-table-ref/default statecounts state 0)))
+	     (set! outtxt (conc outtxt "<tr>"
+				;; "<td><a href=\"" itempath "/" logf "\"> " itempath "</a></td>" 
+				"<td><a href=\"" itempath "/test-summary.html\"> " itempath "</a></td>" 
+				"<td>" state    "</td>" 
+				"<td><font color=" (common:get-color-from-status status)
+				">"   status   "</font></td>"
+				"<td>" (if (equal? comment "")
+					   "&nbsp;"
+					   comment) "</td>"
+					   "</tr>"))))
+	 (if (list? testdat)
+	     testdat
+	     (begin
+	       (print "ERROR: failed to get records with rmt:test-get-records-for-index-file run-id=" run-id "test-name=" test-name)
+	       '())))
+	
+	(print "<table><tr><td valign=\"top\">")
+	;; Print out stats for status
+	(set! tot 0)
+	(print "<table cellspacing=\"0\" border=\"1\"><tr><td colspan=\"2\"><h2>State stats</h2></td></tr>")
+	(for-each (lambda (state)
+		    (set! tot (+ tot (hash-table-ref statecounts state)))
+		    (print "<tr><td>" state "</td><td>" (hash-table-ref statecounts state) "</td></tr>"))
+		  (hash-table-keys statecounts))
+	(print "<tr><td>Total</td><td>" tot "</td></tr></table>")
+	(print "</td><td valign=\"top\">")
+	;; Print out stats for state
+	(set! tot 0)
+	(print "<table cellspacing=\"0\" border=\"1\"><tr><td colspan=\"2\"><h2>Status stats</h2></td></tr>")
+	(for-each (lambda (status)
+		    (set! tot (+ tot (hash-table-ref counts status)))
+		    (print "<tr><td><font color=\"" (common:get-color-from-status status) "\">" status
+			   "</font></td><td>" (hash-table-ref counts status) "</td></tr>"))
+		  (hash-table-keys counts))
+	(print "<tr><td>Total</td><td>" tot "</td></tr></table>")
+	(print "</td></td></tr></table>")
+	
+	(print "<table cellspacing=\"0\" border=\"1\">" 
+	       "<tr><td>Item</td><td>State</td><td>Status</td><td>Comment</td>"
+	       outtxt "</table></body></html>")
+	;; (release-dot-lock outputfilename)
+	;;(rmt:update-run-stats 
+	;; run-id
+	;; (hash-table-map
+	;;  state-status-counts
+	;;  (lambda (key val)
+	;;	(append key (list val)))))
+	))))
+
+(define tests:css-jscript-block
+#<<EOF
+<style type="text/css">
+ul.LinkedList { display: block; }
+/* ul.LinkedList ul { display: none; } */
+.HandCursorStyle { cursor: pointer; cursor: hand; }  /* For IE */
+th {background-color: #8c8c8c;}
+td.test {background-color: #d9dbdd;}
+td.PASS {background-color: #347533;}
+td.FAIL {background-color: #cc2812;}
+td.SKIP{background-color: #FFD733;}
+td.WARN {background-color: #EA8724;}
+td.WAIVED {background-color: #838A12;}
+td.ABORT{background-color: #EA24B7;}
+.PASS .link, .SKIP .link, .WARN .link,.WAIVED .link,.ABORT .link, .FAIL .link{color: #FFFFFF;}
+
+
+</style>
+
+
+  <script type="text/JavaScript">
+
+    function filtersome() {
+  $("tr").show();
+  $(".test").filter(
+    function() {
+      var names = $('#testname').val().split(',');
+      var good=1;
+      for (var i=0, len=names.length; i<len; i++) {
+        var uname=names[i];
+        console.log("Trying to check for " + uname); 
+        if($(this).text().indexOf(uname) != -1) {
+          good= 0;
+          console.log("Found "+uname);
+        }
+      }
+      return good; 
+    }
+  ).parent().hide();
+//  $(".sum").show();
+}
+  
+    // Add this to the onload event of the BODY element
+    function addEvents() {
+      activateTree(document.getElementById("LinkedList1"));
+    }
+
+    // This function traverses the list and add links 
+    // to nested list items
+    function activateTree(oList) {
+      // Collapse the tree
+      for (var i=0; i < oList.getElementsByTagName("ul").length; i++) {
+        oList.getElementsByTagName("ul")[i].style.display="none";            
+      }                                                                  
+      // Add the click-event handler to the list items
+      if (oList.addEventListener) {
+        oList.addEventListener("click", toggleBranch, false);
+      } else if (oList.attachEvent) { // For IE
+        oList.attachEvent("onclick", toggleBranch);
+      }
+      // Make the nested items look like links
+      addLinksToBranches(oList);
+    }
+
+    // This is the click-event handler
+    function toggleBranch(event) {
+      var oBranch, cSubBranches;
+      if (event.target) {
+        oBranch = event.target;
+      } else if (event.srcElement) { // For IE
+        oBranch = event.srcElement;
+      }
+      cSubBranches = oBranch.getElementsByTagName("ul");
+      if (cSubBranches.length > 0) {
+        if (cSubBranches[0].style.display == "block") {
+          cSubBranches[0].style.display = "none";
+        } else {
+          cSubBranches[0].style.display = "block";
+        }
+      }
+    }
+
+    // This function makes nested list items look like links
+    function addLinksToBranches(oList) {
+      var cBranches = oList.getElementsByTagName("li");
+      var i, n, cSubBranches;
+      if (cBranches.length > 0) {
+        for (i=0, n = cBranches.length; i < n; i++) {
+          cSubBranches = cBranches[i].getElementsByTagName("ul");
+          if (cSubBranches.length > 0) {
+            addLinksToBranches(cSubBranches[0]);
+            cBranches[i].className = "HandCursorStyle";
+            cBranches[i].style.color = "blue";
+            cSubBranches[0].style.color = "black";
+            cSubBranches[0].style.cursor = "auto";
+          }
+        }
+      }
+    }
+  </script>
+EOF
+)
+
+(define tests:css-jscript-block-dynamic 
+#<<EOF
+           <script src= ./jquery3.1.0.js></script> 
+EOF
+)
+
+(define  (test:js-block javascript-lib)
+   (conc  "<script src=" javascript-lib "></script>" ))
+
+
+(define tests:css-jscript-block-static (test:js-block *java-script-lib*))
+
+(define (tests:css-jscript-block-cond dynamic) 
+      (if (equal? dynamic  #t)
+       tests:css-jscript-block-dynamic
+       tests:css-jscript-block-static))
+
+       
+(define (tests:run-record->test-path run numkeys)
+   (append (take (vector->list run) numkeys)
+	   (list (vector-ref run (+ 1 numkeys)))))
+
+
+(define (tests:get-rest-data runs header numkeys)
+   (let ((resh (make-hash-table)))
+   (for-each
+     (lambda (run)
+        (let* ((run-id (db:get-value-by-header run header "id"))
+               (run-dir      (tests:run-record->test-path run numkeys))
+	       (test-data    (rmt:get-tests-for-run
+				   run-id
+                                   "%"       ;; testnamepatt
+				   '()        ;; states
+				   '()        ;; statuses
+				   #f         ;; offset
+				   #f         ;; num-to-get
+				   #f         ;; hide/not-hide
+				   #f         ;; sort-by
+				   #f         ;; sort-order
+				   #f         ;; 'shortlist                           ;; qrytype
+                                   0         ;; last update
+				   #f)))
+            
+            (map (lambda (test)
+                 (let* ((test-name (vector-ref test 2))
+                        (test-html-path (conc (vector-ref test 10) "/" (vector-ref test 13)))
+                        (test-item (conc test-name ":" (vector-ref test 11)))
+                        (test-status (vector-ref test 4)))
+                         
+                (if (not (hash-table-ref/default resh test-name  #f))
+                      (hash-table-set! resh test-name   (make-hash-table)))
+                (if (not (hash-table-ref/default (hash-table-ref/default resh test-name  #f)  test-item  #f))
+                       (hash-table-set! (hash-table-ref/default resh test-name  #f) test-item   (make-hash-table))) 
+               (hash-table-set!  (hash-table-ref/default (hash-table-ref/default resh test-name  #f) test-item #f) run-id (list test-status test-html-path)))) 
+        test-data)))
+      runs)
+   resh))
+
+
+;; tests:genrate dashboard body 
+;;
+
+(define (tests:dashboard-body page pg-size keys numkeys  total-runs linktree area-name get-prev-links get-next-links flag run-patt target-patt)
+  (let* ((start (* page pg-size)) 
+					;(runsdat   (rmt:get-runs "%" pg-size start (map (lambda (x)(list x "%")) keys)))
+         (runsdat   (rmt:get-runs-by-patt  keys run-patt target-patt start pg-size #f 0 sort-order: "desc"))
+					; db:get-runs-by-patt   keys runnamepatt targpatt offset limit fields last-update   
+	 (header    (vector-ref runsdat 0))
+	 (runs      (vector-ref runsdat 1))
+         (ctr 0)
+         (test-runs-hash (tests:get-rest-data runs header numkeys))
+         (test-list (hash-table-keys test-runs-hash))) 
+    
+    (s:html tests:css-jscript-block (tests:css-jscript-block-cond flag)
+	    (s:title "Summary for " area-name)
+	    (s:body 'onload "addEvents();"
+		    (get-prev-links page linktree)
+		    (get-next-links page linktree total-runs)
+		    
+		    (s:h1 "Summary for " area-name)
+		    (s:h3 "Filter" )
+		    (s:input 'type "text"  'name "testname" 'id "testname" 'length "30" 'onkeyup "filtersome()")
+		    ;; top list
+		    
+		    (s:table 'id "LinkedList1" 'border "1" 'cellspacing 0
+			     (map (lambda (key)
+				    (let* ((res (s:tr 'class "something" 
+						      (s:th key )
+						      (map (lambda (run)
+							     (s:th  (vector-ref run ctr)))
+							   runs))))
+				      (set! ctr (+ ctr 1))
+				      res))
+				  keys)
+			     (s:tr
+			      (s:th "Run Name")
+			      (map (lambda (run)
+				     (s:th (db:get-value-by-header run header "runname")))
+				   runs))
+			     
+			     (map (lambda (test-name)
+				    (let* ((item-hash (hash-table-ref/default test-runs-hash test-name  #f))
+					   (item-keys (sort (hash-table-keys item-hash) string<=?))) 
+				      (map (lambda (item-name)  
+  		                             (let* ((res (s:tr  'class item-name
+								(s:td  item-name 'class "test" )
+								(map (lambda (run)
+								       (let* ((run-test (hash-table-ref/default item-hash item-name  #f))
+									      (run-id (db:get-value-by-header run header "id"))
+									      (result (hash-table-ref/default run-test run-id "n/a"))
+					;(relative-path (get-relative-path)) 
+									      (status (if (string? result)
+											  result
+											  (car result)))
+									      (link (if (string? result)
+											result
+											(if (equal? flag #t) 
+											    (s:a (car result) 'href (conc "./test_log?runid=" run-id "&testname="  item-name ))
+											    (s:a (car result) 'href (string-substitute  (conc linktree "/")  "" (cadr result)  "-"))))))
+									 (s:td  link 'class status)))
+								     runs))))
+					       res))
+					   item-keys)))
+				  test-list)))))) 
+
+;; (tests:create-html-tree "test-index.html")
+;;
+(define (tests:create-html-tree outf)
+  (let* ((lockfile  (conc outf ".lock"))
+	 (runs-to-process '())
+         (linktree  (common:get-linktree))
+         (area-name (common:get-area-name))
+	 (keys      (rmt:get-keys))
+	 (numkeys   (length keys))
+         (run-patt (or (args:get-arg "-run-patt")
+		       (args:get-arg "-runname")
+		       "%"))
+         (target (or  (args:get-arg "-target-patt") 
+		      (args:get-arg "-target")
+                      "%"))
+         (targlist (string-split target "/"))
+         (numtarg  (length targlist))  
+         (targtweaked (if (> numkeys numtarg)
+			  (append targlist (make-list (- numkeys numtarg) "%"))
+			  targlist))
+         (target-patt (string-join targtweaked "/"))
+					;(total-runs  (rmt:get-num-runs "%")) ;;this needs to be changed to filter by target
+	 (total-runs (rmt:get-runs-cnt-by-patt run-patt target-patt keys )) 
+         (pg-size 10))
+    (if (common:simple-file-lock lockfile)
+        (begin
+					;(print total-runs)    
+	  (let loop ((page 0))
+	    (let* ((oup            (open-output-file (or outf (conc linktree "/page" page ".html"))))
+		   (get-prev-links (lambda (page linktree )   
+				     (let* ((link  (if (not (eq? page 0))
+						       (s:a "&lt;&lt;prev" 'href (conc  "page" (- page 1) ".html"))
+						       (s:a "" 'href (conc   "page"  page ".html")))))
+				       link)))
+		   (get-next-links (lambda (page linktree total-runs)   
+				     (let* ((link  (if (> total-runs (+ 10 (* page pg-size)))
+						       (s:a "next&gt;&gt;" 'href (conc  "page"  (+ page 1) ".html"))
+						       (s:a "" 'href (conc   "page" page  ".html")))))
+				       link))) )
+	      (print "total runs: " total-runs) 
+	      (s:output-new
+	       oup
+	       (tests:dashboard-body page pg-size keys numkeys total-runs linktree area-name get-prev-links get-next-links #f run-patt target-patt)) ;; update this function
+	      (close-output-port oup)
+					; (set! page (+ 1 page))
+	      (if (> total-runs (* (+ 1 page) pg-size))
+		  (loop (+ 1  page)))))
+	  (common:simple-file-release-lock lockfile))
+	(begin
+	  (debug:print 0 *default-log-port* "Failed to get lock on file outf, lockfile: " lockfile) #f))))
+
+
+;; CHECK - WAS THIS ADDED OR REMOVED? MANUAL MERGE WITH API STUFF!!!
+;;
+;; get a pretty table to summarize steps
+;;
+;; (define (dcommon:process-steps-table steps);; db test-id #!key (work-area #f))
+(define (tests:process-steps-table steps);; db test-id #!key (work-area #f))
+;;  (let ((steps   (db:get-steps-for-test db test-id work-area: work-area)))
+    ;; organise the steps for better readability
+    (let ((res (make-hash-table)))
+      (for-each 
+       (lambda (step)
+	 (debug:print 6 *default-log-port* "step=" step)
+	 (let ((record (hash-table-ref/default 
+			res 
+			(tdb:step-get-stepname step)
+			;;           0                      1    2    3       4         5       6       7
+			;;        stepname                start end status Duration  Logfile Comment  first-id
+			(vector (tdb:step-get-stepname step) ""   "" ""     ""        ""     ""       #f))))
+	   (debug:print 6 *default-log-port* "record(before) = " record 
+			"\nid:       " (tdb:step-get-id step)
+			"\nstepname: " (tdb:step-get-stepname step)
+			"\nstate:    " (tdb:step-get-state step)
+			"\nstatus:   " (tdb:step-get-status step)
+			"\ntime:     " (tdb:step-get-event_time step))
+	   (if (not (vector-ref record 7))(vector-set! record 7 (tdb:step-get-id step))) ;; do not clobber the id if previously set
+	   (case (string->symbol (tdb:step-get-state step))
+	     ((start)(vector-set! record 1 (tdb:step-get-event_time step))
+	      (vector-set! record 3 (if (equal? (vector-ref record 3) "")
+					(tdb:step-get-status step)))
+	      (if (> (string-length (tdb:step-get-logfile step))
+		     0)
+		  (vector-set! record 5 (tdb:step-get-logfile step))))
+	     ((end)  
+	      (vector-set! record 2 (any->number (tdb:step-get-event_time step)))
+	      (vector-set! record 3 (tdb:step-get-status step))
+	      (vector-set! record 4 (let ((startt (any->number (vector-ref record 1)))
+					  (endt   (any->number (vector-ref record 2))))
+				      (debug:print 4 *default-log-port* "record[1]=" (vector-ref record 1) 
+						   ", startt=" startt ", endt=" endt
+						   ", get-status: " (tdb:step-get-status step))
+				      (if (and (number? startt)(number? endt))
+					  (seconds->hr-min-sec (- endt startt)) "-1")))
+	      (if (> (string-length (tdb:step-get-logfile step))
+		     0)
+		  (vector-set! record 5 (tdb:step-get-logfile step)))
+	      (if (> (string-length (tdb:step-get-comment step))
+		     0)
+		  (vector-set! record 6 (tdb:step-get-comment step))))
+	     (else
+	      (vector-set! record 2 (tdb:step-get-state step))
+	      (vector-set! record 3 (tdb:step-get-status step))
+	      (vector-set! record 4 (tdb:step-get-event_time step))
+	      (vector-set! record 6 (tdb:step-get-comment step))))
+	   (hash-table-set! res (tdb:step-get-stepname step) record)
+	   (debug:print 6 *default-log-port* "record(after)  = " record 
+			"\nid:       " (tdb:step-get-id step)
+			"\nstepname: " (tdb:step-get-stepname step)
+			"\nstate:    " (tdb:step-get-state step)
+			"\nstatus:   " (tdb:step-get-status step)
+			"\ntime:     " (tdb:step-get-event_time step))))
+       ;; (else   (vector-set! record 1 (tdb:step-get-event_time step)))
+       (sort steps (lambda (a b)
+		     (cond
+		      ((<   (tdb:step-get-event_time a)(tdb:step-get-event_time b)) #t)
+		      ((eq? (tdb:step-get-event_time a)(tdb:step-get-event_time b)) 
+		       (<   (tdb:step-get-id a)        (tdb:step-get-id b)))
+		      (else #f)))))
+      res))
+
+;; 
+;;
+(define (tests:get-compressed-steps run-id test-id)
+  (let* ((steps-data  (rmt:get-steps-for-test run-id test-id)) ;;      0       1    2    3       4       5       6      7       
+	 (comprsteps  (tests:process-steps-table steps-data))) ;; #<stepname start end status Duration Logfile Comment id>
+    (map (lambda (x)
+	   ;; take advantage of the \n on time->string
+	   (vector    ;; we are constructing basically the original vector but collapsing start end records
+	    (vector-ref x 0)                              ;; id        0
+	    (let ((s (vector-ref x 1)))
+	      (if (number? s)(seconds->time-string s) s)) ;; starttime 1
+	    (let ((s (vector-ref x 2)))
+	      (if (number? s)(seconds->time-string s) s)) ;; endtime   2
+	    (vector-ref x 3)                              ;; status    3    
+	    (vector-ref x 4)                              ;; duration  4
+	    (vector-ref x 5)                              ;; logfile   5
+	    (vector-ref x 6)                              ;; comment   6
+	    (vector-ref x 7)))                            ;; id        7
+	 (sort (hash-table-values comprsteps)
+	       (lambda (a b)
+		 (let ((time-a (vector-ref a 1))
+		       (time-b (vector-ref b 1))
+		       (id-a   (vector-ref a 7))
+		       (id-b   (vector-ref b 7)))
+		   (if (and (number? time-a)(number? time-b))
+		       (if (< time-a time-b)
+			   #t
+			   (if (eq? time-a time-b)
+			       (< id-a id-b)
+			       ;; (string<? (conc (vector-ref a 2))
+			       ;;	    (conc (vector-ref b 2)))
+			       #f))
+		       (string<? (conc time-a)(conc time-b)))))))))
+
+
+;; Save test state and status in to a file .final-status in the test directory
+;;
+(define (tests:save-final-status run-id test-id)
+  (let* ((test-dat  (rmt:get-test-info-by-id run-id test-id))
+	 (out-dir   (db:test-get-rundir test-dat))
+	 (status-file  (conc out-dir "/.final-status"))
+   )
+    ;; first verify we are able to write the output file
+    (if (not (file-writable? out-dir))
+	    (debug:print 0 *default-log-port* "ERROR: cannot write .final-status to " out-dir)
+	    (let* 
+         ((outp      (open-output-file status-file))
+	       (status    (db:test-get-status   test-dat))
+         (state     (db:test-get-state    test-dat)))
+        (fprintf outp "~S\n" state) 
+        (fprintf outp "~S\n" status) 
+        (close-output-port outp)))))
+
+
+;; MUST BE CALLED local!
+;;
+(define (tests:test-get-paths-matching keynames target fnamepatt #!key (res '()))
+  ;; BUG: Move the values derived from args to parameters and push to megatest.scm
+  (let* ((testpatt   (or (args:get-arg "-testpatt")(args:get-arg "-testpatt") "%"))
+	 (statepatt  (or (args:get-arg "-state")   (args:get-arg ":state")    "%"))
+	 (statuspatt (or (args:get-arg "-status")  (args:get-arg ":status")   "%"))
+	 (runname    (or (args:get-arg "-runname") (args:get-arg ":runname")  "%"))
+	 (paths-from-db (rmt:test-get-paths-matching-keynames-target-new keynames target res
+					testpatt
+					statepatt
+					statuspatt
+					runname)))
+    (if fnamepatt
+	(apply append 
+	       (map (lambda (p)
+		      (if (directory-exists? p)
+			  (let ((glob-query (conc p "/" fnamepatt)))
+			    (handle-exceptions
+				exn
+			      (begin
+				(print "built-in glob on " glob-query ", failed, try using the shell. exn=" exn)
+				(with-input-from-pipe
+				 (conc "echo " glob-query)
+				 read-lines))  ;; we aren't going to try too hard. If glob breaks it is likely because someone tried to do */*/*.log or similar
+			      (glob glob-query)))
+			  '()))
+		    paths-from-db))
+	paths-from-db)))
+
+			      
+;;======================================================================
+;; Gather data from test/task specifications
+;;======================================================================
+
+;; (define (tests:get-valid-tests testsdir test-patts) ;;  #!key (test-names '()))
+;;   (let ((tests (glob (conc testsdir "/tests/*")))) ;; " (string-translate patt "%" "*")))))
+;;     (set! tests (filter (lambda (test)(common:file-exists? (conc test "/testconfig"))) tests))
+;;     (delete-duplicates
+;;      (filter (lambda (testname)
+;; 	       (tests:match test-patts testname #f))
+;; 	     (map (lambda (testp)
+;; 		    (last (string-split testp "/")))
+;; 		  tests)))))
+
+(define (tests:get-test-path-from-environment)
+  (if (and (getenv "MT_LINKTREE")
+	   (getenv "MT_TARGET")
+	   (getenv "MT_RUNNAME")
+	   (getenv "MT_TEST_NAME")
+	   (getenv "MT_ITEMPATH"))
+      (conc (getenv "MT_LINKTREE")  "/"
+	    (getenv "MT_TARGET")    "/"
+	    (getenv "MT_RUNNAME")   "/"
+	    (getenv "MT_TEST_NAME")
+	    (if (and (getenv "MT_ITEMPATH")
+                     (not (string=? "" (getenv "MT_ITEMPATH"))))
+		(conc "/" (getenv "MT_ITEMPATH"))
+                ""))
+      #f))
+
+;; if .testconfig exists in test directory read and return it
+;; else if have cached copy in *testconfigs* return it IFF there is a section "have fulldata"
+;; else read the testconfig file
+;;   if have path to test directory save the config as .testconfig and return it
+;;
+(define (tests:get-testconfig test-name item-path test-registry system-allowed #!key (force-create #f)(allow-write-cache #t)(wait-a-minute #f))
+  (let* ((use-cache    (common:use-cache?))
+	 (cache-path   (tests:get-test-path-from-environment))
+	 (cache-file   (and cache-path (conc cache-path "/.testconfig")))
+	 (cache-exists (and cache-file
+			    (not force-create)  ;; if force-create then pretend there is no cache to read
+			    (common:file-exists? cache-file)))
+	 (cached-dat   (if (and (not force-create)
+				cache-exists
+				use-cache)
+			   (handle-exceptions
+			       exn
+			     (begin
+			       (debug:print 0 *default-log-port* "failed to read " cache-file ", exn=" exn)
+			       #f) ;; any issues, just give up with the cached version and re-read
+			     (configf:read-alist cache-file))
+			   #f))
+         (test-full-name (if (and item-path (not (string-null? item-path)))
+                             (conc test-name "/" item-path)
+                             test-name)))
+    (if cached-dat
+	cached-dat
+	(let ((dat (hash-table-ref/default *testconfigs* test-full-name #f)))
+	  (if (and  dat ;; have a locally cached version
+		    (hash-table-ref/default dat "have fulldata" #f)) ;; marked as good data?
+	      dat
+	      ;; no cached data available
+	      (let* ((treg         (or test-registry
+				       (tests:get-all)))
+		     (test-path    (or (hash-table-ref/default treg test-name #f)
+                                       (let* ((local-tcdir (conc (getenv "MT_LINKTREE") "/"
+                                                                 (getenv "MT_TARGET") "/"
+                                                                 (getenv "MT_RUNNAME") "/"
+                                                                 test-name "/" item-path))
+                                              (local-tcfg (conc local-tcdir "/testconfig")))
+                                         (if (common:file-exists? local-tcfg)
+                                             local-tcdir
+                                             #f))
+				       (conc *toppath* "/tests/" test-name)))
+		     (test-configf (conc test-path "/testconfig"))
+		     (testexists   (let loopa ((tries-left 30))
+                                     (cond
+                                      (
+                                       (and (common:file-exists? test-configf)(file-readable? test-configf))
+                                       #t)
+                                      (
+                                       (common:file-exists? test-configf)
+                                       (debug:print 0 *default-log-port* "WARNING: Cannot read testconfig file: "test-configf)
+                                       #f)
+                                      (
+                                       (and wait-a-minute (> tries-left 0))
+                                       (thread-sleep! 10)
+                                       (debug:print 0 *default-log-port* "WARNING: testconfig file does not exist: "test-configf" will retry in 10 seconds.  Tries left: "tries-left) ;; BB: this fires
+                                       (loopa (sub1 tries-left)))
+                                      (else
+                                       (debug:print 0 *default-log-port* "WARNING: testconfig file does not exist: "test-configf) ;; BB: this fires
+                                       #f))))
+		     (tcfg         (if testexists
+				       (configf:read-config test-configf #f system-allowed
+						    environ-patt: (if system-allowed
+								      "pre-launch-env-vars"
+								      #f)
+						    env-to-use: (module-environment 'bigmod))
+				       #f)))
+		(if (and tcfg cache-file) (hash-table-set! tcfg "have fulldata" #t)) ;; mark this as fully read data
+		(if tcfg (hash-table-set! *testconfigs* test-full-name tcfg))
+		(if (and testexists
+			 cache-file
+			 (and (file-exists? cache-path)
+			      (file-writable? cache-path))
+			 allow-write-cache)
+		    (let ((tpath (conc cache-path "/.testconfig")))
+		      (debug:print-info 1 *default-log-port* "Caching testconfig for " test-name " in " tpath)
+                      (if (and tcfg (not (common:in-running-test?)))
+                          (configf:write-alist tcfg tpath))))
+		tcfg))))))
+  
+;; sort tests by priority and waiton
+;; Move test specific stuff to a test unit FIXME one of these days
+(define (tests:sort-by-priority-and-waiton test-records)
+  (if (eq? (hash-table-size test-records) 0)
+      '()
+      (let* ((mungepriority (lambda (priority)
+			      (if priority
+				  (let ((tmp (any->number priority)))
+				    (if tmp tmp (begin (debug:print-error 0 *default-log-port* "bad priority value " priority ", using 0") 0)))
+				  0)))
+	     (all-tests      (hash-table-keys test-records))
+	     (all-waited-on  (let loop ((hed (car all-tests))
+					(tal (cdr all-tests))
+					(res '()))
+			       (let* ((trec    (hash-table-ref test-records hed))
+				      (waitons (or (tests:testqueue-get-waitons trec) '())))
+				 (if (null? tal)
+				     (append res waitons)
+				     (loop (car tal)(cdr tal)(append res waitons))))))
+	     (sort-fn1 
+	      (lambda (a b)
+		(let* ((a-record   (hash-table-ref test-records a))
+		       (b-record   (hash-table-ref test-records b))
+		       (a-waitons  (or (tests:testqueue-get-waitons a-record) '()))
+		       (b-waitons  (or (tests:testqueue-get-waitons b-record) '()))
+		       (a-config   (tests:testqueue-get-testconfig  a-record))
+		       (b-config   (tests:testqueue-get-testconfig  b-record))
+		       (a-raw-pri  (configf:lookup a-config "requirements" "priority"))
+		       (b-raw-pri  (configf:lookup b-config "requirements" "priority"))
+		       (a-priority (mungepriority a-raw-pri))
+		       (b-priority (mungepriority b-raw-pri)))
+		  (tests:testqueue-set-priority! a-record a-priority)
+		  (tests:testqueue-set-priority! b-record b-priority)
+		  ;; (debug:print 0 *default-log-port* "a=" a ", b=" b ", a-waitons=" a-waitons ", b-waitons=" b-waitons)
+		  (cond
+		   ;; is 
+		   ((member a b-waitons)          ;; is b waiting on a?
+		    ;; (debug:print 0 *default-log-port* "case1")
+		    #t)
+		   ((member b a-waitons)          ;; is a waiting on b?
+		    ;; (debug:print 0 *default-log-port* "case2")
+		    #f)
+		   ((and (not (null? a-waitons))  ;; both have waitons - do not disturb
+			 (not (null? b-waitons)))
+		    ;; (debug:print 0 *default-log-port* "case2.1")
+		    #t)
+		   ((and (null? a-waitons)        ;; no waitons for a but b has waitons
+			 (not (null? b-waitons)))
+		    ;; (debug:print 0 *default-log-port* "case3")
+		    #f)
+		   ((and (not (null? a-waitons))  ;; a has waitons but b does not
+			 (null? b-waitons)) 
+		    ;; (debug:print 0 *default-log-port* "case4")
+		    #t)
+		   ((not (eq? a-priority b-priority)) ;; use
+		    (> a-priority b-priority))
+		   (else
+		    ;; (debug:print 0 *default-log-port* "case5")
+		    (string>? a b))))))
+	     
+	     (sort-fn2
+	      (lambda (a b)
+		(> (mungepriority (tests:testqueue-get-priority (hash-table-ref test-records a)))
+		   (mungepriority (tests:testqueue-get-priority (hash-table-ref test-records b)))))))
+	;; (let ((dot-res (tests:run-dot (tests:tests->dot test-records) "plain")))
+	;;   (debug:print "dot-res=" dot-res))
+	;; (let ((data (map cdr (filter
+	;;     		  (lambda (x)(equal? "node" (car x)))
+	;;     		  (map string-split (tests:easy-dot test-records "plain"))))))
+	;;   (map car (sort data (lambda (a b)
+	;;     		    (> (string->number (caddr a))(string->number (caddr b)))))))
+	;; ))
+	(sort all-tests sort-fn1)))) ;; avoid dealing with deleted tests, look at the hash table
+
+(define (tests:easy-dot test-records outtype)
+  (let-values (((fd temp-path) (file-mkstemp (conc "/tmp/" (current-user-name) ".XXXXXX"))))
+    (let ((all-testnames (hash-table-keys test-records))
+	  (temp-port     (open-output-file* fd)))
+      ;; (format temp-port "This file is ~A.~%" temp-path)
+      (format temp-port "digraph tests {\n")
+      (format temp-port "  size=4,8\n")
+      ;; (format temp-port "   splines=none\n")
+      (for-each
+       (lambda (testname)
+	 (let* ((testrec (hash-table-ref test-records testname))
+		(waitons (or (tests:testqueue-get-waitons testrec) '())))
+	   (for-each
+	    (lambda (waiton)
+	      (format temp-port (conc "   " waiton " -> " testname " [splines=ortho]\n")))
+	    waitons)))
+       all-testnames)
+      (format temp-port "}\n")
+      (close-output-port temp-port)
+      (with-input-from-pipe
+       (conc "env -i PATH=$PATH dot -T" outtype " < " temp-path)
+       (lambda ()
+	 (let ((res (read-lines)))
+	   ;; (delete-file temp-path)
+	   res))))))
+
+(define (tests:write-dot-file test-records fname sizex sizey)
+  (if (file-writable? (pathname-directory fname))
+      (with-output-to-file fname
+	(lambda ()
+	  (map print (tests:tests->dot test-records sizex sizey))))))
+
+(define (tests:tests->dot test-records sizex sizey)
+  (let ((all-testnames (hash-table-keys test-records)))
+    (if (null? all-testnames)
+	'()
+	(let loop ((hed (car all-testnames))
+		   (tal (cdr all-testnames))
+		   (res (list "digraph tests {"
+			      (conc " size=\"" (or sizex 11) "," (or sizey 11) "\";")
+			      " ratio=0.95;"
+			      )))
+	  (let* ((testrec (hash-table-ref test-records hed))
+		 (waitons (or (tests:testqueue-get-waitons testrec) '()))
+		 (newres  (append res
+				  (if (null? waitons)
+				      (list (conc "   \"" hed "\" [shape=box];"))
+				      (map (lambda (waiton)
+					     (conc "   \"" waiton "\" -> \"" hed "\" [shape=box];"))
+					   waitons)
+				      ))))
+	    (if (null? tal)
+		(append newres (list "}"))
+		(loop (car tal)(cdr tal) newres)
+		))))))
+
+;; (tests:run-dot (list "digraph tests {" "a -> b" "}") "plain")
+
+(define (tests:run-dot indat outtype) ;; outtype is plain, fig, dot, etc. http://www.graphviz.org/content/output-formats
+  (let-values (((inp oup pid)(process "env -i PATH=$PATH dot" (list "-T" outtype))))
+    (with-output-to-port oup
+      (lambda ()
+	(map print indat)))
+    (close-output-port oup)
+    (let ((res (with-input-from-port inp
+		 (lambda ()
+		   (read-lines)))))
+      (close-input-port inp)
+      res)))
+
+;; read data from tmp file or create if not exists
+;; if exists regen in background
+;;
+(define (tests:lazy-dot testrecords  outtype sizex sizey)
+  (let ((dfile (conc "/tmp/." (current-user-name) "-" (server:mk-signature) ".dot"))
+	(fname (conc "/tmp/." (current-user-name) "-" (server:mk-signature) ".dotdat")))
+    (tests:write-dot-file testrecords dfile sizex sizey)
+    (if (common:file-exists? fname)
+	(let ((res (with-input-from-file fname
+		     (lambda ()
+		       (read-lines)))))
+	  (system (conc "env -i PATH=$PATH dot -T " outtype " < " dfile " > " fname "&"))
+	  res)
+	(begin
+	  (system (conc "env -i PATH=$PATH dot -T " outtype " < " dfile " > " fname))
+	  (with-input-from-file fname
+	    (lambda ()
+	      (read-lines)))))))
+	  
+
+;;======================================================================
+;; refactoring this block into tests:get-full-data from line 263 of runs.scm
+;;======================================================================
+;; hed is the test name
+;; test-records is a hash of test-name => test record
+(define (tests:get-full-data test-names test-records required-tests all-tests-registry)
+  (if (not (null? test-names))
+      (let loop ((hed (car test-names))
+		 (tal (cdr test-names)))         ;; 'return-procs tells the config reader to prep running system but return a proc
+	(debug:print-info 4 *default-log-port* "hed=" hed " at top of loop")
+        ;; don't know item-path at this time, let the testconfig get the top level testconfig
+	(let* ((config  (tests:get-testconfig hed #f all-tests-registry 'return-procs))
+	       (waitons (let ((instr (if config 
+					 (configf:lookup config "requirements" "waiton")
+					 (begin ;; No config means this is a non-existant test
+					   (debug:print-error 0 *default-log-port* "non-existent required test \"" hed "\", grep through your testconfigs to find and remove or create the test. Discarding and continuing.")
+					     ""))))
+			  (debug:print-info 8 *default-log-port* "waitons string is " instr)
+			  (string-split (cond
+					 ((procedure? instr)
+					  (let ((res (instr)))
+					    (debug:print-info 8 *default-log-port* "waiton procedure results in string " res " for test " hed)
+					    res))
+					 ((string? instr)     instr)
+					 (else 
+					  ;; NOTE: This is actually the case of *no* waitons! ;; (debug:print-error 0 *default-log-port* "something went wrong in processing waitons for test " hed)
+					  ""))))))
+	  (if (not config) ;; this is a non-existant test called in a waiton. 
+	      (if (null? tal)
+		  test-records
+		  (loop (car tal)(cdr tal)))
+	      (begin
+		(debug:print-info 8 *default-log-port* "waitons: " waitons)
+		;; check for hed in waitons => this would be circular, remove it and issue an
+		;; error
+		(if (member hed waitons)
+		    (begin
+		      (debug:print-error 0 *default-log-port* "test " hed " has listed itself as a waiton, please correct this!")
+		      (set! waitons (filter (lambda (x)(not (equal? x hed))) waitons))))
+		
+		;; (items   (items:get-items-from-config config)))
+		(if (not (hash-table-ref/default test-records hed #f))
+		    (hash-table-set! test-records
+				     hed (vector hed     ;; 0
+						 config  ;; 1
+						 waitons ;; 2
+						 (configf:lookup config "requirements" "priority")     ;; priority 3
+						 (let ((items      (hash-table-ref/default config "items" #f)) ;; items 4
+						       (itemstable (hash-table-ref/default config "itemstable" #f))) 
+						   ;; if either items or items table is a proc return it so test running
+						   ;; process can know to call items:get-items-from-config
+						   ;; if either is a list and none is a proc go ahead and call get-items
+						   ;; otherwise return #f - this is not an iterated test
+						   (cond
+						    ((procedure? items)      
+						     (debug:print-info 4 *default-log-port* "items is a procedure, will calc later")
+						     items)            ;; calc later
+						    ((procedure? itemstable)
+						     (debug:print-info 4 *default-log-port* "itemstable is a procedure, will calc later")
+						     itemstable)       ;; calc later
+						    ((filter (lambda (x)
+							       (let ((val (car x)))
+								 (if (procedure? val) val #f)))
+							     (append (if (list? items) items '())
+								     (if (list? itemstable) itemstable '())))
+						     'have-procedure)
+						    ((or (list? items)(list? itemstable)) ;; calc now
+						     (debug:print-info 4 *default-log-port* "items and itemstable are lists, calc now\n"
+								       "    items: " items " itemstable: " itemstable)
+						     (items:get-items-from-config config))
+						    (else #f)))                           ;; not iterated
+						 #f      ;; itemsdat 5
+						 #f      ;; spare - used for item-path
+						 )))
+		(for-each 
+		 (lambda (waiton)
+		   (if (and waiton (not (member waiton test-names)))
+		       (begin
+			 (set! required-tests (cons waiton required-tests))
+			 (set! test-names (cons waiton test-names))))) ;; was an append, now a cons
+		 waitons)
+		(let ((remtests (delete-duplicates (append waitons tal))))
+		  (if (not (null? remtests))
+		      (loop (car remtests)(cdr remtests))
+		      test-records))))))))
+
+;;======================================================================
+;; test steps
+;;======================================================================
+
+;; teststep-set-status! used to be here
+
+(define (test-get-kill-request run-id test-id) ;; run-id test-name itemdat)
+  (let* ((testdat   (rmt:get-test-info-by-id run-id test-id)))
+    (and testdat
+	 (equal? (test:get-state testdat) "KILLREQ"))))
+
+(define (test:tdb-get-rundat-count tdb)
+  (if tdb
+      (let ((res 0))
+	(sqlite3:for-each-row
+	 (lambda (count)
+	   (set! res count))
+	 tdb
+	 "SELECT count(id) FROM test_rundat;")
+	res))
+  0)
+
+(define (tests:update-central-meta-info run-id test-id cpuload diskfree minutes uname hostname)
+  (rmt:general-call 'update-test-rundat run-id test-id (current-seconds) (or cpuload -1)(or diskfree -1) -1 (or minutes -1))
+  (if (and cpuload diskfree)
+      (rmt:general-call 'update-cpuload-diskfree run-id cpuload diskfree test-id))
+  (if minutes 
+      (rmt:general-call 'update-run-duration run-id minutes test-id))
+  (if (and uname hostname)
+      (rmt:general-call 'update-uname-host run-id uname hostname test-id)))
+  
+;; This one is for running with no db access (i.e. via rmt: internally)
+(define (tests:set-full-meta-info db test-id run-id minutes work-area remtries)
+;; (define (tests:set-full-meta-info test-id run-id minutes work-area)
+;;  (let ((remtries 10))
+  (let* ((cpuload  (get-cpu-load))
+	 (diskfree (get-df (current-directory)))
+	 (uname    (get-uname "-srvpio"))
+	 (hostname (get-host-name)))
+    (tests:update-central-meta-info run-id test-id cpuload diskfree minutes uname hostname)))
+    
+;; (define (tests:set-partial-meta-info test-id run-id minutes work-area)
+#;(define (tests:set-partial-meta-info test-id run-id minutes work-area remtries)
+  (let* ((cpuload  (get-cpu-load))
+	 (diskfree (get-df (current-directory)))
+	 (remtries 10))
+    (handle-exceptions
+     exn
+     (if (> remtries 0)
+	 (begin
+	   (print-call-chain (current-error-port))
+	   (debug:print-info 0 *default-log-port* "WARNING: failed to set meta info. Will try " remtries " more times")
+	   (set! remtries (- remtries 1))
+	   (thread-sleep! 10)
+	   (tests:set-full-meta-info db test-id run-id minutes work-area (- remtries 1)))
+	 (let ((err-status ((condition-property-accessor 'sqlite3 'status #f) exn)))
+	   (debug:print-error 0 *default-log-port* "tried for over a minute to update meta info and failed. Giving up")
+	   (debug:print 0 *default-log-port* "EXCEPTION: database probably overloaded or unreadable.")
+	   (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
+	   (debug:print 5 *default-log-port* "exn=" (condition->list exn))
+	   (debug:print 0 *default-log-port* " status:  " ((condition-property-accessor 'sqlite3 'status) exn))
+	   (print-call-chain (current-error-port))))
+     (tests:update-testdat-meta-info db test-id work-area cpuload diskfree minutes)
+  )))
+	 
+;;======================================================================
+;; A R C H I V I N G
+;;======================================================================
+
+(define (test:archive db test-id)
+  #f)
+
+(define (test:archive-tests db keynames target)
+  #f)
+
+
+;; summarize test in to a file test-summary.html in the test directory
+;;
+(define (tests:summarize-test run-id test-id)
+  (let* ((test-dat  (rmt:get-test-info-by-id run-id test-id))
+	 (out-dir   (db:test-get-rundir test-dat))
+	 (out-file  (conc out-dir "/test-summary.html")))
+    ;; first verify we are able to write the output file
+    (if (not (file-writable? out-dir))
+	(debug:print 0 *default-log-port* "ERROR: cannot write test-summary.html to " out-dir)
+	(let* (;; (steps-dat (rmt:get-steps-for-test run-id test-id))
+	       (test-name (db:test-get-testname test-dat))
+	       (item-path (db:test-get-item-path test-dat))
+	       (full-name (db:test-make-full-name test-name item-path))
+	       (oup       (open-output-file out-file))
+	       (status    (db:test-get-status   test-dat))
+	       (color     (common:get-color-from-status status))
+	       (logf      (db:test-get-final_logf test-dat))
+	       (steps-dat (tests:get-compressed-steps run-id test-id)))
+	  ;; (dcommon:get-compressed-steps #f 1 30045)
+	  ;; (#("wasting_time" "23:36:13" "23:36:21" "0" "8.0s" "wasting_time.log"))
+	
+	  (s:output-new
+	   oup
+	   (s:html
+	    (s:title "Summary for " full-name)
+	    (s:body 
+	     (s:h2 "Summary for " full-name)
+	     (s:table 'cellspacing "0" 'border "1"
+		      (s:tr (s:td "run id")   (s:td (db:test-get-run_id   test-dat))
+			    (s:td "test id")  (s:td (db:test-get-id       test-dat)))
+		      (s:tr (s:td "testname") (s:td test-name)
+			    (s:td "itempath") (s:td item-path))
+		      (s:tr (s:td "state")    (s:td (db:test-get-state    test-dat))
+			    (s:td "status")   (s:td (s:a 'href logf (s:font 'color color status))))
+		      (s:tr (s:td "TestDate") (s:td (seconds->work-week/day-time 
+						     (db:test-get-event_time test-dat)))
+			    (s:td "Duration") (s:td (seconds->hr-min-sec (db:test-get-run_duration test-dat)))))
+	     (s:h3 "Log files")
+	     (s:table 
+	      'cellspacing "0" 'border "1"
+	      (s:tr (s:td "Final log")(s:td (s:a 'href logf logf))))
+	     (s:table
+	      'cellspacing "0" 'border "1"
+	      (s:tr (s:td "Step Name")(s:td "Start")(s:td "End")(s:td "Status")(s:td "Duration")(s:td "Log File"))
+	      (map (lambda (step-dat)
+		     (s:tr (s:td (tdb:steps-table-get-stepname step-dat))
+			   (s:td (tdb:steps-table-get-start    step-dat))
+			   (s:td (tdb:steps-table-get-end      step-dat))
+			   (s:td (tdb:steps-table-get-status   step-dat))
+			   (s:td (tdb:steps-table-get-runtime  step-dat))
+			   (s:td (let ((step-log (tdb:steps-table-get-log-file step-dat)))
+				   (s:a 'href step-log step-log)))))
+		   steps-dat))
+	     )))
+	  (close-output-port oup)))))
+	  
+;; for each test:
+;;   
+(define (tests:filter-non-runnable run-id testkeynames testrecordshash)
+  (let ((runnables '()))
+    (for-each
+     (lambda (testkeyname)
+       (let* ((test-record (hash-table-ref testrecordshash testkeyname))
+	      (test-name   (tests:testqueue-get-testname  test-record))
+	      (itemdat     (tests:testqueue-get-itemdat   test-record))
+	      (item-path   (tests:testqueue-get-item_path test-record))
+	      (waitons     (tests:testqueue-get-waitons   test-record))
+	      (keep-test   #t)
+	      (test-id     (rmt:get-test-id run-id test-name item-path))
+	      (tdat        (rmt:get-testinfo-state-status run-id test-id))) ;; (cdb:get-test-info-by-id *runremote* test-id)))
+	 (if tdat
+	     (begin
+	       ;; Look at the test state and status
+	       (if (or (and (member (db:test-get-status tdat) 
+				    '("PASS" "WARN" "WAIVED" "CHECK" "SKIP"))
+			    (equal? (db:test-get-state tdat) "COMPLETED"))
+		       (member (db:test-get-state tdat)
+				    '("INCOMPLETE" "KILLED")))
+		   (set! keep-test #f))
+
+	       ;; examine waitons for any fails. If it is FAIL or INCOMPLETE then eliminate this test
+	       ;; from the runnable list
+	       (if keep-test
+		   (for-each (lambda (waiton)
+			       ;; for now we are waiting only on the parent test
+			       (let* ((parent-test-id (rmt:get-test-id run-id waiton ""))
+				      (wtdat          (rmt:get-testinfo-state-status run-id test-id))) ;; (cdb:get-test-info-by-id *runremote* test-id)))
+				 (if (or (and (equal? (db:test-get-state wtdat) "COMPLETED")
+					      (member (db:test-get-status wtdat) '("FAIL" "ABORT")))
+					 (member (db:test-get-status wtdat)  '("KILLED"))
+					 (member (db:test-get-state wtdat)   '("INCOMPETE")))
+				 ;; (if (or (member (db:test-get-status wtdat)
+				 ;;        	 '("FAIL" "KILLED"))
+				 ;;         (member (db:test-get-state wtdat)
+				 ;;        	 '("INCOMPETE")))
+				     (set! keep-test #f)))) ;; no point in running this one again
+			     waitons))))
+	 (if keep-test (set! runnables (cons testkeyname runnables)))))
+     testkeynames)
+    runnables))
+
+
+
+
+)

DELETED vg-test.scm
Index: vg-test.scm
==================================================================
--- vg-test.scm
+++ /dev/null
@@ -1,119 +0,0 @@
-;;  Copyright 2006-2017, Matthew Welland.
-;; 
-;; This file is part of Megatest.
-;; 
-;;     Megatest is free software: you can redistribute it and/or modify
-;;     it under the terms of the GNU General Public License as published by
-;;     the Free Software Foundation, either version 3 of the License, or
-;;     (at your option) any later version.
-;; 
-;;     Megatest is distributed in the hope that it will be useful,
-;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;     GNU General Public License for more details.
-;; 
-;;     You should have received a copy of the GNU General Public License
-;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
-;;
-(use canvas-draw iup foof-loop)
-(import canvas-draw-iup)
-
-(load "vg.scm")
-
-(define numtorun 1000)
-;; (if (> (length (argv)) 1)
-;; 		     (string->number (cadr (argv)))
-;; 		     1000))
-
- (use trace)
- ;; (trace 
- ;;  ;; vg:draw-rect
- ;;  ;; vg:grow-rect
- ;;  vg:get-extents-for-objs
- ;;  vg:components-get-extents
- ;;  vg:instances-get-extents
- ;;  vg:get-extents-for-two-rects
- ;;  canvas-line!)
-
-(define d1 (vg:drawing-new))
-(define l1 (vg:lib-new))
-(define c1 (vg:comp-new))
-(define c2 (vg:comp-new))
-(define bt1 (vg:make-rect-obj 10 40 20 50 text: "A long piece of text" font: "Helvetica, -10"))
-
-(let ((r1 (vg:make-rect-obj 20 20 30 30 text: "r1" font: "Helvetica, -20"))
-      (r2 (vg:make-rect-obj 30 30 60 60 text: "r2" font: "Helvetica, -10"))
-      (t1 (vg:make-text-obj 60 60 "The middle" font: "Helvetica, -10")))
-  (vg:add-objs-to-comp c1 r1 r2 t1 bt1))
-
-(loop ((for x (up-from 0 (to 20))))
-       (loop ((for y (up-from 0 (to 20))))
-	     (vg:add-objs-to-comp c1 (vg:make-rect-obj x y (+ x 5)(+ y 5)))))
-      
-(let ((start (current-seconds)))
-  (let loop ((i 0))
-    (vg:add-obj-to-comp c1 (vg:make-rect-obj 0 0 100 100))
-    (if (< i numtorun)(loop (+ i 1))))
-  (print "Run time: " (- (current-seconds) start)))
-
-(vg:add-obj-to-comp c1 (vg:make-line-obj 0 0 100 100))
-
-;; add the c1 component to lib l1 with name firstcomp
-(vg:add-comp-to-lib l1 "firstcomp" c1)
-(vg:add-comp-to-lib l1 "secondcomp" c2)
-
-;; add the l1 lib to drawing with name firstlib
-(vg:add-lib d1 "firstlib" l1)
-
-;; instantiate firstlib/firstcomp as inst1 in drawing d1 at 0,0
-(vg:instantiate d1 "firstlib" "firstcomp" "inst1" 0 0)
-(vg:instantiate d1 "firstlib" "firstcomp" "inst2" 200 200)
-
-
-;; (vg:drawing-scalex-set! d1 1.1)
-;; (vg:drawing-scaley-set! d1 0.5)
-
-;; (define xtnts (vg:scale-offset-xy 
-;; 	       (vg:component-get-extents c1)
-;; 	       1.1 1.1 -2 -2))
-
-;; get extents of c1 and put a rectange around it
-;;
-(define xtnts (apply vg:grow-rect 10 10 (vg:components-get-extents d1 c1)))
-(vg:add-objs-to-comp c1 (apply vg:make-rect-obj xtnts))
-
-(define bt1xt (vg:obj-get-extents d1 bt1))
-(print "bt1xt: " bt1xt)
-(vg:add-objs-to-comp c1 (apply vg:make-rect-obj bt1xt))
-
-;; get extents of all objects and put rectangle around it
-;;
-(define big-xtnts (vg:instances-get-extents d1))
-(vg:add-objs-to-comp c2 (apply vg:make-rect-obj big-xtnts))
-(vg:instantiate d1 "firstlib" "secondcomp" "inst3" 0 0)
-
-(vg:drawing-scalex-set! d1 1.5)
-(vg:drawing-scaley-set! d1 1.5)
-
-(define cnv #f)
-(define the-cnv (canvas 
-		 #:size "500x400"
-		 #:expand "YES"
-		 #:scrollbar "YES"
-		 #:posx "0.5"
-		 #:posy "0.5"
-		 #:action (make-canvas-action
-			   (lambda (c xadj yadj)
-			     (set! cnv c)))))
-
-(show
- (dialog
-  (vbox
-   the-cnv)))
-
-(vg:drawing-cnv-set! d1 cnv)
-(vg:draw d1 #t)
-
-;; (canvas-rectangle! cnv  10 100 10 80)
-
-(main-loop)

Index: vg.scm
==================================================================
--- vg.scm
+++ vg.scm
@@ -24,10 +24,17 @@
 (use canvas-draw iup)
 (import canvas-draw-iup)
 
 (include "vg_records.scm")
 
+;;======================================================================
+;; IDEA
+;;
+;;      make it possible to instantiate a vg drawing inside a vg drawing
+;;
+;;======================================================================
+
 ;; ;; structs
 ;; ;;
 ;; (defstruct vg:lib     comps)
 ;; (defstruct vg:comp    objs name file)
 ;; ;; extents caches extents calculated on draw
@@ -379,20 +386,20 @@
     b))
 
 ;; Obsolete function
 ;;
 (define (vg:generate-color)
-  (vg:rgb->number (random 255)
-                  (random 255)
-                  (random 255)))
+  (vg:rgb->number (pseudo-random-integer 255)
+                  (pseudo-random-integer 255)
+                  (pseudo-random-integer 255)))
 
 ;; Need to return a string of random iup-color for graph
 ;;
 (define (vg:generate-color-rgb)
-  (conc (number->string (random 255)) " "
-        (number->string (random 255)) " "
-        (number->string (random 255))))
+  (conc (number->string (pseudo-random-integer 255)) " "
+        (number->string (pseudo-random-integer 255)) " "
+        (number->string (pseudo-random-integer 255))))
 
 (define (vg:iup-color->number iup-color)
   (apply vg:rgb->number (map string->number (string-split iup-color))))
 
 ;;======================================================================

ADDED   vgmod.scm
Index: vgmod.scm
==================================================================
--- /dev/null
+++ vgmod.scm
@@ -0,0 +1,672 @@
+;;
+;; Copyright 2016  Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
+
+;;  strftime('%m/%d/%Y %H:%M:%S','now','localtime')
+
+(declare (unit vgmod))
+
+(module vgmod
+    *
+  
+(import scheme chicken data-structures extras ports)
+(use canvas-draw iup)
+(use typed-records srfi-1 srfi-69)
+(import canvas-draw-iup)
+
+(include "vg_records.scm")
+
+;; ;; structs
+;; ;;
+;; (defstruct vg:lib     comps)
+;; (defstruct vg:comp    objs name file)
+;; ;; extents caches extents calculated on draw
+;; ;; proc is called on draw and takes the obj itself as a parameter
+;; ;; attrib is an alist of parameters
+;; (defstruct vg:obj     type pts fill-color text line-color call-back angle font attrib extents proc)
+;; (defstruct vg:inst    libname compname theta xoff yoff scalex scaley mirrx mirry call-back cache)
+;; (defstruct vg:drawing libs insts scalex scaley xoff yoff cnv cache) ;; libs: hash of name->lib, insts: hash of instname->inst
+
+;; inits
+;;
+(define (vg:comp-new)
+  (make-vg:comp objs: '() name: #f file: #f))
+
+(define (vg:lib-new)
+  (make-vg:lib comps: (make-hash-table)))
+
+(define (vg:drawing-new)
+  (make-vg:drawing scalex: 1 
+		   scaley: 1 
+		   xoff: 0 
+		   yoff: 0 
+		   libs: (make-hash-table) 
+		   insts: (make-hash-table)
+		   cache: '()))
+
+;;======================================================================
+;; scaling and offsets
+;;======================================================================
+
+(define-inline (vg:scale-offset val s o)
+  (+ o (* val s)))
+  ;; (* (+ o val) s))
+
+;; apply scale and offset to a list of x y values
+;;
+(define (vg:scale-offset-xy lstxy sx sy ox oy)
+  (if (> (length lstxy) 1) ;; have at least one xy pair
+      (let loop ((x   (car lstxy))
+		 (y   (cadr lstxy))
+		 (tal (cddr lstxy))
+		 (res '()))
+	(let ((newres (cons (vg:scale-offset y sy oy)
+			    (cons (vg:scale-offset x sx ox)
+				  res))))
+	  (if (> (length tal) 1)
+	      (loop (car tal)(cadr tal)(cddr tal) newres)
+	      (reverse newres))))
+      '()))
+
+;; apply drawing offset and scaling to the points in lstxy
+;;
+(define (vg:drawing-apply-scale drawing lstxy)
+  (vg:scale-offset-xy 
+   lstxy
+   (vg:drawing-scalex drawing)
+   (vg:drawing-scaley drawing)
+   (vg:drawing-xoff   drawing)
+   (vg:drawing-yoff   drawing)))
+
+;; apply instance offset and scaling to the points in lstxy
+;;
+(define (vg:inst-apply-scale inst lstxy)
+  (vg:scale-offset-xy 
+   lstxy
+   (vg:inst-scalex inst)
+   (vg:inst-scaley inst)
+   (vg:inst-xoff   inst)
+   (vg:inst-yoff   inst)))
+
+;; apply both drawing and instance scaling to a list of xy points
+;; 
+(define (vg:drawing-inst-apply-scale-offset drawing inst lstxy)
+  (vg:drawing-apply-scale 
+   drawing
+   (vg:inst-apply-scale inst lstxy)))
+
+;;======================================================================
+;; objects
+;;======================================================================
+
+;;   (vg:inst-apply-scale 
+;;    inst
+;;    (vg:drawing-apply-scale drawing lstxy)))
+
+;; make a rectangle obj
+;;
+(define (vg:make-rect-obj x1 y1 x2 y2 #!key (line-color #f)(fill-color #f)(text #f)(font #f)(extents #f))
+  (make-vg:obj type: 'r pts: (list x1 y1 x2 y2) text: text font: font line-color: line-color fill-color: fill-color extents: extents))
+
+;; make a rectangle obj
+;; 
+(define (vg:make-line-obj x1 y1 x2 y2 #!key (line-color #f)(fill-color #f)(text #f)(font #f)(extents #f))
+  (make-vg:obj type: 'l pts: (list x1 y1 x2 y2) text: text font: font line-color: line-color extents: extents))
+
+;; make a text obj
+;;
+(define (vg:make-text-obj x1 y1 text #!key (line-color #f)(fill-color #f)
+		      (angle #f)(scale-with-zoom #f)(font #f)
+		      (font-size #f))
+  (make-vg:obj type: 't pts: (list x1 y1) text: text 
+	       line-color: line-color fill-color: fill-color
+	       angle: angle font: font extents: #f
+	       attributes: (vg:make-attrib 'font-size font-size)))
+
+;; proc takes startnum and endnum and yields scalef, per-grad and unitname
+;;
+(define (vg:make-xaxis-obj x1 y1 x2 y2 #!key (line-color #f)(fill-color #f)(text #f)(font #f)(proc #f))
+  (make-vg:obj type: 'x pts: (list x1 y1 x2 y2) text: text font: font line-color: line-color fill-color: fill-color extents: #f proc: proc))
+
+;;======================================================================
+;; obj modifiers and queries
+;;======================================================================
+
+;; get extents, use knowledge of type ...
+;;
+(define (vg:obj-get-extents drawing obj)
+  (let ((type (vg:obj-type obj)))
+    (case type
+      ((l)(vg:rect-get-extents obj))
+      ((r)(vg:rect-get-extents obj))
+      ((t)(vg:draw-text drawing obj draw: #f))
+      (else #f))))
+
+(define (vg:rect-get-extents obj)
+  (vg:obj-pts obj)) ;; extents are just the points for a rectangle
+
+(define (vg:grow-rect borderx bordery x1 y1 x2 y2)
+  (list
+   (- x1 borderx)
+   (- y1 bordery)
+   (+ x2 borderx)
+   (+ y2 bordery)))
+
+(define (vg:make-attrib . attrib-list)
+  #f)
+
+;;======================================================================
+;; components
+;;======================================================================
+
+;; add obj to comp
+;;
+(define (vg:add-objs-to-comp comp . objs)
+  (vg:comp-objs-set! comp (append (vg:comp-objs comp) objs)))
+
+(define (vg:add-obj-to-comp comp obj)
+  (vg:comp-objs-set! comp (cons obj (vg:comp-objs comp))))
+
+;; use the struct. leave this here to remind of this!
+;;
+;; (define (vg:comp-get-objs comp)
+;;   (vg:comp-objs comp))
+
+;; add comp to lib
+;;
+(define (vg:add-comp-to-lib lib compname comp)
+  (hash-table-set! (vg:lib-comps lib) compname comp))
+
+;; instanciate component in drawing
+;;
+(define (vg:instantiate drawing libname compname instname xoff yoff #!key (theta 0)(scalex 1)(scaley 1)(mirrx #f)(mirry #f))
+  (let ((inst (make-vg:inst libname: libname compname: compname xoff: xoff yoff: yoff theta: theta scalex: scalex scaley: scaley mirrx: mirrx mirry: mirry)) )
+    (hash-table-set! (vg:drawing-insts drawing) instname inst)))
+
+(define (vg:instance-move drawing instname newx newy)
+  (let ((inst (hash-table-ref (vg:drawing-insts drawing) instname)))
+    (vg:inst-xoff-set! inst newx)
+    (vg:inst-yoff-set! inst newy)))
+
+;; get component from drawing (look in apropriate lib) given libname and compname
+(define (vg:get-component drawing libname compname)
+  (let* ((lib  (hash-table-ref (vg:drawing-libs drawing) libname))
+	 (inst (hash-table-ref (vg:lib-comps lib) compname)))
+    inst))
+
+(define (vg:get-extents-for-objs drawing objs)
+  (if (or (not objs)
+	  (null? objs))
+      #f
+      (let loop ((hed     (car objs))
+		 (tal     (cdr objs))
+		 (extents (vg:obj-get-extents drawing (car objs))))
+	(let ((newextents
+	       (vg:get-extents-for-two-rects
+		extents
+		(vg:obj-get-extents drawing hed))))
+	  (if (null? tal)
+	      extents
+	      (loop (car tal)(cdr tal) newextents))))))
+
+;;   (let ((extents #f))
+;;     (for-each
+;;      (lambda (obj)
+;;        (set! extents
+;; 	 (vg:get-extents-for-two-rects
+;; 	  extents
+;; 	  (vg:obj-get-extents drawing obj))))
+;;      objs)
+;;     extents))
+
+;; given rectangles r1 and r2, return the box that bounds both
+;;
+(define (vg:get-extents-for-two-rects r1 r2)
+  (if (not r1)
+      r2
+      (if (not r2)
+	  r1 ;; #f ;; no extents from #f #f
+	  (list (min (car r1)(car r2))           ;; llx
+		(min (cadr r1)(cadr r2))         ;; lly
+		(max (caddr r1)(caddr r2))       ;; ulx
+		(max (cadddr r1)(cadddr r2)))))) ;; uly
+
+(define (vg:components-get-extents drawing . comps)
+  (if (null? comps)
+      #f
+      (let loop ((hed  (car comps))
+		 (tal  (cdr comps))
+		 (extents #f))
+	(let* ((objs  (vg:comp-objs hed))
+	       (newextents (if extents
+			       (vg:get-extents-for-two-rects
+				extents
+				(vg:get-extents-for-objs drawing objs))
+			       (vg:get-extents-for-objs drawing objs))))
+	  (if (null? tal)
+	      newextents
+	      (loop (car tal)(cdr tal) newextents))))))
+
+;;======================================================================
+;; libraries
+;;======================================================================
+
+;; register lib with drawing
+
+;;
+(define (vg:add-lib drawing libname lib)
+  (hash-table-set! (vg:drawing-libs drawing) libname lib))
+
+(define (vg:get-lib drawing libname)
+  (hash-table-ref/default (vg:drawing-libs drawing) libname #f))
+
+(define (vg:get/create-lib drawing libname)
+  (let ((lib (vg:get-lib drawing libname)))
+    (if lib
+	lib
+	(let ((newlib (vg:lib-new)))
+	  (vg:add-lib drawing libname newlib)
+	  newlib))))
+
+;;======================================================================
+;; map objects given offset, scale and mirror, resulting obj is displayed
+;;======================================================================
+
+;; dispatch the drawing of obj off to the correct drawing routine
+;;
+(define (vg:map-obj drawing inst obj)
+  (case (vg:obj-type obj)
+    ((l)(vg:map-line   drawing inst obj))
+    ((r)(vg:map-rect   drawing inst obj))
+    ((t)(vg:map-text   drawing inst obj))
+    ((x)(vg:map-xaxis  drawing inst obj))
+    (else #f)))
+
+;; given a drawing and a inst map a rectangle to it screen coordinates
+;;
+(define (vg:map-rect drawing inst obj)
+  (let ((res (make-vg:obj type:       'r ;; is there a defstruct copy?
+			  fill-color: (vg:obj-fill-color obj)
+			  text:       (vg:obj-text       obj)
+			  line-color: (vg:obj-line-color obj)
+			  font:       (vg:obj-font       obj)))
+	(pts (vg:obj-pts obj)))
+    (vg:obj-pts-set! res (vg:drawing-inst-apply-scale-offset drawing inst pts))
+    (vg:drawing-cache-set! drawing (cons res (vg:drawing-cache drawing) ))
+    res))
+
+;; given a drawing and a inst map a line to it screen coordinates
+;;
+(define (vg:map-line drawing inst obj)
+  (let ((res (make-vg:obj type:       'l ;; is there a defstruct copy?
+			  line-color: (vg:obj-line-color obj)
+			  font:       (vg:obj-font       obj)))
+	(pts (vg:obj-pts obj)))
+    (vg:obj-pts-set! res (vg:drawing-inst-apply-scale-offset drawing inst pts))
+    (vg:drawing-cache-set! drawing (cons res (vg:drawing-cache drawing) ))
+    res))
+
+;; given a drawing and a inst map a text to it screen coordinates
+;;
+(define (vg:map-text drawing inst obj)
+  (let ((res (make-vg:obj type:       't
+			  fill-color: (vg:obj-fill-color obj)
+			  text:       (vg:obj-text       obj)
+			  line-color: (vg:obj-line-color obj)
+			  font:       (vg:obj-font       obj)
+			  angle:      (vg:obj-angle      obj)
+			  attrib:     (vg:obj-attrib     obj)))
+	(pts (vg:obj-pts obj)))
+    (vg:obj-pts-set! res (vg:drawing-inst-apply-scale-offset drawing inst pts))
+    (vg:drawing-cache-set! drawing (cons res (vg:drawing-cache drawing)))
+    res))
+
+;; given a drawing and a inst map a line to it screen coordinates
+;;
+(define (vg:map-xaxis drawing inst obj)
+  (let ((res (make-vg:obj type:      'x ;; is there a defstruct copy?
+			  line-color: (vg:obj-line-color obj)
+			  font:       (vg:obj-font       obj)))
+	(pts (vg:obj-pts obj)))
+    (vg:obj-pts-set! res (vg:drawing-inst-apply-scale-offset drawing inst pts))
+    (vg:drawing-cache-set! drawing (cons res (vg:drawing-cache drawing) ))
+    res))
+
+;;======================================================================
+;; instances
+;;======================================================================
+
+(define (vg:instances-get-extents drawing . instance-names)
+  (let ((xtnt-lst (vg:draw drawing #f)))
+    (if (null? xtnt-lst)
+	#f
+	(let loop ((extents (car xtnt-lst))
+		   (tal     (cdr xtnt-lst))
+		   (llx     #f)
+		   (lly     #f)
+		   (ulx     #f)
+		   (uly     #f))
+	  (let ((nllx      (if llx (min llx (list-ref extents 0))(list-ref extents 0)))
+		(nlly      (if lly (min lly (list-ref extents 1))(list-ref extents 1)))
+		(nulx      (if ulx (max ulx (list-ref extents 2))(list-ref extents 2)))
+		(nuly      (if uly (max uly (list-ref extents 3))(list-ref extents 3))))
+	    (if (null? tal)
+		(list llx lly ulx uly)
+		(loop (car tal)(cdr tal) nllx nlly nulx nuly)))))))
+
+(define (vg:lib-get-component lib instname)
+  (hash-table-ref/default  (vg:lib-comps lib) instname #f))
+
+;;======================================================================
+;; color
+;;======================================================================
+
+(define (vg:rgb->number r g b #!key (a 0))
+  (bitwise-ior
+    (arithmetic-shift a 24)
+    (arithmetic-shift r 16)
+    (arithmetic-shift g 8)
+    b))
+
+;; Obsolete function
+;;
+(define (vg:generate-color)
+  (vg:rgb->number (random 255)
+                  (random 255)
+                  (random 255)))
+
+;; Need to return a string of random iup-color for graph
+;;
+(define (vg:generate-color-rgb)
+  (conc (number->string (random 255)) " "
+        (number->string (random 255)) " "
+        (number->string (random 255))))
+
+(define (vg:iup-color->number iup-color)
+  (apply vg:rgb->number (map string->number (string-split iup-color))))
+
+;;======================================================================
+;; graphing
+;;======================================================================
+
+(define (vg:make-xaxis drawing component x1 y1 x2 y2 startnum endnum scaleproc)
+  (let ((obj (vg:make-xaxis-obj x1 y1 x2 y2)))
+    #f))
+
+;;======================================================================
+;; Unravel and draw the objects
+;;======================================================================
+
+;; with get-extents = #t return the extents
+;; with draw = #f don't actually draw the object
+;;
+(define (vg:draw-obj drawing obj #!key (draw #t))
+  ;; (print "obj type: " (vg:obj-type obj))
+  (case (vg:obj-type obj)
+    ((l)(vg:draw-line drawing obj draw: draw))
+    ((r)(vg:draw-rect drawing obj draw: draw))
+    ((t)(vg:draw-text drawing obj draw: draw))))
+
+;; given a rect obj draw it on the canvas applying first the drawing
+;; scale and offset
+;;
+(define (vg:draw-rect drawing obj #!key (draw #t))
+  (let* ((cnv (vg:drawing-cnv drawing))
+	 (pts (vg:drawing-apply-scale drawing (vg:obj-pts obj)))
+	 (fill-color (vg:obj-fill-color obj))
+	 (line-color (vg:obj-line-color obj))
+	 (text       (vg:obj-text obj))
+	 (font       (vg:obj-font obj))
+	 (llx        (car pts))
+	 (lly        (cadr pts))
+	 (ulx        (caddr pts))
+	 (uly        (cadddr pts))
+	 (w          (- ulx llx))
+	 (h          (- uly lly))
+	 (text-xmax  #f)
+	 (text-ymax  #f))
+    (if draw 
+	(let ((prev-background-color (canvas-background cnv))
+	      (prev-foreground-color (canvas-foreground cnv)))
+	  (if fill-color
+	      (begin
+		(canvas-foreground-set! cnv fill-color)
+		(canvas-box! cnv llx ulx lly uly))) ;; docs are all over the place on this one.;; w h)
+	  (if line-color
+	      (canvas-foreground-set! cnv line-color)
+	      (if fill-color
+		  (canvas-foreground-set! cnv prev-foreground-color)))
+	  (canvas-rectangle! cnv llx ulx lly uly)
+	  (canvas-foreground-set! cnv prev-foreground-color)
+	  (if text 
+	      (let* ((prev-font    (canvas-font cnv))
+		     (font-changed (and font (not (equal? font prev-font)))))
+		(if font-changed (canvas-font-set! cnv font))
+		(canvas-text! cnv (+ 2 llx)(+ 2 lly) text)
+		(if (eq? draw 'get-extents)
+		    (let-values (((xmax ymax)(canvas-text-size cnv text)))
+				(set! text-xmax xmax)(set! text-ymax ymax)))
+		(if font-changed (canvas-font-set! cnv prev-font))))))
+    ;; (print "text-xmax: " text-xmax " text-ymax: " text-ymax)
+    (if (vg:obj-extents obj)
+	(vg:obj-extents obj)
+	(if (not text)
+	    pts ;; no text
+	    (if (and text-xmax text-ymax) ;; have text
+		(let ((xt (list llx lly
+				(max ulx (+ llx text-xmax))
+				(max uly (+ lly text-ymax)))))
+		  (vg:obj-extents-set! obj xt)
+		  xt)
+		(if cnv
+		    (if (eq? draw 'get-extents)
+			(let-values (((xmax ymax)(canvas-text-size cnv text)))
+				    (let ((xt (list llx lly
+						    (max ulx (+ llx xmax))
+						    (max uly (+ lly ymax)))))
+				      (vg:obj-extents-set! obj xt)
+				      xt))
+			pts)
+		    pts)))))) ;; return extents 
+
+;; given a rect obj draw it on the canvas applying first the drawing
+;; scale and offset
+;;
+(define (vg:draw-line drawing obj #!key (draw #t))
+  (let* ((cnv (vg:drawing-cnv drawing))
+	 (pts (vg:drawing-apply-scale drawing (vg:obj-pts obj)))
+	 ;; (fill-color (vg:obj-fill-color obj))
+	 (line-color (vg:obj-line-color obj))
+	 (text       (vg:obj-text obj))
+	 (font       (vg:obj-font obj))
+	 (llx        (car pts))
+	 (lly        (cadr pts))
+	 (ulx        (caddr pts))
+	 (uly        (cadddr pts))
+	 (w          (- ulx llx))
+	 (h          (- uly lly))
+	 (text-xmax  #f)
+	 (text-ymax  #f))
+    (if draw 
+	(let ((prev-background-color (canvas-background cnv))
+	      (prev-foreground-color (canvas-foreground cnv)))
+	;; (if fill-color
+	;;     (begin
+	;; 	(canvas-foreground-set! cnv fill-color)
+	;; 	(canvas-box! cnv llx ulx lly uly))) ;; docs are all over the place on this one.;; w h)
+	  (if line-color
+	      (canvas-foreground-set! cnv line-color))
+	     ;; (if fill-color
+	     ;;  (canvas-foreground-set! cnv prev-foreground-color)))
+	  (canvas-line! cnv llx lly ulx uly)
+	  (canvas-foreground-set! cnv prev-foreground-color)
+	  (if text 
+	      (let* ((prev-font    (canvas-font cnv))
+		     (font-changed (and font (not (equal? font prev-font)))))
+		(if font-changed (canvas-font-set! cnv font))
+		(canvas-text! cnv (+ 2 llx)(+ 2 lly) text)
+		(let-values (((xmax ymax)(canvas-text-size cnv text)))
+		  (set! text-xmax xmax)(set! text-ymax ymax))
+		(if font-changed (canvas-font-set! cnv prev-font))))))
+    ;; (print "text-xmax: " text-xmax " text-ymax: " text-ymax)
+    (if (vg:obj-extents obj)
+	(vg:obj-extents obj)
+	(if (not text)
+	    pts
+	    (if (and text-xmax text-ymax)
+		(let ((xt (list llx lly
+				(max ulx (+ llx text-xmax))
+				(max uly (+ lly text-ymax)))))
+		  (vg:obj-extents-set! obj xt)
+		  xt)
+		(if cnv
+		    (let-values (((xmax ymax)(canvas-text-size cnv text)))
+		      (let ((xt (list llx lly
+				      (max ulx (+ llx xmax))
+				      (max uly (+ lly ymax)))))
+			(vg:obj-extents-set! obj xt)
+			xt))
+		    pts)))))) ;; return extents 
+
+;; given a rect obj draw it on the canvas applying first the drawing
+;; scale and offset
+;;
+(define (vg:draw-xaxis drawing obj #!key (draw #t))
+  (let* ((cnv (vg:drawing-cnv drawing))
+	 (pts (vg:drawing-apply-scale drawing (vg:obj-pts obj)))
+	 ;; (fill-color (vg:obj-fill-color obj))
+	 (line-color (vg:obj-line-color obj))
+	 (text       (vg:obj-text obj))
+	 (font       (vg:obj-font obj))
+	 (llx        (car pts))
+	 (lly        (cadr pts))
+	 (ulx        (caddr pts))
+	 (uly        (cadddr pts))
+	 (w          (- ulx llx))
+	 (h          (- uly lly))
+	 (text-xmax  #f)
+	 (text-ymax  #f))
+    (if draw 
+	(let ((prev-background-color (canvas-background cnv))
+	      (prev-foreground-color (canvas-foreground cnv)))
+	;; (if fill-color
+	;;     (begin
+	;; 	(canvas-foreground-set! cnv fill-color)
+	;; 	(canvas-box! cnv llx ulx lly uly))) ;; docs are all over the place on this one.;; w h)
+	  (if line-color
+	      (canvas-foreground-set! cnv line-color)
+	      #;(if fill-color
+		  (canvas-foreground-set! cnv prev-foreground-color)))
+	  (canvas-line! cnv llx ulx lly uly)
+	  (canvas-foreground-set! cnv prev-foreground-color)
+	  (if text 
+	      (let* ((prev-font    (canvas-font cnv))
+		     (font-changed (and font (not (equal? font prev-font)))))
+		(if font-changed (canvas-font-set! cnv font))
+		(canvas-text! cnv (+ 2 llx)(+ 2 lly) text)
+		(let-values (((xmax ymax)(canvas-text-size cnv text)))
+		  (set! text-xmax xmax)(set! text-ymax ymax))
+		(if font-changed (canvas-font-set! cnv prev-font))))))
+    ;; (print "text-xmax: " text-xmax " text-ymax: " text-ymax)
+    (if (vg:obj-extents obj)
+	(vg:obj-extents obj)
+	(if (not text)
+	    pts
+	    (if (and text-xmax text-ymax)
+		(let ((xt (list llx lly
+				(max ulx (+ llx text-xmax))
+				(max uly (+ lly text-ymax)))))
+		  (vg:obj-extents-set! obj xt)
+		  xt)
+		(if cnv
+		    (let-values (((xmax ymax)(canvas-text-size cnv text)))
+		      (let ((xt (list llx lly
+				      (max ulx (+ llx xmax))
+				      (max uly (+ lly ymax)))))
+			(vg:obj-extents-set! obj xt)
+			xt))
+		    pts)))))) ;; return extents 
+
+;; given a rect obj draw it on the canvas applying first the drawing
+;; scale and offset
+;;
+(define (vg:draw-text drawing obj #!key (draw #t))
+  (let* ((cnv        (vg:drawing-cnv drawing))
+	 (pts        (vg:drawing-apply-scale drawing (vg:obj-pts obj)))
+	 (text       (vg:obj-text obj))
+	 (font       (vg:obj-font obj))
+	 (fill-color (vg:obj-fill-color obj))
+	 (line-color (vg:obj-line-color obj))
+	 (llx        (car pts)) 
+	 (lly        (cadr pts)))
+    (if draw 
+	(let* ((prev-background-color (canvas-background cnv))
+	       (prev-foreground-color (canvas-foreground cnv))
+	       (prev-font             (canvas-font       cnv))
+	       (font-changed    (and font (not (equal? font prev-font)))))
+	  (if line-color
+	      (canvas-foreground-set! cnv line-color)
+	      (if fill-color
+		  (canvas-foreground-set! cnv prev-foreground-color)))
+	  (if font-changed (canvas-font-set! cnv font))
+	  (canvas-text! cnv llx lly text)
+	  ;; NOTE: we do not set the font back!!
+	  (canvas-foreground-set! cnv prev-foreground-color)))
+    (if cnv
+	(if (eq? draw 'get-extents)
+	    (let-values (((xmax ymax)(canvas-text-size cnv text)))
+			(append pts (list (+ llx xmax)(+ lly ymax)))) ;; will be wrong if text is rotated?
+	    (append pts pts))
+	(append pts pts))))
+
+(define (vg:draw-inst drawing inst #!key (draw-mode #t)(prev-extents '()))
+  (let* ((libname  (vg:inst-libname inst))
+	 (compname (vg:inst-compname inst))
+	 (comp     (vg:get-component drawing libname compname))
+	 (objs     (vg:comp-objs comp)))
+    ;; (print "comp: " comp)
+    (if (null? objs)
+	prev-extents
+	(let loop ((obj (car objs))
+		   (tal (cdr objs))
+		   (res prev-extents))
+	  (let* ((obj-xfrmd (vg:map-obj drawing inst obj))
+		 (newres    (cons (vg:draw-obj drawing obj-xfrmd draw: draw-mode) res)))
+	    (if (null? tal)
+		newres
+		(loop (car tal)(cdr tal) newres)))))))
+
+(define (vg:draw drawing draw-mode . instnames)
+  (let* ((insts (vg:drawing-insts drawing))
+	 (all-inst-names (hash-table-keys insts))
+	 (master-list    (if (null? instnames)
+			     all-inst-names
+			     instnames)))
+    (if (null? master-list)
+	'()
+	(let loop ((instname (car master-list))
+		   (tal      (cdr master-list))
+		   (res      '()))
+	  (let* ((inst     (hash-table-ref/default insts instname #f))
+		 (newres   (if inst
+			       (vg:draw-inst drawing inst draw-mode: draw-mode prev-extents: res)
+			       res)))
+	    (if (null? tal)
+		newres
+		(loop (car tal)(cdr tal) newres)))))))
+
+)

DELETED widgets.scm
Index: widgets.scm
==================================================================
--- widgets.scm
+++ /dev/null
@@ -1,208 +0,0 @@
-;;  Copyright 2006-2017, Matthew Welland.
-;; 
-;; This file is part of Megatest.
-;; 
-;;     Megatest is free software: you can redistribute it and/or modify
-;;     it under the terms of the GNU General Public License as published by
-;;     the Free Software Foundation, either version 3 of the License, or
-;;     (at your option) any later version.
-;; 
-;;     Megatest is distributed in the hope that it will be useful,
-;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;     GNU General Public License for more details.
-;; 
-;;     You should have received a copy of the GNU General Public License
-;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
-
-(require-library srfi-4 iup)
-(import srfi-4 iup
-	;; iup-pplot
-	iup-glcanvas) ;; iup-web
-
-(define (popup dlg . args)
-  (apply show dlg #:modal? 'yes args)
-  (destroy! dlg))
-
-(define (properties ih)
-  (popup (element-properties-dialog ih))
-  'default)
-
-(define dlg
-  (dialog
-    (vbox
-      (hbox ; headline
-        (fill)
-        (frame (label " Inspect control and dialog classes "
-                      fontsize: 15))
-        (fill)
-        margin: '0x0)
-
-      (label "") 
-      (label "Dialogs" fontsize: 12)
-      (hbox
-        (button "dialog"
-                action: (lambda (self) (properties (dialog (vbox)))))
-        (button "color-dialog"
-                action: (lambda (self) (properties (color-dialog))))
-        (button "file-dialog"
-                action: (lambda (self) (properties (file-dialog))))
-        (button "font-dialog"
-                action: (lambda (self) (properties (font-dialog))))
-        (button "message-dialog"
-                action: (lambda (self) (properties (message-dialog))))
-        (fill)
-        margin: '0x0)
-      (hbox
-        (button "layout-dialog"
-                action: (lambda (self) (properties (layout-dialog))))
-        (button "element-properties-dialog"
-                action: (lambda (self)
-                          (properties
-                            (element-properties-dialog (create 'user)))))
-        (fill)
-        margin: '0x0)
-
-      (label "") 
-      (label "Composition widgets" fontsize: 12)
-      (hbox
-        (button "fill"
-                action: (lambda (self) (properties (fill))))
-        (button "hbox"
-                action: (lambda (self) (properties (hbox))))
-        (button "vbox"
-                action: (lambda (self) (properties (vbox))))
-        (button "zbox"
-                action: (lambda (self) (properties (zbox))))
-        (button "radio"
-                action: (lambda (self) (properties (radio (vbox)))))
-        (button "normalizer"
-                action: (lambda (self) (properties (normalizer))))
-        (button "cbox"
-                action: (lambda (self) (properties (cbox))))
-        (button "sbox"
-                action: (lambda (self) (properties (sbox (vbox)))))
-        (button "split"
-                action: (lambda (self) (properties (split (vbox) (vbox)))))
-        (fill)
-        margin: '0x0)
-
-      (label "") 
-      (label "Standard widgets" fontsize: 12)
-      (hbox
-        (button "button"
-                action: (lambda (self) (properties (button))))
-        (button "canvas"
-                action: (lambda (self) (properties (canvas))))
-        (button "frame"
-                action: (lambda (self) (properties (frame))))
-        (button "label"
-                action: (lambda (self) (properties (label))))
-        (button "listbox"
-                action: (lambda (self) (properties (listbox))))
-        (button "progress-bar"
-                action: (lambda (self) (properties (progress-bar))))
-        (button "spin"
-                action: (lambda (self) (properties (spin))))
-        (fill)
-        margin: '0x0)
-      (hbox
-        (button "tabs"
-                action: (lambda (self) (properties (tabs))))
-        (button "textbox"
-                action: (lambda (self) (properties (textbox))))
-        (button "toggle"
-                action: (lambda (self) (properties (toggle))))
-        (button "treebox"
-                action: (lambda (self) (properties (treebox))))
-        (button "valuator"
-                action: (lambda (self) (properties (valuator ""))))
-        (fill)
-        margin: '0x0)
-
-      (label "") 
-      (label "Additional widgets" fontsize: 12)
-      (hbox
-        (button "cells"
-                action: (lambda (self) (properties (cells))))
-        (button "color-bar"
-                action: (lambda (self) (properties (color-bar))))
-        (button "color-browser"
-                action: (lambda (self) (properties (color-browser))))
-        (button "dial"
-                action: (lambda (self) (properties (dial ""))))
-        (button "matrix"
-                action: (lambda (self) (properties (matrix))))
-        (fill)
-        margin: '0x0)
-      (hbox
-        #;(button "pplot"
-                action: (lambda (self) (properties (pplot))))
-        (button "glcanvas"
-                action: (lambda (self) (properties (glcanvas))))
-        ;; (button "web-browser"
-        ;;         action: (lambda (self) (properties (web-browser))))
-        (fill)
-        margin: '0x0)
-
-      (label "") 
-      (label "Menu widgets" fontsize: 12)
-      (hbox
-        (button "menu"
-                action: (lambda (self) (properties (menu))))
-        (button "menu-item"
-                action: (lambda (self) (properties (menu-item))))
-        (button "menu-separator"
-                action: (lambda (self) (properties (menu-separator))))
-        (fill)
-        margin: '0x0)
-
-      (label "") 
-      (label "Images" fontsize: 12)
-      (hbox
-        (button "image/palette"
-                action: (lambda (self)
-                          (properties
-                            (image/palette 1 1 (u8vector->blob (u8vector 0))))))
-        (button "image/rgb"
-                action: (lambda (self)
-                          (properties
-                            (image/rgb 1 1 (u8vector->blob (u8vector 0))))))
-        (button "image/rgba"
-                action: (lambda (self)
-                          (properties
-                            (image/rgba 1 1 (u8vector->blob (u8vector 0))))))
-        (button "image/file"
-                action: (lambda (self)
-                          (properties
-                            ;; same attributes as image/palette
-                            (image/palette 1 1 (u8vector->blob (u8vector 0))))))
-                            ;; needs a file in current directory
-                            ;(image/file "chicken.ico")))) ; ok
-                            ;(image/file "chicken.png")))) ; doesn't work
-        (fill)
-        margin: '0x0)
-
-      (label "") 
-      (label "Other widgets" fontsize: 12)
-      (hbox
-        (button "clipboard"
-                action: (lambda (self) (properties (clipboard))))
-        (button "timer"
-                action: (lambda (self) (properties (timer))))
-        (button "spinbox"
-                action: (lambda (self) (properties (spinbox (vbox)))))
-        (fill)
-        margin: '0x0)
-
-      (fill)
-      (button "E&xit"
-              expand: 'horizontal
-              action: (lambda (self) 'close))
-      )
-    margin: '15x15
-    title: "Iup inspector"))
-
-(show dlg)
-(main-loop)
-(exit 0)