Mercurial > hg > xemacs-beta
annotate tests/automated/lisp-reader-tests.el @ 5170:5ddbab03b0e6
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.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Thu, 25 Mar 2010 06:07:25 -0500 |
| parents | c136144fe765 |
| children | e6508b64ee08 308d34e9f07d |
| rev | line source |
|---|---|
| 3543 | 1 ;; Copyright (C) 2005 Martin Kuehl. |
| 2 | |
| 3 ;; Author: Martin Kuehl <martin.kuehl@gmail.com> | |
| 4 ;; Maintainer: Martin Kuehl <martin.kuehl@gmail.com> | |
| 5 ;; Created: 2005 | |
| 6 ;; Keywords: tests | |
| 7 | |
| 8 ;; This file is NOT part of SXEmacs. | |
| 9 | |
| 10 ;; SXEmacs is free software; you can redistribute it and/or modify it | |
| 11 ;; under the terms of the GNU General Public License as published by | |
| 12 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 13 ;; any later version. | |
| 14 | |
| 15 ;; SXEmacs is distributed in the hope that it will be useful, but | |
| 16 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 18 ;; General Public License for more details. | |
| 19 | |
| 20 ;; You should have received a copy of the GNU General Public License | |
| 21 ;; along with SXEmacs; see the file COPYING. If not, write to the Free | |
| 22 ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | |
| 23 ;; 02111-1307, USA. | |
| 24 | |
| 25 ;;; Synched up with: Not in FSF. | |
| 26 | |
| 27 ;;; Commentary: | |
| 28 | |
| 29 ;; Test the lisp reader. | |
| 30 ;; See test-harness.el for instructions on how to run these tests. | |
| 31 | |
| 32 ;;; Raw Strings | |
| 33 ;;; =========== | |
| 34 | |
| 35 ;; Equality to "traditional" strings | |
| 36 ;; --------------------------------- | |
| 37 (dolist (strings '((#r"xyz" "xyz") ; no backslashes | |
| 38 (#r"\xyz" "\\xyz") ; backslash at start | |
| 39 (#r"\\xyz" "\\\\xyz") ; backslashes at start | |
| 40 (#r"\nxyz" "\\nxyz") ; escape seq. at start | |
| 41 (#r"\"xyz" "\\\"xyz") ; quote at start | |
| 42 (#r"xy\z" "xy\\z") ; backslash in middle | |
| 43 (#r"xy\\z" "xy\\\\z") ; backslashes in middle | |
| 44 (#r"xy\nz" "xy\\nz") ; escape seq. in middle | |
| 45 (#r"xy\"z" "xy\\\"z") ; quote in middle | |
| 46 ;;(#r"xyz\" "xyz\\") ; backslash at end: error | |
| 47 (#r"xyz\\" "xyz\\\\") ; backslashes at end | |
| 48 (#r"xyz\n" "xyz\\n") ; escape seq. at end | |
| 49 (#r"xyz\"" "xyz\\\"") ; quote at end | |
| 50 (#ru"\u00ABxyz" "\u00ABxyz") ; one Unicode escape | |
| 51 (#rU"\U000000ABxyz" "\U000000ABxyz") ; another Unicode escape | |
| 52 (#rU"xyz\u00AB" "xyz\u00AB") ; one Unicode escape | |
| 53 )) | |
| 54 (Assert (apply #'string= strings))) | |
| 55 | |
| 56 ;; Odd number of backslashes at the end | |
| 57 ;; ------------------------------------ | |
| 58 (dolist (string '("#r\"xyz\\\"" ; `#r"abc\"': escaped delimiter | |
| 59 "#r\"xyz\\\\\\\"" ; `#r"abc\\\"': escaped delimiter | |
| 60 )) | |
| 61 (with-temp-buffer | |
| 62 (insert string) | |
| 63 (Check-Error end-of-file (eval-buffer)))) | |
| 64 | |
| 65 ;; Alternate string/regex delimiters | |
| 66 ;; --------------------------------- | |
| 67 (dolist (string '("#r/xyz/" ; Perl syntax | |
| 68 "#r:ix/xyz/" ; Extended Perl syntax | |
| 69 "#r|xyz|" ; TeX syntax | |
| 70 "#r[xyz]" ; (uncommon) Perl syntax | |
| 71 "#r<xyz>" ; Perl6 syntax? | |
| 72 "#r(xyz)" ; arbitrary santax | |
| 73 "#r{xyz}" ; arbitrary santax | |
| 74 "#r,xyz," ; arbitrary santax | |
| 75 "#r!xyz!" ; arbitrary santax | |
| 76 )) | |
| 77 (with-temp-buffer | |
| 78 (insert string) | |
| 79 (Check-Error-Message invalid-read-syntax "unrecognized raw string" | |
| 80 (eval-buffer)))) |