@@ -17,10 +17,11 @@
 (declare (uses common))
 (declare (uses megatest-version))
 (declare (uses margs))
 (declare (uses runs))
 (declare (uses launch))
+(declare (uses server))
 
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 
@@ -90,10 +91,11 @@
   -update-meta            : update the tests metadata for all tests
   -env2file fname         : write the environment to fname.csh and fname.sh
   -setvars VAR1=val1,VAR2=val2 : Add environment variables to a run NB// these are
                                  overwritten by values set in config files.
   -archive                : archive tests, use -target, :runname, -itempatt and -testpatt
+  -server                 : start the server (reduces contention on megatest.db)
 
 Spreadsheet generation
   -extract-ods fname.ods  : extract an open document spreadsheet from the database
   -pathmod path           : insert path, i.e. path/runame/itempath/logfile.html
                             will clear the field if no rundir/testname/itempath/logfile
@@ -176,10 +178,12 @@
 			"-keepgoing"
 			"-usequeue"
 			"-rebuild-db"
 			"-rollup"
 			"-update-meta"
+			"-server"
+
 			"-v" ;; verbose 2, more than normal (normal is 1)
 			"-q" ;; quiet 0, errors/warnings only
 		       )
 		 args:arg-hash
 		 0))
@@ -379,10 +383,20 @@
 		     (args:get-arg "-itempatt")
 		     user
 		     (make-hash-table)))))
 
 ;;======================================================================
+;; Start the server
+;;======================================================================
+(if (args:get-arg "-server")
+    (let* ((toppath (setup-for-run))
+	   (db      (if toppath (open-db) #f)))
+      (if db 
+	  (server:start db)
+	  (debug:print 0 "ERROR: Failed to setup for megatest"))))
+
+;;;======================================================================
 ;; Rollup into a run
 ;;======================================================================
 (if (args:get-arg "-rollup")
     (general-run-call 
      "-rollup" 
@@ -541,11 +555,11 @@
 	      (begin
 		(debug:print 0 "Failed to setup, exiting")
 		(exit 1)))
 	  (set! db (open-db))
 	  (if (and state status)
-	      (teststep-set-status! db run-id test-name step state status itemdat (args:get-arg "-m") logfile)
+	      (rdb:teststep-set-status! db run-id test-name step state status itemdat (args:get-arg "-m") logfile)
 	      (begin
 		(debug:print 0 "ERROR: You must specify :state and :status with every call to -step")
 		(exit 6)))
 	  (sqlite3:finalize! db)
 	  (set! *didsomething* #t))))
@@ -604,11 +618,11 @@
 				       ((zsh bash sh ash) "2>&1 >")))
 			 (fullcmd    (conc "(" (string-intersperse 
 						(cons cmd params) " ")
 					   ") " redir " " logfile)))
 		    ;; mark the start of the test
-		    (teststep-set-status! db run-id test-name stepname "start" "n/a" itemdat (args:get-arg "-m") logfile)
+		    (rdb:teststep-set-status! db run-id test-name stepname "start" "n/a" itemdat (args:get-arg "-m") logfile)
 		    ;; close the db
 		    (sqlite3:finalize! db)
 		    ;; run the test step
 		    (debug:print 2 "INFO: Running \"" fullcmd "\"")
 		    (change-directory startingdir)
@@ -626,11 +640,11 @@
 			  (change-directory startingdir)
 			  (set! exitstat (system cmd))
 			  (set! *globalexitstatus* exitstat) ;; no necessary
 			  (change-directory testpath)
 			  (test-set-log! db run-id test-name itemdat htmllogfile)))
-		    (teststep-set-status! db run-id test-name stepname "end" exitstat itemdat (args:get-arg "-m") logfile)
+		    (rdb:teststep-set-status! db run-id test-name stepname "end" exitstat itemdat (args:get-arg "-m") logfile)
 		    (sqlite3:finalize! db)
 		    (if (not (eq? exitstat 0))
 			(exit 254)) ;; (exit exitstat) doesn't work?!?
 		  ;; open the db
 		  ;; mark the end of the test