Mercurial > hg > xemacs-beta
annotate src/vm-limit.c @ 5124:623d57b7fbe8 ben-lisp-object
separate regular and disksave finalization, print method fixes.
Create separate disksave method and make the finalize method only be for
actual object finalization, not disksave finalization.
Fix places where 0 was given in place of a printer -- print methods are
mandatory, and internal objects formerly without a print method now must
explicitly specify internal_object_printer().
Change the defn of CONSOLE_LIVE_P to avoid problems in some weird situations.
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-01-20 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (very_old_free_lcrecord):
* alloc.c (disksave_object_finalization_1):
* alloc.c (make_lcrecord_list):
* alloc.c (alloc_managed_lcrecord):
* alloc.c (free_managed_lcrecord):
* alloc.c (sweep_lcrecords_1):
* buffer.c:
* bytecode.c:
* bytecode.c (Fcompiled_function_p):
* chartab.c:
* console-impl.h:
* console-impl.h (CONSOLE_TYPE_P):
* console.c:
* console.c (set_quit_events):
* data.c:
* data.c (Fmake_ephemeron):
* database.c:
* database.c (finalize_database):
* database.c (Fclose_database):
* device-msw.c:
* device-msw.c (finalize_devmode):
* device-msw.c (allocate_devmode):
* device.c:
* elhash.c:
* elhash.c (finalize_hash_table):
* eval.c:
* eval.c (bind_multiple_value_limits):
* event-stream.c:
* event-stream.c (finalize_command_builder):
* events.c:
* events.c (mark_event):
* extents.c:
* extents.c (finalize_extent_info):
* extents.c (uninit_buffer_extents):
* faces.c:
* file-coding.c:
* file-coding.c (finalize_coding_system):
* file-coding.h:
* file-coding.h (struct coding_system_methods):
* file-coding.h (struct detector):
* floatfns.c:
* floatfns.c (extract_float):
* fns.c:
* fns.c (Fidentity):
* font-mgr.c (finalize_fc_pattern):
* font-mgr.c (finalize_fc_config):
* frame.c:
* glyphs.c:
* glyphs.c (finalize_image_instance):
* glyphs.c (unmap_subwindow_instance_cache_mapper):
* gui.c:
* gui.c (gui_error):
* keymap.c:
* lisp.h (struct Lisp_Symbol):
* lrecord.h:
* lrecord.h (struct lrecord_implementation):
* lrecord.h (MC_ALLOC_CALL_FINALIZER):
* lrecord.h (MC_ALLOC_CALL_FINALIZER_FOR_DISKSAVE):
* lrecord.h (DEFINE_DUMPABLE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_SIZABLE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_FROB_BLOCK_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_FROB_BLOCK_GENERAL_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_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_SIZABLE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_FROB_BLOCK_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_FROB_BLOCK_GENERAL_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_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_MODULE_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_MODULE_SIZABLE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_MODULE_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_MODULE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_MODULE_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_MODULE_SIZABLE_GENERAL_LISP_OBJECT):
* lrecord.h (MAKE_MODULE_LISP_OBJECT):
* lstream.c:
* lstream.c (finalize_lstream):
* lstream.c (disksave_lstream):
* marker.c:
* marker.c (finalize_marker):
* mule-charset.c (make_charset):
* number.c:
* objects.c:
* objects.c (finalize_color_instance):
* objects.c (finalize_font_instance):
* opaque.c:
* opaque.c (make_opaque_ptr):
* process-nt.c:
* process-nt.c (nt_finalize_process_data):
* process-nt.c (nt_deactivate_process):
* process.c:
* process.c (finalize_process):
* procimpl.h (struct process_methods):
* scrollbar.c:
* scrollbar.c (free_scrollbar_instance):
* specifier.c (finalize_specifier):
* symbols.c:
* toolbar.c:
* toolbar.c (Ftoolbar_button_p):
* tooltalk.c:
* ui-gtk.c:
* ui-gtk.c (emacs_gtk_object_finalizer):
* ui-gtk.c (allocate_emacs_gtk_boxed_data):
* window.c:
* window.c (finalize_window):
* window.c (mark_window_as_deleted):
Separate out regular and disksave finalization. Instead of a
FOR_DISKSAVE argument to the finalizer, create a separate object
method `disksaver'. Make `finalizer' have only one argument.
Go through and separate out all finalize methods into finalize
and disksave. Delete lots of thereby redundant disksave checking.
Delete places that signal an error if we attempt to disksave --
all of these objects are non-dumpable and we will get an error
from pdump anyway if we attempt to dump them. After this is done,
only one object remains that has a disksave method -- lstream.
Change DEFINE_*_LISP_OBJECT_WITH_PROPS to DEFINE_*_GENERAL_LISP_OBJECT,
which is used for specifying either property methods or disksave
methods (or in the future, any other less-used methods).
Remove the for_disksave argument to finalize_process_data. Don't
provide a disksaver for processes because no one currently needs
it.
Clean up various places where objects didn't provide a print method.
It was made mandatory in previous changes, and all methods now
either provide their own print method or use internal_object_printer
or external_object_printer.
Change the definition of CONSOLE_LIVE_P to use the contype enum
rather than looking into the conmeths structure -- in some weird
situations with dead objects, the conmeths structure is NULL,
and printing such objects from debug_print() will crash if we try
to look into the conmeths structure.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Wed, 20 Jan 2010 07:05:57 -0600 |
| parents | 04bc9d2f42c7 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 /* Functions for memory limit warnings. |
| 2 Copyright (C) 1990, 1992 Free Software Foundation, Inc. | |
| 3 | |
| 4 This file is part of XEmacs. | |
| 5 | |
| 6 XEmacs is free software; you can redistribute it and/or modify it | |
| 7 under the terms of the GNU General Public License as published by the | |
| 8 Free Software Foundation; either version 2, or (at your option) any | |
| 9 later version. | |
| 10 | |
| 11 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 14 for more details. | |
| 15 | |
| 16 You should have received a copy of the GNU General Public License | |
| 17 along with XEmacs; see the file COPYING. If not, write to | |
| 18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 19 Boston, MA 02111-1307, USA. */ | |
| 20 | |
| 21 /* Synched up with: FSF 19.30. */ | |
| 22 | |
| 23 #ifdef emacs | |
| 24 #include <config.h> | |
| 25 #include "lisp.h" | |
| 26 #endif | |
| 27 | |
| 28 #include <stddef.h> | |
| 29 #ifndef emacs | |
| 30 typedef size_t SIZE; | |
| 31 typedef void *POINTER; | |
| 32 #define EXCEEDS_LISP_PTR(x) 0 | |
| 33 #endif | |
| 34 | |
| 35 #include "mem-limits.h" | |
| 36 | |
| 793 | 37 #ifndef _NO_MALLOC_WARNING_ |
| 38 | |
| 428 | 39 /* |
| 40 Level number of warnings already issued. | |
| 41 0 -- no warnings issued. | |
| 42 1 -- 75% warning already issued. | |
| 43 2 -- 85% warning already issued. | |
| 44 3 -- 95% warning issued; keep warning frequently. | |
| 45 */ | |
| 46 static int warnlevel; | |
| 47 | |
| 48 /* Function to call to issue a warning; | |
| 49 0 means don't issue them. */ | |
| 442 | 50 static void (*warn_function) (const char *); |
| 428 | 51 |
| 52 /* Get more memory space, complaining if we're near the end. */ | |
| 53 | |
| 54 static void | |
| 55 check_memory_limits (void) | |
| 56 { | |
| 57 extern POINTER (*__morecore) (ptrdiff_t size); | |
| 58 | |
| 59 POINTER cp; | |
| 60 unsigned long five_percent; | |
| 61 unsigned long data_size; | |
| 442 | 62 void (*save_warn_fun) (const char *); |
| 428 | 63 |
| 64 if (lim_data == 0) | |
| 65 get_lim_data (); | |
| 66 five_percent = lim_data / 20; | |
| 67 | |
| 68 /* Find current end of memory and issue warning if getting near max */ | |
| 69 cp = (char *) (*__morecore) (0); | |
| 70 data_size = (char *) cp - (char *) data_space_start; | |
| 71 | |
| 72 if (warn_function) | |
| 442 | 73 { |
| 74 /* temporarily reset the warn_function to 0 or we will get infinite | |
| 75 looping. */ | |
| 76 save_warn_fun = warn_function; | |
| 77 warn_function = 0; | |
| 78 switch (warnlevel) | |
| 79 { | |
| 80 case 0: | |
| 81 if (data_size > five_percent * 15) | |
| 82 { | |
| 83 warnlevel++; | |
| 84 (*save_warn_fun) ("Warning: past 75% of memory limit"); | |
| 85 } | |
| 86 break; | |
| 428 | 87 |
| 442 | 88 case 1: |
| 89 if (data_size > five_percent * 17) | |
| 90 { | |
| 91 warnlevel++; | |
| 92 (*save_warn_fun) ("Warning: past 85% of memory limit"); | |
| 93 } | |
| 94 break; | |
| 428 | 95 |
| 442 | 96 case 2: |
| 97 if (data_size > five_percent * 19) | |
| 98 { | |
| 99 warnlevel++; | |
| 100 (*save_warn_fun) ("Warning: past 95% of memory limit"); | |
| 101 } | |
| 102 break; | |
| 428 | 103 |
| 442 | 104 default: |
| 105 (*save_warn_fun) ("Warning: past acceptable memory limits"); | |
| 106 break; | |
| 107 } | |
| 108 warn_function = save_warn_fun; | |
| 109 } | |
| 428 | 110 |
| 111 /* If we go down below 70% full, issue another 75% warning | |
| 112 when we go up again. */ | |
| 113 if (data_size < five_percent * 14) | |
| 114 warnlevel = 0; | |
| 115 /* If we go down below 80% full, issue another 85% warning | |
| 116 when we go up again. */ | |
| 117 else if (warnlevel > 1 && data_size < five_percent * 16) | |
| 118 warnlevel = 1; | |
| 119 /* If we go down below 90% full, issue another 95% warning | |
| 120 when we go up again. */ | |
| 121 else if (warnlevel > 2 && data_size < five_percent * 18) | |
| 122 warnlevel = 2; | |
| 123 | |
| 124 if (EXCEEDS_LISP_PTR (cp)) | |
| 442 | 125 { |
| 126 if (warn_function) | |
| 127 { | |
| 128 /* temporarily reset the warn_function to 0 or we will get infinite | |
| 129 looping. */ | |
| 130 save_warn_fun = warn_function; | |
| 131 warn_function = 0; | |
| 132 (*save_warn_fun) | |
| 133 ("Warning: memory in use exceeds lisp pointer size"); | |
| 134 warn_function = save_warn_fun; | |
| 135 } | |
| 136 } | |
| 428 | 137 } |
| 138 | |
| 793 | 139 #endif /* not _NO_MALLOC_WARNING_ */ |
| 140 | |
| 428 | 141 /* Cause reinitialization based on job parameters; |
| 142 also declare where the end of pure storage is. */ | |
| 143 | |
| 144 void | |
| 2286 | 145 memory_warnings (void *start, |
| 146 #ifdef _NO_MALLOC_WARNING_ | |
| 147 void (*UNUSED_ARG (warnfun)) (const char *) ATTRIBUTE_UNUSED | |
| 148 #else | |
| 149 void (*warnfun) (const char *) | |
| 150 #endif | |
| 151 ) | |
| 428 | 152 { |
| 793 | 153 #ifndef _NO_MALLOC_WARNING_ |
| 428 | 154 extern void (* __after_morecore_hook) (void); /* From gmalloc.c */ |
| 793 | 155 #endif |
| 428 | 156 |
| 157 if (start) | |
| 442 | 158 data_space_start = (char*) start; |
| 428 | 159 else |
| 160 data_space_start = start_of_data (); | |
| 161 | |
| 162 #ifndef _NO_MALLOC_WARNING_ | |
| 163 warn_function = warnfun; | |
| 164 __after_morecore_hook = check_memory_limits; | |
| 165 #endif | |
| 166 } |