@@ -22,10 +22,17 @@
 (include "common_records.scm")
 
 ;; (require-library margs)
 ;; (include "margs.scm")
 
+;; (define old-exit exit)
+;; 
+;; (define (exit . code)
+;;   (if (null? code)
+;;       (old-exit)
+;;       (old-exit code)))
+
 (define getenv get-environment-variable)
 (define (safe-setenv key val)
   (if (and (string? val)(string? key))
       (handle-exceptions
        exn
@@ -275,40 +282,61 @@
 ;;======================================================================
 ;; E X I T   H A N D L I N G
 ;;======================================================================
 
 (define (std-exit-procedure area-dat)
-  (debug:print-info 2 "starting exit process, finalizing databases.")
-  (rmt:print-db-stats area-dat)
-  (let* ((configdat (megatest:area-configdat area-dat))
-	 (run-ids (hash-table-keys *db-local-sync*)))
-    (if (and (not (null? run-ids))
-	     (configf:lookup configdat "setup" "megatest-db"))
-	(db:multi-db-sync run-ids 'new2old)))
-  (if *dbstruct-db* (db:close-all *dbstruct-db* area-dat))
-  (if *inmemdb*     (db:close-all *inmemdb* area-dat))
-  (if (and *megatest-db*
-	   (sqlite3:database? *megatest-db*))
-      (begin
-	(sqlite3:interrupt! *megatest-db*)
-	(sqlite3:finalize! *megatest-db* #t)
-	(set! *megatest-db* #f)))
-  (if *task-db*     (let ((db (cdr *task-db*)))
-		      (if (sqlite3:database? db)
-			  (begin
-			    (sqlite3:interrupt! db)
-			    (sqlite3:finalize! db #t)
-			    (vector-set! *task-db* 0 #f))))))
+  (let* ((no-hurry  (if *time-to-exit* ;; hurry up
+		       #f
+		       (begin
+			 (set! *time-to-exit* #t)
+			 #t)))
+         (configdat (megatest:area-configdat area-dat))
+	 (run-ids   (hash-table-keys *db-local-sync*)))
+    (debug:print-info 4 "starting exit process, finalizing databases.")
+    (if (and no-hurry (debug:debug-mode 18))
+	(rmt:print-db-stats area-dat))
+    (let ((th1 (make-thread (lambda () ;; thread for cleaning up, give it five seconds
+			      (if (and (not (null? run-ids))
+				       (configf:lookup configdat "setup" "megatest-db"))
+				  (if no-hurry (db:multi-db-sync run-ids 'new2old)))
+			      (if *dbstruct-db* (db:close-all *dbstruct-db* area-dat))
+			      (if *inmemdb*     (db:close-all *inmemdb* area-dat))
+			      (if (and *megatest-db*
+				       (sqlite3:database? *megatest-db*))
+				  (begin
+				    (sqlite3:interrupt! *megatest-db*)
+				    (sqlite3:finalize! *megatest-db* #t)
+				    (set! *megatest-db* #f)))
+			      (if *task-db*    
+				  (let ((db (cdr *task-db*)))
+				    (if (sqlite3:database? db)
+					(begin
+					  (sqlite3:interrupt! db)
+					  (sqlite3:finalize! db #t)
+					  (vector-set! *task-db* 0 #f)))))) "Cleanup db exit thread"))
+	  (th2 (make-thread (lambda ()
+			      (debug:print 4 "Attempting clean exit. Please be patient and wait a few seconds...")
+			      (if no-hurry
+				  (thread-sleep! 5) ;; give the clean up few seconds to do it's stuff
+				  (thread-sleep! 1))
+			      (debug:print 0 "       Done.")
+			      )
+			    "clean exit")))
+      (thread-start! th2)
+      (thread-start! th1)
+      (thread-join! th2))))
 
 (define (std-signal-handler signum)
-  (signal-mask! signum)
+  ;; (signal-mask! signum)
+  (set! *time-to-exit* #t)
   (debug:print 0 "ERROR: Received signal " signum " exiting promptly")
   ;; (std-exit-procedure) ;; shouldn't need this since we are exiting and it will be called anyway
   (exit))
 
-(set-signal-handler! signal/int std-signal-handler)
+(set-signal-handler! signal/int  std-signal-handler)  ;; ^C
 (set-signal-handler! signal/term std-signal-handler)
+(set-signal-handler! signal/stop std-signal-handler)  ;; ^Z
 
 ;;======================================================================
 ;; Misc utils
 ;;======================================================================