* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 20:43:43 +00:00
|
|
|
|
;;; elp.el --- Emacs Lisp Profiler -*- lexical-binding: t -*-
|
1994-09-14 09:03:27 +00:00
|
|
|
|
|
2014-01-01 07:43:34 +00:00
|
|
|
|
;; Copyright (C) 1994-1995, 1997-1998, 2001-2014 Free Software
|
2013-01-01 09:11:05 +00:00
|
|
|
|
;; Foundation, Inc.
|
1994-09-14 20:21:36 +00:00
|
|
|
|
|
2001-07-15 19:53:53 +00:00
|
|
|
|
;; Author: Barry A. Warsaw
|
2014-02-10 01:34:22 +00:00
|
|
|
|
;; Maintainer: emacs-devel@gnu.org
|
2001-07-15 19:53:53 +00:00
|
|
|
|
;; Created: 26-Feb-1994
|
|
|
|
|
;; Keywords: debugging lisp tools
|
1994-09-14 09:03:27 +00:00
|
|
|
|
|
1994-09-14 20:21:36 +00:00
|
|
|
|
;; This file is part of GNU Emacs.
|
1994-09-14 09:03:27 +00:00
|
|
|
|
|
2008-05-06 03:21:21 +00:00
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
1994-09-14 09:03:27 +00:00
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 03:21:21 +00:00
|
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
;; (at your option) any later version.
|
1994-09-14 20:21:36 +00:00
|
|
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
1994-09-14 09:03:27 +00:00
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
1994-09-14 20:21:36 +00:00
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2008-05-06 03:21:21 +00:00
|
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
1994-09-14 09:03:27 +00:00
|
|
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
;;
|
1994-12-29 00:11:46 +00:00
|
|
|
|
;; If you want to profile a bunch of functions, set elp-function-list
|
|
|
|
|
;; to the list of symbols, then do a M-x elp-instrument-list. This
|
|
|
|
|
;; hacks those functions so that profiling information is recorded
|
|
|
|
|
;; whenever they are called. To print out the current results, use
|
1997-04-12 19:14:18 +00:00
|
|
|
|
;; M-x elp-results. If you want output to go to standard-output
|
|
|
|
|
;; instead of a separate buffer, setq elp-use-standard-output to
|
|
|
|
|
;; non-nil. With elp-reset-after-results set to non-nil, profiling
|
|
|
|
|
;; information will be reset whenever the results are displayed. You
|
|
|
|
|
;; can also reset all profiling info at any time with M-x
|
|
|
|
|
;; elp-reset-all.
|
1994-09-14 20:21:36 +00:00
|
|
|
|
;;
|
|
|
|
|
;; You can also instrument all functions in a package, provided that
|
2001-12-27 03:23:50 +00:00
|
|
|
|
;; the package follows the GNU coding standard of a common textual
|
1994-12-29 00:11:46 +00:00
|
|
|
|
;; prefix. Use M-x elp-instrument-package for this.
|
1994-09-14 09:03:27 +00:00
|
|
|
|
;;
|
|
|
|
|
;; If you want to sort the results, set elp-sort-by-function to some
|
|
|
|
|
;; predicate function. The three most obvious choices are predefined:
|
|
|
|
|
;; elp-sort-by-call-count, elp-sort-by-average-time, and
|
1994-12-29 00:11:46 +00:00
|
|
|
|
;; elp-sort-by-total-time. Also, you can prune from the output, all
|
|
|
|
|
;; functions that have been called fewer than a given number of times
|
|
|
|
|
;; by setting elp-report-limit.
|
1994-09-14 09:03:27 +00:00
|
|
|
|
;;
|
|
|
|
|
;; Elp can instrument byte-compiled functions just as easily as
|
1994-09-14 20:21:36 +00:00
|
|
|
|
;; interpreted functions, but it cannot instrument macros. However,
|
1994-12-24 04:27:01 +00:00
|
|
|
|
;; when you redefine a function (e.g. with eval-defun), you'll need to
|
1994-12-29 00:11:46 +00:00
|
|
|
|
;; re-instrument it with M-x elp-instrument-function. This will also
|
|
|
|
|
;; reset profiling information for that function. Elp can handle
|
|
|
|
|
;; interactive functions (i.e. commands), but of course any time spent
|
|
|
|
|
;; idling for user prompts will show up in the timing results.
|
1994-09-14 09:03:27 +00:00
|
|
|
|
;;
|
|
|
|
|
;; You can also designate a `master' function. Profiling times will
|
|
|
|
|
;; be gathered for instrumented functions only during execution of
|
|
|
|
|
;; this master function. Thus, if you have some defuns like:
|
|
|
|
|
;;
|
|
|
|
|
;; (defun foo () (do-something-time-intensive))
|
|
|
|
|
;; (defun bar () (foo))
|
|
|
|
|
;; (defun baz () (bar) (foo))
|
|
|
|
|
;;
|
|
|
|
|
;; and you want to find out the amount of time spent in bar and foo,
|
1994-12-24 04:27:01 +00:00
|
|
|
|
;; but only during execution of bar, make bar the master. The call of
|
1994-12-29 00:11:46 +00:00
|
|
|
|
;; foo from baz will not add to foo's total timing sums. Use M-x
|
|
|
|
|
;; elp-set-master and M-x elp-unset-master to utilize this feature.
|
|
|
|
|
;; Only one master function can be set at a time.
|
1994-09-14 09:03:27 +00:00
|
|
|
|
|
|
|
|
|
;; You can restore any function's original function definition with
|
|
|
|
|
;; elp-restore-function. The other instrument, restore, and reset
|
|
|
|
|
;; functions are provided for symmetry.
|
|
|
|
|
|
1994-12-26 15:49:29 +00:00
|
|
|
|
;; Here is a list of variable you can use to customize elp:
|
|
|
|
|
;; elp-function-list
|
|
|
|
|
;; elp-reset-after-results
|
|
|
|
|
;; elp-sort-by-function
|
|
|
|
|
;; elp-report-limit
|
|
|
|
|
;;
|
|
|
|
|
;; Here is a list of the interactive commands you can use:
|
|
|
|
|
;; elp-instrument-function
|
|
|
|
|
;; elp-restore-function
|
|
|
|
|
;; elp-instrument-list
|
|
|
|
|
;; elp-restore-list
|
|
|
|
|
;; elp-instrument-package
|
|
|
|
|
;; elp-restore-all
|
|
|
|
|
;; elp-reset-function
|
|
|
|
|
;; elp-reset-list
|
|
|
|
|
;; elp-reset-all
|
|
|
|
|
;; elp-set-master
|
|
|
|
|
;; elp-unset-master
|
|
|
|
|
;; elp-results
|
|
|
|
|
|
1994-12-29 00:11:46 +00:00
|
|
|
|
;; Note that there are plenty of factors that could make the times
|
|
|
|
|
;; reported unreliable, including the accuracy and granularity of your
|
|
|
|
|
;; system clock, and the overhead spent in lisp calculating and
|
|
|
|
|
;; recording the intervals. I figure the latter is pretty constant,
|
|
|
|
|
;; so while the times may not be entirely accurate, I think they'll
|
|
|
|
|
;; give you a good feel for the relative amount of work spent in the
|
|
|
|
|
;; various lisp routines you are profiling. Note further that times
|
|
|
|
|
;; are calculated using wall-clock time, so other system load will
|
1997-04-12 19:14:18 +00:00
|
|
|
|
;; affect accuracy too.
|
1994-12-29 00:11:46 +00:00
|
|
|
|
|
1994-12-26 15:49:29 +00:00
|
|
|
|
;;; Background:
|
|
|
|
|
|
1997-04-21 23:48:34 +00:00
|
|
|
|
;; This program was inspired by the only two existing Emacs Lisp
|
|
|
|
|
;; profilers that I'm aware of, Boaz Ben-Zvi's profile.el, and Root
|
|
|
|
|
;; Boy Jim's profiler.el. Both were written for Emacs 18 and both were
|
|
|
|
|
;; pretty good first shots at profiling, but I found that they didn't
|
|
|
|
|
;; provide the functionality or interface that I wanted, so I wrote
|
|
|
|
|
;; this. I've tested elp in XEmacs 19 and Emacs 19. There's no point
|
|
|
|
|
;; in even trying to make this work with Emacs 18.
|
1994-12-26 15:49:29 +00:00
|
|
|
|
|
|
|
|
|
;; Unlike previous profilers, elp uses Emacs 19's built-in function
|
|
|
|
|
;; current-time to return interval times. This obviates the need for
|
|
|
|
|
;; both an external C program and Emacs processes to communicate with
|
1994-12-29 00:11:46 +00:00
|
|
|
|
;; such a program, and thus simplifies the package as a whole.
|
1994-12-24 04:27:01 +00:00
|
|
|
|
|
1997-04-12 19:14:18 +00:00
|
|
|
|
;; TBD:
|
|
|
|
|
;; Make this act like a real profiler, so that it records time spent
|
|
|
|
|
;; in all branches of execution.
|
|
|
|
|
|
1994-09-14 09:03:27 +00:00
|
|
|
|
;;; Code:
|
|
|
|
|
|
* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 20:43:43 +00:00
|
|
|
|
(eval-when-compile (require 'cl-lib))
|
1994-09-14 09:03:27 +00:00
|
|
|
|
|
1997-04-21 23:48:34 +00:00
|
|
|
|
;; start of user configuration variables
|
1994-09-14 09:03:27 +00:00
|
|
|
|
;; vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
|
|
|
|
|
|
1997-04-12 19:31:00 +00:00
|
|
|
|
(defgroup elp nil
|
2005-07-04 02:44:09 +00:00
|
|
|
|
"Emacs Lisp Profiler."
|
1997-04-12 19:31:00 +00:00
|
|
|
|
:group 'lisp)
|
1994-09-14 09:03:27 +00:00
|
|
|
|
|
1997-04-12 19:31:00 +00:00
|
|
|
|
(defcustom elp-function-list nil
|
2009-07-22 02:45:34 +00:00
|
|
|
|
"List of functions to profile.
|
1997-04-12 19:31:00 +00:00
|
|
|
|
Used by the command `elp-instrument-list'."
|
|
|
|
|
:type '(repeat function)
|
|
|
|
|
:group 'elp)
|
|
|
|
|
|
|
|
|
|
(defcustom elp-reset-after-results t
|
2009-07-22 02:45:34 +00:00
|
|
|
|
"Non-nil means reset all profiling info after results are displayed.
|
1997-04-12 19:31:00 +00:00
|
|
|
|
Results are displayed with the `elp-results' command."
|
|
|
|
|
:type 'boolean
|
|
|
|
|
:group 'elp)
|
1994-09-14 09:03:27 +00:00
|
|
|
|
|
1997-04-12 19:31:00 +00:00
|
|
|
|
(defcustom elp-sort-by-function 'elp-sort-by-total-time
|
2009-07-22 02:45:34 +00:00
|
|
|
|
"Non-nil specifies ELP results sorting function.
|
1994-09-14 09:03:27 +00:00
|
|
|
|
These functions are currently available:
|
|
|
|
|
|
* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 20:43:43 +00:00
|
|
|
|
`elp-sort-by-call-count' -- sort by the highest call count
|
|
|
|
|
`elp-sort-by-total-time' -- sort by the highest total time
|
|
|
|
|
`elp-sort-by-average-time' -- sort by the highest average times
|
1994-09-14 09:03:27 +00:00
|
|
|
|
|
2007-10-31 12:09:33 +00:00
|
|
|
|
You can write your own sort function. It should adhere to the
|
|
|
|
|
interface specified by the PREDICATE argument for `sort'.
|
|
|
|
|
Each \"element of LIST\" is really a 4 element vector where element 0 is
|
1994-09-14 09:03:27 +00:00
|
|
|
|
the call count, element 1 is the total time spent in the function,
|
|
|
|
|
element 2 is the average time spent in the function, and element 3 is
|
1997-04-12 19:31:00 +00:00
|
|
|
|
the symbol's name string."
|
|
|
|
|
:type 'function
|
|
|
|
|
:group 'elp)
|
1994-09-14 09:03:27 +00:00
|
|
|
|
|
1997-04-12 19:31:00 +00:00
|
|
|
|
(defcustom elp-report-limit 1
|
2009-07-22 02:45:34 +00:00
|
|
|
|
"Prevent some functions from being displayed in the results buffer.
|
1994-09-14 20:21:36 +00:00
|
|
|
|
If a number, no function that has been called fewer than that number
|
|
|
|
|
of times will be displayed in the output buffer. If nil, all
|
1997-04-12 19:31:00 +00:00
|
|
|
|
functions will be displayed."
|
|
|
|
|
:type '(choice integer
|
* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 20:43:43 +00:00
|
|
|
|
(const :tag "Show All" nil))
|
1997-04-12 19:31:00 +00:00
|
|
|
|
:group 'elp)
|
1994-09-14 20:21:36 +00:00
|
|
|
|
|
1997-04-12 19:31:00 +00:00
|
|
|
|
(defcustom elp-use-standard-output nil
|
2009-07-22 02:45:34 +00:00
|
|
|
|
"If non-nil, output to `standard-output' instead of a buffer."
|
1997-04-12 19:31:00 +00:00
|
|
|
|
:type 'boolean
|
|
|
|
|
:group 'elp)
|
1997-04-12 19:14:18 +00:00
|
|
|
|
|
1997-04-12 19:31:00 +00:00
|
|
|
|
(defcustom elp-recycle-buffers-p t
|
2009-07-22 02:45:34 +00:00
|
|
|
|
"If nil, don't recycle the `elp-results-buffer'.
|
1997-04-12 19:14:18 +00:00
|
|
|
|
In other words, a new unique buffer is create every time you run
|
1997-04-12 19:31:00 +00:00
|
|
|
|
\\[elp-results]."
|
|
|
|
|
:type 'boolean
|
|
|
|
|
:group 'elp)
|
1997-04-12 19:14:18 +00:00
|
|
|
|
|
1994-09-14 09:03:27 +00:00
|
|
|
|
|
|
|
|
|
;; ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
1997-04-12 19:14:18 +00:00
|
|
|
|
;; end of user configuration variables
|
1994-09-14 09:03:27 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(defvar elp-results-buffer "*ELP Profiling Results*"
|
|
|
|
|
"Buffer name for outputting profiling results.")
|
|
|
|
|
|
|
|
|
|
(defconst elp-timer-info-property 'elp-info
|
|
|
|
|
"ELP information property name.")
|
|
|
|
|
|
|
|
|
|
(defvar elp-record-p t
|
|
|
|
|
"Controls whether functions should record times or not.
|
|
|
|
|
This variable is set by the master function.")
|
|
|
|
|
|
|
|
|
|
(defvar elp-master nil
|
|
|
|
|
"Master function symbol.")
|
|
|
|
|
|
2001-11-17 00:58:21 +00:00
|
|
|
|
(defvar elp-not-profilable
|
2005-11-28 21:55:15 +00:00
|
|
|
|
;; First, the functions used inside each instrumented function:
|
* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 20:43:43 +00:00
|
|
|
|
'(called-interactively-p
|
2005-11-28 21:55:15 +00:00
|
|
|
|
;; Then the functions used by the above functions. I used
|
|
|
|
|
;; (delq nil (mapcar (lambda (x) (and (symbolp x) (fboundp x) x))
|
|
|
|
|
;; (aref (symbol-function 'elp-wrapper) 2)))
|
|
|
|
|
;; to help me find this list.
|
2009-09-12 01:40:11 +00:00
|
|
|
|
error call-interactively apply current-time
|
|
|
|
|
;; Andreas Politz reports problems profiling these (Bug#4233):
|
|
|
|
|
+ byte-code-function-p functionp byte-code subrp
|
|
|
|
|
indirect-function fboundp)
|
2001-11-17 00:58:21 +00:00
|
|
|
|
"List of functions that cannot be profiled.
|
|
|
|
|
Those functions are used internally by the profiling code and profiling
|
|
|
|
|
them would thus lead to infinite recursion.")
|
|
|
|
|
|
2005-11-28 21:55:15 +00:00
|
|
|
|
(defun elp-profilable-p (fun)
|
|
|
|
|
(and (symbolp fun)
|
|
|
|
|
(fboundp fun)
|
|
|
|
|
(not (or (memq fun elp-not-profilable)
|
|
|
|
|
(keymapp fun)
|
* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 20:43:43 +00:00
|
|
|
|
(autoloadp (symbol-function fun)) ;FIXME: Why not just load it?
|
|
|
|
|
(special-form-p fun)))))
|
2001-11-17 00:58:21 +00:00
|
|
|
|
|
* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 20:43:43 +00:00
|
|
|
|
(defconst elp--advice-name 'ELP-instrumentation\ )
|
1997-04-21 23:48:34 +00:00
|
|
|
|
|
1994-09-14 20:24:21 +00:00
|
|
|
|
;;;###autoload
|
1994-09-14 09:03:27 +00:00
|
|
|
|
(defun elp-instrument-function (funsym)
|
|
|
|
|
"Instrument FUNSYM for profiling.
|
|
|
|
|
FUNSYM must be a symbol of a defined function."
|
|
|
|
|
(interactive "aFunction to instrument: ")
|
* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 20:43:43 +00:00
|
|
|
|
(let* ((infovec (vector 0 0)))
|
2005-11-28 21:55:15 +00:00
|
|
|
|
;; We cannot profile functions used internally during profiling.
|
|
|
|
|
(unless (elp-profilable-p funsym)
|
|
|
|
|
(error "ELP cannot profile the function: %s" funsym))
|
* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 20:43:43 +00:00
|
|
|
|
;; The info vector data structure is a 2 element vector. The 0th
|
1994-09-14 09:03:27 +00:00
|
|
|
|
;; element is the call-count, i.e. the total number of times this
|
|
|
|
|
;; function has been entered. This value is bumped up on entry to
|
|
|
|
|
;; the function so that non-local exists are still recorded. TBD:
|
|
|
|
|
;; I haven't tested non-local exits at all, so no guarantees.
|
|
|
|
|
;;
|
2011-07-01 00:30:18 +00:00
|
|
|
|
;; The 1st element is the total amount of time in seconds that has
|
1994-09-14 09:03:27 +00:00
|
|
|
|
;; been spent inside this function. This number is added to on
|
|
|
|
|
;; function exit.
|
|
|
|
|
|
* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 20:43:43 +00:00
|
|
|
|
;; Put the info vector on the property list.
|
1994-09-14 09:03:27 +00:00
|
|
|
|
(put funsym elp-timer-info-property infovec)
|
|
|
|
|
|
2001-05-17 13:58:14 +00:00
|
|
|
|
;; Set the symbol's new profiling function definition to run
|
* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 20:43:43 +00:00
|
|
|
|
;; ELP wrapper.
|
|
|
|
|
(advice-add funsym :around (elp--make-wrapper funsym)
|
2013-12-12 19:47:11 +00:00
|
|
|
|
`((name . ,elp--advice-name) (depth . -99)))))
|
* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 20:43:43 +00:00
|
|
|
|
|
|
|
|
|
(defun elp--instrumented-p (sym)
|
|
|
|
|
(advice-member-p elp--advice-name sym))
|
1994-09-14 09:03:27 +00:00
|
|
|
|
|
|
|
|
|
(defun elp-restore-function (funsym)
|
|
|
|
|
"Restore an instrumented function to its original definition.
|
|
|
|
|
Argument FUNSYM is the symbol of a defined function."
|
* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 20:43:43 +00:00
|
|
|
|
(interactive
|
|
|
|
|
(list
|
|
|
|
|
(intern
|
|
|
|
|
(completing-read "Function to restore: " obarray
|
|
|
|
|
#'elp--instrumented-p t))))
|
|
|
|
|
;; If the function was the master, reset the master.
|
|
|
|
|
(if (eq funsym elp-master)
|
|
|
|
|
(setq elp-master nil
|
|
|
|
|
elp-record-p t))
|
|
|
|
|
|
|
|
|
|
;; Zap the properties.
|
|
|
|
|
(put funsym elp-timer-info-property nil)
|
|
|
|
|
|
|
|
|
|
(advice-remove funsym elp--advice-name))
|
1994-09-14 09:03:27 +00:00
|
|
|
|
|
1994-09-14 20:24:21 +00:00
|
|
|
|
;;;###autoload
|
1994-09-14 09:03:27 +00:00
|
|
|
|
(defun elp-instrument-list (&optional list)
|
2008-11-24 15:09:02 +00:00
|
|
|
|
"Instrument, for profiling, all functions in `elp-function-list'.
|
|
|
|
|
Use optional LIST if provided instead.
|
|
|
|
|
If called interactively, read LIST using the minibuffer."
|
* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 20:43:43 +00:00
|
|
|
|
(interactive "PList of functions to instrument: ") ;FIXME: Doesn't work?!
|
2008-11-24 15:09:02 +00:00
|
|
|
|
(unless (listp list)
|
2008-11-24 18:23:53 +00:00
|
|
|
|
(signal 'wrong-type-argument (list 'listp list)))
|
* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 20:43:43 +00:00
|
|
|
|
(mapcar #'elp-instrument-function (or list elp-function-list)))
|
1994-09-14 09:03:27 +00:00
|
|
|
|
|
1994-09-14 20:24:21 +00:00
|
|
|
|
;;;###autoload
|
1994-09-14 20:21:36 +00:00
|
|
|
|
(defun elp-instrument-package (prefix)
|
|
|
|
|
"Instrument for profiling, all functions which start with PREFIX.
|
|
|
|
|
For example, to instrument all ELP functions, do the following:
|
|
|
|
|
|
|
|
|
|
\\[elp-instrument-package] RET elp- RET"
|
2005-11-28 21:55:15 +00:00
|
|
|
|
(interactive
|
|
|
|
|
(list (completing-read "Prefix of package to instrument: "
|
|
|
|
|
obarray 'elp-profilable-p)))
|
2001-05-14 17:52:12 +00:00
|
|
|
|
(if (zerop (length prefix))
|
2001-07-15 19:53:53 +00:00
|
|
|
|
(error "Instrumenting all Emacs functions would render Emacs unusable"))
|
1994-09-14 20:21:36 +00:00
|
|
|
|
(elp-instrument-list
|
1997-04-21 23:48:34 +00:00
|
|
|
|
(mapcar
|
|
|
|
|
'intern
|
2005-11-28 21:55:15 +00:00
|
|
|
|
(all-completions prefix obarray 'elp-profilable-p))))
|
1994-09-14 20:21:36 +00:00
|
|
|
|
|
1994-09-14 09:03:27 +00:00
|
|
|
|
(defun elp-restore-list (&optional list)
|
|
|
|
|
"Restore the original definitions for all functions in `elp-function-list'.
|
|
|
|
|
Use optional LIST if provided instead."
|
* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 20:43:43 +00:00
|
|
|
|
(interactive "PList of functions to restore: ") ;FIXME: Doesn't work!?
|
|
|
|
|
(mapcar #'elp-restore-function (or list elp-function-list)))
|
1994-09-14 09:03:27 +00:00
|
|
|
|
|
|
|
|
|
(defun elp-restore-all ()
|
2007-10-31 12:09:33 +00:00
|
|
|
|
"Restore the original definitions of all functions being profiled."
|
1994-09-14 09:03:27 +00:00
|
|
|
|
(interactive)
|
* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 20:43:43 +00:00
|
|
|
|
(mapatoms #'elp-restore-function))
|
1994-09-14 09:03:27 +00:00
|
|
|
|
|
|
|
|
|
(defun elp-reset-function (funsym)
|
|
|
|
|
"Reset the profiling information for FUNSYM."
|
|
|
|
|
(interactive "aFunction to reset: ")
|
|
|
|
|
(let ((info (get funsym elp-timer-info-property)))
|
|
|
|
|
(or info
|
2001-07-15 19:53:53 +00:00
|
|
|
|
(error "%s is not instrumented for profiling" funsym))
|
1994-09-14 09:03:27 +00:00
|
|
|
|
(aset info 0 0) ;reset call counter
|
|
|
|
|
(aset info 1 0.0) ;reset total time
|
|
|
|
|
;; don't muck with aref 2 as that is the old symbol definition
|
|
|
|
|
))
|
|
|
|
|
|
|
|
|
|
(defun elp-reset-list (&optional list)
|
|
|
|
|
"Reset the profiling information for all functions in `elp-function-list'.
|
|
|
|
|
Use optional LIST if provided instead."
|
* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 20:43:43 +00:00
|
|
|
|
(interactive "PList of functions to reset: ") ;FIXME: Doesn't work!?
|
1994-09-14 09:03:27 +00:00
|
|
|
|
(let ((list (or list elp-function-list)))
|
|
|
|
|
(mapcar 'elp-reset-function list)))
|
|
|
|
|
|
|
|
|
|
(defun elp-reset-all ()
|
|
|
|
|
"Reset the profiling information for all functions being profiled."
|
|
|
|
|
(interactive)
|
* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 20:43:43 +00:00
|
|
|
|
(mapatoms (lambda (sym)
|
|
|
|
|
(if (get sym elp-timer-info-property)
|
|
|
|
|
(elp-reset-function sym)))))
|
1994-09-14 09:03:27 +00:00
|
|
|
|
|
|
|
|
|
(defun elp-set-master (funsym)
|
|
|
|
|
"Set the master function for profiling."
|
* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 20:43:43 +00:00
|
|
|
|
(interactive
|
|
|
|
|
(list
|
|
|
|
|
(intern
|
|
|
|
|
(completing-read "Master function: " obarray
|
|
|
|
|
#'elp--instrumented-p
|
|
|
|
|
t nil nil (if elp-master (symbol-name elp-master))))))
|
|
|
|
|
;; When there's a master function, recording is turned off by default.
|
1994-09-14 09:03:27 +00:00
|
|
|
|
(setq elp-master funsym
|
|
|
|
|
elp-record-p nil)
|
* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 20:43:43 +00:00
|
|
|
|
;; Make sure master function is instrumented.
|
|
|
|
|
(or (elp--instrumented-p funsym)
|
1994-09-14 09:03:27 +00:00
|
|
|
|
(elp-instrument-function funsym)))
|
|
|
|
|
|
|
|
|
|
(defun elp-unset-master ()
|
2007-10-31 12:09:33 +00:00
|
|
|
|
"Unset the master function."
|
1994-12-24 04:27:01 +00:00
|
|
|
|
(interactive)
|
* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 20:43:43 +00:00
|
|
|
|
;; When there's no master function, recording is turned on by default.
|
1994-09-14 09:03:27 +00:00
|
|
|
|
(setq elp-master nil
|
|
|
|
|
elp-record-p t))
|
|
|
|
|
|
|
|
|
|
|
1997-04-12 19:14:18 +00:00
|
|
|
|
(defsubst elp-elapsed-time (start end)
|
2011-07-01 00:30:18 +00:00
|
|
|
|
(float-time (time-subtract end start)))
|
1994-09-14 09:03:27 +00:00
|
|
|
|
|
* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 20:43:43 +00:00
|
|
|
|
(defun elp--make-wrapper (funsym)
|
|
|
|
|
"Make the piece of advice that instruments FUNSYM."
|
|
|
|
|
(lambda (func &rest args)
|
|
|
|
|
"This function has been instrumented for profiling by the ELP.
|
1994-09-14 09:03:27 +00:00
|
|
|
|
ELP is the Emacs Lisp Profiler. To restore the function to its
|
|
|
|
|
original definition, use \\[elp-restore-function] or \\[elp-restore-all]."
|
* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 20:43:43 +00:00
|
|
|
|
;; turn on recording if this is the master function
|
|
|
|
|
(if (and elp-master
|
|
|
|
|
(eq funsym elp-master))
|
|
|
|
|
(setq elp-record-p t))
|
|
|
|
|
;; get info vector and original function symbol
|
|
|
|
|
(let* ((info (get funsym elp-timer-info-property))
|
|
|
|
|
result)
|
|
|
|
|
(or func
|
|
|
|
|
(error "%s is not instrumented for profiling" funsym))
|
|
|
|
|
(if (not elp-record-p)
|
|
|
|
|
;; when not recording, just call the original function symbol
|
|
|
|
|
;; and return the results.
|
|
|
|
|
(setq result (apply func args))
|
|
|
|
|
;; we are recording times
|
|
|
|
|
(let (enter-time exit-time)
|
|
|
|
|
;; increment the call-counter
|
|
|
|
|
(cl-incf (aref info 0))
|
1997-04-12 19:14:18 +00:00
|
|
|
|
(setq enter-time (current-time)
|
|
|
|
|
result (apply func args)
|
* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 20:43:43 +00:00
|
|
|
|
exit-time (current-time))
|
|
|
|
|
;; calculate total time in function
|
|
|
|
|
(cl-incf (aref info 1) (elp-elapsed-time enter-time exit-time))
|
|
|
|
|
))
|
|
|
|
|
;; turn off recording if this is the master function
|
|
|
|
|
(if (and elp-master
|
|
|
|
|
(eq funsym elp-master))
|
|
|
|
|
(setq elp-record-p nil))
|
|
|
|
|
result)))
|
1994-09-14 09:03:27 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; shut the byte-compiler up
|
|
|
|
|
(defvar elp-field-len nil)
|
|
|
|
|
(defvar elp-cc-len nil)
|
|
|
|
|
(defvar elp-at-len nil)
|
|
|
|
|
(defvar elp-et-len nil)
|
|
|
|
|
|
|
|
|
|
(defun elp-sort-by-call-count (vec1 vec2)
|
|
|
|
|
;; sort by highest call count. See `sort'.
|
|
|
|
|
(>= (aref vec1 0) (aref vec2 0)))
|
|
|
|
|
|
|
|
|
|
(defun elp-sort-by-total-time (vec1 vec2)
|
|
|
|
|
;; sort by highest total time spent in function. See `sort'.
|
|
|
|
|
(>= (aref vec1 1) (aref vec2 1)))
|
|
|
|
|
|
|
|
|
|
(defun elp-sort-by-average-time (vec1 vec2)
|
|
|
|
|
;; sort by highest average time spent in function. See `sort'.
|
|
|
|
|
(>= (aref vec1 2) (aref vec2 2)))
|
|
|
|
|
|
1994-12-24 04:27:01 +00:00
|
|
|
|
(defsubst elp-pack-number (number width)
|
|
|
|
|
;; pack the NUMBER string into WIDTH characters, watching out for
|
|
|
|
|
;; very small or large numbers
|
|
|
|
|
(if (<= (length number) width)
|
|
|
|
|
number
|
|
|
|
|
;; check for very large or small numbers
|
|
|
|
|
(if (string-match "^\\(.*\\)\\(e[+-].*\\)$" number)
|
|
|
|
|
(concat (substring
|
2005-11-28 21:55:15 +00:00
|
|
|
|
(match-string 1 number)
|
1994-12-24 04:27:01 +00:00
|
|
|
|
0
|
|
|
|
|
(- width (match-end 2) (- (match-beginning 2)) 3))
|
|
|
|
|
"..."
|
2005-11-28 21:55:15 +00:00
|
|
|
|
(match-string 2 number))
|
|
|
|
|
(substring number 0 width))))
|
1994-12-24 04:27:01 +00:00
|
|
|
|
|
1994-09-14 09:03:27 +00:00
|
|
|
|
(defun elp-output-result (resultvec)
|
|
|
|
|
;; output the RESULTVEC into the results buffer. RESULTVEC is a 4 or
|
|
|
|
|
;; more element vector where aref 0 is the call count, aref 1 is the
|
|
|
|
|
;; total time spent in the function, aref 2 is the average time
|
|
|
|
|
;; spent in the function, and aref 3 is the symbol's string
|
|
|
|
|
;; name. All other elements in the vector are ignored.
|
|
|
|
|
(let* ((cc (aref resultvec 0))
|
|
|
|
|
(tt (aref resultvec 1))
|
|
|
|
|
(at (aref resultvec 2))
|
|
|
|
|
(symname (aref resultvec 3))
|
|
|
|
|
callcnt totaltime avetime)
|
|
|
|
|
(setq callcnt (number-to-string cc)
|
|
|
|
|
totaltime (number-to-string tt)
|
|
|
|
|
avetime (number-to-string at))
|
1994-09-14 20:21:36 +00:00
|
|
|
|
;; possibly prune the results
|
|
|
|
|
(if (and elp-report-limit
|
|
|
|
|
(numberp elp-report-limit)
|
|
|
|
|
(< cc elp-report-limit))
|
|
|
|
|
nil
|
2004-08-19 07:52:01 +00:00
|
|
|
|
(elp-output-insert-symname symname)
|
1994-09-14 20:21:36 +00:00
|
|
|
|
(insert-char 32 (+ elp-field-len (- (length symname)) 2))
|
|
|
|
|
;; print stuff out, formatting it nicely
|
|
|
|
|
(insert callcnt)
|
|
|
|
|
(insert-char 32 (+ elp-cc-len (- (length callcnt)) 2))
|
1994-12-24 04:27:01 +00:00
|
|
|
|
(let ((ttstr (elp-pack-number totaltime elp-et-len))
|
|
|
|
|
(atstr (elp-pack-number avetime elp-at-len)))
|
|
|
|
|
(insert ttstr)
|
|
|
|
|
(insert-char 32 (+ elp-et-len (- (length ttstr)) 2))
|
|
|
|
|
(insert atstr))
|
1994-09-14 20:21:36 +00:00
|
|
|
|
(insert "\n"))))
|
1994-09-14 09:03:27 +00:00
|
|
|
|
|
2004-08-19 07:52:01 +00:00
|
|
|
|
(defvar elp-results-symname-map
|
|
|
|
|
(let ((map (make-sparse-keymap)))
|
2005-11-28 21:55:15 +00:00
|
|
|
|
(define-key map [mouse-2] 'elp-results-jump-to-definition)
|
2009-01-31 17:00:54 +00:00
|
|
|
|
(define-key map [follow-link] 'mouse-face)
|
2004-08-19 07:52:01 +00:00
|
|
|
|
(define-key map "\C-m" 'elp-results-jump-to-definition)
|
|
|
|
|
map)
|
|
|
|
|
"Keymap used on the function name column." )
|
|
|
|
|
|
2005-11-28 21:55:15 +00:00
|
|
|
|
(defun elp-results-jump-to-definition (&optional event)
|
2004-08-19 07:52:01 +00:00
|
|
|
|
"Jump to the definition of the function under the point."
|
2005-11-28 21:55:15 +00:00
|
|
|
|
(interactive (list last-nonmenu-event))
|
|
|
|
|
(if event (posn-set-point (event-end event)))
|
2004-08-19 07:52:01 +00:00
|
|
|
|
(find-function (get-text-property (point) 'elp-symname)))
|
|
|
|
|
|
|
|
|
|
(defun elp-output-insert-symname (symname)
|
|
|
|
|
;; Insert SYMNAME with text properties.
|
|
|
|
|
(insert (propertize symname
|
|
|
|
|
'elp-symname (intern symname)
|
|
|
|
|
'keymap elp-results-symname-map
|
|
|
|
|
'mouse-face 'highlight
|
2009-06-23 05:54:33 +00:00
|
|
|
|
'face 'link
|
2005-11-28 21:55:15 +00:00
|
|
|
|
'help-echo "mouse-2 or RET jumps to definition")))
|
2004-08-19 07:52:01 +00:00
|
|
|
|
|
1994-09-14 20:24:21 +00:00
|
|
|
|
;;;###autoload
|
1994-09-14 09:03:27 +00:00
|
|
|
|
(defun elp-results ()
|
|
|
|
|
"Display current profiling results.
|
|
|
|
|
If `elp-reset-after-results' is non-nil, then current profiling
|
2007-10-31 12:09:33 +00:00
|
|
|
|
information for all instrumented functions is reset after results are
|
1994-09-14 09:03:27 +00:00
|
|
|
|
displayed."
|
|
|
|
|
(interactive)
|
|
|
|
|
(let ((curbuf (current-buffer))
|
1997-04-12 19:14:18 +00:00
|
|
|
|
(resultsbuf (if elp-recycle-buffers-p
|
|
|
|
|
(get-buffer-create elp-results-buffer)
|
|
|
|
|
(generate-new-buffer elp-results-buffer))))
|
1994-09-14 09:03:27 +00:00
|
|
|
|
(set-buffer resultsbuf)
|
|
|
|
|
(erase-buffer)
|
|
|
|
|
;; get the length of the longest function name being profiled
|
|
|
|
|
(let* ((longest 0)
|
|
|
|
|
(title "Function Name")
|
|
|
|
|
(titlelen (length title))
|
|
|
|
|
(elp-field-len titlelen)
|
|
|
|
|
(cc-header "Call Count")
|
|
|
|
|
(elp-cc-len (length cc-header))
|
|
|
|
|
(et-header "Elapsed Time")
|
|
|
|
|
(elp-et-len (length et-header))
|
|
|
|
|
(at-header "Average Time")
|
|
|
|
|
(elp-at-len (length at-header))
|
* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 20:43:43 +00:00
|
|
|
|
(resvec '())
|
1994-09-14 09:03:27 +00:00
|
|
|
|
) ; end let*
|
* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 20:43:43 +00:00
|
|
|
|
(mapatoms
|
|
|
|
|
(lambda (funsym)
|
|
|
|
|
(when (elp--instrumented-p funsym)
|
|
|
|
|
(let* ((info (get funsym elp-timer-info-property))
|
|
|
|
|
(symname (format "%s" funsym))
|
|
|
|
|
(cc (aref info 0))
|
|
|
|
|
(tt (aref info 1)))
|
|
|
|
|
(if (not info)
|
|
|
|
|
(insert "No profiling information found for: "
|
|
|
|
|
symname)
|
|
|
|
|
(setq longest (max longest (length symname)))
|
|
|
|
|
(push
|
|
|
|
|
(vector cc tt (if (zerop cc)
|
|
|
|
|
0.0 ;avoid arithmetic div-by-zero errors
|
|
|
|
|
(/ (float tt) (float cc)))
|
|
|
|
|
symname)
|
|
|
|
|
resvec))))))
|
2007-12-31 23:23:39 +00:00
|
|
|
|
;; If printing to stdout, insert the header so it will print.
|
|
|
|
|
;; Otherwise use header-line-format.
|
|
|
|
|
(setq elp-field-len (max titlelen longest))
|
|
|
|
|
(if (or elp-use-standard-output noninteractive)
|
* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 20:43:43 +00:00
|
|
|
|
(progn
|
|
|
|
|
(insert title)
|
|
|
|
|
(if (> longest titlelen)
|
|
|
|
|
(progn
|
|
|
|
|
(insert-char 32 (- longest titlelen))))
|
|
|
|
|
(insert " " cc-header " " et-header " " at-header "\n")
|
|
|
|
|
(insert-char ?= elp-field-len)
|
|
|
|
|
(insert " ")
|
|
|
|
|
(insert-char ?= elp-cc-len)
|
|
|
|
|
(insert " ")
|
|
|
|
|
(insert-char ?= elp-et-len)
|
|
|
|
|
(insert " ")
|
|
|
|
|
(insert-char ?= elp-at-len)
|
|
|
|
|
(insert "\n"))
|
|
|
|
|
(let ((column 0))
|
|
|
|
|
(setq header-line-format
|
|
|
|
|
(mapconcat
|
|
|
|
|
(lambda (title)
|
|
|
|
|
(prog1
|
|
|
|
|
(concat
|
|
|
|
|
(propertize " "
|
|
|
|
|
'display (list 'space :align-to column)
|
|
|
|
|
'face 'fixed-pitch)
|
|
|
|
|
title)
|
|
|
|
|
(setq column (+ column 2
|
|
|
|
|
(if (= column 0)
|
|
|
|
|
elp-field-len
|
|
|
|
|
(length title))))))
|
|
|
|
|
(list title cc-header et-header at-header) ""))))
|
1994-09-14 09:03:27 +00:00
|
|
|
|
;; if sorting is enabled, then sort the results list. in either
|
|
|
|
|
;; case, call elp-output-result to output the result in the
|
|
|
|
|
;; buffer
|
|
|
|
|
(if elp-sort-by-function
|
|
|
|
|
(setq resvec (sort resvec elp-sort-by-function)))
|
2007-09-26 00:14:17 +00:00
|
|
|
|
(mapc 'elp-output-result resvec))
|
1994-09-14 09:03:27 +00:00
|
|
|
|
;; now pop up results buffer
|
|
|
|
|
(set-buffer curbuf)
|
|
|
|
|
(pop-to-buffer resultsbuf)
|
1997-04-12 19:14:18 +00:00
|
|
|
|
;; copy results to standard-output?
|
|
|
|
|
(if (or elp-use-standard-output noninteractive)
|
* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 20:43:43 +00:00
|
|
|
|
(princ (buffer-substring (point-min) (point-max)))
|
2007-12-31 23:23:39 +00:00
|
|
|
|
(goto-char (point-min)))
|
1994-09-14 09:03:27 +00:00
|
|
|
|
;; reset profiling info if desired
|
|
|
|
|
(and elp-reset-after-results
|
|
|
|
|
(elp-reset-all))))
|
2000-10-31 12:05:34 +00:00
|
|
|
|
|
2007-10-31 12:46:08 +00:00
|
|
|
|
(defun elp-unload-function ()
|
|
|
|
|
"Unload the Emacs Lisp Profiler."
|
|
|
|
|
(elp-restore-all)
|
|
|
|
|
;; continue standard unloading
|
|
|
|
|
nil)
|
1994-09-14 09:03:27 +00:00
|
|
|
|
|
|
|
|
|
(provide 'elp)
|
1994-12-26 15:49:29 +00:00
|
|
|
|
|
2001-07-15 19:53:53 +00:00
|
|
|
|
;;; elp.el ends here
|