... |
... |
@@ -352,51 +352,51 @@ |
352
|
352
|
(old-run-utime old-run-stime old-page-faults old-bytes-consed)
|
353
|
353
|
(time-get-sys-info))
|
354
|
354
|
(let ((start-gc-run-time *gc-run-time*))
|
355
|
|
- (setq cycle-count (- (cycle-count/float)))
|
356
|
|
- (multiple-value-prog1
|
357
|
|
- ;; Execute the form and return its values.
|
358
|
|
- (funcall fun)
|
359
|
|
- (incf cycle-count (cycle-count/float))
|
360
|
|
- (multiple-value-setq
|
361
|
|
- (new-run-utime new-run-stime new-page-faults new-bytes-consed)
|
362
|
|
- (time-get-sys-info))
|
363
|
|
- (setq new-real-time (- (get-internal-real-time) real-time-overhead))
|
364
|
|
- (let ((gc-run-time (max (- *gc-run-time* start-gc-run-time) 0))
|
365
|
|
- (bytes-consed (- new-bytes-consed old-bytes-consed cons-overhead)))
|
366
|
|
- (unless *in-get-time-consing*
|
367
|
|
- (terpri *trace-output*)
|
368
|
|
- (pprint-logical-block (*trace-output* nil :per-line-prefix "; ")
|
369
|
|
- (format *trace-output*
|
370
|
|
- (intl:gettext "Evaluation took:~% ~
|
|
355
|
+ (setq cycle-count (- (cycle-count/float)))
|
|
356
|
+ (multiple-value-prog1
|
|
357
|
+ ;; Execute the form and return its values.
|
|
358
|
+ (funcall fun)
|
|
359
|
+ (incf cycle-count (cycle-count/float))
|
|
360
|
+ (multiple-value-setq
|
|
361
|
+ (new-run-utime new-run-stime new-page-faults new-bytes-consed)
|
|
362
|
+ (time-get-sys-info))
|
|
363
|
+ (setq new-real-time (- (get-internal-real-time) real-time-overhead))
|
|
364
|
+ (let ((gc-run-time (max (- *gc-run-time* start-gc-run-time) 0))
|
|
365
|
+ (bytes-consed (- new-bytes-consed old-bytes-consed cons-overhead)))
|
|
366
|
+ (unless *in-get-time-consing*
|
|
367
|
+ (terpri *trace-output*)
|
|
368
|
+ (pprint-logical-block (*trace-output* nil :per-line-prefix "; ")
|
|
369
|
+ (format *trace-output*
|
|
370
|
+ (intl:gettext "Evaluation took:~% ~
|
371
|
371
|
~S seconds of real time~% ~
|
372
|
372
|
~S seconds of user run time~% ~
|
373
|
373
|
~S seconds of system run time~% ")
|
374
|
|
- (max (/ (- new-real-time old-real-time)
|
375
|
|
- (float internal-time-units-per-second))
|
376
|
|
- 0.0)
|
377
|
|
- (max (/ (- new-run-utime old-run-utime) 1000000.0) 0.0)
|
378
|
|
- (max (/ (- new-run-stime old-run-stime) 1000000.0) 0.0))
|
379
|
|
- (format *trace-output*
|
380
|
|
- (intl:ngettext
|
381
|
|
- "~:D ~A cycle~% ~
|
|
374
|
+ (max (/ (- new-real-time old-real-time)
|
|
375
|
+ (float internal-time-units-per-second))
|
|
376
|
+ 0.0)
|
|
377
|
+ (max (/ (- new-run-utime old-run-utime) 1000000.0) 0.0)
|
|
378
|
+ (max (/ (- new-run-stime old-run-stime) 1000000.0) 0.0))
|
|
379
|
+ (format *trace-output*
|
|
380
|
+ (intl:ngettext
|
|
381
|
+ "~:D ~A cycle~% ~
|
382
|
382
|
~@[[Run times include ~S seconds GC run time]~% ~]"
|
383
|
|
- "~:D ~A cycles~% ~
|
|
383
|
+ "~:D ~A cycles~% ~
|
384
|
384
|
~@[[Run times include ~S seconds GC run time]~% ~]"
|
385
|
|
- (truncate cycle-count))
|
386
|
|
- (truncate cycle-count)
|
387
|
|
- "CPU"
|
388
|
|
- (unless (zerop gc-run-time)
|
389
|
|
- (/ (float gc-run-time)
|
390
|
|
- (float internal-time-units-per-second))))
|
391
|
|
- (format *trace-output*
|
392
|
|
- (intl:ngettext "~S page fault and~% "
|
393
|
|
- "~S page faults and~% "
|
394
|
|
- (max (- new-page-faults old-page-faults) 0))
|
395
|
|
- (max (- new-page-faults old-page-faults) 0))
|
396
|
|
- (format *trace-output*
|
397
|
|
- (intl:ngettext "~:D byte consed.~%"
|
398
|
|
- "~:D bytes consed.~%"
|
399
|
|
- (max (- bytes-consed (or *time-consing* 0)) 0))
|
400
|
|
- (max (- bytes-consed (or *time-consing* 0)) 0)))
|
401
|
|
- (terpri *trace-output*))
|
402
|
|
- (setq *last-time-consing* bytes-consed)))))) |
|
385
|
+ (truncate cycle-count))
|
|
386
|
+ (truncate cycle-count)
|
|
387
|
+ "CPU"
|
|
388
|
+ (unless (zerop gc-run-time)
|
|
389
|
+ (/ (float gc-run-time)
|
|
390
|
+ (float internal-time-units-per-second))))
|
|
391
|
+ (format *trace-output*
|
|
392
|
+ (intl:ngettext "~S page fault and~% "
|
|
393
|
+ "~S page faults and~% "
|
|
394
|
+ (max (- new-page-faults old-page-faults) 0))
|
|
395
|
+ (max (- new-page-faults old-page-faults) 0))
|
|
396
|
+ (format *trace-output*
|
|
397
|
+ (intl:ngettext "~:D byte consed.~%"
|
|
398
|
+ "~:D bytes consed.~%"
|
|
399
|
+ (max (- bytes-consed (or *time-consing* 0)) 0))
|
|
400
|
+ (max (- bytes-consed (or *time-consing* 0)) 0)))
|
|
401
|
+ (terpri *trace-output*))
|
|
402
|
+ (setq *last-time-consing* bytes-consed)))))) |