Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -174,11 +174,11 @@
 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
-api.o rmt.o db.o : mofiles/apimod.o mofiles/dbmod.o
+api.o rmt.o db.o : mofiles/apimod.o mofiles/dbmod.o mofiles/rmtmod.o
 
 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
 

Index: client.scm
==================================================================
--- client.scm
+++ client.scm
@@ -96,12 +96,13 @@
 		  (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))
+                  (begin
+		    ;; POSSIBLE BUG. I removed the full initialization call. mrw
+		    (set! *runremote* (make-remote)) ;; (create-remote-record))
                     (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)))))))

Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -302,30 +302,10 @@
     (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))
 

Index: commonmod.scm
==================================================================
--- commonmod.scm
+++ commonmod.scm
@@ -59,10 +59,29 @@
   (conc megatest-version "-" megatest-fossil-hash))
 
 (define (version-signature)
   (conc megatest-version "-" (substring megatest-fossil-hash 0 4)))
 
+(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         #f) ;; *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))
 
 ;;======================================================================
 ;; V E R S I O N
 ;;======================================================================
 

Index: rmt.scm
==================================================================
--- rmt.scm
+++ rmt.scm
@@ -27,10 +27,13 @@
 (declare (uses commonmod))
 (import commonmod)
 
 (declare (uses apimod))
 (import apimod)
+
+(declare (uses rmtmod))
+(import rmtmod)
 
 (include "common_records.scm")
 ;; (declare (uses rmtmod))
 
 ;; (import rmtmod)
@@ -61,10 +64,18 @@
 		  (client:setup areapath)
 		  #f))))
 
 (define *send-receive-mutex* (make-mutex)) ;; should have separate mutex per run-id
 
+(define (create-remote-record)
+  (let ((rr (make-remote)))
+    (remote-hh-dat-set!         rr (common:get-homehost)) ;
+    (remote-server-info-set!    rr (if *toppath* (server:check-if-running *toppath*) #f))
+    (remote-transport-set!      rr *transport-type*)
+    (remote-server-timeout-set! rr (server:expiration-timeout))
+    rr))
+  
 ;; 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))
@@ -106,11 +117,11 @@
     ;; 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))
+	  (set! *runremote* (create-remote-record))
           (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)))))  
@@ -187,11 +198,11 @@
      ;; 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))
+      (set! *runremote* (create-remote-record)) 
       (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)))))
@@ -972,24 +983,10 @@
   (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)

Index: rmtmod.scm
==================================================================
--- rmtmod.scm
+++ rmtmod.scm
@@ -29,18 +29,33 @@
 (module rmtmod
 	*
 	
 (import scheme chicken data-structures extras)
 (import (prefix sqlite3 sqlite3:) posix typed-records srfi-18)
-(import (prefix commonmod cmod:))
+(import commonmod)
 (import apimod)
 ;; (import (prefix ulex ulex:))
 
 (defstruct alldat
   (areapath #f)
   (ulexdat  #f)
   )
+
+
+(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))))
+
 
 ;; 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
 ;;    - establishes the connection to the current dbowner