X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Funix.lisp;h=fbae02174becc25a8cf330cd41bd8bf5fc5e854e;hb=cd176690400f8b6fa23faa4dc6fa8494bcbce480;hp=b6e0b00b07c595852d4acf418af5cc1738ba53bb;hpb=83fd554b67913275d8dc06edcad8b2f065c89c49;p=sbcl.git diff --git a/src/code/unix.lisp b/src/code/unix.lisp index b6e0b00..fbae021 100644 --- a/src/code/unix.lisp +++ b/src/code/unix.lisp @@ -90,9 +90,9 @@ ;;;; hacking the Unix environment -(def-alien-routine ("getenv" posix-getenv) c-string - "Return the environment string \"name=value\" which corresponds to NAME, or - NIL if there is none." +(define-alien-routine ("getenv" posix-getenv) c-string + "Return the \"value\" part of the environment string \"name=value\" which + corresponds to NAME, or NIL if there is none." (name c-string)) ;;; from stdio.h @@ -112,12 +112,12 @@ ;;; is not extreme enough, since it doesn't need to be blindingly ;;; fast: we can just implement those functions in C as a wrapper ;;; layer. -(def-alien-type fd-mask unsigned-long) +(define-alien-type fd-mask unsigned-long) (eval-when (:compile-toplevel :load-toplevel :execute) (defconstant fd-setsize 1024)) -(def-alien-type nil +(define-alien-type nil (struct fd-set (fds-bits (array fd-mask #.(/ fd-setsize 32))))) @@ -152,7 +152,7 @@ ;; A time value that is accurate to the nearest ;; microsecond but also has a range of years. -(def-alien-type nil +(define-alien-type nil (struct timeval (tv-sec time-t) ; seconds (tv-usec time-t))) ; and microseconds @@ -163,7 +163,7 @@ (defconstant rusage_children -1) ; terminated child processes (defconstant rusage_both -2) -(def-alien-type nil +(define-alien-type nil (struct rusage (ru-utime (struct timeval)) ; user time used (ru-stime (struct timeval)) ; system time used. @@ -318,10 +318,10 @@ (void-syscall ("exit" int) code)) ;;; Return the process id of the current process. -(def-alien-routine ("getpid" unix-getpid) int) +(define-alien-routine ("getpid" unix-getpid) int) ;;; Return the real user-id associated with the current process. -(def-alien-routine ("getuid" unix-getuid) int) +(define-alien-routine ("getuid" unix-getuid) int) ;;; Invoke readlink(2) on the file name specified by PATH. Return ;;; (VALUES LINKSTRING NIL) on success, or (VALUES NIL ERRNO) on @@ -346,26 +346,6 @@ (declare (type unix-pathname name)) (void-syscall ("unlink" c-string) name)) -;;; Set the tty-process-group for the unix file-descriptor FD to PGRP. -;;; If not supplied, FD defaults to "/dev/tty". -(defun %set-tty-process-group (pgrp &optional fd) - (let ((old-sigs (unix-sigblock (sigmask :sigttou - :sigttin - :sigtstp - :sigchld)))) - (declare (type (unsigned-byte 32) old-sigs)) - (unwind-protect - (if fd - (tcsetpgrp fd pgrp) - (multiple-value-bind (tty-fd errno) (unix-open "/dev/tty" o_rdwr 0) - (cond (tty-fd - (multiple-value-prog1 - (tcsetpgrp tty-fd pgrp) - (unix-close tty-fd))) - (t - (values nil errno))))) - (unix-sigsetmask old-sigs)))) - ;;; Return the name of the host machine as a string. (defun unix-gethostname () (with-alien ((buf (array char 256))) @@ -439,30 +419,29 @@ ;;;; sys/select.h -(defmacro unix-fast-select (num-descriptors - read-fds write-fds exception-fds - timeout-secs &optional (timeout-usecs 0)) - #!+sb-doc - "Perform the UNIX select(2) system call." - (declare (type (integer 0 #.FD-SETSIZE) num-descriptors) +;;;; FIXME: Why have both UNIX-SELECT and UNIX-FAST-SELECT? + +;;; Perform the UNIX select(2) system call. +(declaim (inline unix-fast-select)) ; (used to be a macro in CMU CL) +(defun unix-fast-select (num-descriptors + read-fds write-fds exception-fds + timeout-secs &optional (timeout-usecs 0)) + (declare (type (integer 0 #.fd-setsize) num-descriptors) (type (or (alien (* (struct fd-set))) null) read-fds write-fds exception-fds) (type (or null (unsigned-byte 31)) timeout-secs) - (type (unsigned-byte 31) timeout-usecs) ) + (type (unsigned-byte 31) timeout-usecs)) ;; FIXME: CMU CL had - ;; (optimize (speed 3) (safety 0) (inhibit-warnings 3)) - ;; in the declarations above. If they're important, they should - ;; be in a declaration inside the LET expansion, not in the - ;; macro compile-time code. - `(let ((timeout-secs ,timeout-secs)) - (with-alien ((tv (struct timeval))) - (when timeout-secs - (setf (slot tv 'tv-sec) timeout-secs) - (setf (slot tv 'tv-usec) ,timeout-usecs)) - (int-syscall ("select" int (* (struct fd-set)) (* (struct fd-set)) - (* (struct fd-set)) (* (struct timeval))) - ,num-descriptors ,read-fds ,write-fds ,exception-fds - (if timeout-secs (alien-sap (addr tv)) (int-sap 0)))))) + ;; (declare (optimize (speed 3) (safety 0) (inhibit-warnings 3))) + ;; here. Is that important for SBCL? If so, why? Profiling might tell us.. + (with-alien ((tv (struct timeval))) + (when timeout-secs + (setf (slot tv 'tv-sec) timeout-secs) + (setf (slot tv 'tv-usec) timeout-usecs)) + (int-syscall ("select" int (* (struct fd-set)) (* (struct fd-set)) + (* (struct fd-set)) (* (struct timeval))) + num-descriptors read-fds write-fds exception-fds + (if timeout-secs (alien-sap (addr tv)) (int-sap 0))))) ;;; UNIX-SELECT accepts sets of file descriptors and waits for an event ;;; to happen on one of them or to time out. @@ -533,7 +512,7 @@ ;;; st_size is a long, not an off-t, because off-t is a 64-bit ;;; quantity on Alpha. And FIXME: "No one would want a file length ;;; longer than 32 bits anyway, right?":-| -(def-alien-type nil +(define-alien-type nil (struct wrapped_stat (st-dev unsigned-long) ; would be dev-t in a real stat (st-ino ino-t) @@ -608,13 +587,13 @@ ;; the POSIX.4 structure for a time value. This is like a "struct ;; timeval" but has nanoseconds instead of microseconds. -(def-alien-type nil +(define-alien-type nil (struct timespec (tv-sec long) ; seconds (tv-nsec long))) ; nanoseconds ;; used by other time functions -(def-alien-type nil +(define-alien-type nil (struct tm (tm-sec int) ; Seconds. [0-60] (1 leap second) (tm-min int) ; Minutes. [0-59] @@ -628,7 +607,7 @@ (tm-gmtoff long) ; Seconds east of UTC. (tm-zone c-string))) ; Timezone abbreviation. -(def-alien-routine get-timezone sb!c-call:void +(define-alien-routine get-timezone sb!c-call:void (when sb!c-call:long :in) (minutes-west sb!c-call:int :out) (daylight-savings-p sb!alien:boolean :out)) @@ -648,7 +627,7 @@ ;;; Structure crudely representing a timezone. KLUDGE: This is ;;; obsolete and should never be used. -(def-alien-type nil +(define-alien-type nil (struct timezone (tz-minuteswest int) ; minutes west of Greenwich (tz-dsttime int))) ; type of dst correction @@ -718,11 +697,11 @@ (defun unix-resolve-links (pathname) (declare (type simple-string pathname)) (aver (not (relative-unix-pathname? pathname))) - (/show "entering UNIX-RESOLVE-LINKS") + (/noshow "entering UNIX-RESOLVE-LINKS") (loop with previous-pathnames = nil do - (/show pathname previous-pathnames) + (/noshow pathname previous-pathnames) (let ((link (unix-readlink pathname))) - (/show link) + (/noshow link) ;; Unlike the old CMU CL code, we handle a broken symlink by ;; returning the link itself. That way, CL:TRUENAME on a ;; broken link returns the link itself, so that CL:DIRECTORY @@ -741,7 +720,7 @@ pathname :from-end t))) (dir (subseq pathname 0 dir-len))) - (/show dir) + (/noshow dir) (concatenate 'string dir link)) link)))) (if (unix-file-kind new-pathname)