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

[Git][cmucl/cmucl][issue-386-generate-def-unix-error] Want the second definition for duplicates
by Raymond Toy (＠rtoy) 01 Mar '25

01 Mar '25

Raymond Toy pushed to branch issue-386-generate-def-unix-error at cmucl / cmucl Commits: 30f4504e by Raymond Toy at 2025-03-01T08:01:43-08:00 Want the second definition for duplicates Modify script so that if we find a duplicate, we mark the old as something to be skipped on output. We want the second (last) definition. This is needed on Darwin where we want the second definition of EOPNOTSUPP. Tested this with a simple C program on Darwin to print the value of EOPNOTSUPP. It is 102, not ENOTSUP (45). - - - - - 1 changed file: - bin/create-def-unix-error.awk Changes: ===================================== bin/create-def-unix-error.awk ===================================== @@ -4,27 +4,26 @@ BEGIN { # Find anything that matches '#define Efoo value' /^#define[ \t]+(E[A-Z0-9]+)[ \t]+([A-Z0-9]+).*$/ { - # If we haven't found $2 in errno before, add it to the table. - # This is to catch any duplicates. We assume the latter value is - # NOT what we want. This happens on Darwin where EOPNOSUPP is - # defined twice due to #if's. found = 0 + # Search to see if the current key, $2, is already in the table. + # If so, we mark it as something to skip. This happens on Darwin + # where EOPNTOSUPP is seen twice. We want the second entry. for (key in errno) { if (errno[key] == $2) { - printf ";; Ignoring dup of %s: old value %d, new value %\n", $2, errno[key], $3; + printf ";; Ignoring dup of %s: old value %s, new value %s\n", $2, value[key], $3; found = 1; + skip[key] = 1; break; } } - if (!found) { - errno[count] = $2; - value[count] = $3; - ++count; - } + errno[count] = $2; + value[count] = $3; + ++count; } END { for (k = 0; k < count; ++k) { - printf "(def-unix-error %s %s)\n", errno[k], value[k]; + printf "%s(def-unix-error %s %s)\n", + (skip[k] != 1) ? "": ";; ", errno[k], value[k]; } } View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/30f4504e9f7b3bc1e45c375… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/30f4504e9f7b3bc1e45c375… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-386-generate-def-unix-error] Save errno.lisp in artifacts
by Raymond Toy (＠rtoy) 01 Mar '25

01 Mar '25

Raymond Toy pushed to branch issue-386-generate-def-unix-error at cmucl / cmucl Commits: 8148f5a7 by Raymond Toy at 2025-03-01T07:08:10-08:00 Save errno.lisp in artifacts Want to keep src/code/errno.lisp so we can look at it when browsing the artifacts. Currently only for osx. - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -184,6 +184,7 @@ osx:build: - darwin-2/*.log - darwin-3/*.log - darwin-4/*.log + - src/code/errno.lisp needs: - job: osx:install artifacts: true View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/8148f5a7667e8aa404007be… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/8148f5a7667e8aa404007be… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-386-generate-def-unix-error] Have to search the array ourselves for duplicates
by Raymond Toy (＠rtoy) 01 Mar '25

01 Mar '25

Raymond Toy pushed to branch issue-386-generate-def-unix-error at cmucl / cmucl Commits: e82619f1 by Raymond Toy at 2025-03-01T06:52:07-08:00 Have to search the array ourselves for duplicates We have write our own loop to find a duplicate errno value. If we do, print a comment to the output saying so, at least for now. - - - - - 1 changed file: - bin/create-def-unix-error.awk Changes: ===================================== bin/create-def-unix-error.awk ===================================== @@ -8,7 +8,15 @@ BEGIN { # This is to catch any duplicates. We assume the latter value is # NOT what we want. This happens on Darwin where EOPNOSUPP is # defined twice due to #if's. - if (!($2 in errno)) { + found = 0 + for (key in errno) { + if (errno[key] == $2) { + printf ";; Ignoring dup of %s: old value %d, new value %\n", $2, errno[key], $3; + found = 1; + break; + } + } + if (!found) { errno[count] = $2; value[count] = $3; ++count; View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/e82619f1f9ceab750574bc2… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/e82619f1f9ceab750574bc2… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-386-generate-def-unix-error] Ignore duplicate errno values
by Raymond Toy (＠rtoy) 01 Mar '25

01 Mar '25

Raymond Toy pushed to branch issue-386-generate-def-unix-error at cmucl / cmucl Commits: 17859fdd by Raymond Toy at 2025-03-01T05:38:46-08:00 Ignore duplicate errno values Put the awk script in the new file create-def-unix-error.awk. This script pretty much does what the previous version did, but it checks to see if we have a duplicate errno value in the file and just ignores it, assuming the first occurrence is what we want. Update create-errno.sh to call this script. Duplicates appear to happen on Darwin, where EOPNOTSUPP occurs twice due to #if's selecting one or the other. We assume here that the latter is not what we want. This is a gross hack. - - - - - 2 changed files: - + bin/create-def-unix-error.awk - bin/create-errno.sh Changes: ===================================== bin/create-def-unix-error.awk ===================================== @@ -0,0 +1,22 @@ +BEGIN { + count = 0 +} + +# Find anything that matches '#define Efoo value' +/^#define[ \t]+(E[A-Z0-9]+)[ \t]+([A-Z0-9]+).*$/ { + # If we haven't found $2 in errno before, add it to the table. + # This is to catch any duplicates. We assume the latter value is + # NOT what we want. This happens on Darwin where EOPNOSUPP is + # defined twice due to #if's. + if (!($2 in errno)) { + errno[count] = $2; + value[count] = $3; + ++count; + } +} + +END { + for (k = 0; k < count; ++k) { + printf "(def-unix-error %s %s)\n", errno[k], value[k]; + } +} ===================================== bin/create-errno.sh ===================================== @@ -23,9 +23,7 @@ case `uname -s` in ;; esac -awk '/^#define[ \t]+(E[A-Z0-9]+)[ \t]+([A-Z0-9]+).*$/ { - printf "(def-unix-error %s %s)\n", $2, $3; -}' "$@" ${ERRNO_FILES} >> $OUTPUT +awk -f bin/create-def-unix-error.awk ${ERRNO_FILES} >> $OUTPUT # The tail was also copied from code/unix.lisp. It's needed to tell # Lisp about the errno values. View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/17859fddd84b302482b8614… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/17859fddd84b302482b8614… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-386-generate-def-unix-error] Add support for auto-generating on Macosx
by Raymond Toy (＠rtoy) 01 Mar '25

01 Mar '25

Raymond Toy pushed to branch issue-386-generate-def-unix-error at cmucl / cmucl Commits: 3566cce0 by Raymond Toy at 2025-02-28T19:57:44-08:00 Add support for auto-generating on Macosx On mac, get the errno values from /usr/include/sys/errno.h. Update the template so we exclude more stuff when `:darwin` is defined for macosx. - - - - - 2 changed files: - bin/create-errno.sh - bin/errno-template.lisp Changes: ===================================== bin/create-errno.sh ===================================== @@ -19,6 +19,8 @@ cat bin/errno-template.lisp > $OUTPUT case `uname -s` in Linux) ERRNO_FILES=/usr/include/asm-generic/errno*.h ;; + Darwin) ERRNO_FILES=/usr/include/sys/errno.h + ;; esac awk '/^#define[ \t]+(E[A-Z0-9]+)[ \t]+([A-Z0-9]+).*$/ { ===================================== bin/errno-template.lisp ===================================== @@ -44,7 +44,7 @@ ;;; (def-unix-error ESUCCESS 0 _N"Successful") -#-linux +#-(or linux darwin) (progn (def-unix-error EPERM 1 _N"Operation not permitted") (def-unix-error ENOENT 2 _N"No such file or directory") @@ -86,7 +86,7 @@ ) ;;; -#-(or linux svr4) +#-(or linux svr4 darwin) (progn ;;; non-blocking and interrupt i/o (def-unix-error EWOULDBLOCK 35 _N"Operation would block") View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/3566cce059b37bbe26a3c91… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/3566cce059b37bbe26a3c91… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0