X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fgc.lisp;h=dcab2ea63d435ead7bc8acda99c08d8568b24eba;hb=731d5dd65a7b94b5d49d1663d9b60c3a406ce38c;hp=e048d8d672bbeac5b52649aed30e583c6cc91b79;hpb=2675adcb29d689ee6d270f52658af17f2deeaf77;p=sbcl.git diff --git a/src/code/gc.lisp b/src/code/gc.lisp index e048d8d..dcab2ea 100644 --- a/src/code/gc.lisp +++ b/src/code/gc.lisp @@ -83,10 +83,14 @@ :print-summary nil)) (defun room-maximal-info () - (room-minimal-info) - (sb!vm:memory-usage :count-spaces '(:static :dynamic)) - (sb!vm:instance-usage :dynamic :top-n 10) - (sb!vm:instance-usage :static :top-n 10)) + ;; FIXME: SB!VM:INSTANCE-USAGE calls suppressed until bug 344 is fixed + (room-intermediate-info) + ;; old way, could be restored when bug 344 fixed: + ;;x (room-minimal-info) + ;;x (sb!vm:memory-usage :count-spaces '(:static :dynamic)) + ;;x (sb!vm:instance-usage :dynamic :top-n 10) + ;;x (sb!vm:instance-usage :static :top-n 10) + ) (defun room (&optional (verbosity :default)) #!+sb-doc @@ -116,15 +120,10 @@ ;;; allocated and never freed.) (declaim (type unsigned-byte *n-bytes-freed-or-purified*)) (defvar *n-bytes-freed-or-purified* 0) -(push (lambda () - (setf *n-bytes-freed-or-purified* 0)) - ;; KLUDGE: It's probably not quite safely right either to do - ;; this in *BEFORE-SAVE-INITIALIZATIONS* (since consing, or even - ;; worse, something which depended on (GET-BYTES-CONSED), might - ;; happen after that) or in *AFTER-SAVE-INITIALIZATIONS*. But - ;; it's probably not a big problem, and there seems to be no - ;; other obvious time to do it. -- WHN 2001-07-30 - *after-save-initializations*) +(defun gc-reinit () + (gc-on) + (gc) + (setf *n-bytes-freed-or-purified* 0)) (declaim (ftype (function () unsigned-byte) get-bytes-consed)) (defun get-bytes-consed () @@ -140,23 +139,9 @@ and submit it as a patch." ;;;; GC hooks -(defvar *before-gc-hooks* nil ; actually initialized in cold init - #!+sb-doc - "A list of functions that are called before garbage collection occurs. - The functions are run with interrupts disabled and all other threads - paused. They should take no arguments.") - -(defvar *after-gc-hooks* nil ; actually initialized in cold init - #!+sb-doc - "A list of functions that are called after garbage collection occurs. - The functions are run with interrupts disabled and all other threads - paused. They should take no arguments.") - -(defvar *gc-run-time* 0 - #!+sb-doc - "the total CPU time spent doing garbage collection (as reported by - GET-INTERNAL-RUN-TIME)") -(declaim (type index *gc-run-time*)) +(defvar *after-gc-hooks* nil + "Called after each garbage collection. In a multithreaded +environment these hooks may run in any thread.") ;;;; The following specials are used to control when garbage ;;;; collection occurs. @@ -186,9 +171,6 @@ and submit it as a patch." (declaim (type (or index null) *gc-trigger*)) (defvar *gc-trigger* nil) -;;; When >0, inhibits garbage collection. -(defvar *gc-inhibit*) ; initialized in cold init - ;;; When T, indicates that a GC should have happened but did not due to ;;; *GC-INHIBIT*. (defvar *need-to-collect-garbage* nil) ; initialized in cold init @@ -210,14 +192,6 @@ and submit it as a patch." ;;;; SUB-GC -;;; 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) - (error (cond) - (warn "(FUNCALL ~S~{ ~S~}) lost:~%~A" ',function ',args cond) - nil)))) - ;;; SUB-GC does a garbage collection. This is called from three places: ;;; (1) The C runtime will call here when it detects that we've consed ;;; enough to exceed the gc trigger threshold. This is done in @@ -233,28 +207,43 @@ and submit it as a patch." ;;; For GENCGC all generations < GEN will be GC'ed. -(defvar *already-in-gc* nil "System is running SUB-GC") -(defvar *gc-mutex* (sb!thread:make-mutex :name "GC Mutex")) +(defvar *already-in-gc* + (sb!thread:make-mutex :name "GC lock") "ID of thread running SUB-GC") -(defun sub-gc (&key (gen 0) &aux (pre-gc-dynamic-usage (dynamic-usage))) - ;; catch attempts to gc recursively or during post-hooks and ignore them - (when (sb!thread::mutex-value *gc-mutex*) (return-from sub-gc nil)) - (sb!thread:with-mutex (*gc-mutex* :wait-p nil) +(defun sub-gc (&key (gen 0)) + (unless (eql (sb!thread:current-thread-id) + (sb!thread::mutex-value *already-in-gc*)) (setf *need-to-collect-garbage* t) (when (zerop *gc-inhibit*) - (without-interrupts - (gc-stop-the-world) - (collect-garbage gen) - (incf *n-bytes-freed-or-purified* - (max 0 (- pre-gc-dynamic-usage (dynamic-usage)))) - (setf *need-to-collect-garbage* nil) - (gc-start-the-world)) - (scrub-control-stack) - (setf *need-to-collect-garbage* nil) - (dolist (h *after-gc-hooks*) (carefully-funcall h)))) - (values)) - - + (sb!thread:with-mutex (*already-in-gc*) + (let ((old-usage (dynamic-usage)) + (new-usage 0)) + (unsafe-clear-roots) + ;; We need to disable interrupts for GC, but we also want + ;; to run as little as possible without them. + (without-interrupts + (gc-stop-the-world) + (collect-garbage gen) + (setf *need-to-collect-garbage* nil + new-usage (dynamic-usage)) + (gc-start-the-world)) + ;; Interrupts re-enabled, but still inside the mutex. + ;; In a multithreaded environment the other threads will + ;; see *n-b-f-o-p* change a little late, but that's OK. + (let ((freed (- old-usage new-usage))) + ;; GENCGC occasionally reports negative here, but the + ;; current belief is that it is part of the normal order + ;; of things and not a bug. + (when (plusp freed) + (incf *n-bytes-freed-or-purified* freed))) + (sb!thread::reap-dead-threads))) + ;; Outside the mutex, these may cause another GC. + (run-pending-finalizers) + (dolist (hook *after-gc-hooks*) + (handler-case + (funcall hook) + (error (c) + (warn "Error calling after GC hook ~S:~% ~S" hook c))))))) ;;; This is the user-advertised garbage collection function. (defun gc (&key (gen 0) (full nil) &allow-other-keys) @@ -266,6 +255,15 @@ and submit it as a patch." generational garbage collectors, but is ignored in this implementation." (sub-gc :gen (if full 6 gen))) +(defun unsafe-clear-roots () + ;; KLUDGE: Do things in an attempt to get rid of extra roots. Unsafe + ;; as having these cons more then we have space left leads to huge + ;; badness. + (scrub-control-stack) + ;; FIXME: CTYPE-OF-CACHE-CLEAR isn't thread-safe. + #!-sb-thread + (ctype-of-cache-clear)) + ;;;; auxiliary functions @@ -282,6 +280,9 @@ and submit it as a patch." (sb!alien:unsigned 32)) val)) +;;; FIXME: Aren't these utterly wrong if called inside WITHOUT-GCING? +;;; Unless something that works there too can be deviced this fact +;;; should be documented. (defun gc-on () #!+sb-doc "Enable the garbage collector."