X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftime.lisp;h=5ddfde3be5cb01f5e0fcbfff532281d0f8686dd2;hb=840832c6ca7fae0af981d721bdbb38e567d575cf;hp=9ae42fcbfb9b69d2a1916c0269c611ee1c8119ed;hpb=a40c4adfd7837230109cdb1f054b44fe0b15371a;p=sbcl.git diff --git a/src/code/time.lisp b/src/code/time.lisp index 9ae42fc..5ddfde3 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,7 +39,7 @@ (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) @@ -52,12 +50,6 @@ "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) @@ -67,10 +59,9 @@ ;; 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)) @@ -79,14 +70,6 @@ ;;;; Encode and decode universal times. -;;; 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) - (daylight-savings-p sb!alien:boolean :out)) - ;;; Subtract from the returned Internal-Time to get the universal ;;; time. The offset between our time base and the Perq one is 2145 ;;; weeks and five days. @@ -102,7 +85,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)) @@ -110,7 +93,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))) @@ -133,15 +116,17 @@ (year NIL) (day NIL) (daylight NIL) - (timezone (if (null time-zone) - (multiple-value-bind - (ignore minwest dst) - (get-timezone (- universal-time - unix-to-universal-time)) - (declare (ignore ignore)) - (setf daylight dst) - minwest) - (* time-zone 60)))) + (timezone (cond + ((null time-zone) + (multiple-value-bind + (ignore minwest dst) + (sb!unix::get-timezone (- universal-time + unix-to-universal-time)) + (declare (ignore ignore)) + (declare (fixnum minwest)) + (setf daylight dst) + minwest)) + (t (* time-zone 60))))) (declare (fixnum timezone)) (multiple-value-bind (t1 seconds) (truncate secs 60) (setq second seconds) @@ -220,32 +205,20 @@ (if time-zone (+ second (* (+ minute (* (+ hours time-zone) 60)) 60)) (let* ((minwest-guess - (nth-value 1 - (get-timezone (- (* hours 60 60) - unix-to-universal-time)))) + (sb!unix::unix-get-minutes-west (- (* hours 60 60) + unix-to-universal-time))) (guess (+ minute (* hours 60) minwest-guess)) (minwest - (nth-value 1 - (get-timezone (- (* guess 60) - unix-to-universal-time))))) + (sb!unix::unix-get-minutes-west (- (* guess 60) + unix-to-universal-time)))) (+ second (* (+ guess (- minwest minwest-guess)) 60)))))) ;;;; TIME (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) - ;; This is just a placeholder as of the switch from IR1 interpreter - ;; to bytecode interpreter. Someday it might make sense to complain - ;; about bytecoded FUN and/or compile it to native code, so I've - ;; left the placeholder in place, but as of sbcl-0.7.0 it's not - ;; obvious how to do the right thing easily, so I haven't actually - ;; done it. -- WHN - 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 () @@ -255,8 +228,8 @@ ;;; 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 + (declare (type function fun)) + (let (old-run-utime new-run-utime old-run-stime new-run-stime @@ -313,12 +286,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)))))))