From 942edb0d856ebfac47824e66cd638ea2f01c25f3 Mon Sep 17 00:00:00 2001
From: Jono Spiro <jono.spiro@gmail.com>
Date: Thu, 5 Aug 2004 02:32:02 +0000
Subject: [PATCH] svn: r140

---
 collects/mztake/debugger-model.ss |  6 +-----
 collects/mztake/mztake.ss         | 10 +++++++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/collects/mztake/debugger-model.ss b/collects/mztake/debugger-model.ss
index 02174145d2..ad3bd66832 100644
--- a/collects/mztake/debugger-model.ss
+++ b/collects/mztake/debugger-model.ss
@@ -15,15 +15,11 @@
               process)
       (export run)
       
-      
       (define run-semaphore (debug-process-run-semaphore process))
-      (define ev (make-eventspace))
-      
       
       (define ((break client) mark-set kind final-mark)
         (let ([mark-list (continuation-mark-set->list mark-set debug-key)])
-          (parameterize ([current-eventspace ev])
-            (queue-callback (lambda () (receive-result (make-normal-breakpoint-info (cons final-mark mark-list) client)))))
+          (receive-result (make-normal-breakpoint-info (cons final-mark mark-list) client))
           (semaphore-wait run-semaphore)))
       
       
diff --git a/collects/mztake/mztake.ss b/collects/mztake/mztake.ss
index 6c88ec3c66..5ddc4f0a2f 100644
--- a/collects/mztake/mztake.ss
+++ b/collects/mztake/mztake.ss
@@ -157,6 +157,11 @@ TESTING/CAPABILITIES------------------------------------------------------------
   ; Callback for when a breakpoint (tracepoint) is hit by the model
   ; ((client) breakpoint-struct) -> ()
   (define ((receive-result process) result)
+    
+    ; Before we process the trace, see if we are supposed to pause
+    (unless (running-now? process)
+      (semaphore-wait (debug-process-run-semaphore process)))
+    
     (match result
       ; regular breakpoint
       [($ normal-breakpoint-info (top-mark rest-mark ...) client)
@@ -170,11 +175,11 @@ TESTING/CAPABILITIES------------------------------------------------------------
          ; Run all traces at this breakpoint               
          (let ([to-send (map (lambda (t) (trace->frp-event client result t)) traces)])
            (frp:send-synchronous-events to-send))
-         ; do we want to pause interactive debugging
+         
+         ; Now that we processed the trace, do we want to pause or continue
          (when (running-now? process)
            (semaphore-post (debug-process-run-semaphore process))))]
       
-      ;TODO eventually remove this from debugger-model.ss
       [($ error-breakpoint-info (source exn))
        ; all errors and raises from the TARGET program will be caught here
        ; FrTime errors from the script have their own eventstream
@@ -462,7 +467,6 @@ TESTING/CAPABILITIES------------------------------------------------------------
   (define (runtime/milliseconds process)
     (debug-process-runtime process))
   
-  ;TODO dont forget to contract this
   (define (runtime/seconds process)
     (frp:hold ((frp:changes (debug-process-runtime process))
                . frp:==> .