@@ -37,10 +37,12 @@
 (include "db_records.scm")
 (include "key_records.scm")
 (include "run_records.scm")
 
 (define *rundb-mutex* (make-mutex)) ;; prevent problems opening/closing rundb's
+(define *number-of-writes* 0)
+(define *number-non-write-queries* 0)
 
 ;; Get/open a database
 ;;    if run-id => get run specific db
 ;;    if #f     => get main db
 ;;    if db already open - return inmem
@@ -128,11 +130,11 @@
 	       (dbpath       (let ((dbdir (conc *toppath* "/db"))) ;; use this opportunity to create our db dir
 			       (if (not (directory-exists? dbdir))
 				   (create-direcory dbdir))
 			       (conc *toppath* "/db/main.db")))
 	       (dbexists     (file-exists? dbpath))
-	       (db           (sqlite3:open-database dbpath)) ;; (never-give-up-open-db dbpath))
+	       (db           (sqlite3:open-database dbpath))
 	       (write-access (file-write-access? dbpath))
 	       (handler      (make-busy-timeout 136000)))
 	  (if (and dbexists (not write-access))
 	      (set! *db-write-access* #f))
 	  (if write-access 
@@ -364,13 +366,13 @@
   (debug:print-info 11 "open-run-close-no-exception-handling START given a db=" (if idb "yes " "no ") ", params=" params)
   (if (or *db-write-access*
 	  (not (member proc *db:all-write-procs*)))
       (let* ((db   (cond
 		    ((sqlite3:database? idb) idb)
-		    ((not idb)               (open-db))
+		    ((not idb)               (make-dbr:dbstruct path: *toppath*))
 		    ((procedure? idb)       (idb))
-		    (else   	            (open-db))))
+		    (else   	            (make-dbr:dbstruct path: *toppath*))))
 	     (res #f))
 	(set! res (apply proc db params))
 	(if (not idb)(sqlite3:finalize! db))
 	(debug:print-info 11 "open-run-close-no-exception-handling END" )
 	res)
@@ -523,11 +525,11 @@
 ;;======================================================================
 
 (define (open-logging-db) ;;  (conc *toppath* "/megatest.db") (car *configinfo*)))
   (let* ((dbpath    (conc (if *toppath* (conc *toppath* "/") "") "logging.db")) ;; fname)
 	 (dbexists  (file-exists? dbpath))
-	 (db        (sqlite3:open-database dbpath)) ;; (never-give-up-open-db dbpath))
+	 (db        (sqlite3:open-database dbpath))
 	 (handler   (make-busy-timeout (if (args:get-arg "-override-timeout")
 					   (string->number (args:get-arg "-override-timeout"))
 					   136000)))) ;; 136000)))
     (sqlite3:set-busy-handler! db handler)
     (if (not dbexists)