X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fsb-posix%2Finterface.lisp;h=8e6be50596e84c18051d6a7c88fb7edca47c921a;hb=b27852e74e11ccc9808305a73d815a4a67d77963;hp=ac580c7e4207fe45989d5deed18f4cba718ea87a;hpb=2c7b547fafe16874bc395f10fd9595ce782b3649;p=sbcl.git diff --git a/contrib/sb-posix/interface.lisp b/contrib/sb-posix/interface.lisp index ac580c7..8e6be50 100644 --- a/contrib/sb-posix/interface.lisp +++ b/contrib/sb-posix/interface.lisp @@ -61,14 +61,25 @@ (find-class ',name)))) (define-condition sb-posix:syscall-error (error) - ((errno :initarg :errno :reader sb-posix:syscall-errno)) + ((errno :initarg :errno :reader sb-posix:syscall-errno) + (name :initarg :name :initform nil :reader sb-posix:syscall-name)) (:report (lambda (c s) - (let ((errno (sb-posix:syscall-errno c))) - (format s "System call error ~A (~A)" - errno (sb-int:strerror errno)))))) - -(defun syscall-error () - (error 'sb-posix:syscall-error :errno (get-errno))) + (let ((errno (sb-posix:syscall-errno c)) + (name (sb-posix:syscall-name c))) + (if name + (format s "Error in ~S: ~A (~A)" + name + (sb-int:strerror errno) + errno) + (format s "Error in syscall: ~A (~A)" + (sb-int:strerror errno) + errno)))))) + +(declaim (ftype (function (&optional symbol) nil) syscall-error)) +(defun syscall-error (&optional name) + (error 'sb-posix:syscall-error + :name name + :errno (get-errno))) (defun unsupported-error (lisp-name c-name) (error "~S is unsupported by SBCL on this platform due to lack of ~A()." @@ -195,7 +206,7 @@ (function ,result-type system-area-pointer)) (sb-alien::vector-sap arg)))) (when (,errorp result) - (syscall-error)) + (syscall-error ',lisp-name)) ;; FIXME: We'd rather return pathnames, but other ;; SB-POSIX functions like this return strings... (let ((pathname (sb-ext:octets-to-string @@ -270,26 +281,35 @@ ;; uid, gid (define-call "geteuid" uid-t never-fails) ; "always successful", it says -#-sunos (define-call "getresuid" uid-t never-fails) + #-sunos + (define-call "getresuid" uid-t never-fails) (define-call "getuid" uid-t never-fails) (define-call "seteuid" int minusp (uid uid-t)) -#-sunos (define-call "setfsuid" int minusp (uid uid-t)) + #-sunos + (define-call "setfsuid" int minusp (uid uid-t)) (define-call "setreuid" int minusp (ruid uid-t) (euid uid-t)) -#-sunos (define-call "setresuid" int minusp (ruid uid-t) (euid uid-t) (suid uid-t)) + #-sunos + (define-call "setresuid" int minusp (ruid uid-t) (euid uid-t) (suid uid-t)) (define-call "setuid" int minusp (uid uid-t)) (define-call "getegid" gid-t never-fails) (define-call "getgid" gid-t never-fails) -#-sunos (define-call "getresgid" gid-t never-fails) + #-sunos + (define-call "getresgid" gid-t never-fails) (define-call "setegid" int minusp (gid gid-t)) -#-sunos (define-call "setfsgid" int minusp (gid gid-t)) + #-sunos + (define-call "setfsgid" int minusp (gid gid-t)) (define-call "setgid" int minusp (gid gid-t)) (define-call "setregid" int minusp (rgid gid-t) (egid gid-t)) -#-sunos (define-call "setresgid" int minusp (rgid gid-t) (egid gid-t) (sgid gid-t)) + #-sunos + (define-call "setresgid" int minusp (rgid gid-t) (egid gid-t) (sgid gid-t)) ;; processes, signals (define-call "alarm" int never-fails (seconds unsigned)) - + ;; exit and abort, not much point inlining these + (define-simple-call abort void) + (define-simple-call exit void (status int)) + (define-simple-call _exit void (status int)) ;; FIXME this is a lie, of course this can fail, but there's no ;; error handling here yet! @@ -357,7 +377,7 @@ not supported." (with-growing-c-string (buf size) (let ((count (%readlink (filename pathspec) buf size))) (cond ((minusp count) - (syscall-error)) + (syscall-error 'readlink)) ((< 0 count size) (buf count)))))))) @@ -375,7 +395,7 @@ not supported." (cond (result (buf)) ((/= (get-errno) sb-posix:erange) - (syscall-error)))))))) + (syscall-error 'getcwd)))))))) #-win32 (progn @@ -389,7 +409,7 @@ not supported." (extern-alien "wait" (function pid-t (* int))) (sb-sys:vector-sap ptr))))) (if (minusp pid) - (syscall-error) + (syscall-error 'wait) (values pid (aref ptr 0)))))) #-win32 @@ -407,7 +427,7 @@ not supported." pid-t (* int) int)) pid (sb-sys:vector-sap ptr) options)))) (if (minusp pid) - (syscall-error) + (syscall-error 'waitpid) (values pid (aref ptr 0))))) ;; waitpid macros (define-call "wifexited" boolean never-fails (status int)) @@ -431,8 +451,29 @@ not supported." (define-call "munmap" int minusp (start sb-sys:system-area-pointer) (length unsigned)) +#-win32 (define-call "msync" int minusp (addr sb-sys:system-area-pointer) (length unsigned) (flags int))) +#+win32 +(progn + ;; No attempt is made to offer a full mmap-like interface on Windows. + ;; It would be possible to do so (and has been done by AK on his + ;; branch), but the use case is unclear to me. However, the following + ;; definitions are needed to keep existing code in sb-simple-streams + ;; running. --DFL + (defconstant PROT-READ #x02) + (defconstant PROT-WRITE #x04) + (defconstant PROT-EXEC #x10) + (defconstant PROT-NONE 0) + (defconstant MAP-SHARED 0) + (defconstant MAP-PRIVATE 1) + (defconstant MS-ASYNC nil) + (defconstant MS-SYNC nil) + (export ;export on the fly like define-call + (defun msync (address length flags) + (declare (ignore flags)) + (when (zerop (sb-win32:flush-view-of-file address length)) + (sb-win32::win32-error "FlushViewOfFile"))))) ;;; mlockall, munlockall (define-call "mlockall" int minusp (flags int)) @@ -465,8 +506,8 @@ not supported." :documentation "Initial working directory.") (shell :initarg :shell :accessor passwd-shell :documentation "Program to use as shell.")) - (:documentation "Instances of this class represent entries in - the system's user database.")) + (:documentation + "Instances of this class represent entries in the system's user database.")) ;;; group database #-win32 @@ -524,14 +565,15 @@ not supported." bytes. For symbolic links, the length in bytes of the filename contained in the symbolic link.") + (rdev :initarg :rdev :reader stat-rdev + :documentation "For devices the device number.") (atime :initarg :atime :reader stat-atime :documentation "Time of last access.") (mtime :initarg :mtime :reader stat-mtime :documentation "Time of last data modification.") (ctime :initarg :ctime :reader stat-ctime - :documentation "Time of last status change")) - (:documentation "Instances of this class represent Posix file - metadata.")) + :documentation "Time of last status change.")) + (:documentation "Instances of this class represent POSIX file metadata.")) (defmacro define-stat-call (name arg designator-fun type) ;; FIXME: this isn't the documented way of doing this, surely? @@ -549,7 +591,7 @@ not supported." (,designator-fun ,arg) a-stat))) (when (minusp r) - (syscall-error)) + (syscall-error ',lisp-name)) (alien-to-stat a-stat stat))))))) (define-stat-call #-win32 "stat" #+win32 "_stat" @@ -595,7 +637,7 @@ not supported." (extern-alien "pipe" (function int (* int))) (sb-sys:vector-sap filedes2))))) (when (minusp r) - (syscall-error))) + (syscall-error 'pipe))) (values (aref filedes2 0) (aref filedes2 1)))) #-win32 @@ -610,8 +652,8 @@ not supported." :documentation "Local modes.") (cc :initarg :cc :accessor sb-posix:termios-cc :array-length nccs :documentation "Control characters.")) - (:documentation "Instances of this class represent I/O - characteristics of the terminal.")) + (:documentation + "Instances of this class represent I/O characteristics of the terminal.")) #-win32 (progn @@ -628,7 +670,7 @@ not supported." (function int int int (* alien-termios))) fd actions a-termios))) (when (minusp r) - (syscall-error))) + (syscall-error 'tcsetattr))) (values)))) (export 'tcgetattr :sb-posix) (declaim (inline tcgetattr)) @@ -641,7 +683,7 @@ not supported." (file-descriptor fd) a-termios))) (when (minusp r) - (syscall-error)) + (syscall-error 'tcgetattr)) (setf termios (alien-to-termios a-termios termios)))) termios) (define-call "tcdrain" int minusp (fd file-descriptor)) @@ -660,7 +702,7 @@ not supported." a-termios speed))) (when (minusp r) - (syscall-error)) + (syscall-error 'cfsetispeed)) (setf termios (alien-to-termios a-termios termios)))) termios) (export 'cfsetospeed :sb-posix) @@ -674,7 +716,7 @@ not supported." a-termios speed))) (when (minusp r) - (syscall-error)) + (syscall-error 'cfsetospeed)) (setf termios (alien-to-termios a-termios termios)))) termios) (export 'cfgetispeed :sb-posix) @@ -705,12 +747,13 @@ not supported." (function time-t (* time-t))) nil))) (if (minusp result) - (syscall-error) + (syscall-error 'time) result))) (export 'utime :sb-posix) (defun utime (filename &optional access-time modification-time) - (let ((fun (extern-alien "utime" (function int (c-string :not-null t) - (* alien-utimbuf)))) + (let ((fun (extern-alien #-netbsd "utime" #+netbsd "_utime" + (function int (c-string :not-null t) + (* alien-utimbuf)))) (name (filename filename))) (if (not (and access-time modification-time)) (alien-funcall fun name nil) @@ -719,7 +762,7 @@ not supported." (slot utimbuf 'modtime) (or modification-time 0)) (let ((result (alien-funcall fun name (alien-sap utimbuf)))) (if (minusp result) - (syscall-error) + (syscall-error 'utime) result)))))) (export 'utimes :sb-posix) (defun utimes (filename &optional access-time modification-time) @@ -729,7 +772,7 @@ not supported." (values integer (cl:truncate (* fractional 1000000))))) (maybe-syscall-error (value) (if (minusp value) - (syscall-error) + (syscall-error 'utimes) value))) (let ((fun (extern-alien "utimes" (function int (c-string :not-null t) (* (array alien-timeval 2)))))