[Openmcl-cvs-notifications] r15027 - /trunk/source/lib/misc.lisp

[gb at clozure.com]

Author: gb
Date: Mon Oct 17 15:44:40 2011
New Revision: 15027

Log:
In STANDARD-REPORT-TIME: try harder to make time-related numbers line up,
summarize differently.

Modified:
    trunk/source/lib/misc.lisp

Modified: trunk/source/lib/misc.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/lib/misc.lisp (original)
+++ trunk/source/lib/misc.lisp Mon Oct 17 15:44:40 2011
@@ -461,19 +461,33 @@
           (ecase internal-time-units-per-second
             (1000000 "microseconds")
             (1000  "milliseconds")))
-         (width
+         (iwidth (max (length (format nil "~:D" elapsed-time))
+                          (length (format nil "~:D" user-time))
+                          (length (format nil "~:D" system-time))
+                          (length (format nil "~:D" gc-time))))
+                      =

+         (fwidth
           (ecase internal-time-units-per-second
             (1000000 6)
             (1000  3)))
+         (elapsed-seconds (/ elapsed-time internal-time-units-per-second))
+         (user-seconds (/ user-time internal-time-units-per-second))
+         (system-seconds (/ system-time internal-time-units-per-second))
+         (gc-seconds  (/ gc-time internal-time-units-per-second))
+         (ffield-width (max (length (format nil "~,vF" fwidth elapsed-seco=
nds))
+                                (length (format nil "~,vF" fwidth user-sec=
onds))
+                                (length (format nil "~,vF" fwidth system-s=
econds))
+                                (length (format nil "~,vF" fwidth gc-secon=
ds))))
          (cpu-count (cpu-count)))
-    (format s "~&~S took ~:D ~a (~,vF seconds) to run ~%~20twith ~D availa=
ble CPU core~P."
-            form elapsed-time units width (/ elapsed-time internal-time-un=
its-per-second) cpu-count cpu-count)
-    (format s "~&During that period, ~:D ~a (~,vF seconds) were spent in u=
ser mode" user-time units width (/ user-time internal-time-units-per-second=
))
-    (format s "~&                    ~:D ~a (~,vF seconds) were spent in s=
ystem mode" system-time units width(/ system-time internal-time-units-per-s=
econd))
+    (format s "~&~S" form)
+    (format s "~&took ~v:D ~a (~v,vF seconds) to run." iwidth elapsed-time=
 units ffield-width fwidth elapsed-seconds )
     (unless (eql gc-time 0)
       (format s
-              "~%~:D ~a (~,vF seconds) was spent in GC."
-              gc-time units width (/ gc-time internal-time-units-per-secon=
d)))
+              "~%~5t~v:D ~a (~v,vF seconds, ~,2f%) of which was spent in G=
C." iwidth
+              gc-time units ffield-width fwidth gc-seconds (* 100.0 (/ gc-=
seconds elapsed-seconds))))
+    (format s "~&During that period, and with ~D available CPU core~P," cp=
u-count cpu-count)
+    (format s "~&~5t~v:D ~a (~v,vF seconds) were spent in user mode" iwidt=
h user-time units ffield-width fwidth user-seconds)
+    (format s "~&~5t~v:D ~a (~v,vF seconds) were spent in system mode" iwi=
dth system-time units ffield-width fwidth system-seconds)
     (unless (eql 0 bytes-allocated)
       (format s "~% ~:D bytes of memory allocated." bytes-allocated))
     (when (or (> minor-page-faults 0)