view tests/gtk/gnome-test.el @ 5157:1fae11d56ad2

redo memory-usage mechanism, add way of dynamically initializing Lisp objects -------------------- ChangeLog entries follow: -------------------- lisp/ChangeLog addition: 2010-03-18 Ben Wing <ben@xemacs.org> * diagnose.el (show-memory-usage): Rewrite to take into account API changes in memory-usage functions. src/ChangeLog addition: 2010-03-18 Ben Wing <ben@xemacs.org> * alloc.c: * alloc.c (disksave_object_finalization_1): * alloc.c (lisp_object_storage_size): * alloc.c (listu): * alloc.c (listn): * alloc.c (Fobject_memory_usage_stats): * alloc.c (compute_memusage_stats_length): * alloc.c (Fobject_memory_usage): * alloc.c (Ftotal_object_memory_usage): * alloc.c (malloced_storage_size): * alloc.c (common_init_alloc_early): * alloc.c (reinit_alloc_objects_early): * alloc.c (reinit_alloc_early): * alloc.c (init_alloc_once_early): * alloc.c (syms_of_alloc): * alloc.c (reinit_vars_of_alloc): * buffer.c: * buffer.c (struct buffer_stats): * buffer.c (compute_buffer_text_usage): * buffer.c (compute_buffer_usage): * buffer.c (buffer_memory_usage): * buffer.c (buffer_objects_create): * buffer.c (syms_of_buffer): * buffer.c (vars_of_buffer): * console-impl.h (struct console_methods): * dynarr.c (Dynarr_memory_usage): * emacs.c (main_1): * events.c (clear_event_resource): * extents.c: * extents.c (compute_buffer_extent_usage): * extents.c (extent_objects_create): * extents.h: * faces.c: * faces.c (compute_face_cachel_usage): * faces.c (face_objects_create): * faces.h: * general-slots.h: * glyphs.c: * glyphs.c (compute_glyph_cachel_usage): * glyphs.c (glyph_objects_create): * glyphs.h: * lisp.h: * lisp.h (struct usage_stats): * lrecord.h: * lrecord.h (enum lrecord_type): * lrecord.h (struct lrecord_implementation): * lrecord.h (MC_ALLOC_CALL_FINALIZER_FOR_DISKSAVE): * lrecord.h (DEFINE_DUMPABLE_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_SIZABLE_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_FROB_BLOCK_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_FROB_BLOCK_SIZABLE_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_INTERNAL_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_SIZABLE_INTERNAL_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_SIZABLE_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_FROB_BLOCK_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_FROB_BLOCK_SIZABLE_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_INTERNAL_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_SIZABLE_INTERNAL_LISP_OBJECT): * lrecord.h (MAKE_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_MODULE_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_MODULE_SIZABLE_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_MODULE_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_MODULE_SIZABLE_LISP_OBJECT): * lrecord.h (MAKE_MODULE_LISP_OBJECT): * lrecord.h (INIT_LISP_OBJECT): * lrecord.h (INIT_MODULE_LISP_OBJECT): * lrecord.h (UNDEF_LISP_OBJECT): * lrecord.h (UNDEF_MODULE_LISP_OBJECT): * lrecord.h (DECLARE_LISP_OBJECT): * lrecord.h (DECLARE_MODULE_API_LISP_OBJECT): * lrecord.h (DECLARE_MODULE_LISP_OBJECT): * lstream.c: * lstream.c (syms_of_lstream): * lstream.c (vars_of_lstream): * marker.c: * marker.c (compute_buffer_marker_usage): * mc-alloc.c (mc_alloced_storage_size): * mc-alloc.h: * mule-charset.c: * mule-charset.c (struct charset_stats): * mule-charset.c (compute_charset_usage): * mule-charset.c (charset_memory_usage): * mule-charset.c (mule_charset_objects_create): * mule-charset.c (syms_of_mule_charset): * mule-charset.c (vars_of_mule_charset): * redisplay.c: * redisplay.c (compute_rune_dynarr_usage): * redisplay.c (compute_display_block_dynarr_usage): * redisplay.c (compute_glyph_block_dynarr_usage): * redisplay.c (compute_display_line_dynarr_usage): * redisplay.c (compute_line_start_cache_dynarr_usage): * redisplay.h: * scrollbar-gtk.c (gtk_compute_scrollbar_instance_usage): * scrollbar-msw.c (mswindows_compute_scrollbar_instance_usage): * scrollbar-x.c (x_compute_scrollbar_instance_usage): * scrollbar.c (compute_scrollbar_instance_usage): * scrollbar.h: * symbols.c: * symbols.c (reinit_symbol_objects_early): * symbols.c (init_symbols_once_early): * symbols.c (reinit_symbols_early): * symbols.c (defsymbol_massage_name_1): * symsinit.h: * ui-gtk.c: * ui-gtk.c (emacs_gtk_object_getprop): * ui-gtk.c (emacs_gtk_object_putprop): * ui-gtk.c (ui_gtk_objects_create): * unicode.c (compute_from_unicode_table_size_1): * unicode.c (compute_to_unicode_table_size_1): * unicode.c (compute_from_unicode_table_size): * unicode.c (compute_to_unicode_table_size): * window.c: * window.c (struct window_stats): * window.c (compute_window_mirror_usage): * window.c (compute_window_usage): * window.c (window_memory_usage): * window.c (window_objects_create): * window.c (syms_of_window): * window.c (vars_of_window): * window.h: Redo memory-usage mechanism, make it general; add way of dynamically initializing Lisp object types -- OBJECT_HAS_METHOD(), similar to CONSOLE_HAS_METHOD(). (1) Create OBJECT_HAS_METHOD(), OBJECT_HAS_PROPERTY() etc. for specifying that a Lisp object type has a particular method or property. Call such methods with OBJECT_METH, MAYBE_OBJECT_METH, OBJECT_METH_OR_GIVEN; retrieve properties with OBJECT_PROPERTY. Methods that formerly required a DEFINE_*GENERAL_LISP_OBJECT() to specify them (getprop, putprop, remprop, plist, disksave) now instead use the dynamic-method mechanism. The main benefit of this is that new methods or properties can be added without requiring that the declaration statements of all existing methods be modified. We have to make the `struct lrecord_implementation' non-const, but I don't think this should have any effect on speed -- the only possible method that's really speed-critical is the mark method, and we already extract those out into a separate (non-const) array for increased cache locality. Object methods need to be reinitialized after pdump, so we put them in separate functions such as face_objects_create(), extent_objects_create() and call them appropriately from emacs.c The only current object property (`memusage_stats_list') that objects can specify is a Lisp object and gets staticpro()ed so it only needs to be set during dump time, but because it references symbols that might not exist in a syms_of_() function, we initialize it in vars_of_(). There is also an object property (`num_extra_memusage_stats') that is automatically initialized based on `memusage_stats_list'; we do that in reinit_vars_of_alloc(), which is called after all vars_of_() functions are called. `disksaver' method was renamed `disksave' to correspond with the name normally given to the function (e.g. disksave_lstream()). (2) Generalize the memory-usage mechanism in `buffer-memory-usage', `window-memory-usage', `charset-memory-usage' into an object-type- specific mechanism called by a single function `object-memory-usage'. (Former function `object-memory-usage' renamed to `total-object-memory-usage'). Generalize the mechanism of different "slices" so that we can have different "classes" of memory described and different "slices" onto each class; `t' separates classes, `nil' separates slices. Currently we have three classes defined: the memory of an object itself, non-Lisp-object memory associated with the object (e.g. arrays or dynarrs stored as fields in the object), and Lisp-object memory associated with the object (other internal Lisp objects stored in the object). This isn't completely finished yet and we might need to further separate the "other internal Lisp objects" class into two classes. The memory-usage mechanism uses a `struct usage_stats' (renamed from `struct overhead_stats') to describe a malloc-view onto a set of allocated memory (listing how much was requested and various types of overhead) and a more general `struct generic_usage_stats' (with a `struct usage_stats' in it) to hold all statistics about object memory. `struct generic_usage_stats' contains an array of 32 Bytecounts, which are statistics of unspecified semantics. The intention is that individual types declare a corresponding struct (e.g. `struct window_stats') with the same structure but with specific fields in place of the array, corresponding to specific statistics. The number of such statistics is an object property computed from the list of tags (Lisp symbols describing the statistics) stored in `memusage_stats_list'. The idea here is to allow particular object types to customize the number and semantics of the statistics where completely avoiding consing. This doesn't matter so much yet, but the intention is to have the memory usage of all objects computed at the end of GC, at the same time as other statistics are currently computed. The values for all statistics for a single type would be added up to compute aggregate values for all objects of a specific type. To make this efficient, we can't allow any memory allocation at all. (3) Create some additional functions for creating lists that specify the elements directly as args rather than indirectly through an array: listn() (number of args given), listu() (list terminated by Qunbound). (4) Delete a bit of remaining unused C window_config stuff, also unused lrecord_type_popup_data.
author Ben Wing <ben@xemacs.org>
date Thu, 18 Mar 2010 10:50:06 -0500
parents db7068430402
children ba07c880114a
line wrap: on
line source

;; 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., 51 Franklin Street - Fifth Floor,
;; Boston, MA 02111-1301, USA.  */

(require 'gnome)

(gtk-define-test
 "GNOME Stock Pixmaps" gnome gnome-pixmaps nil
 (let ((hbox nil)
       (vbox nil)
       (widget nil)
       (label nil)
       (i 0))
   (mapc (lambda (b)
	   (if (= (% i 5) 0)
	       (progn
		 (setq hbox (gtk-hbutton-box-new))
		 (gtk-box-set-spacing hbox 5)
		 (gtk-container-add window hbox)))

	   (setq widget (gnome-stock-pixmap-widget-new window (car b))
		 vbox (gtk-vbox-new t 0)
		 label (gtk-label-new (cdr b)))
	   (gtk-container-add hbox vbox)
	   (gtk-container-add vbox widget)
	   (gtk-container-add vbox label)
	   (gtk-widget-show-all vbox)
	   (setq i (1+ i)))
	 gnome-stock-pixmaps))) 

(gtk-define-test
 "GNOME Stock Buttons" gnome gnome-buttons nil
 (let ((hbbox nil)
       (button nil)
       (i 0))
   (mapc (lambda (b)
	   (setq button (gnome-stock-button (car b)))
	   (gtk-signal-connect button 'clicked (lambda (obj data)
						 (message "Stock GNOME Button: %s" data))
			       (cdr b))
	   (if (= (% i 3) 0)
	       (progn
		 (setq hbbox (gtk-hbutton-box-new))
		 (gtk-button-box-set-spacing hbbox 5)
		 (gtk-container-add window hbbox)))
	       
	   (gtk-container-add hbbox button)
	   (gtk-widget-show button)
	   (setq i (1+ i)))
	 gnome-stock-buttons)))
	 
(gtk-define-test
 "GNOME About" gnome gnome-about t
 (setq window (gnome-about-new "XEmacs/GTK Test Application"
			       "1.0a"
			       "Copyright (C) 2000 Free Software Foundation"
			       '("William M. Perry <wmperry@gnu.org>"
				 "Ichabod Crane")
			       "This is a comment string... what wonderful commentary you have my dear!"
			       "")))

(gtk-define-test
 "GNOME File Entry" gnome gnome-file-entry nil
 (let ((button (gnome-file-entry-new nil "Test browse dialog...")))
   (gtk-container-add window button)))
 
(gtk-define-test
 "GNOME Color Picker" gnome gnome-color-picker nil
 (let ((picker (gnome-color-picker-new))
       (hbox (gtk-hbox-new nil 0))
       (label (gtk-label-new "Please choose a color: ")))

   (gtk-box-pack-start hbox label nil nil 2)
   (gtk-box-pack-start hbox picker t t 2)
   (gtk-container-add window hbox)
   (gtk-widget-show-all hbox)))

(gtk-define-test
 "GNOME Desktop Entry Editor" gnome gnome-dentry-edit nil
 (let* ((notebook (gtk-notebook-new)))
   (gnome-dentry-edit-new-notebook notebook)
   (gtk-container-add window notebook)))

(gtk-define-test
 "GNOME Date Edit" gnome gnome-date-entry nil
 (let ((date (gnome-date-edit-new 0 t t))
       button)
   (gtk-box-pack-start window date t t 0)

   (setq button (gtk-check-button-new-with-label "Show time"))
   (gtk-signal-connect button 'clicked
		       (lambda (button date)
			 (let ((flags (gnome-date-edit-get-flags date)))
			   (if (gtk-toggle-button-get-active button)
			       (push 'show-time flags)
			     (setq flags (delq 'show-time flags)))
			   (gnome-date-edit-set-flags date flags))) date)
   (gtk-toggle-button-set-active button t)
   (gtk-box-pack-start window button nil nil 0)

   (setq button (gtk-check-button-new-with-label "24 Hour format"))
   (gtk-signal-connect button 'clicked
		       (lambda (button date)
			 (let ((flags (gnome-date-edit-get-flags date)))
			   (if (gtk-toggle-button-get-active button)
			       (push '24-hr flags)
			     (setq flags (delq '24-hr flags)))
			   (gnome-date-edit-set-flags date flags))) date)
   (gtk-toggle-button-set-active button t)
   (gtk-box-pack-start window button nil nil 0)

   (setq button (gtk-check-button-new-with-label "Week starts on monday"))
   (gtk-signal-connect button 'clicked
		       (lambda (button date)
			 (let ((flags (gnome-date-edit-get-flags date)))
			   (if (gtk-toggle-button-get-active button)
			       (push 'week-starts-on-monday flags)
			     (setq flags (delq 'week-starts-on-monday flags)))
			   (gnome-date-edit-set-flags date flags))) date)
   (gtk-toggle-button-set-active button t)
   (gtk-box-pack-start window button nil nil 0)))
   
(gtk-define-test
 "GNOME Font Picker" gnome gnome-font-picker nil
 (let ((hbox (gtk-hbox-new nil 5))
       (fp (gnome-font-picker-new))
       (label (gtk-label-new "Choose a font: "))
       (button nil))
   (gtk-box-pack-start hbox label t t 0)
   (gtk-box-pack-start hbox fp nil nil 2)
   (gnome-font-picker-set-title fp "Select a font...")
   (gnome-font-picker-set-mode fp 'font-info)
   (gtk-box-pack-start window hbox t t 0)

   (setq button (gtk-check-button-new-with-label "Use font in label"))
   (gtk-signal-connect button 'clicked
		       (lambda (button fp)
			 (gnome-font-picker-fi-set-use-font-in-label
			  fp (gtk-toggle-button-get-active button) 14))
		       fp)
   (gtk-box-pack-start window button nil nil 0)

   (setq button (gtk-check-button-new-with-label "Show size"))
   (gtk-signal-connect button 'clicked
		       (lambda (button fp)
			 (gnome-font-picker-fi-set-show-size
			  fp (gtk-toggle-button-get-active button)))
		       fp)
   (gtk-box-pack-start window button nil nil 0)))

(gtk-define-test
 "GNOME Application" gnome gnome-app t
 (setq window (gnome-app-new "XEmacs" "XEmacs/GNOME"))
 (let ((menubar (gtk-menu-bar-new))
       (contents nil)
       ;(toolbar-instance (specifier-instance top-toolbar))
       (toolbar nil)
       (item nil)
       (flushright nil))
   (mapc (lambda (node)
	   (if (not node)
	       (setq flushright t)
	     (setq item (gtk-build-xemacs-menu node))
	     (gtk-widget-show item)
	     (if flushright (gtk-menu-item-right-justify item))
	     (gtk-menu-append menubar item)))
	 current-menubar)

   (setq toolbar (gtk-toolbar-new 'horizontal 'both))
   (mapc (lambda (x)
	   (let ((button (gtk-button-new))
		 (pixmap (gnome-stock-pixmap-widget-new toolbar x)))
	     (gtk-container-add button pixmap)
	     (gtk-toolbar-append-widget toolbar button (symbol-name x) nil)))
	 '(open save print cut copy paste undo spellcheck srchrpl mail help))

   (setq contents (gtk-hbox-new nil 5))
   (let ((hbox contents)
	 (vbox (gtk-vbox-new nil 5))
	 (frame nil)
	 (label nil))
     (gtk-box-pack-start hbox vbox nil nil 0)

     (setq frame (gtk-frame-new "Normal Label")
	   label (gtk-label-new "This is a Normal label"))
     (gtk-container-add frame label)
     (gtk-box-pack-start vbox frame nil nil 0)

     (setq frame (gtk-frame-new "Multi-line Label")
	   label (gtk-label-new "This is a multi-line label.\nSecond line\nThird line"))
     (gtk-container-add frame label)
     (gtk-box-pack-start vbox frame nil nil 0)

     (setq frame (gtk-frame-new "Left Justified Label")
	   label (gtk-label-new "This is a Left-Justified\nMulti-line label.\nThird      line"))
     (gtk-label-set-justify label 'left)
     (gtk-container-add frame label)
     (gtk-box-pack-start vbox frame nil nil 0)

     (setq frame (gtk-frame-new "Right Justified Label")
	   label (gtk-label-new "This is a Right-Justified\nMulti-line label.\nFourth line, (j/k)"))
     (gtk-label-set-justify label 'right)
     (gtk-container-add frame label)
     (gtk-box-pack-start vbox frame nil nil 0)

     ;; Start a second row so that we don't make a ridiculously tall window
     (setq vbox (gtk-vbox-new nil 5))
     (gtk-box-pack-start hbox vbox nil nil 0)

     (setq frame (gtk-frame-new "Line wrapped label")
	   label (gtk-label-new
		  (concat "This is an example of a line-wrapped label.  It should not be taking "
			  "up the entire             " ;;; big space to test spacing
			  "width allocated to it, but automatically wraps the words to fit.  "
			  "The time has come, for all good men, to come to the aid of their party.  "
			  "The sixth sheik's six sheep's sick.\n"
			  "     It supports multiple paragraphs correctly, and  correctly   adds "
			  "many          extra  spaces. ")))
     (gtk-label-set-line-wrap label t)
     (gtk-container-add frame label)
     (gtk-box-pack-start vbox frame nil nil 0)

     (setq frame (gtk-frame-new "Filled, wrapped label")
	   label (gtk-label-new
		  (concat
		   "This is an example of a line-wrapped, filled label.  It should be taking "
		   "up the entire              width allocated to it.  Here is a seneance to prove "
		   "my point.  Here is another sentence. "
		   "Here comes the sun, do de do de do.\n"
		   "    This is a new paragraph.\n"
		   "    This is another newer, longer, better paragraph.  It is coming to an end, "
		   "unfortunately.")))
     (gtk-label-set-justify label 'fill)
     (gtk-label-set-line-wrap label t)
     (gtk-container-add frame label)
     (gtk-box-pack-start vbox frame nil nil 0)

     (setq frame (gtk-frame-new "Underlined label")
	   label (gtk-label-new (concat "This label is underlined!\n"
					"This one is underlined in 日本語の入用quite a funky fashion")))
     (gtk-label-set-justify label 'left)
     (gtk-label-set-pattern label "_________________________ _ _________ _ _____ _ __ __  ___ ____ _____")
     (gtk-container-add frame label)
     (gtk-box-pack-start vbox frame nil nil 0))
 
   (gtk-widget-show-all toolbar)
   (gtk-widget-show-all menubar)
   (gtk-widget-show-all contents)
   (gnome-app-set-menus window menubar)
   (gnome-app-set-toolbar window toolbar)
   (gnome-app-set-contents window contents)))