From 2da80a5263e44a824675283340b2253db2348f5e Mon Sep 17 00:00:00 2001 From: Daniel Barlow Date: Mon, 29 Sep 2003 15:35:30 +0000 Subject: [PATCH] 0.8.3.95 Minimal fix to compile on Linux 2.6 and recent FreeBSD: disable running of pre-gc hooks move running of post-gc hooks later, so it is done after other threads start running aagin, outside the GC lock --- src/code/gc.lisp | 8 +++++--- version.lisp-expr | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/code/gc.lisp b/src/code/gc.lisp index 0e6018461..684e92662 100644 --- a/src/code/gc.lisp +++ b/src/code/gc.lisp @@ -244,16 +244,18 @@ and submit it as a patch." (let ((*already-in-gc* t)) (without-interrupts (gc-stop-the-world) + #+nil (dolist (h *before-gc-hooks*) (carefully-funcall h)) (collect-garbage gen) (incf *n-bytes-freed-or-purified* (max 0 (- pre-gc-dynamic-usage (dynamic-usage)))) (setf *need-to-collect-garbage* nil) - (dolist (h *after-gc-hooks*) - (carefully-funcall h)) + (gc-start-the-world))) - (scrub-control-stack))) + (scrub-control-stack)) + (dolist (h *after-gc-hooks*) + (carefully-funcall h))) (values)) diff --git a/version.lisp-expr b/version.lisp-expr index 260689b3c..694253749 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"0.8.3.94" +"0.8.3.95" -- 2.11.4.GIT