annotate src/ralloc.c @ 101369:5ceb2eda0cbb

Remove local var.
author Chong Yidong <cyd@stupidchicken.com>
date Fri, 23 Jan 2009 03:34:00 +0000
parents e038c1a8307c
children 68dd71358159
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 36187
diff changeset
1 /* Block-relocating memory allocator.
75227
e90d04cd455a Update copyright for years from Emacs 21 to present (mainly adding
Glenn Morris <rgm@gnu.org>
parents: 73539
diff changeset
2 Copyright (C) 1993, 1995, 2000, 2001, 2002, 2003, 2004,
100951
e038c1a8307c Add 2009 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 100674
diff changeset
3 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5 This file is part of GNU Emacs.
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6
94963
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 79759
diff changeset
7 GNU Emacs is free software: you can redistribute it and/or modify
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8 it under the terms of the GNU General Public License as published by
94963
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 79759
diff changeset
9 the Free Software Foundation, either version 3 of the License, or
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 79759
diff changeset
10 (at your option) any later version.
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12 GNU Emacs is distributed in the hope that it will be useful,
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13 but WITHOUT ANY WARRANTY; without even the implied warranty of
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
15 GNU General Public License for more details.
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
16
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
17 You should have received a copy of the GNU General Public License
94963
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 79759
diff changeset
18 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
19
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
20 /* NOTES:
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
21
3591
507f64624555 Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents: 3136
diff changeset
22 Only relocate the blocs necessary for SIZE in r_alloc_sbrk,
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
23 rather than all of them. This means allowing for a possible
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
24 hole between the first bloc and the end of malloc storage. */
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
25
1390
92df75f4167f (check_memory_limits): Reduce warnlevel when usage drops far enough.
Richard M. Stallman <rms@gnu.org>
parents: 1249
diff changeset
26 #ifdef emacs
1403
f0ea279194f8 Removed #include "mem-limits.h".
Roland McGrath <roland@gnu.org>
parents: 1401
diff changeset
27
4696
1fc792473491 Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents: 4230
diff changeset
28 #include <config.h>
577
53f29271d1b0 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
29 #include "lisp.h" /* Needed for VALBITS. */
61226
1050c59c8ed5 #include blockinput also
Jan Djärv <jan.h.d@swipnet.se>
parents: 61225
diff changeset
30 #include "blockinput.h"
31414
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
31
29917
ee0c984f226d Maybe include unistd.h.
Dave Love <fx@gnu.org>
parents: 19999
diff changeset
32 #ifdef HAVE_UNISTD_H
ee0c984f226d Maybe include unistd.h.
Dave Love <fx@gnu.org>
parents: 19999
diff changeset
33 #include <unistd.h>
ee0c984f226d Maybe include unistd.h.
Dave Love <fx@gnu.org>
parents: 19999
diff changeset
34 #endif
1403
f0ea279194f8 Removed #include "mem-limits.h".
Roland McGrath <roland@gnu.org>
parents: 1401
diff changeset
35
31414
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
36 typedef POINTER_TYPE *POINTER;
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
37 typedef size_t SIZE;
1451
107c9b227e7f [emacs]: Define POINTER and SIZE.
Richard M. Stallman <rms@gnu.org>
parents: 1403
diff changeset
38
1390
92df75f4167f (check_memory_limits): Reduce warnlevel when usage drops far enough.
Richard M. Stallman <rms@gnu.org>
parents: 1249
diff changeset
39 /* Declared in dispnew.c, this version doesn't screw up if regions
92df75f4167f (check_memory_limits): Reduce warnlevel when usage drops far enough.
Richard M. Stallman <rms@gnu.org>
parents: 1249
diff changeset
40 overlap. */
31414
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
41
1390
92df75f4167f (check_memory_limits): Reduce warnlevel when usage drops far enough.
Richard M. Stallman <rms@gnu.org>
parents: 1249
diff changeset
42 extern void safe_bcopy ();
1403
f0ea279194f8 Removed #include "mem-limits.h".
Roland McGrath <roland@gnu.org>
parents: 1401
diff changeset
43
17845
ac6367122ee2 (mallopt): Declare, if appropriate.
Richard M. Stallman <rms@gnu.org>
parents: 14953
diff changeset
44 #ifdef DOUG_LEA_MALLOC
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 36187
diff changeset
45 #define M_TOP_PAD -2
17845
ac6367122ee2 (mallopt): Declare, if appropriate.
Richard M. Stallman <rms@gnu.org>
parents: 14953
diff changeset
46 extern int mallopt ();
31414
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
47 #else /* not DOUG_LEA_MALLOC */
31498
17d4a8f3df67 Don't include string.h (redundant).
Dave Love <fx@gnu.org>
parents: 31473
diff changeset
48 #ifndef SYSTEM_MALLOC
31891
d8d68cbd1113 (__malloc_extra_blocks): Declare as __malloc_size_t.
Dave Love <fx@gnu.org>
parents: 31606
diff changeset
49 extern size_t __malloc_extra_blocks;
31498
17d4a8f3df67 Don't include string.h (redundant).
Dave Love <fx@gnu.org>
parents: 31473
diff changeset
50 #endif /* SYSTEM_MALLOC */
31414
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
51 #endif /* not DOUG_LEA_MALLOC */
10785
f3a45c2e57c2 (r_alloc_init): Set __malloc_extra_blocks.
Richard M. Stallman <rms@gnu.org>
parents: 10767
diff changeset
52
10747
c6a68e4ee53a (r_alloc_free): Call refill_memory_reserve only if emacs.
Richard M. Stallman <rms@gnu.org>
parents: 10682
diff changeset
53 #else /* not emacs */
1403
f0ea279194f8 Removed #include "mem-limits.h".
Roland McGrath <roland@gnu.org>
parents: 1401
diff changeset
54
1390
92df75f4167f (check_memory_limits): Reduce warnlevel when usage drops far enough.
Richard M. Stallman <rms@gnu.org>
parents: 1249
diff changeset
55 #include <stddef.h>
1403
f0ea279194f8 Removed #include "mem-limits.h".
Roland McGrath <roland@gnu.org>
parents: 1401
diff changeset
56
1390
92df75f4167f (check_memory_limits): Reduce warnlevel when usage drops far enough.
Richard M. Stallman <rms@gnu.org>
parents: 1249
diff changeset
57 typedef size_t SIZE;
92df75f4167f (check_memory_limits): Reduce warnlevel when usage drops far enough.
Richard M. Stallman <rms@gnu.org>
parents: 1249
diff changeset
58 typedef void *POINTER;
1403
f0ea279194f8 Removed #include "mem-limits.h".
Roland McGrath <roland@gnu.org>
parents: 1401
diff changeset
59
f0ea279194f8 Removed #include "mem-limits.h".
Roland McGrath <roland@gnu.org>
parents: 1401
diff changeset
60 #include <unistd.h>
f0ea279194f8 Removed #include "mem-limits.h".
Roland McGrath <roland@gnu.org>
parents: 1401
diff changeset
61 #include <malloc.h>
f0ea279194f8 Removed #include "mem-limits.h".
Roland McGrath <roland@gnu.org>
parents: 1401
diff changeset
62
1390
92df75f4167f (check_memory_limits): Reduce warnlevel when usage drops far enough.
Richard M. Stallman <rms@gnu.org>
parents: 1249
diff changeset
63 #define safe_bcopy(x, y, z) memmove (y, x, z)
10747
c6a68e4ee53a (r_alloc_free): Call refill_memory_reserve only if emacs.
Richard M. Stallman <rms@gnu.org>
parents: 10682
diff changeset
64 #define bzero(x, len) memset (x, 0, len)
1390
92df75f4167f (check_memory_limits): Reduce warnlevel when usage drops far enough.
Richard M. Stallman <rms@gnu.org>
parents: 1249
diff changeset
65
10747
c6a68e4ee53a (r_alloc_free): Call refill_memory_reserve only if emacs.
Richard M. Stallman <rms@gnu.org>
parents: 10682
diff changeset
66 #endif /* not emacs */
c6a68e4ee53a (r_alloc_free): Call refill_memory_reserve only if emacs.
Richard M. Stallman <rms@gnu.org>
parents: 10682
diff changeset
67
31414
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
68
10747
c6a68e4ee53a (r_alloc_free): Call refill_memory_reserve only if emacs.
Richard M. Stallman <rms@gnu.org>
parents: 10682
diff changeset
69 #include "getpagesize.h"
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
70
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
71 #define NIL ((POINTER) 0)
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
72
1390
92df75f4167f (check_memory_limits): Reduce warnlevel when usage drops far enough.
Richard M. Stallman <rms@gnu.org>
parents: 1249
diff changeset
73 /* A flag to indicate whether we have initialized ralloc yet. For
92df75f4167f (check_memory_limits): Reduce warnlevel when usage drops far enough.
Richard M. Stallman <rms@gnu.org>
parents: 1249
diff changeset
74 Emacs's sake, please do not make this local to malloc_init; on some
92df75f4167f (check_memory_limits): Reduce warnlevel when usage drops far enough.
Richard M. Stallman <rms@gnu.org>
parents: 1249
diff changeset
75 machines, the dumping procedure makes all static variables
92df75f4167f (check_memory_limits): Reduce warnlevel when usage drops far enough.
Richard M. Stallman <rms@gnu.org>
parents: 1249
diff changeset
76 read-only. On these machines, the word static is #defined to be
92df75f4167f (check_memory_limits): Reduce warnlevel when usage drops far enough.
Richard M. Stallman <rms@gnu.org>
parents: 1249
diff changeset
77 the empty string, meaning that r_alloc_initialized becomes an
31414
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
78 automatic variable, and loses its value each time Emacs is started
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
79 up. */
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
80
1390
92df75f4167f (check_memory_limits): Reduce warnlevel when usage drops far enough.
Richard M. Stallman <rms@gnu.org>
parents: 1249
diff changeset
81 static int r_alloc_initialized = 0;
92df75f4167f (check_memory_limits): Reduce warnlevel when usage drops far enough.
Richard M. Stallman <rms@gnu.org>
parents: 1249
diff changeset
82
92df75f4167f (check_memory_limits): Reduce warnlevel when usage drops far enough.
Richard M. Stallman <rms@gnu.org>
parents: 1249
diff changeset
83 static void r_alloc_init ();
31414
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
84
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
85
577
53f29271d1b0 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
86 /* Declarations for working with the malloc, ralloc, and system breaks. */
53f29271d1b0 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
87
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
88 /* Function to set the real break value. */
30061
3de459e6c652 Make real_morecore non-static.
Andrew Innes <andrewi@gnu.org>
parents: 29917
diff changeset
89 POINTER (*real_morecore) ();
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
90
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
91 /* The break value, as seen by malloc. */
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
92 static POINTER virtual_break_value;
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
93
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
94 /* The address of the end of the last data in use by ralloc,
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
95 including relocatable blocs as well as malloc data. */
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
96 static POINTER break_value;
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
97
1473
6359d8850fa3 (relinquish): Adjust page_break_value by amount of memory actually given back.
Richard M. Stallman <rms@gnu.org>
parents: 1451
diff changeset
98 /* This is the size of a page. We round memory requests to this boundary. */
6359d8850fa3 (relinquish): Adjust page_break_value by amount of memory actually given back.
Richard M. Stallman <rms@gnu.org>
parents: 1451
diff changeset
99 static int page_size;
6359d8850fa3 (relinquish): Adjust page_break_value by amount of memory actually given back.
Richard M. Stallman <rms@gnu.org>
parents: 1451
diff changeset
100
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 36187
diff changeset
101 /* Whenever we get memory from the system, get this many extra bytes. This
1595
ac1be1d32868 * ralloc.c (relocate_some_blocs): Handle BLOC == NIL_BLOC.
Jim Blandy <jimb@redhat.com>
parents: 1473
diff changeset
102 must be a multiple of page_size. */
1473
6359d8850fa3 (relinquish): Adjust page_break_value by amount of memory actually given back.
Richard M. Stallman <rms@gnu.org>
parents: 1451
diff changeset
103 static int extra_bytes;
6359d8850fa3 (relinquish): Adjust page_break_value by amount of memory actually given back.
Richard M. Stallman <rms@gnu.org>
parents: 1451
diff changeset
104
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
105 /* Macros for rounding. Note that rounding to any value is possible
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
106 by changing the definition of PAGE. */
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
107 #define PAGE (getpagesize ())
4230
df4d091e603e (ALIGNED, ROUNDUP): Use `unsigned long int' instead of `unsigned int' for
Roland McGrath <roland@gnu.org>
parents: 3591
diff changeset
108 #define ALIGNED(addr) (((unsigned long int) (addr) & (page_size - 1)) == 0)
df4d091e603e (ALIGNED, ROUNDUP): Use `unsigned long int' instead of `unsigned int' for
Roland McGrath <roland@gnu.org>
parents: 3591
diff changeset
109 #define ROUNDUP(size) (((unsigned long int) (size) + page_size - 1) \
df4d091e603e (ALIGNED, ROUNDUP): Use `unsigned long int' instead of `unsigned int' for
Roland McGrath <roland@gnu.org>
parents: 3591
diff changeset
110 & ~(page_size - 1))
1473
6359d8850fa3 (relinquish): Adjust page_break_value by amount of memory actually given back.
Richard M. Stallman <rms@gnu.org>
parents: 1451
diff changeset
111 #define ROUND_TO_PAGE(addr) (addr & (~(page_size - 1)))
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
112
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
113 #define MEM_ALIGN sizeof(double)
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
114 #define MEM_ROUNDUP(addr) (((unsigned long int)(addr) + MEM_ALIGN - 1) \
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
115 & ~(MEM_ALIGN - 1))
31414
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
116
36187
72f30168f26c (__morecore) [!SYSTEM_MALLOC]: Move declaration
Gerd Moellmann <gerd@gnu.org>
parents: 31891
diff changeset
117 /* The hook `malloc' uses for the function which gets more space
72f30168f26c (__morecore) [!SYSTEM_MALLOC]: Move declaration
Gerd Moellmann <gerd@gnu.org>
parents: 31891
diff changeset
118 from the system. */
72f30168f26c (__morecore) [!SYSTEM_MALLOC]: Move declaration
Gerd Moellmann <gerd@gnu.org>
parents: 31891
diff changeset
119
72f30168f26c (__morecore) [!SYSTEM_MALLOC]: Move declaration
Gerd Moellmann <gerd@gnu.org>
parents: 31891
diff changeset
120 #ifndef SYSTEM_MALLOC
72f30168f26c (__morecore) [!SYSTEM_MALLOC]: Move declaration
Gerd Moellmann <gerd@gnu.org>
parents: 31891
diff changeset
121 extern POINTER (*__morecore) ();
72f30168f26c (__morecore) [!SYSTEM_MALLOC]: Move declaration
Gerd Moellmann <gerd@gnu.org>
parents: 31891
diff changeset
122 #endif
72f30168f26c (__morecore) [!SYSTEM_MALLOC]: Move declaration
Gerd Moellmann <gerd@gnu.org>
parents: 31891
diff changeset
123
72f30168f26c (__morecore) [!SYSTEM_MALLOC]: Move declaration
Gerd Moellmann <gerd@gnu.org>
parents: 31891
diff changeset
124
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
125
31414
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
126 /***********************************************************************
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
127 Implementation using sbrk
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
128 ***********************************************************************/
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
129
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
130 /* Data structures of heaps and blocs. */
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
131
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
132 /* The relocatable objects, or blocs, and the malloc data
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
133 both reside within one or more heaps.
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
134 Each heap contains malloc data, running from `start' to `bloc_start',
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
135 and relocatable objects, running from `bloc_start' to `free'.
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
136
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
137 Relocatable objects may relocate within the same heap
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
138 or may move into another heap; the heaps themselves may grow
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
139 but they never move.
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
140
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
141 We try to make just one heap and make it larger as necessary.
14036
621a575db6f7 Comment fixes.
Karl Heuer <kwzh@gnu.org>
parents: 11146
diff changeset
142 But sometimes we can't do that, because we can't get contiguous
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
143 space to add onto the heap. When that happens, we start a new heap. */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 36187
diff changeset
144
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
145 typedef struct heap
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
146 {
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
147 struct heap *next;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
148 struct heap *prev;
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
149 /* Start of memory range of this heap. */
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
150 POINTER start;
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
151 /* End of memory range of this heap. */
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
152 POINTER end;
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
153 /* Start of relocatable data in this heap. */
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
154 POINTER bloc_start;
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
155 /* Start of unused space in this heap. */
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
156 POINTER free;
9666
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
157 /* First bloc in this heap. */
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
158 struct bp *first_bloc;
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
159 /* Last bloc in this heap. */
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
160 struct bp *last_bloc;
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
161 } *heap_ptr;
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
162
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
163 #define NIL_HEAP ((heap_ptr) 0)
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
164 #define HEAP_PTR_SIZE (sizeof (struct heap))
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
165
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
166 /* This is the first heap object.
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
167 If we need additional heap objects, each one resides at the beginning of
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
168 the space it covers. */
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
169 static struct heap heap_base;
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
170
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
171 /* Head and tail of the list of heaps. */
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
172 static heap_ptr first_heap, last_heap;
577
53f29271d1b0 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
173
53f29271d1b0 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
174 /* These structures are allocated in the malloc arena.
53f29271d1b0 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
175 The linked list is kept in order of increasing '.data' members.
53f29271d1b0 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
176 The data blocks abut each other; if b->next is non-nil, then
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 36187
diff changeset
177 b->data + b->size == b->next->data.
11146
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
178
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
179 An element with variable==NIL denotes a freed block, which has not yet
99767
0d5b71c55b3c Fix typos in comments.
Juanma Barranquero <lekktu@gmail.com>
parents: 95479
diff changeset
180 been collected. They may only appear while r_alloc_freeze_level > 0,
0d5b71c55b3c Fix typos in comments.
Juanma Barranquero <lekktu@gmail.com>
parents: 95479
diff changeset
181 and will be freed when the arena is thawed. Currently, these blocs are
0d5b71c55b3c Fix typos in comments.
Juanma Barranquero <lekktu@gmail.com>
parents: 95479
diff changeset
182 not reusable, while the arena is frozen. Very inefficient. */
11146
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
183
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
184 typedef struct bp
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
185 {
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
186 struct bp *next;
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
187 struct bp *prev;
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
188 POINTER *variable;
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
189 POINTER data;
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
190 SIZE size;
14036
621a575db6f7 Comment fixes.
Karl Heuer <kwzh@gnu.org>
parents: 11146
diff changeset
191 POINTER new_data; /* temporarily used for relocation */
11146
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
192 struct heap *heap; /* Heap this bloc is in. */
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
193 } *bloc_ptr;
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
194
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
195 #define NIL_BLOC ((bloc_ptr) 0)
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
196 #define BLOC_PTR_SIZE (sizeof (struct bp))
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
197
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
198 /* Head and tail of the list of relocatable blocs. */
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
199 static bloc_ptr first_bloc, last_bloc;
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
200
11146
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
201 static int use_relocatable_buffers;
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
202
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
203 /* If >0, no relocation whatsoever takes place. */
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
204 static int r_alloc_freeze_level;
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
205
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
206
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
207 /* Functions to get and return memory from the system. */
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
208
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
209 /* Find the heap that ADDRESS falls within. */
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
210
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
211 static heap_ptr
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
212 find_heap (address)
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
213 POINTER address;
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
214 {
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
215 heap_ptr heap;
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
216
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
217 for (heap = last_heap; heap; heap = heap->prev)
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
218 {
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
219 if (heap->start <= address && address <= heap->end)
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
220 return heap;
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
221 }
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
222
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
223 return NIL_HEAP;
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
224 }
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
225
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
226 /* Find SIZE bytes of space in a heap.
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
227 Try to get them at ADDRESS (which must fall within some heap's range)
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
228 if we can get that many within one heap.
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
229
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
230 If enough space is not presently available in our reserve, this means
14036
621a575db6f7 Comment fixes.
Karl Heuer <kwzh@gnu.org>
parents: 11146
diff changeset
231 getting more page-aligned space from the system. If the returned space
621a575db6f7 Comment fixes.
Karl Heuer <kwzh@gnu.org>
parents: 11146
diff changeset
232 is not contiguous to the last heap, allocate a new heap, and append it
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
233
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
234 obtain does not try to keep track of whether space is in use
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
235 or not in use. It just returns the address of SIZE bytes that
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
236 fall within a single heap. If you call obtain twice in a row
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
237 with the same arguments, you typically get the same value.
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
238 to the heap list. It's the caller's responsibility to keep
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
239 track of what space is in use.
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
240
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
241 Return the address of the space if all went well, or zero if we couldn't
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
242 allocate the memory. */
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
243
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
244 static POINTER
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
245 obtain (address, size)
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
246 POINTER address;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
247 SIZE size;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
248 {
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
249 heap_ptr heap;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
250 SIZE already_available;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
251
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
252 /* Find the heap that ADDRESS falls within. */
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
253 for (heap = last_heap; heap; heap = heap->prev)
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
254 {
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
255 if (heap->start <= address && address <= heap->end)
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
256 break;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
257 }
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
258
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
259 if (! heap)
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
260 abort ();
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
261
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
262 /* If we can't fit SIZE bytes in that heap,
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
263 try successive later heaps. */
31473
055accd6bf1d (obtain, relinquish, relinquish, r_alloc_size_in_use)
Gerd Moellmann <gerd@gnu.org>
parents: 31468
diff changeset
264 while (heap && (char *) address + size > (char *) heap->end)
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
265 {
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
266 heap = heap->next;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
267 if (heap == NIL_HEAP)
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
268 break;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
269 address = heap->bloc_start;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
270 }
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
271
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
272 /* If we can't fit them within any existing heap,
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
273 get more space. */
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
274 if (heap == NIL_HEAP)
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
275 {
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
276 POINTER new = (*real_morecore)(0);
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
277 SIZE get;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
278
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
279 already_available = (char *)last_heap->end - (char *)address;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
280
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
281 if (new != last_heap->end)
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
282 {
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
283 /* Someone else called sbrk. Make a new heap. */
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
284
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
285 heap_ptr new_heap = (heap_ptr) MEM_ROUNDUP (new);
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
286 POINTER bloc_start = (POINTER) MEM_ROUNDUP ((POINTER)(new_heap + 1));
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
287
31473
055accd6bf1d (obtain, relinquish, relinquish, r_alloc_size_in_use)
Gerd Moellmann <gerd@gnu.org>
parents: 31468
diff changeset
288 if ((*real_morecore) ((char *) bloc_start - (char *) new) != new)
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
289 return 0;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
290
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
291 new_heap->start = new;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
292 new_heap->end = bloc_start;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
293 new_heap->bloc_start = bloc_start;
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
294 new_heap->free = bloc_start;
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
295 new_heap->next = NIL_HEAP;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
296 new_heap->prev = last_heap;
9666
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
297 new_heap->first_bloc = NIL_BLOC;
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
298 new_heap->last_bloc = NIL_BLOC;
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
299 last_heap->next = new_heap;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
300 last_heap = new_heap;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
301
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
302 address = bloc_start;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
303 already_available = 0;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
304 }
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
305
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
306 /* Add space to the last heap (which we may have just created).
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
307 Get some extra, so we can come here less often. */
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
308
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
309 get = size + extra_bytes - already_available;
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
310 get = (char *) ROUNDUP ((char *)last_heap->end + get)
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
311 - (char *) last_heap->end;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
312
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
313 if ((*real_morecore) (get) != last_heap->end)
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
314 return 0;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
315
31473
055accd6bf1d (obtain, relinquish, relinquish, r_alloc_size_in_use)
Gerd Moellmann <gerd@gnu.org>
parents: 31468
diff changeset
316 last_heap->end = (char *) last_heap->end + get;
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
317 }
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
318
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
319 return address;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
320 }
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
321
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
322 /* Return unused heap space to the system
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
323 if there is a lot of unused space now.
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
324 This can make the last heap smaller;
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
325 it can also eliminate the last heap entirely. */
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
326
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
327 static void
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
328 relinquish ()
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
329 {
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
330 register heap_ptr h;
73539
db045c86d29b * ralloc.c (relinquish): Use a long for excess space counter to
Chong Yidong <cyd@stupidchicken.com>
parents: 68651
diff changeset
331 long excess = 0;
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
332
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
333 /* Add the amount of space beyond break_value
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
334 in all heaps which have extend beyond break_value at all. */
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
335
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
336 for (h = last_heap; h && break_value < h->end; h = h->prev)
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
337 {
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
338 excess += (char *) h->end - (char *) ((break_value < h->bloc_start)
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
339 ? h->bloc_start : break_value);
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
340 }
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
341
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
342 if (excess > extra_bytes * 2 && (*real_morecore) (0) == last_heap->end)
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
343 {
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
344 /* Keep extra_bytes worth of empty space.
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
345 And don't free anything unless we can free at least extra_bytes. */
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
346 excess -= extra_bytes;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
347
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
348 if ((char *)last_heap->end - (char *)last_heap->bloc_start <= excess)
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
349 {
9666
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
350 /* This heap should have no blocs in it. */
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
351 if (last_heap->first_bloc != NIL_BLOC
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
352 || last_heap->last_bloc != NIL_BLOC)
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
353 abort ();
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
354
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
355 /* Return the last heap, with its header, to the system. */
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
356 excess = (char *)last_heap->end - (char *)last_heap->start;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
357 last_heap = last_heap->prev;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
358 last_heap->next = NIL_HEAP;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
359 }
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
360 else
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
361 {
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
362 excess = (char *) last_heap->end
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
363 - (char *) ROUNDUP ((char *)last_heap->end - excess);
31473
055accd6bf1d (obtain, relinquish, relinquish, r_alloc_size_in_use)
Gerd Moellmann <gerd@gnu.org>
parents: 31468
diff changeset
364 last_heap->end = (char *) last_heap->end - excess;
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
365 }
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
366
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
367 if ((*real_morecore) (- excess) == 0)
19999
cc8daec6d363 (relinquish): When returning memory to the system,
Karl Heuer <kwzh@gnu.org>
parents: 18757
diff changeset
368 {
cc8daec6d363 (relinquish): When returning memory to the system,
Karl Heuer <kwzh@gnu.org>
parents: 18757
diff changeset
369 /* If the system didn't want that much memory back, adjust
cc8daec6d363 (relinquish): When returning memory to the system,
Karl Heuer <kwzh@gnu.org>
parents: 18757
diff changeset
370 the end of the last heap to reflect that. This can occur
cc8daec6d363 (relinquish): When returning memory to the system,
Karl Heuer <kwzh@gnu.org>
parents: 18757
diff changeset
371 if break_value is still within the original data segment. */
31473
055accd6bf1d (obtain, relinquish, relinquish, r_alloc_size_in_use)
Gerd Moellmann <gerd@gnu.org>
parents: 31468
diff changeset
372 last_heap->end = (char *) last_heap->end + excess;
19999
cc8daec6d363 (relinquish): When returning memory to the system,
Karl Heuer <kwzh@gnu.org>
parents: 18757
diff changeset
373 /* Make sure that the result of the adjustment is accurate.
cc8daec6d363 (relinquish): When returning memory to the system,
Karl Heuer <kwzh@gnu.org>
parents: 18757
diff changeset
374 It should be, for the else clause above; the other case,
cc8daec6d363 (relinquish): When returning memory to the system,
Karl Heuer <kwzh@gnu.org>
parents: 18757
diff changeset
375 which returns the entire last heap to the system, seems
cc8daec6d363 (relinquish): When returning memory to the system,
Karl Heuer <kwzh@gnu.org>
parents: 18757
diff changeset
376 unlikely to trigger this mode of failure. */
cc8daec6d363 (relinquish): When returning memory to the system,
Karl Heuer <kwzh@gnu.org>
parents: 18757
diff changeset
377 if (last_heap->end != (*real_morecore) (0))
cc8daec6d363 (relinquish): When returning memory to the system,
Karl Heuer <kwzh@gnu.org>
parents: 18757
diff changeset
378 abort ();
cc8daec6d363 (relinquish): When returning memory to the system,
Karl Heuer <kwzh@gnu.org>
parents: 18757
diff changeset
379 }
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
380 }
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
381 }
10682
5659c0885145 (r_alloc_size_in_use): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10432
diff changeset
382
5659c0885145 (r_alloc_size_in_use): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10432
diff changeset
383 /* Return the total size in use by relocating allocator,
5659c0885145 (r_alloc_size_in_use): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10432
diff changeset
384 above where malloc gets space. */
5659c0885145 (r_alloc_size_in_use): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10432
diff changeset
385
5659c0885145 (r_alloc_size_in_use): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10432
diff changeset
386 long
5659c0885145 (r_alloc_size_in_use): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10432
diff changeset
387 r_alloc_size_in_use ()
5659c0885145 (r_alloc_size_in_use): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10432
diff changeset
388 {
31473
055accd6bf1d (obtain, relinquish, relinquish, r_alloc_size_in_use)
Gerd Moellmann <gerd@gnu.org>
parents: 31468
diff changeset
389 return (char *) break_value - (char *) virtual_break_value;
10682
5659c0885145 (r_alloc_size_in_use): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10432
diff changeset
390 }
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
391
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
392 /* The meat - allocating, freeing, and relocating blocs. */
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
393
577
53f29271d1b0 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
394 /* Find the bloc referenced by the address in PTR. Returns a pointer
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
395 to that block. */
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
396
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
397 static bloc_ptr
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
398 find_bloc (ptr)
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
399 POINTER *ptr;
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
400 {
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
401 register bloc_ptr p = first_bloc;
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
402
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
403 while (p != NIL_BLOC)
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
404 {
100674
dbba9cb0e6ce Add comments to explain checks and aborts, to assist future debugging.
Jason Rumney <jasonr@gnu.org>
parents: 100673
diff changeset
405 /* Consistency check. Don't return inconsistent blocs.
dbba9cb0e6ce Add comments to explain checks and aborts, to assist future debugging.
Jason Rumney <jasonr@gnu.org>
parents: 100673
diff changeset
406 Don't abort here, as callers might be expecting this, but
dbba9cb0e6ce Add comments to explain checks and aborts, to assist future debugging.
Jason Rumney <jasonr@gnu.org>
parents: 100673
diff changeset
407 callers that always expect a bloc to be returned should abort
dbba9cb0e6ce Add comments to explain checks and aborts, to assist future debugging.
Jason Rumney <jasonr@gnu.org>
parents: 100673
diff changeset
408 if one isn't to avoid a memory corruption bug that is
dbba9cb0e6ce Add comments to explain checks and aborts, to assist future debugging.
Jason Rumney <jasonr@gnu.org>
parents: 100673
diff changeset
409 difficult to track down. */
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
410 if (p->variable == ptr && p->data == *ptr)
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
411 return p;
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
412
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
413 p = p->next;
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
414 }
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
415
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
416 return p;
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
417 }
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
418
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
419 /* Allocate a bloc of SIZE bytes and append it to the chain of blocs.
1249
761b9b4fd3ed * ralloc.c: Since the users of the relocating allocation code
Jim Blandy <jimb@redhat.com>
parents: 1121
diff changeset
420 Returns a pointer to the new bloc, or zero if we couldn't allocate
761b9b4fd3ed * ralloc.c: Since the users of the relocating allocation code
Jim Blandy <jimb@redhat.com>
parents: 1121
diff changeset
421 memory for the new block. */
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
422
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
423 static bloc_ptr
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
424 get_bloc (size)
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
425 SIZE size;
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
426 {
1249
761b9b4fd3ed * ralloc.c: Since the users of the relocating allocation code
Jim Blandy <jimb@redhat.com>
parents: 1121
diff changeset
427 register bloc_ptr new_bloc;
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
428 register heap_ptr heap;
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
429
1249
761b9b4fd3ed * ralloc.c: Since the users of the relocating allocation code
Jim Blandy <jimb@redhat.com>
parents: 1121
diff changeset
430 if (! (new_bloc = (bloc_ptr) malloc (BLOC_PTR_SIZE))
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
431 || ! (new_bloc->data = obtain (break_value, size)))
1249
761b9b4fd3ed * ralloc.c: Since the users of the relocating allocation code
Jim Blandy <jimb@redhat.com>
parents: 1121
diff changeset
432 {
95479
9588c3703f38 remove useless if-before-free tests
Jim Meyering <jim@meyering.net>
parents: 94963
diff changeset
433 free (new_bloc);
1249
761b9b4fd3ed * ralloc.c: Since the users of the relocating allocation code
Jim Blandy <jimb@redhat.com>
parents: 1121
diff changeset
434
761b9b4fd3ed * ralloc.c: Since the users of the relocating allocation code
Jim Blandy <jimb@redhat.com>
parents: 1121
diff changeset
435 return 0;
761b9b4fd3ed * ralloc.c: Since the users of the relocating allocation code
Jim Blandy <jimb@redhat.com>
parents: 1121
diff changeset
436 }
761b9b4fd3ed * ralloc.c: Since the users of the relocating allocation code
Jim Blandy <jimb@redhat.com>
parents: 1121
diff changeset
437
31473
055accd6bf1d (obtain, relinquish, relinquish, r_alloc_size_in_use)
Gerd Moellmann <gerd@gnu.org>
parents: 31468
diff changeset
438 break_value = (char *) new_bloc->data + size;
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
439
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
440 new_bloc->size = size;
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
441 new_bloc->next = NIL_BLOC;
1013
6bf2c4766d4c * ralloc.c (get_bloc): When initializing new_bloc->variable, cast
Jim Blandy <jimb@redhat.com>
parents: 734
diff changeset
442 new_bloc->variable = (POINTER *) NIL;
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
443 new_bloc->new_data = 0;
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
444
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
445 /* Record in the heap that this space is in use. */
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
446 heap = find_heap (new_bloc->data);
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
447 heap->free = break_value;
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
448
9666
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
449 /* Maintain the correspondence between heaps and blocs. */
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
450 new_bloc->heap = heap;
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
451 heap->last_bloc = new_bloc;
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
452 if (heap->first_bloc == NIL_BLOC)
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
453 heap->first_bloc = new_bloc;
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
454
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
455 /* Put this bloc on the doubly-linked list of blocs. */
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
456 if (first_bloc)
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
457 {
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
458 new_bloc->prev = last_bloc;
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
459 last_bloc->next = new_bloc;
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
460 last_bloc = new_bloc;
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
461 }
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
462 else
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
463 {
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
464 first_bloc = last_bloc = new_bloc;
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
465 new_bloc->prev = NIL_BLOC;
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
466 }
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
467
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
468 return new_bloc;
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
469 }
9666
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
470
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
471 /* Calculate new locations of blocs in the list beginning with BLOC,
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
472 relocating it to start at ADDRESS, in heap HEAP. If enough space is
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
473 not presently available in our reserve, call obtain for
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 36187
diff changeset
474 more space.
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 36187
diff changeset
475
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
476 Store the new location of each bloc in its new_data field.
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
477 Do not touch the contents of blocs or break_value. */
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
478
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
479 static int
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
480 relocate_blocs (bloc, heap, address)
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
481 bloc_ptr bloc;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
482 heap_ptr heap;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
483 POINTER address;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
484 {
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
485 register bloc_ptr b = bloc;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
486
11146
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
487 /* No need to ever call this if arena is frozen, bug somewhere! */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 36187
diff changeset
488 if (r_alloc_freeze_level)
11146
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
489 abort();
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
490
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
491 while (b)
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
492 {
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
493 /* If bloc B won't fit within HEAP,
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
494 move to the next heap and try again. */
31473
055accd6bf1d (obtain, relinquish, relinquish, r_alloc_size_in_use)
Gerd Moellmann <gerd@gnu.org>
parents: 31468
diff changeset
495 while (heap && (char *) address + b->size > (char *) heap->end)
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
496 {
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
497 heap = heap->next;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
498 if (heap == NIL_HEAP)
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
499 break;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
500 address = heap->bloc_start;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
501 }
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
502
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
503 /* If BLOC won't fit in any heap,
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
504 get enough new space to hold BLOC and all following blocs. */
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
505 if (heap == NIL_HEAP)
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
506 {
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
507 register bloc_ptr tb = b;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
508 register SIZE s = 0;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
509
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
510 /* Add up the size of all the following blocs. */
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
511 while (tb != NIL_BLOC)
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
512 {
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 36187
diff changeset
513 if (tb->variable)
11146
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
514 s += tb->size;
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
515
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
516 tb = tb->next;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
517 }
1595
ac1be1d32868 * ralloc.c (relocate_some_blocs): Handle BLOC == NIL_BLOC.
Jim Blandy <jimb@redhat.com>
parents: 1473
diff changeset
518
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
519 /* Get that space. */
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
520 address = obtain (address, s);
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
521 if (address == 0)
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
522 return 0;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
523
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
524 heap = last_heap;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
525 }
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
526
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
527 /* Record the new address of this bloc
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
528 and update where the next bloc can start. */
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
529 b->new_data = address;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 36187
diff changeset
530 if (b->variable)
31473
055accd6bf1d (obtain, relinquish, relinquish, r_alloc_size_in_use)
Gerd Moellmann <gerd@gnu.org>
parents: 31468
diff changeset
531 address = (char *) address + b->size;
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
532 b = b->next;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
533 }
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
534
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
535 return 1;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
536 }
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
537
9666
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
538 /* Reorder the bloc BLOC to go before bloc BEFORE in the doubly linked list.
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
539 This is necessary if we put the memory of space of BLOC
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
540 before that of BEFORE. */
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
541
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
542 static void
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
543 reorder_bloc (bloc, before)
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
544 bloc_ptr bloc, before;
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
545 {
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
546 bloc_ptr prev, next;
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
547
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
548 /* Splice BLOC out from where it is. */
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
549 prev = bloc->prev;
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
550 next = bloc->next;
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
551
9666
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
552 if (prev)
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
553 prev->next = next;
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
554 if (next)
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
555 next->prev = prev;
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
556
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
557 /* Splice it in before BEFORE. */
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
558 prev = before->prev;
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
559
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
560 if (prev)
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
561 prev->next = bloc;
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
562 bloc->prev = prev;
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
563
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
564 before->prev = bloc;
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
565 bloc->next = before;
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
566 }
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
567
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
568 /* Update the records of which heaps contain which blocs, starting
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
569 with heap HEAP and bloc BLOC. */
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
570
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
571 static void
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
572 update_heap_bloc_correspondence (bloc, heap)
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
573 bloc_ptr bloc;
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
574 heap_ptr heap;
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
575 {
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
576 register bloc_ptr b;
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
577
9666
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
578 /* Initialize HEAP's status to reflect blocs before BLOC. */
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
579 if (bloc != NIL_BLOC && bloc->prev != NIL_BLOC && bloc->prev->heap == heap)
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
580 {
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
581 /* The previous bloc is in HEAP. */
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
582 heap->last_bloc = bloc->prev;
31473
055accd6bf1d (obtain, relinquish, relinquish, r_alloc_size_in_use)
Gerd Moellmann <gerd@gnu.org>
parents: 31468
diff changeset
583 heap->free = (char *) bloc->prev->data + bloc->prev->size;
9666
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
584 }
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
585 else
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
586 {
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
587 /* HEAP contains no blocs before BLOC. */
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
588 heap->first_bloc = NIL_BLOC;
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
589 heap->last_bloc = NIL_BLOC;
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
590 heap->free = heap->bloc_start;
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
591 }
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
592
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
593 /* Advance through blocs one by one. */
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
594 for (b = bloc; b != NIL_BLOC; b = b->next)
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
595 {
9666
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
596 /* Advance through heaps, marking them empty,
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
597 till we get to the one that B is in. */
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
598 while (heap)
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
599 {
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
600 if (heap->bloc_start <= b->data && b->data <= heap->end)
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
601 break;
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
602 heap = heap->next;
9666
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
603 /* We know HEAP is not null now,
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
604 because there has to be space for bloc B. */
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
605 heap->first_bloc = NIL_BLOC;
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
606 heap->last_bloc = NIL_BLOC;
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
607 heap->free = heap->bloc_start;
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
608 }
9666
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
609
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
610 /* Update HEAP's status for bloc B. */
31473
055accd6bf1d (obtain, relinquish, relinquish, r_alloc_size_in_use)
Gerd Moellmann <gerd@gnu.org>
parents: 31468
diff changeset
611 heap->free = (char *) b->data + b->size;
9666
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
612 heap->last_bloc = b;
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
613 if (heap->first_bloc == NIL_BLOC)
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
614 heap->first_bloc = b;
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
615
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
616 /* Record that B is in HEAP. */
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
617 b->heap = heap;
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
618 }
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
619
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
620 /* If there are any remaining heaps and no blocs left,
9666
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
621 mark those heaps as empty. */
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
622 heap = heap->next;
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
623 while (heap)
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
624 {
9666
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
625 heap->first_bloc = NIL_BLOC;
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
626 heap->last_bloc = NIL_BLOC;
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
627 heap->free = heap->bloc_start;
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
628 heap = heap->next;
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
629 }
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
630 }
9666
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
631
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
632 /* Resize BLOC to SIZE bytes. This relocates the blocs
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
633 that come after BLOC in memory. */
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
634
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
635 static int
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
636 resize_bloc (bloc, size)
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
637 bloc_ptr bloc;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
638 SIZE size;
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
639 {
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
640 register bloc_ptr b;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
641 heap_ptr heap;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
642 POINTER address;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
643 SIZE old_size;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
644
11146
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
645 /* No need to ever call this if arena is frozen, bug somewhere! */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 36187
diff changeset
646 if (r_alloc_freeze_level)
11146
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
647 abort();
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
648
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
649 if (bloc == NIL_BLOC || size == bloc->size)
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
650 return 1;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
651
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
652 for (heap = first_heap; heap != NIL_HEAP; heap = heap->next)
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
653 {
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
654 if (heap->bloc_start <= bloc->data && bloc->data <= heap->end)
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
655 break;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
656 }
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
657
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
658 if (heap == NIL_HEAP)
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
659 abort ();
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
660
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
661 old_size = bloc->size;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
662 bloc->size = size;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
663
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
664 /* Note that bloc could be moved into the previous heap. */
31473
055accd6bf1d (obtain, relinquish, relinquish, r_alloc_size_in_use)
Gerd Moellmann <gerd@gnu.org>
parents: 31468
diff changeset
665 address = (bloc->prev ? (char *) bloc->prev->data + bloc->prev->size
055accd6bf1d (obtain, relinquish, relinquish, r_alloc_size_in_use)
Gerd Moellmann <gerd@gnu.org>
parents: 31468
diff changeset
666 : (char *) first_heap->bloc_start);
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
667 while (heap)
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
668 {
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
669 if (heap->bloc_start <= address && address <= heap->end)
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
670 break;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
671 heap = heap->prev;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
672 }
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
673
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
674 if (! relocate_blocs (bloc, heap, address))
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
675 {
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
676 bloc->size = old_size;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
677 return 0;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
678 }
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
679
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
680 if (size > old_size)
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
681 {
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
682 for (b = last_bloc; b != bloc; b = b->prev)
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
683 {
11146
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
684 if (!b->variable)
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
685 {
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
686 b->size = 0;
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
687 b->data = b->new_data;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 36187
diff changeset
688 }
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 36187
diff changeset
689 else
11146
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
690 {
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
691 safe_bcopy (b->data, b->new_data, b->size);
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
692 *b->variable = b->data = b->new_data;
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
693 }
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
694 }
11146
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
695 if (!bloc->variable)
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
696 {
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
697 bloc->size = 0;
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
698 bloc->data = bloc->new_data;
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
699 }
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
700 else
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
701 {
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
702 safe_bcopy (bloc->data, bloc->new_data, old_size);
31473
055accd6bf1d (obtain, relinquish, relinquish, r_alloc_size_in_use)
Gerd Moellmann <gerd@gnu.org>
parents: 31468
diff changeset
703 bzero ((char *) bloc->new_data + old_size, size - old_size);
11146
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
704 *bloc->variable = bloc->data = bloc->new_data;
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
705 }
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
706 }
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
707 else
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
708 {
1595
ac1be1d32868 * ralloc.c (relocate_some_blocs): Handle BLOC == NIL_BLOC.
Jim Blandy <jimb@redhat.com>
parents: 1473
diff changeset
709 for (b = bloc; b != NIL_BLOC; b = b->next)
ac1be1d32868 * ralloc.c (relocate_some_blocs): Handle BLOC == NIL_BLOC.
Jim Blandy <jimb@redhat.com>
parents: 1473
diff changeset
710 {
11146
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
711 if (!b->variable)
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
712 {
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
713 b->size = 0;
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
714 b->data = b->new_data;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 36187
diff changeset
715 }
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 36187
diff changeset
716 else
11146
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
717 {
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
718 safe_bcopy (b->data, b->new_data, b->size);
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
719 *b->variable = b->data = b->new_data;
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
720 }
1595
ac1be1d32868 * ralloc.c (relocate_some_blocs): Handle BLOC == NIL_BLOC.
Jim Blandy <jimb@redhat.com>
parents: 1473
diff changeset
721 }
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
722 }
1595
ac1be1d32868 * ralloc.c (relocate_some_blocs): Handle BLOC == NIL_BLOC.
Jim Blandy <jimb@redhat.com>
parents: 1473
diff changeset
723
9666
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
724 update_heap_bloc_correspondence (bloc, heap);
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
725
31473
055accd6bf1d (obtain, relinquish, relinquish, r_alloc_size_in_use)
Gerd Moellmann <gerd@gnu.org>
parents: 31468
diff changeset
726 break_value = (last_bloc ? (char *) last_bloc->data + last_bloc->size
055accd6bf1d (obtain, relinquish, relinquish, r_alloc_size_in_use)
Gerd Moellmann <gerd@gnu.org>
parents: 31468
diff changeset
727 : (char *) first_heap->bloc_start);
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
728 return 1;
1595
ac1be1d32868 * ralloc.c (relocate_some_blocs): Handle BLOC == NIL_BLOC.
Jim Blandy <jimb@redhat.com>
parents: 1473
diff changeset
729 }
9666
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
730
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
731 /* Free BLOC from the chain of blocs, relocating any blocs above it.
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
732 This may return space to the system. */
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
733
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
734 static void
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
735 free_bloc (bloc)
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
736 bloc_ptr bloc;
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
737 {
9666
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
738 heap_ptr heap = bloc->heap;
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
739
11146
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
740 if (r_alloc_freeze_level)
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
741 {
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
742 bloc->variable = (POINTER *) NIL;
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
743 return;
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
744 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 36187
diff changeset
745
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
746 resize_bloc (bloc, 0);
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
747
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
748 if (bloc == first_bloc && bloc == last_bloc)
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
749 {
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
750 first_bloc = last_bloc = NIL_BLOC;
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
751 }
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
752 else if (bloc == last_bloc)
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
753 {
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
754 last_bloc = bloc->prev;
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
755 last_bloc->next = NIL_BLOC;
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
756 }
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
757 else if (bloc == first_bloc)
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
758 {
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
759 first_bloc = bloc->next;
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
760 first_bloc->prev = NIL_BLOC;
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
761 }
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
762 else
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
763 {
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
764 bloc->next->prev = bloc->prev;
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
765 bloc->prev->next = bloc->next;
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
766 }
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
767
9666
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
768 /* Update the records of which blocs are in HEAP. */
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
769 if (heap->first_bloc == bloc)
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
770 {
10747
c6a68e4ee53a (r_alloc_free): Call refill_memory_reserve only if emacs.
Richard M. Stallman <rms@gnu.org>
parents: 10682
diff changeset
771 if (bloc->next != 0 && bloc->next->heap == heap)
9666
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
772 heap->first_bloc = bloc->next;
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
773 else
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
774 heap->first_bloc = heap->last_bloc = NIL_BLOC;
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
775 }
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
776 if (heap->last_bloc == bloc)
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
777 {
10747
c6a68e4ee53a (r_alloc_free): Call refill_memory_reserve only if emacs.
Richard M. Stallman <rms@gnu.org>
parents: 10682
diff changeset
778 if (bloc->prev != 0 && bloc->prev->heap == heap)
9666
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
779 heap->last_bloc = bloc->prev;
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
780 else
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
781 heap->first_bloc = heap->last_bloc = NIL_BLOC;
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
782 }
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
783
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
784 relinquish ();
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
785 free (bloc);
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
786 }
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
787
577
53f29271d1b0 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
788 /* Interface routines. */
53f29271d1b0 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
789
1249
761b9b4fd3ed * ralloc.c: Since the users of the relocating allocation code
Jim Blandy <jimb@redhat.com>
parents: 1121
diff changeset
790 /* Obtain SIZE bytes of storage from the free pool, or the system, as
1390
92df75f4167f (check_memory_limits): Reduce warnlevel when usage drops far enough.
Richard M. Stallman <rms@gnu.org>
parents: 1249
diff changeset
791 necessary. If relocatable blocs are in use, this means relocating
1249
761b9b4fd3ed * ralloc.c: Since the users of the relocating allocation code
Jim Blandy <jimb@redhat.com>
parents: 1121
diff changeset
792 them. This function gets plugged into the GNU malloc's __morecore
761b9b4fd3ed * ralloc.c: Since the users of the relocating allocation code
Jim Blandy <jimb@redhat.com>
parents: 1121
diff changeset
793 hook.
761b9b4fd3ed * ralloc.c: Since the users of the relocating allocation code
Jim Blandy <jimb@redhat.com>
parents: 1121
diff changeset
794
1473
6359d8850fa3 (relinquish): Adjust page_break_value by amount of memory actually given back.
Richard M. Stallman <rms@gnu.org>
parents: 1451
diff changeset
795 We provide hysteresis, never relocating by less than extra_bytes.
6359d8850fa3 (relinquish): Adjust page_break_value by amount of memory actually given back.
Richard M. Stallman <rms@gnu.org>
parents: 1451
diff changeset
796
1249
761b9b4fd3ed * ralloc.c: Since the users of the relocating allocation code
Jim Blandy <jimb@redhat.com>
parents: 1121
diff changeset
797 If we're out of memory, we should return zero, to imitate the other
761b9b4fd3ed * ralloc.c: Since the users of the relocating allocation code
Jim Blandy <jimb@redhat.com>
parents: 1121
diff changeset
798 __morecore hook values - in particular, __default_morecore in the
761b9b4fd3ed * ralloc.c: Since the users of the relocating allocation code
Jim Blandy <jimb@redhat.com>
parents: 1121
diff changeset
799 GNU malloc package. */
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
800
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 36187
diff changeset
801 POINTER
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
802 r_alloc_sbrk (size)
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
803 long size;
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
804 {
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
805 register bloc_ptr b;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
806 POINTER address;
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
807
10767
2954efb1d06c (r_alloc_check): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 10766
diff changeset
808 if (! r_alloc_initialized)
2954efb1d06c (r_alloc_check): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 10766
diff changeset
809 r_alloc_init ();
2954efb1d06c (r_alloc_check): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 10766
diff changeset
810
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
811 if (! use_relocatable_buffers)
1401
9689db083f88 (sbrk): Removed decl.
Roland McGrath <roland@gnu.org>
parents: 1398
diff changeset
812 return (*real_morecore) (size);
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
813
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
814 if (size == 0)
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
815 return virtual_break_value;
1473
6359d8850fa3 (relinquish): Adjust page_break_value by amount of memory actually given back.
Richard M. Stallman <rms@gnu.org>
parents: 1451
diff changeset
816
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
817 if (size > 0)
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
818 {
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
819 /* Allocate a page-aligned space. GNU malloc would reclaim an
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
820 extra space if we passed an unaligned one. But we could
14036
621a575db6f7 Comment fixes.
Karl Heuer <kwzh@gnu.org>
parents: 11146
diff changeset
821 not always find a space which is contiguous to the previous. */
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
822 POINTER new_bloc_start;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
823 heap_ptr h = first_heap;
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
824 SIZE get = ROUNDUP (size);
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
825
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
826 address = (POINTER) ROUNDUP (virtual_break_value);
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
827
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
828 /* Search the list upward for a heap which is large enough. */
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
829 while ((char *) h->end < (char *) MEM_ROUNDUP ((char *)address + get))
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
830 {
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
831 h = h->next;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
832 if (h == NIL_HEAP)
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
833 break;
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
834 address = (POINTER) ROUNDUP (h->start);
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
835 }
1473
6359d8850fa3 (relinquish): Adjust page_break_value by amount of memory actually given back.
Richard M. Stallman <rms@gnu.org>
parents: 1451
diff changeset
836
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
837 /* If not found, obtain more space. */
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
838 if (h == NIL_HEAP)
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
839 {
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
840 get += extra_bytes + page_size;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
841
11146
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
842 if (! obtain (address, get))
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
843 return 0;
1249
761b9b4fd3ed * ralloc.c: Since the users of the relocating allocation code
Jim Blandy <jimb@redhat.com>
parents: 1121
diff changeset
844
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
845 if (first_heap == last_heap)
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
846 address = (POINTER) ROUNDUP (virtual_break_value);
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
847 else
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
848 address = (POINTER) ROUNDUP (last_heap->start);
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
849 h = last_heap;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
850 }
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
851
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
852 new_bloc_start = (POINTER) MEM_ROUNDUP ((char *)address + get);
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
853
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
854 if (first_heap->bloc_start < new_bloc_start)
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
855 {
11146
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
856 /* This is no clean solution - no idea how to do it better. */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 36187
diff changeset
857 if (r_alloc_freeze_level)
11146
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
858 return NIL;
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
859
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
860 /* There is a bug here: if the above obtain call succeeded, but the
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
861 relocate_blocs call below does not succeed, we need to free
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
862 the memory that we got with obtain. */
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
863
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
864 /* Move all blocs upward. */
11146
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
865 if (! relocate_blocs (first_bloc, h, new_bloc_start))
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
866 return 0;
577
53f29271d1b0 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
867
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
868 /* Note that (POINTER)(h+1) <= new_bloc_start since
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
869 get >= page_size, so the following does not destroy the heap
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
870 header. */
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
871 for (b = last_bloc; b != NIL_BLOC; b = b->prev)
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
872 {
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
873 safe_bcopy (b->data, b->new_data, b->size);
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
874 *b->variable = b->data = b->new_data;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
875 }
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
876
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
877 h->bloc_start = new_bloc_start;
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
878
9666
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
879 update_heap_bloc_correspondence (first_bloc, h);
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
880 }
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
881 if (h != first_heap)
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
882 {
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
883 /* Give up managing heaps below the one the new
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
884 virtual_break_value points to. */
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
885 first_heap->prev = NIL_HEAP;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
886 first_heap->next = h->next;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
887 first_heap->start = h->start;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
888 first_heap->end = h->end;
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
889 first_heap->free = h->free;
9666
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
890 first_heap->first_bloc = h->first_bloc;
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
891 first_heap->last_bloc = h->last_bloc;
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
892 first_heap->bloc_start = h->bloc_start;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
893
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
894 if (first_heap->next)
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
895 first_heap->next->prev = first_heap;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
896 else
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
897 last_heap = first_heap;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
898 }
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
899
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
900 bzero (address, size);
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
901 }
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
902 else /* size < 0 */
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
903 {
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
904 SIZE excess = (char *)first_heap->bloc_start
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
905 - ((char *)virtual_break_value + size);
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
906
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
907 address = virtual_break_value;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
908
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
909 if (r_alloc_freeze_level == 0 && excess > 2 * extra_bytes)
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
910 {
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
911 excess -= extra_bytes;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
912 first_heap->bloc_start
9666
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
913 = (POINTER) MEM_ROUNDUP ((char *)first_heap->bloc_start - excess);
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
914
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
915 relocate_blocs (first_bloc, first_heap, first_heap->bloc_start);
1473
6359d8850fa3 (relinquish): Adjust page_break_value by amount of memory actually given back.
Richard M. Stallman <rms@gnu.org>
parents: 1451
diff changeset
916
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
917 for (b = first_bloc; b != NIL_BLOC; b = b->next)
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
918 {
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
919 safe_bcopy (b->data, b->new_data, b->size);
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
920 *b->variable = b->data = b->new_data;
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
921 }
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
922 }
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
923
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
924 if ((char *)virtual_break_value + size < (char *)first_heap->start)
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
925 {
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
926 /* We found an additional space below the first heap */
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
927 first_heap->start = (POINTER) ((char *)virtual_break_value + size);
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
928 }
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
929 }
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
930
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
931 virtual_break_value = (POINTER) ((char *)address + size);
9666
d50850d0c8f8 (struct heap): New fields first_bloc, last_bloc.
Richard M. Stallman <rms@gnu.org>
parents: 9596
diff changeset
932 break_value = (last_bloc
31473
055accd6bf1d (obtain, relinquish, relinquish, r_alloc_size_in_use)
Gerd Moellmann <gerd@gnu.org>
parents: 31468
diff changeset
933 ? (char *) last_bloc->data + last_bloc->size
055accd6bf1d (obtain, relinquish, relinquish, r_alloc_size_in_use)
Gerd Moellmann <gerd@gnu.org>
parents: 31468
diff changeset
934 : (char *) first_heap->bloc_start);
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
935 if (size < 0)
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
936 relinquish ();
1473
6359d8850fa3 (relinquish): Adjust page_break_value by amount of memory actually given back.
Richard M. Stallman <rms@gnu.org>
parents: 1451
diff changeset
937
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
938 return address;
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
939 }
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
940
31414
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
941
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
942 /* Allocate a relocatable bloc of storage of size SIZE. A pointer to
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
943 the data is returned in *PTR. PTR is thus the address of some variable
1249
761b9b4fd3ed * ralloc.c: Since the users of the relocating allocation code
Jim Blandy <jimb@redhat.com>
parents: 1121
diff changeset
944 which will use the data area.
761b9b4fd3ed * ralloc.c: Since the users of the relocating allocation code
Jim Blandy <jimb@redhat.com>
parents: 1121
diff changeset
945
11146
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
946 The allocation of 0 bytes is valid.
99767
0d5b71c55b3c Fix typos in comments.
Juanma Barranquero <lekktu@gmail.com>
parents: 95479
diff changeset
947 In case r_alloc_freeze_level is set, a best fit of unused blocs could be
0d5b71c55b3c Fix typos in comments.
Juanma Barranquero <lekktu@gmail.com>
parents: 95479
diff changeset
948 done before allocating a new area. Not yet done.
11146
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
949
1249
761b9b4fd3ed * ralloc.c: Since the users of the relocating allocation code
Jim Blandy <jimb@redhat.com>
parents: 1121
diff changeset
950 If we can't allocate the necessary memory, set *PTR to zero, and
761b9b4fd3ed * ralloc.c: Since the users of the relocating allocation code
Jim Blandy <jimb@redhat.com>
parents: 1121
diff changeset
951 return zero. */
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
952
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
953 POINTER
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
954 r_alloc (ptr, size)
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
955 POINTER *ptr;
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
956 SIZE size;
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
957 {
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
958 register bloc_ptr new_bloc;
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
959
1390
92df75f4167f (check_memory_limits): Reduce warnlevel when usage drops far enough.
Richard M. Stallman <rms@gnu.org>
parents: 1249
diff changeset
960 if (! r_alloc_initialized)
92df75f4167f (check_memory_limits): Reduce warnlevel when usage drops far enough.
Richard M. Stallman <rms@gnu.org>
parents: 1249
diff changeset
961 r_alloc_init ();
92df75f4167f (check_memory_limits): Reduce warnlevel when usage drops far enough.
Richard M. Stallman <rms@gnu.org>
parents: 1249
diff changeset
962
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
963 new_bloc = get_bloc (MEM_ROUNDUP (size));
1249
761b9b4fd3ed * ralloc.c: Since the users of the relocating allocation code
Jim Blandy <jimb@redhat.com>
parents: 1121
diff changeset
964 if (new_bloc)
761b9b4fd3ed * ralloc.c: Since the users of the relocating allocation code
Jim Blandy <jimb@redhat.com>
parents: 1121
diff changeset
965 {
761b9b4fd3ed * ralloc.c: Since the users of the relocating allocation code
Jim Blandy <jimb@redhat.com>
parents: 1121
diff changeset
966 new_bloc->variable = ptr;
761b9b4fd3ed * ralloc.c: Since the users of the relocating allocation code
Jim Blandy <jimb@redhat.com>
parents: 1121
diff changeset
967 *ptr = new_bloc->data;
761b9b4fd3ed * ralloc.c: Since the users of the relocating allocation code
Jim Blandy <jimb@redhat.com>
parents: 1121
diff changeset
968 }
761b9b4fd3ed * ralloc.c: Since the users of the relocating allocation code
Jim Blandy <jimb@redhat.com>
parents: 1121
diff changeset
969 else
761b9b4fd3ed * ralloc.c: Since the users of the relocating allocation code
Jim Blandy <jimb@redhat.com>
parents: 1121
diff changeset
970 *ptr = 0;
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
971
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
972 return *ptr;
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
973 }
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
974
1390
92df75f4167f (check_memory_limits): Reduce warnlevel when usage drops far enough.
Richard M. Stallman <rms@gnu.org>
parents: 1249
diff changeset
975 /* Free a bloc of relocatable storage whose data is pointed to by PTR.
92df75f4167f (check_memory_limits): Reduce warnlevel when usage drops far enough.
Richard M. Stallman <rms@gnu.org>
parents: 1249
diff changeset
976 Store 0 in *PTR to show there's no block allocated. */
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
977
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
978 void
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
979 r_alloc_free (ptr)
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
980 register POINTER *ptr;
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
981 {
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
982 register bloc_ptr dead_bloc;
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
983
10767
2954efb1d06c (r_alloc_check): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 10766
diff changeset
984 if (! r_alloc_initialized)
2954efb1d06c (r_alloc_check): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 10766
diff changeset
985 r_alloc_init ();
2954efb1d06c (r_alloc_check): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 10766
diff changeset
986
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
987 dead_bloc = find_bloc (ptr);
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
988 if (dead_bloc == NIL_BLOC)
100674
dbba9cb0e6ce Add comments to explain checks and aborts, to assist future debugging.
Jason Rumney <jasonr@gnu.org>
parents: 100673
diff changeset
989 abort (); /* Double free? PTR not originally used to allocate? */
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
990
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
991 free_bloc (dead_bloc);
1390
92df75f4167f (check_memory_limits): Reduce warnlevel when usage drops far enough.
Richard M. Stallman <rms@gnu.org>
parents: 1249
diff changeset
992 *ptr = 0;
10682
5659c0885145 (r_alloc_size_in_use): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10432
diff changeset
993
10747
c6a68e4ee53a (r_alloc_free): Call refill_memory_reserve only if emacs.
Richard M. Stallman <rms@gnu.org>
parents: 10682
diff changeset
994 #ifdef emacs
10682
5659c0885145 (r_alloc_size_in_use): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10432
diff changeset
995 refill_memory_reserve ();
10747
c6a68e4ee53a (r_alloc_free): Call refill_memory_reserve only if emacs.
Richard M. Stallman <rms@gnu.org>
parents: 10682
diff changeset
996 #endif
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
997 }
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
998
1087
6c410cc87574 * ralloc.c (r_re_alloc): Instead of allocating a new bloc at the
Jim Blandy <jimb@redhat.com>
parents: 1013
diff changeset
999 /* Given a pointer at address PTR to relocatable data, resize it to SIZE.
1249
761b9b4fd3ed * ralloc.c: Since the users of the relocating allocation code
Jim Blandy <jimb@redhat.com>
parents: 1121
diff changeset
1000 Do this by shifting all blocks above this one up in memory, unless
761b9b4fd3ed * ralloc.c: Since the users of the relocating allocation code
Jim Blandy <jimb@redhat.com>
parents: 1121
diff changeset
1001 SIZE is less than or equal to the current bloc size, in which case
761b9b4fd3ed * ralloc.c: Since the users of the relocating allocation code
Jim Blandy <jimb@redhat.com>
parents: 1121
diff changeset
1002 do nothing.
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1003
99767
0d5b71c55b3c Fix typos in comments.
Juanma Barranquero <lekktu@gmail.com>
parents: 95479
diff changeset
1004 In case r_alloc_freeze_level is set, a new bloc is allocated, and the
14036
621a575db6f7 Comment fixes.
Karl Heuer <kwzh@gnu.org>
parents: 11146
diff changeset
1005 memory copied to it. Not very efficient. We could traverse the
11146
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1006 bloc_list for a best fit of free blocs first.
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1007
1249
761b9b4fd3ed * ralloc.c: Since the users of the relocating allocation code
Jim Blandy <jimb@redhat.com>
parents: 1121
diff changeset
1008 Change *PTR to reflect the new bloc, and return this value.
761b9b4fd3ed * ralloc.c: Since the users of the relocating allocation code
Jim Blandy <jimb@redhat.com>
parents: 1121
diff changeset
1009
761b9b4fd3ed * ralloc.c: Since the users of the relocating allocation code
Jim Blandy <jimb@redhat.com>
parents: 1121
diff changeset
1010 If more memory cannot be allocated, then leave *PTR unchanged, and
761b9b4fd3ed * ralloc.c: Since the users of the relocating allocation code
Jim Blandy <jimb@redhat.com>
parents: 1121
diff changeset
1011 return zero. */
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1012
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1013 POINTER
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1014 r_re_alloc (ptr, size)
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1015 POINTER *ptr;
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1016 SIZE size;
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1017 {
1087
6c410cc87574 * ralloc.c (r_re_alloc): Instead of allocating a new bloc at the
Jim Blandy <jimb@redhat.com>
parents: 1013
diff changeset
1018 register bloc_ptr bloc;
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1019
10767
2954efb1d06c (r_alloc_check): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 10766
diff changeset
1020 if (! r_alloc_initialized)
2954efb1d06c (r_alloc_check): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 10766
diff changeset
1021 r_alloc_init ();
2954efb1d06c (r_alloc_check): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 10766
diff changeset
1022
11146
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1023 if (!*ptr)
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1024 return r_alloc (ptr, size);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 36187
diff changeset
1025 if (!size)
11146
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1026 {
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1027 r_alloc_free (ptr);
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1028 return r_alloc (ptr, 0);
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1029 }
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1030
1087
6c410cc87574 * ralloc.c (r_re_alloc): Instead of allocating a new bloc at the
Jim Blandy <jimb@redhat.com>
parents: 1013
diff changeset
1031 bloc = find_bloc (ptr);
6c410cc87574 * ralloc.c (r_re_alloc): Instead of allocating a new bloc at the
Jim Blandy <jimb@redhat.com>
parents: 1013
diff changeset
1032 if (bloc == NIL_BLOC)
100674
dbba9cb0e6ce Add comments to explain checks and aborts, to assist future debugging.
Jason Rumney <jasonr@gnu.org>
parents: 100673
diff changeset
1033 abort (); /* Already freed? PTR not originally used to allocate? */
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1034
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 36187
diff changeset
1035 if (size < bloc->size)
11146
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1036 {
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1037 /* Wouldn't it be useful to actually resize the bloc here? */
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1038 /* I think so too, but not if it's too expensive... */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 36187
diff changeset
1039 if ((bloc->size - MEM_ROUNDUP (size) >= page_size)
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 36187
diff changeset
1040 && r_alloc_freeze_level == 0)
11146
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1041 {
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1042 resize_bloc (bloc, MEM_ROUNDUP (size));
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1043 /* Never mind if this fails, just do nothing... */
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1044 /* It *should* be infallible! */
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1045 }
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1046 }
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1047 else if (size > bloc->size)
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1048 {
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1049 if (r_alloc_freeze_level)
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1050 {
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1051 bloc_ptr new_bloc;
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1052 new_bloc = get_bloc (MEM_ROUNDUP (size));
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1053 if (new_bloc)
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1054 {
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1055 new_bloc->variable = ptr;
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1056 *ptr = new_bloc->data;
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1057 bloc->variable = (POINTER *) NIL;
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1058 }
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1059 else
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1060 return NIL;
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1061 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 36187
diff changeset
1062 else
11146
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1063 {
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1064 if (! resize_bloc (bloc, MEM_ROUNDUP (size)))
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1065 return NIL;
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1066 }
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1067 }
118
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1068 return *ptr;
49342840ba00 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1069 }
8951
b628561b185b (r_alloc_freeze_level): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 5063
diff changeset
1070
b628561b185b (r_alloc_freeze_level): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 5063
diff changeset
1071 /* Disable relocations, after making room for at least SIZE bytes
b628561b185b (r_alloc_freeze_level): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 5063
diff changeset
1072 of non-relocatable heap if possible. The relocatable blocs are
b628561b185b (r_alloc_freeze_level): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 5063
diff changeset
1073 guaranteed to hold still until thawed, even if this means that
b628561b185b (r_alloc_freeze_level): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 5063
diff changeset
1074 malloc must return a null pointer. */
9596
134f7085c56b (heap_base): Move static var to top level.
Richard M. Stallman <rms@gnu.org>
parents: 9459
diff changeset
1075
8951
b628561b185b (r_alloc_freeze_level): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 5063
diff changeset
1076 void
b628561b185b (r_alloc_freeze_level): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 5063
diff changeset
1077 r_alloc_freeze (size)
b628561b185b (r_alloc_freeze_level): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 5063
diff changeset
1078 long size;
b628561b185b (r_alloc_freeze_level): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 5063
diff changeset
1079 {
10767
2954efb1d06c (r_alloc_check): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 10766
diff changeset
1080 if (! r_alloc_initialized)
2954efb1d06c (r_alloc_check): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 10766
diff changeset
1081 r_alloc_init ();
2954efb1d06c (r_alloc_check): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 10766
diff changeset
1082
8951
b628561b185b (r_alloc_freeze_level): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 5063
diff changeset
1083 /* If already frozen, we can't make any more room, so don't try. */
b628561b185b (r_alloc_freeze_level): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 5063
diff changeset
1084 if (r_alloc_freeze_level > 0)
b628561b185b (r_alloc_freeze_level): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 5063
diff changeset
1085 size = 0;
b628561b185b (r_alloc_freeze_level): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 5063
diff changeset
1086 /* If we can't get the amount requested, half is better than nothing. */
b628561b185b (r_alloc_freeze_level): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 5063
diff changeset
1087 while (size > 0 && r_alloc_sbrk (size) == 0)
b628561b185b (r_alloc_freeze_level): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 5063
diff changeset
1088 size /= 2;
b628561b185b (r_alloc_freeze_level): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 5063
diff changeset
1089 ++r_alloc_freeze_level;
b628561b185b (r_alloc_freeze_level): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 5063
diff changeset
1090 if (size > 0)
b628561b185b (r_alloc_freeze_level): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 5063
diff changeset
1091 r_alloc_sbrk (-size);
b628561b185b (r_alloc_freeze_level): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 5063
diff changeset
1092 }
b628561b185b (r_alloc_freeze_level): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 5063
diff changeset
1093
b628561b185b (r_alloc_freeze_level): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 5063
diff changeset
1094 void
b628561b185b (r_alloc_freeze_level): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 5063
diff changeset
1095 r_alloc_thaw ()
b628561b185b (r_alloc_freeze_level): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 5063
diff changeset
1096 {
11146
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1097
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 36187
diff changeset
1098 if (! r_alloc_initialized)
11146
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1099 r_alloc_init ();
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1100
8951
b628561b185b (r_alloc_freeze_level): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 5063
diff changeset
1101 if (--r_alloc_freeze_level < 0)
b628561b185b (r_alloc_freeze_level): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 5063
diff changeset
1102 abort ();
11146
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1103
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 36187
diff changeset
1104 /* This frees all unused blocs. It is not too inefficient, as the resize
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 36187
diff changeset
1105 and bcopy is done only once. Afterwards, all unreferenced blocs are
11146
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1106 already shrunk to zero size. */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 36187
diff changeset
1107 if (!r_alloc_freeze_level)
11146
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1108 {
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1109 bloc_ptr *b = &first_bloc;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 36187
diff changeset
1110 while (*b)
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 36187
diff changeset
1111 if (!(*b)->variable)
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 36187
diff changeset
1112 free_bloc (*b);
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 36187
diff changeset
1113 else
11146
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1114 b = &(*b)->next;
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1115 }
8951
b628561b185b (r_alloc_freeze_level): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 5063
diff changeset
1116 }
11146
9a14b32f5d71 (r_re_alloc): Correct realloc behavior--allow shrinking
Richard M. Stallman <rms@gnu.org>
parents: 10785
diff changeset
1117
18757
9d6149f4c762 (r_alloc_reinit): New function.
Richard M. Stallman <rms@gnu.org>
parents: 17845
diff changeset
1118
9d6149f4c762 (r_alloc_reinit): New function.
Richard M. Stallman <rms@gnu.org>
parents: 17845
diff changeset
1119 #if defined (emacs) && defined (DOUG_LEA_MALLOC)
9d6149f4c762 (r_alloc_reinit): New function.
Richard M. Stallman <rms@gnu.org>
parents: 17845
diff changeset
1120
9d6149f4c762 (r_alloc_reinit): New function.
Richard M. Stallman <rms@gnu.org>
parents: 17845
diff changeset
1121 /* Reinitialize the morecore hook variables after restarting a dumped
9d6149f4c762 (r_alloc_reinit): New function.
Richard M. Stallman <rms@gnu.org>
parents: 17845
diff changeset
1122 Emacs. This is needed when using Doug Lea's malloc from GNU libc. */
9d6149f4c762 (r_alloc_reinit): New function.
Richard M. Stallman <rms@gnu.org>
parents: 17845
diff changeset
1123 void
9d6149f4c762 (r_alloc_reinit): New function.
Richard M. Stallman <rms@gnu.org>
parents: 17845
diff changeset
1124 r_alloc_reinit ()
9d6149f4c762 (r_alloc_reinit): New function.
Richard M. Stallman <rms@gnu.org>
parents: 17845
diff changeset
1125 {
9d6149f4c762 (r_alloc_reinit): New function.
Richard M. Stallman <rms@gnu.org>
parents: 17845
diff changeset
1126 /* Only do this if the hook has been reset, so that we don't get an
9d6149f4c762 (r_alloc_reinit): New function.
Richard M. Stallman <rms@gnu.org>
parents: 17845
diff changeset
1127 infinite loop, in case Emacs was linked statically. */
9d6149f4c762 (r_alloc_reinit): New function.
Richard M. Stallman <rms@gnu.org>
parents: 17845
diff changeset
1128 if (__morecore != r_alloc_sbrk)
9d6149f4c762 (r_alloc_reinit): New function.
Richard M. Stallman <rms@gnu.org>
parents: 17845
diff changeset
1129 {
9d6149f4c762 (r_alloc_reinit): New function.
Richard M. Stallman <rms@gnu.org>
parents: 17845
diff changeset
1130 real_morecore = __morecore;
9d6149f4c762 (r_alloc_reinit): New function.
Richard M. Stallman <rms@gnu.org>
parents: 17845
diff changeset
1131 __morecore = r_alloc_sbrk;
9d6149f4c762 (r_alloc_reinit): New function.
Richard M. Stallman <rms@gnu.org>
parents: 17845
diff changeset
1132 }
9d6149f4c762 (r_alloc_reinit): New function.
Richard M. Stallman <rms@gnu.org>
parents: 17845
diff changeset
1133 }
31414
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1134
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1135 #endif /* emacs && DOUG_LEA_MALLOC */
18757
9d6149f4c762 (r_alloc_reinit): New function.
Richard M. Stallman <rms@gnu.org>
parents: 17845
diff changeset
1136
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
1137 #ifdef DEBUG
31414
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1138
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
1139 #include <assert.h>
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
1140
10767
2954efb1d06c (r_alloc_check): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 10766
diff changeset
1141 void
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
1142 r_alloc_check ()
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
1143 {
10766
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1144 int found = 0;
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1145 heap_ptr h, ph = 0;
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1146 bloc_ptr b, pb = 0;
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
1147
10766
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1148 if (!r_alloc_initialized)
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1149 return;
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
1150
10766
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1151 assert (first_heap);
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1152 assert (last_heap->end <= (POINTER) sbrk (0));
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1153 assert ((POINTER) first_heap < first_heap->start);
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1154 assert (first_heap->start <= virtual_break_value);
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1155 assert (virtual_break_value <= first_heap->end);
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
1156
10766
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1157 for (h = first_heap; h; h = h->next)
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1158 {
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1159 assert (h->prev == ph);
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1160 assert ((POINTER) ROUNDUP (h->end) == h->end);
14953
36e4b3043730 (r_alloc_check): Don't check alignment of h->start.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
1161 #if 0 /* ??? The code in ralloc.c does not really try to ensure
36e4b3043730 (r_alloc_check): Don't check alignment of h->start.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
1162 the heap start has any sort of alignment.
36e4b3043730 (r_alloc_check): Don't check alignment of h->start.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
1163 Perhaps it should. */
10766
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1164 assert ((POINTER) MEM_ROUNDUP (h->start) == h->start);
14953
36e4b3043730 (r_alloc_check): Don't check alignment of h->start.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
1165 #endif
10766
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1166 assert ((POINTER) MEM_ROUNDUP (h->bloc_start) == h->bloc_start);
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1167 assert (h->start <= h->bloc_start && h->bloc_start <= h->end);
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
1168
10766
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1169 if (ph)
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1170 {
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1171 assert (ph->end < h->start);
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1172 assert (h->start <= (POINTER)h && (POINTER)(h+1) <= h->bloc_start);
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1173 }
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
1174
10766
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1175 if (h->bloc_start <= break_value && break_value <= h->end)
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1176 found = 1;
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
1177
10766
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1178 ph = h;
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1179 }
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
1180
10766
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1181 assert (found);
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1182 assert (last_heap == ph);
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
1183
10766
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1184 for (b = first_bloc; b; b = b->next)
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1185 {
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1186 assert (b->prev == pb);
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1187 assert ((POINTER) MEM_ROUNDUP (b->data) == b->data);
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1188 assert ((SIZE) MEM_ROUNDUP (b->size) == b->size);
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
1189
10766
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1190 ph = 0;
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1191 for (h = first_heap; h; h = h->next)
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1192 {
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1193 if (h->bloc_start <= b->data && b->data + b->size <= h->end)
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1194 break;
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1195 ph = h;
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1196 }
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
1197
10766
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1198 assert (h);
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
1199
10766
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1200 if (pb && pb->data + pb->size != b->data)
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1201 {
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1202 assert (ph && b->data == h->bloc_start);
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1203 while (ph)
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1204 {
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1205 if (ph->bloc_start <= pb->data
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1206 && pb->data + pb->size <= ph->end)
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1207 {
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1208 assert (pb->data + pb->size + b->size > ph->end);
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1209 break;
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1210 }
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1211 else
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1212 {
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1213 assert (ph->bloc_start + b->size > ph->end);
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1214 }
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1215 ph = ph->prev;
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1216 }
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1217 }
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1218 pb = b;
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1219 }
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
1220
10766
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1221 assert (last_bloc == pb);
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
1222
10766
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1223 if (last_bloc)
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1224 assert (last_bloc->data + last_bloc->size == break_value);
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1225 else
07eea2d610d3 Whitespace fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10747
diff changeset
1226 assert (first_heap->bloc_start == break_value);
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
1227 }
31414
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1228
9459
a1569f00a6a6 Install Hiroshi Nakano's rewrite to allow multiple heaps, for implementations
Karl Heuer <kwzh@gnu.org>
parents: 8951
diff changeset
1229 #endif /* DEBUG */
31414
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1230
100673
01f68a925d12 * ralloc.c (r_alloc_reset_variable): New function.
Jason Rumney <jasonr@gnu.org>
parents: 99767
diff changeset
1231 /* Update the internal record of which variable points to some data to NEW.
01f68a925d12 * ralloc.c (r_alloc_reset_variable): New function.
Jason Rumney <jasonr@gnu.org>
parents: 99767
diff changeset
1232 Used by buffer-swap-text in Emacs to restore consistency after it
01f68a925d12 * ralloc.c (r_alloc_reset_variable): New function.
Jason Rumney <jasonr@gnu.org>
parents: 99767
diff changeset
1233 swaps the buffer text between two buffer objects. The OLD pointer
01f68a925d12 * ralloc.c (r_alloc_reset_variable): New function.
Jason Rumney <jasonr@gnu.org>
parents: 99767
diff changeset
1234 is checked to ensure that memory corruption does not occur due to
01f68a925d12 * ralloc.c (r_alloc_reset_variable): New function.
Jason Rumney <jasonr@gnu.org>
parents: 99767
diff changeset
1235 misuse. */
01f68a925d12 * ralloc.c (r_alloc_reset_variable): New function.
Jason Rumney <jasonr@gnu.org>
parents: 99767
diff changeset
1236 void
01f68a925d12 * ralloc.c (r_alloc_reset_variable): New function.
Jason Rumney <jasonr@gnu.org>
parents: 99767
diff changeset
1237 r_alloc_reset_variable (old, new)
01f68a925d12 * ralloc.c (r_alloc_reset_variable): New function.
Jason Rumney <jasonr@gnu.org>
parents: 99767
diff changeset
1238 POINTER *old, *new;
01f68a925d12 * ralloc.c (r_alloc_reset_variable): New function.
Jason Rumney <jasonr@gnu.org>
parents: 99767
diff changeset
1239 {
01f68a925d12 * ralloc.c (r_alloc_reset_variable): New function.
Jason Rumney <jasonr@gnu.org>
parents: 99767
diff changeset
1240 bloc_ptr bloc = first_bloc;
01f68a925d12 * ralloc.c (r_alloc_reset_variable): New function.
Jason Rumney <jasonr@gnu.org>
parents: 99767
diff changeset
1241
01f68a925d12 * ralloc.c (r_alloc_reset_variable): New function.
Jason Rumney <jasonr@gnu.org>
parents: 99767
diff changeset
1242 /* Find the bloc that corresponds to the data pointed to by pointer.
01f68a925d12 * ralloc.c (r_alloc_reset_variable): New function.
Jason Rumney <jasonr@gnu.org>
parents: 99767
diff changeset
1243 find_bloc cannot be used, as it has internal consistency checks
01f68a925d12 * ralloc.c (r_alloc_reset_variable): New function.
Jason Rumney <jasonr@gnu.org>
parents: 99767
diff changeset
1244 which fail when the variable needs reseting. */
01f68a925d12 * ralloc.c (r_alloc_reset_variable): New function.
Jason Rumney <jasonr@gnu.org>
parents: 99767
diff changeset
1245 while (bloc != NIL_BLOC)
01f68a925d12 * ralloc.c (r_alloc_reset_variable): New function.
Jason Rumney <jasonr@gnu.org>
parents: 99767
diff changeset
1246 {
01f68a925d12 * ralloc.c (r_alloc_reset_variable): New function.
Jason Rumney <jasonr@gnu.org>
parents: 99767
diff changeset
1247 if (bloc->data == *new)
01f68a925d12 * ralloc.c (r_alloc_reset_variable): New function.
Jason Rumney <jasonr@gnu.org>
parents: 99767
diff changeset
1248 break;
01f68a925d12 * ralloc.c (r_alloc_reset_variable): New function.
Jason Rumney <jasonr@gnu.org>
parents: 99767
diff changeset
1249
01f68a925d12 * ralloc.c (r_alloc_reset_variable): New function.
Jason Rumney <jasonr@gnu.org>
parents: 99767
diff changeset
1250 bloc = bloc->next;
01f68a925d12 * ralloc.c (r_alloc_reset_variable): New function.
Jason Rumney <jasonr@gnu.org>
parents: 99767
diff changeset
1251 }
01f68a925d12 * ralloc.c (r_alloc_reset_variable): New function.
Jason Rumney <jasonr@gnu.org>
parents: 99767
diff changeset
1252
01f68a925d12 * ralloc.c (r_alloc_reset_variable): New function.
Jason Rumney <jasonr@gnu.org>
parents: 99767
diff changeset
1253 if (bloc == NIL_BLOC || bloc->variable != old)
100674
dbba9cb0e6ce Add comments to explain checks and aborts, to assist future debugging.
Jason Rumney <jasonr@gnu.org>
parents: 100673
diff changeset
1254 abort (); /* Already freed? OLD not originally used to allocate? */
100673
01f68a925d12 * ralloc.c (r_alloc_reset_variable): New function.
Jason Rumney <jasonr@gnu.org>
parents: 99767
diff changeset
1255
01f68a925d12 * ralloc.c (r_alloc_reset_variable): New function.
Jason Rumney <jasonr@gnu.org>
parents: 99767
diff changeset
1256 /* Update variable to point to the new location. */
01f68a925d12 * ralloc.c (r_alloc_reset_variable): New function.
Jason Rumney <jasonr@gnu.org>
parents: 99767
diff changeset
1257 bloc->variable = new;
01f68a925d12 * ralloc.c (r_alloc_reset_variable): New function.
Jason Rumney <jasonr@gnu.org>
parents: 99767
diff changeset
1258 }
31414
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1259
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1260
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1261 /***********************************************************************
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1262 Initialization
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1263 ***********************************************************************/
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1264
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1265 /* Initialize various things for memory allocation. */
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1266
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1267 static void
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1268 r_alloc_init ()
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1269 {
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1270 if (r_alloc_initialized)
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1271 return;
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1272 r_alloc_initialized = 1;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 36187
diff changeset
1273
31498
17d4a8f3df67 Don't include string.h (redundant).
Dave Love <fx@gnu.org>
parents: 31473
diff changeset
1274 page_size = PAGE;
17d4a8f3df67 Don't include string.h (redundant).
Dave Love <fx@gnu.org>
parents: 31473
diff changeset
1275 #ifndef SYSTEM_MALLOC
31414
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1276 real_morecore = __morecore;
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1277 __morecore = r_alloc_sbrk;
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1278
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1279 first_heap = last_heap = &heap_base;
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1280 first_heap->next = first_heap->prev = NIL_HEAP;
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1281 first_heap->start = first_heap->bloc_start
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1282 = virtual_break_value = break_value = (*real_morecore) (0);
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1283 if (break_value == NIL)
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1284 abort ();
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1285
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1286 extra_bytes = ROUNDUP (50000);
31498
17d4a8f3df67 Don't include string.h (redundant).
Dave Love <fx@gnu.org>
parents: 31473
diff changeset
1287 #endif
31414
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1288
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1289 #ifdef DOUG_LEA_MALLOC
61225
1e515cc6ca0c * alloc.c (allocate_string_data): Call BLOCK_INPUT before calling
Jan Djärv <jan.h.d@swipnet.se>
parents: 52401
diff changeset
1290 BLOCK_INPUT;
1e515cc6ca0c * alloc.c (allocate_string_data): Call BLOCK_INPUT before calling
Jan Djärv <jan.h.d@swipnet.se>
parents: 52401
diff changeset
1291 mallopt (M_TOP_PAD, 64 * 4096);
1e515cc6ca0c * alloc.c (allocate_string_data): Call BLOCK_INPUT before calling
Jan Djärv <jan.h.d@swipnet.se>
parents: 52401
diff changeset
1292 UNBLOCK_INPUT;
31414
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1293 #else
31498
17d4a8f3df67 Don't include string.h (redundant).
Dave Love <fx@gnu.org>
parents: 31473
diff changeset
1294 #ifndef SYSTEM_MALLOC
31414
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1295 /* Give GNU malloc's morecore some hysteresis
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1296 so that we move all the relocatable blocks much less often. */
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1297 __malloc_extra_blocks = 64;
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1298 #endif
31498
17d4a8f3df67 Don't include string.h (redundant).
Dave Love <fx@gnu.org>
parents: 31473
diff changeset
1299 #endif
31414
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1300
31509
6bc82db7d305 (r_alloc_init): Conditionalize on SYSTEM_MALLOC, not REL_ALLOC_MMAP.
Dave Love <fx@gnu.org>
parents: 31504
diff changeset
1301 #ifndef SYSTEM_MALLOC
31414
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1302 first_heap->end = (POINTER) ROUNDUP (first_heap->start);
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1303
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1304 /* The extra call to real_morecore guarantees that the end of the
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1305 address space is a multiple of page_size, even if page_size is
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1306 not really the page size of the system running the binary in
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1307 which page_size is stored. This allows a binary to be built on a
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1308 system with one page size and run on a system with a smaller page
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1309 size. */
31473
055accd6bf1d (obtain, relinquish, relinquish, r_alloc_size_in_use)
Gerd Moellmann <gerd@gnu.org>
parents: 31468
diff changeset
1310 (*real_morecore) ((char *) first_heap->end - (char *) first_heap->start);
31414
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1311
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1312 /* Clear the rest of the last page; this memory is in our address space
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1313 even though it is after the sbrk value. */
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1314 /* Doubly true, with the additional call that explicitly adds the
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1315 rest of that page to the address space. */
31473
055accd6bf1d (obtain, relinquish, relinquish, r_alloc_size_in_use)
Gerd Moellmann <gerd@gnu.org>
parents: 31468
diff changeset
1316 bzero (first_heap->start,
055accd6bf1d (obtain, relinquish, relinquish, r_alloc_size_in_use)
Gerd Moellmann <gerd@gnu.org>
parents: 31468
diff changeset
1317 (char *) first_heap->end - (char *) first_heap->start);
31414
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1318 virtual_break_value = break_value = first_heap->bloc_start = first_heap->end;
31498
17d4a8f3df67 Don't include string.h (redundant).
Dave Love <fx@gnu.org>
parents: 31473
diff changeset
1319 #endif
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 36187
diff changeset
1320
31414
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1321 use_relocatable_buffers = 1;
76dcf201d009 (POINTER, SIZE) [emacs]: Define in terms of
Gerd Moellmann <gerd@gnu.org>
parents: 30061
diff changeset
1322 }
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 49600
diff changeset
1323
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 49600
diff changeset
1324 /* arch-tag: 6a524a15-faff-44c8-95d4-a5da6f55110f
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 49600
diff changeset
1325 (do not change this comment) */