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

[Git][cmucl/cmucl][issue-125-unix-stat-wrong] Clean up impl more
by Raymond Toy (＠rtoy) 03 Aug '22

03 Aug '22

Raymond Toy pushed to branch issue-125-unix-stat-wrong at cmucl / cmucl Commits: 50da071d by Raymond Toy at 2022-08-03T12:38:09-07:00 Clean up impl more * Move the stat functions from unix.c to os-common.c and remove unix.c. * Update Linux config files appropriately. * Use the same unix_stat function everywhere, so we can remove all of the different OS-specific definitions of struct stat that we no longer need. - - - - - 6 changed files: - src/code/unix.lisp - src/i18n/locale/cmucl-unix.pot - src/lisp/Config.x86_linux - src/lisp/Config.x86_linux_clang - src/lisp/os-common.c - − src/lisp/unix.c Changes: ===================================== src/code/unix.lisp ===================================== @@ -1346,232 +1346,6 @@ (d-name (array char 256)))) ; name must be no longer than this -#+(and bsd (not netbsd)) -(def-alien-type nil - (struct stat - (st-dev dev-t) - (st-ino ino-t) - (st-mode mode-t) - (st-nlink nlink-t) - (st-uid uid-t) - (st-gid gid-t) - (st-rdev dev-t) - (st-atime (struct timespec-t)) - (st-mtime (struct timespec-t)) - (st-ctime (struct timespec-t)) - (st-size off-t) - (st-blocks off-t) - (st-blksize unsigned-long) - (st-flags unsigned-long) - (st-gen unsigned-long) - (st-lspare long) - (st-qspare (array long 4)))) - -#+svr4 -(def-alien-type nil - (struct stat - (st-dev dev-t) - (st-pad1 #-linux (array long 3) #+linux unsigned-short) - (st-ino ino-t) - (st-mode #-linux unsigned-long #+linux unsigned-short) - (st-nlink #-linux short #+linux unsigned-short) - (st-uid #-linux uid-t #+linux unsigned-short) - (st-gid #-linux gid-t #+linux unsigned-short) - (st-rdev dev-t) - (st-pad2 #-linux (array long 2) #+linux unsigned-short) - (st-size off-t) - #-linux (st-pad3 long) - #+linux (st-blksize unsigned-long) - #+linux (st-blocks unsigned-long) - #-linux (st-atime (struct timestruc-t)) - #+linux (st-atime unsigned-long) - #+linux (unused-1 unsigned-long) - #-linux (st-mtime (struct timestruc-t)) - #+linux (st-mtime unsigned-long) - #+linux (unused-2 unsigned-long) - #-linux (st-ctime (struct timestruc-t)) - #+linux (st-ctime unsigned-long) - #+linux (unused-3 unsigned-long) - #+linux (unused-4 unsigned-long) - #+linux (unused-5 unsigned-long) - #-linux(st-blksize long) - #-linux (st-blocks long) - #-linux (st-fstype (array char 16)) - #-linux (st-pad4 (array long 8)))) - -#+(and nil linux) -(def-alien-type nil - (struct stat - (st-dev dev-t) - #-(or alpha amd64) (st-pad1 unsigned-short) - (st-ino ino64-t) - #+alpha (st-pad1 unsigned-int) - #-amd64 (st-mode mode-t) - (st-nlink nlink-t) - #+amd64 (st-mode mode-t) - (st-uid uid-t) - (st-gid gid-t) - (st-rdev dev-t) - #-alpha (st-pad2 unsigned-short) - (st-size off-t) - #-alpha (st-blksize unsigned-long) - #-alpha (st-blocks blkcnt-t) - (st-atime time-t) - #-alpha (unused-1 unsigned-long) - (st-mtime time-t) - #-alpha (unused-2 unsigned-long) - (st-ctime time-t) - #+alpha (st-blocks int) - #+alpha (st-pad2 unsigned-int) - #+alpha (st-blksize unsigned-int) - #+alpha (st-flags unsigned-int) - #+alpha (st-gen unsigned-int) - #+alpha (st-pad3 unsigned-int) - #+alpha (unused-1 unsigned-long) - #+alpha (unused-2 unsigned-long) - (unused-3 unsigned-long) - (unused-4 unsigned-long) - #-alpha (unused-5 unsigned-long))) - -;;; 64-bit stat for Solaris -#+solaris -(def-alien-type nil - (struct stat64 - (st-dev dev-t) - (st-pad1 (array long 3)) ; Pad so ino is 64-bit aligned - (st-ino ino64-t) - (st-mode unsigned-long) - (st-nlink short) - (st-uid uid-t) - (st-gid gid-t) - (st-rdev dev-t) - (st-pad2 (array long 3)) ; Pad so size is 64-bit aligned - (st-size off64-t) - (st-atime (struct timestruc-t)) - (st-mtime (struct timestruc-t)) - (st-ctime (struct timestruc-t)) - (st-blksize long) - (st-pad3 (array long 1)) ; Pad so blocks is 64-bit aligned - (st-blocks blkcnt64-t) - (st-fstype (array char 16)) - (st-pad4 (array long 8)))) - -#+netbsd -(def-alien-type nil - (struct stat - (st-dev dev-t) - (st-mode mode-t) - (st-ino ino-t) - (st-nlink nlink-t) - (st-uid uid-t) - (st-gid gid-t) - (st-rdev dev-t) - (st-atime (struct timespec-t)) - (st-mtime (struct timespec-t)) - (st-ctime (struct timespec-t)) - (st-birthtime (struct timespec-t)) - (st-size off-t) - (st-blocks off-t) - (st-blksize long) - (st-flags unsigned-long) - (st-gen unsigned-long) - (st-spare (array unsigned-long 2)))) - -#-linux -(defmacro extract-stat-results (buf) - `(values T - (slot ,buf 'st-dev) - (slot ,buf 'st-ino) - (slot ,buf 'st-mode) - (slot ,buf 'st-nlink) - (slot ,buf 'st-uid) - (slot ,buf 'st-gid) - (slot ,buf 'st-rdev) - (slot ,buf 'st-size) - #-(or svr4 BSD) (slot ,buf 'st-atime) - #+svr4 (slot (slot ,buf 'st-atime) 'tv-sec) - #+BSD (slot (slot ,buf 'st-atime) 'ts-sec) - #-(or svr4 BSD)(slot ,buf 'st-mtime) - #+svr4 (slot (slot ,buf 'st-mtime) 'tv-sec) - #+BSD(slot (slot ,buf 'st-mtime) 'ts-sec) - #-(or svr4 BSD) (slot ,buf 'st-ctime) - #+svr4 (slot (slot ,buf 'st-ctime) 'tv-sec) - #+BSD(slot (slot ,buf 'st-ctime) 'ts-sec) - #+netbsd (slot (slot ,buf 'st-birthtime) 'ts-sec) - (slot ,buf 'st-blksize) - (slot ,buf 'st-blocks))) - -#+linux -(defmacro extract-stat-results (buf) - `(values T - #+(or alpha amd64) - (slot ,buf 'st-dev) - #-(or alpha amd64) - (+ (deref (slot ,buf 'st-dev) 0) - (* (+ +max-u-long+ 1) - (deref (slot ,buf 'st-dev) 1))) ;;; let's hope this works.. - (slot ,buf 'st-ino) - (slot ,buf 'st-mode) - (slot ,buf 'st-nlink) - (slot ,buf 'st-uid) - (slot ,buf 'st-gid) - #+(or alpha amd64) - (slot ,buf 'st-rdev) - #-(or alpha amd64) - (+ (deref (slot ,buf 'st-rdev) 0) - (* (+ +max-u-long+ 1) - (deref (slot ,buf 'st-rdev) 1))) ;;; let's hope this works.. - (slot ,buf 'st-size) - (slot ,buf 'st-atime) - (slot ,buf 'st-mtime) - (slot ,buf 'st-ctime) - (slot ,buf 'st-blksize) - (slot ,buf 'st-blocks))) - -#-(or linux solaris) -(progn -(defun unix-stat (name) - _N"Unix-stat retrieves information about the specified - file returning them in the form of multiple values. - See the UNIX Programmer's Manual for a description - of the values returned. If the call fails, then NIL - and an error number is returned instead." - (declare (type unix-pathname name)) - (when (string= name "") - (setf name ".")) - (with-alien ((buf (struct stat))) - (syscall (#+linux "stat64" #+netbsd "__stat50" #-(or linux netbsd) "stat" - c-string (* (struct stat))) - (extract-stat-results buf) - (%name->file name) (addr buf)))) - -(defun unix-lstat (name) - _N"Unix-lstat is similar to unix-stat except the specified - file must be a symbolic link." - (declare (type unix-pathname name)) - (with-alien ((buf (struct stat))) - (syscall (#+linux "lstat64" #+netbsd "__lstat50" #-(or linux netbsd) "lstat" - c-string (* (struct stat))) - (extract-stat-results buf) - (%name->file name) (addr buf)))) - -(defun unix-fstat (fd) - _N"Unix-fstat is similar to unix-stat except the file is specified - by the file descriptor fd." - (declare (type unix-fd fd)) - (with-alien ((buf (struct stat))) - (syscall (#+linux "fstat64" #+netbsd "__fstat50" #-(or linux netbsd) "fstat" - int (* (struct stat))) - (extract-stat-results buf) - fd (addr buf)))) -) - -;; On linux we call out to our own C routine to return the appropriate -;; parts so that we don't have to mess around with making sure the -;; struct stat is consistent with the library. -;; -;; This should be updated so that all OSes do this. -#+linux (macrolet ((call-stat (c-func-name first-arg-type first-arg) ;; Call the stat function named C-FUNC-NAME. The type of the ===================================== src/i18n/locale/cmucl-unix.pot ===================================== @@ -497,14 +497,14 @@ msgstr "" #: src/code/unix.lisp msgid "" -"Unix-lstat is similar to unix-stat except the specified\n" -" file must be a symbolic link." +"Unix-fstat is similar to unix-stat except the file is specified\n" +" by the file descriptor fd." msgstr "" #: src/code/unix.lisp msgid "" -"Unix-fstat is similar to unix-stat except the file is specified\n" -" by the file descriptor fd." +"Unix-lstat is similar to unix-stat except the specified\n" +" file must be a symbolic link." msgstr "" #: src/code/unix.lisp ===================================== src/lisp/Config.x86_linux ===================================== @@ -7,7 +7,7 @@ CFLAGS += -rdynamic -march=pentium4 -mfpmath=sse -mtune=generic UNDEFSYMPATTERN = -Xlinker -u -Xlinker & ASSEM_SRC += linux-stubs.S -OS_SRC += Linux-os.c elf.c unix.c +OS_SRC += Linux-os.c elf.c OS_LIBS = -ldl OS_LINK_FLAGS = -m32 -rdynamic -Xlinker --export-dynamic -Xlinker -Map -Xlinker foo OS_LINK_FLAGS += -Wl,-z,noexecstack ===================================== src/lisp/Config.x86_linux_clang ===================================== @@ -12,7 +12,7 @@ CFLAGS += -msse2 -mtune=pentium4 -ftrapping-math UNDEFSYMPATTERN = -Xlinker -u -Xlinker & ASSEM_SRC += linux-stubs.S -OS_SRC += Linux-os.c elf.c unix.c +OS_SRC += Linux-os.c elf.c OS_LIBS = -ldl OS_LINK_FLAGS = -m32 -rdynamic -Xlinker --export-dynamic -Xlinker -Map -Xlinker foo OS_LINK_FLAGS += -Wl,-z,noexecstack ===================================== src/lisp/os-common.c ===================================== @@ -5,12 +5,17 @@ */ +#define _LARGEFILE_SOURCE +#define _FILE_OFFSET_BITS 64 + +#include <stdio.h> #include <errno.h> #include <math.h> #include <netdb.h> #include <stdio.h> #include <string.h> #include <time.h> +#include <sys/stat.h> #include "os.h" #include "internals.h" @@ -589,3 +594,98 @@ os_sleep(double seconds) requested = remaining; } } + +int unix_stat(const char* path, dev_t *dev, ino_t *ino, mode_t *mode, nlink_t *nlink, + uid_t *uid, gid_t *gid, dev_t *rdev, off_t *size, + time_t *atime, time_t *mtime, time_t *ctime, + long *blksize, off_t *blocks) +{ + int rc; + struct stat buf; + + rc = stat(path, &buf); + + fprintf(stderr, "size dev %d\n", sizeof(buf.st_dev)); + fprintf(stderr, "size ino %d\n", sizeof(buf.st_ino)); + fprintf(stderr, "size mode %d\n", sizeof(buf.st_mode)); + fprintf(stderr, "size nlink %d\n", sizeof(buf.st_nlink)); + fprintf(stderr, "size uid %d\n", sizeof(buf.st_uid)); + fprintf(stderr, "size gid %d\n", sizeof(buf.st_gid)); + fprintf(stderr, "size rdev %d\n", sizeof(buf.st_rdev)); + fprintf(stderr, "size size %d\n", sizeof(buf.st_size)); + fprintf(stderr, "size atime %d\n", sizeof(buf.st_atime)); + fprintf(stderr, "size mtime %d\n", sizeof(buf.st_mtime)); + fprintf(stderr, "size ctime %d\n", sizeof(buf.st_ctime)); + fprintf(stderr, "size blksize %d\n", sizeof(buf.st_blksize)); + fprintf(stderr, "size blocks %d\n", sizeof(buf.st_blocks)); + + *dev = buf.st_dev; + *ino = buf.st_ino; + *mode = buf.st_mode; + *nlink = buf.st_nlink; + *uid = buf.st_uid; + *gid = buf.st_gid; + *rdev = buf.st_rdev; + *size = buf.st_size; + *atime = buf.st_atime; + *mtime = buf.st_mtime; + *ctime = buf.st_ctime; + *blksize = buf.st_blksize; + *blocks = buf.st_blocks; + + return rc; +} + +int unix_fstat(int fd, dev_t *dev, ino_t *ino, mode_t *mode, nlink_t *nlink, + uid_t *uid, gid_t *gid, dev_t *rdev, off_t *size, + time_t *atime, time_t *mtime, time_t *ctime, + long *blksize, off_t *blocks) +{ + int rc; + struct stat buf; + + rc = fstat(fd, &buf); + + *dev = buf.st_dev; + *ino = buf.st_ino; + *mode = buf.st_mode; + *nlink = buf.st_nlink; + *uid = buf.st_uid; + *gid = buf.st_gid; + *rdev = buf.st_rdev; + *size = buf.st_size; + *atime = buf.st_atime; + *mtime = buf.st_mtime; + *ctime = buf.st_ctime; + *blksize = buf.st_blksize; + *blocks = buf.st_blocks; + + return rc; +} + +int unix_lstat(const char* path, dev_t *dev, ino_t *ino, mode_t *mode, nlink_t *nlink, + uid_t *uid, gid_t *gid, dev_t *rdev, off_t *size, + time_t *atime, time_t *mtime, time_t *ctime, + long *blksize, off_t *blocks) +{ + int rc; + struct stat buf; + + rc = lstat(path, &buf); + + *dev = buf.st_dev; + *ino = buf.st_ino; + *mode = buf.st_mode; + *nlink = buf.st_nlink; + *uid = buf.st_uid; + *gid = buf.st_gid; + *rdev = buf.st_rdev; + *size = buf.st_size; + *atime = buf.st_atime; + *mtime = buf.st_mtime; + *ctime = buf.st_ctime; + *blksize = buf.st_blksize; + *blocks = buf.st_blocks; + + return rc; +} ===================================== src/lisp/unix.c deleted ===================================== @@ -1,110 +0,0 @@ -/* - * C interfaces to unix syscalls - */ - -/* We want to support large files */ - -#define _LARGEFILE_SOURCE -#define _FILE_OFFSET_BITS 64 - -#include <stdio.h> -#include <sys/stat.h> - -int unix_stat(const char* path, dev_t *dev, ino_t *ino, mode_t *mode, nlink_t *nlink, - uid_t *uid, gid_t *gid, dev_t *rdev, off_t *size, - time_t *atime, time_t *mtime, time_t *ctime, - long *blksize, off_t *blocks) -{ - int rc; - struct stat buf; - - rc = stat(path, &buf); - - fprintf(stderr, "size dev %d\n", sizeof(buf.st_dev)); - fprintf(stderr, "size ino %d\n", sizeof(buf.st_ino)); - fprintf(stderr, "size mode %d\n", sizeof(buf.st_mode)); - fprintf(stderr, "size nlink %d\n", sizeof(buf.st_nlink)); - fprintf(stderr, "size uid %d\n", sizeof(buf.st_uid)); - fprintf(stderr, "size gid %d\n", sizeof(buf.st_gid)); - fprintf(stderr, "size rdev %d\n", sizeof(buf.st_rdev)); - fprintf(stderr, "size size %d\n", sizeof(buf.st_size)); - fprintf(stderr, "size atime %d\n", sizeof(buf.st_atime)); - fprintf(stderr, "size mtime %d\n", sizeof(buf.st_mtime)); - fprintf(stderr, "size ctime %d\n", sizeof(buf.st_ctime)); - fprintf(stderr, "size blksize %d\n", sizeof(buf.st_blksize)); - fprintf(stderr, "size blocks %d\n", sizeof(buf.st_blocks)); - - - *dev = buf.st_dev; - *ino = buf.st_ino; - *mode = buf.st_mode; - *nlink = buf.st_nlink; - *uid = buf.st_uid; - *gid = buf.st_gid; - *rdev = buf.st_rdev; - *size = buf.st_size; - *atime = buf.st_atime; - *mtime = buf.st_mtime; - *ctime = buf.st_ctime; - *blksize = buf.st_blksize; - *blocks = buf.st_blocks; - - return rc; -} - -int unix_fstat(int fd, dev_t *dev, ino_t *ino, mode_t *mode, nlink_t *nlink, - uid_t *uid, gid_t *gid, dev_t *rdev, off_t *size, - time_t *atime, time_t *mtime, time_t *ctime, - long *blksize, off_t *blocks) -{ - int rc; - struct stat buf; - - rc = fstat(fd, &buf); - - *dev = buf.st_dev; - *ino = buf.st_ino; - *mode = buf.st_mode; - *nlink = buf.st_nlink; - *uid = buf.st_uid; - *gid = buf.st_gid; - *rdev = buf.st_rdev; - *size = buf.st_size; - *atime = buf.st_atime; - *mtime = buf.st_mtime; - *ctime = buf.st_ctime; - *blksize = buf.st_blksize; - *blocks = buf.st_blocks; - - return rc; -} - -int unix_lstat(const char* path, dev_t *dev, ino_t *ino, mode_t *mode, nlink_t *nlink, - uid_t *uid, gid_t *gid, dev_t *rdev, off_t *size, - time_t *atime, time_t *mtime, time_t *ctime, - long *blksize, off_t *blocks) -{ - int rc; - struct stat buf; - - rc = lstat(path, &buf); - - *dev = buf.st_dev; - *ino = buf.st_ino; - *mode = buf.st_mode; - *nlink = buf.st_nlink; - *uid = buf.st_uid; - *gid = buf.st_gid; - *rdev = buf.st_rdev; - *size = buf.st_size; - *atime = buf.st_atime; - *mtime = buf.st_mtime; - *ctime = buf.st_ctime; - *blksize = buf.st_blksize; - *blocks = buf.st_blocks; - - return rc; -} - - - View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/50da071db677ed03e805422… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/50da071db677ed03e805422… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-125-unix-stat-wrong] 3 commits: 64-bit support and clean up times
by Raymond Toy (＠rtoy) 03 Aug '22

03 Aug '22

Raymond Toy pushed to branch issue-125-unix-stat-wrong at cmucl / cmucl Commits: 55140c71 by Raymond Toy at 2022-08-03T09:52:06-07:00 64-bit support and clean up times In unix.c define _LARGEFILE_SOURCE and _FILE_OFFSET_BITS so that we can the 64-bit versions of stat and friends. Also, for compatibility, we don't return a struct timespec, but a long for the number of seconds. We ignore the nanosec part. In unix.lisp, change the definition of dev-t on linux to be u-int64-t since it seems we support the 64-bit integer type. - - - - - 97f6a14c by Raymond Toy at 2022-08-03T10:00:45-07:00 Use time_t/time-t instead of long For the time fields, use time_t on the C side and time-t on the Lisp side. - - - - - 8dd3f6ae by Raymond Toy at 2022-08-03T11:26:29-07:00 Simplify implementation of unix-stat and friends Since the body of unix-stat and friends are almost identical and only differ in the arg and type of the first arg to stat, we use a macro to handle the call to stat. - - - - - 2 changed files: - src/code/unix.lisp - src/lisp/unix.c Changes: ===================================== src/code/unix.lisp ===================================== @@ -74,8 +74,7 @@ (def-alien-type dev-t #-(or alpha svr4 bsd linux) short - #+(and linux (not amd64)) uquad-t - #+(and linux amd64) u-int64-t + #+linux u-int64-t #+netbsd u-int64-t #+alpha int #+(and (not linux) (not netbsd) (or bsd svr4)) unsigned-long) @@ -1573,207 +1572,96 @@ ;; ;; This should be updated so that all OSes do this. #+linux -(progn -(defun unix-stat (name) - _N"Unix-stat retrieves information about the specified +(macrolet + ((call-stat (c-func-name first-arg-type first-arg) + ;; Call the stat function named C-FUNC-NAME. The type of the + ;; first arg is FIRST-ARG_TYPE and FIRST-ARG is the first arg + ;; to the stat function. fstat is different from stat and + ;; lstat since it takes an fd for the first arg instead of + ;; string. + `(with-alien ((dev dev-t) + (ino ino64-t) + (mode mode-t) + (nlink nlink-t) + (uid uid-t) + (gid gid-t) + (rdev dev-t) + (size off-t) + (atime time-t) + (mtime time-t) + (ctime time-t) + (blksize c-call:long) + (blocks off-t)) + (let ((result + (alien-funcall + (extern-alien ,c-func-name + (function int + ,first-arg-type + (* dev-t) + (* ino64-t) + (* mode-t) + (* nlink-t) + (* uid-t) + (* gid-t) + (* dev-t) + (* off-t) + (* time-t) + (* time-t) + (* time-t) + (* c-call:long) + (* off-t))) + ,first-arg + (addr dev) + (addr ino) + (addr mode) + (addr nlink) + (addr uid) + (addr gid) + (addr rdev) + (addr size) + (addr atime) + (addr mtime) + (addr ctime) + (addr blksize) + (addr blocks)))) + (if (eql -1 result) + (values nil (unix-errno)) + (values t + dev + ino + mode + nlink + uid + gid + rdev + size + atime + mtime + ctime + blksize + blocks)))))) + (defun unix-stat (name) + _N"Unix-stat retrieves information about the specified file returning them in the form of multiple values. See the UNIX Programmer's Manual for a description of the values returned. If the call fails, then NIL and an error number is returned instead." - (declare (type unix-pathname name)) - (when (string= name "") - (setf name ".")) - (with-alien ((dev dev-t) - (ino ino64-t) - (mode mode-t) - (nlink nlink-t) - (uid uid-t) - (gid gid-t) - (rdev dev-t) - (size off-t) - (atime (struct timespec-t)) - (mtime (struct timespec-t)) - (ctime (struct timespec-t)) - (blksize off-t) - (blocks off-t)) - (let ((result - (alien-funcall - (extern-alien "unix_stat" - (function int - c-call::c-string - (* dev-t) - (* ino64-t) - (* mode-t) - (* nlink-t) - (* uid-t) - (* gid-t) - (* dev-t) - (* off-t) - (* (struct timespec-t)) - (* (struct timespec-t)) - (* (struct timespec-t)) - (* off-t) - (* off-t))) - (%name->file name) - (addr dev) - (addr ino) - (addr mode) - (addr nlink) - (addr uid) - (addr gid) - (addr rdev) - (addr size) - (addr atime) - (addr mtime) - (addr ctime) - (addr blksize) - (addr blocks)))) - (if (eql -1 result) - (values nil (unix-errno)) - (flet ((make-64bit (x) - (+ (alien:deref x 0) - (ash (alien:deref x 1) 32))) - (make-time (x) - (alien:slot x 'unix::ts-sec))) - (values t - (make-64bit dev) ino mode nlink uid gid - (make-64bit rdev) - size - (make-time atime) - (make-time mtime) - (make-time ctime) - blksize blocks)))))) + (declare (type unix-pathname name)) + (when (string= name "") + (setf name ".")) + (call-stat "unix_stat" c-call:c-string (%name->file name))) -(defun unix-lstat (name) - "Unix-lstat is similar to unix-stat except the specified + (defun unix-lstat (name) + "Unix-lstat is similar to unix-stat except the specified file must be a symbolic link." - (declare (type unix-pathname name)) - (with-alien ((dev dev-t) - (ino ino64-t) - (mode mode-t) - (nlink nlink-t) - (uid uid-t) - (gid gid-t) - (rdev dev-t) - (size off-t) - (atime (struct timespec-t)) - (mtime (struct timespec-t)) - (ctime (struct timespec-t)) - (blksize off-t) - (blocks off-t)) - (let ((result - (alien-funcall - (extern-alien "unix_lstat" - (function int - c-call::c-string - (* dev-t) - (* ino64-t) - (* mode-t) - (* nlink-t) - (* uid-t) - (* gid-t) - (* dev-t) - (* off-t) - (* (struct timespec-t)) - (* (struct timespec-t)) - (* (struct timespec-t)) - (* off-t) - (* off-t))) - (%name->file name) - (addr dev) - (addr ino) - (addr mode) - (addr nlink) - (addr uid) - (addr gid) - (addr rdev) - (addr size) - (addr atime) - (addr mtime) - (addr ctime) - (addr blksize) - (addr blocks)))) - (if (eql -1 result) - (values nil (unix-errno)) - (flet ((make-64bit (x) - (+ (alien:deref x 0) - (ash (alien:deref x 1) 32))) - (make-time (x) - (alien:slot x 'unix::ts-sec))) - (values t - (make-64bit dev) ino mode nlink uid gid - (make-64bit rdev) - size - (make-time atime) - (make-time mtime) - (make-time ctime) - blksize blocks)))))) + (declare (type unix-pathname name)) + (call-stat "unix_lstat" c-call:c-string (%name->file name))) -(defun unix-fstat (fd) - _N"Unix-fstat is similar to unix-stat except the file is specified + (defun unix-fstat (fd) + _N"Unix-fstat is similar to unix-stat except the file is specified by the file descriptor fd." - (declare (type unix-fd fd)) - (with-alien ((dev dev-t) - (ino ino64-t) - (mode mode-t) - (nlink nlink-t) - (uid uid-t) - (gid gid-t) - (rdev dev-t) - (size off-t) - (atime (struct timespec-t)) - (mtime (struct timespec-t)) - (ctime (struct timespec-t)) - (blksize off-t) - (blocks off-t)) - (let ((result - (alien-funcall - (extern-alien "unix_fstat" - (function int - int - (* dev-t) - (* ino64-t) - (* mode-t) - (* nlink-t) - (* uid-t) - (* gid-t) - (* dev-t) - (* off-t) - (* (struct timespec-t)) - (* (struct timespec-t)) - (* (struct timespec-t)) - (* off-t) - (* off-t))) - fd - (addr dev) - (addr ino) - (addr mode) - (addr nlink) - (addr uid) - (addr gid) - (addr rdev) - (addr size) - (addr atime) - (addr mtime) - (addr ctime) - (addr blksize) - (addr blocks)))) - (if (eql -1 result) - (values nil (unix-errno)) - (flet ((make-64bit (x) - (+ (alien:deref x 0) - (ash (alien:deref x 1) 32))) - (make-time (x) - (alien:slot x 'unix::ts-sec))) - (values t - (make-64bit dev) ino mode nlink uid gid - (make-64bit rdev) - size - (make-time atime) - (make-time mtime) - (make-time ctime) - blksize blocks)))))) -) + (declare (type unix-fd fd)) + (call-stat "unix_fstat" int fd))) ;;; 64-bit versions of stat and friends #+solaris ===================================== src/lisp/unix.c ===================================== @@ -2,13 +2,18 @@ * C interfaces to unix syscalls */ +/* We want to support large files */ + +#define _LARGEFILE_SOURCE +#define _FILE_OFFSET_BITS 64 + #include <stdio.h> #include <sys/stat.h> int unix_stat(const char* path, dev_t *dev, ino_t *ino, mode_t *mode, nlink_t *nlink, uid_t *uid, gid_t *gid, dev_t *rdev, off_t *size, - struct timespec *atime, struct timespec *mtime, struct timespec *ctime, - long *blksize, long *blocks) + time_t *atime, time_t *mtime, time_t *ctime, + long *blksize, off_t *blocks) { int rc; struct stat buf; @@ -38,9 +43,9 @@ int unix_stat(const char* path, dev_t *dev, ino_t *ino, mode_t *mode, nlink_t *n *gid = buf.st_gid; *rdev = buf.st_rdev; *size = buf.st_size; - *atime = buf.st_atim; - *mtime = buf.st_mtim; - *ctime = buf.st_ctim; + *atime = buf.st_atime; + *mtime = buf.st_mtime; + *ctime = buf.st_ctime; *blksize = buf.st_blksize; *blocks = buf.st_blocks; @@ -49,8 +54,8 @@ int unix_stat(const char* path, dev_t *dev, ino_t *ino, mode_t *mode, nlink_t *n int unix_fstat(int fd, dev_t *dev, ino_t *ino, mode_t *mode, nlink_t *nlink, uid_t *uid, gid_t *gid, dev_t *rdev, off_t *size, - struct timespec *atime, struct timespec *mtime, struct timespec *ctime, - long *blksize, long *blocks) + time_t *atime, time_t *mtime, time_t *ctime, + long *blksize, off_t *blocks) { int rc; struct stat buf; @@ -65,9 +70,9 @@ int unix_fstat(int fd, dev_t *dev, ino_t *ino, mode_t *mode, nlink_t *nlink, *gid = buf.st_gid; *rdev = buf.st_rdev; *size = buf.st_size; - *atime = buf.st_atim; - *mtime = buf.st_mtim; - *ctime = buf.st_ctim; + *atime = buf.st_atime; + *mtime = buf.st_mtime; + *ctime = buf.st_ctime; *blksize = buf.st_blksize; *blocks = buf.st_blocks; @@ -76,8 +81,8 @@ int unix_fstat(int fd, dev_t *dev, ino_t *ino, mode_t *mode, nlink_t *nlink, int unix_lstat(const char* path, dev_t *dev, ino_t *ino, mode_t *mode, nlink_t *nlink, uid_t *uid, gid_t *gid, dev_t *rdev, off_t *size, - struct timespec *atime, struct timespec *mtime, struct timespec *ctime, - long *blksize, long *blocks) + time_t *atime, time_t *mtime, time_t *ctime, + long *blksize, off_t *blocks) { int rc; struct stat buf; @@ -92,9 +97,9 @@ int unix_lstat(const char* path, dev_t *dev, ino_t *ino, mode_t *mode, nlink_t * *gid = buf.st_gid; *rdev = buf.st_rdev; *size = buf.st_size; - *atime = buf.st_atim; - *mtime = buf.st_mtim; - *ctime = buf.st_ctim; + *atime = buf.st_atime; + *mtime = buf.st_mtime; + *ctime = buf.st_ctime; *blksize = buf.st_blksize; *blocks = buf.st_blocks; View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/6a38637e8653785b23e249… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/6a38637e8653785b23e249… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl] Pushed new branch issue-125-unix-stat-wrong
by Raymond Toy (＠rtoy) 03 Aug '22

03 Aug '22

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

1 0

[Git][cmucl/cmucl][master] 2 commits: Fix #122: gcc 11 can't build cmucl
by Raymond Toy (＠rtoy) 26 Jun '22

26 Jun '22

Raymond Toy pushed to branch master at cmucl / cmucl Commits: f4ccaa45 by Raymond Toy at 2022-06-26T22:07:54+00:00 Fix #122: gcc 11 can't build cmucl - - - - - 00907500 by Raymond Toy at 2022-06-26T22:07:54+00:00 Merge branch 'issue-122-gnu-source' into 'master' Fix #122: gcc 11 can't build cmucl Closes #122 See merge request cmucl/cmucl!84 - - - - - 4 changed files: - src/lisp/Config.x86_linux - src/lisp/Config.x86_linux_clang - src/lisp/Linux-os.c - src/lisp/x86-lispregs.h Changes: ===================================== src/lisp/Config.x86_linux ===================================== @@ -2,7 +2,7 @@ include Config.x86_common CFLAGS += $(COPT) -CPPFLAGS += -m32 -D__NO_CTYPE -D_GNU_SOURCE +CPPFLAGS += -m32 -D__NO_CTYPE CFLAGS += -rdynamic -march=pentium4 -mfpmath=sse -mtune=generic UNDEFSYMPATTERN = -Xlinker -u -Xlinker & ===================================== src/lisp/Config.x86_linux_clang ===================================== @@ -2,7 +2,7 @@ include Config.x86_common CC = clang -CPPFLAGS += -m32 -D__NO_CTYPE -D_GNU_SOURCE +CPPFLAGS += -m32 -D__NO_CTYPE CFLAGS += $(COPT) # Allow sse2 instructions (-msse2); and tune for pentium4 ===================================== src/lisp/Linux-os.c ===================================== @@ -17,6 +17,8 @@ * */ +#define _GNU_SOURCE /* for reg_* constants in uc_mcontext.gregs */ +#include <signal.h> #include <stdio.h> #include <sys/param.h> #include <sys/file.h> @@ -198,6 +200,8 @@ os_sigcontext_reg(ucontext_t *scp, int offset) return (unsigned long *) &scp->uc_mcontext.gregs[REG_ESI]; case 14: return (unsigned long *) &scp->uc_mcontext.gregs[REG_EDI]; + case 16: + return (unsigned long*) &scp->uc_mcontext.gregs[REG_EFL]; } return NULL; } ===================================== src/lisp/x86-lispregs.h ===================================== @@ -30,6 +30,7 @@ #define reg_EBP REG(10) #define reg_ESI REG(12) #define reg_EDI REG(14) +#define reg_EFL REG(16) #define reg_SP reg_ESP #define reg_FP reg_EBP @@ -60,7 +61,7 @@ #define SC_EFLAGS(sc) ((sc)->uc_mcontext->ss.eflags) #endif #elif defined(__linux__) -#define SC_EFLAGS(sc) ((sc)->uc_mcontext.gregs[REG_EFL]) +#define SC_EFLAGS(sc) SC_REG(sc, reg_EFL) #elif defined(__NetBSD__) #define SC_EFLAGS(sc) ((sc)->uc_mcontext.__gregs[_REG_EFL]) #elif defined(SOLARIS) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/ca3deab27d85d3fbfbc6d9… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/ca3deab27d85d3fbfbc6d9… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-122-gnu-source] Update src/lisp/Linux-os.c
by Carl S. Shapiro (＠cshapiro) 26 Jun '22

26 Jun '22

Carl S. Shapiro pushed to branch issue-122-gnu-source at cmucl / cmucl Commits: d31ab04c by Carl S. Shapiro at 2022-06-26T21:39:23+00:00 Update src/lisp/Linux-os.c - - - - - 1 changed file: - src/lisp/Linux-os.c Changes: ===================================== src/lisp/Linux-os.c ===================================== @@ -17,8 +17,8 @@ * */ -#define _GNU_SOURCE -#include <signal.h> /* for reg_* constants in uc_mcontext.gregs */ +#define _GNU_SOURCE /* for reg_* constants in uc_mcontext.gregs */ +#include <signal.h> #include <stdio.h> #include <sys/param.h> #include <sys/file.h> View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/d31ab04c93ea31a452f6d5d… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/d31ab04c93ea31a452f6d5d… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-122-gnu-source] Update src/lisp/Linux-os.c
by Carl S. Shapiro (＠cshapiro) 26 Jun '22

26 Jun '22

Carl S. Shapiro pushed to branch issue-122-gnu-source at cmucl / cmucl Commits: 1c2e52ef by Carl S. Shapiro at 2022-06-26T21:28:53+00:00 Update src/lisp/Linux-os.c - - - - - 1 changed file: - src/lisp/Linux-os.c Changes: ===================================== src/lisp/Linux-os.c ===================================== @@ -17,11 +17,8 @@ * */ -#if defined(__linux__) -/* Needed to define REG_foo to get indices into the mcontext gregs. */ #define _GNU_SOURCE -#endif - +#include <signal.h> /* for reg_* constants in uc_mcontext.gregs */ #include <stdio.h> #include <sys/param.h> #include <sys/file.h> View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/1c2e52ef5d2262a54179ad1… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/1c2e52ef5d2262a54179ad1… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl] Pushed new branch issue-122-gnu-source
by Raymond Toy (＠rtoy) 25 Jun '22

25 Jun '22

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

1 0

[Git][cmucl/cmucl][issue-122-dynamically-allocate-altstack] Only allocate altstack once.
by Raymond Toy (＠rtoy) 30 Jan '22

30 Jan '22

Raymond Toy pushed to branch issue-122-dynamically-allocate-altstack at cmucl / cmucl Commits: e6dd7ca5 by Raymond Toy at 2022-01-30T15:40:37-08:00 Only allocate altstack once. Initialize altstack to NULL, so that we can tell if we need to allocate space for it. - - - - - 1 changed file: - src/lisp/interrupt.c Changes: ===================================== src/lisp/interrupt.c ===================================== @@ -406,7 +406,7 @@ interrupt_maybe_gc(HANDLER_ARGS) \****************************************************************/ #if defined(__linux__) -char* altstack; +char* altstack = NULL; #else char altstack[SIGNAL_STACK_SIZE]; #endif @@ -436,7 +436,14 @@ interrupt_install_low_level_handler(int signal, void handler(HANDLER_ARGS)) sigstack.ss_sp = (void *) SIGNAL_STACK_START; #else #if defined(__linux__) - altstack = malloc(SIGSTKSZ); + /* + * For gcc 11.2 (clang 13.0), we need to allocate altstack + * dynamically. Do this here, but only if we haven't already + * allocated space. + */ + if (altstack == NULL) { + altstack = malloc(SIGSTKSZ); + } #endif sigstack.ss_sp = (void *) altstack; #endif View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/e6dd7ca518562373e4a1bf6… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/e6dd7ca518562373e4a1bf6… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl] Pushed new branch issue-122-dynamically-allocate-altstack
by Raymond Toy (＠rtoy) 30 Jan '22

30 Jan '22

Raymond Toy pushed new branch issue-122-dynamically-allocate-altstack at cmucl / cmucl -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/tree/issue-122-dynamically-all… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][master] 2 commits: Fix #121: fill-pointer-misc off by one for charpos
by Raymond Toy (＠rtoy) 16 Dec '21

16 Dec '21

Raymond Toy pushed to branch master at cmucl / cmucl Commits: bd79fc27 by Raymond Toy at 2021-12-16T18:56:43+00:00 Fix #121: fill-pointer-misc off by one for charpos - - - - - ca3deab2 by Raymond Toy at 2021-12-16T18:56:43+00:00 Merge branch 'issue-121-fill-pointer-misc' into 'master' Fix #121: fill-pointer-misc off by one for charpos Closes #121 See merge request cmucl/cmucl!83 - - - - - 3 changed files: - src/code/stream.lisp - src/general-info/release-21e.md - tests/issues.lisp Changes: ===================================== src/code/stream.lisp ===================================== @@ -1928,7 +1928,10 @@ output to Output-stream" (let ((found (position #\newline string :test #'char= :end end :from-end t))) (if found - (- end (the fixnum found)) + ;; END points to where the next character goes, not the + ;; last character. FOUND is where the newline is. + ;; Subtract 1 to adjust for the difference. + (- end (the fixnum found) 1) current))))) (:element-type 'base-char))) ===================================== src/general-info/release-21e.md ===================================== @@ -48,6 +48,7 @@ public domain. * ~~#108~~ Update ASDF * ~~#112~~ CLX can't connect to X server via inet sockets * ~~#113~~ REQUIRE on contribs can pull in the wrong things vai ASDF. + * ~~#121~~ Wrong column index in FILL-POINTER-OUTPUT-STREAM * Other changes: * Improvements to the PCL implementation of CLOS: * Changes to building procedure: ===================================== tests/issues.lisp ===================================== @@ -556,3 +556,17 @@ (assert-equalp 3.0380154777955097d205 (expt 1.7976931348623157d308 0.6666))) + +(define-test issue.121 + (:tag :issues) + ;; Output should only have one newline character in it. Previously, + ;; we printed two. + (assert-equalp + (concatenate 'string "xxx" (string #\Newline)) + (let ((a (make-array 0 :element-type 'character :fill-pointer 0 + :adjustable t))) + (with-output-to-string (s a) + (format s "xxx") + (terpri s) + (fresh-line s)) + a))) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/b93156783b639cabd83aed… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/b93156783b639cabd83aed… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0