@@ -31,10 +31,11 @@
 	chicken
 	data-structures
 	extras
 	files
 
+	format
 	(prefix sqlite3 sqlite3:)
 	matchable
 	posix
 	typed-records
 	srfi-1
@@ -827,10 +828,54 @@
 		   (res    (dbmod:sync-gasket tables last-update sdb ddb dest-db 'todisk keys)))
 	      (sqlite3:finalize! sdb)
 	      (sqlite3:finalize! ddb)
 	      res)))
       #f))
+
+;; ======================================================================
+;; dbstats
+;;======================================================================
+
+;; (define *dbstruct-dbs*         #f) ;; used to cache the dbstruct in db:setup. Goal is to remove this.
+;; db stats
+(define *db-stats*            (make-hash-table)) ;; hash of vectors < count duration-total >
+(define *db-stats-mutex*      (make-mutex))
+
+(define (rmt:print-db-stats)
+  (let ((fmtstr "~40a~7-d~9-d~20,2-f")) ;; "~20,2-f"
+    (debug:print 0 *default-log-port* "DB Stats\n========")
+    (debug:print 0 *default-log-port* (format #f "~40a~8a~10a~10a" "Cmd" "Count" "TotTime" "Avg"))
+    (for-each (lambda (cmd)
+		(let* ((dat     (hash-table-ref *db-stats* cmd))
+		       (count   (dbstat-cnt dat))
+		       (tottime (dbstat-tottime dat)))
+		  (debug:print 0 *default-log-port*
+			       (format #f fmtstr cmd count tottime
+				       (/ tottime count)))))
+	      (sort (hash-table-keys *db-stats*)
+		    (lambda (a b)
+		      (> (dbstat-tottime (hash-table-ref *db-stats* a))
+			 (dbstat-tottime (hash-table-ref *db-stats* b))))))))
+
+(defstruct dbstat
+  (cnt 0)
+  (tottime 0))
+
+(define (db:add-stats cmd run-id params delta)
+  (let* ((modified-cmd (if (eq? cmd 'general-call)
+			   (string->symbol (conc "general-call-" (car params)))
+			   cmd))
+	 (rec          (hash-table-ref/default *db-stats* modified-cmd #f)))
+    (if (not rec)
+	(let ((new-rec  (make-dbstat)))
+	  (hash-table-set! *db-stats* modified-cmd new-rec)
+	  (set! rec new-rec)))
+    (dbstat-cnt-set! rec (+ (dbstat-cnt rec) 1))
+    (dbstat-tottime-set! rec (+ (dbstat-tottime rec) delta))))
+    
+
+
 )
 
 
 ;; ATTIC