Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -28,11 +28,11 @@
            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
 
 # module source files
-MSRCFILES = dbmod.scm servermod.scm apimod.scm commonmod.scm rmtmod.scm ods.scm
+MSRCFILES = dbmod.scm servermod.scm apimod.scm commonmod.scm rmtmod.scm ods.scm configfmod.scm
 MOFILES = $(addprefix mofiles/,$(MSRCFILES:%.scm=%.o))
 MOIMPFILES = $(MSRCFILES:%.scm=%.import.o)
 # 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	\

Index: commonmod.scm
==================================================================
--- commonmod.scm
+++ commonmod.scm
@@ -171,31 +171,16 @@
 
 ;;======================================================================
 ;; testsuite and area utilites
 ;;======================================================================
 
-(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
 ;;
 (define (path->area-record cfgdat path)
   (let* ((areadat (get-cfg-areas cfgdat))
 	 (all     (filter (lambda (x)
@@ -2567,51 +2552,10 @@
 	(if (eq? (length output) 0)
 	   #f
 	   #t))
       #t))
  
-(define (common:get-sync-lock-filepath)
-  (let* ((tmp-area     (common:get-db-tmp-area))
-         (lockfile     (conc tmp-area "/megatest.db.sync-lock")))
-    lockfile))
-    
-(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)))))
-
-(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)))
-
-
-
 ;; ;;======================================================================
 ;; ;; N A N O M S G   C L I E N T
 ;; ;;======================================================================
 ;; 
 ;; 
@@ -3147,78 +3091,10 @@
 	   (let ((nums (map string->number
 			    (string-split-fields "\\d+" inl))))
 	     (loop (read-line)
 		   (append res nums))))))))
 
-;;======================================================================
-;; lookup routines - replicated from configf
-;;======================================================================
-
-(define (config: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
-		   (config: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))
-
-(define config-lookup configf:lookup)
-
-;; 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
-                     (config:assoc-safe-add sectdat var val))))
-
-    ;;(append (filter (lambda (x)(not (assoc var sectdat))) sectdat)
-    ;;	    (list var val))))
 
 ;;======================================================================
 ;; stuff from tests.scm
 ;;======================================================================
 

Index: configf.scm
==================================================================
--- configf.scm
+++ configf.scm
@@ -28,10 +28,13 @@
 (declare (uses env))
 (declare (uses keys))
 
 (declare (uses commonmod))
 (import commonmod)
+
+(declare (uses configfmod))
+(import configfmod)
 
 (include "common_records.scm")
 
 ;; return list (path fullpath configname)
 (define (find-config configname #!key (toppath #f))
@@ -49,11 +52,11 @@
 		(let ((remcwd (take dir (- (length dir) 1))))
 		  (if (null? remcwd)
 		      (list #f #f #f) ;;  #f #f) 
 		  (loop remcwd)))))))))
 
-(define (config:eval-string-in-environment str)
+(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
@@ -232,11 +235,11 @@
 		      (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 (config:assoc-safe-add (hash-table-ref ht section) key val metadata: meta))))
+			  (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
@@ -410,11 +413,11 @@
                                                                (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 
-                                                          (config:assoc-safe-add alist
+                                                          (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)))
@@ -429,11 +432,11 @@
                                    (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 
-                                                      (config:assoc-safe-add alist key fval metadata: metapath))
+                                                      (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)))
                
@@ -444,17 +447,17 @@
 							(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
-                                                       (config:eval-string-in-environment val)
+                                                       (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 
-                                                      (config:assoc-safe-add alist key realval metadata: metapath))
+                                                      (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     )
@@ -467,11 +470,11 @@
                                                             (string-substitute (regexp lead) "" whsp)
                                                             "")
                                                         val)))
                                            ;; (print "val: " val "\nnewval: \"" newval "\"\nvarflag: " var-flag)
                                            (hash-table-set! res curr-section-name 
-                                                            (config:assoc-safe-add alist var-flag newval metadata: metapath))
+                                                            (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))))
@@ -498,76 +501,76 @@
 
 ;;======================================================================
 ;; lookup and manipulation routines
 ;;======================================================================
 
-(define (config: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
-		   (config: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))
-
-(define config-lookup configf:lookup)
+;; (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))
+;; 
+;; (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
-                     (config:assoc-safe-add sectdat var val))))
-
-    ;;(append (filter (lambda (x)(not (assoc var sectdat))) sectdat)
-    ;;	    (list var 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
 ;;======================================================================
 
 (define (setup)

Index: dashboard.scm
==================================================================
--- dashboard.scm
+++ dashboard.scm
@@ -63,11 +63,14 @@
 ;; (import ods)
 ;; 
 (declare (uses dbmod))
 (import dbmod)
 ;; (declare (uses dbmod.import))
-;; 
+
+(declare (uses configfmod))
+(import configfmod)
+
 (include "common_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
 (include "task_records.scm")
 (include "megatest-version.scm")

Index: dbmod.scm
==================================================================
--- dbmod.scm
+++ dbmod.scm
@@ -19,16 +19,18 @@
 ;;======================================================================
 
 (declare (unit dbmod))
 (declare (uses commonmod))
 (declare (uses ods))
+(declare (uses configfmod))
 
 (module dbmod
 	*
 	
 (import commonmod)
 (import ods)
+(import configfmod)
 
 (import scheme chicken data-structures extras ports)
 (import
   (prefix base64 base64:)
   (prefix sqlite3 sqlite3:)

Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -38,10 +38,13 @@
 (declare (uses commonmod))
 (import commonmod)
 
 (declare (uses dbmod))
 (import dbmod)
+
+(declare (uses configfmod))
+(import configfmod)
 
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 (include "megatest-fossil-hash.scm")

Index: mtexec.scm
==================================================================
--- mtexec.scm
+++ mtexec.scm
@@ -29,10 +29,13 @@
 
 ;; (declare (uses common))
 (declare (uses margs))
 (declare (uses configf))
 ;; (declare (uses rmt))
+
+(declare (uses configfmod))
+(import configfmod)
 
 ;; (use ducttape-lib)
 (include "megatest-version.scm")
 (include "megatest-fossil-hash.scm")
 

Index: mtut.scm
==================================================================
--- mtut.scm
+++ mtut.scm
@@ -33,10 +33,13 @@
 (declare (uses configf))
 ;; (declare (uses rmt))
 
 (declare (uses commonmod))
 (import commonmod)
+
+(declare (uses configfmod))
+(import configfmod)
 
 (use ducttape-lib)
 
 (include "megatest-fossil-hash.scm")