Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -979,10 +979,14 @@
 					  "/megatest_localdb/"
 					  tsname
 					  (string-translate *toppath* "/" "."))
 				    ))))
 		(set! *db-cache-path* dbpath)
+		;; ensure megatest area has .db
+		(let ((dbarea (conc *toppath* "/.db")))
+		  (if (not (file-exists? dbarea))
+		      (create-directory dbarea)))
 		dbpath))
 	  #f)))
 
 (define (common:get-area-path-signature)
   (message-digest-string (md5-primitive) *toppath*))
@@ -1045,11 +1049,11 @@
 	     ((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")))
+              (let* ((syncer (or (configf:lookup *configdat* "server" "sync-method") "delta-sync"))) ;; "brute-force-sync")))
                 (cond
                  ((equal? syncer "brute-force-sync")
                   (server:writable-watchdog-bruteforce dbstruct))
                  ((equal? syncer "delta-sync")
                   (server:writable-watchdog-deltasync dbstruct))

Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -29,10 +29,11 @@
 (import (prefix sqlite3 sqlite3:))
 (import (prefix base64 base64:))
 
 (declare (unit db))
 (declare (uses common))
+(declare (uses dbmod))
 (declare (uses keys))
 (declare (uses ods))
 (declare (uses client))
 (declare (uses mt))
 
@@ -41,10 +42,12 @@
 (include "key_records.scm")
 (include "run_records.scm")
 
 (define *number-of-writes* 0)
 (define *number-non-write-queries* 0)
+
+(import dbmod)
 
 ;;======================================================================
 ;;  R E C O R D S
 ;;======================================================================
 
@@ -131,22 +134,25 @@
    (apply sqlite3:first-result db stmt params)))
 
 ;; Get/open a database
 ;;    if run-id => get run specific db
 ;;    if #f     => get main db
+;;    if run-id is a string treat it as a filename
 ;;    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) 
+(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))))
+          (let* ((dbname (db:run-id->dbname run-id))
+		 (newdb  (db:open-megatest-db path: (db:dbfile-path)
+					      name: dbname)))
             ;; (stack-push! (dbr:dbstruct-dbstack dbstruct) newdb)
             newdb)
           (stack-pop! (dbr:dbstruct-dbstack dbstruct)))
-      (db:open-db dbstruct)))
+      (db:open-db dbstruct run-id)))
 
 ;; ;; legacy handling of structure for managing db's. Refactor this into dbr:?
 (define (db:dbdat-get-db dbdat)
   (if (pair? dbdat)
       (car dbdat)
@@ -170,11 +176,11 @@
 ;; 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)
+			(db:get-db dbstruct run-id)
 			#f))
 	 (db        (if have-struct
 			(db:dbdat-get-db dbdat)
 			dbstruct))
 	 (fname     (db:dbdat-get-path dbdat))
@@ -315,28 +321,33 @@
 	)))
 
 
 ;; 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
+(define (db:open-db dbstruct run-id #!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
+	       (dbname       (db:run-id->dbname run-id))
                (dbexists     (common:file-exists? dbpath))
-	       (tmpdbfname   (conc dbpath "/megatest.db"))
+	       (mtdbfname    (conc *toppath* "/.db/"dbname))
+               (mtdbexists   (common:file-exists? mtdbfname))
+               (mtdbmodtime  (if mtdbexists (common:lazy-sqlite-db-modification-time mtdbfname)  #f))
+               (mtdb         (db:open-megatest-db mtdbfname))
+	       ;; the reference db for syncing
+	       (refdbfname   (conc dbpath "/ref_"dbname))
+               (refndb       (db:open-megatest-db refdbfname))
+               ;; (mtdbpath     (db:dbdat-get-path mtdb))
+	       ;; the tmpdb
+	       (tmpdbfname   (conc dbpath"/"dbname)) ;; /tmp/<stuff>/.db/[main|1,2...].db 
+               (tmpdb        (db:open-megatest-db tmpdbfname)) ;; lock-create-open dbpath db:initialize-main-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))
+	       (tmpdbmodtime (if dbfexists  (common:lazy-sqlite-db-modification-time tmpdbfname) #f))
+
+               (write-access (file-write-access? mtdbfname))
 	       ;(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))
@@ -344,12 +355,12 @@
 
           (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)
+	  ;; (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)
@@ -362,12 +373,12 @@
 			     (> 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))  
+		;; 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))))
@@ -399,11 +410,11 @@
     (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)
+      (db:open-db dbstruct #f 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
@@ -415,19 +426,15 @@
 ;;   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))
+(define (db:open-megatest-db dbpath)
+  (let* ((dbexists     (common:file-exists? dbpath))
 	 (db           (db:lock-create-open dbpath
 					    (lambda (db)
-                                              (db:initialize-main-db db)
-					      ;;(db:initialize-run-id-db db)
-					      )))
+                                              (db:initialize-main-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)))
@@ -1135,17 +1142,28 @@
        
        (stack-push! (dbr:dbstruct-dbstack dbstruct) tmpdb))
      options)
     data-synced))
 
+;; Sync all changed db's
+;;
 (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))
+  (let* ((all-dbs     (cons "main.db" (glob (conc (db:dbfile-path)"/[0-9]*.db")))))
+    (for-each
+     (lambda (dbname)
+       (let* ((mtdb        (dbr:dbstruct-mtdb dbstruct))
+
+
+	      ;; more to do here?
+
+	      
+	      (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))
+     all-dbs)))
 
 ;;;; run-ids
 ;;    if #f use *db-local-sync* : or 'local-sync-flags
 ;;    if #t use timestamps      : or 'timestamps
 ;;

Index: megatest-version.scm
==================================================================
--- megatest-version.scm
+++ megatest-version.scm
@@ -18,6 +18,6 @@
 ;; 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.6589)
+(define megatest-version 1.7001)

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -39,12 +39,17 @@
 (declare (uses mt))
 (declare (uses api))
 (declare (uses tasks)) ;; only used for debugging.
 (declare (uses env))
 (declare (uses diff-report))
+(declare (uses dbmod))
+(declare (uses dbmod.import))
+
 ;; (declare (uses ftail))
 ;; (import ftail)
+
+(import dbmod)
 
 (define *db* #f) ;; this is only for the repl, do not use in general!!!!
 
 (include "common_records.scm")
 (include "key_records.scm")

ADDED   tests/simplerun/Makefile
Index: tests/simplerun/Makefile
==================================================================
--- /dev/null
+++ tests/simplerun/Makefile
@@ -0,0 +1,5 @@
+
+cleanup :
+	killall mtest dboard -v -9 || true
+	rm -rf *.log *.bak NB* logs/* .meta .db ../simpleruns/* lt
+

ADDED   tests/simplerun/debug.scm
Index: tests/simplerun/debug.scm
==================================================================
--- /dev/null
+++ tests/simplerun/debug.scm
@@ -0,0 +1,61 @@
+
+(module junk
+	*
+
+(import big-chicken
+	rmtmod
+	apimod
+	dbmod
+	srfi-18
+	trace)
+
+(trace-call-sites #t)
+(trace 
+  ;; db:get-tests-for-run
+  ;; rmt:general-open-connection
+  ;; rmt:open-main-connection
+  ;; rmt:drop-conn
+  ;; rmt:send-receive
+  ;; rmt:log-to-main
+  )
+
+(define (make-run-id)
+  (let* ((s (conc (current-process-id)))
+	 (l (string-length s)))
+    (string->number (substring s (- l 3) l))
+    ))
+
+(define (run)
+  (let* ((th1 (make-thread
+	       (lambda ()
+		 (let loop ((r 0)
+			    (i 1)
+			    (s 0)) ;; sum
+		   (let ((start-time (current-milliseconds))
+			 (run-id     (+ r (make-run-id))))
+		     (rmt:register-test run-id "test1" (conc "item_" i))
+		     (thread-sleep! 0.01)
+		     (let* ((qry-time (- (current-milliseconds) start-time))
+			    (tot-query-time (+ qry-time s))
+			    (avg-query-time (* 1.0 (/ tot-query-time (max i 1)))))
+		       (if (> qry-time 500)
+			   (print "WARNING: rmt:register-test took more than 500ms, "qry-time"ms, i="i", avg-query-time="avg-query-time))
+		       (if (eq? (modulo i 100) 0)
+			   (print "For run-id="run-id", "(rmt:get-keys-write)" num tests registered="i" avg-query-time="avg-query-time))
+		       (if (< i 500)
+			   (loop r (+ i 1) tot-query-time)
+			   (if (< r 100)
+			       (let* ((start-time (current-milliseconds)))
+				 (print "rmt:get-keys "(rmt:get-keys)" in "(- (current-milliseconds) start-time))
+				 ;;                                          run-id testpatt states statuses offset limit not-in sort-by sort-order qryvals last-update mode
+				 (print "Got "(length (rmt:get-tests-for-run run-id "%"     '()    '()       #f      #f    #f     #f      #f         #f      0           #f))" tests for run "run-id)
+				 (print "Average query time: "avg-query-time)
+				 (loop (+ r 1) 0 tot-query-time))))))))
+	       )))
+    (thread-start! th1)
+    (thread-join! th1)))
+
+(run)
+)
+
+

Index: tests/simplerun/megatest.config
==================================================================
--- tests/simplerun/megatest.config
+++ tests/simplerun/megatest.config
@@ -21,10 +21,12 @@
 
 [setup]
 # Adjust max_concurrent_jobs to limit how much you load your machines
 max_concurrent_jobs 50
 
+[server]
+timeout 3600
 # Uncomment this to make the in-mem db into a disk based db (slower but good for debug)
 # be aware that some unit tests will fail with this due to persistent data
 #
 # tmpdb /tmp
 
@@ -35,15 +37,15 @@
 [validvalues]
 state start end completed
 
 # Job tools are more advanced ways to control how your jobs are launched
 [jobtools]
-useshell yes
-launcher nbfind
+# useshell yes
+launcher nbfake
 
 # You can override environment variables for all your tests here
 [env-override]
 EXAMPLE_VAR example value
 
 # As you run more tests you may need to add additional disks, the names are arbitrary but must be unique
 [disks]
 disk0 #{getenv MT_RUN_AREA_HOME}/../simpleruns

Index: tests/simplerun/tests/test1/testconfig
==================================================================
--- tests/simplerun/tests/test1/testconfig
+++ tests/simplerun/tests/test1/testconfig
@@ -24,11 +24,11 @@
 [requirements]
 # waiton setup
 priority 0
 
 # Iteration for your tests are controlled by the items section
-[items]
+# [items]
 # PARTOFDAY morning noon afternoon evening night
 
 # test_meta is a section for storing additional data on your test
 [test_meta]
 author matt