Index: api.scm
==================================================================
--- api.scm
+++ api.scm
@@ -1,7 +1,5 @@
-
-
 ;;======================================================================
 ;; Copyright 2006-2013, Matthew Welland.
 ;; 
 ;; This file is part of Megatest.
 ;; 

Index: dashboard-transport-mode.scm.template
==================================================================
--- dashboard-transport-mode.scm.template
+++ dashboard-transport-mode.scm.template
@@ -1,3 +1,15 @@
-;; 'http or 'tcp
+;;======================================================================
+;; set up transport, db cache and sync methods
+;;
+;; sync-method:        'original, 'attach or 'none
+;; cache-method:       'tmp, 'inmem or 'none
+;; rmt:transport-mode: 'http, 'tcp, 'nfs
+;;
+;; NOTE: NOT ALL COMBINATIONS WORK
+;;
+;;======================================================================
+
+(dbfile:sync-method 'none)
+(dbfile:cache-method 'none)
 (rmt:transport-mode 'nfs)
-;; (rmt:transport-mode 'http)
+

Index: dashboard.scm
==================================================================
--- dashboard.scm
+++ dashboard.scm
@@ -416,27 +416,29 @@
   (make-dboard:runsdat
    runs-index: (make-hash-table)
    tests-index: (make-hash-table)
    matrix-dat: (make-sparse-array)))
 
-;; used to keep the rundata from rmt:get-tests-for-run
-;; in sync. 
+;; duplicated in dcommon.scm
 ;;
-(defstruct dboard:rundat
-  run
-  tests-drawn    ;; list of id's already drawn on screen
-  tests-notdrawn ;; list of id's NOT already drawn
-  rowsused       ;; hash of lists covering what areas used - replace with quadtree
-  hierdat        ;; put hierarchial sorted list here
-  tests          ;; hash of id => testdat
-  ((tests-by-name (make-hash-table)) : hash-table) ;; hash of testfullname => testdat
-  key-vals
-  ((last-update   0)                 : number)    ;; last query to db got records from before last-update
-  ((last-db-time  0)                 : number)    ;; last timestamp on main.db
-  ((data-changed  #f)                : boolean)   
-  ((run-data-offset  0)              : number)      ;; get only 100 items per call, set back to zero when received less than 100 items
-  (db-path #f))
+;; ;; used to keep the rundata from rmt:get-tests-for-run
+;; ;; in sync. 
+;; ;;
+;; (defstruct dboard:rundat
+;;   run
+;;   tests-drawn    ;; list of id's already drawn on screen
+;;   tests-notdrawn ;; list of id's NOT already drawn
+;;   rowsused       ;; hash of lists covering what areas used - replace with quadtree
+;;   hierdat        ;; put hierarchial sorted list here
+;;   tests          ;; hash of id => testdat
+;;   ((tests-by-name (make-hash-table)) : hash-table) ;; hash of testfullname => testdat
+;;   key-vals
+;;   ((last-update   0)                 : number)    ;; last query to db got records from before last-update
+;;   ((last-db-time  0)                 : number)    ;; last timestamp on main.db
+;;   ((data-changed  #f)                : boolean)   
+;;   ((run-data-offset  0)              : number)      ;; get only 100 items per call, set back to zero when received less than 100 items
+;;   (db-path #f))
 
 ;; for the new runs view lets build up a few new record types and then consolidate later
 ;;
 ;; this is a two level deep pipeline for the incoming data:
 ;;   sql query data ==> filters ==> data for display

Index: dbfile.scm
==================================================================
--- dbfile.scm
+++ dbfile.scm
@@ -40,14 +40,18 @@
 
 	commonmod
 	debugprint
 	)
 
-(define keep-age-param (make-parameter 10)) ;; qif file age, if over move to attic
-(define num-run-dbs    (make-parameter 10))     ;; number of db's in .megatest
+;; parameters
+;;
 (define dbfile:testsuite-name (make-parameter #f))
-(define dbfile:sync-method (make-parameter 'attach)) ;; 'attach or 'original
+
+(define keep-age-param        (make-parameter 10))      ;; qif file age, if over move to attic
+(define num-run-dbs           (make-parameter 10))      ;; number of db's in .megatest
+(define dbfile:sync-method    (make-parameter 'attach)) ;; 'attach or 'original
+(define dbfile:cache-method   (make-parameter 'inmem))  ;; 'direct
 
 ;; 'original     - use old condition code
 ;; 'suicide-mode - create mtrah/stop-the-train with info on what went wrong
 ;; else use no condition code (should be production mode)
 ;;
@@ -442,16 +446,20 @@
   (let* ((db  (dbfile:raw-open-no-sync-db dbpath))
 	 (res (proc db)))
     (sqlite3:finalize! db)
     res))
 
+(define *no-sync-db-mutex* (make-mutex))
 (define (dbfile:open-no-sync-db dbpath)
-  (if *no-sync-db*
-      *no-sync-db*
-      (let* ((db (dbfile:raw-open-no-sync-db dbpath)))
-	(set! *no-sync-db* db)
-	db)))
+  (mutex-lock! *no-sync-db-mutex*)
+  (let* ((res (if *no-sync-db*
+		  *no-sync-db*
+		  (let* ((db (dbfile:raw-open-no-sync-db dbpath)))
+		    (set! *no-sync-db* db)
+		    db))))
+    (mutex-unlock! *no-sync-db-mutex*)
+    res))
 
 (define (db:no-sync-set db var val)
   (sqlite3:execute db "INSERT OR REPLACE INTO no_sync_metadat (var,val) VALUES (?,?);" var val))
 
 (define (db:no-sync-del! db var)

Index: dbmod.scm
==================================================================
--- dbmod.scm
+++ dbmod.scm
@@ -63,22 +63,17 @@
 ;; Read-only inmem cached direct from disk method
 ;;======================================================================
 
 (define *dbmod:nfs-db-handles* (make-hash-table)) ;; dbfname -> dbstruct
 
+;; called in rmt.scm nfs-transport-handler
 (define (dbmod:nfs-get-dbstruct run-id keys init-proc areapath)
   (assert areapath "FATAL: dbmod:nfs-get-dbstruct called without areapath set.")
   (let* ((dbfname  (dbmod:run-id->dbfname run-id))
 	 (dbstruct (hash-table-ref/default *dbmod:nfs-db-handles* dbfname #f)))
     (if dbstruct
-	(let* ((last-update (dbr:dbstruct-last-update dbstruct))
-	       (curr-secs   (current-seconds)))
-	  (if (> (- curr-secs last-update) 2)
-	      (begin
-		((dbr:dbstruct-sync-proc dbstruct) last-update)
-		(dbr:dbstruct-last-update-set! dbstruct curr-secs)))
-	  dbstruct)
+	dbstruct
 	(let* ((newdbstruct (dbmod:open-dbmoddb areapath run-id dbfname init-proc keys syncdir: 'fromdisk)))
 	  (hash-table-set! *dbmod:nfs-db-handles* dbfname newdbstruct)
 	  newdbstruct))))
 
 ;;======================================================================
@@ -104,10 +99,25 @@
 		     dbfile: (dbr:dbstruct-dbfile dbstruct)
 		     dbh:    (dbr:dbstruct-inmem  dbstruct)
 		     )))
 	(dbr:dbstruct-dbdat-set! dbstruct dbdat)
 	dbdat)))
+
+(define (dbmod:need-on-disk-db-handle)
+    (case (dbfile:cache-method)
+      ((none tmp) #t)
+      ((inmem)
+       (case (dbfile:sync-method)
+	 ((original) #t)
+	 ((attach)   #f)
+	 (else
+	  (debug:print 0 *default-log-port* "Unknown dbfile:sync-method setting: "
+		       (dbfile:sync-method)))))
+      (else
+       (debug:print 0 *default-log-port* "Unknown dbfile:cache-method setting: "
+		    (dbfile:cache-method))
+       #f)))
 
 ;; Open the inmem db and the on-disk db
 ;; populate the inmem db with data
 ;;
 ;; Updates fields in dbstruct
@@ -124,29 +134,34 @@
 	 (dbpath       (dbmod:get-dbdir dbstruct))             ;; directory where all the .db files are kept
 	 (dbfullname   (conc dbpath"/"dbfname)) ;; (dbmod:run-id->full-dbfname dbstruct run-id))
 	 (dbexists     (file-exists? dbfullname))
 	 (inmem        (dbmod:open-inmem-db init-proc))
 	 (write-access (file-write-access? dbpath))
-	 (db           (dbfile:with-simple-file-lock
-			(conc dbfullname".lock")
-			(lambda ()
-			  (let* ((db      (sqlite3:open-database dbfullname))
-				 (handler (sqlite3:make-busy-timeout 136000)))
-			    (sqlite3:set-busy-handler! db handler)
-			    (if write-access
-				(init-proc db))
-			    db))))
+	 (open-the-db  (lambda ()
+			 (dbfile:with-simple-file-lock
+			  (conc dbfullname".lock")
+			  (lambda ()
+			    (let* ((db      (sqlite3:open-database dbfullname))
+				   (handler (sqlite3:make-busy-timeout 136000)))
+			      (sqlite3:set-busy-handler! db handler)
+			      (if write-access
+				  (init-proc db))
+			      db)))))
+	 (db            (if (dbmod:need-on-disk-db-handle)
+			    (open-the-db)
+			    #f))
 	 (tables       (db:sync-all-tables-list keys)))
     (dbr:dbstruct-inmem-set!    dbstruct inmem)
     (dbr:dbstruct-ondiskdb-set! dbstruct db)
     (dbr:dbstruct-dbfile-set!   dbstruct dbfullname)
     (dbr:dbstruct-sync-proc-set! dbstruct
 				 (lambda (last-update)
-				   (sync-gasket tables last-update inmem db
-						dbfullname syncdir)))
+				   (if db
+				       (sync-gasket tables last-update inmem db
+						    dbfullname syncdir))))
     ;; (dbmod:sync-tables tables #f db inmem)
-    (sync-gasket tables #f inmem db dbfullname 'fromdest)
+    (if db (sync-gasket tables #f inmem db dbfullname 'fromdest))
     (dbr:dbstruct-last-update-set! dbstruct (current-seconds)) ;; should this be offset back in time by one second?
     dbstruct))
 
 ;;    (if (eq? syncdir 'todisk) ;; sync to disk normally, sync from in dashboard
 ;;        (dbmod:sync-tables tables last-update inmem db)
@@ -154,10 +169,11 @@
 
 ;; direction: 'fromdest 'todest
 ;;
 (define (sync-gasket tables last-update inmem dbh dbfname direction)
   (case (dbfile:sync-method)
+    ((none) #f)
     ((attach)
      (dbmod:attach-sync tables inmem dbfname direction))
     (else
      (case direction
        ((todest)

Index: rmt.scm
==================================================================
--- rmt.scm
+++ rmt.scm
@@ -91,30 +91,33 @@
 
 ;; 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
   (assert *toppath* "FATAL: rmt:send-receive called with *toppath* not set.")
-  (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)))
-
-  ;; I'm turning this off, it may make sense to move it
-  ;; into http-transport-handler
-  (if (and (> attemptnum 5) (= 0 (modulo attemptnum 15)))  
+
+  (if (not (eq? (rmt:transport-mode) 'nfs))
       (begin
-	(debug:print 0 *default-log-port* "ERROR: can't connect to server, trying to start a server.")
-	(case (rmt:transport-mode)
-	  ((http)
-	   (server:run *toppath*)
-	   (thread-sleep! 3))
-	  (else
-	   (thread-sleep! 1) ;; for tcp the server is started by routines in tcp-transportmod. For nfs there is no server
-	   ))))
+	(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)))
+	
+	;; I'm turning this off, it may make sense to move it
+	;; into http-transport-handler
+	(if (and (> attemptnum 5) (= 0 (modulo attemptnum 15)))  
+	    (begin
+	      (debug:print 0 *default-log-port* "ERROR: can't connect to server, trying to start a server.")
+	      (case (rmt:transport-mode)
+		((http)
+		 (server:run *toppath*)
+		 (thread-sleep! 3))
+		(else
+		 (thread-sleep! 1) ;; for tcp the server is started by routines in tcp-transportmod. For nfs there is no server
+		 ))))))
   
   ;; 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
   ;;
@@ -128,14 +131,14 @@
 	 (mtexe         (common:find-local-megatest)))
 
     (case (rmt:transport-mode)
       ((http)(http-transport-handler runremote cmd rid params attemptnum area-dat areapath readonly-mode))
       ((tcp) (tcp-transport-handler  runremote cmd rid params attemptnum area-dat areapath readonly-mode testsuite mtexe))
-      ((nfs) (nfs:transport-handler  runremote cmd rid params attemptnum area-dat areapath readonly-mode testsuite mtexe))
+      ((nfs) (nfs-transport-handler  runremote cmd rid params attemptnum area-dat areapath readonly-mode testsuite mtexe))
       )))
 
-(define (nfs:transport-handler  runremote cmd run-id params attemptnum area-dat areapath readonly-mode testsuite mtexe)
+(define (nfs-transport-handler  runremote cmd run-id params attemptnum area-dat areapath readonly-mode testsuite mtexe)
   (let* ((keys     (common:get-fields *configdat*))
 	 (dbstruct (dbmod:nfs-get-dbstruct run-id keys (dbfile:db-init-proc) areapath)))
     (api:dispatch-request dbstruct cmd run-id params)))
 	 
 (define (tcp-transport-handler runremote cmd run-id params attemptnum area-dat areapath readonly-mode testsuite mtexe)

Index: transport-mode.scm.template
==================================================================
--- transport-mode.scm.template
+++ transport-mode.scm.template
@@ -1,3 +1,15 @@
-;; 'http or 'tcp
-(rmt:transport-mode 'tcp)
-;; (rmt:transport-mode 'http)
+;;======================================================================
+;; set up transport, db cache and sync methods
+;;
+;; sync-method:        'original, 'attach or 'none
+;; cache-method:       'tmp, 'inmem or 'none
+;; rmt:transport-mode: 'http, 'tcp, 'nfs
+;;
+;; NOTE: NOT ALL COMBINATIONS WORK
+;;
+;;======================================================================
+
+(dbfile:sync-method 'none)
+(dbfile:cache-method 'none)
+(rmt:transport-mode 'nfs)
+