use shift/reset

scheme/httpd/surflets/surflet-handler.scm

@@ -54,15 +54,15 @@
 (define (launch-new-instance full-path req)
   (let ((instance-id (generate-new-instance-id))
 	(plugin (get-plugin-rt-structure full-path)))
-    (call-with-current-continuation
-     (lambda (return)
+    (reset
+     (begin
        (save-instance! full-path instance-id)	; make entry in instance-table
-       (register-session! instance-id return)
+       (register-session! instance-id 'no-return)
        (with-names-from-rt-structure 
 	plugin plugin-interface 
 	;; MAIN may return in another thread, so we have to lookup 
 	;; return continuation explicitly
-	((session-return-continuation) (main req)))))))
+	(main req))))))
 
 ;; try to get continuation-table and then the continuation
 (define (resume-url full-path req)
@@ -82,28 +82,27 @@ You can try starting at the <A HREF=~a>beginning</a>."
 	  (let* ((continuation-table (instance-continuation-table instance-id))
 		 (resume (table-ref continuation-table continuation-id)))
 	    (if resume
-		(call-with-current-continuation
-		 (lambda (return)
-		   (register-session! instance-id return)
-		   (error "This may never return." ; for debugging
-			  (resume req))))))))))))
+		(reset
+		 (begin
+		   (register-session! instance-id 'no-return)
+;		   (error "This may never return." ; for debugging
+			  (resume req)))))))))))
   
 	
 (define (send/suspend response-maker)
-  (call-with-current-continuation
-   (lambda (return)
-     (let* ((instance-id (session-instance-id))
-	    (continuations-table (instance-continuation-table instance-id))
-	    (continuation-id (generate-new-continuation-id instance-id)))
-       (table-set! continuations-table continuation-id return)
-       (let ((new-url (make-resume-url (instance-servlet-name instance-id)
-				       instance-id 
-				       continuation-id)))
-	 ((session-return-continuation) (response-maker new-url)))))))
+  (shift return
+	 (let* ((instance-id (session-instance-id))
+		(continuations-table (instance-continuation-table instance-id))
+		(continuation-id (generate-new-continuation-id instance-id)))
+	   (table-set! continuations-table continuation-id return)
+	   (let ((new-url (make-resume-url (instance-servlet-name instance-id)
+					   instance-id 
+					   continuation-id)))
+	     (response-maker new-url)))))
 
 (define (send/finish response)
   (instance-delete (session-instance-id))
-  ((session-return-continuation) response))
+  response)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; access to instance-table