projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1.0.18.6: rename SB-PCL::FUNCTION-KEYWORD-PARAMETERS to CL:FUNCTION-KEYWORDS
[sbcl.git]
/
src
/
code
/
bsd-os.lisp
diff --git
a/src/code/bsd-os.lisp
b/src/code/bsd-os.lisp
index
4152ae2
..
97814f2
100644
(file)
--- a/
src/code/bsd-os.lisp
+++ b/
src/code/bsd-os.lisp
@@
-1,4
+1,4
@@
-;;;; 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
;;;; This code was written as part of the CMU Common Lisp project at
;;;; Carnegie Mellon University, and has been placed in the public
@@
-8,17
+8,18
@@
;;;; Check that target machine features are set up consistently with
;;;; this file.
;;;; 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"
(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"))
-
-(defvar *software-version* nil)
+ #!+OpenBSD "OpenBSD"
+ #!+NetBSD "NetBSD"
+ #!+Darwin "Darwin"))
(defun software-version ()
#!+sb-doc
(defun software-version ()
#!+sb-doc
@@
-26,25
+27,20
@@
if not available."
(or *software-version*
(setf *software-version*
if not available."
(or *software-version*
(setf *software-version*
- (string-trim '(#\newline)
- (with-output-to-string (stream)
- (sb!ext:run-program "/usr/bin/uname" `("-r")
- :output stream))))))
+ (string-trim '(#\newline)
+ (with-output-to-string (stream)
+ (sb!ext:run-program "/usr/bin/uname" `("-r")
+ :output stream))))))
\f
\f
-(defun os-cold-init-or-reinit ()
- (setf *software-version* nil)
- (setf *default-pathname-defaults*
- (pathname (sb!unix:posix-getcwd/))))
-
;;; Return system time, user time and number of page faults.
(defun get-system-info ()
(multiple-value-bind (err? utime stime maxrss ixrss idrss
;;; 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?
(simple-perror "Unix system call getrusage() failed" :errno utime))
(declare (ignore maxrss ixrss idrss isrss minflt))
(unless err?
(simple-perror "Unix system call getrusage() failed" :errno utime))
-
+
(values utime stime majflt)))
;;; Return the system page size.
(values utime stime majflt)))
;;; Return the system page size.