X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Funix.lisp;h=7c1298d3ec7813c1bd707fbd93e448c90a2fbc25;hb=15d6e7c9a2c3234f95dfe278046fa2fee1b0c007;hp=91a8e396a5ed6e63932bd23d938dd45b525afd93;hpb=02abc70f6d8d522d0b1b94a5eababda9409d1e53;p=sbcl.git diff --git a/src/code/unix.lisp b/src/code/unix.lisp index 91a8e39..7c1298d 100644 --- a/src/code/unix.lisp +++ b/src/code/unix.lisp @@ -64,21 +64,25 @@ ;;; implemented using SB!XC:DEFMACRO wrapped in EVAL-WHEN. (defmacro syscall ((name &rest arg-types) success-form &rest args) - `(let ((result (alien-funcall (extern-alien ,name (function int ,@arg-types)) + `(locally + (declare (optimize (sb!c::float-accuracy 0))) + (let ((result (alien-funcall (extern-alien ,name (function int ,@arg-types)) ,@args))) - (if (minusp result) - (values nil (get-errno)) - ,success-form))) + (if (minusp result) + (values nil (get-errno)) + ,success-form)))) ;;; This is like SYSCALL, but if it fails, signal an error instead of ;;; returning error codes. Should only be used for syscalls that will ;;; never really get an error. (defmacro syscall* ((name &rest arg-types) success-form &rest args) - `(let ((result (alien-funcall (extern-alien ,name (function int ,@arg-types)) - ,@args))) - (if (minusp result) - (error "Syscall ~A failed: ~A" ,name (strerror)) - ,success-form))) + `(locally + (declare (optimize (sb!c::float-accuracy 0))) + (let ((result (alien-funcall (extern-alien ,name (function int ,@arg-types)) + ,@args))) + (if (minusp result) + (error "Syscall ~A failed: ~A" ,name (strerror)) + ,success-form)))) (/show0 "unix.lisp 109") @@ -237,7 +241,7 @@ ;;; UNIX-WRITE accepts a file descriptor, a buffer, an offset, and the ;;; length to write. It attempts to write len bytes to the device -;;; associated with fd from the the buffer starting at offset. It returns +;;; associated with fd from the buffer starting at offset. It returns ;;; the actual number of bytes written. (defun unix-write (fd buf offset len) (declare (type unix-fd fd) @@ -293,14 +297,14 @@ ;; a constant. Going the grovel_headers route doesn't seem to be ;; helpful, either, as Solaris doesn't export PATH_MAX from ;; unistd.h. - #!-(or linux openbsd freebsd sunos osf1) (,stub,) - #!+(or linux openbsd freebsd sunos osf1) + #!-(or linux openbsd freebsd netbsd sunos osf1 darwin) (,stub,) + #!+(or linux openbsd freebsd netbsd sunos osf1 darwin) (or (newcharstar-string (alien-funcall (extern-alien "getcwd" (function (* char) (* char) size-t)) nil - #!+(or linux openbsd freebsd) 0 + #!+(or linux openbsd freebsd netbsd darwin) 0 #!+(or sunos osf1) 1025)) (simple-perror "getcwd"))) @@ -390,12 +394,6 @@ (cast buf c-string) (cast buf (* char)) 256))) -;;; Write the core image of the file described by FD to disk. -(defun unix-fsync (fd) - (declare (type unix-fd fd)) - (void-syscall ("fsync" int) fd)) - - (defun unix-setsid () (int-syscall ("setsid"))) @@ -556,14 +554,14 @@ ;;; longer than 32 bits anyway, right?":-| (define-alien-type nil (struct wrapped_stat - (st-dev unsigned-long) ; would be dev-t in a real stat + (st-dev unsigned-int) ; would be dev-t in a real stat (st-ino ino-t) (st-mode mode-t) (st-nlink nlink-t) (st-uid uid-t) (st-gid gid-t) - (st-rdev unsigned-long) ; would be dev-t in a real stat - (st-size unsigned-long) ; would be off-t in a real stat + (st-rdev unsigned-int) ; would be dev-t in a real stat + (st-size unsigned-int) ; would be off-t in a real stat (st-blksize unsigned-long) (st-blocks unsigned-long) (st-atime time-t) @@ -651,19 +649,13 @@ (define-alien-routine get-timezone sb!alien:void (when sb!alien:long :in) - (minutes-west sb!alien:int :out) + (seconds-west sb!alien:int :out) (daylight-savings-p sb!alien:boolean :out)) -(defun unix-get-minutes-west (secs) - (multiple-value-bind (ignore minutes dst) (get-timezone secs) +(defun unix-get-seconds-west (secs) + (multiple-value-bind (ignore seconds dst) (get-timezone secs) (declare (ignore ignore) (ignore dst)) - (values minutes))) - -(defun unix-get-timezone (secs) - (multiple-value-bind (ignore minutes dst) (get-timezone secs) - (declare (ignore ignore) (ignore minutes)) - (values (deref unix-tzname (if dst 1 0))))) - + (values seconds))) ;;;; sys/time.h @@ -759,7 +751,7 @@ (slot (slot itvo 'it-value) 'tv-usec)) which (alien-sap (addr itvn))(alien-sap (addr itvo)))))) -(defmacro sb!ext::with-timeout (expires &body body) +(defmacro sb!ext:with-timeout (expires &body body) "Execute the body, interrupting it with a SIGALRM after at least EXPIRES seconds have passed. Uses Unix setitimer(), restoring any previous timer after the body has finished executing" @@ -779,16 +771,9 @@ previous timer after the body has finished executing" (unix-setitimer :real 0 0 ,s ,u) ,@body) (unix-setitimer :real 0 0 ,saved-seconds ,saved-useconds)) - ,@body))))) - + (progn + ,@body)))))) - -(defconstant ENOENT 2) ; Unix error code, "No such file or directory" -(defconstant EINTR 4) ; Unix error code, "Interrupted system call" -(defconstant EIO 5) ; Unix error code, "I/O error" -(defconstant EEXIST 17) ; Unix error code, "File exists" -(defconstant ESPIPE 29) ; Unix error code, "Illegal seek" -(defconstant EWOULDBLOCK 11) ; Unix error code, "Operation would block" ;;; FIXME: Many Unix error code definitions were deleted from the old ;;; CMU CL source code here, but not in the exports of SB-UNIX. I ;;; (WHN) hope that someday I'll figure out an automatic way to detect @@ -796,7 +781,6 @@ previous timer after the body has finished executing" ;;; enough of them all in one place here that they should probably be ;;; removed by hand. - ;;;; support routines for dealing with Unix pathnames (defun unix-file-kind (name &optional check-for-links) @@ -984,7 +968,9 @@ previous timer after the body has finished executing" `(multiple-value-bind (,word ,bit) (floor ,offset 32) (setf (deref (slot ,fd-set 'fds-bits) ,word) (logand (deref (slot ,fd-set 'fds-bits) ,word) - (sb!kernel:32bit-logical-not + ;; FIXME: This may not be quite right for 64-bit + ;; ports of SBCL. --njf, 2004-08-04 + (sb!kernel:word-logical-not (truly-the (unsigned-byte 32) (ash 1 ,bit)))))))) ;;; not checked for linux...