Mercurial > hg > xemacs-beta
view lisp/buffer.el @ 5160:ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
-------------------- ChangeLog entries follow: --------------------
lisp/ChangeLog addition:
2010-03-20 Ben Wing <ben@xemacs.org>
* diagnose.el (show-memory-usage):
* diagnose.el (show-object-memory-usage-stats):
Further changes to correspond with changes in the C code;
add an additional column showing the overhead used with each type,
and add it into the grand total memory usage.
src/ChangeLog addition:
2010-03-20 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (init_lrecord_stats):
* alloc.c (free_normal_lisp_object):
* alloc.c (struct):
* alloc.c (clear_lrecord_stats):
* alloc.c (tick_lrecord_stats):
* alloc.c (COUNT_FROB_BLOCK_USAGE):
* alloc.c (COPY_INTO_LRECORD_STATS):
* alloc.c (sweep_strings):
* alloc.c (UNMARK_string):
* alloc.c (gc_sweep_1):
* alloc.c (finish_object_memory_usage_stats):
* alloc.c (object_memory_usage_stats):
* alloc.c (object_dead_p):
* alloc.c (fixed_type_block_overhead):
* alloc.c (lisp_object_storage_size):
* emacs.c (main_1):
* lisp.h:
* lrecord.h:
Export lisp_object_storage_size() and malloced_storage_size() even
when not MEMORY_USAGE_STATS, to get the non-MEMORY_USAGE_STATS
build to compile.
Don't export fixed_type_block_overhead() any more.
Some code cleanup, rearrangement, add some section headers.
Clean up various bugs especially involving computation of overhead
and double-counting certain usage in total_gc_usage. Add
statistics computing the overhead used by all types. Don't add a
special entry for string headers in the object-memory-usage-stats
because it's already present as just "string". But do count the
overhead used by long strings. Don't try to call the
memory_usage() methods when NEW_GC because there's nowhere obvious
in the sweep stage to make the calls.
* marker.c (compute_buffer_marker_usage):
Just use lisp_object_storage_size() rather than trying to
reimplement it.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Sat, 20 Mar 2010 20:20:30 -0500 |
parents | 74a5eaa67982 |
children | 308d34e9f07d |
line wrap: on
line source
;;; buffer.el --- buffer routines taken from C ;; Copyright (C) 1985-1989, 1992-1995, 1997 Free Software Foundation, Inc. ;; Copyright (C) 1995 Sun Microsystems. ;; Copyright (C) 1995, 1996 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, 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Synched up with: FSF 19.30 buffer.c. ;;; Commentary: ;; This file is dumped with XEmacs. ;;; Code: (defun switch-to-buffer (bufname &optional norecord) "Select buffer BUFNAME in the current window. BUFNAME may be a buffer or a buffer name and is created if it did not exist. Optional second arg NORECORD non-nil means do not put this buffer at the front of the list of recently selected ones. WARNING: This is NOT the way to work on another buffer temporarily within a Lisp program! Use `set-buffer' instead. That avoids messing with the window-buffer correspondences." (interactive (list (read-buffer "Switch to buffer: " (other-buffer (current-buffer)) nil (current-buffer)))) ;; #ifdef I18N3 ;; #### Doc string should indicate that the buffer name will get ;; translated. ;; #endif (if (eq (minibuffer-window) (selected-window)) (error "Cannot switch buffers in minibuffer window")) (if (window-dedicated-p (selected-window)) (error "Cannot switch buffers in a dedicated window")) (let (buf) (if (null bufname) (setq buf (other-buffer (current-buffer))) (setq buf (get-buffer bufname)) (if (null buf) (progn (setq buf (get-buffer-create bufname)) (set-buffer-major-mode buf)))) (push-window-configuration) (set-buffer buf) (set-window-buffer (last-nonminibuf-window) buf norecord) buf)) (defun pop-to-buffer (bufname &optional not-this-window-p on-frame) "Select buffer BUFNAME in some window, preferably a different one. If BUFNAME is nil, then some other buffer is chosen. If `pop-up-windows' is non-nil, windows can be split to do this. If optional second arg NOT-THIS-WINDOW-P is non-nil, insist on finding another window even if BUFNAME is already visible in the selected window. If optional third arg is non-nil, it is the frame to pop to this buffer on. If `focus-follows-mouse' is non-nil, keyboard focus is left unchanged. Buffers with names that are members of the `same-window-buffer-names' list, or that match an element of the `same-window-regexps' list are treated specially by this function--they are always selected in the same window rather than in a different one." ;; #ifdef I18N3 ;; #### Doc string should indicate that the buffer name will get ;; translated. ;; #endif ;; This is twisted. It is evil to throw the keyboard focus around ;; willy-nilly if the user wants focus-follows-mouse. (let ((oldbuf (current-buffer)) buf window frame) (if (null bufname) (setq buf (other-buffer (current-buffer))) (setq buf (get-buffer bufname)) (if (null buf) (progn (setq buf (get-buffer-create bufname)) (set-buffer-major-mode buf)))) (push-window-configuration) (set-buffer buf) (setq window (display-buffer buf not-this-window-p on-frame)) (setq frame (window-frame window)) ;; if the display-buffer hook decided to show this buffer in another ;; frame, then select that frame, (unless obeying focus-follows-mouse -sb). (if (and (not focus-follows-mouse) (not (eq frame (selected-frame)))) (select-frame frame)) (record-buffer buf) (if (and focus-follows-mouse on-frame (not (eq on-frame (selected-frame)))) (set-buffer oldbuf) ;; select-window will modify the internal keyboard focus of XEmacs (select-window window)) buf)) ;;; buffer.el ends here