annotate lisp/post-gc.el @ 4967:0d4c9d0f6a8d

rewrite dynarr code -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 2010-02-03 Ben Wing <ben@xemacs.org> * device-x.c (x_get_resource_prefix): * device-x.c (Fx_get_resource): * device-x.c (Fx_get_resource_prefix): * device-x.c (Fx_put_resource): * dialog-msw.c: * dialog-msw.c (handle_question_dialog_box): * dired-msw.c (mswindows_sort_files): * dired-msw.c (mswindows_get_files): * extents.c (extent_fragment_sort_by_priority): * extents.c (Fset_extent_parent): * file-coding.c (coding_reader): * file-coding.c (coding_writer): * file-coding.c (gzip_convert): * frame.c (generate_title_string): * gutter.c (calculate_gutter_size_from_display_lines): * indent.c (vmotion_1): * lread.c (read_bit_vector): * mule-coding.c (iso2022_decode): * rangetab.c: * rangetab.c (Fcopy_range_table): * rangetab.c (Fget_range_table): * rangetab.c (unified_range_table_copy_data): * redisplay-msw.c (mswindows_output_string): * redisplay-output.c (output_display_line): * redisplay-output.c (redisplay_move_cursor): * redisplay-output.c (redisplay_clear_bottom_of_window): * redisplay-tty.c (tty_output_ichar_dynarr): * redisplay-tty.c (set_foreground_to): * redisplay-tty.c (set_background_to): * redisplay-xlike-inc.c (XLIKE_output_string): * redisplay.c (redisplay_window_text_width_string): * redisplay.c (redisplay_text_width_string): * redisplay.c (create_text_block): * redisplay.c (SET_CURRENT_MODE_CHARS_PIXSIZE): * redisplay.c (generate_fstring_runes): * redisplay.c (regenerate_modeline): * redisplay.c (ensure_modeline_generated): * redisplay.c (real_current_modeline_height): * redisplay.c (create_string_text_block): * redisplay.c (regenerate_window): * redisplay.c (REGEN_INC_FIND_START_END): * redisplay.c (point_visible): * redisplay.c (redisplay_window): * redisplay.c (mark_glyph_block_dynarr): * redisplay.c (line_start_cache_start): * redisplay.c (start_with_line_at_pixpos): * redisplay.c (update_line_start_cache): * redisplay.c (glyph_to_pixel_translation): * redisplay.c (pixel_to_glyph_translation): * sysdep.c (qxe_readdir): * text.c (dfc_convert_to_external_format): * text.c (dfc_convert_to_internal_format): * toolbar-common.c (common_output_toolbar_button): * window.c (window_modeline_height): * window.c (Fwindow_last_line_visible_height): * window.c (window_displayed_height): * window.c (window_scroll): * window.c (get_current_pixel_pos): Use Dynarr_begin() in place of Dynarr_atp (foo, 0). * dynarr.c (Dynarr_realloc): * dynarr.c (Dynarr_lisp_realloc): * dynarr.c (Dynarr_resize): * dynarr.c (Dynarr_insert_many): * dynarr.c (Dynarr_delete_many): * dynarr.c (Dynarr_memory_usage): * dynarr.c (stack_like_malloc): * dynarr.c (stack_like_free): * lisp.h: * lisp.h (DECLARE_DYNARR_LISP_IMP): * lisp.h (XD_DYNARR_DESC): * lisp.h (Dynarr_pop): * gutter.c (output_gutter): * redisplay-output.c (sync_rune_structs): * redisplay-output.c (redisplay_output_window): Redo the dynarr code, add greater checks. Rename the `len', `largest' and `max' members to `len_', `largest_' and `max_' to try and catch existing places that might directly modify these values. Make new accessors Dynarr_largest() and Dynarr_max() and make them and existing Dynarr_length() be non-lvalues by adding '+ 0' to them; fix a couple of places in the redisplay code that tried to modify the length directly by setting Dynarr_length(). Use the accessors whenever possible even in the dynarr code itself. The accessors also verify that 0 <= len <= largest <= max. Rename settor function Dynarr_set_size() to Dynarr_set_length() and use it more consistently; also create lower-level Dynarr_set_length_1(). This latter function should be the only function that directly modifies the `len_' member of a Dynarr, and in the process makes sure that the `largest' value is kept correct. Consistently use ERROR_CHECK_STRUCTURES instead of ERROR_CHECK_TYPES for error-checking code. Reintroduce the temporarily disabled verification code on the positions of Dynarr_at(), Dynarr_atp() and Dynarr_atp_past_end(). Also create Dynarr_resize_if() in place of a repeated code fragment. Clean up all the functions that modify Dynarrs to use the new macros and functions and verify the correctness of the Dynarr both before and after the change. Note that there are two kinds of verification -- one for accessing and one for modifying. The difference is that the modify verification additionally checks to make sure that the Dynarr isn't locked. (This is used in redisplay to check for problems with reentrancy.) * lrecord.h: Move XD_DYNARR_DESC to lisp.h, grouping with the dynarr code.
author Ben Wing <ben@xemacs.org>
date Wed, 03 Feb 2010 20:51:18 -0600
parents 75b8038f720e
children d27c1ee1943b 308d34e9f07d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
886
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
1 ;;; post-gc.el --- post-gc actions
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
2
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
3 ;; Copyright (C) 1985-1986, 1990, 1992-1997 Free Software Foundation, Inc.
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
4 ;; Copyright (c) 1993, 1994 Sun Microsystems, Inc.
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
5 ;; Copyright (C) 1995 Board of Trustees, University of Illinois
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
6
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
7 ;; Author: Mike Sperber <mike@xemacs.org>
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
8 ;; Maintainer: XEmacs Development Team
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
9 ;; Keywords: internal, dumped
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
10
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
11 ;; This file is part of XEmacs.
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
12
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
13 ;; XEmacs is free software; you can redistribute it and/or modify it
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
14 ;; under the terms of the GNU General Public License as published by
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
15 ;; the Free Software Foundation; either version 2, or (at your option)
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
16 ;; any later version.
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
17
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
18 ;; XEmacs is distributed in the hope that it will be useful, but
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
19 ;; WITHOUT ANY WARRANTY; without even the implied warranty of
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
21 ;; General Public License for more details.
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
22
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
23 ;; You should have received a copy of the GNU General Public License
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
24 ;; along with XEmacs; see the file COPYING. If not, write to the
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
25 ;; Free Software Foundation, 59 Temple Place - Suite 330,
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
26 ;; Boston, MA 02111-1307, USA.
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
27
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
28 ;;; Synched up with: Not in FSF.
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
29
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
30 ;;; Commentary:
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
31
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
32 ;; This file is dumped with XEmacs.
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
33
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
34 ;; This file defines actions to happen after each GC to perform
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
35 ;; additional cleanup, call finalizers, etc.
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
36
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
37 (defun run-finalizers (alist)
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
38 "Run the finalizers for all objects that have just become unreachable."
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
39 (let ((info (assq 'finalize-list alist)))
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
40 (if info
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
41 (let ((finalize-list (cdr info)))
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
42 (while finalize-list
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
43 (funcall (cdr (car finalize-list)) (car (car finalize-list)))
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
44 (setq finalize-list (cdr finalize-list)))))))
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
45
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
46 (add-hook 'post-gc-hook 'run-finalizers)
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
47
1591
75b8038f720e [xemacs-hg @ 2003-07-26 14:01:23 by michaels]
michaels
parents: 886
diff changeset
48 (defvar simple-finalizer-ephemerons '()
75b8038f720e [xemacs-hg @ 2003-07-26 14:01:23 by michaels]
michaels
parents: 886
diff changeset
49 "List of ephemerons for objects that have a finalizer attached..")
886
011e1bce6ece [xemacs-hg @ 2002-06-28 14:20:41 by michaels]
michaels
parents:
diff changeset
50
1591
75b8038f720e [xemacs-hg @ 2003-07-26 14:01:23 by michaels]
michaels
parents: 886
diff changeset
51 (defun add-finalizer (object func)
75b8038f720e [xemacs-hg @ 2003-07-26 14:01:23 by michaels]
michaels
parents: 886
diff changeset
52 "Add FUNC as a finalizer for object OBJECT."
75b8038f720e [xemacs-hg @ 2003-07-26 14:01:23 by michaels]
michaels
parents: 886
diff changeset
53 (setq simple-finalizer-ephemerons
75b8038f720e [xemacs-hg @ 2003-07-26 14:01:23 by michaels]
michaels
parents: 886
diff changeset
54 (cons (make-ephemeron object object func)
75b8038f720e [xemacs-hg @ 2003-07-26 14:01:23 by michaels]
michaels
parents: 886
diff changeset
55 simple-finalizer-ephemerons)))
75b8038f720e [xemacs-hg @ 2003-07-26 14:01:23 by michaels]
michaels
parents: 886
diff changeset
56
75b8038f720e [xemacs-hg @ 2003-07-26 14:01:23 by michaels]
michaels
parents: 886
diff changeset
57 (defun cleanup-simple-finalizers (alist)
75b8038f720e [xemacs-hg @ 2003-07-26 14:01:23 by michaels]
michaels
parents: 886
diff changeset
58 "Clean up `simple-finalizer-ephemerons'."
75b8038f720e [xemacs-hg @ 2003-07-26 14:01:23 by michaels]
michaels
parents: 886
diff changeset
59 ;; We have to do this by hand because DELETE-IF isn't defined yet.
75b8038f720e [xemacs-hg @ 2003-07-26 14:01:23 by michaels]
michaels
parents: 886
diff changeset
60 (let ((current simple-finalizer-ephemerons)
75b8038f720e [xemacs-hg @ 2003-07-26 14:01:23 by michaels]
michaels
parents: 886
diff changeset
61 (prev nil))
75b8038f720e [xemacs-hg @ 2003-07-26 14:01:23 by michaels]
michaels
parents: 886
diff changeset
62 (while (not (null current))
75b8038f720e [xemacs-hg @ 2003-07-26 14:01:23 by michaels]
michaels
parents: 886
diff changeset
63 (if (not (ephemeron-ref (car current)))
75b8038f720e [xemacs-hg @ 2003-07-26 14:01:23 by michaels]
michaels
parents: 886
diff changeset
64 (if (null prev)
75b8038f720e [xemacs-hg @ 2003-07-26 14:01:23 by michaels]
michaels
parents: 886
diff changeset
65 (setq simple-finalizer-ephemerons (cdr current))
75b8038f720e [xemacs-hg @ 2003-07-26 14:01:23 by michaels]
michaels
parents: 886
diff changeset
66 (setcdr prev (cdr current)))
75b8038f720e [xemacs-hg @ 2003-07-26 14:01:23 by michaels]
michaels
parents: 886
diff changeset
67 (setq prev current))
75b8038f720e [xemacs-hg @ 2003-07-26 14:01:23 by michaels]
michaels
parents: 886
diff changeset
68 (setq current (cdr current)))))
75b8038f720e [xemacs-hg @ 2003-07-26 14:01:23 by michaels]
michaels
parents: 886
diff changeset
69
75b8038f720e [xemacs-hg @ 2003-07-26 14:01:23 by michaels]
michaels
parents: 886
diff changeset
70 (add-hook 'post-gc-hook 'cleanup-simple-finalizers)