@@ -15,43 +15,65 @@
 ;; 
 ;;     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 sqlite3 srfi-1 posix srfi-69 hostinfo dot-locking z3 regex)
-(import (prefix sqlite3 sqlite3:))
-
 (declare (unit portlogger))
-(declare (uses db))
+
+(module
+ portlogger
+ (portlogger:set-configdat!
+  portlogger:set-printers!
+  portlogger:set-default-log-port!
+  portlogger:open-db
+  portlogger:open-run-close
+  portlogger:take-port
+  portlogger:get-prev-used-port
+  portlogger:find-port
+  portlogger:set-port
+  portlogger:release-port
+  portlogger:set-failed
+  portlogger:is-port-in-use
+  portlogger:main
+)
+ 
+(import scheme posix chicken data-structures)
+
+(require-extension (srfi 18) extras tcp s11n)
+(import srfi-1 posix srfi-69 hostinfo dot-locking z3 regex)
+(import (prefix sqlite3 sqlite3:))
+(import (prefix mtconfigf configf:))
 
 ;; lsof -i
 
+(define *configdat* #f)
+(define (portlogger:set-configdat! cfgdat)
+  (set! *configdat* cfgdat))
+
+(define (debug:print . params)
+  (apply print params))
+(define debug:print-error debug:print)
+(define (portlogger:set-printers! pdebug pdebugerr)
+  (set! debug:print pdebug)
+  (set! debug:print-error pdebugerr))
+(define *default-log-port* (current-error-port))
+(define (portlogger:set-default-log-port! port)
+  (set! *default-log-port* port))
 
 (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))
+  (let* ((avail    #t) ;; for now - assume wait on journal not needed (tasks:wait-on-journal fname 5 remove: #t)) ;; wait up to about 10 seconds for the journal to go away
+	 (exists   (file-exists? fname))
 	 (db       (if avail 
 		       (sqlite3:open-database fname)
 		       (begin
 			 (system (conc "rm -f " fname))
 			 (sqlite3:open-database fname))))
-	 (handler  (make-busy-timeout 136000))
+	 (handler  (sqlite3:make-busy-timeout 136000))
 	 (canwrite (file-write-access? fname)))
-	 ;; (db-init  (lambda ()
-	 ;;             (sqlite3:execute 
-	 ;;              db
-	 ;;              "CREATE TABLE IF NOT EXISTS ports (
-         ;;                 port INTEGER PRIMARY KEY,
-         ;;                 state TEXT DEFAULT 'not-used',
-         ;;                 fail_count INTEGER DEFAULT 0,
-         ;;                 update_time TIMESTAMP DEFAULT (strftime('%s','now')) );"))))
     (sqlite3:set-busy-handler! db handler)
-    (db:set-sync db) ;; (sqlite3:execute db "PRAGMA synchronous = 0;")
-    ;; (if (not exists) ;; needed with IF NOT EXISTS?
-    (sqlite3:execute 
+    (sqlite3:execute db "PRAGMA synchronous = 0;")
+        (sqlite3:execute 
      db
      "CREATE TABLE IF NOT EXISTS ports (
             port INTEGER PRIMARY KEY,
             state TEXT DEFAULT 'not-used',
             fail_count INTEGER DEFAULT 0,
@@ -58,19 +80,19 @@
             update_time TIMESTAMP DEFAULT (strftime('%s','now')) );")
     db))
 
 (define (portlogger:open-run-close proc . params)
   (let* ((fname  (conc "/tmp/." (current-user-name) "-portlogger.db"))
-	 (avail  (tasks:wait-on-journal fname 10))) ;; wait up to about 10 seconds for the journal to go away
+	 (avail  #t)) ;; (tasks:wait-on-journal fname 10))) ;; wait up to about 10 seconds for the journal to go away
     (handle-exceptions
      exn
      (begin
        ;; (release-dot-lock fname)
        (debug:print-error 0 *default-log-port* "portlogger:open-run-close failed. " proc " " params)
        (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
        (debug:print 5 *default-log-port* "exn=" (condition->list exn))
-       (if (common:file-exists? fname)(delete-file fname)) ;; brutally get rid of it
+       (if (file-exists? fname)(delete-file fname)) ;; brutally get rid of it
        (print-call-chain (current-error-port)))
      (let* (;; (lock   (obtain-dot-lock fname 2 9 10))
 	    (db     (portlogger:open-db fname))
 	    (res    (apply proc db params)))
        (sqlite3:finalize! db)
@@ -207,5 +229,6 @@
 	     ((failed)(portlogger:set-failed db (string->number (cadr args))) 'failed)))))
     (sqlite3:finalize! db)
     result))
      
 ;; (print (apply portlogger:main (cdr (argv))))
+)