diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | am/guilec | 4 | ||||
| -rw-r--r-- | check-guile.in | 1 | ||||
| -rw-r--r-- | libguile/Makefile.am | 22 | ||||
| -rw-r--r-- | libguile/measure-hwm.scm | 136 | ||||
| -rw-r--r-- | test-suite/standalone/test-fast-slot-ref.in | 2 | ||||
| -rwxr-xr-x | test-suite/standalone/test-use-srfi.in | 6 |
7 files changed, 7 insertions, 165 deletions
diff --git a/.gitignore b/.gitignore index 884d819f1..3aa1f0471 100644 --- a/.gitignore +++ b/.gitignore @@ -72,7 +72,6 @@ guile-readline/guile-readline-config.h.in TAGS guile-1.8.pc gdb-pre-inst-guile -libguile/stack-limit-calibration.scm cscope.out cscope.files *.log @@ -10,6 +10,4 @@ CLEANFILES = $(GOBJECTS) SUFFIXES = .scm .go .scm.go: $(MKDIR_P) `dirname $@` - $(top_builddir)/meta/guile \ - -l $(top_builddir)/libguile/stack-limit-calibration.scm \ - $(top_srcdir)/scripts/compile -o "$@" "$<" + $(top_builddir)/meta/uninstalled-env guile-tools compile -o "$@" "$<" diff --git a/check-guile.in b/check-guile.in index 1c0101275..3162fa6fc 100644 --- a/check-guile.in +++ b/check-guile.in @@ -41,7 +41,6 @@ if [ ! -f guile-procedures.txt ] ; then fi exec $guile \ - -l ${top_builddir}/libguile/stack-limit-calibration.scm \ -e main -s "$TEST_SUITE_DIR/guile-test" \ --test-suite "$TEST_SUITE_DIR/tests" \ --log-file check-guile.log "$@" diff --git a/libguile/Makefile.am b/libguile/Makefile.am index 580114093..0f9a542ad 100644 --- a/libguile/Makefile.am +++ b/libguile/Makefile.am @@ -256,7 +256,7 @@ EXTRA_DIST = ChangeLog-scm ChangeLog-threads \ cpp_errno.c cpp_err_symbols.in cpp_err_symbols.c \ cpp_sig_symbols.c cpp_sig_symbols.in cpp_cnvt.awk \ c-tokenize.lex version.h.in \ - scmconfig.h.top libgettext.h measure-hwm.scm + scmconfig.h.top libgettext.h # $(DOT_DOC_FILES) $(EXTRA_DOT_DOC_FILES) \ # guile-procedures.txt guile.texi @@ -351,24 +351,6 @@ guile-procedures.txt: guile-procedures.texi endif -# Stack limit calibration to allow the compiler to run when creating -# the initial `.go' files and for `make check'. (For why we do this, see -# the comments in measure-hwm.scm.) -# -# The fact that "libguile" comes before "module" and "test-suite" -# in SUBDIRS in our toplevel Makefile.am ensures that the -# stack-limit-calibration.scm program will be run before we compile -# files or run tests. -# -# We don't care about the exit code of `measure-hwm.scm' because the -# important thing about stack-limit-calibration.scm is just that it is -# generated in the first place, so that it can be loaded in `am/guilec' -# and by the test suite. -BUILT_SOURCES += stack-limit-calibration.scm - -stack-limit-calibration.scm: measure-hwm.scm guile$(EXEEXT) - -$(preinstguile) -s $(srcdir)/measure-hwm.scm > $@ - c-tokenize.c: c-tokenize.lex flex -t $(srcdir)/c-tokenize.lex > $@ || { rm $@; false; } @@ -423,7 +405,7 @@ MOSTLYCLEANFILES = \ cpp_err_symbols_here cpp_err_symbols_diff cpp_err_symbols_new \ cpp_sig_symbols_here cpp_sig_symbols_diff cpp_sig_symbols_new \ version.h version.h.tmp \ - scmconfig.h scmconfig.h.tmp stack-limit-calibration.scm + scmconfig.h scmconfig.h.tmp CLEANFILES = libpath.h *.x *.doc guile-procedures.txt guile-procedures.texi guile.texi diff --git a/libguile/measure-hwm.scm b/libguile/measure-hwm.scm deleted file mode 100644 index 53a30d560..000000000 --- a/libguile/measure-hwm.scm +++ /dev/null @@ -1,136 +0,0 @@ -;;;; Copyright (C) 2008 Free Software Foundation, Inc. -;;;; -;;;; This library is free software; you can redistribute it and/or -;;;; modify it under the terms of the GNU Lesser General Public -;;;; License as published by the Free Software Foundation; either -;;;; version 2.1 of the License, or (at your option) any later version. -;;;; -;;;; This library is distributed in the hope that it will be useful, -;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -;;;; Lesser General Public License for more details. -;;;; -;;;; You should have received a copy of the GNU Lesser General Public -;;;; License along with this library; if not, write to the Free Software -;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -;;;; - -;;; Commentary: - -;;; This code is run during the Guile build, in order to set the stack -;;; limit to a value that will allow the `make check' tests to pass, -;;; taking into account the average stack usage on the build platform. -;;; For more detail, see the text below that gets written out to the -;;; stack limit calibration file. - -;;; Code: - -;; Store off Guile's default stack limit. -(define default-stack-limit (cadr (memq 'stack (debug-options)))) - -;; Now disable the stack limit, so that we don't get a stack overflow -;; while running this code! -(debug-set! stack 0) - -;; Define a variable to hold the measured stack high water mark (HWM). -(define top-repl-hwm-measured 0) - -;; Use an evaluator trap to measure the stack size at every -;; evaluation step, and increase top-repl-hwm-measured if it is less -;; than the measured stack size. -(trap-set! enter-frame-handler - (lambda _ - (let ((stack-size (%get-stack-size))) - (if (< top-repl-hwm-measured stack-size) - (set! top-repl-hwm-measured stack-size))))) -(trap-enable 'enter-frame) -(trap-enable 'traps) - -;; Call (turn-on-debugging) and (top-repl) in order to simulate as -;; closely as possible what happens - and in particular, how much -;; stack is used - when a standard Guile REPL is started up. -;; -;; `make check' stack overflow errors have been reported in the past -;; for: -;; -;; - test-suite/standalone/test-use-srfi, which runs `guile -q -;; --use-srfi=...' a few times, with standard input for the REPL -;; coming from a shell script -;; -;; - test-suite/tests/elisp.test, which does not involve the REPL, but -;; has a lot of `use-modules' calls. -;; -;; Stack high water mark (HWM) measurements show that the HWM is -;; higher in the test-use-srfi case - specifically because of the -;; complexity of (top-repl) - so that is what we simulate for our -;; calibration model here. -(turn-on-debugging) -(with-output-to-port (%make-void-port "w") - (lambda () - (with-input-from-string "\n" top-repl))) - -;; top-repl-hwm-measured now contains the stack HWM that resulted from -;; running that code. - -;; This is the value of top-repl-hwm-measured that we get on a -;; `canonical' build platform. (See text below for what that means.) -(define top-repl-hwm-i686-pc-linux-gnu 9461) - -;; Using the above results, output code that tests can run in order to -;; configure the stack limit correctly for the current build platform. -(format #t "\ -;; Stack limit calibration file. -;; -;; This file is automatically generated by Guile when it builds, in -;; order to set the stack limit to a value that reflects the stack -;; usage of the build platform (OS + compiler + compilation options), -;; specifically so that none of Guile's own tests (which are run by -;; `make check') fail because of a benign stack overflow condition. -;; -;; By a `benign' stack overflow condition, we mean one where the test -;; code is behaving correctly, but exceeds the configured stack limit -;; because the limit is set too low. A non-benign stack overflow -;; condition would be if a piece of test code behaved significantly -;; differently on some platform to how it does normally, and as a -;; result consumed a lot more stack. Although they seem pretty -;; unlikely, we would want to catch non-benign conditions like this, -;; and that is why we don't just do `(debug-set! stack 0)' when -;; running `make check'. -;; -;; Although the primary purpose of this file is to prevent `make -;; check' from failing without good reason, Guile developers and users -;; may also find the following information useful, when determining -;; what stack limit to configure for their own programs. - - (let (;; The stack high water mark measured when starting up the - ;; standard Guile REPL on the current build platform. - (top-repl-hwm-measured ~a) - - ;; The value of top-repl-hwm-measured that we get when building - ;; Guile on an i686 PC GNU/Linux system, after configuring with - ;; `./configure --enable-maintainer-mode --with-threads'. - ;; (Hereafter referred to as the `canonical' build platform.) - (top-repl-hwm-i686-pc-linux-gnu ~a) - - ;; Guile's default stack limit (i.e. the initial, C-coded value - ;; of the 'stack debug option). In the context of this file, - ;; the important thing about this number is that we know that - ;; it allows all of the `make check' tests to pass on the - ;; canonical build platform. - (default-stack-limit ~a) - - ;; Calibrated stack limit. This is the default stack limit, - ;; scaled by the factor between top-repl-hwm-i686-pc-linux-gnu - ;; and top-repl-hwm-measured. - (calibrated-stack-limit ~a)) - - ;; Configure the calibrated stack limit. - (debug-set! stack calibrated-stack-limit)) -" - top-repl-hwm-measured - top-repl-hwm-i686-pc-linux-gnu - default-stack-limit - ;; Use quotient here to get an integer result, rather than a - ;; rational. - (quotient (* default-stack-limit top-repl-hwm-measured) - top-repl-hwm-i686-pc-linux-gnu)) diff --git a/test-suite/standalone/test-fast-slot-ref.in b/test-suite/standalone/test-fast-slot-ref.in index 5bd063876..774cfe269 100644 --- a/test-suite/standalone/test-fast-slot-ref.in +++ b/test-suite/standalone/test-fast-slot-ref.in @@ -25,7 +25,7 @@ # executing the (%fast-slot-ref i 3) line. For reasons as yet # unknown, it does not cause a segmentation fault if the same code is # loaded as a script; that is why we run it here using "guile -q <<EOF". -exec guile -q -l @top_builddir_absolute@/libguile/stack-limit-calibration.scm >/dev/null 2>&1 <<EOF +exec guile -q >/dev/null 2>&1 <<EOF (use-modules (oop goops)) (define-module (oop goops)) (define-class <c> () (a #:init-value 1) (b #:init-value 2) (c #:init-value 3)) diff --git a/test-suite/standalone/test-use-srfi.in b/test-suite/standalone/test-use-srfi.in index 57f84afe4..7186b5a24 100755 --- a/test-suite/standalone/test-use-srfi.in +++ b/test-suite/standalone/test-use-srfi.in @@ -19,7 +19,7 @@ # Test that two srfi numbers on the command line work. # -guile -q -l @top_builddir_absolute@/libguile/stack-limit-calibration.scm --use-srfi=1,10 >/dev/null <<EOF +guile -q --use-srfi=1,10 >/dev/null <<EOF (if (and (defined? 'partition) (defined? 'define-reader-ctor)) (exit 0) ;; good @@ -38,7 +38,7 @@ fi # `top-repl' the core bindings got ahead of anything --use-srfi gave. # -guile -q -l @top_builddir_absolute@/libguile/stack-limit-calibration.scm --use-srfi=1 >/dev/null <<EOF +guile -q --use-srfi=1 >/dev/null <<EOF (catch #t (lambda () (iota 2 3 4)) @@ -56,7 +56,7 @@ fi # exercises duplicates handling in `top-repl' versus `use-srfis' (in # boot-9.scm). # -guile -q -l @top_builddir_absolute@/libguile/stack-limit-calibration.scm --use-srfi=17 >/dev/null <<EOF +guile -q --use-srfi=17 >/dev/null <<EOF (if (procedure-with-setter? car) (exit 0) ;; good (exit 1)) ;; bad |