From ba12c5c0420f28250ef4931b47af92c6d7963195 Mon Sep 17 00:00:00 2001 From: Paul Khuong Date: Wed, 6 Jul 2011 02:16:17 -0400 Subject: [PATCH] Small cleanups * Wrap some asserts with with-test in defstruct.impure.lisp * Remove two unused variables in remap_free_pages. * Fix the allocation region size estimate in sb-sprof. --- contrib/sb-sprof/sb-sprof.lisp | 2 +- src/runtime/gencgc.c | 3 +-- tests/defstruct.impure.lisp | 9 ++++++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/contrib/sb-sprof/sb-sprof.lisp b/contrib/sb-sprof/sb-sprof.lisp index 5a5b3e7..ab1edf2 100644 --- a/contrib/sb-sprof/sb-sprof.lisp +++ b/contrib/sb-sprof/sb-sprof.lisp @@ -361,7 +361,7 @@ profiling") #-gencgc (get-page-size) #+gencgc - sb-vm:gencgc-alloc-granularity) + (max sb-vm:gencgc-alloc-granularity sb-vm:gencgc-card-bytes)) (declaim (type number *alloc-region-size*)) (defvar *samples* nil) diff --git a/src/runtime/gencgc.c b/src/runtime/gencgc.c index c1fc6c8..1868797 100644 --- a/src/runtime/gencgc.c +++ b/src/runtime/gencgc.c @@ -4314,8 +4314,7 @@ remap_page_range (page_index_t from, page_index_t to) static void remap_free_pages (page_index_t from, page_index_t to, int forcibly) { - page_index_t first_page, last_page, - first_aligned_page, last_aligned_page; + page_index_t first_page, last_page; if (forcibly) return remap_page_range(from, to); diff --git a/tests/defstruct.impure.lisp b/tests/defstruct.impure.lisp index 6fc914d..1947bbd 100644 --- a/tests/defstruct.impure.lisp +++ b/tests/defstruct.impure.lisp @@ -461,11 +461,13 @@ *manyraw*))) (room) (sb-ext:gc)) -(check-manyraws *manyraw*) +(with-test (:name defstruct-raw-slot-gc) + (check-manyraws *manyraw*)) ;;; try a full GC, too (sb-ext:gc :full t) -(check-manyraws *manyraw*) +(with-test (:name (defstruct-raw-slot-gc :full)) + (check-manyraws *manyraw*)) ;;; fasl dumper and loader also have special handling of raw slots, so ;;; dump all of them into a fasl @@ -485,7 +487,8 @@ ;;; re-read the dumped structures and check them (load "tmp-defstruct.manyraw.fasl") -(check-manyraws (dumped-manyraws)) +(with-test (:name (defstruct-raw-slot load)) + (check-manyraws (dumped-manyraws))) ;;;; miscellaneous old bugs -- 1.7.10.4