From: Chris Hanson <org/chris-hanson/cph>
Date: Wed, 15 Oct 2003 17:07:04 +0000 (+0000)
Subject: GC was blowing up with SIGSEGV when run under emacs, because recent
X-Git-Tag: 20090517-FFI~1770
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=26449597309c06f71873d35727c178376e5aa4c8;p=mit-scheme.git

GC was blowing up with SIGSEGV when run under emacs, because recent
changes to add threading support to output ports caused consing during
the GC.
---

diff --git a/v7/src/runtime/emacs.scm b/v7/src/runtime/emacs.scm
index 21d6611c0..a9a14ccbd 100644
--- a/v7/src/runtime/emacs.scm
+++ b/v7/src/runtime/emacs.scm
@@ -1,8 +1,9 @@
 #| -*-Scheme-*-
 
-$Id: emacs.scm,v 14.31 2003/02/14 18:28:32 cph Exp $
+$Id: emacs.scm,v 14.32 2003/10/15 17:06:55 cph Exp $
 
-Copyright (c) 1988-2001 Massachusetts Institute of Technology
+Copyright 1986,1987,1991,1993,1994,1999 Massachusetts Institute of Technology
+Copyright 2001,2003 Massachusetts Institute of Technology
 
 This file is part of MIT/GNU Scheme.
 
@@ -173,10 +174,10 @@ USA.
 
 (define (emacs/gc-start port)
   (output-port/flush-output port)
-  (channel-write-block (port/output-channel port) "\033b" 0 2))
+  (cwb (port/output-channel port) "\033b" 0 2))
 
 (define (emacs/gc-finish port)
-  (channel-write-block (port/output-channel port) "\033e" 0 2))
+  (cwb (port/output-channel port) "\033e" 0 2))
 
 (define (transmit-signal port type)
   (let ((channel (port/output-channel port))
@@ -184,7 +185,7 @@ USA.
     (output-port/flush-output port)
     (with-absolutely-no-interrupts
      (lambda ()
-       (channel-write-block channel buffer 0 2)))))
+       (cwb channel buffer 0 2)))))
 
 (define (transmit-signal-with-argument port type string)
   (let ((channel (port/output-channel port))
@@ -198,7 +199,17 @@ USA.
 	(output-port/flush-output port)
 	(with-absolutely-no-interrupts
 	 (lambda ()
-	   (channel-write-block channel buffer 0 buffer-length)))))))
+	   (cwb channel buffer 0 buffer-length)))))))
+
+(define (cwb channel string start end)
+  ;; This is a private copy of CHANNEL-WRITE-BLOCK that bypasses all
+  ;; the threading hair in that procedure.
+  (let loop ((start start) (n-left (fix:- end start)))
+    (let ((n
+	   ((ucode-primitive channel-write 4) (channel-descriptor channel)
+					      string start end)))
+      (cond ((not n) (loop start n-left))
+	    ((fix:< n n-left) (loop (fix:+ start n) (fix:- n-left n)))))))
 
 (define (emacs-typeout port message)
   (emacs-eval port "(message \"%s\" " (write-to-string message) ")"))
diff --git a/v7/src/runtime/runtime.pkg b/v7/src/runtime/runtime.pkg
index 3912f782c..e5bbcec9e 100644
--- a/v7/src/runtime/runtime.pkg
+++ b/v7/src/runtime/runtime.pkg
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: runtime.pkg,v 14.465 2003/10/11 04:00:24 cph Exp $
+$Id: runtime.pkg,v 14.466 2003/10/15 17:07:04 cph Exp $
 
 Copyright 1988,1989,1990,1991,1992,1993 Massachusetts Institute of Technology
 Copyright 1994,1995,1996,1997,1998,1999 Massachusetts Institute of Technology
@@ -2575,6 +2575,8 @@ USA.
 	  tty-input-channel
 	  tty-output-channel
 	  with-channel-blocking)
+  (export (runtime emacs-interface)
+	  channel-descriptor)
   (export (runtime load)
 	  channel-descriptor)
   (export (runtime socket)