X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftime.lisp;h=e0d001f2df7eb82631c14aec5c6bb4a25c48d4bb;hb=ea36d3d79b9dfe3598faca5e267efd5980b94d4a;hp=6b9f5de445fcb86dec93420745349d28055eafb1;hpb=d45e8a2e9167150c8283783152d2449bd8d59d2d;p=sbcl.git

diff --git a/src/code/time.lisp b/src/code/time.lisp
index 6b9f5de..e0d001f 100644
--- a/src/code/time.lisp
+++ b/src/code/time.lisp
@@ -47,16 +47,6 @@
 	     (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
@@ -85,27 +75,6 @@
 			       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.
@@ -276,14 +245,14 @@
       (declare (ignore def))
       (cond
        (env-p
-	(warn "TIME form in a non-null environment, forced to interpret.~@
-	       Compiling entire form will produce more accurate times.")
+	(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)))
 
-;;; Return all the files that we want time to report.
+;;; Return all the data that we want TIME to report.
 (defun time-get-sys-info ()
   (multiple-value-bind (user sys faults) (sb!sys:get-system-info)
     (values user sys faults (get-bytes-consed))))