X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Flinux-os.lisp;h=1e1e7868752f72db84975841c224aea9154103ca;hb=25fe91bf63fd473d9316675b0e0ca9be0079e9eb;hp=52610c7cbc004d022a8659ad2764a5ccf46eb3ba;hpb=4f9d842fc0a23394dbf5fc5b1916fe98a3ac7cbe;p=sbcl.git diff --git a/src/code/linux-os.lisp b/src/code/linux-os.lisp index 52610c7..1e1e786 100644 --- a/src/code/linux-os.lisp +++ b/src/code/linux-os.lisp @@ -1,4 +1,4 @@ -;;;; OS interface functions for CMU CL under Linux +;;;; OS interface functions for SBCL under Linux ;;;; This software is part of the SBCL system. See the README file for ;;;; more information. @@ -20,33 +20,20 @@ "Return a string describing the supporting software." (values "Linux")) -(defvar *software-version* nil) - +;;; FIXME: More duplicated logic here vrt. other oses. Abstract into +;;; uname-software-version? (defun software-version () #!+sb-doc "Return a string describing version of the supporting software, or NIL if not available." (or *software-version* (setf *software-version* - (string-trim '(#\newline) - (with-output-to-string (stream) - (sb!ext:run-program "/bin/uname" `("-r") - :output stream)))))) - -(defun os-cold-init-or-reinit () ; KLUDGE: don't know what to do here - (/show "entering linux-os.lisp OS-COLD-INIT-OR-REINIT") - (setf *software-version* nil) - (/show "setting *DEFAULT-PATHNAME-DEFAULTS*") - (setf *default-pathname-defaults* - ;; (temporary value, so that #'PATHNAME won't blow up when - ;; we call it below:) - (make-trivial-default-pathname) - *default-pathname-defaults* - ;; (final value, constructed using #'PATHNAME:) - (pathname (sb!unix:posix-getcwd/))) - (/show "leaving linux-os.lisp OS-COLD-INIT-OR-REINIT")) + (string-trim '(#\newline) + (with-output-to-string (stream) + (sb!ext:run-program "/bin/uname" `("-r") + :output stream)))))) -;;; Return system time, user time and number of page faults. +;;; Return user time, system time, and number of page faults. (defun get-system-info () (multiple-value-bind (err? utime stime maxrss ixrss idrss isrss minflt majflt)