From f6fb4d990ff434408cd6808c244255b4a301eb23 Mon Sep 17 00:00:00 2001 From: Gabor Melis Date: Tue, 24 Feb 2009 10:32:11 +0000 Subject: [PATCH] 1.0.25.56: SUB-GC: don't observe deadlines - because the condition that's signalled can cause arbitrary code to run catching us with pants down - and we should not skip gc if it was triggerred --- src/code/gc.lisp | 4 +++- version.lisp-expr | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/code/gc.lisp b/src/code/gc.lisp index 32aa109..8a8fe46 100644 --- a/src/code/gc.lisp +++ b/src/code/gc.lisp @@ -215,7 +215,9 @@ run in any thread.") ;; Now, if GET-MUTEX did not cons, that would be enough. ;; Because it does, we need the :IN-PROGRESS bit above to ;; tell the runtime not to trigger gcs. - (let ((sb!impl::*in-without-gcing* t)) + (let ((sb!impl::*in-without-gcing* t) + (sb!impl::*deadline* nil) + (sb!impl::*deadline-seconds* nil)) (sb!thread:with-mutex (*already-in-gc*) (let ((*gc-inhibit* t)) (let ((old-usage (dynamic-usage)) diff --git a/version.lisp-expr b/version.lisp-expr index 7f1e7d1..bcfbb57 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".) -"1.0.25.55" +"1.0.25.56" -- 1.7.10.4