diff options
| author | Paul Eggert | 2011-06-30 17:27:45 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-06-30 17:27:45 -0700 |
| commit | e2bac5f625481e45ccd1a217af0cd211df461a20 (patch) | |
| tree | befe4dfdf322442afcdb0565f93f885e093c8f19 /lisp | |
| parent | 98768aebbe64e37b189364cf460aa4524339e3c0 (diff) | |
| download | emacs-e2bac5f625481e45ccd1a217af0cd211df461a20.tar.gz emacs-e2bac5f625481e45ccd1a217af0cd211df461a20.zip | |
* emacs-lisp/benchmark.el (benchmark-elapse): Use float-time.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 1 | ||||
| -rw-r--r-- | lisp/emacs-lisp/benchmark.el | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 346c290ab7b..ab071c79454 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | * calendar/timeclock.el (timeclock-seconds-to-time): | 3 | * calendar/timeclock.el (timeclock-seconds-to-time): |
| 4 | Defalias to seconds-to-time, since they're the same thing. | 4 | Defalias to seconds-to-time, since they're the same thing. |
| 5 | 5 | ||
| 6 | * emacs-lisp/benchmark.el (benchmark-elapse): | ||
| 6 | * allout-widgets.el (allout-elapsed-time-seconds): Use float-time. | 7 | * allout-widgets.el (allout-elapsed-time-seconds): Use float-time. |
| 7 | 8 | ||
| 8 | 2011-06-30 Lars Magne Ingebrigtsen <larsi@gnus.org> | 9 | 2011-06-30 Lars Magne Ingebrigtsen <larsi@gnus.org> |
diff --git a/lisp/emacs-lisp/benchmark.el b/lisp/emacs-lisp/benchmark.el index 86063c512c6..aa84a075b76 100644 --- a/lisp/emacs-lisp/benchmark.el +++ b/lisp/emacs-lisp/benchmark.el | |||
| @@ -39,9 +39,8 @@ | |||
| 39 | (setq ,t1 (current-time)) | 39 | (setq ,t1 (current-time)) |
| 40 | ,@forms | 40 | ,@forms |
| 41 | (setq ,t2 (current-time)) | 41 | (setq ,t2 (current-time)) |
| 42 | (+ (* (- (car ,t2) (car ,t1)) 65536.0) | 42 | (float-time (time-subtract ,t2 ,t1))))) |
| 43 | (- (nth 1 ,t2) (nth 1 ,t1)) | 43 | |
| 44 | (* (- (nth 2 ,t2) (nth 2 ,t1)) 1.0e-6))))) | ||
| 45 | (put 'benchmark-elapse 'edebug-form-spec t) | 44 | (put 'benchmark-elapse 'edebug-form-spec t) |
| 46 | (put 'benchmark-elapse 'lisp-indent-function 0) | 45 | (put 'benchmark-elapse 'lisp-indent-function 0) |
| 47 | 46 | ||