diff options
| author | Paul Eggert | 2018-08-14 12:07:09 -0700 |
|---|---|---|
| committer | Paul Eggert | 2018-08-14 12:08:03 -0700 |
| commit | 11c7c2f758f8f07e7b917fbc93267cee236a80e5 (patch) | |
| tree | abd4c9e192fe6f0a125f54b61b881fff73f58de0 /src/alloc.c | |
| parent | db6f511eb709def49280ca5ff2f05b2b7cbfd98d (diff) | |
| download | emacs-11c7c2f758f8f07e7b917fbc93267cee236a80e5.tar.gz emacs-11c7c2f758f8f07e7b917fbc93267cee236a80e5.zip | |
Remove more traces of misc (Bug#32405)
Remove misc-objects-consed and the misc component of
memory-use-count, since misc objects no longer exist.
* doc/lispref/internals.texi, etc/NEWS: Mention this,
and adjust better to recent removal of misc objects.
* src/alloc.c (MEM_TYPE_MISC): Remove; no longer used.
(Fmemory_use_counts): Omit misc count, since miscs
no longer exist.
(misc-objects-consed): Remove.
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/alloc.c b/src/alloc.c index fb8a8c98b08..6a938211599 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -379,7 +379,6 @@ enum mem_type | |||
| 379 | MEM_TYPE_BUFFER, | 379 | MEM_TYPE_BUFFER, |
| 380 | MEM_TYPE_CONS, | 380 | MEM_TYPE_CONS, |
| 381 | MEM_TYPE_STRING, | 381 | MEM_TYPE_STRING, |
| 382 | MEM_TYPE_MISC, | ||
| 383 | MEM_TYPE_SYMBOL, | 382 | MEM_TYPE_SYMBOL, |
| 384 | MEM_TYPE_FLOAT, | 383 | MEM_TYPE_FLOAT, |
| 385 | /* Since all non-bool pseudovectors are small enough to be | 384 | /* Since all non-bool pseudovectors are small enough to be |
| @@ -7023,11 +7022,10 @@ Each of these counters increments for a certain kind of object. | |||
| 7023 | The counters wrap around from the largest positive integer to zero. | 7022 | The counters wrap around from the largest positive integer to zero. |
| 7024 | Garbage collection does not decrease them. | 7023 | Garbage collection does not decrease them. |
| 7025 | The elements of the value are as follows: | 7024 | The elements of the value are as follows: |
| 7026 | (CONSES FLOATS VECTOR-CELLS SYMBOLS STRING-CHARS MISCS INTERVALS STRINGS) | 7025 | (CONSES FLOATS VECTOR-CELLS SYMBOLS STRING-CHARS INTERVALS STRINGS) |
| 7027 | All are in units of 1 = one object consed | 7026 | All are in units of 1 = one object consed |
| 7028 | except for VECTOR-CELLS and STRING-CHARS, which count the total length of | 7027 | except for VECTOR-CELLS and STRING-CHARS, which count the total length of |
| 7029 | objects consed. | 7028 | objects consed. |
| 7030 | MISCS include overlays, markers, and some internal types. | ||
| 7031 | Frames, windows, buffers, and subprocesses count as vectors | 7029 | Frames, windows, buffers, and subprocesses count as vectors |
| 7032 | (but the contents of a buffer's text do not count here). */) | 7030 | (but the contents of a buffer's text do not count here). */) |
| 7033 | (void) | 7031 | (void) |
| @@ -7038,7 +7036,6 @@ Frames, windows, buffers, and subprocesses count as vectors | |||
| 7038 | bounded_number (vector_cells_consed), | 7036 | bounded_number (vector_cells_consed), |
| 7039 | bounded_number (symbols_consed), | 7037 | bounded_number (symbols_consed), |
| 7040 | bounded_number (string_chars_consed), | 7038 | bounded_number (string_chars_consed), |
| 7041 | bounded_number (misc_objects_consed), | ||
| 7042 | bounded_number (intervals_consed), | 7039 | bounded_number (intervals_consed), |
| 7043 | bounded_number (strings_consed)); | 7040 | bounded_number (strings_consed)); |
| 7044 | } | 7041 | } |
| @@ -7297,11 +7294,6 @@ If this portion is smaller than `gc-cons-threshold', this is ignored. */); | |||
| 7297 | DEFVAR_INT ("string-chars-consed", string_chars_consed, | 7294 | DEFVAR_INT ("string-chars-consed", string_chars_consed, |
| 7298 | doc: /* Number of string characters that have been consed so far. */); | 7295 | doc: /* Number of string characters that have been consed so far. */); |
| 7299 | 7296 | ||
| 7300 | DEFVAR_INT ("misc-objects-consed", misc_objects_consed, | ||
| 7301 | doc: /* Number of miscellaneous objects that have been consed so far. | ||
| 7302 | These include markers and overlays, plus certain objects not visible | ||
| 7303 | to users. */); | ||
| 7304 | |||
| 7305 | DEFVAR_INT ("intervals-consed", intervals_consed, | 7297 | DEFVAR_INT ("intervals-consed", intervals_consed, |
| 7306 | doc: /* Number of intervals that have been consed so far. */); | 7298 | doc: /* Number of intervals that have been consed so far. */); |
| 7307 | 7299 | ||