Mercurial > hg > xemacs-beta
annotate src/alloc.c @ 5354:22c4e67a2e69
Remove #'acons from cl.el, make the version in alloc.c visible to Lisp
src/ChangeLog addition:
2011-02-09 Aidan Kehoe <kehoea@parhasard.net>
* alloc.c (Facons):
* alloc.c (Fobject_memory_usage):
* alloc.c (syms_of_alloc):
* faces.c (complex_vars_of_faces):
* lisp.h:
* mc-alloc.c (Fmc_alloc_memory_usage):
Rename acons() to Facons(), make it visible to Lisp. Change uses
of the function in C accordingly.
lisp/ChangeLog addition:
2011-02-09 Aidan Kehoe <kehoea@parhasard.net>
* cl.el (acons): Removed, make the implementation in alloc.c
visible to Lisp instead.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Wed, 09 Feb 2011 20:15:50 +0000 |
| parents | c096d8051f89 |
| children | 3889ef128488 00e79bbbe48f |
| rev | line source |
|---|---|
| 428 | 1 /* Storage allocation and gc for XEmacs Lisp interpreter. |
| 2 Copyright (C) 1985-1998 Free Software Foundation, Inc. | |
| 3 Copyright (C) 1995 Sun Microsystems, Inc. | |
|
4880
ae81a2c00f4f
try harder to avoid crashing when debug-printing
Ben Wing <ben@xemacs.org>
parents:
4803
diff
changeset
|
4 Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, 2005, 2010 Ben Wing. |
| 428 | 5 |
| 6 This file is part of XEmacs. | |
| 7 | |
| 8 XEmacs is free software; you can redistribute it and/or modify it | |
| 9 under the terms of the GNU General Public License as published by the | |
| 10 Free Software Foundation; either version 2, or (at your option) any | |
| 11 later version. | |
| 12 | |
| 13 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 16 for more details. | |
| 17 | |
| 18 You should have received a copy of the GNU General Public License | |
| 19 along with XEmacs; see the file COPYING. If not, write to | |
| 20 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 21 Boston, MA 02111-1307, USA. */ | |
| 22 | |
| 23 /* Synched up with: FSF 19.28, Mule 2.0. Substantially different from | |
| 24 FSF. */ | |
| 25 | |
| 26 /* Authorship: | |
| 27 | |
| 28 FSF: Original version; a long time ago. | |
| 29 Mly: Significantly rewritten to use new 3-bit tags and | |
| 30 nicely abstracted object definitions, for 19.8. | |
| 31 JWZ: Improved code to keep track of purespace usage and | |
| 32 issue nice purespace and GC stats. | |
| 33 Ben Wing: Cleaned up frob-block lrecord code, added error-checking | |
| 34 and various changes for Mule, for 19.12. | |
| 35 Added bit vectors for 19.13. | |
| 36 Added lcrecord lists for 19.14. | |
| 37 slb: Lots of work on the purification and dump time code. | |
| 38 Synched Doug Lea malloc support from Emacs 20.2. | |
| 442 | 39 og: Killed the purespace. Portable dumper (moved to dumper.c) |
| 428 | 40 */ |
| 41 | |
| 42 #include <config.h> | |
| 43 #include "lisp.h" | |
| 44 | |
| 45 #include "backtrace.h" | |
| 46 #include "buffer.h" | |
| 47 #include "bytecode.h" | |
| 48 #include "chartab.h" | |
| 49 #include "device.h" | |
| 50 #include "elhash.h" | |
| 51 #include "events.h" | |
| 872 | 52 #include "extents-impl.h" |
| 1204 | 53 #include "file-coding.h" |
| 872 | 54 #include "frame-impl.h" |
| 3092 | 55 #include "gc.h" |
| 428 | 56 #include "glyphs.h" |
| 57 #include "opaque.h" | |
| 1204 | 58 #include "lstream.h" |
| 872 | 59 #include "process.h" |
| 1292 | 60 #include "profile.h" |
| 428 | 61 #include "redisplay.h" |
| 62 #include "specifier.h" | |
| 63 #include "sysfile.h" | |
| 442 | 64 #include "sysdep.h" |
| 428 | 65 #include "window.h" |
| 3092 | 66 #ifdef NEW_GC |
| 67 #include "vdb.h" | |
| 68 #endif /* NEW_GC */ | |
| 428 | 69 #include "console-stream.h" |
| 70 | |
| 71 #ifdef DOUG_LEA_MALLOC | |
| 72 #include <malloc.h> | |
| 73 #endif | |
|
4803
5d120deb60ca
Enable rudimentary support for valgrind, including functions that tell valgrind
Jerry James <james@xemacs.org>
parents:
4776
diff
changeset
|
74 #ifdef USE_VALGRIND |
|
5d120deb60ca
Enable rudimentary support for valgrind, including functions that tell valgrind
Jerry James <james@xemacs.org>
parents:
4776
diff
changeset
|
75 #include <valgrind/memcheck.h> |
|
5d120deb60ca
Enable rudimentary support for valgrind, including functions that tell valgrind
Jerry James <james@xemacs.org>
parents:
4776
diff
changeset
|
76 #endif |
| 428 | 77 |
| 78 EXFUN (Fgarbage_collect, 0); | |
| 79 | |
| 80 #if 0 /* this is _way_ too slow to be part of the standard debug options */ | |
| 81 #if defined(DEBUG_XEMACS) && defined(MULE) | |
| 82 #define VERIFY_STRING_CHARS_INTEGRITY | |
| 83 #endif | |
| 84 #endif | |
| 85 | |
| 86 /* Define this to use malloc/free with no freelist for all datatypes, | |
| 87 the hope being that some debugging tools may help detect | |
| 88 freed memory references */ | |
| 89 #ifdef USE_DEBUG_MALLOC /* Taking the above comment at face value -slb */ | |
| 90 #include <dmalloc.h> | |
| 91 #define ALLOC_NO_POOLS | |
| 92 #endif | |
| 93 | |
| 94 #ifdef DEBUG_XEMACS | |
| 458 | 95 static Fixnum debug_allocation; |
| 96 static Fixnum debug_allocation_backtrace_length; | |
| 428 | 97 #endif |
| 98 | |
|
5307
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5229
diff
changeset
|
99 Fixnum Varray_dimension_limit, Varray_total_size_limit, Varray_rank_limit; |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5229
diff
changeset
|
100 |
| 851 | 101 int need_to_check_c_alloca; |
| 887 | 102 int need_to_signal_post_gc; |
| 851 | 103 int funcall_allocation_flag; |
| 104 Bytecount __temp_alloca_size__; | |
| 105 Bytecount funcall_alloca_count; | |
| 814 | 106 |
|
5146
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
107 /* All the built-in lisp object types are enumerated in `enum lrecord_type'. |
|
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
108 Additional ones may be defined by a module (none yet). We leave some |
|
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
109 room in `lrecord_implementations_table' for such new lisp object types. */ |
|
5157
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
110 struct lrecord_implementation *lrecord_implementations_table[(int)lrecord_type_last_built_in_type + MODULE_DEFINABLE_TYPE_COUNT]; |
|
5146
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
111 int lrecord_type_count = lrecord_type_last_built_in_type; |
|
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
112 |
|
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
113 /* This is just for use by the printer, to allow things to print uniquely. |
|
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
114 We have a separate UID space for each object. (Important because the |
|
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
115 UID is only 20 bits in old-GC, and 22 in NEW_GC.) */ |
|
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
116 int lrecord_uid_counter[countof (lrecord_implementations_table)]; |
|
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
117 |
|
5160
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
118 #ifndef USE_KKCC |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
119 /* Object marker functions are in the lrecord_implementation structure. |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
120 But copying them to a parallel array is much more cache-friendly. |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
121 This hack speeds up (garbage-collect) by about 5%. */ |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
122 Lisp_Object (*lrecord_markers[countof (lrecord_implementations_table)]) (Lisp_Object); |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
123 #endif /* not USE_KKCC */ |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
124 |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
125 struct gcpro *gcprolist; |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
126 |
|
5146
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
127 /* Non-zero means we're in the process of doing the dump */ |
|
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
128 int purify_flag; |
|
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
129 |
|
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
130 /* Non-zero means we're pdumping out or in */ |
|
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
131 #ifdef PDUMP |
|
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
132 int in_pdump; |
|
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
133 #endif |
|
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
134 |
|
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
135 #ifdef ERROR_CHECK_TYPES |
|
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
136 |
|
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
137 Error_Behavior ERROR_ME, ERROR_ME_NOT, ERROR_ME_WARN, ERROR_ME_DEBUG_WARN; |
|
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
138 |
|
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
139 #endif |
|
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
140 |
|
5157
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
141 #ifdef MEMORY_USAGE_STATS |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
142 Lisp_Object Qobject_actually_requested, Qobject_malloc_overhead; |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
143 Lisp_Object Qother_memory_actually_requested, Qother_memory_malloc_overhead; |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
144 Lisp_Object Qother_memory_dynarr_overhead, Qother_memory_gap_overhead; |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
145 #endif /* MEMORY_USAGE_STATS */ |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
146 |
|
5167
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
147 #ifndef NEW_GC |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
148 static int gc_count_num_short_string_in_use; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
149 static Bytecount gc_count_string_total_size; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
150 static Bytecount gc_count_short_string_total_size; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
151 static Bytecount gc_count_long_string_storage_including_overhead; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
152 #endif /* not NEW_GC */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
153 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
154 /* static int gc_count_total_records_used, gc_count_records_total_size; */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
155 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
156 /* stats on objects in use */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
157 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
158 #ifdef NEW_GC |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
159 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
160 static struct |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
161 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
162 int instances_in_use; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
163 int bytes_in_use; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
164 int bytes_in_use_including_overhead; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
165 } lrecord_stats [countof (lrecord_implementations_table)]; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
166 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
167 #else /* not NEW_GC */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
168 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
169 static struct |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
170 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
171 Elemcount instances_in_use; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
172 Bytecount bytes_in_use; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
173 Bytecount bytes_in_use_overhead; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
174 Elemcount instances_freed; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
175 Bytecount bytes_freed; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
176 Bytecount bytes_freed_overhead; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
177 Elemcount instances_on_free_list; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
178 Bytecount bytes_on_free_list; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
179 Bytecount bytes_on_free_list_overhead; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
180 #ifdef MEMORY_USAGE_STATS |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
181 Bytecount nonlisp_bytes_in_use; |
|
5170
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
182 Bytecount lisp_ancillary_bytes_in_use; |
|
5167
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
183 struct generic_usage_stats stats; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
184 #endif |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
185 } lrecord_stats [countof (lrecord_implementations_table)]; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
186 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
187 #endif /* (not) NEW_GC */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
188 |
|
5146
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
189 /* Very cheesy ways of figuring out how much memory is being used for |
|
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
190 data. #### Need better (system-dependent) ways. */ |
|
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
191 void *minimum_address_seen; |
|
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
192 void *maximum_address_seen; |
|
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
193 |
| 428 | 194 |
|
5167
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
195 /************************************************************************/ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
196 /* Low-level allocation */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
197 /************************************************************************/ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
198 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
199 void |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
200 recompute_funcall_allocation_flag (void) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
201 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
202 funcall_allocation_flag = |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
203 need_to_garbage_collect || |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
204 need_to_check_c_alloca || |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
205 need_to_signal_post_gc; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
206 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
207 |
| 428 | 208 /* Maximum amount of C stack to save when a GC happens. */ |
| 209 | |
| 210 #ifndef MAX_SAVE_STACK | |
| 211 #define MAX_SAVE_STACK 0 /* 16000 */ | |
| 212 #endif | |
| 213 | |
| 214 /* Non-zero means ignore malloc warnings. Set during initialization. */ | |
| 215 int ignore_malloc_warnings; | |
| 216 | |
| 217 | |
| 3263 | 218 #ifndef NEW_GC |
| 3092 | 219 void *breathing_space; |
| 428 | 220 |
| 221 void | |
| 222 release_breathing_space (void) | |
| 223 { | |
| 224 if (breathing_space) | |
| 225 { | |
| 226 void *tmp = breathing_space; | |
| 227 breathing_space = 0; | |
|
4976
16112448d484
Rename xfree(FOO, TYPE) -> xfree(FOO)
Ben Wing <ben@xemacs.org>
parents:
4969
diff
changeset
|
228 xfree (tmp); |
| 428 | 229 } |
| 230 } | |
|
5167
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
231 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
232 #if !defined(HAVE_MMAP) || defined(DOUG_LEA_MALLOC) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
233 /* If we released our reserve (due to running out of memory), |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
234 and we have a fair amount free once again, |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
235 try to set aside another reserve in case we run out once more. |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
236 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
237 This is called when a relocatable block is freed in ralloc.c. */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
238 void refill_memory_reserve (void); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
239 void |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
240 refill_memory_reserve (void) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
241 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
242 if (breathing_space == 0) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
243 breathing_space = (char *) malloc (4096 - MALLOC_OVERHEAD); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
244 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
245 #endif /* !defined(HAVE_MMAP) || defined(DOUG_LEA_MALLOC) */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
246 |
| 3263 | 247 #endif /* not NEW_GC */ |
| 428 | 248 |
| 801 | 249 static void |
| 250 set_alloc_mins_and_maxes (void *val, Bytecount size) | |
| 251 { | |
| 252 if (!val) | |
| 253 return; | |
| 254 if ((char *) val + size > (char *) maximum_address_seen) | |
| 255 maximum_address_seen = (char *) val + size; | |
| 256 if (!minimum_address_seen) | |
| 257 minimum_address_seen = | |
| 258 #if SIZEOF_VOID_P == 8 | |
| 259 (void *) 0xFFFFFFFFFFFFFFFF; | |
| 260 #else | |
| 261 (void *) 0xFFFFFFFF; | |
| 262 #endif | |
| 263 if ((char *) val < (char *) minimum_address_seen) | |
| 264 minimum_address_seen = (char *) val; | |
| 265 } | |
| 266 | |
| 1315 | 267 #ifdef ERROR_CHECK_MALLOC |
| 3176 | 268 static int in_malloc; |
| 1333 | 269 extern int regex_malloc_disallowed; |
| 2367 | 270 |
| 271 #define MALLOC_BEGIN() \ | |
| 272 do \ | |
| 273 { \ | |
| 3176 | 274 assert (!in_malloc); \ |
| 2367 | 275 assert (!regex_malloc_disallowed); \ |
| 276 in_malloc = 1; \ | |
| 277 } \ | |
| 278 while (0) | |
| 279 | |
| 3263 | 280 #ifdef NEW_GC |
| 2720 | 281 #define FREE_OR_REALLOC_BEGIN(block) \ |
| 282 do \ | |
| 283 { \ | |
| 284 /* Unbelievably, calling free() on 0xDEADBEEF doesn't cause an \ | |
| 285 error until much later on for many system mallocs, such as \ | |
| 286 the one that comes with Solaris 2.3. FMH!! */ \ | |
|
4938
299dce99bdad
(for main branch) when freeing check against DEADBEEF_CONSTANT since that's what we use elsewhere
Ben Wing <ben@xemacs.org>
parents:
4934
diff
changeset
|
287 assert (block != (void *) DEADBEEF_CONSTANT); \ |
| 2720 | 288 MALLOC_BEGIN (); \ |
| 289 } \ | |
| 290 while (0) | |
| 3263 | 291 #else /* not NEW_GC */ |
| 2367 | 292 #define FREE_OR_REALLOC_BEGIN(block) \ |
| 293 do \ | |
| 294 { \ | |
| 295 /* Unbelievably, calling free() on 0xDEADBEEF doesn't cause an \ | |
| 296 error until much later on for many system mallocs, such as \ | |
| 297 the one that comes with Solaris 2.3. FMH!! */ \ | |
|
4938
299dce99bdad
(for main branch) when freeing check against DEADBEEF_CONSTANT since that's what we use elsewhere
Ben Wing <ben@xemacs.org>
parents:
4934
diff
changeset
|
298 assert (block != (void *) DEADBEEF_CONSTANT); \ |
| 2367 | 299 /* You cannot free something within dumped space, because there is \ |
| 300 no longer any sort of malloc structure associated with the block. \ | |
| 301 If you are tripping this, you may need to conditionalize on \ | |
| 302 DUMPEDP. */ \ | |
| 303 assert (!DUMPEDP (block)); \ | |
| 304 MALLOC_BEGIN (); \ | |
| 305 } \ | |
| 306 while (0) | |
| 3263 | 307 #endif /* not NEW_GC */ |
| 2367 | 308 |
| 309 #define MALLOC_END() \ | |
| 310 do \ | |
| 311 { \ | |
| 312 in_malloc = 0; \ | |
| 313 } \ | |
| 314 while (0) | |
| 315 | |
| 316 #else /* ERROR_CHECK_MALLOC */ | |
| 317 | |
| 2658 | 318 #define MALLOC_BEGIN() |
| 2367 | 319 #define FREE_OR_REALLOC_BEGIN(block) |
| 320 #define MALLOC_END() | |
| 321 | |
| 322 #endif /* ERROR_CHECK_MALLOC */ | |
| 323 | |
| 324 static void | |
| 325 malloc_after (void *val, Bytecount size) | |
| 326 { | |
| 327 if (!val && size != 0) | |
| 328 memory_full (); | |
| 329 set_alloc_mins_and_maxes (val, size); | |
| 330 } | |
| 331 | |
| 3305 | 332 /* malloc calls this if it finds we are near exhausting storage */ |
| 333 void | |
| 334 malloc_warning (const char *str) | |
| 335 { | |
| 336 if (ignore_malloc_warnings) | |
| 337 return; | |
| 338 | |
| 339 /* Remove the malloc lock here, because warn_when_safe may allocate | |
| 340 again. It is safe to remove the malloc lock here, because malloc | |
| 341 is already finished (malloc_warning is called via | |
| 342 after_morecore_hook -> check_memory_limits -> save_warn_fun -> | |
| 343 malloc_warning). */ | |
| 344 MALLOC_END (); | |
| 345 | |
| 346 warn_when_safe | |
| 347 (Qmemory, Qemergency, | |
| 348 "%s\n" | |
| 349 "Killing some buffers may delay running out of memory.\n" | |
| 350 "However, certainly by the time you receive the 95%% warning,\n" | |
| 351 "you should clean up, kill this Emacs, and start a new one.", | |
| 352 str); | |
| 353 } | |
| 354 | |
| 355 /* Called if malloc returns zero */ | |
| 356 DOESNT_RETURN | |
| 357 memory_full (void) | |
| 358 { | |
| 359 /* Force a GC next time eval is called. | |
| 360 It's better to loop garbage-collecting (we might reclaim enough | |
| 361 to win) than to loop beeping and barfing "Memory exhausted" | |
| 362 */ | |
| 363 consing_since_gc = gc_cons_threshold + 1; | |
| 364 recompute_need_to_garbage_collect (); | |
| 365 #ifdef NEW_GC | |
| 366 /* Put mc-alloc into memory shortage mode. This may keep XEmacs | |
| 367 alive until the garbage collector can free enough memory to get | |
| 368 us out of the memory exhaustion. If already in memory shortage | |
| 369 mode, we are in a loop and hopelessly lost. */ | |
| 370 if (memory_shortage) | |
| 371 { | |
| 372 fprintf (stderr, "Memory full, cannot recover.\n"); | |
| 373 ABORT (); | |
| 374 } | |
| 375 fprintf (stderr, | |
| 376 "Memory full, try to recover.\n" | |
| 377 "You should clean up, kill this Emacs, and start a new one.\n"); | |
| 378 memory_shortage++; | |
| 379 #else /* not NEW_GC */ | |
| 380 release_breathing_space (); | |
| 381 #endif /* not NEW_GC */ | |
| 382 | |
| 383 /* Flush some histories which might conceivably contain garbalogical | |
| 384 inhibitors. */ | |
| 385 if (!NILP (Fboundp (Qvalues))) | |
| 386 Fset (Qvalues, Qnil); | |
| 387 Vcommand_history = Qnil; | |
| 388 | |
| 389 out_of_memory ("Memory exhausted", Qunbound); | |
| 390 } | |
| 391 | |
| 2367 | 392 /* like malloc, calloc, realloc, free but: |
| 393 | |
| 394 -- check for no memory left | |
| 395 -- set internal mins and maxes | |
| 396 -- with error-checking on, check for reentrancy, invalid freeing, etc. | |
| 397 */ | |
| 1292 | 398 |
| 428 | 399 #undef xmalloc |
| 400 void * | |
| 665 | 401 xmalloc (Bytecount size) |
| 428 | 402 { |
| 1292 | 403 void *val; |
| 2367 | 404 MALLOC_BEGIN (); |
| 1292 | 405 val = malloc (size); |
| 2367 | 406 MALLOC_END (); |
| 407 malloc_after (val, size); | |
| 428 | 408 return val; |
| 409 } | |
| 410 | |
| 411 #undef xcalloc | |
| 412 static void * | |
| 665 | 413 xcalloc (Elemcount nelem, Bytecount elsize) |
| 428 | 414 { |
| 1292 | 415 void *val; |
| 2367 | 416 MALLOC_BEGIN (); |
| 1292 | 417 val= calloc (nelem, elsize); |
| 2367 | 418 MALLOC_END (); |
| 419 malloc_after (val, nelem * elsize); | |
| 428 | 420 return val; |
| 421 } | |
| 422 | |
| 423 void * | |
| 665 | 424 xmalloc_and_zero (Bytecount size) |
| 428 | 425 { |
| 426 return xcalloc (size, sizeof (char)); | |
| 427 } | |
| 428 | |
| 429 #undef xrealloc | |
| 430 void * | |
| 665 | 431 xrealloc (void *block, Bytecount size) |
| 428 | 432 { |
| 2367 | 433 FREE_OR_REALLOC_BEGIN (block); |
| 551 | 434 block = realloc (block, size); |
| 2367 | 435 MALLOC_END (); |
| 436 malloc_after (block, size); | |
| 551 | 437 return block; |
| 428 | 438 } |
| 439 | |
| 440 void | |
| 441 xfree_1 (void *block) | |
| 442 { | |
| 443 #ifdef ERROR_CHECK_MALLOC | |
| 444 assert (block); | |
| 445 #endif /* ERROR_CHECK_MALLOC */ | |
| 2367 | 446 FREE_OR_REALLOC_BEGIN (block); |
| 428 | 447 free (block); |
| 2367 | 448 MALLOC_END (); |
| 428 | 449 } |
| 450 | |
|
5146
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
451 void |
| 665 | 452 deadbeef_memory (void *ptr, Bytecount size) |
| 428 | 453 { |
| 826 | 454 UINT_32_BIT *ptr4 = (UINT_32_BIT *) ptr; |
| 665 | 455 Bytecount beefs = size >> 2; |
| 428 | 456 |
| 457 /* In practice, size will always be a multiple of four. */ | |
| 458 while (beefs--) | |
| 1204 | 459 (*ptr4++) = 0xDEADBEEF; /* -559038737 base 10 */ |
| 428 | 460 } |
| 461 | |
| 462 #undef xstrdup | |
| 463 char * | |
| 442 | 464 xstrdup (const char *str) |
| 428 | 465 { |
| 466 int len = strlen (str) + 1; /* for stupid terminating 0 */ | |
| 467 void *val = xmalloc (len); | |
| 771 | 468 |
| 428 | 469 if (val == 0) return 0; |
| 470 return (char *) memcpy (val, str, len); | |
| 471 } | |
| 472 | |
| 473 #ifdef NEED_STRDUP | |
| 474 char * | |
| 442 | 475 strdup (const char *s) |
| 428 | 476 { |
| 477 return xstrdup (s); | |
| 478 } | |
| 479 #endif /* NEED_STRDUP */ | |
| 480 | |
| 481 | |
|
5167
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
482 /************************************************************************/ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
483 /* Lisp object allocation */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
484 /************************************************************************/ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
485 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
486 /* Determine now whether we need to garbage collect or not, to make |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
487 Ffuncall() faster */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
488 #define INCREMENT_CONS_COUNTER_1(size) \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
489 do \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
490 { \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
491 consing_since_gc += (size); \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
492 total_consing += (size); \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
493 if (profiling_active) \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
494 profile_record_consing (size); \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
495 recompute_need_to_garbage_collect (); \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
496 } while (0) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
497 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
498 #define debug_allocation_backtrace() \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
499 do { \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
500 if (debug_allocation_backtrace_length > 0) \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
501 debug_short_backtrace (debug_allocation_backtrace_length); \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
502 } while (0) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
503 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
504 #ifdef DEBUG_XEMACS |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
505 #define INCREMENT_CONS_COUNTER(foosize, type) \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
506 do { \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
507 if (debug_allocation) \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
508 { \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
509 stderr_out ("allocating %s (size %ld)\n", type, \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
510 (long) foosize); \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
511 debug_allocation_backtrace (); \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
512 } \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
513 INCREMENT_CONS_COUNTER_1 (foosize); \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
514 } while (0) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
515 #define NOSEEUM_INCREMENT_CONS_COUNTER(foosize, type) \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
516 do { \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
517 if (debug_allocation > 1) \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
518 { \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
519 stderr_out ("allocating noseeum %s (size %ld)\n", type, \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
520 (long) foosize); \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
521 debug_allocation_backtrace (); \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
522 } \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
523 INCREMENT_CONS_COUNTER_1 (foosize); \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
524 } while (0) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
525 #else |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
526 #define INCREMENT_CONS_COUNTER(size, type) INCREMENT_CONS_COUNTER_1 (size) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
527 #define NOSEEUM_INCREMENT_CONS_COUNTER(size, type) \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
528 INCREMENT_CONS_COUNTER_1 (size) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
529 #endif |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
530 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
531 #ifdef NEW_GC |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
532 /* [[ The call to recompute_need_to_garbage_collect is moved to |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
533 free_normal_lisp_object, since DECREMENT_CONS_COUNTER is extensively called |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
534 during sweep and recomputing need_to_garbage_collect all the time |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
535 is not needed. ]] -- not accurate! */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
536 #define DECREMENT_CONS_COUNTER(size) do { \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
537 consing_since_gc -= (size); \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
538 total_consing -= (size); \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
539 if (profiling_active) \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
540 profile_record_unconsing (size); \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
541 if (consing_since_gc < 0) \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
542 consing_since_gc = 0; \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
543 } while (0) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
544 #else /* not NEW_GC */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
545 #define DECREMENT_CONS_COUNTER(size) do { \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
546 consing_since_gc -= (size); \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
547 total_consing -= (size); \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
548 if (profiling_active) \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
549 profile_record_unconsing (size); \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
550 if (consing_since_gc < 0) \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
551 consing_since_gc = 0; \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
552 recompute_need_to_garbage_collect (); \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
553 } while (0) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
554 #endif /*not NEW_GC */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
555 |
| 3263 | 556 #ifndef NEW_GC |
| 428 | 557 static void * |
| 665 | 558 allocate_lisp_storage (Bytecount size) |
| 428 | 559 { |
| 793 | 560 void *val = xmalloc (size); |
| 561 /* We don't increment the cons counter anymore. Calling functions do | |
| 562 that now because we have two different kinds of cons counters -- one | |
| 563 for normal objects, and one for no-see-um conses (and possibly others | |
| 564 similar) where the conses are used totally internally, never escape, | |
| 565 and are created and then freed and shouldn't logically increment the | |
| 566 cons counting. #### (Or perhaps, we should decrement it when an object | |
| 567 get freed?) */ | |
| 568 | |
| 569 /* But we do now (as of 3-27-02) go and zero out the memory. This is a | |
| 570 good thing, as it will guarantee we won't get any intermittent bugs | |
| 1204 | 571 coming from an uninitiated field. The speed loss is unnoticeable, |
| 572 esp. as the objects are not large -- large stuff like buffer text and | |
| 573 redisplay structures are allocated separately. */ | |
| 793 | 574 memset (val, 0, size); |
| 851 | 575 |
| 576 if (need_to_check_c_alloca) | |
| 577 xemacs_c_alloca (0); | |
| 578 | |
| 793 | 579 return val; |
| 428 | 580 } |
| 3263 | 581 #endif /* not NEW_GC */ |
| 582 | |
|
5117
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
583 #define assert_proper_sizing(size) \ |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
584 type_checking_assert \ |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
585 (implementation->static_size == 0 ? \ |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
586 implementation->size_in_bytes_method != NULL : \ |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
587 implementation->size_in_bytes_method == NULL && \ |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
588 implementation->static_size == size) |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
589 |
| 3263 | 590 #ifndef NEW_GC |
| 442 | 591 /* lcrecords are chained together through their "next" field. |
| 592 After doing the mark phase, GC will walk this linked list | |
| 593 and free any lcrecord which hasn't been marked. */ | |
| 3024 | 594 static struct old_lcrecord_header *all_lcrecords; |
| 3263 | 595 #endif /* not NEW_GC */ |
| 596 | |
| 597 #ifdef NEW_GC | |
| 2720 | 598 /* The basic lrecord allocation functions. See lrecord.h for details. */ |
|
5117
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
599 static Lisp_Object |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
600 alloc_sized_lrecord_1 (Bytecount size, |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
601 const struct lrecord_implementation *implementation, |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
602 int noseeum) |
| 2720 | 603 { |
| 604 struct lrecord_header *lheader; | |
| 605 | |
|
5117
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
606 assert_proper_sizing (size); |
| 2720 | 607 |
| 608 lheader = (struct lrecord_header *) mc_alloc (size); | |
| 609 gc_checking_assert (LRECORD_FREE_P (lheader)); | |
| 610 set_lheader_implementation (lheader, implementation); | |
| 2994 | 611 #ifdef ALLOC_TYPE_STATS |
| 2720 | 612 inc_lrecord_stats (size, lheader); |
| 2994 | 613 #endif /* ALLOC_TYPE_STATS */ |
| 3263 | 614 if (implementation->finalizer) |
| 615 add_finalizable_obj (wrap_pointer_1 (lheader)); | |
|
5117
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
616 if (noseeum) |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
617 NOSEEUM_INCREMENT_CONS_COUNTER (size, implementation->name); |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
618 else |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
619 INCREMENT_CONS_COUNTER (size, implementation->name); |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
620 return wrap_pointer_1 (lheader); |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
621 } |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
622 |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
623 Lisp_Object |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
624 alloc_sized_lrecord (Bytecount size, |
| 3092 | 625 const struct lrecord_implementation *implementation) |
| 626 { | |
|
5117
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
627 return alloc_sized_lrecord_1 (size, implementation, 0); |
| 2720 | 628 } |
| 629 | |
|
5117
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
630 Lisp_Object |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
631 noseeum_alloc_sized_lrecord (Bytecount size, |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
632 const struct lrecord_implementation * |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
633 implementation) |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
634 { |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
635 return alloc_sized_lrecord_1 (size, implementation, 1); |
| 2720 | 636 } |
| 637 | |
|
5117
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
638 Lisp_Object |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
639 alloc_lrecord (const struct lrecord_implementation *implementation) |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
640 { |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
641 type_checking_assert (implementation->static_size > 0); |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
642 return alloc_sized_lrecord (implementation->static_size, implementation); |
| 2720 | 643 } |
| 644 | |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
645 Lisp_Object |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
646 noseeum_alloc_lrecord (const struct lrecord_implementation *implementation) |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
647 { |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
648 type_checking_assert (implementation->static_size > 0); |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
649 return noseeum_alloc_sized_lrecord (implementation->static_size, implementation); |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
650 } |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
651 |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
652 Lisp_Object |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
653 alloc_sized_lrecord_array (Bytecount size, int elemcount, |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
654 const struct lrecord_implementation *implementation) |
| 3092 | 655 { |
| 656 struct lrecord_header *lheader; | |
| 657 Rawbyte *start, *stop; | |
| 658 | |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
659 assert_proper_sizing (size); |
| 3092 | 660 |
| 661 lheader = (struct lrecord_header *) mc_alloc_array (size, elemcount); | |
| 662 gc_checking_assert (LRECORD_FREE_P (lheader)); | |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
663 |
| 3092 | 664 for (start = (Rawbyte *) lheader, |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
665 /* #### FIXME: why is this -1 present? */ |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
666 stop = ((Rawbyte *) lheader) + (size * elemcount -1); |
| 3092 | 667 start < stop; start += size) |
| 668 { | |
| 669 struct lrecord_header *lh = (struct lrecord_header *) start; | |
| 670 set_lheader_implementation (lh, implementation); | |
| 671 #ifdef ALLOC_TYPE_STATS | |
| 672 inc_lrecord_stats (size, lh); | |
| 673 #endif /* not ALLOC_TYPE_STATS */ | |
| 3263 | 674 if (implementation->finalizer) |
| 675 add_finalizable_obj (wrap_pointer_1 (lh)); | |
| 3092 | 676 } |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
677 |
| 3092 | 678 INCREMENT_CONS_COUNTER (size * elemcount, implementation->name); |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
679 return wrap_pointer_1 (lheader); |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
680 } |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
681 |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
682 Lisp_Object |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
683 alloc_lrecord_array (int elemcount, |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
684 const struct lrecord_implementation *implementation) |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
685 { |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
686 type_checking_assert (implementation->static_size > 0); |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
687 return alloc_sized_lrecord_array (implementation->static_size, elemcount, |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
688 implementation); |
| 3092 | 689 } |
| 690 | |
| 3263 | 691 #else /* not NEW_GC */ |
| 428 | 692 |
| 1204 | 693 /* The most basic of the lcrecord allocation functions. Not usually called |
| 694 directly. Allocates an lrecord not managed by any lcrecord-list, of a | |
| 695 specified size. See lrecord.h. */ | |
| 696 | |
|
5117
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
697 Lisp_Object |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
698 old_alloc_sized_lcrecord (Bytecount size, |
| 3024 | 699 const struct lrecord_implementation *implementation) |
| 700 { | |
| 701 struct old_lcrecord_header *lcheader; | |
| 428 | 702 |
|
5117
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
703 assert_proper_sizing (size); |
| 442 | 704 type_checking_assert |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
705 (!implementation->frob_block_p |
| 442 | 706 && |
|
5117
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
707 !(implementation->hash == NULL && implementation->equal != NULL)); |
| 428 | 708 |
| 3024 | 709 lcheader = (struct old_lcrecord_header *) allocate_lisp_storage (size); |
| 442 | 710 set_lheader_implementation (&lcheader->lheader, implementation); |
| 428 | 711 lcheader->next = all_lcrecords; |
| 712 all_lcrecords = lcheader; | |
| 713 INCREMENT_CONS_COUNTER (size, implementation->name); | |
|
5117
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
714 return wrap_pointer_1 (lcheader); |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
715 } |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
716 |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
717 Lisp_Object |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
718 old_alloc_lcrecord (const struct lrecord_implementation *implementation) |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
719 { |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
720 type_checking_assert (implementation->static_size > 0); |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
721 return old_alloc_sized_lcrecord (implementation->static_size, |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
722 implementation); |
| 428 | 723 } |
| 724 | |
| 725 #if 0 /* Presently unused */ | |
| 726 /* Very, very poor man's EGC? | |
| 727 * This may be slow and thrash pages all over the place. | |
| 728 * Only call it if you really feel you must (and if the | |
| 729 * lrecord was fairly recently allocated). | |
| 730 * Otherwise, just let the GC do its job -- that's what it's there for | |
| 731 */ | |
| 732 void | |
| 3024 | 733 very_old_free_lcrecord (struct old_lcrecord_header *lcrecord) |
| 428 | 734 { |
| 735 if (all_lcrecords == lcrecord) | |
| 736 { | |
| 737 all_lcrecords = lcrecord->next; | |
| 738 } | |
| 739 else | |
| 740 { | |
| 3024 | 741 struct old_lcrecord_header *header = all_lcrecords; |
| 428 | 742 for (;;) |
| 743 { | |
| 3024 | 744 struct old_lcrecord_header *next = header->next; |
| 428 | 745 if (next == lcrecord) |
| 746 { | |
| 747 header->next = lrecord->next; | |
| 748 break; | |
| 749 } | |
| 750 else if (next == 0) | |
| 2500 | 751 ABORT (); |
| 428 | 752 else |
| 753 header = next; | |
| 754 } | |
| 755 } | |
| 756 if (lrecord->implementation->finalizer) | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
757 lrecord->implementation->finalizer (wrap_pointer_1 (lrecord)); |
| 428 | 758 xfree (lrecord); |
| 759 return; | |
| 760 } | |
| 761 #endif /* Unused */ | |
| 3263 | 762 #endif /* not NEW_GC */ |
| 428 | 763 |
| 1204 | 764 /* Bitwise copy all parts of a Lisp object other than the header */ |
| 765 | |
| 766 void | |
| 767 copy_lisp_object (Lisp_Object dst, Lisp_Object src) | |
| 768 { | |
| 769 const struct lrecord_implementation *imp = | |
| 770 XRECORD_LHEADER_IMPLEMENTATION (src); | |
| 771 Bytecount size = lisp_object_size (src); | |
| 772 | |
| 773 assert (imp == XRECORD_LHEADER_IMPLEMENTATION (dst)); | |
| 774 assert (size == lisp_object_size (dst)); | |
| 775 | |
| 3263 | 776 #ifdef NEW_GC |
| 2720 | 777 memcpy ((char *) XRECORD_LHEADER (dst) + sizeof (struct lrecord_header), |
| 778 (char *) XRECORD_LHEADER (src) + sizeof (struct lrecord_header), | |
| 779 size - sizeof (struct lrecord_header)); | |
| 3263 | 780 #else /* not NEW_GC */ |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
781 if (imp->frob_block_p) |
| 1204 | 782 memcpy ((char *) XRECORD_LHEADER (dst) + sizeof (struct lrecord_header), |
| 783 (char *) XRECORD_LHEADER (src) + sizeof (struct lrecord_header), | |
| 784 size - sizeof (struct lrecord_header)); | |
| 785 else | |
| 3024 | 786 memcpy ((char *) XRECORD_LHEADER (dst) + |
| 787 sizeof (struct old_lcrecord_header), | |
| 788 (char *) XRECORD_LHEADER (src) + | |
| 789 sizeof (struct old_lcrecord_header), | |
| 790 size - sizeof (struct old_lcrecord_header)); | |
| 3263 | 791 #endif /* not NEW_GC */ |
| 1204 | 792 } |
| 793 | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
794 /* Zero out all parts of a Lisp object other than the header, for a |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
795 variable-sized object. The size needs to be given explicitly because |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
796 at the time this is called, the contents of the object may not be |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
797 defined, or may not be set up in such a way that we can reliably |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
798 retrieve the size, since it may depend on settings inside of the object. */ |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
799 |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
800 void |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
801 zero_sized_lisp_object (Lisp_Object obj, Bytecount size) |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
802 { |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
803 #ifndef NEW_GC |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
804 const struct lrecord_implementation *imp = |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
805 XRECORD_LHEADER_IMPLEMENTATION (obj); |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
806 #endif /* not NEW_GC */ |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
807 |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
808 #ifdef NEW_GC |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
809 memset ((char *) XRECORD_LHEADER (obj) + sizeof (struct lrecord_header), 0, |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
810 size - sizeof (struct lrecord_header)); |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
811 #else /* not NEW_GC */ |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
812 if (imp->frob_block_p) |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
813 memset ((char *) XRECORD_LHEADER (obj) + sizeof (struct lrecord_header), 0, |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
814 size - sizeof (struct lrecord_header)); |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
815 else |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
816 memset ((char *) XRECORD_LHEADER (obj) + |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
817 sizeof (struct old_lcrecord_header), 0, |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
818 size - sizeof (struct old_lcrecord_header)); |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
819 #endif /* not NEW_GC */ |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
820 } |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
821 |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
822 /* Zero out all parts of a Lisp object other than the header, for an object |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
823 that isn't variable-size. Objects that are variable-size need to use |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
824 zero_sized_lisp_object(). |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
825 */ |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
826 |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
827 void |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
828 zero_nonsized_lisp_object (Lisp_Object obj) |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
829 { |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
830 const struct lrecord_implementation *imp = |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
831 XRECORD_LHEADER_IMPLEMENTATION (obj); |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
832 assert (!imp->size_in_bytes_method); |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
833 |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
834 zero_sized_lisp_object (obj, lisp_object_size (obj)); |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
835 } |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
836 |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
837 void |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
838 free_normal_lisp_object (Lisp_Object obj) |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
839 { |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
840 #ifndef NEW_GC |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
841 const struct lrecord_implementation *imp = |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
842 XRECORD_LHEADER_IMPLEMENTATION (obj); |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
843 #endif /* not NEW_GC */ |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
844 |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
845 #ifdef NEW_GC |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
846 /* Manual frees are not allowed with asynchronous finalization */ |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
847 return; |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
848 #else |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
849 assert (!imp->frob_block_p); |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
850 assert (!imp->size_in_bytes_method); |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
851 old_free_lcrecord (obj); |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
852 #endif |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
853 } |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
854 |
|
5167
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
855 #ifndef NEW_GC |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
856 int |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
857 c_readonly (Lisp_Object obj) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
858 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
859 return POINTER_TYPE_P (XTYPE (obj)) && C_READONLY (obj); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
860 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
861 #endif /* not NEW_GC */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
862 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
863 int |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
864 lisp_readonly (Lisp_Object obj) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
865 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
866 return POINTER_TYPE_P (XTYPE (obj)) && LISP_READONLY (obj); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
867 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
868 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
869 /* #### Should be made into an object method */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
870 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
871 int |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
872 object_dead_p (Lisp_Object obj) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
873 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
874 return ((BUFFERP (obj) && !BUFFER_LIVE_P (XBUFFER (obj))) || |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
875 (FRAMEP (obj) && !FRAME_LIVE_P (XFRAME (obj))) || |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
876 (WINDOWP (obj) && !WINDOW_LIVE_P (XWINDOW (obj))) || |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
877 (DEVICEP (obj) && !DEVICE_LIVE_P (XDEVICE (obj))) || |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
878 (CONSOLEP (obj) && !CONSOLE_LIVE_P (XCONSOLE (obj))) || |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
879 (EVENTP (obj) && !EVENT_LIVE_P (XEVENT (obj))) || |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
880 (EXTENTP (obj) && !EXTENT_LIVE_P (XEXTENT (obj)))); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
881 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
882 |
| 428 | 883 |
| 884 /************************************************************************/ | |
|
5167
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
885 /* Debugger support */ |
| 428 | 886 /************************************************************************/ |
| 887 /* Give gdb/dbx enough information to decode Lisp Objects. We make | |
| 888 sure certain symbols are always defined, so gdb doesn't complain | |
| 438 | 889 about expressions in src/.gdbinit. See src/.gdbinit or src/.dbxrc |
| 890 to see how this is used. */ | |
| 428 | 891 |
| 458 | 892 EMACS_UINT dbg_valmask = ((1UL << VALBITS) - 1) << GCBITS; |
| 893 EMACS_UINT dbg_typemask = (1UL << GCTYPEBITS) - 1; | |
| 428 | 894 |
| 895 #ifdef USE_UNION_TYPE | |
| 458 | 896 unsigned char dbg_USE_UNION_TYPE = 1; |
| 428 | 897 #else |
| 458 | 898 unsigned char dbg_USE_UNION_TYPE = 0; |
| 428 | 899 #endif |
| 900 | |
| 458 | 901 unsigned char dbg_valbits = VALBITS; |
| 902 unsigned char dbg_gctypebits = GCTYPEBITS; | |
| 903 | |
| 904 /* On some systems, the above definitions will be optimized away by | |
| 905 the compiler or linker unless they are referenced in some function. */ | |
| 906 long dbg_inhibit_dbg_symbol_deletion (void); | |
| 907 long | |
| 908 dbg_inhibit_dbg_symbol_deletion (void) | |
| 909 { | |
| 910 return | |
| 911 (dbg_valmask + | |
| 912 dbg_typemask + | |
| 913 dbg_USE_UNION_TYPE + | |
| 914 dbg_valbits + | |
| 915 dbg_gctypebits); | |
| 916 } | |
| 428 | 917 |
| 918 /* Macros turned into functions for ease of debugging. | |
| 919 Debuggers don't know about macros! */ | |
| 920 int dbg_eq (Lisp_Object obj1, Lisp_Object obj2); | |
| 921 int | |
| 922 dbg_eq (Lisp_Object obj1, Lisp_Object obj2) | |
| 923 { | |
| 924 return EQ (obj1, obj2); | |
| 925 } | |
| 926 | |
| 927 | |
| 3263 | 928 #ifdef NEW_GC |
| 3017 | 929 #define DECLARE_FIXED_TYPE_ALLOC(type, structture) struct __foo__ |
| 930 #else | |
| 428 | 931 /************************************************************************/ |
|
5167
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
932 /* Fixed-size type macros */ |
| 428 | 933 /************************************************************************/ |
| 934 | |
| 935 /* For fixed-size types that are commonly used, we malloc() large blocks | |
| 936 of memory at a time and subdivide them into chunks of the correct | |
| 937 size for an object of that type. This is more efficient than | |
| 938 malloc()ing each object separately because we save on malloc() time | |
| 939 and overhead due to the fewer number of malloc()ed blocks, and | |
| 940 also because we don't need any extra pointers within each object | |
| 941 to keep them threaded together for GC purposes. For less common | |
| 942 (and frequently large-size) types, we use lcrecords, which are | |
| 943 malloc()ed individually and chained together through a pointer | |
| 944 in the lcrecord header. lcrecords do not need to be fixed-size | |
| 945 (i.e. two objects of the same type need not have the same size; | |
| 946 however, the size of a particular object cannot vary dynamically). | |
| 947 It is also much easier to create a new lcrecord type because no | |
| 948 additional code needs to be added to alloc.c. Finally, lcrecords | |
| 949 may be more efficient when there are only a small number of them. | |
| 950 | |
| 951 The types that are stored in these large blocks (or "frob blocks") | |
| 1983 | 952 are cons, all number types except fixnum, compiled-function, symbol, |
| 953 marker, extent, event, and string. | |
| 428 | 954 |
| 955 Note that strings are special in that they are actually stored in | |
| 956 two parts: a structure containing information about the string, and | |
| 957 the actual data associated with the string. The former structure | |
| 958 (a struct Lisp_String) is a fixed-size structure and is managed the | |
| 959 same way as all the other such types. This structure contains a | |
| 960 pointer to the actual string data, which is stored in structures of | |
| 961 type struct string_chars_block. Each string_chars_block consists | |
| 962 of a pointer to a struct Lisp_String, followed by the data for that | |
| 440 | 963 string, followed by another pointer to a Lisp_String, followed by |
| 964 the data for that string, etc. At GC time, the data in these | |
| 965 blocks is compacted by searching sequentially through all the | |
| 428 | 966 blocks and compressing out any holes created by unmarked strings. |
| 967 Strings that are more than a certain size (bigger than the size of | |
| 968 a string_chars_block, although something like half as big might | |
| 969 make more sense) are malloc()ed separately and not stored in | |
| 970 string_chars_blocks. Furthermore, no one string stretches across | |
| 971 two string_chars_blocks. | |
| 972 | |
| 1204 | 973 Vectors are each malloc()ed separately as lcrecords. |
| 428 | 974 |
| 975 In the following discussion, we use conses, but it applies equally | |
| 976 well to the other fixed-size types. | |
| 977 | |
| 978 We store cons cells inside of cons_blocks, allocating a new | |
| 979 cons_block with malloc() whenever necessary. Cons cells reclaimed | |
| 980 by GC are put on a free list to be reallocated before allocating | |
| 981 any new cons cells from the latest cons_block. Each cons_block is | |
| 982 just under 2^n - MALLOC_OVERHEAD bytes long, since malloc (at least | |
| 983 the versions in malloc.c and gmalloc.c) really allocates in units | |
| 984 of powers of two and uses 4 bytes for its own overhead. | |
| 985 | |
| 986 What GC actually does is to search through all the cons_blocks, | |
| 987 from the most recently allocated to the oldest, and put all | |
| 988 cons cells that are not marked (whether or not they're already | |
| 989 free) on a cons_free_list. The cons_free_list is a stack, and | |
| 990 so the cons cells in the oldest-allocated cons_block end up | |
| 991 at the head of the stack and are the first to be reallocated. | |
| 992 If any cons_block is entirely free, it is freed with free() | |
| 993 and its cons cells removed from the cons_free_list. Because | |
| 994 the cons_free_list ends up basically in memory order, we have | |
| 995 a high locality of reference (assuming a reasonable turnover | |
| 996 of allocating and freeing) and have a reasonable probability | |
| 997 of entirely freeing up cons_blocks that have been more recently | |
| 998 allocated. This stage is called the "sweep stage" of GC, and | |
| 999 is executed after the "mark stage", which involves starting | |
| 1000 from all places that are known to point to in-use Lisp objects | |
| 1001 (e.g. the obarray, where are all symbols are stored; the | |
| 1002 current catches and condition-cases; the backtrace list of | |
| 1003 currently executing functions; the gcpro list; etc.) and | |
| 1004 recursively marking all objects that are accessible. | |
| 1005 | |
| 454 | 1006 At the beginning of the sweep stage, the conses in the cons blocks |
| 1007 are in one of three states: in use and marked, in use but not | |
| 1008 marked, and not in use (already freed). Any conses that are marked | |
| 1009 have been marked in the mark stage just executed, because as part | |
| 1010 of the sweep stage we unmark any marked objects. The way we tell | |
| 1011 whether or not a cons cell is in use is through the LRECORD_FREE_P | |
| 1012 macro. This uses a special lrecord type `lrecord_type_free', | |
| 1013 which is never associated with any valid object. | |
| 1014 | |
| 1015 Conses on the free_cons_list are threaded through a pointer stored | |
| 1016 in the conses themselves. Because the cons is still in a | |
| 1017 cons_block and needs to remain marked as not in use for the next | |
| 1018 time that GC happens, we need room to store both the "free" | |
| 1019 indicator and the chaining pointer. So this pointer is stored | |
| 1020 after the lrecord header (actually where C places a pointer after | |
| 1021 the lrecord header; they are not necessarily contiguous). This | |
| 1022 implies that all fixed-size types must be big enough to contain at | |
| 1023 least one pointer. This is true for all current fixed-size types, | |
| 1024 with the possible exception of Lisp_Floats, for which we define the | |
| 1025 meat of the struct using a union of a pointer and a double to | |
| 1026 ensure adequate space for the free list chain pointer. | |
| 428 | 1027 |
| 1028 Some types of objects need additional "finalization" done | |
| 1029 when an object is converted from in use to not in use; | |
| 1030 this is the purpose of the ADDITIONAL_FREE_type macro. | |
| 1031 For example, markers need to be removed from the chain | |
| 1032 of markers that is kept in each buffer. This is because | |
| 1033 markers in a buffer automatically disappear if the marker | |
| 1034 is no longer referenced anywhere (the same does not | |
| 1035 apply to extents, however). | |
| 1036 | |
| 1037 WARNING: Things are in an extremely bizarre state when | |
| 1038 the ADDITIONAL_FREE_type macros are called, so beware! | |
| 1039 | |
| 454 | 1040 When ERROR_CHECK_GC is defined, we do things differently so as to |
| 1041 maximize our chances of catching places where there is insufficient | |
| 1042 GCPROing. The thing we want to avoid is having an object that | |
| 1043 we're using but didn't GCPRO get freed by GC and then reallocated | |
| 1044 while we're in the process of using it -- this will result in | |
| 1045 something seemingly unrelated getting trashed, and is extremely | |
| 1046 difficult to track down. If the object gets freed but not | |
| 1047 reallocated, we can usually catch this because we set most of the | |
| 1048 bytes of a freed object to 0xDEADBEEF. (The lisp object type is set | |
| 1049 to the invalid type `lrecord_type_free', however, and a pointer | |
| 1050 used to chain freed objects together is stored after the lrecord | |
| 1051 header; we play some tricks with this pointer to make it more | |
| 428 | 1052 bogus, so crashes are more likely to occur right away.) |
| 1053 | |
| 1054 We want freed objects to stay free as long as possible, | |
| 1055 so instead of doing what we do above, we maintain the | |
| 1056 free objects in a first-in first-out queue. We also | |
| 1057 don't recompute the free list each GC, unlike above; | |
| 1058 this ensures that the queue ordering is preserved. | |
| 1059 [This means that we are likely to have worse locality | |
| 1060 of reference, and that we can never free a frob block | |
| 1061 once it's allocated. (Even if we know that all cells | |
| 1062 in it are free, there's no easy way to remove all those | |
| 1063 cells from the free list because the objects on the | |
| 1064 free list are unlikely to be in memory order.)] | |
| 1065 Furthermore, we never take objects off the free list | |
| 1066 unless there's a large number (usually 1000, but | |
| 1067 varies depending on type) of them already on the list. | |
| 1068 This way, we ensure that an object that gets freed will | |
| 1069 remain free for the next 1000 (or whatever) times that | |
| 440 | 1070 an object of that type is allocated. */ |
| 428 | 1071 |
| 1072 #ifdef ALLOC_NO_POOLS | |
| 1073 # define TYPE_ALLOC_SIZE(type, structtype) 1 | |
| 1074 #else | |
| 1075 # define TYPE_ALLOC_SIZE(type, structtype) \ | |
| 1076 ((2048 - MALLOC_OVERHEAD - sizeof (struct type##_block *)) \ | |
| 1077 / sizeof (structtype)) | |
| 1078 #endif /* ALLOC_NO_POOLS */ | |
| 1079 | |
| 1080 #define DECLARE_FIXED_TYPE_ALLOC(type, structtype) \ | |
| 1081 \ | |
| 1082 struct type##_block \ | |
| 1083 { \ | |
| 1084 struct type##_block *prev; \ | |
| 1085 structtype block[TYPE_ALLOC_SIZE (type, structtype)]; \ | |
| 1086 }; \ | |
| 1087 \ | |
| 1088 static struct type##_block *current_##type##_block; \ | |
| 1089 static int current_##type##_block_index; \ | |
| 1090 \ | |
| 454 | 1091 static Lisp_Free *type##_free_list; \ |
| 1092 static Lisp_Free *type##_free_list_tail; \ | |
| 428 | 1093 \ |
| 1094 static void \ | |
| 1095 init_##type##_alloc (void) \ | |
| 1096 { \ | |
| 1097 current_##type##_block = 0; \ | |
| 1098 current_##type##_block_index = \ | |
| 1099 countof (current_##type##_block->block); \ | |
| 1100 type##_free_list = 0; \ | |
| 1101 type##_free_list_tail = 0; \ | |
| 1102 } \ | |
| 1103 \ | |
| 1104 static int gc_count_num_##type##_in_use; \ | |
| 1105 static int gc_count_num_##type##_freelist | |
| 1106 | |
| 1107 #define ALLOCATE_FIXED_TYPE_FROM_BLOCK(type, result) do { \ | |
| 1108 if (current_##type##_block_index \ | |
| 1109 == countof (current_##type##_block->block)) \ | |
| 1110 { \ | |
| 1111 struct type##_block *AFTFB_new = (struct type##_block *) \ | |
| 1112 allocate_lisp_storage (sizeof (struct type##_block)); \ | |
| 1113 AFTFB_new->prev = current_##type##_block; \ | |
| 1114 current_##type##_block = AFTFB_new; \ | |
| 1115 current_##type##_block_index = 0; \ | |
| 1116 } \ | |
| 1117 (result) = \ | |
| 1118 &(current_##type##_block->block[current_##type##_block_index++]); \ | |
| 1119 } while (0) | |
| 1120 | |
| 1121 /* Allocate an instance of a type that is stored in blocks. | |
| 1122 TYPE is the "name" of the type, STRUCTTYPE is the corresponding | |
| 1123 structure type. */ | |
| 1124 | |
| 1125 #ifdef ERROR_CHECK_GC | |
| 1126 | |
| 1127 /* Note: if you get crashes in this function, suspect incorrect calls | |
| 1128 to free_cons() and friends. This happened once because the cons | |
| 1129 cell was not GC-protected and was getting collected before | |
| 1130 free_cons() was called. */ | |
| 1131 | |
| 454 | 1132 #define ALLOCATE_FIXED_TYPE_1(type, structtype, result) do { \ |
| 1133 if (gc_count_num_##type##_freelist > \ | |
| 1134 MINIMUM_ALLOWED_FIXED_TYPE_CELLS_##type) \ | |
| 1135 { \ | |
| 1136 result = (structtype *) type##_free_list; \ | |
| 1204 | 1137 assert (LRECORD_FREE_P (result)); \ |
| 1138 /* Before actually using the chain pointer, we complement \ | |
| 1139 all its bits; see PUT_FIXED_TYPE_ON_FREE_LIST(). */ \ | |
| 454 | 1140 type##_free_list = (Lisp_Free *) \ |
| 1141 (~ (EMACS_UINT) (type##_free_list->chain)); \ | |
| 1142 gc_count_num_##type##_freelist--; \ | |
| 1143 } \ | |
| 1144 else \ | |
| 1145 ALLOCATE_FIXED_TYPE_FROM_BLOCK (type, result); \ | |
| 1146 MARK_LRECORD_AS_NOT_FREE (result); \ | |
| 428 | 1147 } while (0) |
| 1148 | |
| 1149 #else /* !ERROR_CHECK_GC */ | |
| 1150 | |
| 454 | 1151 #define ALLOCATE_FIXED_TYPE_1(type, structtype, result) do { \ |
| 428 | 1152 if (type##_free_list) \ |
| 1153 { \ | |
| 454 | 1154 result = (structtype *) type##_free_list; \ |
| 1155 type##_free_list = type##_free_list->chain; \ | |
| 428 | 1156 } \ |
| 1157 else \ | |
| 1158 ALLOCATE_FIXED_TYPE_FROM_BLOCK (type, result); \ | |
| 454 | 1159 MARK_LRECORD_AS_NOT_FREE (result); \ |
| 428 | 1160 } while (0) |
| 1161 | |
| 1162 #endif /* !ERROR_CHECK_GC */ | |
| 1163 | |
| 454 | 1164 |
| 428 | 1165 #define ALLOCATE_FIXED_TYPE(type, structtype, result) \ |
| 1166 do \ | |
| 1167 { \ | |
| 1168 ALLOCATE_FIXED_TYPE_1 (type, structtype, result); \ | |
| 1169 INCREMENT_CONS_COUNTER (sizeof (structtype), #type); \ | |
| 1170 } while (0) | |
| 1171 | |
| 1172 #define NOSEEUM_ALLOCATE_FIXED_TYPE(type, structtype, result) \ | |
| 1173 do \ | |
| 1174 { \ | |
| 1175 ALLOCATE_FIXED_TYPE_1 (type, structtype, result); \ | |
| 1176 NOSEEUM_INCREMENT_CONS_COUNTER (sizeof (structtype), #type); \ | |
| 1177 } while (0) | |
| 1178 | |
| 454 | 1179 /* Lisp_Free is the type to represent a free list member inside a frob |
| 1180 block of any lisp object type. */ | |
| 1181 typedef struct Lisp_Free | |
| 1182 { | |
| 1183 struct lrecord_header lheader; | |
| 1184 struct Lisp_Free *chain; | |
| 1185 } Lisp_Free; | |
| 1186 | |
| 1187 #define LRECORD_FREE_P(ptr) \ | |
| 771 | 1188 (((struct lrecord_header *) ptr)->type == lrecord_type_free) |
| 454 | 1189 |
| 1190 #define MARK_LRECORD_AS_FREE(ptr) \ | |
| 771 | 1191 ((void) (((struct lrecord_header *) ptr)->type = lrecord_type_free)) |
| 454 | 1192 |
| 1193 #ifdef ERROR_CHECK_GC | |
| 1194 #define MARK_LRECORD_AS_NOT_FREE(ptr) \ | |
| 771 | 1195 ((void) (((struct lrecord_header *) ptr)->type = lrecord_type_undefined)) |
| 428 | 1196 #else |
| 454 | 1197 #define MARK_LRECORD_AS_NOT_FREE(ptr) DO_NOTHING |
| 428 | 1198 #endif |
| 1199 | |
| 1200 #ifdef ERROR_CHECK_GC | |
| 1201 | |
| 454 | 1202 #define PUT_FIXED_TYPE_ON_FREE_LIST(type, structtype, ptr) do { \ |
| 1203 if (type##_free_list_tail) \ | |
| 1204 { \ | |
| 1205 /* When we store the chain pointer, we complement all \ | |
| 1206 its bits; this should significantly increase its \ | |
| 1207 bogosity in case someone tries to use the value, and \ | |
| 1208 should make us crash faster if someone overwrites the \ | |
| 1209 pointer because when it gets un-complemented in \ | |
| 1210 ALLOCATED_FIXED_TYPE(), the resulting pointer will be \ | |
| 1211 extremely bogus. */ \ | |
| 1212 type##_free_list_tail->chain = \ | |
| 1213 (Lisp_Free *) ~ (EMACS_UINT) (ptr); \ | |
| 1214 } \ | |
| 1215 else \ | |
| 1216 type##_free_list = (Lisp_Free *) (ptr); \ | |
| 1217 type##_free_list_tail = (Lisp_Free *) (ptr); \ | |
| 1218 } while (0) | |
| 428 | 1219 |
| 1220 #else /* !ERROR_CHECK_GC */ | |
| 1221 | |
| 454 | 1222 #define PUT_FIXED_TYPE_ON_FREE_LIST(type, structtype, ptr) do { \ |
| 1223 ((Lisp_Free *) (ptr))->chain = type##_free_list; \ | |
| 1224 type##_free_list = (Lisp_Free *) (ptr); \ | |
| 1225 } while (0) \ | |
| 428 | 1226 |
| 1227 #endif /* !ERROR_CHECK_GC */ | |
| 1228 | |
| 1229 /* TYPE and STRUCTTYPE are the same as in ALLOCATE_FIXED_TYPE(). */ | |
| 1230 | |
| 1231 #define FREE_FIXED_TYPE(type, structtype, ptr) do { \ | |
| 1232 structtype *FFT_ptr = (ptr); \ | |
| 1204 | 1233 gc_checking_assert (!LRECORD_FREE_P (FFT_ptr)); \ |
| 2367 | 1234 gc_checking_assert (!DUMPEDP (FFT_ptr)); \ |
| 428 | 1235 ADDITIONAL_FREE_##type (FFT_ptr); \ |
| 1236 deadbeef_memory (FFT_ptr, sizeof (structtype)); \ | |
| 1237 PUT_FIXED_TYPE_ON_FREE_LIST (type, structtype, FFT_ptr); \ | |
| 454 | 1238 MARK_LRECORD_AS_FREE (FFT_ptr); \ |
| 428 | 1239 } while (0) |
|
5059
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
1240 #endif /* NEW_GC */ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
1241 |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
1242 #ifdef NEW_GC |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
1243 #define FREE_FIXED_TYPE_WHEN_NOT_IN_GC(lo, type, structtype, ptr) \ |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
1244 free_normal_lisp_object (lo) |
|
5059
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
1245 #else /* not NEW_GC */ |
| 428 | 1246 /* Like FREE_FIXED_TYPE() but used when we are explicitly |
| 1247 freeing a structure through free_cons(), free_marker(), etc. | |
| 1248 rather than through the normal process of sweeping. | |
| 1249 We attempt to undo the changes made to the allocation counters | |
| 1250 as a result of this structure being allocated. This is not | |
| 1251 completely necessary but helps keep things saner: e.g. this way, | |
| 1252 repeatedly allocating and freeing a cons will not result in | |
| 1253 the consing-since-gc counter advancing, which would cause a GC | |
| 1204 | 1254 and somewhat defeat the purpose of explicitly freeing. |
| 1255 | |
| 1256 We also disable this mechanism entirely when ALLOC_NO_POOLS is | |
| 1257 set, which is used for Purify and the like. */ | |
| 1258 | |
| 1259 #ifndef ALLOC_NO_POOLS | |
|
5059
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
1260 #define FREE_FIXED_TYPE_WHEN_NOT_IN_GC(lo, type, structtype, ptr) \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
1261 do { FREE_FIXED_TYPE (type, structtype, ptr); \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
1262 DECREMENT_CONS_COUNTER (sizeof (structtype)); \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
1263 gc_count_num_##type##_freelist++; \ |
| 428 | 1264 } while (0) |
| 1204 | 1265 #else |
|
5059
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
1266 #define FREE_FIXED_TYPE_WHEN_NOT_IN_GC(lo, type, structtype, ptr) |
| 1204 | 1267 #endif |
|
5059
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
1268 #endif /* (not) NEW_GC */ |
| 3263 | 1269 |
| 1270 #ifdef NEW_GC | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
1271 #define ALLOC_FROB_BLOCK_LISP_OBJECT(type, lisp_type, var, lrec_ptr)\ |
| 3017 | 1272 do { \ |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
1273 (var) = (lisp_type *) XPNTR (ALLOC_NORMAL_LISP_OBJECT (type)); \ |
| 3017 | 1274 } while (0) |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
1275 #define NOSEEUM_ALLOC_FROB_BLOCK_LISP_OBJECT(type, lisp_type, var, \ |
| 3017 | 1276 lrec_ptr) \ |
| 1277 do { \ | |
|
5120
d1247f3cc363
latest work on lisp-object workspace;
Ben Wing <ben@xemacs.org>
parents:
5118
diff
changeset
|
1278 (var) = (lisp_type *) XPNTR (noseeum_alloc_lrecord (lrec_ptr)); \ |
| 3017 | 1279 } while (0) |
| 3263 | 1280 #else /* not NEW_GC */ |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
1281 #define ALLOC_FROB_BLOCK_LISP_OBJECT(type, lisp_type, var, lrec_ptr) \ |
| 3017 | 1282 do \ |
| 1283 { \ | |
| 1284 ALLOCATE_FIXED_TYPE (type, lisp_type, var); \ | |
| 1285 set_lheader_implementation (&(var)->lheader, lrec_ptr); \ | |
| 1286 } while (0) | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
1287 #define NOSEEUM_ALLOC_FROB_BLOCK_LISP_OBJECT(type, lisp_type, var, \ |
| 3017 | 1288 lrec_ptr) \ |
| 1289 do \ | |
| 1290 { \ | |
| 1291 NOSEEUM_ALLOCATE_FIXED_TYPE (type, lisp_type, var); \ | |
| 1292 set_lheader_implementation (&(var)->lheader, lrec_ptr); \ | |
| 1293 } while (0) | |
| 3263 | 1294 #endif /* not NEW_GC */ |
| 3017 | 1295 |
| 428 | 1296 |
| 1297 | |
| 1298 /************************************************************************/ | |
| 1299 /* Cons allocation */ | |
| 1300 /************************************************************************/ | |
| 1301 | |
| 440 | 1302 DECLARE_FIXED_TYPE_ALLOC (cons, Lisp_Cons); |
| 428 | 1303 /* conses are used and freed so often that we set this really high */ |
| 1304 /* #define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_cons 20000 */ | |
| 1305 #define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_cons 2000 | |
| 1306 | |
| 1307 static Lisp_Object | |
| 1308 mark_cons (Lisp_Object obj) | |
| 1309 { | |
| 1310 if (NILP (XCDR (obj))) | |
| 1311 return XCAR (obj); | |
| 1312 | |
| 1313 mark_object (XCAR (obj)); | |
| 1314 return XCDR (obj); | |
| 1315 } | |
| 1316 | |
| 1317 static int | |
|
4906
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4880
diff
changeset
|
1318 cons_equal (Lisp_Object ob1, Lisp_Object ob2, int depth, int foldcase) |
| 428 | 1319 { |
| 442 | 1320 depth++; |
|
4906
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4880
diff
changeset
|
1321 while (internal_equal_0 (XCAR (ob1), XCAR (ob2), depth, foldcase)) |
| 428 | 1322 { |
| 1323 ob1 = XCDR (ob1); | |
| 1324 ob2 = XCDR (ob2); | |
| 1325 if (! CONSP (ob1) || ! CONSP (ob2)) | |
|
4906
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4880
diff
changeset
|
1326 return internal_equal_0 (ob1, ob2, depth, foldcase); |
| 428 | 1327 } |
| 1328 return 0; | |
| 1329 } | |
| 1330 | |
| 1204 | 1331 static const struct memory_description cons_description[] = { |
| 853 | 1332 { XD_LISP_OBJECT, offsetof (Lisp_Cons, car_) }, |
| 1333 { XD_LISP_OBJECT, offsetof (Lisp_Cons, cdr_) }, | |
| 428 | 1334 { XD_END } |
| 1335 }; | |
| 1336 | |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
1337 DEFINE_DUMPABLE_FROB_BLOCK_LISP_OBJECT ("cons", cons, |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
1338 mark_cons, print_cons, 0, cons_equal, |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
1339 /* |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
1340 * No `hash' method needed. |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
1341 * internal_hash knows how to |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
1342 * handle conses. |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
1343 */ |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
1344 0, cons_description, Lisp_Cons); |
| 428 | 1345 |
| 1346 DEFUN ("cons", Fcons, 2, 2, 0, /* | |
| 3355 | 1347 Create a new cons cell, give it CAR and CDR as components, and return it. |
| 1348 | |
| 1349 A cons cell is a Lisp object (an area in memory) made up of two pointers | |
| 1350 called the CAR and the CDR. Each of these pointers can point to any other | |
| 1351 Lisp object. The common Lisp data type, the list, is a specially-structured | |
| 1352 series of cons cells. | |
| 1353 | |
| 1354 The pointers are accessed from Lisp with `car' and `cdr', and mutated with | |
| 1355 `setcar' and `setcdr' respectively. For historical reasons, the aliases | |
| 1356 `rplaca' and `rplacd' (for `setcar' and `setcdr') are supported. | |
| 428 | 1357 */ |
| 1358 (car, cdr)) | |
| 1359 { | |
| 1360 /* This cannot GC. */ | |
| 1361 Lisp_Object val; | |
| 440 | 1362 Lisp_Cons *c; |
| 1363 | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
1364 ALLOC_FROB_BLOCK_LISP_OBJECT (cons, Lisp_Cons, c, &lrecord_cons); |
| 793 | 1365 val = wrap_cons (c); |
| 853 | 1366 XSETCAR (val, car); |
| 1367 XSETCDR (val, cdr); | |
| 428 | 1368 return val; |
| 1369 } | |
| 1370 | |
| 1371 /* This is identical to Fcons() but it used for conses that we're | |
| 1372 going to free later, and is useful when trying to track down | |
| 1373 "real" consing. */ | |
| 1374 Lisp_Object | |
| 1375 noseeum_cons (Lisp_Object car, Lisp_Object cdr) | |
| 1376 { | |
| 1377 Lisp_Object val; | |
| 440 | 1378 Lisp_Cons *c; |
| 1379 | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
1380 NOSEEUM_ALLOC_FROB_BLOCK_LISP_OBJECT (cons, Lisp_Cons, c, &lrecord_cons); |
| 793 | 1381 val = wrap_cons (c); |
| 428 | 1382 XCAR (val) = car; |
| 1383 XCDR (val) = cdr; | |
| 1384 return val; | |
| 1385 } | |
| 1386 | |
| 1387 DEFUN ("list", Flist, 0, MANY, 0, /* | |
|
4693
80cd90837ac5
Add argument information to remaining MANY or UNEVALLED C subrs.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3514
diff
changeset
|
1388 Return a newly created list with specified ARGS as elements. |
| 428 | 1389 Any number of arguments, even zero arguments, are allowed. |
|
4693
80cd90837ac5
Add argument information to remaining MANY or UNEVALLED C subrs.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3514
diff
changeset
|
1390 |
|
80cd90837ac5
Add argument information to remaining MANY or UNEVALLED C subrs.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3514
diff
changeset
|
1391 arguments: (&rest ARGS) |
| 428 | 1392 */ |
| 1393 (int nargs, Lisp_Object *args)) | |
| 1394 { | |
| 1395 Lisp_Object val = Qnil; | |
| 1396 Lisp_Object *argp = args + nargs; | |
| 1397 | |
| 1398 while (argp > args) | |
| 1399 val = Fcons (*--argp, val); | |
| 1400 return val; | |
| 1401 } | |
| 1402 | |
| 1403 Lisp_Object | |
| 1404 list1 (Lisp_Object obj0) | |
| 1405 { | |
| 1406 /* This cannot GC. */ | |
| 1407 return Fcons (obj0, Qnil); | |
| 1408 } | |
| 1409 | |
| 1410 Lisp_Object | |
| 1411 list2 (Lisp_Object obj0, Lisp_Object obj1) | |
| 1412 { | |
| 1413 /* This cannot GC. */ | |
| 1414 return Fcons (obj0, Fcons (obj1, Qnil)); | |
| 1415 } | |
| 1416 | |
| 1417 Lisp_Object | |
| 1418 list3 (Lisp_Object obj0, Lisp_Object obj1, Lisp_Object obj2) | |
| 1419 { | |
| 1420 /* This cannot GC. */ | |
| 1421 return Fcons (obj0, Fcons (obj1, Fcons (obj2, Qnil))); | |
| 1422 } | |
| 1423 | |
| 1424 Lisp_Object | |
| 1425 cons3 (Lisp_Object obj0, Lisp_Object obj1, Lisp_Object obj2) | |
| 1426 { | |
| 1427 /* This cannot GC. */ | |
| 1428 return Fcons (obj0, Fcons (obj1, obj2)); | |
| 1429 } | |
| 1430 | |
|
5354
22c4e67a2e69
Remove #'acons from cl.el, make the version in alloc.c visible to Lisp
Aidan Kehoe <kehoea@parhasard.net>
parents:
5307
diff
changeset
|
1431 DEFUN ("acons", Facons, 3, 3, 0, /* |
|
22c4e67a2e69
Remove #'acons from cl.el, make the version in alloc.c visible to Lisp
Aidan Kehoe <kehoea@parhasard.net>
parents:
5307
diff
changeset
|
1432 Return a new alist created by prepending (KEY . VALUE) to ALIST. |
|
22c4e67a2e69
Remove #'acons from cl.el, make the version in alloc.c visible to Lisp
Aidan Kehoe <kehoea@parhasard.net>
parents:
5307
diff
changeset
|
1433 */ |
|
22c4e67a2e69
Remove #'acons from cl.el, make the version in alloc.c visible to Lisp
Aidan Kehoe <kehoea@parhasard.net>
parents:
5307
diff
changeset
|
1434 (key, value, alist)) |
| 428 | 1435 { |
| 1436 return Fcons (Fcons (key, value), alist); | |
| 1437 } | |
| 1438 | |
| 1439 Lisp_Object | |
| 1440 list4 (Lisp_Object obj0, Lisp_Object obj1, Lisp_Object obj2, Lisp_Object obj3) | |
| 1441 { | |
| 1442 /* This cannot GC. */ | |
| 1443 return Fcons (obj0, Fcons (obj1, Fcons (obj2, Fcons (obj3, Qnil)))); | |
| 1444 } | |
| 1445 | |
| 1446 Lisp_Object | |
| 1447 list5 (Lisp_Object obj0, Lisp_Object obj1, Lisp_Object obj2, Lisp_Object obj3, | |
| 1448 Lisp_Object obj4) | |
| 1449 { | |
| 1450 /* This cannot GC. */ | |
| 1451 return Fcons (obj0, Fcons (obj1, Fcons (obj2, Fcons (obj3, Fcons (obj4, Qnil))))); | |
| 1452 } | |
| 1453 | |
| 1454 Lisp_Object | |
| 1455 list6 (Lisp_Object obj0, Lisp_Object obj1, Lisp_Object obj2, Lisp_Object obj3, | |
| 1456 Lisp_Object obj4, Lisp_Object obj5) | |
| 1457 { | |
| 1458 /* This cannot GC. */ | |
| 1459 return Fcons (obj0, Fcons (obj1, Fcons (obj2, Fcons (obj3, Fcons (obj4, Fcons (obj5, Qnil)))))); | |
| 1460 } | |
| 1461 | |
|
5157
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
1462 /* Return a list of arbitrary length, terminated by Qunbound. */ |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
1463 |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
1464 Lisp_Object |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
1465 listu (Lisp_Object first, ...) |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
1466 { |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
1467 Lisp_Object obj = Qnil; |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
1468 Lisp_Object val; |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
1469 va_list va; |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
1470 |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
1471 va_start (va, first); |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
1472 val = first; |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
1473 while (!UNBOUNDP (val)) |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
1474 { |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
1475 obj = Fcons (val, obj); |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
1476 val = va_arg (va, Lisp_Object); |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
1477 } |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
1478 va_end (va); |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
1479 return Fnreverse (obj); |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
1480 } |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
1481 |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
1482 /* Return a list of arbitrary length, with length specified and remaining |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
1483 args making up the list. */ |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
1484 |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
1485 Lisp_Object |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
1486 listn (int num_args, ...) |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
1487 { |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
1488 int i; |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
1489 Lisp_Object obj = Qnil; |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
1490 va_list va; |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
1491 |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
1492 va_start (va, num_args); |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
1493 for (i = 0; i < num_args; i++) |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
1494 obj = Fcons (va_arg (va, Lisp_Object), obj); |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
1495 va_end (va); |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
1496 return Fnreverse (obj); |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
1497 } |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
1498 |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
1499 /* Return a list of arbitrary length, with length specified and an array |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
1500 of elements. */ |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
1501 |
| 428 | 1502 DEFUN ("make-list", Fmake_list, 2, 2, 0, /* |
| 444 | 1503 Return a new list of length LENGTH, with each element being OBJECT. |
| 428 | 1504 */ |
| 444 | 1505 (length, object)) |
| 428 | 1506 { |
|
5307
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5229
diff
changeset
|
1507 Lisp_Object val = Qnil; |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5229
diff
changeset
|
1508 Elemcount size; |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5229
diff
changeset
|
1509 |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5229
diff
changeset
|
1510 check_integer_range (length, Qzero, make_integer (EMACS_INT_MAX)); |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5229
diff
changeset
|
1511 |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5229
diff
changeset
|
1512 size = XINT (length); |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5229
diff
changeset
|
1513 |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5229
diff
changeset
|
1514 while (size--) |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5229
diff
changeset
|
1515 val = Fcons (object, val); |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5229
diff
changeset
|
1516 |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5229
diff
changeset
|
1517 return val; |
| 428 | 1518 } |
| 1519 | |
| 1520 | |
| 1521 /************************************************************************/ | |
| 1522 /* Float allocation */ | |
| 1523 /************************************************************************/ | |
| 1524 | |
| 1983 | 1525 /*** With enhanced number support, these are short floats */ |
| 1526 | |
| 440 | 1527 DECLARE_FIXED_TYPE_ALLOC (float, Lisp_Float); |
| 428 | 1528 #define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_float 1000 |
| 1529 | |
| 1530 Lisp_Object | |
| 1531 make_float (double float_value) | |
| 1532 { | |
| 440 | 1533 Lisp_Float *f; |
| 1534 | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
1535 ALLOC_FROB_BLOCK_LISP_OBJECT (float, Lisp_Float, f, &lrecord_float); |
| 440 | 1536 |
| 1537 /* Avoid dump-time `uninitialized memory read' purify warnings. */ | |
| 1538 if (sizeof (struct lrecord_header) + sizeof (double) != sizeof (*f)) | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
1539 zero_nonsized_lisp_object (wrap_float (f)); |
| 3017 | 1540 |
| 428 | 1541 float_data (f) = float_value; |
| 793 | 1542 return wrap_float (f); |
| 428 | 1543 } |
| 1544 | |
| 1545 | |
| 1546 /************************************************************************/ | |
| 1983 | 1547 /* Enhanced number allocation */ |
| 1548 /************************************************************************/ | |
| 1549 | |
| 1550 /*** Bignum ***/ | |
| 1551 #ifdef HAVE_BIGNUM | |
| 1552 DECLARE_FIXED_TYPE_ALLOC (bignum, Lisp_Bignum); | |
| 1553 #define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_bignum 250 | |
| 1554 | |
| 1555 /* WARNING: This function returns a bignum even if its argument fits into a | |
| 1556 fixnum. See Fcanonicalize_number(). */ | |
| 1557 Lisp_Object | |
| 1558 make_bignum (long bignum_value) | |
| 1559 { | |
| 1560 Lisp_Bignum *b; | |
| 1561 | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
1562 ALLOC_FROB_BLOCK_LISP_OBJECT (bignum, Lisp_Bignum, b, &lrecord_bignum); |
| 1983 | 1563 bignum_init (bignum_data (b)); |
| 1564 bignum_set_long (bignum_data (b), bignum_value); | |
| 1565 return wrap_bignum (b); | |
| 1566 } | |
| 1567 | |
| 1568 /* WARNING: This function returns a bignum even if its argument fits into a | |
| 1569 fixnum. See Fcanonicalize_number(). */ | |
| 1570 Lisp_Object | |
| 1571 make_bignum_bg (bignum bg) | |
| 1572 { | |
| 1573 Lisp_Bignum *b; | |
| 1574 | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
1575 ALLOC_FROB_BLOCK_LISP_OBJECT (bignum, Lisp_Bignum, b, &lrecord_bignum); |
| 1983 | 1576 bignum_init (bignum_data (b)); |
| 1577 bignum_set (bignum_data (b), bg); | |
| 1578 return wrap_bignum (b); | |
| 1579 } | |
| 1580 #endif /* HAVE_BIGNUM */ | |
| 1581 | |
| 1582 /*** Ratio ***/ | |
| 1583 #ifdef HAVE_RATIO | |
| 1584 DECLARE_FIXED_TYPE_ALLOC (ratio, Lisp_Ratio); | |
| 1585 #define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_ratio 250 | |
| 1586 | |
| 1587 Lisp_Object | |
| 1588 make_ratio (long numerator, unsigned long denominator) | |
| 1589 { | |
| 1590 Lisp_Ratio *r; | |
| 1591 | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
1592 ALLOC_FROB_BLOCK_LISP_OBJECT (ratio, Lisp_Ratio, r, &lrecord_ratio); |
| 1983 | 1593 ratio_init (ratio_data (r)); |
| 1594 ratio_set_long_ulong (ratio_data (r), numerator, denominator); | |
| 1595 ratio_canonicalize (ratio_data (r)); | |
| 1596 return wrap_ratio (r); | |
| 1597 } | |
| 1598 | |
| 1599 Lisp_Object | |
| 1600 make_ratio_bg (bignum numerator, bignum denominator) | |
| 1601 { | |
| 1602 Lisp_Ratio *r; | |
| 1603 | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
1604 ALLOC_FROB_BLOCK_LISP_OBJECT (ratio, Lisp_Ratio, r, &lrecord_ratio); |
| 1983 | 1605 ratio_init (ratio_data (r)); |
| 1606 ratio_set_bignum_bignum (ratio_data (r), numerator, denominator); | |
| 1607 ratio_canonicalize (ratio_data (r)); | |
| 1608 return wrap_ratio (r); | |
| 1609 } | |
| 1610 | |
| 1611 Lisp_Object | |
| 1612 make_ratio_rt (ratio rat) | |
| 1613 { | |
| 1614 Lisp_Ratio *r; | |
| 1615 | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
1616 ALLOC_FROB_BLOCK_LISP_OBJECT (ratio, Lisp_Ratio, r, &lrecord_ratio); |
| 1983 | 1617 ratio_init (ratio_data (r)); |
| 1618 ratio_set (ratio_data (r), rat); | |
| 1619 return wrap_ratio (r); | |
| 1620 } | |
| 1621 #endif /* HAVE_RATIO */ | |
| 1622 | |
| 1623 /*** Bigfloat ***/ | |
| 1624 #ifdef HAVE_BIGFLOAT | |
| 1625 DECLARE_FIXED_TYPE_ALLOC (bigfloat, Lisp_Bigfloat); | |
| 1626 #define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_bigfloat 250 | |
| 1627 | |
| 1628 /* This function creates a bigfloat with the default precision if the | |
| 1629 PRECISION argument is zero. */ | |
| 1630 Lisp_Object | |
| 1631 make_bigfloat (double float_value, unsigned long precision) | |
| 1632 { | |
| 1633 Lisp_Bigfloat *f; | |
| 1634 | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
1635 ALLOC_FROB_BLOCK_LISP_OBJECT (bigfloat, Lisp_Bigfloat, f, &lrecord_bigfloat); |
| 1983 | 1636 if (precision == 0UL) |
| 1637 bigfloat_init (bigfloat_data (f)); | |
| 1638 else | |
| 1639 bigfloat_init_prec (bigfloat_data (f), precision); | |
| 1640 bigfloat_set_double (bigfloat_data (f), float_value); | |
| 1641 return wrap_bigfloat (f); | |
| 1642 } | |
| 1643 | |
| 1644 /* This function creates a bigfloat with the precision of its argument */ | |
| 1645 Lisp_Object | |
| 1646 make_bigfloat_bf (bigfloat float_value) | |
| 1647 { | |
| 1648 Lisp_Bigfloat *f; | |
| 1649 | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
1650 ALLOC_FROB_BLOCK_LISP_OBJECT (bigfloat, Lisp_Bigfloat, f, &lrecord_bigfloat); |
| 1983 | 1651 bigfloat_init_prec (bigfloat_data (f), bigfloat_get_prec (float_value)); |
| 1652 bigfloat_set (bigfloat_data (f), float_value); | |
| 1653 return wrap_bigfloat (f); | |
| 1654 } | |
| 1655 #endif /* HAVE_BIGFLOAT */ | |
| 1656 | |
| 1657 /************************************************************************/ | |
| 428 | 1658 /* Vector allocation */ |
| 1659 /************************************************************************/ | |
| 1660 | |
| 1661 static Lisp_Object | |
| 1662 mark_vector (Lisp_Object obj) | |
| 1663 { | |
| 1664 Lisp_Vector *ptr = XVECTOR (obj); | |
| 1665 int len = vector_length (ptr); | |
| 1666 int i; | |
| 1667 | |
| 1668 for (i = 0; i < len - 1; i++) | |
| 1669 mark_object (ptr->contents[i]); | |
| 1670 return (len > 0) ? ptr->contents[len - 1] : Qnil; | |
| 1671 } | |
| 1672 | |
| 665 | 1673 static Bytecount |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
1674 size_vector (Lisp_Object obj) |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
1675 { |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
1676 |
| 456 | 1677 return FLEXIBLE_ARRAY_STRUCT_SIZEOF (Lisp_Vector, Lisp_Object, contents, |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
1678 XVECTOR (obj)->size); |
| 428 | 1679 } |
| 1680 | |
| 1681 static int | |
|
4906
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4880
diff
changeset
|
1682 vector_equal (Lisp_Object obj1, Lisp_Object obj2, int depth, int foldcase) |
| 428 | 1683 { |
| 1684 int len = XVECTOR_LENGTH (obj1); | |
| 1685 if (len != XVECTOR_LENGTH (obj2)) | |
| 1686 return 0; | |
| 1687 | |
| 1688 { | |
| 1689 Lisp_Object *ptr1 = XVECTOR_DATA (obj1); | |
| 1690 Lisp_Object *ptr2 = XVECTOR_DATA (obj2); | |
| 1691 while (len--) | |
|
4906
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4880
diff
changeset
|
1692 if (!internal_equal_0 (*ptr1++, *ptr2++, depth + 1, foldcase)) |
| 428 | 1693 return 0; |
| 1694 } | |
| 1695 return 1; | |
| 1696 } | |
| 1697 | |
| 665 | 1698 static Hashcode |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5179
diff
changeset
|
1699 vector_hash (Lisp_Object obj, int depth, Boolint equalp) |
| 442 | 1700 { |
| 1701 return HASH2 (XVECTOR_LENGTH (obj), | |
| 1702 internal_array_hash (XVECTOR_DATA (obj), | |
| 1703 XVECTOR_LENGTH (obj), | |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5179
diff
changeset
|
1704 depth + 1, equalp)); |
| 442 | 1705 } |
| 1706 | |
| 1204 | 1707 static const struct memory_description vector_description[] = { |
| 440 | 1708 { XD_LONG, offsetof (Lisp_Vector, size) }, |
| 1709 { XD_LISP_OBJECT_ARRAY, offsetof (Lisp_Vector, contents), XD_INDIRECT(0, 0) }, | |
| 428 | 1710 { XD_END } |
| 1711 }; | |
| 1712 | |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
1713 DEFINE_DUMPABLE_SIZABLE_LISP_OBJECT ("vector", vector, |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
1714 mark_vector, print_vector, 0, |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
1715 vector_equal, |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
1716 vector_hash, |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
1717 vector_description, |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
1718 size_vector, Lisp_Vector); |
| 428 | 1719 /* #### should allocate `small' vectors from a frob-block */ |
| 1720 static Lisp_Vector * | |
| 665 | 1721 make_vector_internal (Elemcount sizei) |
| 428 | 1722 { |
| 1204 | 1723 /* no `next' field; we use lcrecords */ |
| 665 | 1724 Bytecount sizem = FLEXIBLE_ARRAY_STRUCT_SIZEOF (Lisp_Vector, Lisp_Object, |
| 1204 | 1725 contents, sizei); |
|
5117
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
1726 Lisp_Object obj = ALLOC_SIZED_LISP_OBJECT (sizem, vector); |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
1727 Lisp_Vector *p = XVECTOR (obj); |
| 428 | 1728 |
| 1729 p->size = sizei; | |
| 1730 return p; | |
| 1731 } | |
| 1732 | |
| 1733 Lisp_Object | |
| 665 | 1734 make_vector (Elemcount length, Lisp_Object object) |
| 428 | 1735 { |
| 1736 Lisp_Vector *vecp = make_vector_internal (length); | |
| 1737 Lisp_Object *p = vector_data (vecp); | |
| 1738 | |
| 1739 while (length--) | |
| 444 | 1740 *p++ = object; |
| 428 | 1741 |
| 793 | 1742 return wrap_vector (vecp); |
| 428 | 1743 } |
| 1744 | |
| 1745 DEFUN ("make-vector", Fmake_vector, 2, 2, 0, /* | |
| 444 | 1746 Return a new vector of length LENGTH, with each element being OBJECT. |
| 428 | 1747 See also the function `vector'. |
| 1748 */ | |
| 444 | 1749 (length, object)) |
| 428 | 1750 { |
|
5307
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5229
diff
changeset
|
1751 check_integer_range (length, Qzero, make_int (ARRAY_DIMENSION_LIMIT)); |
| 444 | 1752 return make_vector (XINT (length), object); |
| 428 | 1753 } |
| 1754 | |
| 1755 DEFUN ("vector", Fvector, 0, MANY, 0, /* | |
|
4693
80cd90837ac5
Add argument information to remaining MANY or UNEVALLED C subrs.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3514
diff
changeset
|
1756 Return a newly created vector with specified ARGS as elements. |
| 428 | 1757 Any number of arguments, even zero arguments, are allowed. |
|
4693
80cd90837ac5
Add argument information to remaining MANY or UNEVALLED C subrs.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3514
diff
changeset
|
1758 |
|
80cd90837ac5
Add argument information to remaining MANY or UNEVALLED C subrs.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3514
diff
changeset
|
1759 arguments: (&rest ARGS) |
| 428 | 1760 */ |
| 1761 (int nargs, Lisp_Object *args)) | |
| 1762 { | |
| 1763 Lisp_Vector *vecp = make_vector_internal (nargs); | |
| 1764 Lisp_Object *p = vector_data (vecp); | |
| 1765 | |
| 1766 while (nargs--) | |
| 1767 *p++ = *args++; | |
| 1768 | |
| 793 | 1769 return wrap_vector (vecp); |
| 428 | 1770 } |
| 1771 | |
| 1772 Lisp_Object | |
| 1773 vector1 (Lisp_Object obj0) | |
| 1774 { | |
| 1775 return Fvector (1, &obj0); | |
| 1776 } | |
| 1777 | |
| 1778 Lisp_Object | |
| 1779 vector2 (Lisp_Object obj0, Lisp_Object obj1) | |
| 1780 { | |
| 1781 Lisp_Object args[2]; | |
| 1782 args[0] = obj0; | |
| 1783 args[1] = obj1; | |
| 1784 return Fvector (2, args); | |
| 1785 } | |
| 1786 | |
| 1787 Lisp_Object | |
| 1788 vector3 (Lisp_Object obj0, Lisp_Object obj1, Lisp_Object obj2) | |
| 1789 { | |
| 1790 Lisp_Object args[3]; | |
| 1791 args[0] = obj0; | |
| 1792 args[1] = obj1; | |
| 1793 args[2] = obj2; | |
| 1794 return Fvector (3, args); | |
| 1795 } | |
| 1796 | |
| 1797 #if 0 /* currently unused */ | |
| 1798 | |
| 1799 Lisp_Object | |
| 1800 vector4 (Lisp_Object obj0, Lisp_Object obj1, Lisp_Object obj2, | |
| 1801 Lisp_Object obj3) | |
| 1802 { | |
| 1803 Lisp_Object args[4]; | |
| 1804 args[0] = obj0; | |
| 1805 args[1] = obj1; | |
| 1806 args[2] = obj2; | |
| 1807 args[3] = obj3; | |
| 1808 return Fvector (4, args); | |
| 1809 } | |
| 1810 | |
| 1811 Lisp_Object | |
| 1812 vector5 (Lisp_Object obj0, Lisp_Object obj1, Lisp_Object obj2, | |
| 1813 Lisp_Object obj3, Lisp_Object obj4) | |
| 1814 { | |
| 1815 Lisp_Object args[5]; | |
| 1816 args[0] = obj0; | |
| 1817 args[1] = obj1; | |
| 1818 args[2] = obj2; | |
| 1819 args[3] = obj3; | |
| 1820 args[4] = obj4; | |
| 1821 return Fvector (5, args); | |
| 1822 } | |
| 1823 | |
| 1824 Lisp_Object | |
| 1825 vector6 (Lisp_Object obj0, Lisp_Object obj1, Lisp_Object obj2, | |
| 1826 Lisp_Object obj3, Lisp_Object obj4, Lisp_Object obj5) | |
| 1827 { | |
| 1828 Lisp_Object args[6]; | |
| 1829 args[0] = obj0; | |
| 1830 args[1] = obj1; | |
| 1831 args[2] = obj2; | |
| 1832 args[3] = obj3; | |
| 1833 args[4] = obj4; | |
| 1834 args[5] = obj5; | |
| 1835 return Fvector (6, args); | |
| 1836 } | |
| 1837 | |
| 1838 Lisp_Object | |
| 1839 vector7 (Lisp_Object obj0, Lisp_Object obj1, Lisp_Object obj2, | |
| 1840 Lisp_Object obj3, Lisp_Object obj4, Lisp_Object obj5, | |
| 1841 Lisp_Object obj6) | |
| 1842 { | |
| 1843 Lisp_Object args[7]; | |
| 1844 args[0] = obj0; | |
| 1845 args[1] = obj1; | |
| 1846 args[2] = obj2; | |
| 1847 args[3] = obj3; | |
| 1848 args[4] = obj4; | |
| 1849 args[5] = obj5; | |
| 1850 args[6] = obj6; | |
| 1851 return Fvector (7, args); | |
| 1852 } | |
| 1853 | |
| 1854 Lisp_Object | |
| 1855 vector8 (Lisp_Object obj0, Lisp_Object obj1, Lisp_Object obj2, | |
| 1856 Lisp_Object obj3, Lisp_Object obj4, Lisp_Object obj5, | |
| 1857 Lisp_Object obj6, Lisp_Object obj7) | |
| 1858 { | |
| 1859 Lisp_Object args[8]; | |
| 1860 args[0] = obj0; | |
| 1861 args[1] = obj1; | |
| 1862 args[2] = obj2; | |
| 1863 args[3] = obj3; | |
| 1864 args[4] = obj4; | |
| 1865 args[5] = obj5; | |
| 1866 args[6] = obj6; | |
| 1867 args[7] = obj7; | |
| 1868 return Fvector (8, args); | |
| 1869 } | |
| 1870 #endif /* unused */ | |
| 1871 | |
| 1872 /************************************************************************/ | |
| 1873 /* Bit Vector allocation */ | |
| 1874 /************************************************************************/ | |
| 1875 | |
| 1876 /* #### should allocate `small' bit vectors from a frob-block */ | |
| 440 | 1877 static Lisp_Bit_Vector * |
| 665 | 1878 make_bit_vector_internal (Elemcount sizei) |
| 428 | 1879 { |
| 1204 | 1880 /* no `next' field; we use lcrecords */ |
| 665 | 1881 Elemcount num_longs = BIT_VECTOR_LONG_STORAGE (sizei); |
| 1882 Bytecount sizem = FLEXIBLE_ARRAY_STRUCT_SIZEOF (Lisp_Bit_Vector, | |
| 1204 | 1883 unsigned long, |
| 1884 bits, num_longs); | |
|
5117
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
1885 Lisp_Object obj = ALLOC_SIZED_LISP_OBJECT (sizem, bit_vector); |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
1886 Lisp_Bit_Vector *p = XBIT_VECTOR (obj); |
| 428 | 1887 |
| 1888 bit_vector_length (p) = sizei; | |
| 1889 return p; | |
| 1890 } | |
| 1891 | |
| 1892 Lisp_Object | |
| 665 | 1893 make_bit_vector (Elemcount length, Lisp_Object bit) |
| 428 | 1894 { |
| 440 | 1895 Lisp_Bit_Vector *p = make_bit_vector_internal (length); |
| 665 | 1896 Elemcount num_longs = BIT_VECTOR_LONG_STORAGE (length); |
| 428 | 1897 |
| 444 | 1898 CHECK_BIT (bit); |
| 1899 | |
| 1900 if (ZEROP (bit)) | |
| 428 | 1901 memset (p->bits, 0, num_longs * sizeof (long)); |
| 1902 else | |
| 1903 { | |
| 665 | 1904 Elemcount bits_in_last = length & (LONGBITS_POWER_OF_2 - 1); |
| 428 | 1905 memset (p->bits, ~0, num_longs * sizeof (long)); |
| 1906 /* But we have to make sure that the unused bits in the | |
| 1907 last long are 0, so that equal/hash is easy. */ | |
| 1908 if (bits_in_last) | |
| 1909 p->bits[num_longs - 1] &= (1 << bits_in_last) - 1; | |
| 1910 } | |
| 1911 | |
| 793 | 1912 return wrap_bit_vector (p); |
| 428 | 1913 } |
| 1914 | |
| 1915 Lisp_Object | |
| 665 | 1916 make_bit_vector_from_byte_vector (unsigned char *bytevec, Elemcount length) |
| 428 | 1917 { |
| 665 | 1918 Elemcount i; |
| 428 | 1919 Lisp_Bit_Vector *p = make_bit_vector_internal (length); |
| 1920 | |
| 1921 for (i = 0; i < length; i++) | |
| 1922 set_bit_vector_bit (p, i, bytevec[i]); | |
| 1923 | |
| 793 | 1924 return wrap_bit_vector (p); |
| 428 | 1925 } |
| 1926 | |
| 1927 DEFUN ("make-bit-vector", Fmake_bit_vector, 2, 2, 0, /* | |
| 444 | 1928 Return a new bit vector of length LENGTH. with each bit set to BIT. |
| 1929 BIT must be one of the integers 0 or 1. See also the function `bit-vector'. | |
| 428 | 1930 */ |
| 444 | 1931 (length, bit)) |
| 428 | 1932 { |
|
5307
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5229
diff
changeset
|
1933 check_integer_range (length, Qzero, make_int (ARRAY_DIMENSION_LIMIT)); |
| 444 | 1934 return make_bit_vector (XINT (length), bit); |
| 428 | 1935 } |
| 1936 | |
| 1937 DEFUN ("bit-vector", Fbit_vector, 0, MANY, 0, /* | |
|
4693
80cd90837ac5
Add argument information to remaining MANY or UNEVALLED C subrs.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3514
diff
changeset
|
1938 Return a newly created bit vector with specified ARGS as elements. |
| 428 | 1939 Any number of arguments, even zero arguments, are allowed. |
| 444 | 1940 Each argument must be one of the integers 0 or 1. |
|
4693
80cd90837ac5
Add argument information to remaining MANY or UNEVALLED C subrs.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3514
diff
changeset
|
1941 |
|
80cd90837ac5
Add argument information to remaining MANY or UNEVALLED C subrs.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3514
diff
changeset
|
1942 arguments: (&rest ARGS) |
| 428 | 1943 */ |
| 1944 (int nargs, Lisp_Object *args)) | |
| 1945 { | |
| 1946 int i; | |
| 1947 Lisp_Bit_Vector *p = make_bit_vector_internal (nargs); | |
| 1948 | |
| 1949 for (i = 0; i < nargs; i++) | |
| 1950 { | |
| 1951 CHECK_BIT (args[i]); | |
| 1952 set_bit_vector_bit (p, i, !ZEROP (args[i])); | |
| 1953 } | |
| 1954 | |
| 793 | 1955 return wrap_bit_vector (p); |
| 428 | 1956 } |
| 1957 | |
| 1958 | |
| 1959 /************************************************************************/ | |
| 1960 /* Compiled-function allocation */ | |
| 1961 /************************************************************************/ | |
| 1962 | |
| 1963 DECLARE_FIXED_TYPE_ALLOC (compiled_function, Lisp_Compiled_Function); | |
| 1964 #define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_compiled_function 1000 | |
| 1965 | |
| 1966 static Lisp_Object | |
| 1967 make_compiled_function (void) | |
| 1968 { | |
| 1969 Lisp_Compiled_Function *f; | |
| 1970 | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
1971 ALLOC_FROB_BLOCK_LISP_OBJECT (compiled_function, Lisp_Compiled_Function, |
|
5146
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
1972 f, &lrecord_compiled_function); |
| 428 | 1973 |
| 1974 f->stack_depth = 0; | |
| 1975 f->specpdl_depth = 0; | |
| 1976 f->flags.documentationp = 0; | |
| 1977 f->flags.interactivep = 0; | |
| 1978 f->flags.domainp = 0; /* I18N3 */ | |
| 1979 f->instructions = Qzero; | |
| 1980 f->constants = Qzero; | |
| 1981 f->arglist = Qnil; | |
| 3092 | 1982 #ifdef NEW_GC |
| 1983 f->arguments = Qnil; | |
| 1984 #else /* not NEW_GC */ | |
| 1739 | 1985 f->args = NULL; |
| 3092 | 1986 #endif /* not NEW_GC */ |
| 1739 | 1987 f->max_args = f->min_args = f->args_in_array = 0; |
| 428 | 1988 f->doc_and_interactive = Qnil; |
| 1989 #ifdef COMPILED_FUNCTION_ANNOTATION_HACK | |
| 1990 f->annotated = Qnil; | |
| 1991 #endif | |
| 793 | 1992 return wrap_compiled_function (f); |
| 428 | 1993 } |
| 1994 | |
| 1995 DEFUN ("make-byte-code", Fmake_byte_code, 4, MANY, 0, /* | |
| 1996 Return a new compiled-function object. | |
| 1997 Note that, unlike all other emacs-lisp functions, calling this with five | |
| 1998 arguments is NOT the same as calling it with six arguments, the last of | |
| 1999 which is nil. If the INTERACTIVE arg is specified as nil, then that means | |
| 2000 that this function was defined with `(interactive)'. If the arg is not | |
| 2001 specified, then that means the function is not interactive. | |
| 2002 This is terrible behavior which is retained for compatibility with old | |
| 2003 `.elc' files which expect these semantics. | |
|
4693
80cd90837ac5
Add argument information to remaining MANY or UNEVALLED C subrs.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3514
diff
changeset
|
2004 |
|
80cd90837ac5
Add argument information to remaining MANY or UNEVALLED C subrs.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3514
diff
changeset
|
2005 arguments: (ARGLIST INSTRUCTIONS CONSTANTS STACK-DEPTH &optional DOC-STRING INTERACTIVE) |
| 428 | 2006 */ |
| 2007 (int nargs, Lisp_Object *args)) | |
| 2008 { | |
| 2009 /* In a non-insane world this function would have this arglist... | |
| 2010 (arglist instructions constants stack_depth &optional doc_string interactive) | |
| 2011 */ | |
| 2012 Lisp_Object fun = make_compiled_function (); | |
| 2013 Lisp_Compiled_Function *f = XCOMPILED_FUNCTION (fun); | |
| 2014 | |
| 2015 Lisp_Object arglist = args[0]; | |
| 2016 Lisp_Object instructions = args[1]; | |
| 2017 Lisp_Object constants = args[2]; | |
| 2018 Lisp_Object stack_depth = args[3]; | |
| 2019 Lisp_Object doc_string = (nargs > 4) ? args[4] : Qnil; | |
| 2020 Lisp_Object interactive = (nargs > 5) ? args[5] : Qunbound; | |
| 2021 | |
| 2022 if (nargs < 4 || nargs > 6) | |
| 2023 return Fsignal (Qwrong_number_of_arguments, | |
| 2024 list2 (intern ("make-byte-code"), make_int (nargs))); | |
| 2025 | |
| 2026 /* Check for valid formal parameter list now, to allow us to use | |
| 2027 SPECBIND_FAST_UNSAFE() later in funcall_compiled_function(). */ | |
| 2028 { | |
| 814 | 2029 EXTERNAL_LIST_LOOP_2 (symbol, arglist) |
| 428 | 2030 { |
| 2031 CHECK_SYMBOL (symbol); | |
| 2032 if (EQ (symbol, Qt) || | |
| 2033 EQ (symbol, Qnil) || | |
| 2034 SYMBOL_IS_KEYWORD (symbol)) | |
| 563 | 2035 invalid_constant_2 |
| 428 | 2036 ("Invalid constant symbol in formal parameter list", |
| 2037 symbol, arglist); | |
| 2038 } | |
| 2039 } | |
| 2040 f->arglist = arglist; | |
| 2041 | |
| 2042 /* `instructions' is a string or a cons (string . int) for a | |
| 2043 lazy-loaded function. */ | |
| 2044 if (CONSP (instructions)) | |
| 2045 { | |
| 2046 CHECK_STRING (XCAR (instructions)); | |
| 2047 CHECK_INT (XCDR (instructions)); | |
| 2048 } | |
| 2049 else | |
| 2050 { | |
| 2051 CHECK_STRING (instructions); | |
| 2052 } | |
| 2053 f->instructions = instructions; | |
| 2054 | |
| 2055 if (!NILP (constants)) | |
| 2056 CHECK_VECTOR (constants); | |
| 2057 f->constants = constants; | |
| 2058 | |
|
5307
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5229
diff
changeset
|
2059 check_integer_range (stack_depth, Qzero, make_int (USHRT_MAX)); |
| 442 | 2060 f->stack_depth = (unsigned short) XINT (stack_depth); |
| 428 | 2061 |
| 2062 #ifdef COMPILED_FUNCTION_ANNOTATION_HACK | |
|
4923
8ee3c10d1ed5
remove old no-longer-useful kludgy compiled-fun annotations hack
Ben Wing <ben@xemacs.org>
parents:
4921
diff
changeset
|
2063 f->annotated = Vload_file_name_internal; |
| 428 | 2064 #endif /* COMPILED_FUNCTION_ANNOTATION_HACK */ |
| 2065 | |
| 2066 /* doc_string may be nil, string, int, or a cons (string . int). | |
| 2067 interactive may be list or string (or unbound). */ | |
| 2068 f->doc_and_interactive = Qunbound; | |
| 2069 #ifdef I18N3 | |
| 2070 if ((f->flags.domainp = !NILP (Vfile_domain)) != 0) | |
| 2071 f->doc_and_interactive = Vfile_domain; | |
| 2072 #endif | |
| 2073 if ((f->flags.interactivep = !UNBOUNDP (interactive)) != 0) | |
| 2074 { | |
| 2075 f->doc_and_interactive | |
| 2076 = (UNBOUNDP (f->doc_and_interactive) ? interactive : | |
| 2077 Fcons (interactive, f->doc_and_interactive)); | |
| 2078 } | |
| 2079 if ((f->flags.documentationp = !NILP (doc_string)) != 0) | |
| 2080 { | |
| 2081 f->doc_and_interactive | |
| 2082 = (UNBOUNDP (f->doc_and_interactive) ? doc_string : | |
| 2083 Fcons (doc_string, f->doc_and_interactive)); | |
| 2084 } | |
| 2085 if (UNBOUNDP (f->doc_and_interactive)) | |
| 2086 f->doc_and_interactive = Qnil; | |
| 2087 | |
| 2088 return fun; | |
| 2089 } | |
| 2090 | |
| 2091 | |
| 2092 /************************************************************************/ | |
| 2093 /* Symbol allocation */ | |
| 2094 /************************************************************************/ | |
| 2095 | |
| 440 | 2096 DECLARE_FIXED_TYPE_ALLOC (symbol, Lisp_Symbol); |
| 428 | 2097 #define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_symbol 1000 |
| 2098 | |
| 2099 DEFUN ("make-symbol", Fmake_symbol, 1, 1, 0, /* | |
| 2100 Return a newly allocated uninterned symbol whose name is NAME. | |
| 2101 Its value and function definition are void, and its property list is nil. | |
| 2102 */ | |
| 2103 (name)) | |
| 2104 { | |
| 440 | 2105 Lisp_Symbol *p; |
| 428 | 2106 |
| 2107 CHECK_STRING (name); | |
| 2108 | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
2109 ALLOC_FROB_BLOCK_LISP_OBJECT (symbol, Lisp_Symbol, p, &lrecord_symbol); |
| 793 | 2110 p->name = name; |
| 428 | 2111 p->plist = Qnil; |
| 2112 p->value = Qunbound; | |
| 2113 p->function = Qunbound; | |
| 2114 symbol_next (p) = 0; | |
| 793 | 2115 return wrap_symbol (p); |
| 428 | 2116 } |
| 2117 | |
| 2118 | |
| 2119 /************************************************************************/ | |
| 2120 /* Extent allocation */ | |
| 2121 /************************************************************************/ | |
| 2122 | |
| 2123 DECLARE_FIXED_TYPE_ALLOC (extent, struct extent); | |
| 2124 #define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_extent 1000 | |
| 2125 | |
| 2126 struct extent * | |
| 2127 allocate_extent (void) | |
| 2128 { | |
| 2129 struct extent *e; | |
| 2130 | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
2131 ALLOC_FROB_BLOCK_LISP_OBJECT (extent, struct extent, e, &lrecord_extent); |
| 428 | 2132 extent_object (e) = Qnil; |
| 2133 set_extent_start (e, -1); | |
| 2134 set_extent_end (e, -1); | |
| 2135 e->plist = Qnil; | |
| 2136 | |
| 2137 xzero (e->flags); | |
| 2138 | |
| 2139 extent_face (e) = Qnil; | |
| 2140 e->flags.end_open = 1; /* default is for endpoints to behave like markers */ | |
| 2141 e->flags.detachable = 1; | |
| 2142 | |
| 2143 return e; | |
| 2144 } | |
| 2145 | |
| 2146 | |
| 2147 /************************************************************************/ | |
| 2148 /* Event allocation */ | |
| 2149 /************************************************************************/ | |
| 2150 | |
| 440 | 2151 DECLARE_FIXED_TYPE_ALLOC (event, Lisp_Event); |
| 428 | 2152 #define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_event 1000 |
| 2153 | |
| 2154 Lisp_Object | |
| 2155 allocate_event (void) | |
| 2156 { | |
| 440 | 2157 Lisp_Event *e; |
| 2158 | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
2159 ALLOC_FROB_BLOCK_LISP_OBJECT (event, Lisp_Event, e, &lrecord_event); |
| 428 | 2160 |
| 793 | 2161 return wrap_event (e); |
| 428 | 2162 } |
| 2163 | |
| 1204 | 2164 #ifdef EVENT_DATA_AS_OBJECTS |
| 934 | 2165 DECLARE_FIXED_TYPE_ALLOC (key_data, Lisp_Key_Data); |
| 2166 #define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_key_data 1000 | |
| 2167 | |
| 2168 Lisp_Object | |
| 1204 | 2169 make_key_data (void) |
| 934 | 2170 { |
| 2171 Lisp_Key_Data *d; | |
| 2172 | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
2173 ALLOC_FROB_BLOCK_LISP_OBJECT (key_data, Lisp_Key_Data, d, |
| 3017 | 2174 &lrecord_key_data); |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
2175 zero_nonsized_lisp_object (wrap_key_data (d)); |
| 1204 | 2176 d->keysym = Qnil; |
| 2177 | |
| 2178 return wrap_key_data (d); | |
| 934 | 2179 } |
| 2180 | |
| 2181 DECLARE_FIXED_TYPE_ALLOC (button_data, Lisp_Button_Data); | |
| 2182 #define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_button_data 1000 | |
| 2183 | |
| 2184 Lisp_Object | |
| 1204 | 2185 make_button_data (void) |
| 934 | 2186 { |
| 2187 Lisp_Button_Data *d; | |
| 2188 | |
|
5146
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
2189 ALLOC_FROB_BLOCK_LISP_OBJECT (button_data, Lisp_Button_Data, d, |
|
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
2190 &lrecord_button_data); |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
2191 zero_nonsized_lisp_object (wrap_button_data (d)); |
| 1204 | 2192 return wrap_button_data (d); |
| 934 | 2193 } |
| 2194 | |
| 2195 DECLARE_FIXED_TYPE_ALLOC (motion_data, Lisp_Motion_Data); | |
| 2196 #define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_motion_data 1000 | |
| 2197 | |
| 2198 Lisp_Object | |
| 1204 | 2199 make_motion_data (void) |
| 934 | 2200 { |
| 2201 Lisp_Motion_Data *d; | |
| 2202 | |
|
5146
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
2203 ALLOC_FROB_BLOCK_LISP_OBJECT (motion_data, Lisp_Motion_Data, d, |
|
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
2204 &lrecord_motion_data); |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
2205 zero_nonsized_lisp_object (wrap_motion_data (d)); |
| 934 | 2206 |
| 1204 | 2207 return wrap_motion_data (d); |
| 934 | 2208 } |
| 2209 | |
| 2210 DECLARE_FIXED_TYPE_ALLOC (process_data, Lisp_Process_Data); | |
| 2211 #define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_process_data 1000 | |
| 2212 | |
| 2213 Lisp_Object | |
| 1204 | 2214 make_process_data (void) |
| 934 | 2215 { |
| 2216 Lisp_Process_Data *d; | |
| 2217 | |
|
5146
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
2218 ALLOC_FROB_BLOCK_LISP_OBJECT (process_data, Lisp_Process_Data, d, |
|
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
2219 &lrecord_process_data); |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
2220 zero_nonsized_lisp_object (wrap_process_data (d)); |
| 1204 | 2221 d->process = Qnil; |
| 2222 | |
| 2223 return wrap_process_data (d); | |
| 934 | 2224 } |
| 2225 | |
| 2226 DECLARE_FIXED_TYPE_ALLOC (timeout_data, Lisp_Timeout_Data); | |
| 2227 #define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_timeout_data 1000 | |
| 2228 | |
| 2229 Lisp_Object | |
| 1204 | 2230 make_timeout_data (void) |
| 934 | 2231 { |
| 2232 Lisp_Timeout_Data *d; | |
| 2233 | |
|
5146
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
2234 ALLOC_FROB_BLOCK_LISP_OBJECT (timeout_data, Lisp_Timeout_Data, d, |
|
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
2235 &lrecord_timeout_data); |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
2236 zero_nonsized_lisp_object (wrap_timeout_data (d)); |
| 1204 | 2237 d->function = Qnil; |
| 2238 d->object = Qnil; | |
| 2239 | |
| 2240 return wrap_timeout_data (d); | |
| 934 | 2241 } |
| 2242 | |
| 2243 DECLARE_FIXED_TYPE_ALLOC (magic_data, Lisp_Magic_Data); | |
| 2244 #define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_magic_data 1000 | |
| 2245 | |
| 2246 Lisp_Object | |
| 1204 | 2247 make_magic_data (void) |
| 934 | 2248 { |
| 2249 Lisp_Magic_Data *d; | |
| 2250 | |
|
5146
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
2251 ALLOC_FROB_BLOCK_LISP_OBJECT (magic_data, Lisp_Magic_Data, d, |
|
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
2252 &lrecord_magic_data); |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
2253 zero_nonsized_lisp_object (wrap_magic_data (d)); |
| 934 | 2254 |
| 1204 | 2255 return wrap_magic_data (d); |
| 934 | 2256 } |
| 2257 | |
| 2258 DECLARE_FIXED_TYPE_ALLOC (magic_eval_data, Lisp_Magic_Eval_Data); | |
| 2259 #define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_magic_eval_data 1000 | |
| 2260 | |
| 2261 Lisp_Object | |
| 1204 | 2262 make_magic_eval_data (void) |
| 934 | 2263 { |
| 2264 Lisp_Magic_Eval_Data *d; | |
| 2265 | |
|
5146
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
2266 ALLOC_FROB_BLOCK_LISP_OBJECT (magic_eval_data, Lisp_Magic_Eval_Data, d, |
|
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
2267 &lrecord_magic_eval_data); |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
2268 zero_nonsized_lisp_object (wrap_magic_eval_data (d)); |
| 1204 | 2269 d->object = Qnil; |
| 2270 | |
| 2271 return wrap_magic_eval_data (d); | |
| 934 | 2272 } |
| 2273 | |
| 2274 DECLARE_FIXED_TYPE_ALLOC (eval_data, Lisp_Eval_Data); | |
| 2275 #define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_eval_data 1000 | |
| 2276 | |
| 2277 Lisp_Object | |
| 1204 | 2278 make_eval_data (void) |
| 934 | 2279 { |
| 2280 Lisp_Eval_Data *d; | |
| 2281 | |
|
5146
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
2282 ALLOC_FROB_BLOCK_LISP_OBJECT (eval_data, Lisp_Eval_Data, d, |
|
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
2283 &lrecord_eval_data); |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
2284 zero_nonsized_lisp_object (wrap_eval_data (d)); |
| 1204 | 2285 d->function = Qnil; |
| 2286 d->object = Qnil; | |
| 2287 | |
| 2288 return wrap_eval_data (d); | |
| 934 | 2289 } |
| 2290 | |
| 2291 DECLARE_FIXED_TYPE_ALLOC (misc_user_data, Lisp_Misc_User_Data); | |
| 2292 #define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_misc_user_data 1000 | |
| 2293 | |
| 2294 Lisp_Object | |
| 1204 | 2295 make_misc_user_data (void) |
| 934 | 2296 { |
| 2297 Lisp_Misc_User_Data *d; | |
| 2298 | |
|
5146
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
2299 ALLOC_FROB_BLOCK_LISP_OBJECT (misc_user_data, Lisp_Misc_User_Data, d, |
|
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
2300 &lrecord_misc_user_data); |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
2301 zero_nonsized_lisp_object (wrap_misc_user_data (d)); |
| 1204 | 2302 d->function = Qnil; |
| 2303 d->object = Qnil; | |
| 2304 | |
| 2305 return wrap_misc_user_data (d); | |
| 934 | 2306 } |
| 1204 | 2307 |
| 2308 #endif /* EVENT_DATA_AS_OBJECTS */ | |
| 428 | 2309 |
| 2310 /************************************************************************/ | |
| 2311 /* Marker allocation */ | |
| 2312 /************************************************************************/ | |
| 2313 | |
| 440 | 2314 DECLARE_FIXED_TYPE_ALLOC (marker, Lisp_Marker); |
| 428 | 2315 #define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_marker 1000 |
| 2316 | |
| 2317 DEFUN ("make-marker", Fmake_marker, 0, 0, 0, /* | |
| 2318 Return a new marker which does not point at any place. | |
| 2319 */ | |
| 2320 ()) | |
| 2321 { | |
| 440 | 2322 Lisp_Marker *p; |
| 2323 | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
2324 ALLOC_FROB_BLOCK_LISP_OBJECT (marker, Lisp_Marker, p, &lrecord_marker); |
| 428 | 2325 p->buffer = 0; |
| 665 | 2326 p->membpos = 0; |
| 428 | 2327 marker_next (p) = 0; |
| 2328 marker_prev (p) = 0; | |
| 2329 p->insertion_type = 0; | |
| 793 | 2330 return wrap_marker (p); |
| 428 | 2331 } |
| 2332 | |
| 2333 Lisp_Object | |
| 2334 noseeum_make_marker (void) | |
| 2335 { | |
| 440 | 2336 Lisp_Marker *p; |
| 2337 | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
2338 NOSEEUM_ALLOC_FROB_BLOCK_LISP_OBJECT (marker, Lisp_Marker, p, |
|
5146
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
2339 &lrecord_marker); |
| 428 | 2340 p->buffer = 0; |
| 665 | 2341 p->membpos = 0; |
| 428 | 2342 marker_next (p) = 0; |
| 2343 marker_prev (p) = 0; | |
| 2344 p->insertion_type = 0; | |
| 793 | 2345 return wrap_marker (p); |
| 428 | 2346 } |
| 2347 | |
| 2348 | |
| 2349 /************************************************************************/ | |
| 2350 /* String allocation */ | |
| 2351 /************************************************************************/ | |
| 2352 | |
| 2353 /* The data for "short" strings generally resides inside of structs of type | |
| 2354 string_chars_block. The Lisp_String structure is allocated just like any | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
2355 other frob-block lrecord, and these are freelisted when they get garbage |
| 1204 | 2356 collected. The data for short strings get compacted, but the data for |
| 2357 large strings do not. | |
| 428 | 2358 |
| 2359 Previously Lisp_String structures were relocated, but this caused a lot | |
| 2360 of bus-errors because the C code didn't include enough GCPRO's for | |
| 2361 strings (since EVERY REFERENCE to a short string needed to be GCPRO'd so | |
| 2362 that the reference would get relocated). | |
| 2363 | |
| 2364 This new method makes things somewhat bigger, but it is MUCH safer. */ | |
| 2365 | |
| 438 | 2366 DECLARE_FIXED_TYPE_ALLOC (string, Lisp_String); |
| 428 | 2367 /* strings are used and freed quite often */ |
| 2368 /* #define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_string 10000 */ | |
| 2369 #define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_string 1000 | |
| 2370 | |
| 2371 static Lisp_Object | |
| 2372 mark_string (Lisp_Object obj) | |
| 2373 { | |
| 793 | 2374 if (CONSP (XSTRING_PLIST (obj)) && EXTENT_INFOP (XCAR (XSTRING_PLIST (obj)))) |
| 2375 flush_cached_extent_info (XCAR (XSTRING_PLIST (obj))); | |
| 2376 return XSTRING_PLIST (obj); | |
| 428 | 2377 } |
| 2378 | |
| 2379 static int | |
|
4906
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4880
diff
changeset
|
2380 string_equal (Lisp_Object obj1, Lisp_Object obj2, int UNUSED (depth), |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4880
diff
changeset
|
2381 int foldcase) |
| 428 | 2382 { |
| 2383 Bytecount len; | |
|
4906
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4880
diff
changeset
|
2384 if (foldcase) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4880
diff
changeset
|
2385 return !lisp_strcasecmp_i18n (obj1, obj2); |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4880
diff
changeset
|
2386 else |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4880
diff
changeset
|
2387 return (((len = XSTRING_LENGTH (obj1)) == XSTRING_LENGTH (obj2)) && |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4880
diff
changeset
|
2388 !memcmp (XSTRING_DATA (obj1), XSTRING_DATA (obj2), len)); |
| 428 | 2389 } |
| 2390 | |
| 1204 | 2391 static const struct memory_description string_description[] = { |
| 3092 | 2392 #ifdef NEW_GC |
| 2393 { XD_LISP_OBJECT, offsetof (Lisp_String, data_object) }, | |
| 2394 #else /* not NEW_GC */ | |
| 793 | 2395 { XD_BYTECOUNT, offsetof (Lisp_String, size_) }, |
| 2396 { XD_OPAQUE_DATA_PTR, offsetof (Lisp_String, data_), XD_INDIRECT(0, 1) }, | |
| 3092 | 2397 #endif /* not NEW_GC */ |
| 440 | 2398 { XD_LISP_OBJECT, offsetof (Lisp_String, plist) }, |
| 428 | 2399 { XD_END } |
| 2400 }; | |
| 2401 | |
| 442 | 2402 /* We store the string's extent info as the first element of the string's |
| 2403 property list; and the string's MODIFF as the first or second element | |
| 2404 of the string's property list (depending on whether the extent info | |
| 2405 is present), but only if the string has been modified. This is ugly | |
| 2406 but it reduces the memory allocated for the string in the vast | |
| 2407 majority of cases, where the string is never modified and has no | |
| 2408 extent info. | |
| 2409 | |
| 2410 #### This means you can't use an int as a key in a string's plist. */ | |
| 2411 | |
| 2412 static Lisp_Object * | |
| 2413 string_plist_ptr (Lisp_Object string) | |
| 2414 { | |
| 793 | 2415 Lisp_Object *ptr = &XSTRING_PLIST (string); |
| 442 | 2416 |
| 2417 if (CONSP (*ptr) && EXTENT_INFOP (XCAR (*ptr))) | |
| 2418 ptr = &XCDR (*ptr); | |
| 2419 if (CONSP (*ptr) && INTP (XCAR (*ptr))) | |
| 2420 ptr = &XCDR (*ptr); | |
| 2421 return ptr; | |
| 2422 } | |
| 2423 | |
| 2424 static Lisp_Object | |
| 2425 string_getprop (Lisp_Object string, Lisp_Object property) | |
| 2426 { | |
| 2427 return external_plist_get (string_plist_ptr (string), property, 0, ERROR_ME); | |
| 2428 } | |
| 2429 | |
| 2430 static int | |
| 2431 string_putprop (Lisp_Object string, Lisp_Object property, Lisp_Object value) | |
| 2432 { | |
| 2433 external_plist_put (string_plist_ptr (string), property, value, 0, ERROR_ME); | |
| 2434 return 1; | |
| 2435 } | |
| 2436 | |
| 2437 static int | |
| 2438 string_remprop (Lisp_Object string, Lisp_Object property) | |
| 2439 { | |
| 2440 return external_remprop (string_plist_ptr (string), property, 0, ERROR_ME); | |
| 2441 } | |
| 2442 | |
| 2443 static Lisp_Object | |
| 2444 string_plist (Lisp_Object string) | |
| 2445 { | |
| 2446 return *string_plist_ptr (string); | |
| 2447 } | |
| 2448 | |
| 3263 | 2449 #ifndef NEW_GC |
| 442 | 2450 /* No `finalize', or `hash' methods. |
| 2451 internal_hash() already knows how to hash strings and finalization | |
| 2452 is done with the ADDITIONAL_FREE_string macro, which is the | |
| 2453 standard way to do finalization when using | |
| 2454 SWEEP_FIXED_TYPE_BLOCK(). */ | |
| 2720 | 2455 |
|
5157
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
2456 DEFINE_DUMPABLE_FROB_BLOCK_LISP_OBJECT ("string", string, |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
2457 mark_string, print_string, |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
2458 0, string_equal, 0, |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
2459 string_description, |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
2460 Lisp_String); |
| 3263 | 2461 #endif /* not NEW_GC */ |
| 2720 | 2462 |
| 3092 | 2463 #ifdef NEW_GC |
| 2464 #define STRING_FULLSIZE(size) \ | |
| 2465 ALIGN_SIZE (FLEXIBLE_ARRAY_STRUCT_SIZEOF (Lisp_String_Direct_Data, Lisp_Object, data, (size) + 1), sizeof (Lisp_Object *)); | |
| 2466 #else /* not NEW_GC */ | |
| 428 | 2467 /* String blocks contain this many useful bytes. */ |
| 2468 #define STRING_CHARS_BLOCK_SIZE \ | |
| 814 | 2469 ((Bytecount) (8192 - MALLOC_OVERHEAD - \ |
| 2470 ((2 * sizeof (struct string_chars_block *)) \ | |
| 2471 + sizeof (EMACS_INT)))) | |
| 428 | 2472 /* Block header for small strings. */ |
| 2473 struct string_chars_block | |
| 2474 { | |
| 2475 EMACS_INT pos; | |
| 2476 struct string_chars_block *next; | |
| 2477 struct string_chars_block *prev; | |
| 2478 /* Contents of string_chars_block->string_chars are interleaved | |
| 2479 string_chars structures (see below) and the actual string data */ | |
| 2480 unsigned char string_chars[STRING_CHARS_BLOCK_SIZE]; | |
| 2481 }; | |
| 2482 | |
| 2483 static struct string_chars_block *first_string_chars_block; | |
| 2484 static struct string_chars_block *current_string_chars_block; | |
| 2485 | |
| 2486 /* If SIZE is the length of a string, this returns how many bytes | |
| 2487 * the string occupies in string_chars_block->string_chars | |
| 2488 * (including alignment padding). | |
| 2489 */ | |
| 438 | 2490 #define STRING_FULLSIZE(size) \ |
| 826 | 2491 ALIGN_FOR_TYPE (((size) + 1 + sizeof (Lisp_String *)), Lisp_String *) |
| 428 | 2492 |
| 2493 #define BIG_STRING_FULLSIZE_P(fullsize) ((fullsize) >= STRING_CHARS_BLOCK_SIZE) | |
| 2494 #define BIG_STRING_SIZE_P(size) (BIG_STRING_FULLSIZE_P (STRING_FULLSIZE(size))) | |
| 2495 | |
| 454 | 2496 #define STRING_CHARS_FREE_P(ptr) ((ptr)->string == NULL) |
| 2497 #define MARK_STRING_CHARS_AS_FREE(ptr) ((void) ((ptr)->string = NULL)) | |
| 3092 | 2498 #endif /* not NEW_GC */ |
| 454 | 2499 |
| 3263 | 2500 #ifdef NEW_GC |
|
5157
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
2501 DEFINE_DUMPABLE_LISP_OBJECT ("string", string, mark_string, print_string, |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
2502 0, string_equal, 0, |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
2503 string_description, Lisp_String); |
| 3092 | 2504 |
| 2505 | |
| 2506 static const struct memory_description string_direct_data_description[] = { | |
| 3514 | 2507 { XD_BYTECOUNT, offsetof (Lisp_String_Direct_Data, size) }, |
| 3092 | 2508 { XD_END } |
| 2509 }; | |
| 2510 | |
| 2511 static Bytecount | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
2512 size_string_direct_data (Lisp_Object obj) |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
2513 { |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
2514 return STRING_FULLSIZE (XSTRING_DIRECT_DATA (obj)->size); |
| 3092 | 2515 } |
| 2516 | |
| 2517 | |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
2518 DEFINE_DUMPABLE_SIZABLE_INTERNAL_LISP_OBJECT ("string-direct-data", |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
2519 string_direct_data, |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
2520 0, |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
2521 string_direct_data_description, |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
2522 size_string_direct_data, |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
2523 Lisp_String_Direct_Data); |
| 3092 | 2524 |
| 2525 | |
| 2526 static const struct memory_description string_indirect_data_description[] = { | |
| 2527 { XD_BYTECOUNT, offsetof (Lisp_String_Indirect_Data, size) }, | |
| 2528 { XD_OPAQUE_DATA_PTR, offsetof (Lisp_String_Indirect_Data, data), | |
| 2529 XD_INDIRECT(0, 1) }, | |
| 2530 { XD_END } | |
| 2531 }; | |
| 2532 | |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
2533 DEFINE_DUMPABLE_INTERNAL_LISP_OBJECT ("string-indirect-data", |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
2534 string_indirect_data, |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
2535 0, |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
2536 string_indirect_data_description, |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
2537 Lisp_String_Indirect_Data); |
| 3092 | 2538 #endif /* NEW_GC */ |
| 2720 | 2539 |
| 3092 | 2540 #ifndef NEW_GC |
| 428 | 2541 struct string_chars |
| 2542 { | |
| 438 | 2543 Lisp_String *string; |
| 428 | 2544 unsigned char chars[1]; |
| 2545 }; | |
| 2546 | |
| 2547 struct unused_string_chars | |
| 2548 { | |
| 438 | 2549 Lisp_String *string; |
| 428 | 2550 EMACS_INT fullsize; |
| 2551 }; | |
| 2552 | |
| 2553 static void | |
| 2554 init_string_chars_alloc (void) | |
| 2555 { | |
| 2556 first_string_chars_block = xnew (struct string_chars_block); | |
| 2557 first_string_chars_block->prev = 0; | |
| 2558 first_string_chars_block->next = 0; | |
| 2559 first_string_chars_block->pos = 0; | |
| 2560 current_string_chars_block = first_string_chars_block; | |
| 2561 } | |
| 2562 | |
| 1550 | 2563 static Ibyte * |
| 2564 allocate_big_string_chars (Bytecount length) | |
| 2565 { | |
| 2566 Ibyte *p = xnew_array (Ibyte, length); | |
| 2567 INCREMENT_CONS_COUNTER (length, "string chars"); | |
| 2568 return p; | |
| 2569 } | |
| 2570 | |
| 428 | 2571 static struct string_chars * |
| 793 | 2572 allocate_string_chars_struct (Lisp_Object string_it_goes_with, |
| 814 | 2573 Bytecount fullsize) |
| 428 | 2574 { |
| 2575 struct string_chars *s_chars; | |
| 2576 | |
| 438 | 2577 if (fullsize <= |
| 2578 (countof (current_string_chars_block->string_chars) | |
| 2579 - current_string_chars_block->pos)) | |
| 428 | 2580 { |
| 2581 /* This string can fit in the current string chars block */ | |
| 2582 s_chars = (struct string_chars *) | |
| 2583 (current_string_chars_block->string_chars | |
| 2584 + current_string_chars_block->pos); | |
| 2585 current_string_chars_block->pos += fullsize; | |
| 2586 } | |
| 2587 else | |
| 2588 { | |
| 2589 /* Make a new current string chars block */ | |
| 2590 struct string_chars_block *new_scb = xnew (struct string_chars_block); | |
| 2591 | |
| 2592 current_string_chars_block->next = new_scb; | |
| 2593 new_scb->prev = current_string_chars_block; | |
| 2594 new_scb->next = 0; | |
| 2595 current_string_chars_block = new_scb; | |
| 2596 new_scb->pos = fullsize; | |
| 2597 s_chars = (struct string_chars *) | |
| 2598 current_string_chars_block->string_chars; | |
| 2599 } | |
| 2600 | |
| 793 | 2601 s_chars->string = XSTRING (string_it_goes_with); |
| 428 | 2602 |
| 2603 INCREMENT_CONS_COUNTER (fullsize, "string chars"); | |
| 2604 | |
| 2605 return s_chars; | |
| 2606 } | |
| 3092 | 2607 #endif /* not NEW_GC */ |
| 428 | 2608 |
| 771 | 2609 #ifdef SLEDGEHAMMER_CHECK_ASCII_BEGIN |
| 2610 void | |
| 2611 sledgehammer_check_ascii_begin (Lisp_Object str) | |
| 2612 { | |
| 2613 Bytecount i; | |
| 2614 | |
| 2615 for (i = 0; i < XSTRING_LENGTH (str); i++) | |
| 2616 { | |
| 826 | 2617 if (!byte_ascii_p (string_byte (str, i))) |
| 771 | 2618 break; |
| 2619 } | |
| 2620 | |
| 2621 assert (i == (Bytecount) XSTRING_ASCII_BEGIN (str) || | |
| 2622 (i > MAX_STRING_ASCII_BEGIN && | |
| 2623 (Bytecount) XSTRING_ASCII_BEGIN (str) == | |
| 2624 (Bytecount) MAX_STRING_ASCII_BEGIN)); | |
| 2625 } | |
| 2626 #endif | |
| 2627 | |
| 2628 /* You do NOT want to be calling this! (And if you do, you must call | |
| 851 | 2629 XSET_STRING_ASCII_BEGIN() after modifying the string.) Use ALLOCA () |
| 771 | 2630 instead and then call make_string() like the rest of the world. */ |
| 2631 | |
| 428 | 2632 Lisp_Object |
| 2633 make_uninit_string (Bytecount length) | |
| 2634 { | |
| 438 | 2635 Lisp_String *s; |
| 814 | 2636 Bytecount fullsize = STRING_FULLSIZE (length); |
| 428 | 2637 |
| 438 | 2638 assert (length >= 0 && fullsize > 0); |
| 428 | 2639 |
| 3263 | 2640 #ifdef NEW_GC |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
2641 s = XSTRING (ALLOC_NORMAL_LISP_OBJECT (string)); |
| 3263 | 2642 #else /* not NEW_GC */ |
| 428 | 2643 /* Allocate the string header */ |
| 438 | 2644 ALLOCATE_FIXED_TYPE (string, Lisp_String, s); |
| 793 | 2645 xzero (*s); |
| 771 | 2646 set_lheader_implementation (&s->u.lheader, &lrecord_string); |
| 3263 | 2647 #endif /* not NEW_GC */ |
| 2720 | 2648 |
| 3063 | 2649 /* The above allocations set the UID field, which overlaps with the |
| 2650 ascii-length field, to some non-zero value. We need to zero it. */ | |
| 2651 XSET_STRING_ASCII_BEGIN (wrap_string (s), 0); | |
| 2652 | |
| 3092 | 2653 #ifdef NEW_GC |
| 3304 | 2654 set_lispstringp_direct (s); |
| 3092 | 2655 STRING_DATA_OBJECT (s) = |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
2656 alloc_sized_lrecord (fullsize, &lrecord_string_direct_data); |
| 3092 | 2657 #else /* not NEW_GC */ |
| 826 | 2658 set_lispstringp_data (s, BIG_STRING_FULLSIZE_P (fullsize) |
| 2720 | 2659 ? allocate_big_string_chars (length + 1) |
| 2660 : allocate_string_chars_struct (wrap_string (s), | |
| 2661 fullsize)->chars); | |
| 3092 | 2662 #endif /* not NEW_GC */ |
| 438 | 2663 |
| 826 | 2664 set_lispstringp_length (s, length); |
| 428 | 2665 s->plist = Qnil; |
| 793 | 2666 set_string_byte (wrap_string (s), length, 0); |
| 2667 | |
| 2668 return wrap_string (s); | |
| 428 | 2669 } |
| 2670 | |
| 2671 #ifdef VERIFY_STRING_CHARS_INTEGRITY | |
| 2672 static void verify_string_chars_integrity (void); | |
| 2673 #endif | |
| 2674 | |
| 2675 /* Resize the string S so that DELTA bytes can be inserted starting | |
| 2676 at POS. If DELTA < 0, it means deletion starting at POS. If | |
| 2677 POS < 0, resize the string but don't copy any characters. Use | |
| 2678 this if you're planning on completely overwriting the string. | |
| 2679 */ | |
| 2680 | |
| 2681 void | |
| 793 | 2682 resize_string (Lisp_Object s, Bytecount pos, Bytecount delta) |
| 428 | 2683 { |
| 3092 | 2684 #ifdef NEW_GC |
| 2685 Bytecount newfullsize, len; | |
| 2686 #else /* not NEW_GC */ | |
| 438 | 2687 Bytecount oldfullsize, newfullsize; |
| 3092 | 2688 #endif /* not NEW_GC */ |
| 428 | 2689 #ifdef VERIFY_STRING_CHARS_INTEGRITY |
| 2690 verify_string_chars_integrity (); | |
| 2691 #endif | |
| 800 | 2692 #ifdef ERROR_CHECK_TEXT |
| 428 | 2693 if (pos >= 0) |
| 2694 { | |
| 793 | 2695 assert (pos <= XSTRING_LENGTH (s)); |
| 428 | 2696 if (delta < 0) |
| 793 | 2697 assert (pos + (-delta) <= XSTRING_LENGTH (s)); |
| 428 | 2698 } |
| 2699 else | |
| 2700 { | |
| 2701 if (delta < 0) | |
| 793 | 2702 assert ((-delta) <= XSTRING_LENGTH (s)); |
| 428 | 2703 } |
| 800 | 2704 #endif /* ERROR_CHECK_TEXT */ |
| 428 | 2705 |
| 2706 if (delta == 0) | |
| 2707 /* simplest case: no size change. */ | |
| 2708 return; | |
| 438 | 2709 |
| 2710 if (pos >= 0 && delta < 0) | |
| 2711 /* If DELTA < 0, the functions below will delete the characters | |
| 2712 before POS. We want to delete characters *after* POS, however, | |
| 2713 so convert this to the appropriate form. */ | |
| 2714 pos += -delta; | |
| 2715 | |
| 3092 | 2716 #ifdef NEW_GC |
| 2717 newfullsize = STRING_FULLSIZE (XSTRING_LENGTH (s) + delta); | |
| 2718 | |
| 2719 len = XSTRING_LENGTH (s) + 1 - pos; | |
| 2720 | |
| 2721 if (delta < 0 && pos >= 0) | |
| 2722 memmove (XSTRING_DATA (s) + pos + delta, | |
| 2723 XSTRING_DATA (s) + pos, len); | |
| 2724 | |
| 2725 XSTRING_DATA_OBJECT (s) = | |
| 2726 wrap_string_direct_data (mc_realloc (XPNTR (XSTRING_DATA_OBJECT (s)), | |
| 2727 newfullsize)); | |
| 2728 if (delta > 0 && pos >= 0) | |
| 2729 memmove (XSTRING_DATA (s) + pos + delta, XSTRING_DATA (s) + pos, | |
| 2730 len); | |
| 2731 | |
| 3263 | 2732 #else /* not NEW_GC */ |
| 793 | 2733 oldfullsize = STRING_FULLSIZE (XSTRING_LENGTH (s)); |
| 2734 newfullsize = STRING_FULLSIZE (XSTRING_LENGTH (s) + delta); | |
| 438 | 2735 |
| 2736 if (BIG_STRING_FULLSIZE_P (oldfullsize)) | |
| 428 | 2737 { |
| 438 | 2738 if (BIG_STRING_FULLSIZE_P (newfullsize)) |
| 428 | 2739 { |
| 440 | 2740 /* Both strings are big. We can just realloc(). |
| 2741 But careful! If the string is shrinking, we have to | |
| 2742 memmove() _before_ realloc(), and if growing, we have to | |
| 2743 memmove() _after_ realloc() - otherwise the access is | |
| 2744 illegal, and we might crash. */ | |
| 793 | 2745 Bytecount len = XSTRING_LENGTH (s) + 1 - pos; |
| 440 | 2746 |
| 2747 if (delta < 0 && pos >= 0) | |
| 793 | 2748 memmove (XSTRING_DATA (s) + pos + delta, |
| 2749 XSTRING_DATA (s) + pos, len); | |
| 2750 XSET_STRING_DATA | |
| 867 | 2751 (s, (Ibyte *) xrealloc (XSTRING_DATA (s), |
| 793 | 2752 XSTRING_LENGTH (s) + delta + 1)); |
| 440 | 2753 if (delta > 0 && pos >= 0) |
| 793 | 2754 memmove (XSTRING_DATA (s) + pos + delta, XSTRING_DATA (s) + pos, |
| 2755 len); | |
| 1550 | 2756 /* Bump the cons counter. |
| 2757 Conservative; Martin let the increment be delta. */ | |
| 2758 INCREMENT_CONS_COUNTER (newfullsize, "string chars"); | |
| 428 | 2759 } |
| 438 | 2760 else /* String has been demoted from BIG_STRING. */ |
| 428 | 2761 { |
| 867 | 2762 Ibyte *new_data = |
| 438 | 2763 allocate_string_chars_struct (s, newfullsize)->chars; |
| 867 | 2764 Ibyte *old_data = XSTRING_DATA (s); |
| 438 | 2765 |
| 2766 if (pos >= 0) | |
| 2767 { | |
| 2768 memcpy (new_data, old_data, pos); | |
| 2769 memcpy (new_data + pos + delta, old_data + pos, | |
| 793 | 2770 XSTRING_LENGTH (s) + 1 - pos); |
| 438 | 2771 } |
| 793 | 2772 XSET_STRING_DATA (s, new_data); |
|
4976
16112448d484
Rename xfree(FOO, TYPE) -> xfree(FOO)
Ben Wing <ben@xemacs.org>
parents:
4969
diff
changeset
|
2773 xfree (old_data); |
| 438 | 2774 } |
| 2775 } | |
| 2776 else /* old string is small */ | |
| 2777 { | |
| 2778 if (oldfullsize == newfullsize) | |
| 2779 { | |
| 2780 /* special case; size change but the necessary | |
| 2781 allocation size won't change (up or down; code | |
| 2782 somewhere depends on there not being any unused | |
| 2783 allocation space, modulo any alignment | |
| 2784 constraints). */ | |
| 428 | 2785 if (pos >= 0) |
| 2786 { | |
| 867 | 2787 Ibyte *addroff = pos + XSTRING_DATA (s); |
| 428 | 2788 |
| 2789 memmove (addroff + delta, addroff, | |
| 2790 /* +1 due to zero-termination. */ | |
| 793 | 2791 XSTRING_LENGTH (s) + 1 - pos); |
| 428 | 2792 } |
| 2793 } | |
| 2794 else | |
| 2795 { | |
| 867 | 2796 Ibyte *old_data = XSTRING_DATA (s); |
| 2797 Ibyte *new_data = | |
| 438 | 2798 BIG_STRING_FULLSIZE_P (newfullsize) |
| 1550 | 2799 ? allocate_big_string_chars (XSTRING_LENGTH (s) + delta + 1) |
| 438 | 2800 : allocate_string_chars_struct (s, newfullsize)->chars; |
| 2801 | |
| 428 | 2802 if (pos >= 0) |
| 2803 { | |
| 438 | 2804 memcpy (new_data, old_data, pos); |
| 2805 memcpy (new_data + pos + delta, old_data + pos, | |
| 793 | 2806 XSTRING_LENGTH (s) + 1 - pos); |
| 428 | 2807 } |
| 793 | 2808 XSET_STRING_DATA (s, new_data); |
| 438 | 2809 |
|
4776
73e8632018ad
Don't attempt to free dumped data, alloc.c:resize_string()
Aidan Kehoe <kehoea@parhasard.net>
parents:
4735
diff
changeset
|
2810 if (!DUMPEDP (old_data)) /* Can't free dumped data. */ |
|
73e8632018ad
Don't attempt to free dumped data, alloc.c:resize_string()
Aidan Kehoe <kehoea@parhasard.net>
parents:
4735
diff
changeset
|
2811 { |
|
73e8632018ad
Don't attempt to free dumped data, alloc.c:resize_string()
Aidan Kehoe <kehoea@parhasard.net>
parents:
4735
diff
changeset
|
2812 /* We need to mark this chunk of the string_chars_block |
|
73e8632018ad
Don't attempt to free dumped data, alloc.c:resize_string()
Aidan Kehoe <kehoea@parhasard.net>
parents:
4735
diff
changeset
|
2813 as unused so that compact_string_chars() doesn't |
|
73e8632018ad
Don't attempt to free dumped data, alloc.c:resize_string()
Aidan Kehoe <kehoea@parhasard.net>
parents:
4735
diff
changeset
|
2814 freak. */ |
|
73e8632018ad
Don't attempt to free dumped data, alloc.c:resize_string()
Aidan Kehoe <kehoea@parhasard.net>
parents:
4735
diff
changeset
|
2815 struct string_chars *old_s_chars = (struct string_chars *) |
|
73e8632018ad
Don't attempt to free dumped data, alloc.c:resize_string()
Aidan Kehoe <kehoea@parhasard.net>
parents:
4735
diff
changeset
|
2816 ((char *) old_data - offsetof (struct string_chars, chars)); |
|
73e8632018ad
Don't attempt to free dumped data, alloc.c:resize_string()
Aidan Kehoe <kehoea@parhasard.net>
parents:
4735
diff
changeset
|
2817 /* Sanity check to make sure we aren't hosed by strange |
|
73e8632018ad
Don't attempt to free dumped data, alloc.c:resize_string()
Aidan Kehoe <kehoea@parhasard.net>
parents:
4735
diff
changeset
|
2818 alignment/padding. */ |
|
73e8632018ad
Don't attempt to free dumped data, alloc.c:resize_string()
Aidan Kehoe <kehoea@parhasard.net>
parents:
4735
diff
changeset
|
2819 assert (old_s_chars->string == XSTRING (s)); |
|
73e8632018ad
Don't attempt to free dumped data, alloc.c:resize_string()
Aidan Kehoe <kehoea@parhasard.net>
parents:
4735
diff
changeset
|
2820 MARK_STRING_CHARS_AS_FREE (old_s_chars); |
|
73e8632018ad
Don't attempt to free dumped data, alloc.c:resize_string()
Aidan Kehoe <kehoea@parhasard.net>
parents:
4735
diff
changeset
|
2821 ((struct unused_string_chars *) old_s_chars)->fullsize = |
|
73e8632018ad
Don't attempt to free dumped data, alloc.c:resize_string()
Aidan Kehoe <kehoea@parhasard.net>
parents:
4735
diff
changeset
|
2822 oldfullsize; |
|
73e8632018ad
Don't attempt to free dumped data, alloc.c:resize_string()
Aidan Kehoe <kehoea@parhasard.net>
parents:
4735
diff
changeset
|
2823 } |
| 428 | 2824 } |
| 438 | 2825 } |
| 3092 | 2826 #endif /* not NEW_GC */ |
| 438 | 2827 |
| 793 | 2828 XSET_STRING_LENGTH (s, XSTRING_LENGTH (s) + delta); |
| 438 | 2829 /* If pos < 0, the string won't be zero-terminated. |
| 2830 Terminate now just to make sure. */ | |
| 793 | 2831 XSTRING_DATA (s)[XSTRING_LENGTH (s)] = '\0'; |
| 438 | 2832 |
| 2833 if (pos >= 0) | |
| 793 | 2834 /* We also have to adjust all of the extent indices after the |
| 2835 place we did the change. We say "pos - 1" because | |
| 2836 adjust_extents() is exclusive of the starting position | |
| 2837 passed to it. */ | |
| 2838 adjust_extents (s, pos - 1, XSTRING_LENGTH (s), delta); | |
| 428 | 2839 |
| 2840 #ifdef VERIFY_STRING_CHARS_INTEGRITY | |
| 2841 verify_string_chars_integrity (); | |
| 2842 #endif | |
| 2843 } | |
| 2844 | |
| 2845 #ifdef MULE | |
| 2846 | |
| 771 | 2847 /* WARNING: If you modify an existing string, you must call |
| 2848 CHECK_LISP_WRITEABLE() before and bump_string_modiff() afterwards. */ | |
| 428 | 2849 void |
| 867 | 2850 set_string_char (Lisp_Object s, Charcount i, Ichar c) |
| 428 | 2851 { |
| 867 | 2852 Ibyte newstr[MAX_ICHAR_LEN]; |
| 771 | 2853 Bytecount bytoff = string_index_char_to_byte (s, i); |
| 867 | 2854 Bytecount oldlen = itext_ichar_len (XSTRING_DATA (s) + bytoff); |
| 2855 Bytecount newlen = set_itext_ichar (newstr, c); | |
| 428 | 2856 |
| 793 | 2857 sledgehammer_check_ascii_begin (s); |
| 428 | 2858 if (oldlen != newlen) |
| 2859 resize_string (s, bytoff, newlen - oldlen); | |
| 793 | 2860 /* Remember, XSTRING_DATA (s) might have changed so we can't cache it. */ |
| 2861 memcpy (XSTRING_DATA (s) + bytoff, newstr, newlen); | |
| 771 | 2862 if (oldlen != newlen) |
| 2863 { | |
| 793 | 2864 if (newlen > 1 && i <= (Charcount) XSTRING_ASCII_BEGIN (s)) |
| 771 | 2865 /* Everything starting with the new char is no longer part of |
| 2866 ascii_begin */ | |
| 793 | 2867 XSET_STRING_ASCII_BEGIN (s, i); |
| 2868 else if (newlen == 1 && i == (Charcount) XSTRING_ASCII_BEGIN (s)) | |
| 771 | 2869 /* We've extended ascii_begin, and we have to figure out how much by */ |
| 2870 { | |
| 2871 Bytecount j; | |
| 814 | 2872 for (j = (Bytecount) i + 1; j < XSTRING_LENGTH (s); j++) |
| 771 | 2873 { |
| 826 | 2874 if (!byte_ascii_p (XSTRING_DATA (s)[j])) |
| 771 | 2875 break; |
| 2876 } | |
| 814 | 2877 XSET_STRING_ASCII_BEGIN (s, min (j, (Bytecount) MAX_STRING_ASCII_BEGIN)); |
| 771 | 2878 } |
| 2879 } | |
| 793 | 2880 sledgehammer_check_ascii_begin (s); |
| 428 | 2881 } |
| 2882 | |
| 2883 #endif /* MULE */ | |
| 2884 | |
| 2885 DEFUN ("make-string", Fmake_string, 2, 2, 0, /* | |
| 444 | 2886 Return a new string consisting of LENGTH copies of CHARACTER. |
| 2887 LENGTH must be a non-negative integer. | |
| 428 | 2888 */ |
| 444 | 2889 (length, character)) |
| 428 | 2890 { |
|
5307
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5229
diff
changeset
|
2891 check_integer_range (length, Qzero, make_int (ARRAY_DIMENSION_LIMIT)); |
| 444 | 2892 CHECK_CHAR_COERCE_INT (character); |
| 428 | 2893 { |
| 867 | 2894 Ibyte init_str[MAX_ICHAR_LEN]; |
| 2895 int len = set_itext_ichar (init_str, XCHAR (character)); | |
| 428 | 2896 Lisp_Object val = make_uninit_string (len * XINT (length)); |
| 2897 | |
| 2898 if (len == 1) | |
| 771 | 2899 { |
| 2900 /* Optimize the single-byte case */ | |
| 2901 memset (XSTRING_DATA (val), XCHAR (character), XSTRING_LENGTH (val)); | |
| 793 | 2902 XSET_STRING_ASCII_BEGIN (val, min (MAX_STRING_ASCII_BEGIN, |
| 2903 len * XINT (length))); | |
| 771 | 2904 } |
| 428 | 2905 else |
| 2906 { | |
| 647 | 2907 EMACS_INT i; |
| 867 | 2908 Ibyte *ptr = XSTRING_DATA (val); |
| 428 | 2909 |
| 2910 for (i = XINT (length); i; i--) | |
| 2911 { | |
| 867 | 2912 Ibyte *init_ptr = init_str; |
| 428 | 2913 switch (len) |
| 2914 { | |
| 2915 case 4: *ptr++ = *init_ptr++; | |
| 2916 case 3: *ptr++ = *init_ptr++; | |
| 2917 case 2: *ptr++ = *init_ptr++; | |
| 2918 case 1: *ptr++ = *init_ptr++; | |
| 2919 } | |
| 2920 } | |
| 2921 } | |
| 771 | 2922 sledgehammer_check_ascii_begin (val); |
| 428 | 2923 return val; |
| 2924 } | |
| 2925 } | |
| 2926 | |
| 2927 DEFUN ("string", Fstring, 0, MANY, 0, /* | |
| 2928 Concatenate all the argument characters and make the result a string. | |
|
4693
80cd90837ac5
Add argument information to remaining MANY or UNEVALLED C subrs.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3514
diff
changeset
|
2929 |
|
80cd90837ac5
Add argument information to remaining MANY or UNEVALLED C subrs.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3514
diff
changeset
|
2930 arguments: (&rest ARGS) |
| 428 | 2931 */ |
| 2932 (int nargs, Lisp_Object *args)) | |
| 2933 { | |
| 2367 | 2934 Ibyte *storage = alloca_ibytes (nargs * MAX_ICHAR_LEN); |
| 867 | 2935 Ibyte *p = storage; |
| 428 | 2936 |
| 2937 for (; nargs; nargs--, args++) | |
| 2938 { | |
| 2939 Lisp_Object lisp_char = *args; | |
| 2940 CHECK_CHAR_COERCE_INT (lisp_char); | |
| 867 | 2941 p += set_itext_ichar (p, XCHAR (lisp_char)); |
| 428 | 2942 } |
| 2943 return make_string (storage, p - storage); | |
| 2944 } | |
| 2945 | |
| 771 | 2946 /* Initialize the ascii_begin member of a string to the correct value. */ |
| 2947 | |
| 2948 void | |
| 2949 init_string_ascii_begin (Lisp_Object string) | |
| 2950 { | |
| 2951 #ifdef MULE | |
| 2952 int i; | |
| 2953 Bytecount length = XSTRING_LENGTH (string); | |
| 867 | 2954 Ibyte *contents = XSTRING_DATA (string); |
| 771 | 2955 |
| 2956 for (i = 0; i < length; i++) | |
| 2957 { | |
| 826 | 2958 if (!byte_ascii_p (contents[i])) |
| 771 | 2959 break; |
| 2960 } | |
| 793 | 2961 XSET_STRING_ASCII_BEGIN (string, min (i, MAX_STRING_ASCII_BEGIN)); |
| 771 | 2962 #else |
| 793 | 2963 XSET_STRING_ASCII_BEGIN (string, min (XSTRING_LENGTH (string), |
| 2964 MAX_STRING_ASCII_BEGIN)); | |
| 771 | 2965 #endif |
| 2966 sledgehammer_check_ascii_begin (string); | |
| 2967 } | |
| 428 | 2968 |
| 2969 /* Take some raw memory, which MUST already be in internal format, | |
| 2970 and package it up into a Lisp string. */ | |
| 2971 Lisp_Object | |
| 867 | 2972 make_string (const Ibyte *contents, Bytecount length) |
| 428 | 2973 { |
| 2974 Lisp_Object val; | |
| 2975 | |
| 2976 /* Make sure we find out about bad make_string's when they happen */ | |
| 800 | 2977 #if defined (ERROR_CHECK_TEXT) && defined (MULE) |
| 428 | 2978 bytecount_to_charcount (contents, length); /* Just for the assertions */ |
| 2979 #endif | |
| 2980 | |
| 2981 val = make_uninit_string (length); | |
| 2982 memcpy (XSTRING_DATA (val), contents, length); | |
| 771 | 2983 init_string_ascii_begin (val); |
| 2984 sledgehammer_check_ascii_begin (val); | |
| 428 | 2985 return val; |
| 2986 } | |
| 2987 | |
| 2988 /* Take some raw memory, encoded in some external data format, | |
| 2989 and convert it into a Lisp string. */ | |
| 2990 Lisp_Object | |
|
4953
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
4952
diff
changeset
|
2991 make_extstring (const Extbyte *contents, EMACS_INT length, |
| 440 | 2992 Lisp_Object coding_system) |
| 428 | 2993 { |
| 440 | 2994 Lisp_Object string; |
| 2995 TO_INTERNAL_FORMAT (DATA, (contents, length), | |
| 2996 LISP_STRING, string, | |
| 2997 coding_system); | |
| 2998 return string; | |
| 428 | 2999 } |
| 3000 | |
| 3001 Lisp_Object | |
|
4953
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
4952
diff
changeset
|
3002 build_istring (const Ibyte *str) |
| 771 | 3003 { |
| 3004 /* Some strlen's crash and burn if passed null. */ | |
| 814 | 3005 return make_string (str, (str ? qxestrlen (str) : (Bytecount) 0)); |
| 771 | 3006 } |
| 3007 | |
| 3008 Lisp_Object | |
|
4953
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
4952
diff
changeset
|
3009 build_cistring (const CIbyte *str) |
|
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
4952
diff
changeset
|
3010 { |
|
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
4952
diff
changeset
|
3011 return build_istring ((const Ibyte *) str); |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3012 } |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3013 |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3014 Lisp_Object |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3015 build_ascstring (const Ascbyte *str) |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3016 { |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3017 ASSERT_ASCTEXT_ASCII (str); |
|
4953
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
4952
diff
changeset
|
3018 return build_istring ((const Ibyte *) str); |
| 428 | 3019 } |
| 3020 | |
| 3021 Lisp_Object | |
|
4953
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
4952
diff
changeset
|
3022 build_extstring (const Extbyte *str, Lisp_Object coding_system) |
| 428 | 3023 { |
| 3024 /* Some strlen's crash and burn if passed null. */ | |
|
4953
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
4952
diff
changeset
|
3025 return make_extstring ((const Extbyte *) str, |
| 2367 | 3026 (str ? dfc_external_data_len (str, coding_system) : |
| 3027 0), | |
| 440 | 3028 coding_system); |
| 428 | 3029 } |
| 3030 | |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3031 /* Build a string whose content is a translatable message, and translate |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3032 the message according to the current language environment. */ |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3033 |
| 428 | 3034 Lisp_Object |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3035 build_msg_istring (const Ibyte *str) |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3036 { |
|
4953
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
4952
diff
changeset
|
3037 return build_istring (IGETTEXT (str)); |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3038 } |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3039 |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3040 /* Build a string whose content is a translatable message, and translate |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3041 the message according to the current language environment. */ |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3042 |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3043 Lisp_Object |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3044 build_msg_cistring (const CIbyte *str) |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3045 { |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3046 return build_msg_istring ((const Ibyte *) str); |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3047 } |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3048 |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3049 /* Build a string whose content is a translatable message, and translate |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3050 the message according to the current language environment. |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3051 String must be pure-ASCII, and when compiled with error-checking, |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3052 an abort will have if not pure-ASCII. */ |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3053 |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3054 Lisp_Object |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3055 build_msg_ascstring (const Ascbyte *str) |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3056 { |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3057 ASSERT_ASCTEXT_ASCII (str); |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3058 return build_msg_istring ((const Ibyte *) str); |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3059 } |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3060 |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3061 /* Build a string whose content is a translatable message, but don't |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3062 translate the message immediately. Perhaps do something else instead, |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3063 such as put a property on the string indicating that it needs to be |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3064 translated. |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3065 |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3066 This is useful for strings that are built at dump time or init time, |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3067 rather than on-the-fly when the current language environment is set |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3068 properly. */ |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3069 |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3070 Lisp_Object |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3071 build_defer_istring (const Ibyte *str) |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3072 { |
|
4953
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
4952
diff
changeset
|
3073 Lisp_Object retval = build_istring ((Ibyte *) str); |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3074 /* Possibly do something to the return value */ |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3075 return retval; |
| 771 | 3076 } |
| 3077 | |
| 428 | 3078 Lisp_Object |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3079 build_defer_cistring (const CIbyte *str) |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3080 { |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3081 return build_defer_istring ((Ibyte *) str); |
| 771 | 3082 } |
| 3083 | |
| 3084 Lisp_Object | |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3085 build_defer_ascstring (const Ascbyte *str) |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3086 { |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3087 ASSERT_ASCTEXT_ASCII (str); |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3088 return build_defer_istring ((Ibyte *) str); |
| 428 | 3089 } |
| 3090 | |
| 3091 Lisp_Object | |
| 867 | 3092 make_string_nocopy (const Ibyte *contents, Bytecount length) |
| 428 | 3093 { |
| 438 | 3094 Lisp_String *s; |
| 428 | 3095 Lisp_Object val; |
| 3096 | |
| 3097 /* Make sure we find out about bad make_string_nocopy's when they happen */ | |
| 800 | 3098 #if defined (ERROR_CHECK_TEXT) && defined (MULE) |
| 428 | 3099 bytecount_to_charcount (contents, length); /* Just for the assertions */ |
| 3100 #endif | |
| 3101 | |
| 3263 | 3102 #ifdef NEW_GC |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
3103 s = XSTRING (ALLOC_NORMAL_LISP_OBJECT (string)); |
| 2720 | 3104 mcpro (wrap_pointer_1 (s)); /* otherwise nocopy_strings get |
| 3105 collected and static data is tried to | |
| 3106 be freed. */ | |
| 3263 | 3107 #else /* not NEW_GC */ |
| 428 | 3108 /* Allocate the string header */ |
| 438 | 3109 ALLOCATE_FIXED_TYPE (string, Lisp_String, s); |
| 771 | 3110 set_lheader_implementation (&s->u.lheader, &lrecord_string); |
| 3111 SET_C_READONLY_RECORD_HEADER (&s->u.lheader); | |
| 3263 | 3112 #endif /* not NEW_GC */ |
| 3063 | 3113 /* Don't need to XSET_STRING_ASCII_BEGIN() here because it happens in |
| 3114 init_string_ascii_begin(). */ | |
| 428 | 3115 s->plist = Qnil; |
| 3092 | 3116 #ifdef NEW_GC |
| 3117 set_lispstringp_indirect (s); | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
3118 STRING_DATA_OBJECT (s) = ALLOC_NORMAL_LISP_OBJECT (string_indirect_data); |
| 3092 | 3119 XSTRING_INDIRECT_DATA_DATA (STRING_DATA_OBJECT (s)) = (Ibyte *) contents; |
| 3120 XSTRING_INDIRECT_DATA_SIZE (STRING_DATA_OBJECT (s)) = length; | |
| 3121 #else /* not NEW_GC */ | |
| 867 | 3122 set_lispstringp_data (s, (Ibyte *) contents); |
| 826 | 3123 set_lispstringp_length (s, length); |
| 3092 | 3124 #endif /* not NEW_GC */ |
| 793 | 3125 val = wrap_string (s); |
| 771 | 3126 init_string_ascii_begin (val); |
| 3127 sledgehammer_check_ascii_begin (val); | |
| 3128 | |
| 428 | 3129 return val; |
| 3130 } | |
| 3131 | |
| 3132 | |
| 3263 | 3133 #ifndef NEW_GC |
| 428 | 3134 /************************************************************************/ |
| 3135 /* lcrecord lists */ | |
| 3136 /************************************************************************/ | |
| 3137 | |
| 3138 /* Lcrecord lists are used to manage the allocation of particular | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
3139 sorts of lcrecords, to avoid calling ALLOC_NORMAL_LISP_OBJECT() (and thus |
| 428 | 3140 malloc() and garbage-collection junk) as much as possible. |
| 3141 It is similar to the Blocktype class. | |
| 3142 | |
| 1204 | 3143 See detailed comment in lcrecord.h. |
| 3144 */ | |
| 3145 | |
| 3146 const struct memory_description free_description[] = { | |
| 2551 | 3147 { XD_LISP_OBJECT, offsetof (struct free_lcrecord_header, chain), 0, { 0 }, |
| 1204 | 3148 XD_FLAG_FREE_LISP_OBJECT }, |
| 3149 { XD_END } | |
| 3150 }; | |
| 3151 | |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
3152 DEFINE_NODUMP_INTERNAL_LISP_OBJECT ("free", free, 0, free_description, |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
3153 struct free_lcrecord_header); |
| 1204 | 3154 |
| 3155 const struct memory_description lcrecord_list_description[] = { | |
| 2551 | 3156 { XD_LISP_OBJECT, offsetof (struct lcrecord_list, free), 0, { 0 }, |
| 1204 | 3157 XD_FLAG_FREE_LISP_OBJECT }, |
| 3158 { XD_END } | |
| 3159 }; | |
| 428 | 3160 |
| 3161 static Lisp_Object | |
| 3162 mark_lcrecord_list (Lisp_Object obj) | |
| 3163 { | |
| 3164 struct lcrecord_list *list = XLCRECORD_LIST (obj); | |
| 3165 Lisp_Object chain = list->free; | |
| 3166 | |
| 3167 while (!NILP (chain)) | |
| 3168 { | |
| 3169 struct lrecord_header *lheader = XRECORD_LHEADER (chain); | |
| 3170 struct free_lcrecord_header *free_header = | |
| 3171 (struct free_lcrecord_header *) lheader; | |
| 3172 | |
| 442 | 3173 gc_checking_assert |
| 3174 (/* There should be no other pointers to the free list. */ | |
| 3175 ! MARKED_RECORD_HEADER_P (lheader) | |
| 3176 && | |
| 3177 /* Only lcrecords should be here. */ | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
3178 ! list->implementation->frob_block_p |
| 442 | 3179 && |
| 3180 /* Only free lcrecords should be here. */ | |
|
5142
f965e31a35f0
reduce lcrecord headers to 2 words, rename printing_unreadable_object
Ben Wing <ben@xemacs.org>
parents:
5127
diff
changeset
|
3181 lheader->free |
| 442 | 3182 && |
| 3183 /* The type of the lcrecord must be right. */ | |
| 1204 | 3184 lheader->type == lrecord_type_free |
| 442 | 3185 && |
| 3186 /* So must the size. */ | |
| 1204 | 3187 (list->implementation->static_size == 0 || |
| 3188 list->implementation->static_size == list->size) | |
| 442 | 3189 ); |
| 428 | 3190 |
| 3191 MARK_RECORD_HEADER (lheader); | |
| 3192 chain = free_header->chain; | |
| 3193 } | |
| 3194 | |
| 3195 return Qnil; | |
| 3196 } | |
| 3197 | |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
3198 DEFINE_NODUMP_INTERNAL_LISP_OBJECT ("lcrecord-list", lcrecord_list, |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
3199 mark_lcrecord_list, |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
3200 lcrecord_list_description, |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
3201 struct lcrecord_list); |
| 934 | 3202 |
| 428 | 3203 Lisp_Object |
| 665 | 3204 make_lcrecord_list (Elemcount size, |
| 442 | 3205 const struct lrecord_implementation *implementation) |
| 428 | 3206 { |
|
5124
623d57b7fbe8
separate regular and disksave finalization, print method fixes.
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
3207 /* Don't use alloc_automanaged_lcrecord() avoid infinite recursion |
|
623d57b7fbe8
separate regular and disksave finalization, print method fixes.
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
3208 allocating this. */ |
|
5151
641d0cdd1d00
fix compilation problems identified by Robert Delius Royar
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
3209 struct lcrecord_list *p = |
|
641d0cdd1d00
fix compilation problems identified by Robert Delius Royar
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
3210 XLCRECORD_LIST (old_alloc_lcrecord (&lrecord_lcrecord_list)); |
| 428 | 3211 |
| 3212 p->implementation = implementation; | |
| 3213 p->size = size; | |
| 3214 p->free = Qnil; | |
| 793 | 3215 return wrap_lcrecord_list (p); |
| 428 | 3216 } |
| 3217 | |
| 3218 Lisp_Object | |
| 1204 | 3219 alloc_managed_lcrecord (Lisp_Object lcrecord_list) |
| 428 | 3220 { |
| 3221 struct lcrecord_list *list = XLCRECORD_LIST (lcrecord_list); | |
| 3222 if (!NILP (list->free)) | |
| 3223 { | |
| 3224 Lisp_Object val = list->free; | |
| 3225 struct free_lcrecord_header *free_header = | |
| 3226 (struct free_lcrecord_header *) XPNTR (val); | |
| 1204 | 3227 struct lrecord_header *lheader = &free_header->lcheader.lheader; |
| 428 | 3228 |
| 3229 #ifdef ERROR_CHECK_GC | |
| 1204 | 3230 /* Major overkill here. */ |
| 428 | 3231 /* There should be no other pointers to the free list. */ |
| 442 | 3232 assert (! MARKED_RECORD_HEADER_P (lheader)); |
| 428 | 3233 /* Only free lcrecords should be here. */ |
|
5142
f965e31a35f0
reduce lcrecord headers to 2 words, rename printing_unreadable_object
Ben Wing <ben@xemacs.org>
parents:
5127
diff
changeset
|
3234 assert (lheader->free); |
| 1204 | 3235 assert (lheader->type == lrecord_type_free); |
| 3236 /* Only lcrecords should be here. */ | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
3237 assert (! (list->implementation->frob_block_p)); |
| 1204 | 3238 #if 0 /* Not used anymore, now that we set the type of the header to |
| 3239 lrecord_type_free. */ | |
| 428 | 3240 /* The type of the lcrecord must be right. */ |
| 442 | 3241 assert (LHEADER_IMPLEMENTATION (lheader) == list->implementation); |
| 1204 | 3242 #endif /* 0 */ |
| 428 | 3243 /* So must the size. */ |
| 1204 | 3244 assert (list->implementation->static_size == 0 || |
| 3245 list->implementation->static_size == list->size); | |
| 428 | 3246 #endif /* ERROR_CHECK_GC */ |
| 442 | 3247 |
| 428 | 3248 list->free = free_header->chain; |
|
5142
f965e31a35f0
reduce lcrecord headers to 2 words, rename printing_unreadable_object
Ben Wing <ben@xemacs.org>
parents:
5127
diff
changeset
|
3249 lheader->free = 0; |
| 1204 | 3250 /* Put back the correct type, as we set it to lrecord_type_free. */ |
| 3251 lheader->type = list->implementation->lrecord_type_index; | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
3252 zero_sized_lisp_object (val, list->size); |
| 428 | 3253 return val; |
| 3254 } | |
| 3255 else | |
|
5151
641d0cdd1d00
fix compilation problems identified by Robert Delius Royar
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
3256 return old_alloc_sized_lcrecord (list->size, list->implementation); |
| 428 | 3257 } |
| 3258 | |
| 771 | 3259 /* "Free" a Lisp object LCRECORD by placing it on its associated free list |
| 1204 | 3260 LCRECORD_LIST; next time alloc_managed_lcrecord() is called with the |
| 771 | 3261 same LCRECORD_LIST as its parameter, it will return an object from the |
| 3262 free list, which may be this one. Be VERY VERY SURE there are no | |
| 3263 pointers to this object hanging around anywhere where they might be | |
| 3264 used! | |
| 3265 | |
| 3266 The first thing this does before making any global state change is to | |
| 3267 call the finalize method of the object, if it exists. */ | |
| 3268 | |
| 428 | 3269 void |
| 3270 free_managed_lcrecord (Lisp_Object lcrecord_list, Lisp_Object lcrecord) | |
| 3271 { | |
| 3272 struct lcrecord_list *list = XLCRECORD_LIST (lcrecord_list); | |
| 3273 struct free_lcrecord_header *free_header = | |
| 3274 (struct free_lcrecord_header *) XPNTR (lcrecord); | |
| 442 | 3275 struct lrecord_header *lheader = &free_header->lcheader.lheader; |
| 3276 const struct lrecord_implementation *implementation | |
| 428 | 3277 = LHEADER_IMPLEMENTATION (lheader); |
| 3278 | |
|
4880
ae81a2c00f4f
try harder to avoid crashing when debug-printing
Ben Wing <ben@xemacs.org>
parents:
4803
diff
changeset
|
3279 /* If we try to debug-print during GC, we'll likely get a crash on the |
|
ae81a2c00f4f
try harder to avoid crashing when debug-printing
Ben Wing <ben@xemacs.org>
parents:
4803
diff
changeset
|
3280 following assert (called from Lstream_delete(), from prin1_to_string()). |
|
ae81a2c00f4f
try harder to avoid crashing when debug-printing
Ben Wing <ben@xemacs.org>
parents:
4803
diff
changeset
|
3281 Instead, just don't do anything. Worst comes to worst, we have a |
|
ae81a2c00f4f
try harder to avoid crashing when debug-printing
Ben Wing <ben@xemacs.org>
parents:
4803
diff
changeset
|
3282 small memory leak -- and programs being debugged usually won't be |
|
ae81a2c00f4f
try harder to avoid crashing when debug-printing
Ben Wing <ben@xemacs.org>
parents:
4803
diff
changeset
|
3283 super long-lived afterwards, anyway. */ |
|
ae81a2c00f4f
try harder to avoid crashing when debug-printing
Ben Wing <ben@xemacs.org>
parents:
4803
diff
changeset
|
3284 if (gc_in_progress && in_debug_print) |
|
ae81a2c00f4f
try harder to avoid crashing when debug-printing
Ben Wing <ben@xemacs.org>
parents:
4803
diff
changeset
|
3285 return; |
|
ae81a2c00f4f
try harder to avoid crashing when debug-printing
Ben Wing <ben@xemacs.org>
parents:
4803
diff
changeset
|
3286 |
| 771 | 3287 /* Finalizer methods may try to free objects within them, which typically |
| 3288 won't be marked and thus are scheduled for demolition. Putting them | |
| 3289 on the free list would be very bad, as we'd have xfree()d memory in | |
| 3290 the list. Even if for some reason the objects are still live | |
| 3291 (generally a logic error!), we still will have problems putting such | |
| 3292 an object on the free list right now (e.g. we'd have to avoid calling | |
| 3293 the finalizer twice, etc.). So basically, those finalizers should not | |
| 3294 be freeing any objects if during GC. Abort now to catch those | |
| 3295 problems. */ | |
| 3296 gc_checking_assert (!gc_in_progress); | |
| 3297 | |
| 428 | 3298 /* Make sure the size is correct. This will catch, for example, |
| 3299 putting a window configuration on the wrong free list. */ | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
3300 gc_checking_assert (lisp_object_size (lcrecord) == list->size); |
| 771 | 3301 /* Make sure the object isn't already freed. */ |
|
5142
f965e31a35f0
reduce lcrecord headers to 2 words, rename printing_unreadable_object
Ben Wing <ben@xemacs.org>
parents:
5127
diff
changeset
|
3302 gc_checking_assert (!lheader->free); |
| 2367 | 3303 /* Freeing stuff in dumped memory is bad. If you trip this, you |
| 3304 may need to check for this before freeing. */ | |
| 3305 gc_checking_assert (!OBJECT_DUMPED_P (lcrecord)); | |
| 771 | 3306 |
| 428 | 3307 if (implementation->finalizer) |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
3308 implementation->finalizer (lcrecord); |
| 1204 | 3309 /* Yes, there are two ways to indicate freeness -- the type is |
| 3310 lrecord_type_free or the ->free flag is set. We used to do only the | |
| 3311 latter; now we do the former as well for KKCC purposes. Probably | |
| 3312 safer in any case, as we will lose quicker this way than keeping | |
| 3313 around an lrecord of apparently correct type but bogus junk in it. */ | |
| 3314 MARK_LRECORD_AS_FREE (lheader); | |
| 428 | 3315 free_header->chain = list->free; |
|
5142
f965e31a35f0
reduce lcrecord headers to 2 words, rename printing_unreadable_object
Ben Wing <ben@xemacs.org>
parents:
5127
diff
changeset
|
3316 lheader->free = 1; |
| 428 | 3317 list->free = lcrecord; |
| 3318 } | |
| 3319 | |
| 771 | 3320 static Lisp_Object all_lcrecord_lists[countof (lrecord_implementations_table)]; |
| 3321 | |
|
5117
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
3322 Lisp_Object |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
3323 alloc_automanaged_sized_lcrecord (Bytecount size, |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
3324 const struct lrecord_implementation *imp) |
| 771 | 3325 { |
| 3326 if (EQ (all_lcrecord_lists[imp->lrecord_type_index], Qzero)) | |
| 3327 all_lcrecord_lists[imp->lrecord_type_index] = | |
| 3328 make_lcrecord_list (size, imp); | |
| 3329 | |
|
5117
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
3330 return alloc_managed_lcrecord (all_lcrecord_lists[imp->lrecord_type_index]); |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
3331 } |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
3332 |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
3333 Lisp_Object |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
3334 alloc_automanaged_lcrecord (const struct lrecord_implementation *imp) |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
3335 { |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
3336 type_checking_assert (imp->static_size > 0); |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3063
diff
changeset
|
3337 return alloc_automanaged_sized_lcrecord (imp->static_size, imp); |
| 771 | 3338 } |
| 3339 | |
| 3340 void | |
| 3024 | 3341 old_free_lcrecord (Lisp_Object rec) |
| 771 | 3342 { |
| 3343 int type = XRECORD_LHEADER (rec)->type; | |
| 3344 | |
| 3345 assert (!EQ (all_lcrecord_lists[type], Qzero)); | |
| 3346 | |
| 3347 free_managed_lcrecord (all_lcrecord_lists[type], rec); | |
| 3348 } | |
| 3263 | 3349 #endif /* not NEW_GC */ |
| 428 | 3350 |
| 3351 | |
| 3352 /************************************************************************/ | |
|
5160
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3353 /* Staticpro, MCpro */ |
| 428 | 3354 /************************************************************************/ |
| 3355 | |
| 771 | 3356 /* We want the staticpro list relocated, but not the pointers found |
| 3357 therein, because they refer to locations in the global data segment, not | |
| 3358 in the heap; we only dump heap objects. Hence we use a trivial | |
| 3359 description, as for pointerless objects. (Note that the data segment | |
| 3360 objects, which are global variables like Qfoo or Vbar, themselves are | |
| 3361 pointers to heap objects. Each needs to be described to pdump as a | |
| 3362 "root pointer"; this happens in the call to staticpro(). */ | |
| 1204 | 3363 static const struct memory_description staticpro_description_1[] = { |
| 452 | 3364 { XD_END } |
| 3365 }; | |
| 3366 | |
| 1204 | 3367 static const struct sized_memory_description staticpro_description = { |
| 452 | 3368 sizeof (Lisp_Object *), |
| 3369 staticpro_description_1 | |
| 3370 }; | |
| 3371 | |
| 1204 | 3372 static const struct memory_description staticpros_description_1[] = { |
| 452 | 3373 XD_DYNARR_DESC (Lisp_Object_ptr_dynarr, &staticpro_description), |
| 3374 { XD_END } | |
| 3375 }; | |
| 3376 | |
| 1204 | 3377 static const struct sized_memory_description staticpros_description = { |
| 452 | 3378 sizeof (Lisp_Object_ptr_dynarr), |
| 3379 staticpros_description_1 | |
| 3380 }; | |
| 3381 | |
| 771 | 3382 #ifdef DEBUG_XEMACS |
| 3383 | |
| 3384 /* Help debug crashes gc-marking a staticpro'ed object. */ | |
| 3385 | |
| 3386 Lisp_Object_ptr_dynarr *staticpros; | |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3387 const_Ascbyte_ptr_dynarr *staticpro_names; |
| 771 | 3388 |
| 3389 /* Mark the Lisp_Object at non-heap VARADDRESS as a root object for | |
| 3390 garbage collection, and for dumping. */ | |
| 3391 void | |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3392 staticpro_1 (Lisp_Object *varaddress, const Ascbyte *varname) |
| 771 | 3393 { |
| 3394 Dynarr_add (staticpros, varaddress); | |
| 3395 Dynarr_add (staticpro_names, varname); | |
| 1204 | 3396 dump_add_root_lisp_object (varaddress); |
| 771 | 3397 } |
| 3398 | |
|
5016
2ade80e8c640
enable more warnings and fix them
Ben Wing <ben@xemacs.org>
parents:
4976
diff
changeset
|
3399 const Ascbyte *staticpro_name (int count); |
|
2ade80e8c640
enable more warnings and fix them
Ben Wing <ben@xemacs.org>
parents:
4976
diff
changeset
|
3400 |
|
4934
714f7c9fabb1
make it easier to debug staticpro crashes.
Ben Wing <ben@xemacs.org>
parents:
4880
diff
changeset
|
3401 /* External debugging function: Return the name of the variable at offset |
|
714f7c9fabb1
make it easier to debug staticpro crashes.
Ben Wing <ben@xemacs.org>
parents:
4880
diff
changeset
|
3402 COUNT. */ |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3403 const Ascbyte * |
|
4934
714f7c9fabb1
make it easier to debug staticpro crashes.
Ben Wing <ben@xemacs.org>
parents:
4880
diff
changeset
|
3404 staticpro_name (int count) |
|
714f7c9fabb1
make it easier to debug staticpro crashes.
Ben Wing <ben@xemacs.org>
parents:
4880
diff
changeset
|
3405 { |
|
714f7c9fabb1
make it easier to debug staticpro crashes.
Ben Wing <ben@xemacs.org>
parents:
4880
diff
changeset
|
3406 return Dynarr_at (staticpro_names, count); |
|
714f7c9fabb1
make it easier to debug staticpro crashes.
Ben Wing <ben@xemacs.org>
parents:
4880
diff
changeset
|
3407 } |
| 771 | 3408 |
| 3409 Lisp_Object_ptr_dynarr *staticpros_nodump; | |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3410 const_Ascbyte_ptr_dynarr *staticpro_nodump_names; |
| 771 | 3411 |
| 3412 /* Mark the Lisp_Object at heap VARADDRESS as a root object for | |
| 3413 garbage collection, but not for dumping. (See below.) */ | |
| 3414 void | |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3415 staticpro_nodump_1 (Lisp_Object *varaddress, const Ascbyte *varname) |
| 771 | 3416 { |
| 3417 Dynarr_add (staticpros_nodump, varaddress); | |
| 3418 Dynarr_add (staticpro_nodump_names, varname); | |
| 3419 } | |
| 3420 | |
|
5016
2ade80e8c640
enable more warnings and fix them
Ben Wing <ben@xemacs.org>
parents:
4976
diff
changeset
|
3421 const Ascbyte *staticpro_nodump_name (int count); |
|
2ade80e8c640
enable more warnings and fix them
Ben Wing <ben@xemacs.org>
parents:
4976
diff
changeset
|
3422 |
|
4934
714f7c9fabb1
make it easier to debug staticpro crashes.
Ben Wing <ben@xemacs.org>
parents:
4880
diff
changeset
|
3423 /* External debugging function: Return the name of the variable at offset |
|
714f7c9fabb1
make it easier to debug staticpro crashes.
Ben Wing <ben@xemacs.org>
parents:
4880
diff
changeset
|
3424 COUNT. */ |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3425 const Ascbyte * |
|
4934
714f7c9fabb1
make it easier to debug staticpro crashes.
Ben Wing <ben@xemacs.org>
parents:
4880
diff
changeset
|
3426 staticpro_nodump_name (int count) |
|
714f7c9fabb1
make it easier to debug staticpro crashes.
Ben Wing <ben@xemacs.org>
parents:
4880
diff
changeset
|
3427 { |
|
714f7c9fabb1
make it easier to debug staticpro crashes.
Ben Wing <ben@xemacs.org>
parents:
4880
diff
changeset
|
3428 return Dynarr_at (staticpro_nodump_names, count); |
|
714f7c9fabb1
make it easier to debug staticpro crashes.
Ben Wing <ben@xemacs.org>
parents:
4880
diff
changeset
|
3429 } |
|
714f7c9fabb1
make it easier to debug staticpro crashes.
Ben Wing <ben@xemacs.org>
parents:
4880
diff
changeset
|
3430 |
| 996 | 3431 #ifdef HAVE_SHLIB |
| 3432 /* Stop treating the Lisp_Object at non-heap VARADDRESS as a root object | |
| 3433 for garbage collection, but not for dumping. */ | |
| 3434 void | |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3435 unstaticpro_nodump_1 (Lisp_Object *varaddress, const Ascbyte *varname) |
| 996 | 3436 { |
| 3437 Dynarr_delete_object (staticpros, varaddress); | |
| 3438 Dynarr_delete_object (staticpro_names, varname); | |
| 3439 } | |
| 3440 #endif | |
| 3441 | |
| 771 | 3442 #else /* not DEBUG_XEMACS */ |
| 3443 | |
| 452 | 3444 Lisp_Object_ptr_dynarr *staticpros; |
| 3445 | |
| 3446 /* Mark the Lisp_Object at non-heap VARADDRESS as a root object for | |
| 3447 garbage collection, and for dumping. */ | |
| 428 | 3448 void |
| 3449 staticpro (Lisp_Object *varaddress) | |
| 3450 { | |
| 452 | 3451 Dynarr_add (staticpros, varaddress); |
| 1204 | 3452 dump_add_root_lisp_object (varaddress); |
| 428 | 3453 } |
| 3454 | |
| 442 | 3455 |
| 452 | 3456 Lisp_Object_ptr_dynarr *staticpros_nodump; |
| 3457 | |
| 771 | 3458 /* Mark the Lisp_Object at heap VARADDRESS as a root object for garbage |
| 3459 collection, but not for dumping. This is used for objects where the | |
| 3460 only sure pointer is in the heap (rather than in the global data | |
| 3461 segment, as must be the case for pdump root pointers), but not inside of | |
| 3462 another Lisp object (where it will be marked as a result of that Lisp | |
| 3463 object's mark method). The call to staticpro_nodump() must occur *BOTH* | |
| 3464 at initialization time and at "reinitialization" time (startup, after | |
| 3465 pdump load.) (For example, this is the case with the predicate symbols | |
| 3466 for specifier and coding system types. The pointer to this symbol is | |
| 3467 inside of a methods structure, which is allocated on the heap. The | |
| 3468 methods structure will be written out to the pdump data file, and may be | |
| 3469 reloaded at a different address.) | |
| 3470 | |
| 3471 #### The necessity for reinitialization is a bug in pdump. Pdump should | |
| 3472 automatically regenerate the staticpro()s for these symbols when it | |
| 3473 loads the data in. */ | |
| 3474 | |
| 428 | 3475 void |
| 3476 staticpro_nodump (Lisp_Object *varaddress) | |
| 3477 { | |
| 452 | 3478 Dynarr_add (staticpros_nodump, varaddress); |
| 428 | 3479 } |
| 3480 | |
| 996 | 3481 #ifdef HAVE_SHLIB |
| 3482 /* Unmark the Lisp_Object at non-heap VARADDRESS as a root object for | |
| 3483 garbage collection, but not for dumping. */ | |
| 3484 void | |
| 3485 unstaticpro_nodump (Lisp_Object *varaddress) | |
| 3486 { | |
| 3487 Dynarr_delete_object (staticpros, varaddress); | |
| 3488 } | |
| 3489 #endif | |
| 3490 | |
| 771 | 3491 #endif /* not DEBUG_XEMACS */ |
| 3492 | |
| 3263 | 3493 #ifdef NEW_GC |
| 2720 | 3494 static const struct memory_description mcpro_description_1[] = { |
| 3495 { XD_END } | |
| 3496 }; | |
| 3497 | |
| 3498 static const struct sized_memory_description mcpro_description = { | |
| 3499 sizeof (Lisp_Object *), | |
| 3500 mcpro_description_1 | |
| 3501 }; | |
| 3502 | |
| 3503 static const struct memory_description mcpros_description_1[] = { | |
| 3504 XD_DYNARR_DESC (Lisp_Object_dynarr, &mcpro_description), | |
| 3505 { XD_END } | |
| 3506 }; | |
| 3507 | |
| 3508 static const struct sized_memory_description mcpros_description = { | |
| 3509 sizeof (Lisp_Object_dynarr), | |
| 3510 mcpros_description_1 | |
| 3511 }; | |
| 3512 | |
| 3513 #ifdef DEBUG_XEMACS | |
| 3514 | |
| 3515 /* Help debug crashes gc-marking a mcpro'ed object. */ | |
| 3516 | |
| 3517 Lisp_Object_dynarr *mcpros; | |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3518 const_Ascbyte_ptr_dynarr *mcpro_names; |
| 2720 | 3519 |
| 3520 /* Mark the Lisp_Object at non-heap VARADDRESS as a root object for | |
| 3521 garbage collection, and for dumping. */ | |
| 3522 void | |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3523 mcpro_1 (Lisp_Object varaddress, const Ascbyte *varname) |
| 2720 | 3524 { |
| 3525 Dynarr_add (mcpros, varaddress); | |
| 3526 Dynarr_add (mcpro_names, varname); | |
| 3527 } | |
| 3528 | |
| 5046 | 3529 const Ascbyte *mcpro_name (int count); |
| 3530 | |
|
4934
714f7c9fabb1
make it easier to debug staticpro crashes.
Ben Wing <ben@xemacs.org>
parents:
4880
diff
changeset
|
3531 /* External debugging function: Return the name of the variable at offset |
|
714f7c9fabb1
make it easier to debug staticpro crashes.
Ben Wing <ben@xemacs.org>
parents:
4880
diff
changeset
|
3532 COUNT. */ |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
3533 const Ascbyte * |
|
4934
714f7c9fabb1
make it easier to debug staticpro crashes.
Ben Wing <ben@xemacs.org>
parents:
4880
diff
changeset
|
3534 mcpro_name (int count) |
|
714f7c9fabb1
make it easier to debug staticpro crashes.
Ben Wing <ben@xemacs.org>
parents:
4880
diff
changeset
|
3535 { |
|
714f7c9fabb1
make it easier to debug staticpro crashes.
Ben Wing <ben@xemacs.org>
parents:
4880
diff
changeset
|
3536 return Dynarr_at (mcpro_names, count); |
|
714f7c9fabb1
make it easier to debug staticpro crashes.
Ben Wing <ben@xemacs.org>
parents:
4880
diff
changeset
|
3537 } |
|
714f7c9fabb1
make it easier to debug staticpro crashes.
Ben Wing <ben@xemacs.org>
parents:
4880
diff
changeset
|
3538 |
| 2720 | 3539 #else /* not DEBUG_XEMACS */ |
| 3540 | |
| 3541 Lisp_Object_dynarr *mcpros; | |
| 3542 | |
| 3543 /* Mark the Lisp_Object at non-heap VARADDRESS as a root object for | |
| 3544 garbage collection, and for dumping. */ | |
| 3545 void | |
| 3546 mcpro (Lisp_Object varaddress) | |
| 3547 { | |
| 3548 Dynarr_add (mcpros, varaddress); | |
| 3549 } | |
| 3550 | |
| 3551 #endif /* not DEBUG_XEMACS */ | |
| 3263 | 3552 #endif /* NEW_GC */ |
| 3553 | |
|
5167
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3554 #ifdef ALLOC_TYPE_STATS |
| 428 | 3555 |
| 3556 | |
|
5167
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3557 /************************************************************************/ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3558 /* Determining allocation overhead */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3559 /************************************************************************/ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3560 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3561 /* Attempt to determine the actual amount of space that is used for |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3562 the block allocated starting at PTR, supposedly of size "CLAIMED_SIZE". |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3563 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3564 It seems that the following holds: |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3565 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3566 1. When using the old allocator (malloc.c): |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3567 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3568 -- blocks are always allocated in chunks of powers of two. For |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3569 each block, there is an overhead of 8 bytes if rcheck is not |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3570 defined, 20 bytes if it is defined. In other words, a |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3571 one-byte allocation needs 8 bytes of overhead for a total of |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3572 9 bytes, and needs to have 16 bytes of memory chunked out for |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3573 it. |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3574 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3575 2. When using the new allocator (gmalloc.c): |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3576 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3577 -- blocks are always allocated in chunks of powers of two up |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3578 to 4096 bytes. Larger blocks are allocated in chunks of |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3579 an integral multiple of 4096 bytes. The minimum block |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3580 size is 2*sizeof (void *), or 16 bytes if SUNOS_LOCALTIME_BUG |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3581 is defined. There is no per-block overhead, but there |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3582 is an overhead of 3*sizeof (size_t) for each 4096 bytes |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3583 allocated. |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3584 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3585 3. When using the system malloc, anything goes, but they are |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3586 generally slower and more space-efficient than the GNU |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3587 allocators. One possibly reasonable assumption to make |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3588 for want of better data is that sizeof (void *), or maybe |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3589 2 * sizeof (void *), is required as overhead and that |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3590 blocks are allocated in the minimum required size except |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3591 that some minimum block size is imposed (e.g. 16 bytes). */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3592 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3593 Bytecount |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3594 malloced_storage_size (void * UNUSED (ptr), Bytecount claimed_size, |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3595 struct usage_stats *stats) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3596 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3597 Bytecount orig_claimed_size = claimed_size; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3598 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3599 #ifndef SYSTEM_MALLOC |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3600 if (claimed_size < (Bytecount) (2 * sizeof (void *))) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3601 claimed_size = 2 * sizeof (void *); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3602 # ifdef SUNOS_LOCALTIME_BUG |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3603 if (claimed_size < 16) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3604 claimed_size = 16; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3605 # endif |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3606 if (claimed_size < 4096) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3607 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3608 /* fxg: rename log->log2 to supress gcc3 shadow warning */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3609 int log2 = 1; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3610 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3611 /* compute the log base two, more or less, then use it to compute |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3612 the block size needed. */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3613 claimed_size--; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3614 /* It's big, it's heavy, it's wood! */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3615 while ((claimed_size /= 2) != 0) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3616 ++log2; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3617 claimed_size = 1; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3618 /* It's better than bad, it's good! */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3619 while (log2 > 0) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3620 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3621 claimed_size *= 2; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3622 log2--; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3623 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3624 /* We have to come up with some average about the amount of |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3625 blocks used. */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3626 if ((Bytecount) (rand () & 4095) < claimed_size) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3627 claimed_size += 3 * sizeof (void *); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3628 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3629 else |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3630 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3631 claimed_size += 4095; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3632 claimed_size &= ~4095; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3633 claimed_size += (claimed_size / 4096) * 3 * sizeof (size_t); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3634 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3635 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3636 #else |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3637 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3638 if (claimed_size < 16) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3639 claimed_size = 16; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3640 claimed_size += 2 * sizeof (void *); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3641 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3642 #endif /* system allocator */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3643 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3644 if (stats) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3645 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3646 stats->was_requested += orig_claimed_size; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3647 stats->malloc_overhead += claimed_size - orig_claimed_size; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3648 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3649 return claimed_size; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3650 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3651 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3652 #ifndef NEW_GC |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3653 static Bytecount |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3654 fixed_type_block_overhead (Bytecount size, Bytecount per_block) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3655 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3656 Bytecount overhead = 0; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3657 Bytecount storage_size = malloced_storage_size (0, per_block, 0); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3658 while (size >= per_block) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3659 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3660 size -= per_block; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3661 overhead += storage_size - per_block; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3662 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3663 if (rand () % per_block < size) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3664 overhead += storage_size - per_block; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3665 return overhead; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3666 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3667 #endif /* not NEW_GC */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3668 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3669 Bytecount |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3670 lisp_object_storage_size (Lisp_Object obj, struct usage_stats *ustats) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3671 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3672 #ifndef NEW_GC |
|
5179
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
3673 const struct lrecord_implementation *imp; |
|
5167
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3674 #endif /* not NEW_GC */ |
|
5179
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
3675 Bytecount size; |
|
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
3676 |
|
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
3677 if (!LRECORDP (obj)) |
|
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
3678 return 0; |
|
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
3679 |
|
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
3680 size = lisp_object_size (obj); |
|
5167
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3681 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3682 #ifdef NEW_GC |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3683 return mc_alloced_storage_size (size, ustats); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3684 #else |
|
5179
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
3685 imp = XRECORD_LHEADER_IMPLEMENTATION (obj); |
|
5167
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3686 if (imp->frob_block_p) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3687 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3688 Bytecount overhead = |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3689 /* #### Always using cons_block is incorrect but close; only |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3690 string_chars_block is significantly different in size, and |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3691 it won't ever be seen in this function */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3692 fixed_type_block_overhead (size, sizeof (struct cons_block)); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3693 if (ustats) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3694 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3695 ustats->was_requested += size; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3696 ustats->malloc_overhead += overhead; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3697 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3698 return size + overhead; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3699 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3700 else |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3701 return malloced_storage_size (XPNTR (obj), size, ustats); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3702 #endif |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3703 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3704 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3705 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3706 /************************************************************************/ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3707 /* Allocation Statistics: Accumulate */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3708 /************************************************************************/ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3709 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3710 #ifdef NEW_GC |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3711 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3712 void |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3713 init_lrecord_stats (void) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3714 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3715 xzero (lrecord_stats); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3716 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3717 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3718 void |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3719 inc_lrecord_stats (Bytecount size, const struct lrecord_header *h) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3720 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3721 int type_index = h->type; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3722 if (!size) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3723 size = detagged_lisp_object_size (h); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3724 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3725 lrecord_stats[type_index].instances_in_use++; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3726 lrecord_stats[type_index].bytes_in_use += size; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3727 lrecord_stats[type_index].bytes_in_use_including_overhead |
|
5158
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5157
diff
changeset
|
3728 #ifdef MEMORY_USAGE_STATS |
|
5167
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3729 += mc_alloced_storage_size (size, 0); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3730 #else /* not MEMORY_USAGE_STATS */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3731 += size; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3732 #endif /* not MEMORY_USAGE_STATS */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3733 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3734 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3735 void |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3736 dec_lrecord_stats (Bytecount size_including_overhead, |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3737 const struct lrecord_header *h) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3738 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3739 int type_index = h->type; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3740 int size = detagged_lisp_object_size (h); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3741 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3742 lrecord_stats[type_index].instances_in_use--; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3743 lrecord_stats[type_index].bytes_in_use -= size; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3744 lrecord_stats[type_index].bytes_in_use_including_overhead |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3745 -= size_including_overhead; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3746 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3747 DECREMENT_CONS_COUNTER (size); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3748 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3749 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3750 int |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3751 lrecord_stats_heap_size (void) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3752 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3753 int i; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3754 int size = 0; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3755 for (i = 0; i < countof (lrecord_implementations_table); i++) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3756 size += lrecord_stats[i].bytes_in_use; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3757 return size; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3758 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3759 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3760 #else /* not NEW_GC */ |
|
5059
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
3761 |
|
5160
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3762 static void |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3763 clear_lrecord_stats (void) |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3764 { |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3765 xzero (lrecord_stats); |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3766 gc_count_num_short_string_in_use = 0; |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3767 gc_count_string_total_size = 0; |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3768 gc_count_short_string_total_size = 0; |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3769 gc_count_long_string_storage_including_overhead = 0; |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3770 } |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3771 |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3772 /* Keep track of extra statistics for strings -- length of the string |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3773 characters for short and long strings, number of short and long strings. */ |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3774 static void |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3775 tick_string_stats (Lisp_String *p, int from_sweep) |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3776 { |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3777 Bytecount size = p->size_; |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3778 gc_count_string_total_size += size; |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3779 if (!BIG_STRING_SIZE_P (size)) |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3780 { |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3781 gc_count_short_string_total_size += size; |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3782 gc_count_num_short_string_in_use++; |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3783 } |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3784 else |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3785 gc_count_long_string_storage_including_overhead += |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3786 malloced_storage_size (p->data_, p->size_, NULL); |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3787 /* During the sweep stage, we count the total number of strings in use. |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3788 This gets those not stored in pdump storage. For pdump storage, we |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3789 need to bump the number of strings in use so as to get an accurate |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3790 count of all strings in use (pdump or not). But don't do this when |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3791 called from the sweep stage, or we will double-count. */ |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3792 if (!from_sweep) |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3793 gc_count_num_string_in_use++; |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3794 } |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3795 |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3796 /* As objects are sweeped, we record statistics about their memory usage. |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3797 Currently, all lcrecords are processed this way as well as any frob-block |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3798 objects that were saved and restored as a result of the pdump process. |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3799 (See pdump_objects_unmark().) Other frob-block objects do NOT get their |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3800 statistics noted this way -- instead, as the frob blocks are swept, |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3801 COPY_INTO_LRECORD_STATS() is called, and notes statistics about the |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3802 frob blocks. */ |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3803 |
|
5059
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
3804 void |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
3805 tick_lrecord_stats (const struct lrecord_header *h, |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
3806 enum lrecord_alloc_status status) |
| 428 | 3807 { |
| 647 | 3808 int type_index = h->type; |
|
5163
57f4dcb14ad5
Don't assume a Lisp_Object will fit in a Bytecount, src/alloc.c
Aidan Kehoe <kehoea@parhasard.net>
parents:
5160
diff
changeset
|
3809 Lisp_Object obj = wrap_pointer_1 (h); |
|
5160
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3810 Bytecount sz = lisp_object_size (obj); |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3811 Bytecount sz_with_overhead = lisp_object_storage_size (obj, NULL); |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3812 Bytecount overhead = sz_with_overhead - sz; |
|
5059
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
3813 |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
3814 switch (status) |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
3815 { |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
3816 case ALLOC_IN_USE: |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
3817 lrecord_stats[type_index].instances_in_use++; |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
3818 lrecord_stats[type_index].bytes_in_use += sz; |
|
5160
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3819 lrecord_stats[type_index].bytes_in_use_overhead += overhead; |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3820 if (STRINGP (obj)) |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3821 tick_string_stats (XSTRING (obj), 0); |
|
5158
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5157
diff
changeset
|
3822 #ifdef MEMORY_USAGE_STATS |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5157
diff
changeset
|
3823 { |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5157
diff
changeset
|
3824 struct generic_usage_stats stats; |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5157
diff
changeset
|
3825 if (HAS_OBJECT_METH_P (obj, memory_usage)) |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5157
diff
changeset
|
3826 { |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5157
diff
changeset
|
3827 int i; |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5157
diff
changeset
|
3828 int total_stats = OBJECT_PROPERTY (obj, num_extra_memusage_stats); |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5157
diff
changeset
|
3829 xzero (stats); |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5157
diff
changeset
|
3830 OBJECT_METH (obj, memory_usage, (obj, &stats)); |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5157
diff
changeset
|
3831 for (i = 0; i < total_stats; i++) |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5157
diff
changeset
|
3832 lrecord_stats[type_index].stats.othervals[i] += |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5157
diff
changeset
|
3833 stats.othervals[i]; |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5157
diff
changeset
|
3834 } |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5157
diff
changeset
|
3835 } |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5157
diff
changeset
|
3836 #endif |
|
5059
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
3837 break; |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
3838 case ALLOC_FREE: |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
3839 lrecord_stats[type_index].instances_freed++; |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
3840 lrecord_stats[type_index].bytes_freed += sz; |
|
5160
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3841 lrecord_stats[type_index].bytes_freed_overhead += overhead; |
|
5059
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
3842 break; |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
3843 case ALLOC_ON_FREE_LIST: |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
3844 lrecord_stats[type_index].instances_on_free_list++; |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
3845 lrecord_stats[type_index].bytes_on_free_list += sz; |
|
5160
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3846 lrecord_stats[type_index].bytes_on_free_list_overhead += overhead; |
|
5059
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
3847 break; |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
3848 default: |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
3849 ABORT (); |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
3850 } |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
3851 } |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
3852 |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
3853 inline static void |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
3854 tick_lcrecord_stats (const struct lrecord_header *h, int free_p) |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
3855 { |
|
5142
f965e31a35f0
reduce lcrecord headers to 2 words, rename printing_unreadable_object
Ben Wing <ben@xemacs.org>
parents:
5127
diff
changeset
|
3856 if (h->free) |
| 428 | 3857 { |
| 442 | 3858 gc_checking_assert (!free_p); |
|
5059
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
3859 tick_lrecord_stats (h, ALLOC_ON_FREE_LIST); |
| 428 | 3860 } |
| 3861 else | |
|
5059
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
3862 tick_lrecord_stats (h, free_p ? ALLOC_FREE : ALLOC_IN_USE); |
| 428 | 3863 } |
|
5160
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
3864 |
|
5167
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3865 #endif /* (not) NEW_GC */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3866 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3867 void |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3868 finish_object_memory_usage_stats (void) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3869 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3870 /* Here we add up the aggregate values for each statistic, previously |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3871 computed during tick_lrecord_stats(), to get a single combined value |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3872 of non-Lisp memory usage for all objects of each type. We can't |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3873 do this if NEW_GC because nothing like tick_lrecord_stats() gets |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3874 called -- instead, statistics are computed when objects are allocated, |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3875 which is too early to be calling the memory_usage() method. */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3876 #if defined (MEMORY_USAGE_STATS) && !defined (NEW_GC) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3877 int i; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3878 for (i = 0; i < countof (lrecord_implementations_table); i++) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3879 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3880 struct lrecord_implementation *imp = lrecord_implementations_table[i]; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3881 if (imp && imp->num_extra_nonlisp_memusage_stats) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3882 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3883 int j; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3884 for (j = 0; j < imp->num_extra_nonlisp_memusage_stats; j++) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3885 lrecord_stats[i].nonlisp_bytes_in_use += |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3886 lrecord_stats[i].stats.othervals[j]; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3887 } |
|
5170
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
3888 if (imp && imp->num_extra_lisp_ancillary_memusage_stats) |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
3889 { |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
3890 int j; |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
3891 for (j = 0; j < imp->num_extra_lisp_ancillary_memusage_stats; j++) |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
3892 lrecord_stats[i].lisp_ancillary_bytes_in_use += |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
3893 lrecord_stats[i].stats.othervals |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
3894 [j + imp->offset_lisp_ancillary_memusage_stats]; |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
3895 } |
|
5167
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3896 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3897 #endif /* defined (MEMORY_USAGE_STATS) && !defined (NEW_GC) */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3898 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3899 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3900 #define COUNT_FROB_BLOCK_USAGE(type) \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3901 EMACS_INT s = 0; \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3902 EMACS_INT s_overhead = 0; \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3903 struct type##_block *x = current_##type##_block; \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3904 while (x) { s += sizeof (*x) + MALLOC_OVERHEAD; x = x->prev; } \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3905 s_overhead = fixed_type_block_overhead (s, sizeof (struct type##_block)); \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3906 DO_NOTHING |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3907 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3908 #define COPY_INTO_LRECORD_STATS(type) \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3909 do { \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3910 COUNT_FROB_BLOCK_USAGE (type); \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3911 lrecord_stats[lrecord_type_##type].bytes_in_use += s; \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3912 lrecord_stats[lrecord_type_##type].bytes_in_use_overhead += \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3913 s_overhead; \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3914 lrecord_stats[lrecord_type_##type].instances_on_free_list += \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3915 gc_count_num_##type##_freelist; \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3916 lrecord_stats[lrecord_type_##type].instances_in_use += \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3917 gc_count_num_##type##_in_use; \ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3918 } while (0) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3919 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3920 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3921 /************************************************************************/ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3922 /* Allocation statistics: format nicely */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3923 /************************************************************************/ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3924 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3925 static Lisp_Object |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3926 gc_plist_hack (const Ascbyte *name, EMACS_INT value, Lisp_Object tail) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3927 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3928 /* C doesn't have local functions (or closures, or GC, or readable syntax, |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3929 or portable numeric datatypes, or bit-vectors, or characters, or |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3930 arrays, or exceptions, or ...) */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3931 return cons3 (intern (name), make_int (value), tail); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3932 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3933 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3934 /* Pluralize a lowercase English word stored in BUF, assuming BUF has |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3935 enough space to hold the extra letters (at most 2). */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3936 static void |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3937 pluralize_word (Ascbyte *buf) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3938 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3939 Bytecount len = strlen (buf); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3940 int upper = 0; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3941 Ascbyte d, e; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3942 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3943 if (len == 0 || len == 1) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3944 goto pluralize_apostrophe_s; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3945 e = buf[len - 1]; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3946 d = buf[len - 2]; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3947 upper = isupper (e); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3948 e = tolower (e); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3949 d = tolower (d); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3950 if (e == 'y') |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3951 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3952 switch (d) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3953 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3954 case 'a': |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3955 case 'e': |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3956 case 'i': |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3957 case 'o': |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3958 case 'u': |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3959 goto pluralize_s; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3960 default: |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3961 buf[len - 1] = (upper ? 'I' : 'i'); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3962 goto pluralize_es; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3963 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3964 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3965 else if (e == 's' || e == 'x' || (e == 'h' && (d == 's' || d == 'c'))) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3966 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3967 pluralize_es: |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3968 buf[len++] = (upper ? 'E' : 'e'); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3969 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3970 pluralize_s: |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3971 buf[len++] = (upper ? 'S' : 's'); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3972 buf[len] = '\0'; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3973 return; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3974 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3975 pluralize_apostrophe_s: |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3976 buf[len++] = '\''; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3977 goto pluralize_s; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3978 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3979 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3980 static void |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3981 pluralize_and_append (Ascbyte *buf, const Ascbyte *name, const Ascbyte *suffix) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3982 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3983 strcpy (buf, name); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3984 pluralize_word (buf); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3985 strcat (buf, suffix); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3986 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3987 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3988 static Lisp_Object |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3989 object_memory_usage_stats (int set_total_gc_usage) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3990 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3991 Lisp_Object pl = Qnil; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3992 int i; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3993 EMACS_INT tgu_val = 0; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3994 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3995 #ifdef NEW_GC |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3996 for (i = 0; i < countof (lrecord_implementations_table); i++) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3997 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3998 if (lrecord_stats[i].instances_in_use != 0) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
3999 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4000 Ascbyte buf[255]; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4001 const Ascbyte *name = lrecord_implementations_table[i]->name; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4002 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4003 if (lrecord_stats[i].bytes_in_use_including_overhead != |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4004 lrecord_stats[i].bytes_in_use) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4005 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4006 sprintf (buf, "%s-storage-including-overhead", name); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4007 pl = gc_plist_hack (buf, |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4008 lrecord_stats[i] |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4009 .bytes_in_use_including_overhead, |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4010 pl); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4011 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4012 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4013 sprintf (buf, "%s-storage", name); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4014 pl = gc_plist_hack (buf, |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4015 lrecord_stats[i].bytes_in_use, |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4016 pl); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4017 tgu_val += lrecord_stats[i].bytes_in_use_including_overhead; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4018 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4019 pluralize_and_append (buf, name, "-used"); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4020 pl = gc_plist_hack (buf, lrecord_stats[i].instances_in_use, pl); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4021 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4022 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4023 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4024 #else /* not NEW_GC */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4025 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4026 for (i = 0; i < lrecord_type_count; i++) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4027 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4028 if (lrecord_stats[i].bytes_in_use != 0 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4029 || lrecord_stats[i].bytes_freed != 0 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4030 || lrecord_stats[i].instances_on_free_list != 0) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4031 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4032 Ascbyte buf[255]; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4033 const Ascbyte *name = lrecord_implementations_table[i]->name; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4034 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4035 sprintf (buf, "%s-storage-overhead", name); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4036 pl = gc_plist_hack (buf, lrecord_stats[i].bytes_in_use_overhead, pl); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4037 tgu_val += lrecord_stats[i].bytes_in_use_overhead; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4038 sprintf (buf, "%s-storage", name); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4039 pl = gc_plist_hack (buf, lrecord_stats[i].bytes_in_use, pl); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4040 tgu_val += lrecord_stats[i].bytes_in_use; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4041 #ifdef MEMORY_USAGE_STATS |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4042 if (lrecord_stats[i].nonlisp_bytes_in_use) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4043 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4044 sprintf (buf, "%s-non-lisp-storage", name); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4045 pl = gc_plist_hack (buf, lrecord_stats[i].nonlisp_bytes_in_use, |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4046 pl); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4047 tgu_val += lrecord_stats[i].nonlisp_bytes_in_use; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4048 } |
|
5170
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4049 if (lrecord_stats[i].lisp_ancillary_bytes_in_use) |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4050 { |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4051 sprintf (buf, "%s-lisp-ancillary-storage", name); |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4052 pl = gc_plist_hack (buf, lrecord_stats[i]. |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4053 lisp_ancillary_bytes_in_use, |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4054 pl); |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4055 tgu_val += lrecord_stats[i].lisp_ancillary_bytes_in_use; |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4056 } |
|
5167
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4057 #endif /* MEMORY_USAGE_STATS */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4058 pluralize_and_append (buf, name, "-freed"); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4059 if (lrecord_stats[i].instances_freed != 0) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4060 pl = gc_plist_hack (buf, lrecord_stats[i].instances_freed, pl); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4061 pluralize_and_append (buf, name, "-on-free-list"); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4062 if (lrecord_stats[i].instances_on_free_list != 0) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4063 pl = gc_plist_hack (buf, lrecord_stats[i].instances_on_free_list, |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4064 pl); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4065 pluralize_and_append (buf, name, "-used"); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4066 pl = gc_plist_hack (buf, lrecord_stats[i].instances_in_use, pl); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4067 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4068 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4069 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4070 pl = gc_plist_hack ("long-string-chars-storage-overhead", |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4071 gc_count_long_string_storage_including_overhead - |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4072 (gc_count_string_total_size |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4073 - gc_count_short_string_total_size), pl); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4074 pl = gc_plist_hack ("long-string-chars-storage", |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4075 gc_count_string_total_size |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4076 - gc_count_short_string_total_size, pl); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4077 do |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4078 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4079 COUNT_FROB_BLOCK_USAGE (string_chars); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4080 tgu_val += s + s_overhead; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4081 pl = gc_plist_hack ("short-string-chars-storage-overhead", s_overhead, pl); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4082 pl = gc_plist_hack ("short-string-chars-storage", s, pl); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4083 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4084 while (0); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4085 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4086 pl = gc_plist_hack ("long-strings-total-length", |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4087 gc_count_string_total_size |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4088 - gc_count_short_string_total_size, pl); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4089 pl = gc_plist_hack ("short-strings-total-length", |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4090 gc_count_short_string_total_size, pl); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4091 pl = gc_plist_hack ("long-strings-used", |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4092 gc_count_num_string_in_use |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4093 - gc_count_num_short_string_in_use, pl); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4094 pl = gc_plist_hack ("short-strings-used", |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4095 gc_count_num_short_string_in_use, pl); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4096 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4097 #endif /* NEW_GC */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4098 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4099 if (set_total_gc_usage) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4100 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4101 total_gc_usage = tgu_val; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4102 total_gc_usage_set = 1; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4103 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4104 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4105 return pl; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4106 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4107 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4108 static Lisp_Object |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4109 garbage_collection_statistics (void) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4110 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4111 /* The things we do for backwards-compatibility */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4112 #ifdef NEW_GC |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4113 return |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4114 list6 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4115 (Fcons (make_int (lrecord_stats[lrecord_type_cons].instances_in_use), |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4116 make_int (lrecord_stats[lrecord_type_cons] |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4117 .bytes_in_use_including_overhead)), |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4118 Fcons (make_int (lrecord_stats[lrecord_type_symbol].instances_in_use), |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4119 make_int (lrecord_stats[lrecord_type_symbol] |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4120 .bytes_in_use_including_overhead)), |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4121 Fcons (make_int (lrecord_stats[lrecord_type_marker].instances_in_use), |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4122 make_int (lrecord_stats[lrecord_type_marker] |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4123 .bytes_in_use_including_overhead)), |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4124 make_int (lrecord_stats[lrecord_type_string] |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4125 .bytes_in_use_including_overhead), |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4126 make_int (lrecord_stats[lrecord_type_vector] |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4127 .bytes_in_use_including_overhead), |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4128 object_memory_usage_stats (1)); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4129 #else /* not NEW_GC */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4130 return |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4131 list6 (Fcons (make_int (gc_count_num_cons_in_use), |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4132 make_int (gc_count_num_cons_freelist)), |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4133 Fcons (make_int (gc_count_num_symbol_in_use), |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4134 make_int (gc_count_num_symbol_freelist)), |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4135 Fcons (make_int (gc_count_num_marker_in_use), |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4136 make_int (gc_count_num_marker_freelist)), |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4137 make_int (gc_count_string_total_size), |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4138 make_int (lrecord_stats[lrecord_type_vector].bytes_in_use + |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4139 lrecord_stats[lrecord_type_vector].bytes_freed + |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4140 lrecord_stats[lrecord_type_vector].bytes_on_free_list), |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4141 object_memory_usage_stats (1)); |
| 3263 | 4142 #endif /* not NEW_GC */ |
|
5167
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4143 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4144 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4145 DEFUN ("object-memory-usage-stats", Fobject_memory_usage_stats, 0, 0, 0, /* |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4146 Return statistics about memory usage of Lisp objects. |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4147 */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4148 ()) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4149 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4150 return object_memory_usage_stats (0); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4151 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4152 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4153 #endif /* ALLOC_TYPE_STATS */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4154 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4155 #ifdef MEMORY_USAGE_STATS |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4156 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4157 DEFUN ("object-memory-usage", Fobject_memory_usage, 1, 1, 0, /* |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4158 Return stats about the memory usage of OBJECT. |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4159 The values returned are in the form of an alist of usage types and byte |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4160 counts. The byte counts attempt to encompass all the memory used |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4161 by the object (separate from the memory logically associated with any |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4162 other object), including internal structures and any malloc() |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4163 overhead associated with them. In practice, the byte counts are |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4164 underestimated because certain memory usage is very hard to determine |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4165 \(e.g. the amount of memory used inside the Xt library or inside the |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4166 X server). |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4167 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4168 Multiple slices of the total memory usage may be returned, separated |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4169 by a nil. Each slice represents a particular view of the memory, a |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4170 particular way of partitioning it into groups. Within a slice, there |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4171 is no overlap between the groups of memory, and each slice collectively |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4172 represents all the memory concerned. The rightmost slice typically |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4173 represents the total memory used plus malloc and dynarr overhead. |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4174 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4175 Slices describing other Lisp objects logically associated with the |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4176 object may be included, separated from other slices by `t' and from |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4177 each other by nil if there is more than one. |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4178 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4179 #### We have to figure out how to handle the memory used by the object |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4180 itself vs. the memory used by substructures. Probably the memory_usage |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4181 method should return info only about substructures and related Lisp |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4182 objects, since the caller can always find and all info about the object |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4183 itself. |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4184 */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4185 (object)) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4186 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4187 struct generic_usage_stats gustats; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4188 struct usage_stats object_stats; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4189 int i; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4190 Lisp_Object val = Qnil; |
|
5170
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4191 Lisp_Object stats_list; |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4192 |
|
5179
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
4193 if (!LRECORDP (object)) |
|
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
4194 invalid_argument |
|
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
4195 ("No memory associated with immediate objects (int or char)", object); |
|
5170
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4196 |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4197 stats_list = OBJECT_PROPERTY (object, memusage_stats_list); |
|
5167
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4198 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4199 xzero (object_stats); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4200 lisp_object_storage_size (object, &object_stats); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4201 |
|
5354
22c4e67a2e69
Remove #'acons from cl.el, make the version in alloc.c visible to Lisp
Aidan Kehoe <kehoea@parhasard.net>
parents:
5307
diff
changeset
|
4202 val = Facons (Qobject_actually_requested, |
|
22c4e67a2e69
Remove #'acons from cl.el, make the version in alloc.c visible to Lisp
Aidan Kehoe <kehoea@parhasard.net>
parents:
5307
diff
changeset
|
4203 make_int (object_stats.was_requested), val); |
|
22c4e67a2e69
Remove #'acons from cl.el, make the version in alloc.c visible to Lisp
Aidan Kehoe <kehoea@parhasard.net>
parents:
5307
diff
changeset
|
4204 val = Facons (Qobject_malloc_overhead, |
|
22c4e67a2e69
Remove #'acons from cl.el, make the version in alloc.c visible to Lisp
Aidan Kehoe <kehoea@parhasard.net>
parents:
5307
diff
changeset
|
4205 make_int (object_stats.malloc_overhead), val); |
|
5167
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4206 assert (!object_stats.dynarr_overhead); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4207 assert (!object_stats.gap_overhead); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4208 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4209 if (!NILP (stats_list)) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4210 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4211 xzero (gustats); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4212 MAYBE_OBJECT_METH (object, memory_usage, (object, &gustats)); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4213 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4214 val = Fcons (Qt, val); |
|
5354
22c4e67a2e69
Remove #'acons from cl.el, make the version in alloc.c visible to Lisp
Aidan Kehoe <kehoea@parhasard.net>
parents:
5307
diff
changeset
|
4215 val = Facons (Qother_memory_actually_requested, |
|
22c4e67a2e69
Remove #'acons from cl.el, make the version in alloc.c visible to Lisp
Aidan Kehoe <kehoea@parhasard.net>
parents:
5307
diff
changeset
|
4216 make_int (gustats.u.was_requested), val); |
|
22c4e67a2e69
Remove #'acons from cl.el, make the version in alloc.c visible to Lisp
Aidan Kehoe <kehoea@parhasard.net>
parents:
5307
diff
changeset
|
4217 val = Facons (Qother_memory_malloc_overhead, |
|
22c4e67a2e69
Remove #'acons from cl.el, make the version in alloc.c visible to Lisp
Aidan Kehoe <kehoea@parhasard.net>
parents:
5307
diff
changeset
|
4218 make_int (gustats.u.malloc_overhead), val); |
|
5167
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4219 if (gustats.u.dynarr_overhead) |
|
5354
22c4e67a2e69
Remove #'acons from cl.el, make the version in alloc.c visible to Lisp
Aidan Kehoe <kehoea@parhasard.net>
parents:
5307
diff
changeset
|
4220 val = Facons (Qother_memory_dynarr_overhead, |
|
22c4e67a2e69
Remove #'acons from cl.el, make the version in alloc.c visible to Lisp
Aidan Kehoe <kehoea@parhasard.net>
parents:
5307
diff
changeset
|
4221 make_int (gustats.u.dynarr_overhead), val); |
|
5167
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4222 if (gustats.u.gap_overhead) |
|
5354
22c4e67a2e69
Remove #'acons from cl.el, make the version in alloc.c visible to Lisp
Aidan Kehoe <kehoea@parhasard.net>
parents:
5307
diff
changeset
|
4223 val = Facons (Qother_memory_gap_overhead, |
|
22c4e67a2e69
Remove #'acons from cl.el, make the version in alloc.c visible to Lisp
Aidan Kehoe <kehoea@parhasard.net>
parents:
5307
diff
changeset
|
4224 make_int (gustats.u.gap_overhead), val); |
|
5167
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4225 val = Fcons (Qnil, val); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4226 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4227 i = 0; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4228 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4229 LIST_LOOP_2 (item, stats_list) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4230 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4231 if (NILP (item) || EQ (item, Qt)) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4232 val = Fcons (item, val); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4233 else |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4234 { |
|
5354
22c4e67a2e69
Remove #'acons from cl.el, make the version in alloc.c visible to Lisp
Aidan Kehoe <kehoea@parhasard.net>
parents:
5307
diff
changeset
|
4235 val = Facons (item, make_int (gustats.othervals[i]), val); |
|
5167
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4236 i++; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4237 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4238 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4239 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4240 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4241 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4242 return Fnreverse (val); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4243 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4244 |
|
5170
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4245 /* Compute total memory usage associated with an object, including |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4246 |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4247 (a) Storage (including overhead) allocated to the object itself |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4248 (b) Storage (including overhead) for ancillary non-Lisp structures attached |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4249 to the object |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4250 (c) Storage (including overhead) for ancillary Lisp objects attached |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4251 to the object |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4252 |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4253 Store the three types of memory into the return values provided they |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4254 aren't NULL, and return a sum of the three values. Also store the |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4255 structure of individual statistics into STATS if non-zero. |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4256 |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4257 Note that the value for type (c) is the sum of all three types of |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4258 memory associated with the ancillary Lisp objects. |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4259 */ |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4260 |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4261 Bytecount |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4262 lisp_object_memory_usage_full (Lisp_Object object, Bytecount *storage_size, |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4263 Bytecount *extra_nonlisp_storage, |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4264 Bytecount *extra_lisp_ancillary_storage, |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4265 struct generic_usage_stats *stats) |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4266 { |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4267 Bytecount total; |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4268 |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4269 total = lisp_object_storage_size (object, NULL); |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4270 if (storage_size) |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4271 *storage_size = total; |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4272 |
|
5179
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
4273 if (LRECORDP (object) && HAS_OBJECT_METH_P (object, memory_usage)) |
|
5170
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4274 { |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4275 int i; |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4276 struct generic_usage_stats gustats; |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4277 Bytecount sum; |
|
5179
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
4278 struct lrecord_implementation *imp = |
|
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
4279 XRECORD_LHEADER_IMPLEMENTATION (object); |
|
5170
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4280 |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4281 xzero (gustats); |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4282 OBJECT_METH (object, memory_usage, (object, &gustats)); |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4283 |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4284 if (stats) |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4285 *stats = gustats; |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4286 |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4287 sum = 0; |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4288 for (i = 0; i < imp->num_extra_nonlisp_memusage_stats; i++) |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4289 sum += gustats.othervals[i]; |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4290 total += sum; |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4291 if (extra_nonlisp_storage) |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4292 *extra_nonlisp_storage = sum; |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4293 |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4294 sum = 0; |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4295 for (i = 0; i < imp->num_extra_lisp_ancillary_memusage_stats; i++) |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4296 sum += gustats.othervals[imp->offset_lisp_ancillary_memusage_stats + |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4297 i]; |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4298 total += sum; |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4299 if (extra_lisp_ancillary_storage) |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4300 *extra_lisp_ancillary_storage = sum; |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4301 } |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4302 else |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4303 { |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4304 if (extra_nonlisp_storage) |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4305 *extra_nonlisp_storage = 0; |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4306 if (extra_lisp_ancillary_storage) |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4307 *extra_lisp_ancillary_storage = 0; |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4308 } |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4309 |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4310 return total; |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4311 } |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4312 |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4313 |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4314 Bytecount |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4315 lisp_object_memory_usage (Lisp_Object object) |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4316 { |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4317 return lisp_object_memory_usage_full (object, NULL, NULL, NULL, NULL); |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4318 } |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4319 |
|
5179
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
4320 static Bytecount |
|
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
4321 tree_memory_usage_1 (Lisp_Object arg, int vectorp, int depth) |
|
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
4322 { |
|
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
4323 Bytecount total = 0; |
|
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
4324 |
|
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
4325 if (depth > 200) |
|
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
4326 return total; |
|
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
4327 |
|
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
4328 if (CONSP (arg)) |
|
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
4329 { |
|
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
4330 SAFE_LIST_LOOP_3 (elt, arg, tail) |
|
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
4331 { |
|
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
4332 total += lisp_object_memory_usage (tail); |
|
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
4333 if (CONSP (elt) || VECTORP (elt)) |
|
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
4334 total += tree_memory_usage_1 (elt, vectorp, depth + 1); |
|
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
4335 if (VECTORP (XCDR (tail))) /* hack for (a b . [c d]) */ |
|
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
4336 total += tree_memory_usage_1 (XCDR (tail), vectorp, depth +1); |
|
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
4337 } |
|
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
4338 } |
|
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
4339 else if (VECTORP (arg) && vectorp) |
|
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
4340 { |
|
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
4341 int i = XVECTOR_LENGTH (arg); |
|
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
4342 int j; |
|
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
4343 total += lisp_object_memory_usage (arg); |
|
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
4344 for (j = 0; j < i; j++) |
|
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
4345 { |
|
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
4346 Lisp_Object elt = XVECTOR_DATA (arg) [j]; |
|
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
4347 if (CONSP (elt) || VECTORP (elt)) |
|
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
4348 total += tree_memory_usage_1 (elt, vectorp, depth + 1); |
|
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
4349 } |
|
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
4350 } |
|
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
4351 return total; |
|
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
4352 } |
|
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
4353 |
|
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
4354 Bytecount |
|
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
4355 tree_memory_usage (Lisp_Object arg, int vectorp) |
|
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
4356 { |
|
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
4357 return tree_memory_usage_1 (arg, vectorp, 0); |
|
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
4358 } |
|
14fda1dbdb26
add memory usage info for specifiers
Ben Wing <ben@xemacs.org>
parents:
5172
diff
changeset
|
4359 |
|
5167
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4360 #endif /* MEMORY_USAGE_STATS */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4361 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4362 #ifdef ALLOC_TYPE_STATS |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4363 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4364 DEFUN ("total-object-memory-usage", Ftotal_object_memory_usage, 0, 0, 0, /* |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4365 Return total number of bytes used for object storage in XEmacs. |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4366 This may be helpful in debugging XEmacs's memory usage. |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4367 See also `consing-since-gc' and `object-memory-usage-stats'. |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4368 */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4369 ()) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4370 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4371 return make_int (total_gc_usage + consing_since_gc); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4372 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4373 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4374 #endif /* ALLOC_TYPE_STATS */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4375 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4376 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4377 /************************************************************************/ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4378 /* Allocation statistics: Initialization */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4379 /************************************************************************/ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4380 #ifdef MEMORY_USAGE_STATS |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4381 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4382 /* Compute the number of extra memory-usage statistics associated with an |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4383 object. We can't compute this at the time INIT_LISP_OBJECT() is called |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4384 because the value of the `memusage_stats_list' property is generally |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4385 set afterwards. So we compute the values for all types of objects |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4386 after all objects have been initialized. */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4387 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4388 static void |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4389 compute_memusage_stats_length (void) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4390 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4391 int i; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4392 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4393 for (i = 0; i < countof (lrecord_implementations_table); i++) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4394 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4395 struct lrecord_implementation *imp = lrecord_implementations_table[i]; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4396 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4397 if (!imp) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4398 continue; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4399 /* For some of the early objects, Qnil was not yet initialized at |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4400 the time of object initialization, so it came up as Qnull_pointer. |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4401 Fix that now. */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4402 if (EQ (imp->memusage_stats_list, Qnull_pointer)) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4403 imp->memusage_stats_list = Qnil; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4404 { |
|
5170
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4405 Elemcount len = 0; |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4406 Elemcount nonlisp_len = 0; |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4407 Elemcount lisp_len = 0; |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4408 Elemcount lisp_offset = 0; |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4409 int group_num = 0; |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4410 int slice_num = 0; |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4411 |
|
5167
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4412 LIST_LOOP_2 (item, imp->memusage_stats_list) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4413 { |
|
5170
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4414 if (EQ (item, Qt)) |
|
5167
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4415 { |
|
5170
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4416 group_num++; |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4417 if (group_num == 1) |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4418 lisp_offset = len; |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4419 slice_num = 0; |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4420 } |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4421 else if (EQ (item, Qnil)) |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4422 { |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4423 slice_num++; |
|
5167
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4424 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4425 else |
|
5170
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4426 { |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4427 if (slice_num == 0) |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4428 { |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4429 if (group_num == 0) |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4430 nonlisp_len++; |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4431 else if (group_num == 1) |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4432 lisp_len++; |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4433 } |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4434 len++; |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4435 } |
|
5167
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4436 } |
|
5170
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4437 |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4438 imp->num_extra_memusage_stats = len; |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4439 imp->num_extra_nonlisp_memusage_stats = nonlisp_len; |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4440 imp->num_extra_lisp_ancillary_memusage_stats = lisp_len; |
|
5ddbab03b0e6
various fixes to memory-usage stats
Ben Wing <ben@xemacs.org>
parents:
5167
diff
changeset
|
4441 imp->offset_lisp_ancillary_memusage_stats = lisp_offset; |
|
5167
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4442 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4443 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4444 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4445 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
4446 #endif /* MEMORY_USAGE_STATS */ |
| 428 | 4447 |
| 4448 | |
|
5160
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
4449 /************************************************************************/ |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
4450 /* Garbage Collection -- Sweep/Compact */ |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
4451 /************************************************************************/ |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
4452 |
| 3263 | 4453 #ifndef NEW_GC |
| 428 | 4454 /* Free all unmarked records */ |
| 4455 static void | |
| 3024 | 4456 sweep_lcrecords_1 (struct old_lcrecord_header **prev, int *used) |
| 4457 { | |
| 4458 struct old_lcrecord_header *header; | |
| 428 | 4459 int num_used = 0; |
| 4460 /* int total_size = 0; */ | |
| 4461 | |
| 4462 /* First go through and call all the finalize methods. | |
| 4463 Then go through and free the objects. There used to | |
| 4464 be only one loop here, with the call to the finalizer | |
| 4465 occurring directly before the xfree() below. That | |
| 4466 is marginally faster but much less safe -- if the | |
| 4467 finalize method for an object needs to reference any | |
| 4468 other objects contained within it (and many do), | |
| 4469 we could easily be screwed by having already freed that | |
| 4470 other object. */ | |
| 4471 | |
| 4472 for (header = *prev; header; header = header->next) | |
| 4473 { | |
| 4474 struct lrecord_header *h = &(header->lheader); | |
| 442 | 4475 |
| 4476 GC_CHECK_LHEADER_INVARIANTS (h); | |
| 4477 | |
|
5142
f965e31a35f0
reduce lcrecord headers to 2 words, rename printing_unreadable_object
Ben Wing <ben@xemacs.org>
parents:
5127
diff
changeset
|
4478 if (! MARKED_RECORD_HEADER_P (h) && !h->free) |
| 428 | 4479 { |
| 4480 if (LHEADER_IMPLEMENTATION (h)->finalizer) | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
4481 LHEADER_IMPLEMENTATION (h)->finalizer (wrap_pointer_1 (h)); |
| 428 | 4482 } |
| 4483 } | |
| 4484 | |
| 4485 for (header = *prev; header; ) | |
| 4486 { | |
| 4487 struct lrecord_header *h = &(header->lheader); | |
| 442 | 4488 if (MARKED_RECORD_HEADER_P (h)) |
| 428 | 4489 { |
| 442 | 4490 if (! C_READONLY_RECORD_HEADER_P (h)) |
| 428 | 4491 UNMARK_RECORD_HEADER (h); |
| 4492 num_used++; | |
| 4493 /* total_size += n->implementation->size_in_bytes (h);*/ | |
| 440 | 4494 /* #### May modify header->next on a C_READONLY lcrecord */ |
| 428 | 4495 prev = &(header->next); |
| 4496 header = *prev; | |
| 4497 tick_lcrecord_stats (h, 0); | |
| 4498 } | |
| 4499 else | |
| 4500 { | |
| 3024 | 4501 struct old_lcrecord_header *next = header->next; |
| 428 | 4502 *prev = next; |
| 4503 tick_lcrecord_stats (h, 1); | |
| 4504 /* used to call finalizer right here. */ | |
|
4976
16112448d484
Rename xfree(FOO, TYPE) -> xfree(FOO)
Ben Wing <ben@xemacs.org>
parents:
4969
diff
changeset
|
4505 xfree (header); |
| 428 | 4506 header = next; |
| 4507 } | |
| 4508 } | |
| 4509 *used = num_used; | |
| 4510 /* *total = total_size; */ | |
| 4511 } | |
| 4512 | |
| 4513 /* And the Lord said: Thou shalt use the `c-backslash-region' command | |
| 4514 to make macros prettier. */ | |
| 4515 | |
| 4516 #ifdef ERROR_CHECK_GC | |
| 4517 | |
| 771 | 4518 #define SWEEP_FIXED_TYPE_BLOCK_1(typename, obj_type, lheader) \ |
| 428 | 4519 do { \ |
| 4520 struct typename##_block *SFTB_current; \ | |
| 4521 int SFTB_limit; \ | |
| 4522 int num_free = 0, num_used = 0; \ | |
| 4523 \ | |
| 444 | 4524 for (SFTB_current = current_##typename##_block, \ |
| 428 | 4525 SFTB_limit = current_##typename##_block_index; \ |
| 4526 SFTB_current; \ | |
| 4527 ) \ | |
| 4528 { \ | |
| 4529 int SFTB_iii; \ | |
| 4530 \ | |
| 4531 for (SFTB_iii = 0; SFTB_iii < SFTB_limit; SFTB_iii++) \ | |
| 4532 { \ | |
| 4533 obj_type *SFTB_victim = &(SFTB_current->block[SFTB_iii]); \ | |
| 4534 \ | |
| 454 | 4535 if (LRECORD_FREE_P (SFTB_victim)) \ |
| 428 | 4536 { \ |
| 4537 num_free++; \ | |
| 4538 } \ | |
| 4539 else if (C_READONLY_RECORD_HEADER_P (&SFTB_victim->lheader)) \ | |
| 4540 { \ | |
| 4541 num_used++; \ | |
| 4542 } \ | |
| 442 | 4543 else if (! MARKED_RECORD_HEADER_P (&SFTB_victim->lheader)) \ |
| 428 | 4544 { \ |
| 4545 num_free++; \ | |
| 4546 FREE_FIXED_TYPE (typename, obj_type, SFTB_victim); \ | |
| 4547 } \ | |
| 4548 else \ | |
| 4549 { \ | |
| 4550 num_used++; \ | |
| 4551 UNMARK_##typename (SFTB_victim); \ | |
| 4552 } \ | |
| 4553 } \ | |
| 4554 SFTB_current = SFTB_current->prev; \ | |
| 4555 SFTB_limit = countof (current_##typename##_block->block); \ | |
| 4556 } \ | |
| 4557 \ | |
| 4558 gc_count_num_##typename##_in_use = num_used; \ | |
| 4559 gc_count_num_##typename##_freelist = num_free; \ | |
|
5059
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4560 COPY_INTO_LRECORD_STATS (typename); \ |
| 428 | 4561 } while (0) |
| 4562 | |
| 4563 #else /* !ERROR_CHECK_GC */ | |
| 4564 | |
|
5059
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4565 #define SWEEP_FIXED_TYPE_BLOCK_1(typename, obj_type, lheader) \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4566 do { \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4567 struct typename##_block *SFTB_current; \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4568 struct typename##_block **SFTB_prev; \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4569 int SFTB_limit; \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4570 int num_free = 0, num_used = 0; \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4571 \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4572 typename##_free_list = 0; \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4573 \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4574 for (SFTB_prev = ¤t_##typename##_block, \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4575 SFTB_current = current_##typename##_block, \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4576 SFTB_limit = current_##typename##_block_index; \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4577 SFTB_current; \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4578 ) \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4579 { \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4580 int SFTB_iii; \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4581 int SFTB_empty = 1; \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4582 Lisp_Free *SFTB_old_free_list = typename##_free_list; \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4583 \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4584 for (SFTB_iii = 0; SFTB_iii < SFTB_limit; SFTB_iii++) \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4585 { \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4586 obj_type *SFTB_victim = &(SFTB_current->block[SFTB_iii]); \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4587 \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4588 if (LRECORD_FREE_P (SFTB_victim)) \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4589 { \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4590 num_free++; \ |
| 771 | 4591 PUT_FIXED_TYPE_ON_FREE_LIST (typename, obj_type, SFTB_victim); \ |
|
5059
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4592 } \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4593 else if (C_READONLY_RECORD_HEADER_P (&SFTB_victim->lheader)) \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4594 { \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4595 SFTB_empty = 0; \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4596 num_used++; \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4597 } \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4598 else if (! MARKED_RECORD_HEADER_P (&SFTB_victim->lheader)) \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4599 { \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4600 num_free++; \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4601 FREE_FIXED_TYPE (typename, obj_type, SFTB_victim); \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4602 } \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4603 else \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4604 { \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4605 SFTB_empty = 0; \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4606 num_used++; \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4607 UNMARK_##typename (SFTB_victim); \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4608 } \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4609 } \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4610 if (!SFTB_empty) \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4611 { \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4612 SFTB_prev = &(SFTB_current->prev); \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4613 SFTB_current = SFTB_current->prev; \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4614 } \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4615 else if (SFTB_current == current_##typename##_block \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4616 && !SFTB_current->prev) \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4617 { \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4618 /* No real point in freeing sole allocation block */ \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4619 break; \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4620 } \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4621 else \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4622 { \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4623 struct typename##_block *SFTB_victim_block = SFTB_current; \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4624 if (SFTB_victim_block == current_##typename##_block) \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4625 current_##typename##_block_index \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4626 = countof (current_##typename##_block->block); \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4627 SFTB_current = SFTB_current->prev; \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4628 { \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4629 *SFTB_prev = SFTB_current; \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4630 xfree (SFTB_victim_block); \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4631 /* Restore free list to what it was before victim was swept */ \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4632 typename##_free_list = SFTB_old_free_list; \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4633 num_free -= SFTB_limit; \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4634 } \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4635 } \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4636 SFTB_limit = countof (current_##typename##_block->block); \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4637 } \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4638 \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4639 gc_count_num_##typename##_in_use = num_used; \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4640 gc_count_num_##typename##_freelist = num_free; \ |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4641 COPY_INTO_LRECORD_STATS (typename); \ |
| 428 | 4642 } while (0) |
| 4643 | |
| 4644 #endif /* !ERROR_CHECK_GC */ | |
| 4645 | |
| 771 | 4646 #define SWEEP_FIXED_TYPE_BLOCK(typename, obj_type) \ |
| 4647 SWEEP_FIXED_TYPE_BLOCK_1 (typename, obj_type, lheader) | |
| 4648 | |
| 3263 | 4649 #endif /* not NEW_GC */ |
| 2720 | 4650 |
| 428 | 4651 |
| 3263 | 4652 #ifndef NEW_GC |
| 428 | 4653 static void |
| 4654 sweep_conses (void) | |
| 4655 { | |
| 4656 #define UNMARK_cons(ptr) UNMARK_RECORD_HEADER (&((ptr)->lheader)) | |
| 4657 #define ADDITIONAL_FREE_cons(ptr) | |
| 4658 | |
| 440 | 4659 SWEEP_FIXED_TYPE_BLOCK (cons, Lisp_Cons); |
| 428 | 4660 } |
| 3263 | 4661 #endif /* not NEW_GC */ |
| 428 | 4662 |
| 4663 /* Explicitly free a cons cell. */ | |
| 4664 void | |
| 853 | 4665 free_cons (Lisp_Object cons) |
| 428 | 4666 { |
| 3263 | 4667 #ifndef NEW_GC /* to avoid compiler warning */ |
| 853 | 4668 Lisp_Cons *ptr = XCONS (cons); |
| 3263 | 4669 #endif /* not NEW_GC */ |
| 853 | 4670 |
| 428 | 4671 #ifdef ERROR_CHECK_GC |
| 3263 | 4672 #ifdef NEW_GC |
| 2720 | 4673 Lisp_Cons *ptr = XCONS (cons); |
| 3263 | 4674 #endif /* NEW_GC */ |
| 428 | 4675 /* If the CAR is not an int, then it will be a pointer, which will |
| 4676 always be four-byte aligned. If this cons cell has already been | |
| 4677 placed on the free list, however, its car will probably contain | |
| 4678 a chain pointer to the next cons on the list, which has cleverly | |
| 4679 had all its 0's and 1's inverted. This allows for a quick | |
| 1204 | 4680 check to make sure we're not freeing something already freed. |
| 4681 | |
| 4682 NOTE: This check may not be necessary. Freeing an object sets its | |
| 4683 type to lrecord_type_free, which will trip up the XCONS() above -- as | |
| 4684 well as a check in FREE_FIXED_TYPE(). */ | |
| 853 | 4685 if (POINTER_TYPE_P (XTYPE (cons_car (ptr)))) |
| 4686 ASSERT_VALID_POINTER (XPNTR (cons_car (ptr))); | |
| 428 | 4687 #endif /* ERROR_CHECK_GC */ |
| 4688 | |
|
5059
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4689 FREE_FIXED_TYPE_WHEN_NOT_IN_GC (cons, cons, Lisp_Cons, ptr); |
| 428 | 4690 } |
| 4691 | |
| 4692 /* explicitly free a list. You **must make sure** that you have | |
| 4693 created all the cons cells that make up this list and that there | |
| 4694 are no pointers to any of these cons cells anywhere else. If there | |
| 4695 are, you will lose. */ | |
| 4696 | |
| 4697 void | |
| 4698 free_list (Lisp_Object list) | |
| 4699 { | |
| 4700 Lisp_Object rest, next; | |
| 4701 | |
| 4702 for (rest = list; !NILP (rest); rest = next) | |
| 4703 { | |
| 4704 next = XCDR (rest); | |
| 853 | 4705 free_cons (rest); |
| 428 | 4706 } |
| 4707 } | |
| 4708 | |
| 4709 /* explicitly free an alist. You **must make sure** that you have | |
| 4710 created all the cons cells that make up this alist and that there | |
| 4711 are no pointers to any of these cons cells anywhere else. If there | |
| 4712 are, you will lose. */ | |
| 4713 | |
| 4714 void | |
| 4715 free_alist (Lisp_Object alist) | |
| 4716 { | |
| 4717 Lisp_Object rest, next; | |
| 4718 | |
| 4719 for (rest = alist; !NILP (rest); rest = next) | |
| 4720 { | |
| 4721 next = XCDR (rest); | |
| 853 | 4722 free_cons (XCAR (rest)); |
| 4723 free_cons (rest); | |
| 428 | 4724 } |
| 4725 } | |
| 4726 | |
| 3263 | 4727 #ifndef NEW_GC |
| 428 | 4728 static void |
| 4729 sweep_compiled_functions (void) | |
| 4730 { | |
| 4731 #define UNMARK_compiled_function(ptr) UNMARK_RECORD_HEADER (&((ptr)->lheader)) | |
| 945 | 4732 #define ADDITIONAL_FREE_compiled_function(ptr) \ |
|
4976
16112448d484
Rename xfree(FOO, TYPE) -> xfree(FOO)
Ben Wing <ben@xemacs.org>
parents:
4969
diff
changeset
|
4733 if (ptr->args_in_array) xfree (ptr->args) |
| 428 | 4734 |
| 4735 SWEEP_FIXED_TYPE_BLOCK (compiled_function, Lisp_Compiled_Function); | |
| 4736 } | |
| 4737 | |
| 4738 static void | |
| 4739 sweep_floats (void) | |
| 4740 { | |
| 4741 #define UNMARK_float(ptr) UNMARK_RECORD_HEADER (&((ptr)->lheader)) | |
| 4742 #define ADDITIONAL_FREE_float(ptr) | |
| 4743 | |
| 440 | 4744 SWEEP_FIXED_TYPE_BLOCK (float, Lisp_Float); |
| 428 | 4745 } |
| 4746 | |
| 1983 | 4747 #ifdef HAVE_BIGNUM |
| 4748 static void | |
| 4749 sweep_bignums (void) | |
| 4750 { | |
| 4751 #define UNMARK_bignum(ptr) UNMARK_RECORD_HEADER (&((ptr)->lheader)) | |
| 4752 #define ADDITIONAL_FREE_bignum(ptr) bignum_fini (ptr->data) | |
| 4753 | |
| 4754 SWEEP_FIXED_TYPE_BLOCK (bignum, Lisp_Bignum); | |
| 4755 } | |
| 4756 #endif /* HAVE_BIGNUM */ | |
| 4757 | |
| 4758 #ifdef HAVE_RATIO | |
| 4759 static void | |
| 4760 sweep_ratios (void) | |
| 4761 { | |
| 4762 #define UNMARK_ratio(ptr) UNMARK_RECORD_HEADER (&((ptr)->lheader)) | |
| 4763 #define ADDITIONAL_FREE_ratio(ptr) ratio_fini (ptr->data) | |
| 4764 | |
| 4765 SWEEP_FIXED_TYPE_BLOCK (ratio, Lisp_Ratio); | |
| 4766 } | |
| 4767 #endif /* HAVE_RATIO */ | |
| 4768 | |
| 4769 #ifdef HAVE_BIGFLOAT | |
| 4770 static void | |
| 4771 sweep_bigfloats (void) | |
| 4772 { | |
| 4773 #define UNMARK_bigfloat(ptr) UNMARK_RECORD_HEADER (&((ptr)->lheader)) | |
| 4774 #define ADDITIONAL_FREE_bigfloat(ptr) bigfloat_fini (ptr->bf) | |
| 4775 | |
| 4776 SWEEP_FIXED_TYPE_BLOCK (bigfloat, Lisp_Bigfloat); | |
| 4777 } | |
| 4778 #endif | |
| 4779 | |
| 428 | 4780 static void |
| 4781 sweep_symbols (void) | |
| 4782 { | |
| 4783 #define UNMARK_symbol(ptr) UNMARK_RECORD_HEADER (&((ptr)->lheader)) | |
| 4784 #define ADDITIONAL_FREE_symbol(ptr) | |
| 4785 | |
| 440 | 4786 SWEEP_FIXED_TYPE_BLOCK (symbol, Lisp_Symbol); |
| 428 | 4787 } |
| 4788 | |
| 4789 static void | |
| 4790 sweep_extents (void) | |
| 4791 { | |
| 4792 #define UNMARK_extent(ptr) UNMARK_RECORD_HEADER (&((ptr)->lheader)) | |
| 4793 #define ADDITIONAL_FREE_extent(ptr) | |
| 4794 | |
| 4795 SWEEP_FIXED_TYPE_BLOCK (extent, struct extent); | |
| 4796 } | |
| 4797 | |
| 4798 static void | |
| 4799 sweep_events (void) | |
| 4800 { | |
| 4801 #define UNMARK_event(ptr) UNMARK_RECORD_HEADER (&((ptr)->lheader)) | |
| 4802 #define ADDITIONAL_FREE_event(ptr) | |
| 4803 | |
| 440 | 4804 SWEEP_FIXED_TYPE_BLOCK (event, Lisp_Event); |
| 428 | 4805 } |
| 3263 | 4806 #endif /* not NEW_GC */ |
| 428 | 4807 |
| 1204 | 4808 #ifdef EVENT_DATA_AS_OBJECTS |
| 934 | 4809 |
| 3263 | 4810 #ifndef NEW_GC |
| 934 | 4811 static void |
| 4812 sweep_key_data (void) | |
| 4813 { | |
| 4814 #define UNMARK_key_data(ptr) UNMARK_RECORD_HEADER (&((ptr)->lheader)) | |
| 4815 #define ADDITIONAL_FREE_key_data(ptr) | |
| 4816 | |
| 4817 SWEEP_FIXED_TYPE_BLOCK (key_data, Lisp_Key_Data); | |
| 4818 } | |
| 3263 | 4819 #endif /* not NEW_GC */ |
| 934 | 4820 |
| 1204 | 4821 void |
| 4822 free_key_data (Lisp_Object ptr) | |
| 4823 { | |
|
5059
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4824 FREE_FIXED_TYPE_WHEN_NOT_IN_GC (ptr, key_data, Lisp_Key_Data, |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4825 XKEY_DATA (ptr)); |
| 2720 | 4826 } |
| 4827 | |
| 3263 | 4828 #ifndef NEW_GC |
| 934 | 4829 static void |
| 4830 sweep_button_data (void) | |
| 4831 { | |
| 4832 #define UNMARK_button_data(ptr) UNMARK_RECORD_HEADER (&((ptr)->lheader)) | |
| 4833 #define ADDITIONAL_FREE_button_data(ptr) | |
| 4834 | |
| 4835 SWEEP_FIXED_TYPE_BLOCK (button_data, Lisp_Button_Data); | |
| 4836 } | |
| 3263 | 4837 #endif /* not NEW_GC */ |
| 934 | 4838 |
| 1204 | 4839 void |
| 4840 free_button_data (Lisp_Object ptr) | |
| 4841 { | |
|
5059
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4842 FREE_FIXED_TYPE_WHEN_NOT_IN_GC (ptr, button_data, Lisp_Button_Data, |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4843 XBUTTON_DATA (ptr)); |
| 2720 | 4844 } |
| 4845 | |
| 3263 | 4846 #ifndef NEW_GC |
| 934 | 4847 static void |
| 4848 sweep_motion_data (void) | |
| 4849 { | |
| 4850 #define UNMARK_motion_data(ptr) UNMARK_RECORD_HEADER (&((ptr)->lheader)) | |
| 4851 #define ADDITIONAL_FREE_motion_data(ptr) | |
| 4852 | |
| 4853 SWEEP_FIXED_TYPE_BLOCK (motion_data, Lisp_Motion_Data); | |
| 4854 } | |
| 3263 | 4855 #endif /* not NEW_GC */ |
| 934 | 4856 |
| 1204 | 4857 void |
| 4858 free_motion_data (Lisp_Object ptr) | |
| 4859 { | |
|
5059
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4860 FREE_FIXED_TYPE_WHEN_NOT_IN_GC (ptr, motion_data, Lisp_Motion_Data, |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4861 XMOTION_DATA (ptr)); |
| 2720 | 4862 } |
| 4863 | |
| 3263 | 4864 #ifndef NEW_GC |
| 934 | 4865 static void |
| 4866 sweep_process_data (void) | |
| 4867 { | |
| 4868 #define UNMARK_process_data(ptr) UNMARK_RECORD_HEADER (&((ptr)->lheader)) | |
| 4869 #define ADDITIONAL_FREE_process_data(ptr) | |
| 4870 | |
| 4871 SWEEP_FIXED_TYPE_BLOCK (process_data, Lisp_Process_Data); | |
| 4872 } | |
| 3263 | 4873 #endif /* not NEW_GC */ |
| 934 | 4874 |
| 1204 | 4875 void |
| 4876 free_process_data (Lisp_Object ptr) | |
| 4877 { | |
|
5059
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4878 FREE_FIXED_TYPE_WHEN_NOT_IN_GC (ptr, process_data, Lisp_Process_Data, |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4879 XPROCESS_DATA (ptr)); |
| 2720 | 4880 } |
| 4881 | |
| 3263 | 4882 #ifndef NEW_GC |
| 934 | 4883 static void |
| 4884 sweep_timeout_data (void) | |
| 4885 { | |
| 4886 #define UNMARK_timeout_data(ptr) UNMARK_RECORD_HEADER (&((ptr)->lheader)) | |
| 4887 #define ADDITIONAL_FREE_timeout_data(ptr) | |
| 4888 | |
| 4889 SWEEP_FIXED_TYPE_BLOCK (timeout_data, Lisp_Timeout_Data); | |
| 4890 } | |
| 3263 | 4891 #endif /* not NEW_GC */ |
| 934 | 4892 |
| 1204 | 4893 void |
| 4894 free_timeout_data (Lisp_Object ptr) | |
| 4895 { | |
|
5059
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4896 FREE_FIXED_TYPE_WHEN_NOT_IN_GC (ptr, timeout_data, Lisp_Timeout_Data, |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4897 XTIMEOUT_DATA (ptr)); |
| 2720 | 4898 } |
| 4899 | |
| 3263 | 4900 #ifndef NEW_GC |
| 934 | 4901 static void |
| 4902 sweep_magic_data (void) | |
| 4903 { | |
| 4904 #define UNMARK_magic_data(ptr) UNMARK_RECORD_HEADER (&((ptr)->lheader)) | |
| 4905 #define ADDITIONAL_FREE_magic_data(ptr) | |
| 4906 | |
| 4907 SWEEP_FIXED_TYPE_BLOCK (magic_data, Lisp_Magic_Data); | |
| 4908 } | |
| 3263 | 4909 #endif /* not NEW_GC */ |
| 934 | 4910 |
| 1204 | 4911 void |
| 4912 free_magic_data (Lisp_Object ptr) | |
| 4913 { | |
|
5059
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4914 FREE_FIXED_TYPE_WHEN_NOT_IN_GC (ptr, magic_data, Lisp_Magic_Data, |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4915 XMAGIC_DATA (ptr)); |
| 2720 | 4916 } |
| 4917 | |
| 3263 | 4918 #ifndef NEW_GC |
| 934 | 4919 static void |
| 4920 sweep_magic_eval_data (void) | |
| 4921 { | |
| 4922 #define UNMARK_magic_eval_data(ptr) UNMARK_RECORD_HEADER (&((ptr)->lheader)) | |
| 4923 #define ADDITIONAL_FREE_magic_eval_data(ptr) | |
| 4924 | |
| 4925 SWEEP_FIXED_TYPE_BLOCK (magic_eval_data, Lisp_Magic_Eval_Data); | |
| 4926 } | |
| 3263 | 4927 #endif /* not NEW_GC */ |
| 934 | 4928 |
| 1204 | 4929 void |
| 4930 free_magic_eval_data (Lisp_Object ptr) | |
| 4931 { | |
|
5059
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4932 FREE_FIXED_TYPE_WHEN_NOT_IN_GC (ptr, magic_eval_data, Lisp_Magic_Eval_Data, |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4933 XMAGIC_EVAL_DATA (ptr)); |
| 2720 | 4934 } |
| 4935 | |
| 3263 | 4936 #ifndef NEW_GC |
| 934 | 4937 static void |
| 4938 sweep_eval_data (void) | |
| 4939 { | |
| 4940 #define UNMARK_eval_data(ptr) UNMARK_RECORD_HEADER (&((ptr)->lheader)) | |
| 4941 #define ADDITIONAL_FREE_eval_data(ptr) | |
| 4942 | |
| 4943 SWEEP_FIXED_TYPE_BLOCK (eval_data, Lisp_Eval_Data); | |
| 4944 } | |
| 3263 | 4945 #endif /* not NEW_GC */ |
| 934 | 4946 |
| 1204 | 4947 void |
| 4948 free_eval_data (Lisp_Object ptr) | |
| 4949 { | |
|
5059
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4950 FREE_FIXED_TYPE_WHEN_NOT_IN_GC (ptr, eval_data, Lisp_Eval_Data, |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4951 XEVAL_DATA (ptr)); |
| 2720 | 4952 } |
| 4953 | |
| 3263 | 4954 #ifndef NEW_GC |
| 934 | 4955 static void |
| 4956 sweep_misc_user_data (void) | |
| 4957 { | |
| 4958 #define UNMARK_misc_user_data(ptr) UNMARK_RECORD_HEADER (&((ptr)->lheader)) | |
| 4959 #define ADDITIONAL_FREE_misc_user_data(ptr) | |
| 4960 | |
| 4961 SWEEP_FIXED_TYPE_BLOCK (misc_user_data, Lisp_Misc_User_Data); | |
| 4962 } | |
| 3263 | 4963 #endif /* not NEW_GC */ |
| 934 | 4964 |
| 1204 | 4965 void |
| 4966 free_misc_user_data (Lisp_Object ptr) | |
| 4967 { | |
|
5059
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4968 FREE_FIXED_TYPE_WHEN_NOT_IN_GC (ptr, misc_user_data, Lisp_Misc_User_Data, |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4969 XMISC_USER_DATA (ptr)); |
| 1204 | 4970 } |
| 4971 | |
| 4972 #endif /* EVENT_DATA_AS_OBJECTS */ | |
| 934 | 4973 |
| 3263 | 4974 #ifndef NEW_GC |
| 428 | 4975 static void |
| 4976 sweep_markers (void) | |
| 4977 { | |
| 4978 #define UNMARK_marker(ptr) UNMARK_RECORD_HEADER (&((ptr)->lheader)) | |
| 4979 #define ADDITIONAL_FREE_marker(ptr) \ | |
| 4980 do { Lisp_Object tem; \ | |
| 793 | 4981 tem = wrap_marker (ptr); \ |
| 428 | 4982 unchain_marker (tem); \ |
| 4983 } while (0) | |
| 4984 | |
| 440 | 4985 SWEEP_FIXED_TYPE_BLOCK (marker, Lisp_Marker); |
| 428 | 4986 } |
| 3263 | 4987 #endif /* not NEW_GC */ |
| 428 | 4988 |
| 4989 /* Explicitly free a marker. */ | |
| 4990 void | |
| 1204 | 4991 free_marker (Lisp_Object ptr) |
| 428 | 4992 { |
|
5059
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
4993 FREE_FIXED_TYPE_WHEN_NOT_IN_GC (ptr, marker, Lisp_Marker, XMARKER (ptr)); |
| 428 | 4994 } |
| 4995 | |
| 4996 | |
| 4997 #if defined (MULE) && defined (VERIFY_STRING_CHARS_INTEGRITY) | |
| 4998 | |
| 4999 static void | |
| 5000 verify_string_chars_integrity (void) | |
| 5001 { | |
| 5002 struct string_chars_block *sb; | |
| 5003 | |
| 5004 /* Scan each existing string block sequentially, string by string. */ | |
| 5005 for (sb = first_string_chars_block; sb; sb = sb->next) | |
| 5006 { | |
| 5007 int pos = 0; | |
| 5008 /* POS is the index of the next string in the block. */ | |
| 5009 while (pos < sb->pos) | |
| 5010 { | |
| 5011 struct string_chars *s_chars = | |
| 5012 (struct string_chars *) &(sb->string_chars[pos]); | |
| 438 | 5013 Lisp_String *string; |
| 428 | 5014 int size; |
| 5015 int fullsize; | |
| 5016 | |
| 454 | 5017 /* If the string_chars struct is marked as free (i.e. the |
| 5018 STRING pointer is NULL) then this is an unused chunk of | |
| 5019 string storage. (See below.) */ | |
| 5020 | |
| 5021 if (STRING_CHARS_FREE_P (s_chars)) | |
| 428 | 5022 { |
| 5023 fullsize = ((struct unused_string_chars *) s_chars)->fullsize; | |
| 5024 pos += fullsize; | |
| 5025 continue; | |
| 5026 } | |
| 5027 | |
| 5028 string = s_chars->string; | |
| 5029 /* Must be 32-bit aligned. */ | |
| 5030 assert ((((int) string) & 3) == 0); | |
| 5031 | |
| 793 | 5032 size = string->size_; |
| 428 | 5033 fullsize = STRING_FULLSIZE (size); |
| 5034 | |
| 5035 assert (!BIG_STRING_FULLSIZE_P (fullsize)); | |
| 2720 | 5036 assert (XSTRING_DATA (string) == s_chars->chars); |
| 428 | 5037 pos += fullsize; |
| 5038 } | |
| 5039 assert (pos == sb->pos); | |
| 5040 } | |
| 5041 } | |
| 5042 | |
| 1204 | 5043 #endif /* defined (MULE) && defined (VERIFY_STRING_CHARS_INTEGRITY) */ |
| 428 | 5044 |
| 3092 | 5045 #ifndef NEW_GC |
| 428 | 5046 /* Compactify string chars, relocating the reference to each -- |
| 5047 free any empty string_chars_block we see. */ | |
|
5016
2ade80e8c640
enable more warnings and fix them
Ben Wing <ben@xemacs.org>
parents:
4976
diff
changeset
|
5048 static void |
| 428 | 5049 compact_string_chars (void) |
| 5050 { | |
| 5051 struct string_chars_block *to_sb = first_string_chars_block; | |
| 5052 int to_pos = 0; | |
| 5053 struct string_chars_block *from_sb; | |
| 5054 | |
| 5055 /* Scan each existing string block sequentially, string by string. */ | |
| 5056 for (from_sb = first_string_chars_block; from_sb; from_sb = from_sb->next) | |
| 5057 { | |
| 5058 int from_pos = 0; | |
| 5059 /* FROM_POS is the index of the next string in the block. */ | |
| 5060 while (from_pos < from_sb->pos) | |
| 5061 { | |
| 5062 struct string_chars *from_s_chars = | |
| 5063 (struct string_chars *) &(from_sb->string_chars[from_pos]); | |
| 5064 struct string_chars *to_s_chars; | |
| 438 | 5065 Lisp_String *string; |
| 428 | 5066 int size; |
| 5067 int fullsize; | |
| 5068 | |
| 454 | 5069 /* If the string_chars struct is marked as free (i.e. the |
| 5070 STRING pointer is NULL) then this is an unused chunk of | |
| 5071 string storage. This happens under Mule when a string's | |
| 5072 size changes in such a way that its fullsize changes. | |
| 5073 (Strings can change size because a different-length | |
| 5074 character can be substituted for another character.) | |
| 5075 In this case, after the bogus string pointer is the | |
| 5076 "fullsize" of this entry, i.e. how many bytes to skip. */ | |
| 5077 | |
| 5078 if (STRING_CHARS_FREE_P (from_s_chars)) | |
| 428 | 5079 { |
| 5080 fullsize = ((struct unused_string_chars *) from_s_chars)->fullsize; | |
| 5081 from_pos += fullsize; | |
| 5082 continue; | |
| 5083 } | |
| 5084 | |
| 5085 string = from_s_chars->string; | |
| 1204 | 5086 gc_checking_assert (!(LRECORD_FREE_P (string))); |
| 428 | 5087 |
| 793 | 5088 size = string->size_; |
| 428 | 5089 fullsize = STRING_FULLSIZE (size); |
| 5090 | |
| 442 | 5091 gc_checking_assert (! BIG_STRING_FULLSIZE_P (fullsize)); |
| 428 | 5092 |
| 5093 /* Just skip it if it isn't marked. */ | |
| 771 | 5094 if (! MARKED_RECORD_HEADER_P (&(string->u.lheader))) |
| 428 | 5095 { |
| 5096 from_pos += fullsize; | |
| 5097 continue; | |
| 5098 } | |
| 5099 | |
| 5100 /* If it won't fit in what's left of TO_SB, close TO_SB out | |
| 5101 and go on to the next string_chars_block. We know that TO_SB | |
| 5102 cannot advance past FROM_SB here since FROM_SB is large enough | |
| 5103 to currently contain this string. */ | |
| 5104 if ((to_pos + fullsize) > countof (to_sb->string_chars)) | |
| 5105 { | |
| 5106 to_sb->pos = to_pos; | |
| 5107 to_sb = to_sb->next; | |
| 5108 to_pos = 0; | |
| 5109 } | |
| 5110 | |
| 5111 /* Compute new address of this string | |
| 5112 and update TO_POS for the space being used. */ | |
| 5113 to_s_chars = (struct string_chars *) &(to_sb->string_chars[to_pos]); | |
| 5114 | |
| 5115 /* Copy the string_chars to the new place. */ | |
| 5116 if (from_s_chars != to_s_chars) | |
| 5117 memmove (to_s_chars, from_s_chars, fullsize); | |
| 5118 | |
| 5119 /* Relocate FROM_S_CHARS's reference */ | |
| 826 | 5120 set_lispstringp_data (string, &(to_s_chars->chars[0])); |
| 428 | 5121 |
| 5122 from_pos += fullsize; | |
| 5123 to_pos += fullsize; | |
| 5124 } | |
| 5125 } | |
| 5126 | |
| 5127 /* Set current to the last string chars block still used and | |
| 5128 free any that follow. */ | |
| 5129 { | |
| 5130 struct string_chars_block *victim; | |
| 5131 | |
| 5132 for (victim = to_sb->next; victim; ) | |
| 5133 { | |
| 5134 struct string_chars_block *next = victim->next; | |
|
4976
16112448d484
Rename xfree(FOO, TYPE) -> xfree(FOO)
Ben Wing <ben@xemacs.org>
parents:
4969
diff
changeset
|
5135 xfree (victim); |
| 428 | 5136 victim = next; |
| 5137 } | |
| 5138 | |
| 5139 current_string_chars_block = to_sb; | |
| 5140 current_string_chars_block->pos = to_pos; | |
| 5141 current_string_chars_block->next = 0; | |
| 5142 } | |
| 5143 } | |
| 3092 | 5144 #endif /* not NEW_GC */ |
| 428 | 5145 |
| 3263 | 5146 #ifndef NEW_GC |
| 428 | 5147 #if 1 /* Hack to debug missing purecopy's */ |
| 5148 static int debug_string_purity; | |
| 5149 | |
| 5150 static void | |
| 793 | 5151 debug_string_purity_print (Lisp_Object p) |
| 428 | 5152 { |
| 5153 Charcount i; | |
| 826 | 5154 Charcount s = string_char_length (p); |
| 442 | 5155 stderr_out ("\""); |
| 428 | 5156 for (i = 0; i < s; i++) |
| 5157 { | |
| 867 | 5158 Ichar ch = string_ichar (p, i); |
| 428 | 5159 if (ch < 32 || ch >= 126) |
| 5160 stderr_out ("\\%03o", ch); | |
| 5161 else if (ch == '\\' || ch == '\"') | |
| 5162 stderr_out ("\\%c", ch); | |
| 5163 else | |
| 5164 stderr_out ("%c", ch); | |
| 5165 } | |
| 5166 stderr_out ("\"\n"); | |
| 5167 } | |
| 5168 #endif /* 1 */ | |
| 3263 | 5169 #endif /* not NEW_GC */ |
| 5170 | |
| 5171 #ifndef NEW_GC | |
| 428 | 5172 static void |
| 5173 sweep_strings (void) | |
| 5174 { | |
| 5175 int debug = debug_string_purity; | |
| 5176 | |
| 793 | 5177 #define UNMARK_string(ptr) do { \ |
| 5178 Lisp_String *p = (ptr); \ | |
| 5179 UNMARK_RECORD_HEADER (&(p->u.lheader)); \ | |
|
5160
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
5180 tick_string_stats (p, 1); \ |
| 793 | 5181 if (debug) \ |
| 5182 debug_string_purity_print (wrap_string (p)); \ | |
| 438 | 5183 } while (0) |
| 5184 #define ADDITIONAL_FREE_string(ptr) do { \ | |
| 793 | 5185 Bytecount size = ptr->size_; \ |
| 438 | 5186 if (BIG_STRING_SIZE_P (size)) \ |
|
5146
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
5187 xfree (ptr->data_); \ |
| 438 | 5188 } while (0) |
| 5189 | |
| 771 | 5190 SWEEP_FIXED_TYPE_BLOCK_1 (string, Lisp_String, u.lheader); |
| 428 | 5191 } |
| 3263 | 5192 #endif /* not NEW_GC */ |
| 428 | 5193 |
| 3092 | 5194 #ifndef NEW_GC |
| 5195 void | |
| 5196 gc_sweep_1 (void) | |
| 428 | 5197 { |
|
5059
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
5198 /* Reset all statistics to 0. They will be incremented when |
|
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
5199 sweeping lcrecords, frob-block lrecords and dumped objects. */ |
|
5160
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
5200 clear_lrecord_stats (); |
|
5059
c8f90d61dcf3
fix memory usage stats to include pdumped objects
Ben Wing <ben@xemacs.org>
parents:
5058
diff
changeset
|
5201 |
| 428 | 5202 /* Free all unmarked records. Do this at the very beginning, |
| 5203 before anything else, so that the finalize methods can safely | |
| 5204 examine items in the objects. sweep_lcrecords_1() makes | |
| 5205 sure to call all the finalize methods *before* freeing anything, | |
| 5206 to complete the safety. */ | |
| 5207 { | |
| 5208 int ignored; | |
| 5209 sweep_lcrecords_1 (&all_lcrecords, &ignored); | |
| 5210 } | |
| 5211 | |
| 5212 compact_string_chars (); | |
| 5213 | |
| 5214 /* Finalize methods below (called through the ADDITIONAL_FREE_foo | |
| 5215 macros) must be *extremely* careful to make sure they're not | |
| 5216 referencing freed objects. The only two existing finalize | |
| 5217 methods (for strings and markers) pass muster -- the string | |
| 5218 finalizer doesn't look at anything but its own specially- | |
| 5219 created block, and the marker finalizer only looks at live | |
| 5220 buffers (which will never be freed) and at the markers before | |
| 5221 and after it in the chain (which, by induction, will never be | |
| 5222 freed because if so, they would have already removed themselves | |
| 5223 from the chain). */ | |
| 5224 | |
| 5225 /* Put all unmarked strings on free list, free'ing the string chars | |
| 5226 of large unmarked strings */ | |
| 5227 sweep_strings (); | |
| 5228 | |
| 5229 /* Put all unmarked conses on free list */ | |
| 5230 sweep_conses (); | |
| 5231 | |
| 5232 /* Free all unmarked compiled-function objects */ | |
| 5233 sweep_compiled_functions (); | |
| 5234 | |
| 5235 /* Put all unmarked floats on free list */ | |
| 5236 sweep_floats (); | |
| 5237 | |
| 1983 | 5238 #ifdef HAVE_BIGNUM |
| 5239 /* Put all unmarked bignums on free list */ | |
| 5240 sweep_bignums (); | |
| 5241 #endif | |
| 5242 | |
| 5243 #ifdef HAVE_RATIO | |
| 5244 /* Put all unmarked ratios on free list */ | |
| 5245 sweep_ratios (); | |
| 5246 #endif | |
| 5247 | |
| 5248 #ifdef HAVE_BIGFLOAT | |
| 5249 /* Put all unmarked bigfloats on free list */ | |
| 5250 sweep_bigfloats (); | |
| 5251 #endif | |
| 5252 | |
| 428 | 5253 /* Put all unmarked symbols on free list */ |
| 5254 sweep_symbols (); | |
| 5255 | |
| 5256 /* Put all unmarked extents on free list */ | |
| 5257 sweep_extents (); | |
| 5258 | |
| 5259 /* Put all unmarked markers on free list. | |
| 5260 Dechain each one first from the buffer into which it points. */ | |
| 5261 sweep_markers (); | |
| 5262 | |
| 5263 sweep_events (); | |
| 5264 | |
| 1204 | 5265 #ifdef EVENT_DATA_AS_OBJECTS |
| 934 | 5266 sweep_key_data (); |
| 5267 sweep_button_data (); | |
| 5268 sweep_motion_data (); | |
| 5269 sweep_process_data (); | |
| 5270 sweep_timeout_data (); | |
| 5271 sweep_magic_data (); | |
| 5272 sweep_magic_eval_data (); | |
| 5273 sweep_eval_data (); | |
| 5274 sweep_misc_user_data (); | |
| 1204 | 5275 #endif /* EVENT_DATA_AS_OBJECTS */ |
|
5158
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5157
diff
changeset
|
5276 |
| 428 | 5277 #ifdef PDUMP |
| 442 | 5278 pdump_objects_unmark (); |
| 428 | 5279 #endif |
| 5280 } | |
| 3092 | 5281 #endif /* not NEW_GC */ |
|
5160
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
5282 |
| 428 | 5283 |
|
5160
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
5284 /************************************************************************/ |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
5285 /* "Disksave Finalization" -- Preparing for Dumping */ |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
5286 /************************************************************************/ |
| 428 | 5287 |
|
5167
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
5288 static void |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
5289 disksave_object_finalization_1 (void) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
5290 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
5291 #ifdef NEW_GC |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
5292 mc_finalize_for_disksave (); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
5293 #else /* not NEW_GC */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
5294 struct old_lcrecord_header *header; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
5295 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
5296 for (header = all_lcrecords; header; header = header->next) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
5297 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
5298 struct lrecord_header *objh = &header->lheader; |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
5299 const struct lrecord_implementation *imp = LHEADER_IMPLEMENTATION (objh); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
5300 #if 0 /* possibly useful for debugging */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
5301 if (!RECORD_DUMPABLE (objh) && !objh->free) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
5302 { |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
5303 stderr_out ("Disksaving a non-dumpable object: "); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
5304 debug_print (wrap_pointer_1 (header)); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
5305 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
5306 #endif |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
5307 if (imp->disksave && !objh->free) |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
5308 (imp->disksave) (wrap_pointer_1 (header)); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
5309 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
5310 #endif /* not NEW_GC */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
5311 } |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
5312 |
| 428 | 5313 void |
| 5314 disksave_object_finalization (void) | |
| 5315 { | |
| 5316 /* It's important that certain information from the environment not get | |
| 5317 dumped with the executable (pathnames, environment variables, etc.). | |
| 5318 To make it easier to tell when this has happened with strings(1) we | |
| 5319 clear some known-to-be-garbage blocks of memory, so that leftover | |
| 5320 results of old evaluation don't look like potential problems. | |
| 5321 But first we set some notable variables to nil and do one more GC, | |
| 5322 to turn those strings into garbage. | |
| 440 | 5323 */ |
| 428 | 5324 |
| 5325 /* Yeah, this list is pretty ad-hoc... */ | |
| 5326 Vprocess_environment = Qnil; | |
| 771 | 5327 env_initted = 0; |
| 428 | 5328 Vexec_directory = Qnil; |
| 5329 Vdata_directory = Qnil; | |
| 5330 Vsite_directory = Qnil; | |
| 5331 Vdoc_directory = Qnil; | |
| 5332 Vexec_path = Qnil; | |
| 5333 Vload_path = Qnil; | |
| 5334 /* Vdump_load_path = Qnil; */ | |
| 5335 /* Release hash tables for locate_file */ | |
| 5336 Flocate_file_clear_hashing (Qt); | |
| 771 | 5337 uncache_home_directory (); |
| 776 | 5338 zero_out_command_line_status_vars (); |
| 872 | 5339 clear_default_devices (); |
| 428 | 5340 |
| 5341 #if defined(LOADHIST) && !(defined(LOADHIST_DUMPED) || \ | |
| 5342 defined(LOADHIST_BUILTIN)) | |
| 5343 Vload_history = Qnil; | |
| 5344 #endif | |
| 5345 Vshell_file_name = Qnil; | |
| 5346 | |
| 3092 | 5347 #ifdef NEW_GC |
| 5348 gc_full (); | |
| 5349 #else /* not NEW_GC */ | |
| 428 | 5350 garbage_collect_1 (); |
| 3092 | 5351 #endif /* not NEW_GC */ |
| 428 | 5352 |
| 5353 /* Run the disksave finalization methods of all live objects. */ | |
| 5354 disksave_object_finalization_1 (); | |
| 5355 | |
| 3092 | 5356 #ifndef NEW_GC |
| 428 | 5357 /* Zero out the uninitialized (really, unused) part of the containers |
| 5358 for the live strings. */ | |
| 5359 { | |
| 5360 struct string_chars_block *scb; | |
| 5361 for (scb = first_string_chars_block; scb; scb = scb->next) | |
| 5362 { | |
| 5363 int count = sizeof (scb->string_chars) - scb->pos; | |
| 5364 | |
| 5365 assert (count >= 0 && count < STRING_CHARS_BLOCK_SIZE); | |
| 440 | 5366 if (count != 0) |
| 5367 { | |
| 5368 /* from the block's fill ptr to the end */ | |
| 5369 memset ((scb->string_chars + scb->pos), 0, count); | |
| 5370 } | |
| 428 | 5371 } |
| 5372 } | |
| 3092 | 5373 #endif /* not NEW_GC */ |
| 428 | 5374 |
| 5375 /* There, that ought to be enough... */ | |
| 5376 | |
| 5377 } | |
| 5378 | |
|
5167
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
5379 |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
5380 /************************************************************************/ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
5381 /* Lisp interface onto garbage collection */ |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
5382 /************************************************************************/ |
|
5157
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5383 |
| 2994 | 5384 /* Debugging aids. */ |
| 5385 | |
| 5386 DEFUN ("garbage-collect", Fgarbage_collect, 0, 0, "", /* | |
| 5387 Reclaim storage for Lisp objects no longer needed. | |
| 5388 Return info on amount of space in use: | |
| 5389 ((USED-CONSES . FREE-CONSES) (USED-SYMS . FREE-SYMS) | |
| 5390 (USED-MARKERS . FREE-MARKERS) USED-STRING-CHARS USED-VECTOR-SLOTS | |
| 5391 PLIST) | |
| 5392 where `PLIST' is a list of alternating keyword/value pairs providing | |
| 5393 more detailed information. | |
| 5394 Garbage collection happens automatically if you cons more than | |
| 5395 `gc-cons-threshold' bytes of Lisp data since previous garbage collection. | |
| 5396 */ | |
| 5397 ()) | |
| 5398 { | |
| 5399 /* Record total usage for purposes of determining next GC */ | |
| 3092 | 5400 #ifdef NEW_GC |
| 5401 gc_full (); | |
| 5402 #else /* not NEW_GC */ | |
| 2994 | 5403 garbage_collect_1 (); |
| 3092 | 5404 #endif /* not NEW_GC */ |
| 2994 | 5405 |
| 5406 /* This will get set to 1, and total_gc_usage computed, as part of the | |
| 5407 call to object_memory_usage_stats() -- if ALLOC_TYPE_STATS is enabled. */ | |
| 5408 total_gc_usage_set = 0; | |
| 5409 #ifdef ALLOC_TYPE_STATS | |
|
5167
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
5410 return garbage_collection_statistics (); |
|
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
5411 #else |
| 2994 | 5412 return Qnil; |
|
5167
e374ea766cc1
clean up, rearrange allocation statistics code
Ben Wing <ben@xemacs.org>
parents:
5160
diff
changeset
|
5413 #endif |
| 2994 | 5414 } |
| 428 | 5415 |
| 5416 DEFUN ("consing-since-gc", Fconsing_since_gc, 0, 0, "", /* | |
| 5417 Return the number of bytes consed since the last garbage collection. | |
| 5418 \"Consed\" is a misnomer in that this actually counts allocation | |
| 5419 of all different kinds of objects, not just conses. | |
| 5420 | |
| 5421 If this value exceeds `gc-cons-threshold', a garbage collection happens. | |
| 5422 */ | |
| 5423 ()) | |
| 5424 { | |
| 5425 return make_int (consing_since_gc); | |
| 5426 } | |
| 5427 | |
| 440 | 5428 #if 0 |
| 444 | 5429 DEFUN ("memory-limit", Fmemory_limit, 0, 0, 0, /* |
| 801 | 5430 Return the address of the last byte XEmacs has allocated, divided by 1024. |
| 5431 This may be helpful in debugging XEmacs's memory usage. | |
| 428 | 5432 The value is divided by 1024 to make sure it will fit in a lisp integer. |
| 5433 */ | |
| 5434 ()) | |
| 5435 { | |
| 5436 return make_int ((EMACS_INT) sbrk (0) / 1024); | |
| 5437 } | |
| 440 | 5438 #endif |
| 428 | 5439 |
| 2994 | 5440 DEFUN ("total-memory-usage", Ftotal_memory_usage, 0, 0, 0, /* |
| 801 | 5441 Return the total number of bytes used by the data segment in XEmacs. |
| 5442 This may be helpful in debugging XEmacs's memory usage. | |
| 2994 | 5443 NOTE: This may or may not be accurate! It is hard to determine this |
| 5444 value in a system-independent fashion. On Windows, for example, the | |
| 5445 returned number tends to be much greater than reality. | |
| 801 | 5446 */ |
| 5447 ()) | |
| 5448 { | |
| 5449 return make_int (total_data_usage ()); | |
| 5450 } | |
| 5451 | |
|
4803
5d120deb60ca
Enable rudimentary support for valgrind, including functions that tell valgrind
Jerry James <james@xemacs.org>
parents:
4776
diff
changeset
|
5452 #ifdef USE_VALGRIND |
|
5d120deb60ca
Enable rudimentary support for valgrind, including functions that tell valgrind
Jerry James <james@xemacs.org>
parents:
4776
diff
changeset
|
5453 DEFUN ("valgrind-leak-check", Fvalgrind_leak_check, 0, 0, "", /* |
|
5d120deb60ca
Enable rudimentary support for valgrind, including functions that tell valgrind
Jerry James <james@xemacs.org>
parents:
4776
diff
changeset
|
5454 Ask valgrind to perform a memory leak check. |
|
5d120deb60ca
Enable rudimentary support for valgrind, including functions that tell valgrind
Jerry James <james@xemacs.org>
parents:
4776
diff
changeset
|
5455 The results of the leak check are sent to stderr. |
|
5d120deb60ca
Enable rudimentary support for valgrind, including functions that tell valgrind
Jerry James <james@xemacs.org>
parents:
4776
diff
changeset
|
5456 */ |
|
5d120deb60ca
Enable rudimentary support for valgrind, including functions that tell valgrind
Jerry James <james@xemacs.org>
parents:
4776
diff
changeset
|
5457 ()) |
|
5d120deb60ca
Enable rudimentary support for valgrind, including functions that tell valgrind
Jerry James <james@xemacs.org>
parents:
4776
diff
changeset
|
5458 { |
|
5d120deb60ca
Enable rudimentary support for valgrind, including functions that tell valgrind
Jerry James <james@xemacs.org>
parents:
4776
diff
changeset
|
5459 VALGRIND_DO_LEAK_CHECK; |
|
5d120deb60ca
Enable rudimentary support for valgrind, including functions that tell valgrind
Jerry James <james@xemacs.org>
parents:
4776
diff
changeset
|
5460 return Qnil; |
|
5d120deb60ca
Enable rudimentary support for valgrind, including functions that tell valgrind
Jerry James <james@xemacs.org>
parents:
4776
diff
changeset
|
5461 } |
|
5d120deb60ca
Enable rudimentary support for valgrind, including functions that tell valgrind
Jerry James <james@xemacs.org>
parents:
4776
diff
changeset
|
5462 |
|
5d120deb60ca
Enable rudimentary support for valgrind, including functions that tell valgrind
Jerry James <james@xemacs.org>
parents:
4776
diff
changeset
|
5463 DEFUN ("valgrind-quick-leak-check", Fvalgrind_quick_leak_check, 0, 0, "", /* |
|
5d120deb60ca
Enable rudimentary support for valgrind, including functions that tell valgrind
Jerry James <james@xemacs.org>
parents:
4776
diff
changeset
|
5464 Ask valgrind to perform a quick memory leak check. |
|
5d120deb60ca
Enable rudimentary support for valgrind, including functions that tell valgrind
Jerry James <james@xemacs.org>
parents:
4776
diff
changeset
|
5465 This just prints a summary of leaked memory, rather than all the details. |
|
5d120deb60ca
Enable rudimentary support for valgrind, including functions that tell valgrind
Jerry James <james@xemacs.org>
parents:
4776
diff
changeset
|
5466 The results of the leak check are sent to stderr. |
|
5d120deb60ca
Enable rudimentary support for valgrind, including functions that tell valgrind
Jerry James <james@xemacs.org>
parents:
4776
diff
changeset
|
5467 */ |
|
5d120deb60ca
Enable rudimentary support for valgrind, including functions that tell valgrind
Jerry James <james@xemacs.org>
parents:
4776
diff
changeset
|
5468 ()) |
|
5d120deb60ca
Enable rudimentary support for valgrind, including functions that tell valgrind
Jerry James <james@xemacs.org>
parents:
4776
diff
changeset
|
5469 { |
|
5d120deb60ca
Enable rudimentary support for valgrind, including functions that tell valgrind
Jerry James <james@xemacs.org>
parents:
4776
diff
changeset
|
5470 VALGRIND_DO_QUICK_LEAK_CHECK; |
|
5d120deb60ca
Enable rudimentary support for valgrind, including functions that tell valgrind
Jerry James <james@xemacs.org>
parents:
4776
diff
changeset
|
5471 return Qnil; |
|
5d120deb60ca
Enable rudimentary support for valgrind, including functions that tell valgrind
Jerry James <james@xemacs.org>
parents:
4776
diff
changeset
|
5472 } |
|
5d120deb60ca
Enable rudimentary support for valgrind, including functions that tell valgrind
Jerry James <james@xemacs.org>
parents:
4776
diff
changeset
|
5473 #endif /* USE_VALGRIND */ |
|
5d120deb60ca
Enable rudimentary support for valgrind, including functions that tell valgrind
Jerry James <james@xemacs.org>
parents:
4776
diff
changeset
|
5474 |
| 428 | 5475 |
|
5160
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
5476 /************************************************************************/ |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
5477 /* Initialization */ |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
5478 /************************************************************************/ |
|
ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
Ben Wing <ben@xemacs.org>
parents:
5159
diff
changeset
|
5479 |
| 428 | 5480 /* Initialization */ |
| 771 | 5481 static void |
| 1204 | 5482 common_init_alloc_early (void) |
| 428 | 5483 { |
| 771 | 5484 #ifndef Qzero |
| 5485 Qzero = make_int (0); /* Only used if Lisp_Object is a union type */ | |
| 5486 #endif | |
| 5487 | |
| 5488 #ifndef Qnull_pointer | |
| 5489 /* C guarantees that Qnull_pointer will be initialized to all 0 bits, | |
| 5490 so the following is actually a no-op. */ | |
| 793 | 5491 Qnull_pointer = wrap_pointer_1 (0); |
| 771 | 5492 #endif |
| 5493 | |
| 3263 | 5494 #ifndef NEW_GC |
| 428 | 5495 breathing_space = 0; |
| 5496 all_lcrecords = 0; | |
| 3263 | 5497 #endif /* not NEW_GC */ |
| 428 | 5498 ignore_malloc_warnings = 1; |
| 5499 #ifdef DOUG_LEA_MALLOC | |
| 5500 mallopt (M_TRIM_THRESHOLD, 128*1024); /* trim threshold */ | |
| 5501 mallopt (M_MMAP_THRESHOLD, 64*1024); /* mmap threshold */ | |
| 5502 #if 0 /* Moved to emacs.c */ | |
| 5503 mallopt (M_MMAP_MAX, 64); /* max. number of mmap'ed areas */ | |
| 5504 #endif | |
| 5505 #endif | |
| 3092 | 5506 #ifndef NEW_GC |
| 2720 | 5507 init_string_chars_alloc (); |
| 428 | 5508 init_string_alloc (); |
|
5157
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5509 /* #### Is it intentional that this is called twice? --ben */ |
| 428 | 5510 init_string_chars_alloc (); |
| 5511 init_cons_alloc (); | |
| 5512 init_symbol_alloc (); | |
| 5513 init_compiled_function_alloc (); | |
| 5514 init_float_alloc (); | |
| 1983 | 5515 #ifdef HAVE_BIGNUM |
| 5516 init_bignum_alloc (); | |
| 5517 #endif | |
| 5518 #ifdef HAVE_RATIO | |
| 5519 init_ratio_alloc (); | |
| 5520 #endif | |
| 5521 #ifdef HAVE_BIGFLOAT | |
| 5522 init_bigfloat_alloc (); | |
| 5523 #endif | |
| 428 | 5524 init_marker_alloc (); |
| 5525 init_extent_alloc (); | |
| 5526 init_event_alloc (); | |
| 1204 | 5527 #ifdef EVENT_DATA_AS_OBJECTS |
| 934 | 5528 init_key_data_alloc (); |
| 5529 init_button_data_alloc (); | |
| 5530 init_motion_data_alloc (); | |
| 5531 init_process_data_alloc (); | |
| 5532 init_timeout_data_alloc (); | |
| 5533 init_magic_data_alloc (); | |
| 5534 init_magic_eval_data_alloc (); | |
| 5535 init_eval_data_alloc (); | |
| 5536 init_misc_user_data_alloc (); | |
| 1204 | 5537 #endif /* EVENT_DATA_AS_OBJECTS */ |
| 3263 | 5538 #endif /* not NEW_GC */ |
| 428 | 5539 |
| 5540 ignore_malloc_warnings = 0; | |
| 5541 | |
| 452 | 5542 if (staticpros_nodump) |
| 5543 Dynarr_free (staticpros_nodump); | |
| 5544 staticpros_nodump = Dynarr_new2 (Lisp_Object_ptr_dynarr, Lisp_Object *); | |
| 5545 Dynarr_resize (staticpros_nodump, 100); /* merely a small optimization */ | |
| 771 | 5546 #ifdef DEBUG_XEMACS |
| 5547 if (staticpro_nodump_names) | |
| 5548 Dynarr_free (staticpro_nodump_names); | |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
5549 staticpro_nodump_names = Dynarr_new2 (const_Ascbyte_ptr_dynarr, |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
5550 const Ascbyte *); |
| 771 | 5551 Dynarr_resize (staticpro_nodump_names, 100); /* ditto */ |
| 5552 #endif | |
| 428 | 5553 |
| 3263 | 5554 #ifdef NEW_GC |
| 2720 | 5555 mcpros = Dynarr_new2 (Lisp_Object_dynarr, Lisp_Object); |
| 5556 Dynarr_resize (mcpros, 1410); /* merely a small optimization */ | |
| 5557 dump_add_root_block_ptr (&mcpros, &mcpros_description); | |
| 5558 #ifdef DEBUG_XEMACS | |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
5559 mcpro_names = Dynarr_new2 (const_Ascbyte_ptr_dynarr, const Ascbyte *); |
| 2720 | 5560 Dynarr_resize (mcpro_names, 1410); /* merely a small optimization */ |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
5561 dump_add_root_block_ptr (&mcpro_names, |
| 4964 | 5562 &const_Ascbyte_ptr_dynarr_description); |
| 2720 | 5563 #endif |
| 3263 | 5564 #endif /* NEW_GC */ |
| 2720 | 5565 |
| 428 | 5566 consing_since_gc = 0; |
| 851 | 5567 need_to_check_c_alloca = 0; |
| 5568 funcall_allocation_flag = 0; | |
| 5569 funcall_alloca_count = 0; | |
| 814 | 5570 |
| 3263 | 5571 #ifndef NEW_GC |
| 428 | 5572 debug_string_purity = 0; |
| 3263 | 5573 #endif /* not NEW_GC */ |
| 428 | 5574 |
| 800 | 5575 #ifdef ERROR_CHECK_TYPES |
| 428 | 5576 ERROR_ME.really_unlikely_name_to_have_accidentally_in_a_non_errb_structure = |
| 5577 666; | |
| 5578 ERROR_ME_NOT. | |
| 5579 really_unlikely_name_to_have_accidentally_in_a_non_errb_structure = 42; | |
| 5580 ERROR_ME_WARN. | |
| 5581 really_unlikely_name_to_have_accidentally_in_a_non_errb_structure = | |
| 5582 3333632; | |
| 793 | 5583 ERROR_ME_DEBUG_WARN. |
| 5584 really_unlikely_name_to_have_accidentally_in_a_non_errb_structure = | |
| 5585 8675309; | |
| 800 | 5586 #endif /* ERROR_CHECK_TYPES */ |
| 428 | 5587 } |
| 5588 | |
| 3263 | 5589 #ifndef NEW_GC |
| 771 | 5590 static void |
| 5591 init_lcrecord_lists (void) | |
| 5592 { | |
| 5593 int i; | |
| 5594 | |
| 5595 for (i = 0; i < countof (lrecord_implementations_table); i++) | |
| 5596 { | |
| 5597 all_lcrecord_lists[i] = Qzero; /* Qnil not yet set */ | |
| 5598 staticpro_nodump (&all_lcrecord_lists[i]); | |
| 5599 } | |
| 5600 } | |
| 3263 | 5601 #endif /* not NEW_GC */ |
| 771 | 5602 |
| 5603 void | |
| 1204 | 5604 init_alloc_early (void) |
| 771 | 5605 { |
| 1204 | 5606 #if defined (__cplusplus) && defined (ERROR_CHECK_GC) |
| 5607 static struct gcpro initial_gcpro; | |
| 5608 | |
| 5609 initial_gcpro.next = 0; | |
| 5610 initial_gcpro.var = &Qnil; | |
| 5611 initial_gcpro.nvars = 1; | |
| 5612 gcprolist = &initial_gcpro; | |
| 5613 #else | |
| 5614 gcprolist = 0; | |
| 5615 #endif /* defined (__cplusplus) && defined (ERROR_CHECK_GC) */ | |
| 5616 } | |
| 5617 | |
|
5157
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5618 static void |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5619 reinit_alloc_objects_early (void) |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5620 { |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5621 OBJECT_HAS_METHOD (string, getprop); |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5622 OBJECT_HAS_METHOD (string, putprop); |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5623 OBJECT_HAS_METHOD (string, remprop); |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5624 OBJECT_HAS_METHOD (string, plist); |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5625 } |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5626 |
| 1204 | 5627 void |
| 5628 reinit_alloc_early (void) | |
| 5629 { | |
| 5630 common_init_alloc_early (); | |
| 3263 | 5631 #ifndef NEW_GC |
| 771 | 5632 init_lcrecord_lists (); |
| 3263 | 5633 #endif /* not NEW_GC */ |
|
5157
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5634 reinit_alloc_objects_early (); |
| 771 | 5635 } |
| 5636 | |
| 428 | 5637 void |
| 5638 init_alloc_once_early (void) | |
| 5639 { | |
| 1204 | 5640 common_init_alloc_early (); |
| 428 | 5641 |
| 442 | 5642 { |
| 5643 int i; | |
| 5644 for (i = 0; i < countof (lrecord_implementations_table); i++) | |
| 5645 lrecord_implementations_table[i] = 0; | |
| 5646 } | |
| 5647 | |
|
5146
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
5648 dump_add_opaque (lrecord_uid_counter, sizeof (lrecord_uid_counter)); |
|
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
5649 |
| 452 | 5650 staticpros = Dynarr_new2 (Lisp_Object_ptr_dynarr, Lisp_Object *); |
| 5651 Dynarr_resize (staticpros, 1410); /* merely a small optimization */ | |
| 2367 | 5652 dump_add_root_block_ptr (&staticpros, &staticpros_description); |
| 771 | 5653 #ifdef DEBUG_XEMACS |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
5654 staticpro_names = Dynarr_new2 (const_Ascbyte_ptr_dynarr, const Ascbyte *); |
| 771 | 5655 Dynarr_resize (staticpro_names, 1410); /* merely a small optimization */ |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
5656 dump_add_root_block_ptr (&staticpro_names, |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
5657 &const_Ascbyte_ptr_dynarr_description); |
| 771 | 5658 #endif |
| 5659 | |
| 3263 | 5660 #ifdef NEW_GC |
| 2720 | 5661 mcpros = Dynarr_new2 (Lisp_Object_dynarr, Lisp_Object); |
| 5662 Dynarr_resize (mcpros, 1410); /* merely a small optimization */ | |
| 5663 dump_add_root_block_ptr (&mcpros, &mcpros_description); | |
| 5664 #ifdef DEBUG_XEMACS | |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
5665 mcpro_names = Dynarr_new2 (const_Ascbyte_ptr_dynarr, const Ascbyte *); |
| 2720 | 5666 Dynarr_resize (mcpro_names, 1410); /* merely a small optimization */ |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
5667 dump_add_root_block_ptr (&mcpro_names, |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4938
diff
changeset
|
5668 &const_Ascbyte_ptr_dynarr_description); |
| 2720 | 5669 #endif |
| 3263 | 5670 #else /* not NEW_GC */ |
| 771 | 5671 init_lcrecord_lists (); |
| 3263 | 5672 #endif /* not NEW_GC */ |
|
5157
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5673 |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5674 INIT_LISP_OBJECT (cons); |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5675 INIT_LISP_OBJECT (vector); |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5676 INIT_LISP_OBJECT (string); |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5677 |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5678 #ifdef NEW_GC |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5679 INIT_LISP_OBJECT (string_indirect_data); |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5680 INIT_LISP_OBJECT (string_direct_data); |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5681 #endif /* NEW_GC */ |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5682 #ifndef NEW_GC |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5683 INIT_LISP_OBJECT (lcrecord_list); |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5684 INIT_LISP_OBJECT (free); |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5685 #endif /* not NEW_GC */ |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5686 |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5687 reinit_alloc_objects_early (); |
| 428 | 5688 } |
| 5689 | |
| 5690 void | |
| 5691 syms_of_alloc (void) | |
| 5692 { | |
| 442 | 5693 DEFSYMBOL (Qgarbage_collecting); |
| 428 | 5694 |
|
5157
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5695 #ifdef MEMORY_USAGE_STATS |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5696 DEFSYMBOL (Qobject_actually_requested); |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5697 DEFSYMBOL (Qobject_malloc_overhead); |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5698 DEFSYMBOL (Qother_memory_actually_requested); |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5699 DEFSYMBOL (Qother_memory_malloc_overhead); |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5700 DEFSYMBOL (Qother_memory_dynarr_overhead); |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5701 DEFSYMBOL (Qother_memory_gap_overhead); |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5702 #endif /* MEMORY_USAGE_STATS */ |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5703 |
| 428 | 5704 DEFSUBR (Fcons); |
| 5705 DEFSUBR (Flist); | |
|
5354
22c4e67a2e69
Remove #'acons from cl.el, make the version in alloc.c visible to Lisp
Aidan Kehoe <kehoea@parhasard.net>
parents:
5307
diff
changeset
|
5706 DEFSUBR (Facons); |
| 428 | 5707 DEFSUBR (Fvector); |
| 5708 DEFSUBR (Fbit_vector); | |
| 5709 DEFSUBR (Fmake_byte_code); | |
| 5710 DEFSUBR (Fmake_list); | |
| 5711 DEFSUBR (Fmake_vector); | |
| 5712 DEFSUBR (Fmake_bit_vector); | |
| 5713 DEFSUBR (Fmake_string); | |
| 5714 DEFSUBR (Fstring); | |
| 5715 DEFSUBR (Fmake_symbol); | |
| 5716 DEFSUBR (Fmake_marker); | |
| 2994 | 5717 #ifdef ALLOC_TYPE_STATS |
| 5718 DEFSUBR (Fobject_memory_usage_stats); | |
|
5157
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5719 DEFSUBR (Ftotal_object_memory_usage); |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5720 #endif /* ALLOC_TYPE_STATS */ |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5721 #ifdef MEMORY_USAGE_STATS |
| 2994 | 5722 DEFSUBR (Fobject_memory_usage); |
|
5157
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5723 #endif /* MEMORY_USAGE_STATS */ |
| 428 | 5724 DEFSUBR (Fgarbage_collect); |
| 440 | 5725 #if 0 |
| 428 | 5726 DEFSUBR (Fmemory_limit); |
| 440 | 5727 #endif |
| 2994 | 5728 DEFSUBR (Ftotal_memory_usage); |
| 428 | 5729 DEFSUBR (Fconsing_since_gc); |
|
4803
5d120deb60ca
Enable rudimentary support for valgrind, including functions that tell valgrind
Jerry James <james@xemacs.org>
parents:
4776
diff
changeset
|
5730 #ifdef USE_VALGRIND |
|
5d120deb60ca
Enable rudimentary support for valgrind, including functions that tell valgrind
Jerry James <james@xemacs.org>
parents:
4776
diff
changeset
|
5731 DEFSUBR (Fvalgrind_leak_check); |
|
5d120deb60ca
Enable rudimentary support for valgrind, including functions that tell valgrind
Jerry James <james@xemacs.org>
parents:
4776
diff
changeset
|
5732 DEFSUBR (Fvalgrind_quick_leak_check); |
|
5d120deb60ca
Enable rudimentary support for valgrind, including functions that tell valgrind
Jerry James <james@xemacs.org>
parents:
4776
diff
changeset
|
5733 #endif |
| 428 | 5734 } |
| 5735 | |
| 5736 void | |
|
5157
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5737 reinit_vars_of_alloc (void) |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5738 { |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5739 #ifdef MEMORY_USAGE_STATS |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5740 compute_memusage_stats_length (); |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5741 #endif /* MEMORY_USAGE_STATS */ |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5742 } |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5743 |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
5744 void |
| 428 | 5745 vars_of_alloc (void) |
| 5746 { | |
|
5307
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5229
diff
changeset
|
5747 DEFVAR_CONST_INT ("array-rank-limit", &Varray_rank_limit /* |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5229
diff
changeset
|
5748 The exclusive upper bound on the number of dimensions an array may have. |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5229
diff
changeset
|
5749 |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5229
diff
changeset
|
5750 XEmacs does not support multidimensional arrays, meaning this constant is, |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5229
diff
changeset
|
5751 for the moment, 2. |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5229
diff
changeset
|
5752 */); |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5229
diff
changeset
|
5753 Varray_rank_limit = 2; |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5229
diff
changeset
|
5754 |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5229
diff
changeset
|
5755 DEFVAR_CONST_INT ("array-dimension-limit", &Varray_dimension_limit /* |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5229
diff
changeset
|
5756 The exclusive upper bound of an array's dimension. |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5229
diff
changeset
|
5757 Note that XEmacs may not have enough memory available to create an array |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5229
diff
changeset
|
5758 with this dimension. |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5229
diff
changeset
|
5759 */); |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5229
diff
changeset
|
5760 Varray_dimension_limit = ARRAY_DIMENSION_LIMIT; |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5229
diff
changeset
|
5761 |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5229
diff
changeset
|
5762 DEFVAR_CONST_INT ("array-total-size-limit", &Varray_total_size_limit /* |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5229
diff
changeset
|
5763 The exclusive upper bound on the number of elements an array may contain. |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5229
diff
changeset
|
5764 |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5229
diff
changeset
|
5765 In Common Lisp, this is distinct from `array-dimension-limit', because |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5229
diff
changeset
|
5766 arrays can have more than one dimension. In XEmacs this is not the case, |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5229
diff
changeset
|
5767 and multi-dimensional arrays need to be implemented by the user with arrays |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5229
diff
changeset
|
5768 of arrays. |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5229
diff
changeset
|
5769 |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5229
diff
changeset
|
5770 Note that XEmacs may not have enough memory available to create an array |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5229
diff
changeset
|
5771 with this dimension. |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5229
diff
changeset
|
5772 */); |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5229
diff
changeset
|
5773 Varray_total_size_limit = ARRAY_DIMENSION_LIMIT; |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5229
diff
changeset
|
5774 |
| 428 | 5775 #ifdef DEBUG_XEMACS |
| 5776 DEFVAR_INT ("debug-allocation", &debug_allocation /* | |
| 5777 If non-zero, print out information to stderr about all objects allocated. | |
| 5778 See also `debug-allocation-backtrace-length'. | |
| 5779 */ ); | |
| 5780 debug_allocation = 0; | |
| 5781 | |
| 5782 DEFVAR_INT ("debug-allocation-backtrace-length", | |
| 5783 &debug_allocation_backtrace_length /* | |
| 5784 Length (in stack frames) of short backtrace printed out by `debug-allocation'. | |
| 5785 */ ); | |
| 5786 debug_allocation_backtrace_length = 2; | |
| 5787 #endif | |
| 5788 | |
| 5789 DEFVAR_BOOL ("purify-flag", &purify_flag /* | |
| 5790 Non-nil means loading Lisp code in order to dump an executable. | |
| 5791 This means that certain objects should be allocated in readonly space. | |
| 5792 */ ); | |
| 5793 } |