X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftime.lisp;h=36944255df2e8c18650e3ae2ede21291e38c15c4;hb=86210c4e406c1b2ff10cc3bac0e71435867db48b;hp=34d64c3b7614f5a900bc6ab5e673541c5cd6d8ab;hpb=4a466c4908db0f6f5c468ae0eabb500ffac07aba;p=sbcl.git diff --git a/src/code/time.lisp b/src/code/time.lisp index 34d64c3..3694425 100644 --- a/src/code/time.lisp +++ b/src/code/time.lisp @@ -11,13 +11,13 @@ (in-package "SB!IMPL") -(defconstant internal-time-units-per-second 100 +(defconstant sb!xc:internal-time-units-per-second 1000 #!+sb-doc "The number of internal time units that fit into a second. See GET-INTERNAL-REAL-TIME and GET-INTERNAL-RUN-TIME.") (defconstant micro-seconds-per-internal-time-unit - (/ 1000000 internal-time-units-per-second)) + (/ 1000000 sb!xc:internal-time-units-per-second)) ;;; The base number of seconds for our internal "epoch". We initialize ;;; this to the time of the first call to GET-INTERNAL-REAL-TIME, and @@ -29,8 +29,6 @@ #!+sb-doc "Return the real time in the internal time format. This is useful for finding elapsed time. See INTERNAL-TIME-UNITS-PER-SECOND." - ;; FIXME: See comment on OPTIMIZE declaration in GET-INTERNAL-RUN-TIME. - (declare (optimize (speed 3) (safety 3))) (multiple-value-bind (ignore seconds useconds) (sb!unix:unix-gettimeofday) (declare (ignore ignore) (type (unsigned-byte 32) seconds useconds)) (let ((base *internal-real-time-base-seconds*) @@ -41,33 +39,17 @@ (truly-the (unsigned-byte 32) (+ (the (unsigned-byte 32) (* (the (unsigned-byte 32) (- seconds base)) - internal-time-units-per-second)) + sb!xc:internal-time-units-per-second)) uint))) (t (setq *internal-real-time-base-seconds* seconds) uint))))) -;;; REMOVEME once runtime nonmonotonicity problem is debugged -(defvar *last-utime-sec*) -(defvar *last-utime-usec*) -(defvar *last-stime-sec*) -(defvar *last-stime-usec*) -(defvar *last-internal-run-time*) -(push (lambda () - (makunbound '*last-internal-run-time*)) - *before-save-initializations*) - (defun get-internal-run-time () #!+sb-doc "Return the run time in the internal time format. This is useful for finding CPU usage." (declare (values (unsigned-byte 32))) - ;; FIXME: In CMU CL this was (SPEED 3) (SAFETY 0), and perhaps - ;; someday it should be again, since overhead here is annoying. But - ;; it's even more annoying to worry about this function returning - ;; out-of-range values, so while debugging the profiling code, - ;; I set it to (SAFETY 3) for now. - (declare (optimize (speed 3) (safety 3))) (multiple-value-bind (ignore utime-sec utime-usec stime-sec stime-usec) (sb!unix:unix-fast-getrusage sb!unix:rusage_self) (declare (ignore ignore) @@ -77,35 +59,13 @@ ;; documented anywhere and the observed behavior is to ;; sometimes return 1000000 exactly.) (type (integer 0 1000000) utime-usec stime-usec)) - (let ((result (+ (the (unsigned-byte 32) (* (the (unsigned-byte 32) (+ utime-sec stime-sec)) - internal-time-units-per-second)) + sb!xc:internal-time-units-per-second)) (floor (+ utime-usec stime-usec (floor micro-seconds-per-internal-time-unit 2)) micro-seconds-per-internal-time-unit)))) - - ;; REMOVEME once runtime nonmonotonicity problem is debugged - (when (boundp '*last-internal-run-time*) - (unless (>= result *last-internal-run-time*) - (error "non-monotonic:~@ - UTIME-SEC ~S ~S~@ - UTIME-USEC ~S ~S~@ - STIME-SEC ~S ~S~@ - STIME-USEC ~S ~S~@ - RESULT ~S ~S" - *last-utime-sec* utime-sec - *last-utime-usec* utime-usec - *last-stime-sec* stime-sec - *last-stime-usec* stime-usec - *last-internal-run-time* result))) - (setf *last-utime-sec* utime-sec - *last-utime-usec* utime-usec - *last-stime-sec* stime-sec - *last-stime-usec* stime-usec - *last-internal-run-time* result) - result))) ;;;; Encode and decode universal times. @@ -113,9 +73,9 @@ ;;; Returns two values: ;;; - the minutes west of GMT. ;;; - T if daylight savings is in effect, NIL if not. -(sb!alien:def-alien-routine get-timezone sb!c-call:void - (when sb!c-call:long :in) - (minutes-west sb!c-call:int :out) +(sb!alien:define-alien-routine get-timezone sb!alien:void + (when sb!alien:long :in) + (minutes-west sb!alien:int :out) (daylight-savings-p sb!alien:boolean :out)) ;;; Subtract from the returned Internal-Time to get the universal @@ -133,7 +93,7 @@ (defun get-universal-time () #!+sb-doc - "Returns a single integer for the current time of + "Return a single integer for the current time of day in universal time format." (multiple-value-bind (res secs) (sb!unix:unix-gettimeofday) (declare (ignore res)) @@ -141,7 +101,7 @@ (defun get-decoded-time () #!+sb-doc - "Returns nine values specifying the current time as follows: + "Return nine values specifying the current time as follows: second, minute, hour, date, month, year, day of week (0 = Monday), T (daylight savings times) or NIL (standard time), and timezone." (decode-universal-time (get-universal-time))) @@ -265,23 +225,8 @@ (defmacro time (form) #!+sb-doc - "Evaluates the Form and prints timing information on *Trace-Output*." - `(%time #'(lambda () ,form))) - -;;; Try to compile the closure arg to %TIME if it is interpreted. -(defun massage-time-function (fun) - (cond - ((sb!eval:interpreted-function-p fun) - (multiple-value-bind (def env-p) (function-lambda-expression fun) - (declare (ignore def)) - (cond - (env-p - (warn "non-null environment for TIME form, forced to interpret.~@ - Compiling the entire form will produce more accurate times.") - fun) - (t - (compile nil fun))))) - (t fun))) + "Execute FORM and print timing information on *TRACE-OUTPUT*." + `(%time (lambda () ,form))) ;;; Return all the data that we want TIME to report. (defun time-get-sys-info () @@ -291,8 +236,7 @@ ;;; The guts of the TIME macro. Compute overheads, run the (compiled) ;;; function, report the times. (defun %time (fun) - (let ((fun (massage-time-function fun)) - old-run-utime + (let (old-run-utime new-run-utime old-run-stime new-run-stime @@ -349,12 +293,12 @@ ~S page fault~:P and~% ~ ~S bytes consed.~%" (max (/ (- new-real-time old-real-time) - (float internal-time-units-per-second)) + (float sb!xc:internal-time-units-per-second)) 0.0) (max (/ (- new-run-utime old-run-utime) 1000000.0) 0.0) (max (/ (- new-run-stime old-run-stime) 1000000.0) 0.0) (unless (zerop gc-run-time) (/ (float gc-run-time) - (float internal-time-units-per-second))) + (float sb!xc:internal-time-units-per-second))) (max (- new-page-faults old-page-faults) 0) (max (- new-bytes-consed old-bytes-consed) 0)))))))