xemacs-beta: lisp/utils/elp.el comparison

comparison lisp/utils/elp.el @ 4:b82b59fe008d r19-15b3

Import from CVS: tag r19-15b3

author	cvs
date	Mon, 13 Aug 2007 08:46:56 +0200
parents	376386a54a3c
children	cca96a509cfe

comparison

equal deleted inserted replaced

-:30df88044ec6
+:b82b59fe008d
 ;;; elp.el --- Emacs Lisp Profiler
 ;; Copyright (C) 1994 Free Software Foundation, Inc.
-;; Author:        1994-1995 Barry A. Warsaw
+;; Author:        1994-1996 Barry A. Warsaw
-;; Maintainer:    tools-help@merlin.cnri.reston.va.us
+;; Maintainer:    tools-help@python.org
 ;; Created:       26-Feb-1994
-;; Version:       2.32
+;; Version:       2.37
-;; Last Modified: 1995/07/12 18:53:17
+;; Last Modified: 1996/10/23 04:06:58
 ;; Keywords:      debugging lisp tools
 ;; This file is part of GNU Emacs.
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; GNU General Public License for more details.
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-;;; Synched up with: FSF 19.30.
-;;; In typical "What the hell?" fashion, the version distributed
-;;; with FSF 19.30 claims to be version 2.33 while ours is version 2.32,
-;;; but ours is actually more recent.  Is this another example of
-;;; FSFmacs version corruption?
 ;;; Commentary:
 ;;
 ;; 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
 ;; Only one master function can be set at a time.
 ;; You can restore any function's original function definition with
 ;; elp-restore-function.  The other instrument, restore, and reset
 ;; functions are provided for symmetry.
-;; 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.  The latter I figure 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
-;; affect accuracy too.
 ;; Here is a list of variable you can use to customize elp:
 ;;   elp-function-list
 ;;   elp-reset-after-results
 ;;   elp-sort-by-function
 ;; TBD:
 ;; Make this act like a real profiler, so that it records time spent
 ;; in all branches of execution.
-;; LCD Archive Entry:
-;; elp|Barry A. Warsaw|tools-help@merlin.cnri.reston.va.us|
-;; Emacs Lisp Profiler|
-;; 1995/07/12 18:53:17|2.32|~/misc/elp.el.Z|
 ;;; Code:
 ;; start of user configuration variables
 ;; vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
 ;; ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 ;; end of user configuration variables
-(defconst elp-version "2.32"
+(defconst elp-version "2.37"
 "ELP version number.")
-(defconst elp-help-address "tools-help@merlin.cnri.reston.va.us"
+(defconst elp-help-address "tools-help@python.org"
 "Address accepting submissions of bug reports and questions.")
 (defvar elp-results-buffer "*ELP Profiling Results*"
 "Buffer name for outputting profiling results.")
 ;;;###autoload
 (defun elp-instrument-function (funsym)
 "Instrument FUNSYM for profiling.
 FUNSYM must be a symbol of a defined function."
 (interactive "aFunction to instrument: ")
-;; raise an error if the function is already instrumented
+;; restore the function.  this is necessary to avoid infinite
-(and (get funsym elp-timer-info-property)
+;; recursion of already instrumented functions (i.e. elp-wrapper
-(error "Symbol `%s' is already instrumented for profiling." funsym))
+;; calling elp-wrapper ad infinitum).  it is better to simply
+;; restore the function than to throw an error.  this will work
+;; properly in the face of eval-defun because if the function was
+;; redefined, only the timer info will be nil'd out since
+;; elp-restore-function is smart enough not to trash the new
+;; definition.
+(elp-restore-function funsym)
 (let* ((funguts (symbol-function funsym))
 	 (infovec (vector 0 0 funguts))
 	 (newguts '(lambda (&rest args))))
 ;; we cannot profile macros
 (and (eq (car-safe funguts) 'macro)
-	 (error "ELP cannot profile macro %s" funsym))
+	 (error "ELP cannot profile macro: %s" funsym))
+;; TBD: at some point it might be better to load the autoloaded
+;; function instead of throwing an error.  if we do this, then we
+;; probably want elp-instrument-package to be updated with the
+;; newly loaded list of functions.  i'm not sure it's smart to do
+;; the autoload here, since that could have side effects, and
+;; elp-instrument-function is similar (in my mind) to defun-ish
+;; type functionality (i.e. it shouldn't execute the function).
+(and (eq (car-safe funguts) 'autoload)
+	 (error "ELP cannot profile autoloaded function: %s" funsym))
 ;; put rest of newguts together
 (if (commandp funsym)
 	(setq newguts (append newguts '((interactive)))))
 (setq newguts (append newguts (list
 				   (list 'elp-wrapper
 ;; restore the original function definition, but if the function
 ;; wasn't instrumented do nothing.  we do this after the above
 ;; because its possible the function got un-instrumented due to
 ;; circumstances beyond our control.  Also, check to make sure
 ;; that the current function symbol points to elp-wrapper.  If
-;; not, then the user probably did an eval-defun while the
+;; not, then the user probably did an eval-defun, or loaded a
-;; function was instrumented and we don't want to destroy the new
+;; byte-compiled version, while the function was instrumented and
-;; definition.
+;; we don't want to destroy the new definition.  can it ever be
+;; the case that a lisp function can be compiled instrumented?
 (and info
+	 (not (compiled-function-p (symbol-function funsym)))
 	 (assq 'elp-wrapper (symbol-function funsym))
 	 (fset funsym (aref info 2)))))
 ;;;###autoload
 (defun elp-instrument-list (&optional list)
 "Instrument for profiling, all functions in `elp-function-list'.
 Use optional LIST if provided instead."
 (interactive "PList of functions to instrument: ")
 (let ((list (or list elp-function-list)))
-(mapcar
+(mapcar 'elp-instrument-function list)))
-(function
-(lambda (funsym)
-	(condition-case nil
-	    (elp-instrument-function funsym)
-	  (error nil))))
-list)))
 ;;;###autoload
 (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-reset-after-results
 elp-sort-by-function))))
 (provide 'elp)
 ;; elp.el ends here

Mercurial > hg > xemacs-beta

comparison lisp/utils/elp.el @ 4:b82b59fe008d r19-15b3