Index: api.scm
==================================================================
--- api.scm
+++ api.scm
@@ -19,17 +19,19 @@
 ;;======================================================================
 
 (declare (unit api))
 (declare (uses rmt))
 (declare (uses db))
+(declare (uses debugprint))
 (declare (uses dbmod))
 (declare (uses dbfile))
 (declare (uses tasks))
 (declare (uses tcp-transportmod))
 
 (import dbmod)
 (import dbfile)
+(import debugprint)
 (import tcp-transportmod)
 
 (use srfi-69
      posix
      matchable

Index: archive.scm
==================================================================
--- archive.scm
+++ archive.scm
@@ -18,18 +18,20 @@
 
 ;;  strftime('%m/%d/%Y %H:%M:%S','now','localtime')
 
 (declare (unit archive))
 (declare (uses db))
+(declare (uses debugprint))
 (declare (uses mtargs))
 (declare (uses common))
 (declare (uses commonmod))
 
 (use (prefix sqlite3 sqlite3:) srfi-1 posix regex regex-case srfi-69
      format md5 message-digest srfi-18)
 
 (import commonmod
+	debugprint
 	(prefix mtargs args:))
 
 (include "common_records.scm")
 (include "db_records.scm")
 

Index: client.scm
==================================================================
--- client.scm
+++ client.scm
@@ -18,21 +18,23 @@
 
 ;;======================================================================
 ;; C L I E N T S
 ;;======================================================================
 
-(use srfi-18 extras tcp s11n srfi-1 posix regex srfi-69 hostinfo md5
-     message-digest matchable spiffy uri-common intarweb http-client
-     spiffy-request-vars uri-common intarweb directory-utils)
-
 (declare (unit client))
 
 (declare (uses common))
 (declare (uses db))
 (declare (uses tasks)) ;; tasks are where stuff is maintained about what is running.
 (declare (uses commonmod))
-(import commonmod)
+
+(use srfi-18 extras tcp s11n srfi-1 posix regex srfi-69 hostinfo md5
+     message-digest matchable spiffy uri-common intarweb http-client
+     spiffy-request-vars uri-common intarweb directory-utils)
+
+(import commonmod
+	debugprint)
 
 (module client
 *
 
 )

Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -15,10 +15,15 @@
 ;; 
 ;;     You should have received a copy of the GNU General Public License
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;======================================================================
+
+(declare (unit common))
+(declare (uses commonmod))
+(declare (uses debugprint))
+(declare (uses mtargs))
 
 (use srfi-1 data-structures posix regex-case (prefix base64 base64:)
      format dot-locking csv-xml z3 udp ;; sql-de-lite
      hostinfo md5 message-digest typed-records directory-utils stack
      matchable regex posix (srfi 18) extras ;; tcp 
@@ -27,15 +32,12 @@
      pkts (prefix dbi dbi:)
      )
 (use posix-extras pathname-expand files)
 
 
-(declare (unit common))
-(declare (uses commonmod))
-(declare (uses mtargs))
-
 (import commonmod
+	debugprint
 	(prefix mtargs args:))
 
 (include "common_records.scm")
 
 

Index: common_records.scm
==================================================================
--- common_records.scm
+++ common_records.scm
@@ -81,133 +81,133 @@
 
 ;; this was cached based on results from profiling but it turned out the profiling
 ;; somehow went wrong - perhaps too many processes writing to it. Leaving the caching
 ;; in for now but can probably take it out later.
 ;;
-(define (debug:calc-verbosity vstr)
-  (or (hash-table-ref/default *verbosity-cache* vstr #f)
-      (let ((res (cond
-                  ((number? vstr) vstr)
-                  ((not (string?  vstr))   1)
-                  ;; ((string-match  "^\\s*$" vstr) 1)
-                  (vstr           (let ((debugvals  (filter number? (map string->number (string-split vstr ",")))))
-                                    (cond
-                                     ((> (length debugvals) 1) debugvals)
-                                     ((> (length debugvals) 0)(car debugvals))
-                                     (else 1))))
-                  ((args:get-arg "-v")   2)
-                  ((args:get-arg "-q")    0)
-                  (else                   1))))
-        (hash-table-set! *verbosity-cache* vstr res)
-        res)))
-
-;; check verbosity, #t is ok
-(define (debug:check-verbosity verbosity vstr)
-  (if (not (or (number? verbosity)
-	       (list?   verbosity)))
-      (begin
-	(print "ERROR: Invalid debug value \"" vstr "\"")
-	#f)
-      #t))
-
-(define (debug:debug-mode n)
-  (cond
-   ((and (number? *verbosity*)   ;; number number
-	 (number? n))
-    (<= n *verbosity*))
-   ((and (list? *verbosity*)     ;; list   number
-	 (number? n))
-    (member n *verbosity*))
-   ((and (list? *verbosity*)     ;; list   list
-	 (list? n))
-    (not (null? (lset-intersection! eq? *verbosity* n))))
-   ((and (number? *verbosity*)
-	 (list? n))
-    (member *verbosity* n))))
-
-(define (debug:setup)
-  (let ((debugstr (or (args:get-arg "-debug")
-		      (args:get-arg "-debug-noprop")
-		      (getenv "MT_DEBUG_MODE"))))
-    (set! *verbosity* (debug:calc-verbosity debugstr))
-    (debug:check-verbosity *verbosity* debugstr)
-    ;; if we were handed a bad verbosity rule then we will override it with 1 and continue
-    (if (not *verbosity*)(set! *verbosity* 1))
-    (if (and (not (args:get-arg "-debug-noprop"))
-	     (or (args:get-arg "-debug")
-		 (not (getenv "MT_DEBUG_MODE"))))
-	(setenv "MT_DEBUG_MODE" (if (list? *verbosity*)
-				    (string-intersperse (map conc *verbosity*) ",")
-				    (conc *verbosity*))))))
-  
-(define (debug:print n e . params)
-  (if (debug:debug-mode n)
-      (with-output-to-port (or e (current-error-port))
-	(lambda ()
-	  (if *logging*
-	      (db:log-event (apply conc params))
-	      (apply print params)
-	      )))))
+;; (define (debug:calc-verbosity vstr)
+;;   (or (hash-table-ref/default *verbosity-cache* vstr #f)
+;;       (let ((res (cond
+;;                   ((number? vstr) vstr)
+;;                   ((not (string?  vstr))   1)
+;;                   ;; ((string-match  "^\\s*$" vstr) 1)
+;;                   (vstr           (let ((debugvals  (filter number? (map string->number (string-split vstr ",")))))
+;;                                     (cond
+;;                                      ((> (length debugvals) 1) debugvals)
+;;                                      ((> (length debugvals) 0)(car debugvals))
+;;                                      (else 1))))
+;;                   ((args:get-arg "-v")   2)
+;;                   ((args:get-arg "-q")    0)
+;;                   (else                   1))))
+;;         (hash-table-set! *verbosity-cache* vstr res)
+;;         res)))
+
+;; ;; check verbosity, #t is ok
+;; (define (debug:check-verbosity verbosity vstr)
+;;   (if (not (or (number? verbosity)
+;; 	       (list?   verbosity)))
+;;       (begin
+;; 	(print "ERROR: Invalid debug value \"" vstr "\"")
+;; 	#f)
+;;       #t))
+;; 
+;; (define (debug:debug-mode n)
+;;   (cond
+;;    ((and (number? *verbosity*)   ;; number number
+;; 	 (number? n))
+;;     (<= n *verbosity*))
+;;    ((and (list? *verbosity*)     ;; list   number
+;; 	 (number? n))
+;;     (member n *verbosity*))
+;;    ((and (list? *verbosity*)     ;; list   list
+;; 	 (list? n))
+;;     (not (null? (lset-intersection! eq? *verbosity* n))))
+;;    ((and (number? *verbosity*)
+;; 	 (list? n))
+;;     (member *verbosity* n))))
+;; 
+;; (define (debug:setup)
+;;   (let ((debugstr (or (args:get-arg "-debug")
+;; 		      (args:get-arg "-debug-noprop")
+;; 		      (getenv "MT_DEBUG_MODE"))))
+;;     (set! *verbosity* (debug:calc-verbosity debugstr))
+;;     (debug:check-verbosity *verbosity* debugstr)
+;;     ;; if we were handed a bad verbosity rule then we will override it with 1 and continue
+;;     (if (not *verbosity*)(set! *verbosity* 1))
+;;     (if (and (not (args:get-arg "-debug-noprop"))
+;; 	     (or (args:get-arg "-debug")
+;; 		 (not (getenv "MT_DEBUG_MODE"))))
+;; 	(setenv "MT_DEBUG_MODE" (if (list? *verbosity*)
+;; 				    (string-intersperse (map conc *verbosity*) ",")
+;; 				    (conc *verbosity*))))))
+;;   
+;; (define (debug:print n e . params)
+;;   (if (debug:debug-mode n)
+;;       (with-output-to-port (or e (current-error-port))
+;; 	(lambda ()
+;; 	  (if *logging*
+;; 	      (db:log-event (apply conc params))
+;; 	      (apply print params)
+;; 	      )))))
 
 ;; Brandon's debug printer shortcut (indulge me :)
-(define *BB-process-starttime* (current-milliseconds))
-(define (BB> . in-args)
-  (let* ((stack (get-call-chain))
-         (location "??"))
-    (for-each
-     (lambda (frame)
-       (let* ((this-loc (vector-ref frame 0))
-              (temp     (string-split (->string this-loc) " "))
-              (this-func (if (and (list? temp) (> (length temp) 1)) (cadr temp) "???")))
-         (if (equal? this-func "BB>")
-             (set! location this-loc))))
-     stack)
-    (let* ((color-on "\x1b[1m")
-           (color-off "\x1b[0m")
-           (dp-args
-            (append
-             (list 0 *default-log-port*
-                   (conc color-on location "@"(/ (- (current-milliseconds) *BB-process-starttime*) 1000) color-off "   ")  )
-             in-args)))
-      (apply debug:print dp-args))))
-
-(define *BBpp_custom_expanders_list* (make-hash-table))
-
-
-
-;; register hash tables with BBpp.
-(hash-table-set! *BBpp_custom_expanders_list* HASH_TABLE:
-                 (cons hash-table? hash-table->alist))
-
-;; test name converter
-(define (BBpp_custom_converter arg)
-  (let ((res #f))
-    (for-each
-     (lambda (custom-type-name)
-       (let* ((custom-type-info      (hash-table-ref *BBpp_custom_expanders_list* custom-type-name))
-              (custom-type-test      (car custom-type-info))
-              (custom-type-converter (cdr custom-type-info)))
-         (when (and (not res) (custom-type-test arg))
-           (set! res (custom-type-converter arg)))))
-     (hash-table-keys *BBpp_custom_expanders_list*))
-    (if res (BBpp_ res) arg)))
-
-(define (BBpp_ arg)
-  (cond
-   ;;((SOMESTRUCT? arg) (cons SOMESTRUCT: (SOMESTRUCT->alist arg)))
-   ;;((dboard:tabdat? arg) (cons dboard:tabdat: (dboard:tabdat->alist arg)))
-   ((hash-table? arg)
-    (let ((al (hash-table->alist arg)))
-      (BBpp_ (cons HASH_TABLE: al))))
-   ((null? arg) '())
-   ;;((list? arg) (cons (BBpp_ (car arg)) (BBpp_ (cdr arg))))
-   ((pair? arg) (cons (BBpp_ (car arg)) (BBpp_ (cdr arg))))
-   (else (BBpp_custom_converter arg))))
-
-;; Brandon's pretty printer.  It expands hashes and custom types in addition to regular pp
-(define (BBpp arg)
-  (pp (BBpp_ arg)))
+;; (define *BB-process-starttime* (current-milliseconds))
+;; (define (BB> . in-args)
+;;   (let* ((stack (get-call-chain))
+;;          (location "??"))
+;;     (for-each
+;;      (lambda (frame)
+;;        (let* ((this-loc (vector-ref frame 0))
+;;               (temp     (string-split (->string this-loc) " "))
+;;               (this-func (if (and (list? temp) (> (length temp) 1)) (cadr temp) "???")))
+;;          (if (equal? this-func "BB>")
+;;              (set! location this-loc))))
+;;      stack)
+;;     (let* ((color-on "\x1b[1m")
+;;            (color-off "\x1b[0m")
+;;            (dp-args
+;;             (append
+;;              (list 0 *default-log-port*
+;;                    (conc color-on location "@"(/ (- (current-milliseconds) *BB-process-starttime*) 1000) color-off "   ")  )
+;;              in-args)))
+;;       (apply debug:print dp-args))))
+;; 
+;; (define *BBpp_custom_expanders_list* (make-hash-table))
+;; 
+;; 
+;; 
+;; ;; register hash tables with BBpp.
+;; (hash-table-set! *BBpp_custom_expanders_list* HASH_TABLE:
+;;                  (cons hash-table? hash-table->alist))
+;; 
+;; ;; test name converter
+;; (define (BBpp_custom_converter arg)
+;;   (let ((res #f))
+;;     (for-each
+;;      (lambda (custom-type-name)
+;;        (let* ((custom-type-info      (hash-table-ref *BBpp_custom_expanders_list* custom-type-name))
+;;               (custom-type-test      (car custom-type-info))
+;;               (custom-type-converter (cdr custom-type-info)))
+;;          (when (and (not res) (custom-type-test arg))
+;;            (set! res (custom-type-converter arg)))))
+;;      (hash-table-keys *BBpp_custom_expanders_list*))
+;;     (if res (BBpp_ res) arg)))
+;; 
+;; (define (BBpp_ arg)
+;;   (cond
+;;    ;;((SOMESTRUCT? arg) (cons SOMESTRUCT: (SOMESTRUCT->alist arg)))
+;;    ;;((dboard:tabdat? arg) (cons dboard:tabdat: (dboard:tabdat->alist arg)))
+;;    ((hash-table? arg)
+;;     (let ((al (hash-table->alist arg)))
+;;       (BBpp_ (cons HASH_TABLE: al))))
+;;    ((null? arg) '())
+;;    ;;((list? arg) (cons (BBpp_ (car arg)) (BBpp_ (cdr arg))))
+;;    ((pair? arg) (cons (BBpp_ (car arg)) (BBpp_ (cdr arg))))
+;;    (else (BBpp_custom_converter arg))))
+;; 
+;; ;; Brandon's pretty printer.  It expands hashes and custom types in addition to regular pp
+;; (define (BBpp arg)
+;;   (pp (BBpp_ arg)))
 
 ;(use define-macro)
 (define-syntax inspect
   (syntax-rules ()
     [(_ x)
@@ -215,40 +215,40 @@
        (printf "~a is: ~a\n" 'x (with-output-to-string (lambda () (BBpp x))))
      ;;  )
      ]
     [(_ x y ...) (begin (inspect x) (inspect y ...))]))
 
-(define (debug:print-error n e . params)
-  ;; normal print
-  (if (debug:debug-mode n)
-      (with-output-to-port (if (port? e) e (current-error-port))
-	(lambda ()
-	  (if *logging*
-	      (db:log-event (apply conc params))
-	      ;; (apply print "pid:" (current-process-id) " " params)
-	      (apply print "ERROR: " params)
-	      ))))
-  ;; pass important messages to stderr
-  (if (and (eq? n 0)(not (eq? e (current-error-port)))) 
-      (with-output-to-port (current-error-port)
-	(lambda ()
-	  (apply print "ERROR: " params)
-	  ))))
-
-(define (debug:print-info n e . params)
-  (if (debug:debug-mode n)
-      (with-output-to-port (if (port? e) e (current-error-port))
-	(lambda ()
-	  (if *logging*
-	      (let ((res (format#format #f "INFO: (~a) ~a" n (apply conc params))))
-		(db:log-event res))
-	      ;; (apply print "pid:" (current-process-id) " " "INFO: (" n ") " params) ;; res)
-	      (apply print "INFO: (" n ") " params) ;; res)
-	      )))))
-
+;; (define (debug:print-error n e . params)
+;;   ;; normal print
+;;   (if (debug:debug-mode n)
+;;       (with-output-to-port (if (port? e) e (current-error-port))
+;; 	(lambda ()
+;; 	  (if *logging*
+;; 	      (db:log-event (apply conc params))
+;; 	      ;; (apply print "pid:" (current-process-id) " " params)
+;; 	      (apply print "ERROR: " params)
+;; 	      ))))
+;;   ;; pass important messages to stderr
+;;   (if (and (eq? n 0)(not (eq? e (current-error-port)))) 
+;;       (with-output-to-port (current-error-port)
+;; 	(lambda ()
+;; 	  (apply print "ERROR: " params)
+;; 	  ))))
+;; 
+;; (define (debug:print-info n e . params)
+;;   (if (debug:debug-mode n)
+;;       (with-output-to-port (if (port? e) e (current-error-port))
+;; 	(lambda ()
+;; 	  (if *logging*
+;; 	      (let ((res (format#format #f "INFO: (~a) ~a" n (apply conc params))))
+;; 		(db:log-event res))
+;; 	      ;; (apply print "pid:" (current-process-id) " " "INFO: (" n ") " params) ;; res)
+;; 	      (apply print "INFO: (" n ") " params) ;; res)
+;; 	      )))))
+;; 
 
 
 ;; if a value is printable (i.e. string or number) return the value
 ;; else return an empty string
 (define-inline (printable val)
   (if (or (number? val)(string? val)) val ""))
 

Index: configf.scm
==================================================================
--- configf.scm
+++ configf.scm
@@ -25,15 +25,19 @@
 (use regex regex-case matchable) ;;  directory-utils)
 (declare (unit configf))
 (declare (uses process))
 (declare (uses env))
 (declare (uses keys))
+(declare (uses debugprint))
 (declare (uses mtargs))
+(declare (uses mtargs.import))
+(declare (uses common))
 (declare (uses commonmod))
 (declare (uses commonmod.import))
 (import commonmod
-	(prefix mtargs args:))
+	(prefix mtargs args:)
+	debugprint)
 
 (include "common_records.scm")
 
 ;; return list (path fullpath configname)
 (define (find-config configname #!key (toppath #f))

Index: dashboard-context-menu.scm
==================================================================
--- dashboard-context-menu.scm
+++ dashboard-context-menu.scm
@@ -21,19 +21,10 @@
 ;;======================================================================
 ;; implementation of context menu that pops up on
 ;; right click on test cell in Runs & Runs Summary Tabs
 ;;======================================================================
 
-(use format fmt)
-(require-library iup)
-(import (prefix iup iup:))
-
-(use canvas-draw)
-
-(use srfi-1 posix regex regex-case srfi-69)
-(use (prefix sqlite3 sqlite3:))
-
 (declare (unit dashboard-context-menu))
 (declare (uses common))
 (declare (uses commonmod))
 (declare (uses db))
 (declare (uses gutils))
@@ -41,15 +32,25 @@
 (declare (uses ezsteps))
 ;; (declare (uses sdb))
 ;; (declare (uses filedb))
 (declare (uses subrun))
 
+(use format fmt)
+(require-library iup)
+(import (prefix iup iup:))
+
+(use canvas-draw)
+
+(use srfi-1 posix regex regex-case srfi-69)
+(use (prefix sqlite3 sqlite3:))
+
 (include "common_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
 
-(import commonmod)
+(import commonmod
+	debugprint)
 
 (define (dboard:launch-testpanel run-id test-id)
   (let* ((dboardexe (common:find-local-megatest "dashboard"))
          (cmd (conc dboardexe
                     " -test " run-id "," test-id

Index: dashboard-tests.scm
==================================================================
--- dashboard-tests.scm
+++ dashboard-tests.scm
@@ -20,19 +20,10 @@
 
 ;;======================================================================
 ;; Test info panel
 ;;======================================================================
 
-(use format fmt)
-(require-library iup)
-(import (prefix iup iup:))
-
-(use canvas-draw)
-
-(use srfi-1 posix regex regex-case srfi-69)
-(use (prefix sqlite3 sqlite3:))
-
 (declare (unit dashboard-tests))
 (declare (uses common))
 (declare (uses commonmod))
 (declare (uses db))
 (declare (uses gutils))
@@ -39,12 +30,23 @@
 (declare (uses rmt))
 (declare (uses ezsteps))
 ;; (declare (uses sdb))
 ;; (declare (uses filedb))
 (declare (uses subrun))
+(declare (uses debugprint))
+
+(use format fmt)
+(require-library iup)
+(import (prefix iup iup:))
+
+(use canvas-draw)
+
+(use srfi-1 posix regex regex-case srfi-69)
+(use (prefix sqlite3 sqlite3:))
 
-(import commonmod)
+(import commonmod
+	debugprint)
 
 (include "common_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
 

Index: dashboard.scm
==================================================================
--- dashboard.scm
+++ dashboard.scm
@@ -18,12 +18,14 @@
 ;;
 ;;======================================================================
 
 (declare (uses common))
 (declare (uses mtargs))
+(declare (uses mtargs.import))
 (declare (uses keys))
 (declare (uses items))
+(declare (uses debugprint))
 (declare (uses db))
 (declare (uses configf))
 (declare (uses process))
 (declare (uses launch))
 (declare (uses runs))
@@ -53,11 +55,12 @@
 (use sqlite3 srfi-1 posix regex regex-case srfi-69 typed-records sparse-vectors) ;; defstruct
 
 (import commonmod
 	(prefix mtargs args:)
 	dbmod
-	dbfile)
+	dbfile
+	debugprint)
 
 (include "common_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
 (include "task_records.scm")
@@ -362,18 +365,18 @@
   tests-tree       ;; used in newdashboard
   )
 
 ;; register tabdat with BBpp
 ;; this is used by BBpp (Brandon's pretty printer) to convert dboard:tabdat into a composition of lists that pp will handle
-(hash-table-set! *BBpp_custom_expanders_list* TABDAT:
-                 (cons dboard:tabdat?
-                       (lambda (tabdat-item)
-                         (filter
-                          (lambda (alist-entry)
-                            (member (car alist-entry)
-                                    '(allruns-by-id allruns))) ;; FIELDS OF INTEREST
-                          (dboard:tabdat->alist tabdat-item)))))
+;; (hash-table-set! *BBpp_custom_expanders_list* TABDAT:
+;;                  (cons dboard:tabdat?
+;;                        (lambda (tabdat-item)
+;;                          (filter
+;;                           (lambda (alist-entry)
+;;                             (member (car alist-entry)
+;;                                     '(allruns-by-id allruns))) ;; FIELDS OF INTEREST
+;;                           (dboard:tabdat->alist tabdat-item)))))
 
 
 
 (define (dboard:tabdat-target-string vec)
   (let ((targ (dboard:tabdat-target vec)))
@@ -514,18 +517,18 @@
   duration
   )
 
 ;; register dboard:rundat with BBpp
 ;; this is used by BBpp (Brandon's pretty printer) to convert dboard:rundat into a composition of lists that pp will handle
-(hash-table-set! *BBpp_custom_expanders_list* RUNDAT:
-                 (cons dboard:rundat?
-                       (lambda (tabdat-item)
-                         (filter
-                          (lambda (alist-entry)
-                            (member (car alist-entry)
-                                    '(run run-data-offset ))) ;; FIELDS OF INTEREST
-                          (dboard:rundat->alist tabdat-item)))))
+;; (hash-table-set! *BBpp_custom_expanders_list* RUNDAT:
+;;                  (cons dboard:rundat?
+;;                        (lambda (tabdat-item)
+;;                          (filter
+;;                           (lambda (alist-entry)
+;;                             (member (car alist-entry)
+;;                                     '(run run-data-offset ))) ;; FIELDS OF INTEREST
+;;                           (dboard:rundat->alist tabdat-item)))))
 
 
 
 
 (define (dboard:rundat-make-init #!key (run #f)(key-vals #f)(tests #f));; -100 is before time began

Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -33,10 +33,11 @@
 (declare (uses ods))
 (declare (uses client))
 (declare (uses mt))
 (declare (uses commonmod))
 (declare (uses mtargs))
+
 (import commonmod
 	(prefix mtargs args:))
 
 (use (srfi 18)
      extras

Index: dcommon.scm
==================================================================
--- dcommon.scm
+++ dcommon.scm
@@ -16,24 +16,25 @@
 ;;     You should have received a copy of the GNU General Public License
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 ;;
 ;;======================================================================
 
+(declare (unit dcommon))
+
+(declare (uses gutils))
+(declare (uses db))
+(declare (uses commonmod))
+
 (use format)
 (require-library iup)
 (import (prefix iup iup:))
 (use canvas-draw)
 (import canvas-draw-iup)
 (use regex typed-records matchable)
 
-(declare (unit dcommon))
-
-(declare (uses gutils))
-(declare (uses db))
-(declare (uses commonmod))
-
-(import commonmod)
+(import commonmod
+	debugprint)
 ;; (declare (uses synchash))
 
 (include "megatest-version.scm")
 (include "common_records.scm")
 (include "db_records.scm")

Index: diff-report.scm
==================================================================
--- diff-report.scm
+++ diff-report.scm
@@ -16,13 +16,15 @@
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 ;;
 
 (declare (unit diff-report))
 (declare (uses common))
+(declare (uses debugprint))
 (declare (uses rmt))
 (declare (uses commonmod))
-(import commonmod)
+(import commonmod
+	debugprint)
          
 (include "common_records.scm")
 (use matchable)
 (use fmt)
 (use ducttape-lib)

Index: env.scm
==================================================================
--- env.scm
+++ env.scm
@@ -18,13 +18,15 @@
 
 ;;======================================================================
 
 (declare (unit env))
 
+(declare (uses debugprint))
 (declare (uses mtargs))
 
-(import (prefix mtargs args:))
+(import (prefix mtargs args:)
+	debugprint)
 
 (use sql-de-lite) ;; srfi-1 posix regex regex-case srfi-69 srfi-18 call-with-environment-variables)
 
 (define (env:open-db fname)
   (let* ((db-exists (common:file-exists? fname))

Index: ezsteps.scm
==================================================================
--- ezsteps.scm
+++ ezsteps.scm
@@ -20,10 +20,11 @@
 ;;  strftime('%m/%d/%Y %H:%M:%S','now','localtime')
 
 (declare (unit ezsteps))
 (declare (uses db))
 (declare (uses common))
+(declare (uses debugprint))
 (declare (uses items))
 (declare (uses runconfig))
 ;; (declare (uses sdb))
 ;; (declare (uses filedb))
 (declare (uses commonmod))
@@ -31,10 +32,11 @@
 
 (use srfi-1 posix regex srfi-69 directory-utils call-with-environment-variables posix-extras
      z3 csv typed-records pathname-expand matchable)
 
 (import commonmod
+	debugprint
 	(prefix mtargs args:))
 
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")

Index: genexample.scm
==================================================================
--- genexample.scm
+++ genexample.scm
@@ -17,11 +17,16 @@
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;======================================================================
 
 (declare (unit genexample))
+(declare (uses mtargs))
+(declare (uses debugprint))
+
 (use posix regex matchable)
+(import (prefix mtargs args:)
+	debugprint)
 
 (include "db_records.scm")
 
 (define genexample:example-logpro
 #<<EOF

Index: http-transport.scm
==================================================================
--- http-transport.scm
+++ http-transport.scm
@@ -17,10 +17,11 @@
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 
 (declare (unit http-transport))
 
 (declare (uses common))
+(declare (uses debugprint))
 (declare (uses db))
 (declare (uses tests))
 (declare (uses tasks)) ;; tasks are where stuff is maintained about what is running.
 (declare (uses server))
 ;; (declare (uses daemon))
@@ -34,11 +35,12 @@
 
 (use  srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest posix-extras)
 
 (use spiffy uri-common intarweb http-client spiffy-request-vars intarweb spiffy-directory-listing)
 
-(import (prefix mtargs args:))
+(import (prefix mtargs args:)
+	debugprint)
 
 ;; Configurations for server
 (tcp-buffer-size 2048)
 (max-connections 2048) 
 

Index: items.scm
==================================================================
--- items.scm
+++ items.scm
@@ -21,12 +21,14 @@
 ;; 		     (temperature "cool medium hot")
 ;; 		     (season      "summer winter fall spring")))
 
 (declare (unit items))
 (declare (uses common))
+(declare (uses debugprint))
 (declare (uses commonmod))
-(import commonmod)
+(import commonmod
+	debugprint)
 
 (include "common_records.scm")
 
 ;; Puts out all combinations
 (define (process-itemlist hierdepth curritemkey itemlist)

Index: keys.scm
==================================================================
--- keys.scm
+++ keys.scm
@@ -19,17 +19,22 @@
  
 ;;======================================================================
 ;; Run keys, these are used to hierarchially organise tests and run areas
 ;;======================================================================
 
-(use sqlite3 srfi-1 posix regex regex-case srfi-69)
-(import (prefix sqlite3 sqlite3:))
-
 (declare (unit keys))
 (declare (uses common))
+(declare (uses debugprint))
 (declare (uses commonmod))
-(import commonmod)
+(declare (uses mtargs))
+
+(use sqlite3 srfi-1 posix regex regex-case srfi-69)
+(import (prefix sqlite3 sqlite3:)
+	(prefix mtargs args:))
+
+(import commonmod
+	debugprint)
 
 (include "key_records.scm")
 (include "common_records.scm")
 
 (define (keys->keystr keys) ;; => key1,key2,key3,additiona1, ...

Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -22,10 +22,11 @@
 ;;======================================================================
 
 (declare (unit launch))
 (declare (uses subrun))
 (declare (uses common))
+(declare (uses debugprint))
 (declare (uses commonmod))
 (declare (uses configf))
 (declare (uses db))
 (declare (uses ezsteps))
 (declare (uses dbfile))
@@ -35,11 +36,12 @@
      call-with-environment-variables csv)
 (use typed-records pathname-expand matchable)
 
 (import (prefix base64 base64:)
 	(prefix sqlite3 sqlite3:)
-	(prefix mtargs args:))
+	(prefix mtargs args:)
+	debugprint)
 
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 (include "megatest-fossil-hash.scm")

Index: lock-queue.scm
==================================================================
--- lock-queue.scm
+++ lock-queue.scm
@@ -18,13 +18,16 @@
 
 (use (prefix sqlite3 sqlite3:) srfi-18)
 
 (declare (unit lock-queue))
 (declare (uses common))
+(declare (uses debugprint))
 (declare (uses tasks))
 (declare (uses commonmod))
-(import commonmod)
+
+(import commonmod
+	debugprint)
 
 ;;======================================================================
 ;; attempt to prevent overlapping updates of rollup files by queueing
 ;; update requests in an sqlite db
 ;;======================================================================

Index: mt.scm
==================================================================
--- mt.scm
+++ mt.scm
@@ -19,19 +19,22 @@
 
 (use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking (srfi 18) posix-extras directory-utils call-with-environment-variables)
 (import (prefix sqlite3 sqlite3:))
 
 (declare (unit mt))
+(declare (uses debugprint))
 (declare (uses db))
 (declare (uses common))
 (declare (uses items))
 (declare (uses runconfig))
 (declare (uses tests))
 (declare (uses server))
 (declare (uses runs))
 (declare (uses rmt))
 ;; (declare (uses filedb))
+
+(import debugprint)
 
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")

Index: mtexec.scm
==================================================================
--- mtexec.scm
+++ mtexec.scm
@@ -26,15 +26,16 @@
    srfi-19  srfi-18 extras format pkts regex regex-case
      (prefix dbi dbi:)
      )
 
 ;; (declare (uses common))
-(declare (uses margs))
+(declare (uses mtargs))
 (declare (uses configf))
 ;; (declare (uses rmt))
 (declare (uses commonmod))
-(import commonmod)
+(import commonmod
+	(prefix mtargs args:))
 
 ;; (use ducttape-lib)
 (include "megatest-version.scm")
 (include "megatest-fossil-hash.scm")
 

Index: mtut.scm
==================================================================
--- mtut.scm
+++ mtut.scm
@@ -13,12 +13,21 @@
 ;;     GNU General Public License for more details.
 ;; 
 ;;     You should have received a copy of the GNU General Public License
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 ;;
+;
+(declare (uses common))
+(declare (uses mtargs))
+(declare (uses debugprint))
+(declare (uses configf))
+;; (declare (uses rmt))
+(declare (uses commonmod))
+(declare (uses commonmod.import))
 
-;; (include "common.scm")
+(import debugprint)
+					; (include "common.scm")
 (include "megatest-version.scm")
 
 ;; fake out readline usage of toplevel-command
 (define (toplevel-command . a) #f)
 
@@ -26,17 +35,12 @@
    srfi-19  srfi-18 extras format pkts regex regex-case
      (prefix dbi dbi:)
      (prefix sqlite3 sqlite3:)
      nanomsg)
 
-(declare (uses common))
-(declare (uses margs))
-(declare (uses configf))
-;; (declare (uses rmt))
-(declare (uses commonmod))
-(declare (uses commonmod.import))
-(import commonmod)
+(import commonmod
+	(prefix mtargs args:))
 
 (use ducttape-lib)
 
 (include "megatest-fossil-hash.scm")
 

Index: newdashboard.scm
==================================================================
--- newdashboard.scm
+++ newdashboard.scm
@@ -16,10 +16,16 @@
 ;;     You should have received a copy of the GNU General Public License
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;======================================================================
 
+(declare (uses common))
+(declare (uses debugprint))
+(declare (uses megatest-version))
+(declare (uses mtargs))
+(declare (uses commonmod))
+
 (use format)
 
 (use (prefix iup iup:))
 
 (use canvas-draw)
@@ -26,15 +32,13 @@
 (import canvas-draw-iup)
 
 (use sql-de-lite srfi-1 posix regex regex-case srfi-69 typed-records sparse-vectors ;; defstruct
      (prefix dbi dbi:))
 
-(declare (uses common))
-(declare (uses megatest-version))
-(declare (uses margs))
-(declare (uses commonmod))
-(import commonmod)
+(import commonmod
+	debugprint
+	(prefix mtargs args:))
 
 ;; (declare (uses launch))
 ;; (declare (uses gutils))
 ;; (declare (uses db))
 ;; (declare (uses server))

Index: portlogger.scm
==================================================================
--- portlogger.scm
+++ portlogger.scm
@@ -21,12 +21,14 @@
 
 (use sqlite3 srfi-1 posix srfi-69 hostinfo dot-locking z3)
 (import (prefix sqlite3 sqlite3:))
 
 (declare (unit portlogger))
+(declare (uses debugprint))
 (declare (uses db))
 
+(import debugprint)
 ;; lsof -i
 
 (define (portlogger:open-db fname)
   (let* ((avail    (tasks:wait-on-journal fname 5 remove: #t)) ;; wait up to about 10 seconds for the journal to go away
 	 (exists   (common:file-exists? fname))

Index: process.scm
==================================================================
--- process.scm
+++ process.scm
@@ -22,10 +22,13 @@
 ;; Process convience utils
 ;;======================================================================
 
 (use regex directory-utils)
 (declare (unit process))
+(declare (uses debugprint))
+
+(import debugprint)
 
 (define (process:conservative-read port)
   (let loop ((res ""))
     (if (not (eof-object? (peek-char port)))
 	(loop (conc res (read-char port)))

Index: rmt.scm
==================================================================
--- rmt.scm
+++ rmt.scm
@@ -19,10 +19,11 @@
 ;;======================================================================
 
 (use format typed-records) ;; RADT => purpose of json format??
 
 (declare (unit rmt))
+(declare (uses debugprint))
 (declare (uses api))
 (declare (uses http-transport))
 (declare (uses commonmod))
 (declare (uses dbfile))
 ;; (declare (uses dbmemmod))
@@ -33,10 +34,11 @@
 
 ;; used by http-transport
 (import dbfile
 	rmtmod
 	commonmod
+	debugprint
 ;; 	dbmemmod
 	dbfile
 	dbmod
 	tcp-transportmod)
 

Index: runconfig.scm
==================================================================
--- runconfig.scm
+++ runconfig.scm
@@ -22,12 +22,15 @@
 
 (use format directory-utils)
 
 (declare (unit runconfig))
 (declare (uses common))
+(declare (uses debugprint))
 (declare (uses commonmod))
-(import commonmod)
+
+(import commonmod
+	debugprint)
 
 (include "common_records.scm")
 
 (define (runconfig:read fname target environ-patt)
   (let ((ht (make-hash-table)))

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -15,35 +15,40 @@
 ;;     You should have received a copy of the GNU General Public License
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;  strftime('%m/%d/%Y %H:%M:%S','now','localtime')
 
-(use (prefix sqlite3 sqlite3:) srfi-1 posix regex regex-case srfi-69 (srfi 18) 
-     posix-extras directory-utils pathname-expand typed-records format  sxml-serializer
-     sxml-modifications matchable)
-
 (declare (unit runs))
 (declare (uses db))
 (declare (uses common))
+(declare (uses debugprint))
 (declare (uses commonmod))
 (declare (uses items))
 (declare (uses runconfig))
 (declare (uses tests))
 (declare (uses server))
 (declare (uses mt))
 (declare (uses archive))
-;; (declare (uses filedb))
+(declare (uses mtargs))
+
+(use (prefix sqlite3 sqlite3:) srfi-1 posix regex regex-case srfi-69 (srfi 18) 
+     posix-extras directory-utils pathname-expand typed-records format  sxml-serializer
+     sxml-modifications matchable)
+
+
 
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
 (include "test_records.scm")
 
 ;; (include "debugger.scm")
 
-(import commonmod)
+(import commonmod
+	debugprint
+	(prefix mtargs args:))
 
 ;; use this struct to facilitate refactoring
 ;;
 
 (defstruct runs:dat

Index: server.scm
==================================================================
--- server.scm
+++ server.scm
@@ -14,31 +14,34 @@
 ;; 
 ;;     You should have received a copy of the GNU General Public License
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 ;;
 
-(require-extension (srfi 18) extras tcp s11n)
-
-(use srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest
-     directory-utils posix-extras matchable utils)
-
-(use spiffy uri-common intarweb http-client spiffy-request-vars)
-
 (declare (unit server))
 
 (declare (uses commonmod))
-
+(declare (uses debugprint))
 (declare (uses common))
 (declare (uses db))
 (declare (uses tasks)) ;; tasks are where stuff is maintained about what is running.
 ;; (declare (uses synchash))
 (declare (uses http-transport))
 ;;(declare (uses rpc-transport))
 (declare (uses launch))
 ;; (declare (uses daemon))
+(declare (uses mtargs))
+
+(require-extension (srfi 18) extras tcp s11n)
+
+(use srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest
+     directory-utils posix-extras matchable utils)
+
+(use spiffy uri-common intarweb http-client spiffy-request-vars)
 
-(import commonmod)
+(import commonmod
+	debugprint
+	(prefix mtargs args:))
 
 (include "common_records.scm")
 (include "db_records.scm")
 
 (define (server:make-server-url hostport)

Index: subrun.scm
==================================================================
--- subrun.scm
+++ subrun.scm
@@ -16,27 +16,23 @@
 ;;     You should have received a copy of the GNU General Public License
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;  strftime('%m/%d/%Y %H:%M:%S','now','localtime')
 
-(use (prefix sqlite3 sqlite3:) srfi-1 posix regex regex-case srfi-69 (srfi 18) 
-     posix-extras directory-utils pathname-expand typed-records format
-     call-with-environment-variables)
 (declare (unit subrun))
-;;(declare (uses runs))
+(declare (uses debugprint))
 (declare (uses db))
 (declare (uses common))
 (declare (uses commonmod))
-;;(declare (uses items))
-;;(declare (uses runconfig))
-;;(declare (uses tests))
-;;(declare (uses server))
 (declare (uses mt))
-;;(declare (uses archive))
-;; (declare (uses filedb))
+
+(use (prefix sqlite3 sqlite3:) srfi-1 posix regex regex-case srfi-69 (srfi 18) 
+     posix-extras directory-utils pathname-expand typed-records format
+     call-with-environment-variables)
 
-(import commonmod)
+(import commonmod
+	debugprint)
 
 ;(include "common_records.scm")
 ;;(include "key_records.scm")
 (include "db_records.scm") ;; provides db:test-get-id
 ;;(include "run_records.scm")

Index: tasks.scm
==================================================================
--- tasks.scm
+++ tasks.scm
@@ -16,21 +16,26 @@
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 ;;
 
 ;;  strftime('%m/%d/%Y %H:%M:%S','now','localtime')
 
-(use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking format)
-(import (prefix sqlite3 sqlite3:))
-
 (declare (unit tasks))
+(declare (uses debugprint))
 (declare (uses dbfile))
 (declare (uses db))
 (declare (uses rmt))
 (declare (uses common))
 (declare (uses pgdb))
 (declare (uses commonmod))
-(import commonmod)
+(declare (uses mtargs))
+
+(use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking format)
+(import (prefix sqlite3 sqlite3:))
+
+(import commonmod
+	debugprint
+	(prefix mtargs args:))
 
 (import dbfile)
 ;; (import pgdb) ;; pgdb is a module
 
 (include "task_records.scm")

Index: tcmt.scm
==================================================================
--- tcmt.scm
+++ tcmt.scm
@@ -21,21 +21,23 @@
 ;;
 ;;  1. Run the megatest process and pass it all the needed parameters
 ;;  2. Every five seconds check for state/status changes and print the info
 ;;
 
+(declare (uses mtargs))
+(declare (uses rmt))
+(declare (uses common))
+;; (declare (uses megatest-version))
+(declare (uses commonmod))
+
 (use srfi-1 posix srfi-69 srfi-18 regex defstruct)
 
 (use trace)
 ;; (trace-call-sites #t)
 
-(declare (uses margs))
-(declare (uses rmt))
-(declare (uses common))
-;; (declare (uses megatest-version))
-(declare (uses commonmod))
-(import commonmod)
+(import commonmod
+	(prefix mtargs args:))
 
 (include "megatest-version.scm")
 (include "megatest-fossil-hash.scm")
 (include "db_records.scm")
 

Index: tdb.scm
==================================================================
--- tdb.scm
+++ tdb.scm
@@ -20,24 +20,29 @@
 
 ;;======================================================================
 ;; Database access
 ;;======================================================================
 
-(require-extension (srfi 18) extras tcp)
-(use sqlite3 srfi-1 posix regex regex-case srfi-69 csv-xml s11n md5 message-digest base64)
-(import (prefix sqlite3 sqlite3:))
-(import (prefix base64 base64:))
-
 (declare (unit tdb))
+(declare (uses debugprint))
 (declare (uses common))
 (declare (uses keys))
 (declare (uses ods))
 (declare (uses client))
 (declare (uses mt))
 (declare (uses db))
 (declare (uses commonmod))
-(import commonmod)
+(declare (uses mtargs))
+
+(require-extension (srfi 18) extras tcp)
+(use sqlite3 srfi-1 posix regex regex-case srfi-69 csv-xml s11n md5 message-digest base64)
+(import (prefix sqlite3 sqlite3:))
+(import (prefix base64 base64:))
+
+(import commonmod
+	debugprint
+	(prefix mtargs args:))
 
 (include "common_records.scm")
 (include "db_records.scm")
 (include "key_records.scm")
 (include "run_records.scm")

Index: tests.scm
==================================================================
--- tests.scm
+++ tests.scm
@@ -24,22 +24,26 @@
 
 (declare (unit tests))
 (declare (uses lock-queue))
 (declare (uses db))
 (declare (uses tdb))
+(declare (uses debugprint))
 (declare (uses common))
 (declare (uses commonmod))
 ;; (declare (uses dcommon)) ;; needed for the steps processing
 (declare (uses items))
 (declare (uses runconfig))
 ;; (declare (uses sdb))
 (declare (uses server))
 ;;(declare (uses stml2))
+(declare (uses mtargs))
 
 (use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking tcp directory-utils)
 (import (prefix sqlite3 sqlite3:))
-(import commonmod)
+(import commonmod
+	(prefix mtargs args:)
+	debugprint)
 (require-library stml)
 
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")

Index: tree.scm
==================================================================
--- tree.scm
+++ tree.scm
@@ -18,10 +18,11 @@
 ;;
 ;;======================================================================
 
 (declare (unit tree))
 (declare (uses mtargs))
+(declare (uses debugprint))
 (declare (uses launch))
 ;; (declare (uses megatest-version))
 (declare (uses gutils))
 (declare (uses db))
 (declare (uses server))
@@ -34,11 +35,12 @@
 (use canvas-draw)
 
 (use sqlite3 srfi-1 posix regex regex-case srfi-69)
 (import (prefix sqlite3 sqlite3:))
 
-(import (prefix mtargs args:))
+(import (prefix mtargs args:)
+	debugprint)
 
 (include "megatest-version.scm")
 (include "common_records.scm")
 (include "db_records.scm")
 (include "key_records.scm")