various fixes to memory-usage stats -------------------- ChangeLog entries follow: -------------------- lisp/ChangeLog addition: 2010-03-25 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 in show-object-memory-usage-stats showing the ancillary Lisp overhead used with each type; shrink columns for windows in show-memory-usage to get it to fit in 79 chars. src/ChangeLog addition: 2010-03-25 Ben Wing <ben@xemacs.org> * alloc.c: * alloc.c (struct): * alloc.c (finish_object_memory_usage_stats): * alloc.c (object_memory_usage_stats): * alloc.c (Fobject_memory_usage): * alloc.c (lisp_object_memory_usage_full): * alloc.c (compute_memusage_stats_length): * lrecord.h: * lrecord.h (struct lrecord_implementation): Add fields to the `lrecord_implementation' structure to list an offset into the array of extra statistics in a `struct generic_usage_stats' and a length, listing the first slice of ancillary Lisp-object memory. Compute automatically in compute_memusage_stats_length(). Use to add an entry `FOO-lisp-ancillary-storage' for object type FOO. Don't crash when an int or char is given to object-memory-usage, signal an error instead. Add functions lisp_object_memory_usage_full() and lisp_object_memory_usage() to compute the total memory usage of an object (sum of object, non-Lisp attached, and Lisp ancillary memory). * array.c: * array.c (gap_array_memory_usage): * array.h: Add function to return memory usage of a gap array. * buffer.c (struct buffer_stats): * buffer.c (compute_buffer_usage): * buffer.c (vars_of_buffer): * extents.c (compute_buffer_extent_usage): * marker.c: * marker.c (compute_buffer_marker_usage): * extents.h: * lisp.h: Remove `struct usage_stats' arg from compute_buffer_marker_usage() and compute_buffer_extent_usage() -- these are ancillary Lisp objects and don't get accumulated into `struct usage_stats'; change the value of `memusage_stats_list' so that `markers' and `extents' memory is in Lisp-ancillary, where it belongs. In compute_buffer_marker_usage(), use lisp_object_memory_usage() rather than lisp_object_storage_size(). * casetab.c: * casetab.c (case_table_memory_usage): * casetab.c (vars_of_casetab): * emacs.c (main_1): Add memory usage stats for case tables. * lisp.h: Add comment explaining the `struct generic_usage_stats' more, as well as the new fields in lrecord_implementation. * console-impl.h: * console-impl.h (struct console_methods): * scrollbar-gtk.c: * scrollbar-gtk.c (gtk_compute_scrollbar_instance_usage): * scrollbar-msw.c: * scrollbar-msw.c (mswindows_compute_scrollbar_instance_usage): * scrollbar-x.c: * scrollbar-x.c (x_compute_scrollbar_instance_usage): * scrollbar.c: * scrollbar.c (struct scrollbar_instance_stats): * scrollbar.c (compute_all_scrollbar_instance_usage): * scrollbar.c (scrollbar_instance_memory_usage): * scrollbar.c (scrollbar_objects_create): * scrollbar.c (vars_of_scrollbar): * scrollbar.h: * symsinit.h: * window.c: * window.c (find_window_mirror_maybe): * window.c (struct window_mirror_stats): * window.c (compute_window_mirror_usage): * window.c (window_mirror_memory_usage): * window.c (compute_window_usage): * window.c (window_objects_create): * window.c (syms_of_window): * window.c (vars_of_window): Redo memory-usage associated with windows, window mirrors, and scrollbar instances. Should fix crash in find_window_mirror, among other things. Properly assign memo ry to object memory, non-Lisp extra memory, and Lisp ancillary memory. For example, redisplay structures are non-Lisp memory hanging off a window mirror, not a window; make it an ancillary Lisp-object field. Window mirrors and scrollbar instances have their own statistics, among other things.

;;; gtk-extra.el --- Import `GTK+ Extra' widgets into XEmacs

;; Copyright (C) 2000 Free Software Foundation

;; Maintainer: William Perry <wmperry@gnu.org>
;; Keywords: extensions, 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: Not in FSF

;;; Commentary:

;; GTK+ Extra can be retrieved from http://magnet.fsu.edu/~feiguin/gtk

(eval-and-compile
  (require 'gtk-ffi))

(globally-declare-fboundp
 '(gtk-import-function-internal gtk-call-function))

;;; gtkbordercombo.h
(gtk-import-function GtkType gtk_border_combo_get_type)
(gtk-import-function GtkWidget gtk_border_combo_new)

;;; gtkcheckitem.h
(gtk-import-function GtkType gtk_check_item_get_type)
(gtk-import-function GtkWidget gtk_check_item_new)
(gtk-import-function GtkWidget gtk_check_item_new_with_label
		     (GtkString . label))

;;; gtkcolorcombo.h
(gtk-import-function GtkType gtk_color_combo_get_type)
(gtk-import-function GtkWidget gtk_color_combo_new)
(gtk-import-function GtkWidget gtk_color_combo_new_with_values
		     (gint . nrows)
		     (gint . ncols)
		     (GtkArrayOfString . color_names))
(gtk-import-function GtkString gtk_color_combo_get_color_at
		     (GtkColorCombo . combo)
		     (gint          . row)
		     (gint          . col))
;;;(gtk-import-function none gtk_color_combo_find_color
;;;		     (GtkColorCombo . combo)
;;;		     (GdkColor      . color)
;;;		     ((gint . out)  . row)
;;;		     ((gint . out)  . col))

;;; gtkcombobox.h
(gtk-import-function GtkType gtk_combobox_get_type)
(gtk-import-function GtkWidget gtk_combobox_new)
(gtk-import-function none gtk_combobox_hide_popdown_window)

;;; gtkdirtree.h
(gtk-import-function GtkType gtk_dir_tree_get_type)
(gtk-import-function GtkWidget gtk_dir_tree_new)
(gtk-import-function gint gtk_dir_tree_open_dir
		     (GtkDirTree . tree)
		     (GtkString  . path))

;;; gtkfilelist.h
(gtk-import-function GtkType gtk_file_list_get_type)
(gtk-import-function GtkWidget gtk_file_list_new
		     (guint . icon_width)
		     (gint  . mode)
		     (GtkString . path))
(gtk-import-function none gtk_file_list_set_filter
		     (GtkFileList . file_list)
		     (GtkString   . filter))
(gtk-import-function none gtk_file_list_open_dir
		     (GtkFileList . file_list)
		     (GtkString   . path))
(gtk-import-function GtkString gtk_file_list_get_path
		     (GtkFileList . file_list))
(gtk-import-function GtkString gtk_file_list_get_filename
		     (GtkFileList . file_list))

;;; gtkfontcombo.h
(gtk-import-function GtkType gtk_font_combo_get_type)
(gtk-import-function GtkWidget gtk_font_combo_new)
(gtk-import-function none gtk_font_combo_select
		     (GtkFontCombo . font_combo)
		     (GtkString    . family)
		     (gboolean     . bold)
		     (gboolean     . italic)
		     (gint         . height))
(gtk-import-function none gtk_font_combo_select_nth
		     (GtkFontCombo . font_combo)
		     (gint         . n)
		     (gboolean     . bold)
		     (gboolean     . italic)
		     (gint         . height))

;;; gtkiconfilesel.h
;;; gtkiconlist.h
;;; gtkitementry.h
;;; gtkplot.h
;;; gtkplotcanvas.h
;;; gtkplotpc.h
;;; gtkplotprint.h
;;; gtkplotps.h
;;; gtkpsfont.h
;;; gtksheet.h

(provide 'gtk-extra)