January 2025 - cmucl-cvs - mailman3.common-lisp.net

[Git][cmucl/cmucl] Pushed new branch issue-369-unix-setlocale-docstring
by Raymond Toy (＠rtoy) 09 Jan '25

09 Jan '25

Raymond Toy pushed new branch issue-369-unix-setlocale-docstring at cmucl / cmucl -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/tree/issue-369-unix-setlocale-… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-364-add-mkstemp-mkdtemp] Use NULL-ALIEN to check if result is NULL in unix-mkdtemp
by Raymond Toy (＠rtoy) 09 Jan '25

09 Jan '25

Raymond Toy pushed to branch issue-364-add-mkstemp-mkdtemp at cmucl / cmucl Commits: f230bce9 by Raymond Toy at 2025-01-08T19:35:42-08:00 Use NULL-ALIEN to check if result is NULL in unix-mkdtemp - - - - - 1 changed file: - src/code/unix.lisp Changes: ===================================== src/code/unix.lisp ===================================== @@ -2926,6 +2926,6 @@ (function (* char) c-call:c-string)) octets))) - (if (zerop (sap-int (alien-sap result))) + (if (null-alien result) (values nil (unix-errno)) (%file->name octets)))) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/f230bce9c3d1f315ac8c3c9… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/f230bce9c3d1f315ac8c3c9… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-363-add-version-number] Set TESTDIRARG earlier
by Raymond Toy (＠rtoy) 09 Jan '25

09 Jan '25

Raymond Toy pushed to branch issue-363-add-version-number at cmucl / cmucl Commits: c16456c6 by Raymond Toy at 2025-01-08T19:31:41-08:00 Set TESTDIRARG earlier We need to set up `TESTDIR` and `TESTDIRARG` earlier because we need `TESTDIR` to be defined to build the necessary files and to load the scripts from the right place. - - - - - 1 changed file: - bin/run-unit-tests.sh Changes: ===================================== bin/run-unit-tests.sh ===================================== @@ -49,6 +49,13 @@ function cleanup { trap cleanup EXIT +set -x +if [ -n "${TESTDIR}" ]; then + TESTDIRARG=" :test-directory \"${TESTDIR}/\"" +else + TESTDIR="tests/" + TESTDIRARG="" +fi # Compile up the C file that is used for testing alien funcalls to # functions that return integer types of different lengths. We use # gcc since clang isn't always available. @@ -56,12 +63,6 @@ trap cleanup EXIT if [ $# -eq 0 ]; then # Test directory arg for run-all-tests if a non-default - if [ -n ${TESTDIR} ]; then - TESTDIRARG=" :test-directory \"${TESTDIR}/\"" - else - TESTDIR="tests/" - TESTDIRARG="" - fi # No args so run all the tests $LISP -nositeinit -noinit -load $TESTDIR/run-tests.lisp -eval "(cmucl-test-runner:run-all-tests ${TESTDIRARG})" else View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/c16456c663e3fe6ac028312… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/c16456c663e3fe6ac028312… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-363-add-version-number] Install unit tests and run-unit-tests.sh
by Raymond Toy (＠rtoy) 08 Jan '25

08 Jan '25

Raymond Toy pushed to branch issue-363-add-version-number at cmucl / cmucl Commits: f9383d9c by Raymond Toy at 2025-01-08T15:15:56-08:00 Install unit tests and run-unit-tests.sh Install all of the unit-test files to share/cmucl/version/tests. Install run-unit-tests.sh to bin/run-unit-tests.sh To make this work, modify run-unit-tests to add a `-d` commandline arg that specifies the directory where the test files are located. If no `-d` flag is given, it defaults to how run-unit-tests.sh used to work, which expected the tests to in "./tests/". - - - - - 2 changed files: - bin/make-src-dist.sh - bin/run-unit-tests.sh Changes: ===================================== bin/make-src-dist.sh ===================================== @@ -58,6 +58,7 @@ echo Creating source distribution set -x GTAR_OPTIONS="--exclude=.git --exclude='*.pot.~*~'" install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/share/cmucl/$VERSION/ +install ${GROUP} ${OWNER} -m 0755 bin/run-unit-tests.sh $DESTDIR/bin ${GTAR} ${GTAR_OPTIONS} -cf - src tests | (cd $DESTDIR/share/cmucl/$VERSION; ${GTAR} xf -) if [ -z "$INSTALL_DIR" ]; then # echo " Compressing with $ZIP" ===================================== bin/run-unit-tests.sh ===================================== @@ -6,7 +6,8 @@ # then just those tests are run. usage() { - echo "run-tests.sh [?] [-l lisp] [tests]" + echo "run-tests.sh [?] [-d test-dir] [-l lisp] [tests]" + echo " -d test-dir Directory containing the unit test files" echo " -l lisp Lisp to use for the tests; defaults to lisp" echo " -? This help message" echo "" @@ -23,10 +24,11 @@ usage() { } LISP=lisp -while getopts "h?l:" arg +while getopts "h?l:d:" arg do case $arg in l) LISP=$OPTARG ;; + d) TESTDIR=$OPTARG ;; \?) usage ;; esac done @@ -50,11 +52,18 @@ trap cleanup EXIT # Compile up the C file that is used for testing alien funcalls to # functions that return integer types of different lengths. We use # gcc since clang isn't always available. -(cd tests; gcc -m32 -O3 -c test-return.c) +(cd $TESTDIR; gcc -m32 -O3 -c test-return.c) if [ $# -eq 0 ]; then + # Test directory arg for run-all-tests if a non-default + if [ -n ${TESTDIR} ]; then + TESTDIRARG=" :test-directory \"${TESTDIR}/\"" + else + TESTDIR="tests/" + TESTDIRARG="" + fi # No args so run all the tests - $LISP -nositeinit -noinit -load tests/run-tests.lisp -eval '(cmucl-test-runner:run-all-tests)' + $LISP -nositeinit -noinit -load $TESTDIR/run-tests.lisp -eval "(cmucl-test-runner:run-all-tests ${TESTDIRARG})" else # Run selected files. Convert each file name to uppercase and append "-TESTS" result="" @@ -63,6 +72,6 @@ else new=`echo $f | tr '[a-z]' '[A-Z]'` result="$result "\"$new-TESTS\" done - $LISP -nositeinit -noinit -load tests/run-tests.lisp -eval "(progn (cmucl-test-runner:load-test-files) (cmucl-test-runner:run-test $result))" + $LISP -nositeinit -noinit -load $TESTDIR/run-tests.lisp -eval "(progn (cmucl-test-runner:load-test-files) (cmucl-test-runner:run-test $result))" fi View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/f9383d9c016cc88b51fd605… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/f9383d9c016cc88b51fd605… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-364-add-mkstemp-mkdtemp] Remove old version of unix-mkstemp
by Raymond Toy (＠rtoy) 08 Jan '25

08 Jan '25

Raymond Toy pushed to branch issue-364-add-mkstemp-mkdtemp at cmucl / cmucl Commits: 9a9609a4 by Raymond Toy at 2025-01-08T09:34:19-08:00 Remove old version of unix-mkstemp Forgot to remove the previous version. - - - - - 1 changed file: - src/code/unix.lisp Changes: ===================================== src/code/unix.lisp ===================================== @@ -2901,32 +2901,6 @@ (function (* char)))) c-string)) -(defun unix-mkstemp (template) - _N"Generates a unique temporary file name from TEMPLATE, and creates - and opens the file. On success, the corresponding file descriptor - and name of the file is returned. - - The last six characters of the template must be \"XXXXXX\"." - ;; Hope this buffer is large enough! - (let ((octets (%name->file template))) - (unless (< (length octets) 8192) - (error "Internal buffer is too small for encoded file name of ~D octets" - (length octets))) - (with-alien ((buf (array c-call:unsigned-char 8192))) - ;; Convert the Lisp string and copy it to the alien buffer, being - ;; sure to zero-terminate the buffer. - (loop for k from 0 - for c across octets - do - (setf (deref buf k) (char-code c)) - finally (setf (deref buf k) 0)) - - (syscall ("mkstemp" (* c-call:unsigned-char)) - (values result - ;; Convert the file name back to a Lisp string. - (%file->name (cast buf c-call:c-string))) - (cast buf (* c-call:unsigned-char)))))) - (defun unix-mkstemp (template) _N"Generates a unique temporary file name from TEMPLATE, and creates and opens the file. On success, the corresponding file descriptor View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/9a9609a42827ada69c2e083… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/9a9609a42827ada69c2e083… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-365-add-strerror] get-unix-error-msg calls unix-strerror
by Raymond Toy (＠rtoy) 08 Jan '25

08 Jan '25

Raymond Toy pushed to branch issue-365-add-strerror at cmucl / cmucl Commits: c8e3b367 by Raymond Toy at 2025-01-08T09:21:59-08:00 get-unix-error-msg calls unix-strerror - - - - - 1 changed file: - src/code/unix.lisp Changes: ===================================== src/code/unix.lisp ===================================== @@ -2053,9 +2053,7 @@ _N"Returns a string describing the error number which was returned by a UNIX system call." (declare (type integer error-number)) - (if (array-in-bounds-p *unix-errors* error-number) - (svref *unix-errors* error-number) - (format nil _"Unknown error [~d]" error-number))) + (unix::unix-strerror error-number)) ;;;; Lisp types used by syscalls. View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/c8e3b367dc215677f8e4453… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/c8e3b367dc215677f8e4453… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl] Pushed new branch issue-365-add-strerror
by Raymond Toy (＠rtoy) 08 Jan '25

08 Jan '25

Raymond Toy pushed new branch issue-365-add-strerror at cmucl / cmucl -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/tree/issue-365-add-strerror You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-364-add-mkstemp-mkdtemp] 2 commits: Yet another version of unix-mkstemp
by Raymond Toy (＠rtoy) 08 Jan '25

08 Jan '25

Raymond Toy pushed to branch issue-364-add-mkstemp-mkdtemp at cmucl / cmucl Commits: 36f7ed64 by Raymond Toy at 2025-01-08T08:17:56-08:00 Yet another version of unix-mkstemp This is more in line with what we do for unix-mkdtemp. - - - - - 7bca4800 by Raymond Toy at 2025-01-08T08:21:43-08:00 Revert changes to exports.lisp and extensions.lisp We're not going to define macros for temporary files and directories in this MR. That's for another later MR. - - - - - 3 changed files: - src/code/exports.lisp - src/code/extensions.lisp - src/code/unix.lisp Changes: ===================================== src/code/exports.lisp ===================================== @@ -1717,11 +1717,7 @@ "DESCRIBE-EXTERNAL-FORMAT" "LIST-ALL-EXTERNAL-FORMATS" "STRING-ENCODE" "STRING-DECODE" - "SET-SYSTEM-EXTERNAL-FORMAT") - ;; Temporary files/directories - (:export - "WITH-TEMPORARY-FILE" - "WITH-TEMPORARY-DIRECTORY")) + "SET-SYSTEM-EXTERNAL-FORMAT")) (defpackage "STREAM" (:import-from "SYSTEM" "LISP-STREAM") ===================================== src/code/extensions.lisp ===================================== @@ -22,8 +22,7 @@ read-char-no-edit listen-skip-whitespace concat-pnames iterate once-only collect do-anonymous undefined-value required-argument define-hash-cache defun-cached - cache-hash-eq do-hash - with-temporary-file)) + cache-hash-eq do-hash)) (import 'lisp::whitespace-char-p) @@ -613,73 +612,3 @@ "Return an EQ hash of X. The value of this hash for any given object can (of course) change at arbitary times." `(lisp::pointer-hash ,x)) - -;;; WITH-TEMPORARY-FILE -- Public -(defmacro with-temporary-file ((var template-prefix - &key - (element-type 'base-char) - (external-format :default) - (buffering :full) - decoding-error - encoding-error) - &parse-body (forms decls)) - _N"A temporary file is opened using the Open-args and bound to the - variable Var. The name of the temporary file uses Template-prefix - for the name. If the temporary file cannot be opened, the forms are - not evaluated. The Forms are executed, and when they terminate, - normally or otherwise, the file is closed. - - Defined keywords: - :element-type - Type of object to read or write. Default BASE-CHAR - :external-format - An external format name - :buffering - Buffering to use for the file. Must be one of - :NONE, :LINE, :FULL - :decoding-error - How to handle decoding errors. See OPEN - :encoding-error - How to handle encoding errors. See OPEN" - (let ((abortp (gensym)) - (template (gensym "TEMPLATE-")) - (fd (gensym "FD-"))) - - `(let* ((,template (concatenate 'string - ,template-prefix - "XXXXXX")) - (,fd (unix::unix-mkstemp ,template))) - (unless ,fd - (error "Could not create temporary file using template ~A" - ,template)) - (let ((,var (lisp::make-fd-stream (unix::unix-mkstemp ,template) - :auto-close t - :file ,template - :output t - :input t - :element-type ',element-type - :external-format ,external-format - :decoding-error ,decoding-error - :encoding-error ,encoding-error - :buffering ,buffering)) - (,abortp t)) - ,@decls - (unwind-protect - (multiple-value-prog1 - (progn ,@forms) - (setq ,abortp nil)) - (when ,var - (close ,var :abort ,abortp))))))) - -;; WITH-TEMPORARY-DIRECTORY -- Public -(defmacro with-temporary-directory ((var template-prefix) - &parse-body (forms decls)) - _N"Create a temporary directory using Template-prefix as the name of the directory." - (let ((template (gensym "TEMPLATE-"))) - `(let ((,template (concatenate 'string ,template-prefix - "XXXXXX"))) - ,@decls - (let ((,var (unix::unix-mkdtemp ,template))) - (unless ,var - (error "Could not create temporary directory using template ~A" - ,template)) - (unwind-protect - (multiple-value-prog1 - (progn ,@forms))) - ;; Remove the directory - (unix:unix-rmdir ,var))))) ===================================== src/code/unix.lisp ===================================== @@ -2927,6 +2927,20 @@ (%file->name (cast buf c-call:c-string))) (cast buf (* c-call:unsigned-char)))))) +(defun unix-mkstemp (template) + _N"Generates a unique temporary file name from TEMPLATE, and creates + and opens the file. On success, the corresponding file descriptor + and name of the file is returned. + + The last six characters of the template must be \"XXXXXX\"." + ;; Hope this buffer is large enough! + (let ((octets (%name->file template))) + (syscall ("mkstemp" c-call:c-string) + (values result + ;; Convert the file name back to a Lisp string. + (%file->name octets)) + octets))) + (defun unix-mkdtemp (template) _N"Generate a uniquely named temporary directory from Template, which must have \"XXXXXX\" as the last six characters. The View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/3d4af597c0f72164419964… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/3d4af597c0f72164419964… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-363-add-version-number] Use cmucl-version.sh to get the version
by Raymond Toy (＠rtoy) 06 Jan '25

06 Jan '25

Raymond Toy pushed to branch issue-363-add-version-number at cmucl / cmucl Commits: 659b14d6 by Raymond Toy at 2025-01-05T19:27:30-08:00 Use cmucl-version.sh to get the version Previously, we just implemented the code to extract the version in each file as needed. This, of course, is bad. Use the script `cmucl-version.sh` to get the version so that all the various places agree on the version. - - - - - 3 changed files: - bin/build.sh - bin/make-dist.sh - src/lisp/GNUmakefile Changes: ===================================== bin/build.sh ===================================== @@ -49,17 +49,7 @@ GIT_FILE_COMMENT="yes" export GIT_FILE_COMMENT SKIPUTILS=no -GIT_HASH="`(cd src; git describe --dirty 2>/dev/null || git describe 2>/dev/null)`" -echo GIT_HASH = ${GIT_HASH} - -if expr "X${GIT_HASH}" : 'Xsnapshot-[0-9][0-9][0-9][0-9]-[01][0-9]' > /dev/null; then - DEFAULT_VERSION=`expr "${GIT_HASH}" : "snapshot-$.*$"` -fi - -if expr "X${GIT_HASH}" : 'X[0-9][0-9][a-f]' > /dev/null; then - DEFAULT_VERSION="${GIT_HASH}" -fi - +DEFAULT_VERSION="`bin/cmucl-version.sh`" export DEFAULT_VERISON # If gmake exists, assume it is GNU make and use it. ===================================== bin/make-dist.sh ===================================== @@ -97,17 +97,7 @@ def_arch_os # Choose a version based on the git hash as the default version. We # only compute a default if the git hash looks like a snapshot # ("snapshot-yyyy-mm") or a release number.. -GIT_HASH="`(cd src; git describe --dirty 2>/dev/null)`" - -echo GIT_HASH = ${GIT_HASH} - -if expr "X${GIT_HASH}" : 'Xsnapshot-[0-9][0-9][0-9][0-9]-[01][0-9]' > /dev/null; then - DEFAULT_VERSION=`expr "${GIT_HASH}" : "snapshot-$.*$"` -fi - -if expr "X${GIT_HASH}" : 'X[0-9][0-9][a-f]' > /dev/null; then - DEFAULT_VERSION="${GIT_HASH}" -fi +DEFAULT_VERSION="`bin/cmucl-version.sh`" # Default compression is -J (xz). These variables are passed to the # other scripts via the environmen, so export them. ===================================== src/lisp/GNUmakefile ===================================== @@ -41,8 +41,7 @@ OBJS = $(patsubst %.c,%.o,$(patsubst %.S,%.o,$(patsubst %.s,%.o,$(SRCS)))) ### Don't look in RCS for the files, because we might not want the latest. %: RCS/%,v -GIT_HASH = $(shell git describe --dirty) -DEFAULT_VERSION = $(subst snapshot-,,${GIT_HASH}) +DEFAULT_VERSION = $(shell ../../bin/cmucl-version.sh) lisp.nm: lisp lisp.a echo 'Map file for lisp version ' `cat version` > ,lisp.nm View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/659b14d6e400659672e81ca… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/659b14d6e400659672e81ca… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-363-add-version-number] Add script to determine the appropriate version for cmucl.
by Raymond Toy (＠rtoy) 05 Jan '25

05 Jan '25

Raymond Toy pushed to branch issue-363-add-version-number at cmucl / cmucl Commits: b76f49af by Raymond Toy at 2025-01-05T13:37:37-08:00 Add script to determine the appropriate version for cmucl. This is based on the value from `git describe --dirty`. If it looks like "snapshot-*", we use everything after "snapshot-". Typically it looks something like "snapshot-2024-08" if a snapshot has been made. Otherwise, current HEAD looks something "2024-08-46-g5b45c46fe-dirty". If a release has been made, it should be something like "21e". Otherwise, we get the actual value from git describe. - - - - - 1 changed file: - + bin/cmucl-version.sh Changes: ===================================== bin/cmucl-version.sh ===================================== @@ -0,0 +1,18 @@ +#!/bin/sh + +# Script to determine the cmucl version based on git describe +GIT_HASH="`(cd src; git describe --dirty 2>/dev/null || git describe 2>/dev/null)`" +# echo GIT_HASH = ${GIT_HASH} + +if expr "X${GIT_HASH}" : 'Xsnapshot-[0-9][0-9][0-9][0-9]-[01][0-9]' > /dev/null; then + # The git hash looks like snapshot-yyyy-mm-<stuff>. Remove the + # "snapshot-" part. + DEFAULT_VERSION=`expr "${GIT_HASH}" : "snapshot-$.*$"` +fi + +if expr "X${GIT_HASH}" : 'X[0-9][0-9][a-f]' > /dev/null; then + # The git hash looks like a release which is 3 hex digits. Use it as is. + DEFAULT_VERSION="${GIT_HASH}" +fi + +echo $DEFAULT_VERSION View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/b76f49afd8c8e57cfae3b35… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/b76f49afd8c8e57cfae3b35… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0