Mercurial > hg > xemacs-beta
view lisp/mule/indian.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 | 98af8a976fc3 |
children | 3889ef128488 308d34e9f07d |
line wrap: on
line source
;;; indian.el --- support for Indian Languages -*- coding: iso-2022-7bit; -*- ;; Copyright (C) 1995 Free Software Foundation, Inc. ;; Author: KAWABATA, Taichi <kawabata@is.s.u-tokyo.ac.jp> ;; Keywords: multilingual, Indian ;; 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: Emacs 21.1 (language/indian.el). ;;; Commentary: ;; History: ;; 1996.10.18 written by KAWABATA, Taichi <kawabata@is.s.u-tokyo.ac.jp> ;; For Indian, the character set IS 13194 is supported. ;; ;; IS 13194 does not specifically assign glyphs for each characters. ;; Following code is not specific to each Indian language. ;; ;; Eventually, this code will support generic information about ;; following scripts. ;; ;; Devanagari ;; Bengali ;; Gurmukhi ;; Gujarati ;; Oriya ;; Tamil ;; Telgu ;; Kannada ;; Malayalam ;; ;; In this file, charsets other than charset-ascii and charset-indian-is13194 ;; should not be used except in the comment. ;;; Code: ;; Followings are what you see when you refer to the Emacs ;; representations of IS 13194 charcters. However, this is merely ;; tentative apperance, and you must convert them by ;; indian-to-xxxxxx(specific script) function to use them. ;; Devanagari is not an exception of this rule. ;; 0xa0 //(5!"#$%&'()*+,-./(B ;; 0xb0 (50123456789:;<=>?(B ;; 0xc0 (5@ABCDEFGHIJKLMNO(B ;; 0xd0 (5PQRSTUVWXYZ[\]^_(B ;; 0xe0 (5`abcdefghijklmno(B ;; 0xf0 (5pqrstuvwxyz{|}~(B// ;; Note - In IS 13194, several symbols are obtained by special ;; combination of several characters and Nukta sign. ;; ;; Sanskrit Vowel R -> (5*(B + (5i(B ;; Sanskrit Vowel L -> (5&(B + (5i(B ;; Sanskrit Vowel LL -> (5'(B + (5i(B ;; Sanskrit Avagrah -> (5j(B + (5i(B ;; OM -> (5!(B + (5i(B ;; ;; Note - IS 13194 defines ATR(0xEF) and EXT(0xF0), but they are ;; not used in Emacs. ;; ;; Note - the above characters DO NOT represent any script. For ;; example, if you want to obtain Devanagari character, you must do ;; something like the following. ;; ;; (char-to-string (indian-to-devanagari ?(5$(B)) ;; "$(5!$(B" ;;; ITRANS ;; ;; ITRANS is one of the most popular method to exchange indian scripts ;; electronically. Here is the table to convert between ITRANS code and ;; IS 13194 code. ;; Indian scripts. Symbolic charset for data exchange. Glyphs are ;; not assigned. They are automatically converted to each Indian ;; script which IS-13194 supports. (make-charset 'indian-is13194 "Generic Indian charset for data exchange with IS 13194" '(dimension 1 registries ["IS13194-Devanagari"] chars 94 columns 2 direction l2r final ?5 graphic 1 short-name "IS 13194" long-name "Indian IS 13194" )) ;; Actual Glyph for 1-column width. (make-charset 'indian-1-column "Indian charset for 2-column width glyphs" '(dimension 2 registries ["MuleIndian-1"] chars 94 columns 1 direction l2r final ?6 graphic 0 short-name "Indian 1-col" long-name "Indian 1 Column" )) ;; Actual Glyph for 2-column width. (make-charset 'indian-2-column "Indian charset for 2-column width glyphs" '(dimension 2 registries ["MuleIndian-2"] chars 94 columns 2 direction l2r final ?5 graphic 0 short-name "Indian 2-col" long-name "Indian 2 Column" )) (defvar indian-itrans-consonant-alist '( ("k" . "(53(B") ("kh" . "(54(B") ("g" . "(55(B") ("gh" . "(56(B") ("N^" . "(57(B") ("ch" . "(58(B") ("chh" . "(59(B") ("j" . "(5:(B") ("jh" . "(5;(B") ("JN" . "(5<(B") ("T" . "(5=(B") ("Th" . "(5>(B") ("D" . "(5?(B") ("Dh" . "(5@(B") ("N" . "(5A(B") ("t" . "(5B(B") ("th" . "(5C(B") ("d" . "(5D(B") ("dh" . "(5E(B") ("n" . "(5F(B") ("nh" . "(5G(B") ; For transcription of non-Devanagari Languages. ("p" . "(5H(B") ("ph" . "(5I(B") ("b" . "(5J(B") ("bh" . "(5K(B") ("m" . "(5L(B") ("y" . "(5M(B") ("yh" . "(5N(B") ; For transcription of non-Devanagari Languages. ("r" . "(5O(B") ("rh" . "(5P(B") ; For transcription of non-Devanagari Languages. ("l" . "(5Q(B") ("v" . "(5T(B") ("sh" . "(5U(B") ("shh" . "(5V(B") ("s" . "(5W(B") ("h" . "(5X(B") ("ld" . "(5R(B") ("L" . "(5R(B") ("ksh" . "$(5!3!h!V(B") ("GY" . "***GY***") ; Must check out later. ;; special consonants ("q" . "(53i(B") ("K" . "(54i(B") ("G" . "(55i(B") ("z" . "(5:i(B") ("f" . "(5Ii(B") (".D" . "(5?i(B") (".Dh" . "(5@i(B") )) (defvar indian-itrans-vowel-sign-alist '( ;; Special treatment unique to IS 13194 Transliteration ("" . "(5h(B") ("a" . "") ;; Matra (Vowel Sign) ("aa" . "(5Z(B") ("A" . "(5Z(B") ("i" . "(5[(B") ("ii" . "(5\(B") ("I" . "(5\(B") ("u" . "(5](B") ("uu" . "(5^(B") ("U" . "(5^(B") ("R^i" . "(5_(B") ; These must be checked out later. ("R^I" . "(5_i(B") ("L^i" . "(5[i(B") ("L^I" . "(5\i(B") ("E" . "(5`(B") ; For transcription of non-Devanangri Languages. ("e" . "(5a(B") ("ai" . "(5b(B") ;; ("e.c" . "(5c(B") ; Tentatively suppressed. ("O" . "(5d(B") ; For transcription of non-Devanagari Languages. ("o" . "(5e(B") ("au" . "(5f(B") ;; ("o.c" . "(5g(B") ; Tentatively suppressed. )) ;; ;; Independent vowels and other signs. ;; (defvar indian-itrans-other-letters-alist '( ("a" . "(5$(B") ("aa" . "(5%(B") ("A" . "(5%(B") ("i" . "(5&(B") ("ii" . "(5'(B") ("I" . "(5'(B") ("u" . "(5((B") ("uu" . "(5)(B") ("U" . "(5)(B") ("R^i" . "(5*(B") ("R^I" . "(5*i(B") ("L^i" . "(5&i(B") ("L^I" . "(5'i(B") ("E" . "(5+(B") ; For transcription of non-Devanagari Languages. ("e" . "(5,(B") ("ai" . "(5-(B") ;; ("e.c" . "(5.(B") ; Candra E ("O" . "(5/(B") ; For transcription of non-Devanagari Languages. ("o" . "(50(B") ("au" . "(51(B") ;; ("o.c" . "(52(B") ; Candra O ("M" . "(5$(B") ("H" . "(5#(B") ("AUM" . "(5!i(B") ("OM" . "(5!i(B") (".r" . "(5Oh(B") (".n" . "(5"(B") (".N" . "(5!(B") (".h" . "(5h(B") ; Halant (".." . "(5j(B") (".a" . "(5ji(B") ; Avagrah ("0" . "(5q(B") ("1" . "(5r(B") ("2" . "(5s(B") ("3" . "(5t(B") ("4" . "(5u(B") ("5" . "(5v(B") ("6" . "(5w(B") ("7" . "(5x(B") ("8" . "(5y(B") ("9" . "(5z(B") )) ;; Regular expression matching single Indian character represented ;; by ITRANS. (defvar indian-itrans-regexp (let ((consonant "\\([cs]hh?\\)\\|[kgjTDnpbyr]h?\\|\\(N\\^?\\)\\|\\(jN\\)\\|[mvqKGzfs]\\|\\(ld?\\)\\|\\(ksh\\)\\|\\(GY\\)\\|\\(\\.Dh?\\)") (vowel "\\(a[aiu]\\)\\|\\(ii\\)\\|\\(uu\\)\\|\\([RL]\\^[iI]\\)\\|[AIEOeoaiu]") (misc "[MH0-9]\\|\\(AUM\\)\\|\\(OM\\)\\|\\(\\.[rnNh\\.a]\\)") (lpre "\\(") (rpre "\\)") (orre "\\|")) (concat lpre misc rpre orre lpre lpre consonant rpre "?" lpre vowel rpre rpre orre lpre consonant rpre ))) ;; ;; Regular expression matching single ITRANS unit for IS 13194 characters. ;; (defvar itrans-indian-regexp (let ((vowel "[(5$(B-(52(B]") (consonant "[(53(B-(5X(B]") (matra "[(5Z(B-(5g(B]") (misc "[(5q(B-(5z(B]") (lpre "\\(") (rpre "\\)") (orre "\\|")) (concat misc orre lpre consonant matra "?" rpre orre vowel))) ;; ;; IS13194 - ITRANS conversion table for string matching above regexp. ;; (defvar indian-itrans-alist (let ((cl indian-itrans-consonant-alist) (ml indian-itrans-other-letters-alist) rules) (while cl (let ((vl indian-itrans-vowel-sign-alist)) (while vl (setq rules (cons (cons (concat (car (car cl)) (car (car vl))) (concat (cdr (car cl)) (cdr (car vl)))) rules)) (setq vl (cdr vl)))) (setq cl (cdr cl))) (while ml (setq rules (cons (cons (car (car ml)) (cdr (car ml))) rules)) (setq ml (cdr ml))) rules)) ;; ;; Utility program to convert from ITRANS to IS 13194 in specified region. ;; (defun indian-decode-itrans-region (from to) "Convert `ITRANS' mnemonics of the current region to Indian characters. When called from a program, expects two arguments, positions (integers or markers) specifying the stretch of the region." (interactive "r") (save-restriction (narrow-to-region from to) (goto-char (point-min)) (while (re-search-forward indian-itrans-regexp nil t) (let* ((itrans (buffer-substring (match-beginning 0) (match-end 0))) (ch (cdr (assoc itrans indian-itrans-alist)))) (if ch (progn (delete-region (match-beginning 0) (match-end 0)) (insert ch))))) (goto-char (point-min)) (while (re-search-forward "\\((5h(B\\)[^\\c0]" nil t) (delete-region (match-beginning 1) (match-end 1))))) ;; ;; Utility program to convert from IS 13194 to ITRANS in specified region. ;; (defun indian-encode-itrans-region (from to) "Convert indian region to ITRANS mnemonics." (interactive "r") (save-restriction (narrow-to-region from to) (goto-char (point-min)) (while (re-search-forward itrans-indian-regexp nil t) (let* ((indian (buffer-substring (match-beginning 0) (match-end 0))) (ch (car (rassoc indian indian-itrans-alist)))) (if ch (progn (delete-region (match-beginning 0) (match-end 0)) (insert ch))))) (goto-char (point-min)))) (provide 'indian) ;;; indian.el ends here