Mercurial > hg > xemacs-beta
view lisp/loadup.el @ 1292:f3437b56874d
[xemacs-hg @ 2003-02-13 09:57:04 by ben]
profile updates
profile.c: Major reworking. Keep track of new information -- total
function timing (includes descendants), GC usage, total GC usage
(includes descendants). New functions to be called appropriately
from eval.c, alloc.c to keep track of this information. Keep track
of when we're actually in a function vs. in its profile, for more
accurate timing counts. Track profile overhead separately. Create
new mechanism for specifying "internal sections" that are tracked
just like regular Lisp functions and even appear in the backtrace
if `backtrace-with-internal-sections' is non-nil (t by default
for error-checking builds). Add some KKCC information for the
straight (non-Elisp) hash table used by profile, which contains
Lisp objects in its keys -- but not used yet. Remove old ad-hoc
methods for tracking garbage collection, redisplay (which was
incorrect anyway when Lisp was called within these sections).
Don't record any tick info when blocking under MS Windows, since
the timer there is in real time rather than in process time.
Make `start-profiling', `stop-profiling' interactive. Be consistent
wrt. recursive functions and functions currently on the stack when
starting or stopping -- together these make implementing the
`total' values extremely difficult. When we start profiling, we
act as if we just entered all the functions currently on the stack.
Likewise when exiting. Create vars in_profile for tracking
time spent inside of profiling, and profiling_lock for setting
exclusive access to the main hash table when reading from it or
modifying it. (protects against getting screwed up by the signal
handle going off at the same time.
profile.h: New file.
Create macros for declaring internal profiling sections.
lisp.h: Move profile-related stuff to profile.h.
alloc.c: Keep track of total consing, for profile.
Tell profile when we are consing.
Use new profile-section method for noting garbage-collection.
alloc.c: Abort if we attempt to call the allocator reentrantly.
backtrace.h, eval.c: Add info for use by profile in the backtrace frame and transfer
PUSH_BACKTRACE/POP_BACKTRACE from eval.c, for use with profile.
elhash.c: Author comment.
eval.c, lisp.h: New Lisp var `backtrace-with-internal-sections'. Set to t when
error-checking is on.
eval.c: When unwinding,
eval.c: Report to profile when we are about-to-call and just-called wrt. a
function.
alloc.c, eval.c: Allow for "fake" backtrace frames, for internal sections (used by
profile and `backtrace-with-internal-sections'.
event-Xt.c, event-gtk.c, event-msw.c, event-tty.c: Record when we are actually blocking on an event, for profile's sake.
event-stream.c: Record internal profiling sections for getting, dispatching events.
extents.c: Record internal profiling sections for map_extents.
hash.c, hash.h: Add pregrow_hash_table_if_necessary(). (Used in profile code
since the signal handler is the main grower but can't allow
a realloc(). We make sure, at critical points, that the table
is large enough.)
lread.c: Create internal profiling sections for `load' (which may be triggered
internally by autoload, etc.).
redisplay.c: Remove old profile_redisplay_flag. Use new macros to declare
internal profiling section for redisplay.
text.c: Use new macros to declare internal profiling sections for
char-byte conversion and internal-external conversion.
SEMI-UNRELATED CHANGES:
-----------------------
text.c: Update the long comments.
author | ben |
---|---|
date | Thu, 13 Feb 2003 09:57:08 +0000 |
parents | 465bd3c7d932 |
children | 70921960b980 |
line wrap: on
line source
;; loadup.el --- load up standardly loaded Lisp files for XEmacs. ;; Copyright (C) 1985, 1986, 1992, 1994, 1997 Free Software Foundation, Inc. ;; Copyright (C) 1996 Richard Mlynarik. ;; Copyright (C) 1995, 1996, 2003 Ben Wing. ;; Maintainer: XEmacs Development Team ;; Keywords: internal, dumped ;; This file is part of XEmacs. ;; XEmacs is free software; you can redistribute it and/or modify it ;; under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. ;; XEmacs is distributed in the hope that it will be useful, 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. ;; You should have received a copy of the GNU General Public License ;; along with XEmacs; see the file COPYING. If not, write to the Free ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ;; 02111-1307, USA. ;;; Synched up with: Last synched with FSF 19.30, with wild divergence since. ;;; Commentary: ;; If you are wanting to add files to be dumped into your local version of ;; XEmacs, DO NOT add them here. Use site-init.el or site-load.el instead. ;; This is loaded into a bare XEmacs to make a dumpable one. ;;; Code: ;; Help debug problems. (setq stack-trace-on-error t load-always-display-messages t) (when (fboundp 'error) (error "loadup.el already loaded!")) (defvar running-xemacs t "Non-nil when the current emacs is XEmacs.") (defvar preloaded-file-list nil "List of files preloaded into the XEmacs binary image.") (defvar Installation-string nil "Description of XEmacs installation.") ;(start-profiling) (let ((gc-cons-threshold ;; setting it low makes loadup incredibly fucking slow. ;; no need to do it when not dumping. (if (and purify-flag (not (memq 'quick-build internal-error-checking))) 30000 3000000))) ;; really-early-error-handler outputs a stack trace so let's not do it ;; twice. (let ((stack-trace-on-error nil)) ;; This is awfully damn early to be getting an error, right? (call-with-condition-handler 'really-early-error-handler #'(lambda () ;; Initialize Installation-string. We do it before loading ;; anything so that dumped code can make use of its value. (setq Installation-string (save-current-buffer (set-buffer (get-buffer-create (generate-new-buffer-name " *temp*"))) ;; insert-file-contents-internal bogusly calls ;; format-decode without checking if it's defined. (fset 'format-decode #'(lambda (f l &optional v) l)) (insert-file-contents-internal "../Installation") (fmakunbound 'format-decode) (prog1 (buffer-substring) (kill-buffer (current-buffer))))) (let ((build-root (expand-file-name ".." invocation-directory))) (setq load-path (list (expand-file-name "lisp" build-root))) (setq module-load-path (list (expand-file-name "modules" build-root)))) ;; message not defined yet ... (external-debugging-output (format "\nUsing load-path %s" load-path)) (external-debugging-output (format "\nUsing module-load-path %s" module-load-path)) ;; We don't want to have any undo records in the dumped XEmacs. (buffer-disable-undo (get-buffer "*scratch*")) ;; Load our first bootstrap support (load "very-early-lisp.el") ;; lread.c (or src/Makefile.in.in) has prepended ;; "${srcdir}/../lisp/" to load-path, which is how this file ;; has been found. At this point, enough of XEmacs has been ;; initialized that we can start dumping "standard" lisp. ;; Dumped lisp from external packages is added when we search ;; the package path. ;; #### This code is duplicated in two other places. (let ((temp-path (expand-file-name "." (car load-path)))) (setq load-path (nconc (mapcar #'(lambda (i) (concat i "/")) (directory-files temp-path t "^[^-.]" nil 'dirs-only)) (cons (file-name-as-directory temp-path) load-path)))) (setq load-warn-when-source-only t) ; Set to nil at the end ;; garbage collect after loading every file in an attempt to ;; minimize the size of the dumped image (if we don't do this, ;; there will be lots of extra space in the data segment filled ;; with garbage-collected junk) (defun pureload (file) (let ((full-path (locate-file file load-path (if load-ignore-elc-files '(".el" "") '(".elc" ".el" ""))))) (if full-path (prog1 (load full-path) ;; but garbage collection really slows down loading. (unless (memq 'quick-build internal-error-checking) (garbage-collect))) (external-debugging-output (format "\nLoad file %s: not found\n" file)) ;; Uncomment in case of trouble ;;(print (format "late-packages: %S" late-packages)) ;;(print (format "guessed-roots: %S" (paths-find-emacs-roots invocation-directory invocation-name #'paths-emacs-root-p))) ;;(print (format "guessed-data-roots: %S" (paths-find-emacs-roots invocation-directory invocation-name #'paths-emacs-data-root-p))) nil))) (load (expand-file-name "../lisp/dumped-lisp.el")) (let ((files preloaded-file-list) file) (while (setq file (car files)) (unless (pureload file) (external-debugging-output "Fatal error during load, aborting") (kill-emacs 1)) (setq files (cdr files))) (when (not (featurep 'toolbar)) ;; else still define a few functions. (defun toolbar-button-p (obj) "No toolbar support." nil) (defun toolbar-specifier-p (obj) "No toolbar support." nil)) (fmakunbound 'pureload)) (packages-load-package-dumped-lisps late-package-load-path) )) ;; end of call-with-condition-handler ) ; (let ((stack-trace-on-error nil))) ;; Fix up the preloaded file list (setq preloaded-file-list (mapcar #'file-name-sans-extension preloaded-file-list)) (setq load-warn-when-source-only nil) (setq debugger 'debug) (when (member "no-site-file" command-line-args) (setq site-start-file nil)) ;; If you want additional libraries to be preloaded and their ;; doc strings kept in the DOC file rather than in core, ;; you may load them with a "site-load.el" file. ;; But you must also cause them to be scanned when the DOC file ;; is generated. For MS Windows, you must edit ../nt/xemacs.mak. ;; For other systems, you must edit ../src/Makefile.in.in. (when (load "site-load" t) (garbage-collect) ) ;;FSFmacs randomness ;;(if (fboundp 'x-popup-menu) ;; (precompute-menubar-bindings)) ;;; Turn on recording of which commands get rebound, ;;; for the sake of the next call to precompute-menubar-bindings. ;(setq define-key-rebound-commands nil) ;; Note: all compiled Lisp files loaded above this point ;; must be among the ones parsed by make-docfile ;; to construct DOC. Any that are not processed ;; for DOC will not have doc strings in the dumped XEmacs. ;; Don't bother with these if we're running temacs, i.e. if we're ;; just debugging don't waste time finding doc strings. ;; purify-flag is nil if called from loadup-el.el. (when purify-flag (message "Finding pointers to doc strings...") (Snarf-documentation "DOC") (message "Finding pointers to doc strings...done") (Verify-documentation)) ;; Note: You can cause additional libraries to be preloaded ;; by writing a site-init.el that loads them. ;; See also "site-load" above. (when (stringp site-start-file) (load "site-init" t)) (setq current-load-list nil) (garbage-collect) ;;; At this point, we're ready to resume undo recording for scratch. (buffer-enable-undo "*scratch*") ) ;; (let ((gc-cons-threshold [frequent garbage collection when dumping]))) ;(stop-profiling) ;; yuck! need to insert the function def here, and rewrite the dolist ;; loop below. ;(defun loadup-profile-results (&optional info stream) ; "Print profiling info INFO to STREAM in a pretty format. ;If INFO is omitted, the current profiling info is retrieved using ; `get-profiling-info'. ;If STREAM is omitted, either a *Profiling Results* buffer or standard ; output are used, depending on whether the function was called ; interactively or not." ; (interactive) ; (setq info (if info ; (copy-alist info) ; (get-profiling-info))) ; (when (and (not stream) ; (interactive-p)) ; (pop-to-buffer (get-buffer-create "*Profiling Results*")) ; (erase-buffer)) ; (let ((standard-output (or stream (if (interactive-p) ; (current-buffer) ; standard-output))) ; ;; Calculate the longest function ; (maxfunlen (apply #'max ; (length "Function Name") ; (mapcar ; (lambda (el) ; ;; Functions longer than 50 characters (usually ; ;; anonymous functions) don't qualify ; (let ((l (length (format "%s" (car el))))) ; (if (< l 50) ; l 0))) ; info)))) ; (princ (format "%-*s Ticks %%/Total Call Count\n" ; maxfunlen "Function Name")) ; (princ (make-string maxfunlen ?=)) ; (princ " ===== ======= ==========\n") ; (let ((sum (float (apply #'+ (mapcar #'cdr info))))) ; (let (entry ; (entry-list (nreverse (sort info #'cdr-less-than-cdr)))) ; (while entry-list ; (setq entry (car entry-list)) ; (princ (format "%-*s %-5d %-6.3f %s\n" ; maxfunlen (car entry) (cdr entry) ; (* 100 (/ (cdr entry) sum)) ; (or (gethash (car entry) call-count-profile-table) ; ""))) ; (setq entry-list (cdr entry-list)))) ; (princ (make-string maxfunlen ?-)) ; (princ "---------------------------------\n") ; (princ (format "%-*s %-5d %-6.2f\n" maxfunlen "Total" sum 100.0)) ; (princ (format "\n\nOne tick = %g ms\n" ; (/ default-profiling-interval 1000.0))) ; (and (boundp 'internal-error-checking) ; internal-error-checking ; (princ " ;WARNING: Error checking is turned on in this XEmacs. This might make ; the measurements very unreliable.\n")))) ; (when (and (not stream) ; (interactive-p)) ; (goto-char (point-min)))) ;(loadup-profile-results nil 'external-debugging-output) ;; Dump into the name `xemacs' (only) (when (member "dump" command-line-args) (message "Dumping under the name xemacs") ;; This is handled earlier in the build process. ;; (condition-case () (delete-file "xemacs") (file-error nil)) (when (fboundp 'really-free) (really-free)) ;; Make sure we don't dump with debugging messages turned on. (setq stack-trace-on-error nil load-always-display-messages nil) (dump-emacs (cond ((featurep 'infodock) "infodock") ;; #### BILL!!! ;; If we want to dump under a name other than `xemacs', do that here! ;; ((featurep 'gtk) "xemacs-gtk") (t "xemacs")) "temacs") (kill-emacs)) ;; Avoid error if user loads some more libraries now. (setq purify-flag nil) (when (member "run-temacs" command-line-args) (message "\nBootstrapping from temacs...") ;; Remove all args up to and including "run-temacs" (apply #'run-emacs-from-temacs (cdr (member "run-temacs" command-line-args))) ;; run-emacs-from-temacs doesn't actually return anyway. (kill-emacs)) ;; XEmacs change ;; If you are using 'recompile', then you should have used -l loadup-el.el ;; so that the .el files always get loaded (the .elc files may be out-of- ;; date or bad). (when (member "recompile" command-line-args) (setq command-line-args-left (cdr (member "recompile" command-line-args))) (batch-byte-recompile-directory) (kill-emacs)) ;; For machines with CANNOT_DUMP defined in config.h, ;; this file must be loaded each time Emacs is run. ;; So run the startup code now. (when (not (fboundp 'dump-emacs)) ;; Avoid loading loadup.el a second time! (setq command-line-args (cdr (cdr command-line-args))) (eval top-level)) ;;; loadup.el ends here