X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fgc.lisp;h=8bf7ee397b9e267f74eebe73d76adc4af608511b;hb=ba38798a5ca26b90647a1993f348806cb32f2d1b;hp=30cd93da5bc91661d29d72e2d86500c6de781454;hpb=934b35cf683bacd5c15842a5012f852589ae2314;p=sbcl.git

diff --git a/src/code/gc.lisp b/src/code/gc.lisp
index 30cd93d..8bf7ee3 100644
--- a/src/code/gc.lisp
+++ b/src/code/gc.lisp
@@ -42,18 +42,20 @@
           (current-dynamic-space-start))))
 
 (defun static-space-usage ()
-  (- (* sb!vm:*static-space-free-pointer* sb!vm:word-bytes)
+  (- (* sb!vm:*static-space-free-pointer* sb!vm:n-word-bytes)
      sb!vm:static-space-start))
 
 (defun read-only-space-usage ()
-  (- (* sb!vm::*read-only-space-free-pointer* sb!vm:word-bytes)
+  (- (* sb!vm::*read-only-space-free-pointer* sb!vm:n-word-bytes)
      sb!vm:read-only-space-start))
 
 (defun control-stack-usage ()
-  #!-x86 (- (sb!sys:sap-int (sb!c::control-stack-pointer-sap))
-            sb!vm:control-stack-start)
-  #!+x86 (- sb!vm:control-stack-end
-	    (sb!sys:sap-int (sb!c::control-stack-pointer-sap))))
+  #!-stack-grows-downward-not-upward
+  (- (sb!sys:sap-int (sb!c::control-stack-pointer-sap))
+     sb!vm:control-stack-start)
+  #!+stack-grows-downward-not-upward
+  (- sb!vm:control-stack-end
+     (sb!sys:sap-int (sb!c::control-stack-pointer-sap))))
 
 (defun binding-stack-usage ()
   (- (sb!sys:sap-int (sb!c::binding-stack-pointer-sap))
@@ -140,7 +142,14 @@ and submit it as a patch."
 ;;;
 ;;; Unlike CMU CL, we don't export this variable. (There's no need to,
 ;;; since our BYTES-CONSED-BETWEEN-GCS function is SETFable.)
-(defvar *bytes-consed-between-gcs* (* 4 (expt 10 6)))
+(defvar *bytes-consed-between-gcs*
+  #!+gencgc (* 4 (expt 10 6))
+  ;; Stop-and-copy GC is really really slow when used too often. CSR
+  ;; reported that even on his old 64 Mb SPARC, 20 Mb is much faster
+  ;; than 4 Mb when rebuilding SBCL ca. 0.7.1. For modern machines
+  ;; with >> 128 Mb memory, the optimum could be significantly more
+  ;; than this, but at least 20 Mb should be better than 4 Mb.
+  #!-gencgc (* 20 (expt 10 6)))
 (declaim (type index *bytes-consed-between-gcs*))
 
 ;;;; GC hooks
@@ -203,10 +212,11 @@ and submit it as a patch."
 
 (defun default-gc-notify-before (notify-stream bytes-in-use)
   (declare (type stream notify-stream))
-  (format notify-stream
-	  "~&; GC is beginning with ~:D bytes in use at internal runtime ~:D.~%"
-	  bytes-in-use
-	  (get-internal-run-time))
+  (format
+   notify-stream
+   "~&; GC is beginning with ~:D bytes in use at internal runtime ~:D.~%"
+   bytes-in-use
+   (get-internal-run-time))
   (finish-output notify-stream))
 (defparameter *gc-notify-before* #'default-gc-notify-before
   #!+sb-doc
@@ -230,21 +240,21 @@ and submit it as a patch."
   (finish-output notify-stream))
 (defparameter *gc-notify-after* #'default-gc-notify-after
   #!+sb-doc
-  "The function bound to this variable is invoked after GC'ing with
-the value of *GC-NOTIFY-STREAM*, the amount of dynamic usage (in
-bytes) now free, the number of bytes freed by the GC, and the new GC
-trigger threshold. The function should notify the user that the system
-has finished GC'ing.")
+  "The function bound to this variable is invoked after GC'ing with the
+value of *GC-NOTIFY-STREAM*, the amount of dynamic usage (in bytes) now
+free, the number of bytes freed by the GC, and the new GC trigger
+threshold; or if *GC-NOTIFY-STREAM* is NIL, it's not invoked. The
+function should notify the user that the system has finished GC'ing.")
 
 ;;;; internal GC
 
-(sb!alien:def-alien-routine collect-garbage sb!c-call:int
-  #!+gencgc (last-gen sb!c-call:int))
+(sb!alien:define-alien-routine collect-garbage sb!alien:int
+  #!+gencgc (last-gen sb!alien:int))
 
-(sb!alien:def-alien-routine set-auto-gc-trigger sb!c-call:void
-  (dynamic-usage sb!c-call:unsigned-long))
+(sb!alien:define-alien-routine set-auto-gc-trigger sb!alien:void
+  (dynamic-usage sb!alien:unsigned-long))
 
-(sb!alien:def-alien-routine clear-auto-gc-trigger sb!c-call:void)
+(sb!alien:define-alien-routine clear-auto-gc-trigger sb!alien:void)
 
 ;;; This variable contains the function that does the real GC. This is
 ;;; for low-level GC experimentation. Do not touch it if you do not
@@ -253,7 +263,7 @@ has finished GC'ing.")
 
 ;;;; SUB-GC
 
-;;; Used to carefully invoke hooks.
+;;; This is used to carefully invoke hooks.
 (eval-when (:compile-toplevel :execute)
   (sb!xc:defmacro carefully-funcall (function &rest args)
     `(handler-case (funcall ,function ,@args)
@@ -284,7 +294,7 @@ has finished GC'ing.")
 				  *soft-heap-limit*)))
       (when soft-heap-limit-exceeded?
 	(cerror "Continue with GC."
-		"soft heap limit exceeded (temporary new limit=~D)"
+		"soft heap limit exceeded (temporary new limit=~W)"
 		*soft-heap-limit*))
       (when (and *gc-trigger* (> pre-gc-dynamic-usage *gc-trigger*))
 	(setf *need-to-collect-garbage* t))