From: William Harold Newman <william.newman@airmail.net>
Date: Fri, 23 Jul 2004 21:26:59 +0000 (+0000)
Subject: 0.8.12.52:
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=1998ef5334d3209f0fb511788d2c06fe04832d43;p=sbcl.git

0.8.12.52:
	reduced (ROOM T) functionality down to just (ROOM),
		since (ROOM T) is flaky on my machine again and
		I don't know how to fix it
	logged the problem in BUGS
---

diff --git a/BUGS b/BUGS
index f891955..09fe1a7 100644
--- a/BUGS
+++ b/BUGS
@@ -1559,3 +1559,13 @@ WORKAROUND:
   SET-FUNCALLABLE-INSTANCE-FUN scary stuff in
   src/code/target-defstruct.lisp is broken?  This seems to be broken
   in CMUCL 18e, so it's not caused by a recent change.
+
+344: more (?) ROOM T problems (possibly part of bug 108)
+  In sbcl-0.8.12.51, and off and on leading up to it, the
+  SB!VM:MEMORY-USAGE operations in ROOM T caused 
+	unhandled condition (of type SB-INT:BUG):
+	    failed AVER: "(SAP= CURRENT END)"
+  Several clever people have taken a shot at this without fixing
+  it; this time around (before sbcl-0.8.13 release) I (WHN) just
+  commented out the SB!VM:MEMORY-USAGE calls until someone figures
+  out how to make them work reliably with the rest of the GC.
diff --git a/NEWS b/NEWS
index 481944c..7020223 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,11 @@ changes in sbcl-0.8.13 relative to sbcl-0.8.12:
     object file, link it into a shared library outside of SBCL and
     load it using SB-ALIEN:LOAD-SHARED-OBJECT.  (incidentally fixes
     bug #79)
+  * bug workaround: ROOM T and the GC were not working together
+    reliably, because invariants expected by the SB!VM:INSTANCE-USAGE
+    reporting facility aren't preserved. That reporting has been
+    disabled, so now until and unless someone figures out how to make it
+    work reliably with the current GC, (ROOM T) is equivalent to (ROOM).
   * minor incompatible change: as threatened around sbcl-0.8.0, the
     home package of MOP-related symbols is now SB-MOP, not SB-PCL.
     The symbols are also exported from SB-PCL for backwards
diff --git a/src/code/gc.lisp b/src/code/gc.lisp
index 7c548fd..db65ac7 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
diff --git a/version.lisp-expr b/version.lisp-expr
index 1b02616..be10a77 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.12.51"
+"0.8.12.52"