1.0.4.39: get rid of hardcoded mutex and spinlock slot indexes

[sbcl.git] / src / code / bsd-os.lisp

diff --git a/src/code/bsd-os.lisp b/src/code/bsd-os.lisp
index e36b615..97814f2 100644 (file)
--- a/src/code/bsd-os.lisp
+++ b/src/code/bsd-os.lisp
@@ -1,57 +1,46 @@
-;;;; OS interface functions for CMU CL under BSD Unix.
+;;;; OS interface functions for SBCL under BSD Unix.
 
 ;;;; This code was written as part of the CMU Common Lisp project at
 ;;;; Carnegie Mellon University, and has been placed in the public
 ;;;; domain.
 
-(sb!int:file-comment
-  "$Header$")
-
 (in-package "SB!SYS")
 
 ;;;; Check that target machine features are set up consistently with
 ;;;; this file.
-#!-bsd (eval-when (:compile-toplevel :load-toplevel :execute)
-        (error "The :BSD feature is missing, we shouldn't be doing this code."))
+#!-bsd
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (error "The :BSD feature is missing, we shouldn't be doing this code."))
 
 (defun software-type ()
   #!+sb-doc
   "Return a string describing the supporting software."
   (the string ; (to force error in case of unsupported BSD variant)
        #!+FreeBSD "FreeBSD"
-       #!+OpenBSD "OpenBSD"))
+       #!+OpenBSD "OpenBSD"
+       #!+NetBSD "NetBSD"
+       #!+Darwin "Darwin"))
 
 (defun software-version ()
   #!+sb-doc
   "Return a string describing version of the supporting software, or NIL
    if not available."
-  #+nil ; won't work until we support RUN-PROGRAM..
-  (unless *software-version*
-    (setf *software-version*
-         (string-trim '(#\newline)
-                      (with-output-to-string (stream)
-                        (run-program "/usr/bin/uname"
-                                     '("-r")
-                                     :output stream)))))
-  nil)
+  (or *software-version*
+      (setf *software-version*
+            (string-trim '(#\newline)
+                         (with-output-to-string (stream)
+                           (sb!ext:run-program "/usr/bin/uname" `("-r")
+                                               :output stream))))))
 \f
-;;; OS-COLD-INIT-OR-REINIT initializes our operating-system interface.
-;;; It sets the values of the global port variables to what they
-;;; should be and calls the functions that set up the argument blocks
-;;; for the server interfaces.
-(defun os-cold-init-or-reinit ()
-  (setf *software-version* nil))
-
 ;;; Return system time, user time and number of page faults.
 (defun get-system-info ()
   (multiple-value-bind (err? utime stime maxrss ixrss idrss
-                            isrss minflt majflt)
-                      (sb!unix:unix-getrusage sb!unix:rusage_self)
+                             isrss minflt majflt)
+                       (sb!unix:unix-getrusage sb!unix:rusage_self)
     (declare (ignore maxrss ixrss idrss isrss minflt))
     (unless err?
-      (error "Unix system call getrusage failed: ~A."
-            (sb!unix:get-unix-error-msg utime)))
-    
+      (simple-perror "Unix system call getrusage() failed" :errno utime))
+
     (values utime stime majflt)))
 
 ;;; Return the system page size.