Index: dashboard.scm
==================================================================
--- dashboard.scm
+++ dashboard.scm
@@ -67,11 +67,23 @@
 (if (args:get-arg "-h")
     (begin
       (print help)
       (exit)))
 
-(if (not (launch:setup-for-run))
+;;; REMOVE ME, this is a stop-gap
+(define *area-dat* (make-megatest:area
+		    "default"         ;; area name
+		    #f                ;; area path
+		    'http             ;; transport
+		    #f                ;; configinfo
+		    #f                ;; configdat
+		    (make-hash-table) ;; denoise
+		    #f                ;; client signature
+		    #f                ;; remote connections
+		    ))
+
+(if (not (launch:setup-for-run *area-dat*))
     (begin
       (print "Failed to find megatest.config, exiting") 
       (exit 1)))
 
 ;; (if (args:get-arg "-host")

Index: http-transport.scm
==================================================================
--- http-transport.scm
+++ http-transport.scm
@@ -134,22 +134,22 @@
        (if (< portnum 64000)
 	   (begin 
 	     (debug:print 0 "WARNING: attempt to start server failed. Trying again ...")
 	     (debug:print 0 " message: " ((condition-property-accessor 'exn 'message) exn))
 	     (debug:print 0 "exn=" (condition->list exn))
-	     (portlogger:open-run-close (lambda (db)
-					  (portlogger:set-failed db area-dat))
+	     (portlogger:open-run-close (lambda (db portnum)
+					  (portlogger:set-failed db area-dat portnum))
 					area-dat portnum)
 	     (debug:print 0 "WARNING: failed to start on portnum: " portnum ", trying next port")
 	     (thread-sleep! 0.1)
 
 	     ;; get_next_port goes here
 	     (http-transport:try-start-server run-id
 					      ipaddrstr
 					      (portlogger:open-run-close 
-					       (lambda (db)
-						 (portlogger:find-port db area-dat))
+					       (lambda (db server-id)
+						 (portlogger:find-port db area-dat server-id))
 					       area-dat)
 					      server-id
 					      area-dat))
 	   (begin
 	     (tasks:server-force-clean-run-record (db:delay-if-busy tdbdat area-dat) run-id ipaddrstr portnum " http-transport:try-start-server")
@@ -507,12 +507,12 @@
     ;;
     ;; start_shutdown
     ;;
     (tasks:server-set-state! (db:delay-if-busy tdbdat area-dat) server-id "shutting-down")
     (portlogger:open-run-close 
-     (lambda (db)
-       (portlogger:set-port db area-dat))
+     (lambda (db port yada)
+       (portlogger:set-port db area-dat port yada))
      area-dat port "released")
     (thread-sleep! 5)
     (debug:print-info 0 "Max cached queries was    " *max-cache-size*)
     (debug:print-info 0 "Number of cached writes   " *number-of-writes*)
     (debug:print-info 0 "Average cached write time "

Index: olddashboard.scm
==================================================================
--- olddashboard.scm
+++ olddashboard.scm
@@ -414,11 +414,11 @@
 
 (define (dcommon:run-stats dbstruct)
   (let* ((stats-matrix (iup:matrix expand: "YES"))
 	 (changed      #f)
 	 (updater      (lambda ()
-			 (let* ((run-stats    (db:get-run-stats dbstruct))
+			 (let* ((run-stats    (db:get-run-stats dbstruct *area-dat*))
 				(indices      (common:sparse-list-generate-index run-stats)) ;;  proc: set-cell))
 				(row-indices  (car indices))
 				(col-indices  (cadr indices))
 				(max-row      (if (null? row-indices) 1 (apply max (map cadr row-indices))))
 				(max-col      (if (null? col-indices) 1 
@@ -751,27 +751,39 @@
 (if (args:get-arg "-h")
     (begin
       (print help)
       (exit)))
 
-(if (not (launch:setup-for-run))
+;; legacy ...
+(define *area-dat* (make-megatest:area
+		    "default"         ;; area name
+		    #f                ;; area path
+		    'http             ;; transport
+		    #f                ;; configinfo
+		    #f                ;; configdat
+		    (make-hash-table) ;; denoise
+		    #f                ;; client signature
+		    #f                ;; remote connections
+		    ))
+
+(if (not (launch:setup-for-run *area-dat*))
     (begin
       (print "Failed to find megatest.config, exiting") 
       (exit 1)))
 
-(define *dbdir* (db:dbfile-path #f)) ;; (conc (configf:lookup configdat "setup" "linktree") "/.db"))
+(define *dbdir* (db:dbfile-path #f *area-dat*)) ;; (conc (configf:lookup configdat "setup" "linktree") "/.db"))
 (define *dbstruct-local*  (make-dbr:dbstruct path:  *dbdir*
 					     local: #t))
-(define *db-file-path* (db:dbfile-path 0))
+(define *db-file-path* (db:dbfile-path 0 *area-dat*))
 
 ;; HACK ALERT: this is a hack, please fix.
 (define *read-only* (not (file-read-access? *db-file-path*)))
 
 (define toplevel #f)
 (define dlg      #f)
 (define max-test-num 0)
-(define *keys*   (db:get-keys *dbstruct-local*))
+(define *keys*   (db:get-keys *dbstruct-local* *area-dat*))
 
 (define *dbkeys*  (append *keys* (list "runname")))
 
 (define *header*       #f)
 (define *allruns*     '())
@@ -780,11 +792,11 @@
 
 (define *buttondat*    (make-hash-table)) ;; <run-id color text test run-key>
 (define *alltestnamelst* '())
 (define *searchpatts*  (make-hash-table))
 (define *num-runs*      8)
-(define *tot-run-count* (db:get-num-runs *dbstruct-local* "%"))
+(define *tot-run-count* (db:get-num-runs *dbstruct-local* *area-dat* "%"))
 ;; (define *tot-run-count* (db:get-num-runs *dbstruct-local* "%"))
 
 ;; Update management
 ;;
 (define *last-update*   (current-seconds))
@@ -880,11 +892,11 @@
     (null? (filter (lambda (x)(> x 3)) delta))))
 
 ;; keypatts: ( (KEY1 "abc%def")(KEY2 "%") )
 (define (update-rundat runnamepatt numruns testnamepatt keypatts)
   (let* ((referenced-run-ids '())
-	 (allruns     (db:get-runs *dbstruct-local* runnamepatt numruns ;; (+ numruns 1) ;; (/ numruns 2))
+	 (allruns     (db:get-runs *dbstruct-local* *area-dat* runnamepatt numruns ;; (+ numruns 1) ;; (/ numruns 2))
 				      *start-run-offset* keypatts))
 	 (header      (db:get-header allruns))
 	 (runs        (db:get-rows   allruns))
 	 (result      '())
 	 (maxtests    0)
@@ -899,19 +911,19 @@
     ;; 
     ;; trim runs to only those that are changing often here
     ;; 
     (for-each (lambda (run)
 		(let* ((run-id      (db:get-value-by-header run header "id"))
-		       (tests       (db:get-tests-for-run *dbstruct-local* run-id testnamepatt states statuses
+		       (tests       (db:get-tests-for-run *dbstruct-local* *area-dat* run-id testnamepatt states statuses
 							  #f #f
 							  *hide-not-hide*
 							  sort-by
 							  sort-order
 							  'shortlist))
 		       ;; NOTE: bubble-up also sets the global *all-item-test-names*
 		       ;; (tests       (bubble-up tmptests priority: bubble-type))
-		       (key-vals    (db:get-key-vals *dbstruct-local* run-id)))
+		       (key-vals    (db:get-key-vals *dbstruct-local* *area-dat* run-id)))
 		  ;; NOTE: 11/01/2013 This routine is *NOT* getting called excessively.
 		  ;; (debug:print 0 "Getting data for run " run-id " with key-vals=" key-vals)
 		  ;; Not sure this is needed?
 		  (set! referenced-run-ids (cons run-id referenced-run-ids))
 		  (if (> (length tests) maxtests)
@@ -1243,11 +1255,11 @@
 		(iup:attribute-set! lb "VALUE" newval)
 		newval))))))
 
 (define (dashboard:update-target-selector key-lbs #!key (action-proc #f))
   (let* ((runconf-targs (common:get-runconfig-targets))
-	 (db-target-dat (db:get-targets *dbstruct-local*))
+	 (db-target-dat (db:get-targets *dbstruct-local* *area-dat*))
 	 (header        (vector-ref db-target-dat 0))
 	 (db-targets    (vector-ref db-target-dat 1))
 	 (all-targets   (append db-targets
 				(map (lambda (x)
 				       (list->vector
@@ -1384,11 +1396,11 @@
 ;; A gui for launching tests
 ;;
 (define (dashboard:run-controls)
   (let* ((targets       (make-hash-table))
 	 (test-records  (make-hash-table))
-	 (all-tests-registry (tests:get-all)) ;; (tests:get-valid-tests toppath '()))
+	 (all-tests-registry (tests:get-all *area-dat*)) ;; (tests:get-valid-tests toppath '()))
 	 (test-names    (hash-table-keys all-tests-registry))
 	 (sorted-testnames #f)
 	 (action        "-runtests")
 	 (cmdln         "")
 	 (runlogs       (make-hash-table))
@@ -1403,11 +1415,11 @@
 			     (dashboard:update-run-command))))
 	 (tests-draw-state (make-hash-table)) ;; use for keeping state of the test canvas
 	 (test-patterns-textbox  #f))
     (hash-table-set! tests-draw-state 'first-time #t)
     (hash-table-set! tests-draw-state 'scalef 8)
-    (tests:get-full-data test-names test-records '() all-tests-registry)
+    (tests:get-full-data test-names test-records '() all-tests-registry *area-dat*)
     (set! sorted-testnames (tests:sort-by-priority-and-waiton test-records))
     
     ;; refer to *keys*, *dbkeys* for keys
     (iup:vbox
      ;; The command line display/exectution control
@@ -1475,11 +1487,11 @@
 					    (iup:attribute-set! tb "VALUE" val)
 					    (dboard:data-set-run-name! *data* val)
 					    (dashboard:update-run-command))))
 		(refresh-runs-list (lambda ()
 				     (let* ((target        (dboard:data-get-target-string *data*))
-					    (runs-for-targ (db:get-runs-by-patt *dbstruct-local* *keys* "%" target #f #f))
+					    (runs-for-targ (db:get-runs-by-patt *dbstruct-local* *area-dat* *keys* "%" target #f #f))
 					    (runs-header   (vector-ref runs-for-targ 0))
 					    (runs-dat      (vector-ref runs-for-targ 1))
 					    (run-names     (cons default-run-name 
 								 (map (lambda (x)
 									(db:get-value-by-header x runs-header "runname"))
@@ -1664,11 +1676,11 @@
 	 (dcommon:keys-matrix rawconfig)
 	 (dcommon:general-info)
 	 )))
       (iup:frame
        #:title "Server"
-       (dcommon:servers-table)))
+       (dcommon:servers-table area-dat)))
      (iup:frame 
       #:title "Megatest config settings"
       (iup:hbox
        (dcommon:section-matrix rawconfig "setup" "Varname" "Value")
        (iup:vbox
@@ -1720,14 +1732,14 @@
 			       (key      (conc lin ":" col))
 			       (test-id  (hash-table-ref/default cell-lookup key -1))
 			       (cmd      (conc toolpath " -test " (dboard:data-get-curr-run-id *data*) "," test-id "&")))
 			  (system cmd)))))
 	 (updater  (lambda ()
-		     (let* ((runs-dat     (db:get-runs-by-patt db *keys* "%" #f #f #f))
+		     (let* ((runs-dat     (db:get-runs-by-patt db *area-dat* *keys* "%" #f #f #f))
 			    (runs-header  (vector-ref runs-dat 0)) ;; 0 is header, 1 is list of records
 			    (run-id       (dboard:data-get-curr-run-id *data*))
-			    (tests-dat    (let ((tdat (db:get-tests-for-run db run-id 
+			    (tests-dat    (let ((tdat (db:get-tests-for-run db *area-dat* run-id 
 									    (hash-table-ref/default *searchpatts* "test-name" "%/%")
 									    (hash-table-keys *state-ignore-hash*) ;; '()
 									    (hash-table-keys *status-ignore-hash*) ;; '()
 									    #f #f
 									    *hide-not-hide*
@@ -2077,11 +2089,11 @@
 			 controls))
 	     (tabs (iup:tabs
 		    #:tabchangepos-cb (lambda (obj curr prev)
 					(set! *please-update-buttons* #t)
 					(set! *current-tab-number* curr))
-		    (dashboard:summary db)
+		    (dashboard:summary db *area-dat*)
 		    runs-view
 		    (dashboard:one-run db)
 		    (dashboard:run-controls)
 		    )))
 	;; (set! (iup:callback tabs tabchange-cb:) (lambda (a b c)(print "SWITCHED TO TAB: " a " " b " " c)))
@@ -2126,11 +2138,11 @@
 
 (define *monitor-db-path* (conc *dbdir* "/monitor.db"))
 (define *last-monitor-update-time* 0)
 
 ;; Force creation of the db in case it isn't already there.
-(tasks:open-db area-dat)
+(tasks:open-db *area-dat*)
 
 (define (dashboard:get-youngest-run-db-mod-time)
   (handle-exceptions
    exn
    (begin
@@ -2212,11 +2224,11 @@
 	  (debug:print 3 "INFO: tried to open test with invalid run-id,test-id. " (args:get-arg "-test"))
 	  (exit 1)))))
  ((args:get-arg "-guimonitor")
   (gui-monitor *dbstruct-local*))
  (else
-  (set! uidat (make-dashboard-buttons *dbstruct-local* *num-runs* *num-tests* *dbkeys*))
+  (set! uidat (make-dashboard-buttons *dbstruct-local* *num-runs* *num-tests* *dbkeys* *area-dat*))
   (iup:callback-set! *tim*
 		     "ACTION_CB"
 		     (lambda (x)
 		       (let ((update-is-running #f))
 			 (mutex-lock! *update-mutex*)

Index: tests.scm
==================================================================
--- tests.scm
+++ tests.scm
@@ -33,11 +33,11 @@
 (include "run_records.scm")
 (include "test_records.scm")
 
 ;; Call this one to do all the work and get a standardized list of tests
 (define (tests:get-all area-dat)
-  (let* ((test-search-path   (tests:get-tests-search-path (megatest:area-configdat area-dat))))
+  (let* ((test-search-path   (tests:get-tests-search-path (megatest:area-configdat area-dat) area-dat)))
     (tests:get-valid-tests (make-hash-table) test-search-path)))
 
 (define (tests:get-tests-search-path cfgdat area-dat)
   (let ((paths (map cadr (configf:get-section cfgdat "tests-paths"))))
     (append paths (list (conc (megatest:area-path area-dat) "/tests")))))
@@ -688,16 +688,16 @@
 ;;======================================================================
 ;; 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)
+(define (tests:get-full-data test-names test-records required-tests all-tests-registry area-dat)
   (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 "hed=" hed " at top of loop")
-	(let* ((config  (tests:get-testconfig hed all-tests-registry 'return-procs))
+	(let* ((config  (tests:get-testconfig hed all-tests-registry 'return-procs area-dat))
 	       (waitons (let ((instr (if config 
 					 (config-lookup config "requirements" "waiton")
 					 (begin ;; No config means this is a non-existant test
 					   (debug:print 0 "ERROR: non-existent required test \"" hed "\", grep through your testconfigs to find and remove or create the test. Discarding and continuing.")
 					     ""))))

Index: tests/fullrun/tests/dynamic_waiton/testconfig
==================================================================
--- tests/fullrun/tests/dynamic_waiton/testconfig
+++ tests/fullrun/tests/dynamic_waiton/testconfig
@@ -2,11 +2,11 @@
 listfiles ls
 
 [requirements]
 waiton #{scheme (string-intersperse \
                   (tests:filter-test-names \
-                      (hash-table-keys (tests:get-all)) \
+                      (hash-table-keys (tests:get-all *area-dat*)) \
                       (or (args:get-arg "-runtests") \
                           (args:get-arg "-testpatt") "")) " ")}
 
 [items]