Mercurial > hg > truffle
annotate src/share/vm/memory/allocation.cpp @ 10271:f9be75d21404
8012902: remove use of global operator new - take 2
Summary: The fix of 8010992, disable use of global operator new and new[] which caused failure on some tests. This takes two of the bugs also add ALLOW_OPERATOR_NEW_USAGE to prevent crash for third party code calling operator new of jvm on certain platforms.
Reviewed-by: coleenp, dholmes, zgu
Contributed-by: yumin.qi@oracle.com
| author | minqi |
|---|---|
| date | Tue, 14 May 2013 09:41:12 -0700 |
| parents | 746b070f5022 |
| children | a1ebd310d5c1 ce9ecec70f99 |
| rev | line source |
|---|---|
| 0 | 1 /* |
|
10271
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
2 * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. |
| 0 | 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
| 4 * | |
| 5 * This code is free software; you can redistribute it and/or modify it | |
| 6 * under the terms of the GNU General Public License version 2 only, as | |
| 7 * published by the Free Software Foundation. | |
| 8 * | |
| 9 * This code is distributed in the hope that it will be useful, but WITHOUT | |
| 10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 12 * version 2 for more details (a copy is included in the LICENSE file that | |
| 13 * accompanied this code). | |
| 14 * | |
| 15 * You should have received a copy of the GNU General Public License version | |
| 16 * 2 along with this work; if not, write to the Free Software Foundation, | |
| 17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | |
| 18 * | |
|
1552
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
0
diff
changeset
|
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
0
diff
changeset
|
20 * or visit www.oracle.com if you need additional information or have any |
|
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
0
diff
changeset
|
21 * questions. |
| 0 | 22 * |
| 23 */ | |
| 24 | |
| 1972 | 25 #include "precompiled.hpp" |
| 26 #include "memory/allocation.hpp" | |
| 27 #include "memory/allocation.inline.hpp" | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
28 #include "memory/genCollectedHeap.hpp" |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
29 #include "memory/metaspaceShared.hpp" |
| 1972 | 30 #include "memory/resourceArea.hpp" |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
31 #include "memory/universe.hpp" |
| 6197 | 32 #include "runtime/atomic.hpp" |
| 1972 | 33 #include "runtime/os.hpp" |
| 34 #include "runtime/task.hpp" | |
| 35 #include "runtime/threadCritical.hpp" | |
| 6197 | 36 #include "services/memTracker.hpp" |
| 1972 | 37 #include "utilities/ostream.hpp" |
| 6197 | 38 |
| 1972 | 39 #ifdef TARGET_OS_FAMILY_linux |
| 40 # include "os_linux.inline.hpp" | |
| 41 #endif | |
| 42 #ifdef TARGET_OS_FAMILY_solaris | |
| 43 # include "os_solaris.inline.hpp" | |
| 44 #endif | |
| 45 #ifdef TARGET_OS_FAMILY_windows | |
| 46 # include "os_windows.inline.hpp" | |
| 47 #endif | |
| 3960 | 48 #ifdef TARGET_OS_FAMILY_bsd |
| 49 # include "os_bsd.inline.hpp" | |
| 50 #endif | |
| 0 | 51 |
|
10271
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
52 void* StackObj::operator new(size_t size) { ShouldNotCallThis(); return 0; } |
|
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
53 void StackObj::operator delete(void* p) { ShouldNotCallThis(); } |
|
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
54 void* StackObj::operator new [](size_t size) { ShouldNotCallThis(); return 0; } |
|
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
55 void StackObj::operator delete [](void* p) { ShouldNotCallThis(); } |
|
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
56 |
|
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
57 void* _ValueObj::operator new(size_t size) { ShouldNotCallThis(); return 0; } |
|
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
58 void _ValueObj::operator delete(void* p) { ShouldNotCallThis(); } |
|
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
59 void* _ValueObj::operator new [](size_t size) { ShouldNotCallThis(); return 0; } |
|
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
60 void _ValueObj::operator delete [](void* p) { ShouldNotCallThis(); } |
| 0 | 61 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
62 void* MetaspaceObj::operator new(size_t size, ClassLoaderData* loader_data, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
63 size_t word_size, bool read_only, TRAPS) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
64 // Klass has it's own operator new |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
65 return Metaspace::allocate(loader_data, word_size, read_only, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
66 Metaspace::NonClassType, CHECK_NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
67 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
68 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
69 bool MetaspaceObj::is_shared() const { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
70 return MetaspaceShared::is_in_shared_space(this); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
71 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
72 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
73 bool MetaspaceObj::is_metadata() const { |
|
7176
59c790074993
8003635: NPG: AsynchGetCallTrace broken by Method* virtual call
coleenp
parents:
6882
diff
changeset
|
74 // GC Verify checks use this in guarantees. |
|
59c790074993
8003635: NPG: AsynchGetCallTrace broken by Method* virtual call
coleenp
parents:
6882
diff
changeset
|
75 // TODO: either replace them with is_metaspace_object() or remove them. |
|
59c790074993
8003635: NPG: AsynchGetCallTrace broken by Method* virtual call
coleenp
parents:
6882
diff
changeset
|
76 // is_metaspace_object() is slower than this test. This test doesn't |
|
59c790074993
8003635: NPG: AsynchGetCallTrace broken by Method* virtual call
coleenp
parents:
6882
diff
changeset
|
77 // seem very useful for metaspace objects anymore though. |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
78 return !Universe::heap()->is_in_reserved(this); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
79 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
80 |
|
7176
59c790074993
8003635: NPG: AsynchGetCallTrace broken by Method* virtual call
coleenp
parents:
6882
diff
changeset
|
81 bool MetaspaceObj::is_metaspace_object() const { |
|
59c790074993
8003635: NPG: AsynchGetCallTrace broken by Method* virtual call
coleenp
parents:
6882
diff
changeset
|
82 return Metaspace::contains((void*)this); |
|
59c790074993
8003635: NPG: AsynchGetCallTrace broken by Method* virtual call
coleenp
parents:
6882
diff
changeset
|
83 } |
|
59c790074993
8003635: NPG: AsynchGetCallTrace broken by Method* virtual call
coleenp
parents:
6882
diff
changeset
|
84 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
85 void MetaspaceObj::print_address_on(outputStream* st) const { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
86 st->print(" {"INTPTR_FORMAT"}", this); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
87 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
88 |
| 6197 | 89 void* ResourceObj::operator new(size_t size, allocation_type type, MEMFLAGS flags) { |
| 0 | 90 address res; |
| 91 switch (type) { | |
| 92 case C_HEAP: | |
| 6197 | 93 res = (address)AllocateHeap(size, flags, CALLER_PC); |
| 1685 | 94 DEBUG_ONLY(set_allocation_type(res, C_HEAP);) |
| 0 | 95 break; |
| 96 case RESOURCE_AREA: | |
|
1688
2dfd013a7465
6975078: assert(allocated_on_res_area() || allocated_on_C_heap() || allocated_on_arena()
kvn
parents:
1685
diff
changeset
|
97 // new(size) sets allocation type RESOURCE_AREA. |
| 0 | 98 res = (address)operator new(size); |
| 99 break; | |
| 100 default: | |
| 101 ShouldNotReachHere(); | |
| 102 } | |
| 103 return res; | |
| 104 } | |
| 105 | |
|
10271
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
106 void* ResourceObj::operator new [](size_t size, allocation_type type, MEMFLAGS flags) { |
|
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
107 return (address) operator new(size, type, flags); |
|
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
108 } |
|
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
109 |
|
6872
7b5885dadbdc
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
6725
diff
changeset
|
110 void* ResourceObj::operator new(size_t size, const std::nothrow_t& nothrow_constant, |
|
7b5885dadbdc
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
6725
diff
changeset
|
111 allocation_type type, MEMFLAGS flags) { |
|
7b5885dadbdc
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
6725
diff
changeset
|
112 //should only call this with std::nothrow, use other operator new() otherwise |
|
7b5885dadbdc
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
6725
diff
changeset
|
113 address res; |
|
7b5885dadbdc
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
6725
diff
changeset
|
114 switch (type) { |
|
7b5885dadbdc
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
6725
diff
changeset
|
115 case C_HEAP: |
|
7b5885dadbdc
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
6725
diff
changeset
|
116 res = (address)AllocateHeap(size, flags, CALLER_PC, AllocFailStrategy::RETURN_NULL); |
|
7b5885dadbdc
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
6725
diff
changeset
|
117 DEBUG_ONLY(if (res!= NULL) set_allocation_type(res, C_HEAP);) |
|
7b5885dadbdc
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
6725
diff
changeset
|
118 break; |
|
7b5885dadbdc
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
6725
diff
changeset
|
119 case RESOURCE_AREA: |
|
7b5885dadbdc
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
6725
diff
changeset
|
120 // new(size) sets allocation type RESOURCE_AREA. |
|
7b5885dadbdc
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
6725
diff
changeset
|
121 res = (address)operator new(size, std::nothrow); |
|
7b5885dadbdc
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
6725
diff
changeset
|
122 break; |
|
7b5885dadbdc
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
6725
diff
changeset
|
123 default: |
|
7b5885dadbdc
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
6725
diff
changeset
|
124 ShouldNotReachHere(); |
|
7b5885dadbdc
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
6725
diff
changeset
|
125 } |
|
7b5885dadbdc
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
6725
diff
changeset
|
126 return res; |
|
7b5885dadbdc
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
6725
diff
changeset
|
127 } |
|
7b5885dadbdc
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
6725
diff
changeset
|
128 |
|
10271
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
129 void* ResourceObj::operator new [](size_t size, const std::nothrow_t& nothrow_constant, |
|
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
130 allocation_type type, MEMFLAGS flags) { |
|
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
131 return (address)operator new(size, nothrow_constant, type, flags); |
|
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
132 } |
|
6872
7b5885dadbdc
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
6725
diff
changeset
|
133 |
| 0 | 134 void ResourceObj::operator delete(void* p) { |
| 135 assert(((ResourceObj *)p)->allocated_on_C_heap(), | |
| 136 "delete only allowed for C_HEAP objects"); | |
|
2015
79d8657be916
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
1972
diff
changeset
|
137 DEBUG_ONLY(((ResourceObj *)p)->_allocation_t[0] = (uintptr_t)badHeapOopVal;) |
| 0 | 138 FreeHeap(p); |
| 139 } | |
| 140 | |
|
10271
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
141 void ResourceObj::operator delete [](void* p) { |
|
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
142 operator delete(p); |
|
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
143 } |
|
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
144 |
| 1685 | 145 #ifdef ASSERT |
| 146 void ResourceObj::set_allocation_type(address res, allocation_type type) { | |
| 147 // Set allocation type in the resource object | |
| 148 uintptr_t allocation = (uintptr_t)res; | |
|
1688
2dfd013a7465
6975078: assert(allocated_on_res_area() || allocated_on_C_heap() || allocated_on_arena()
kvn
parents:
1685
diff
changeset
|
149 assert((allocation & allocation_mask) == 0, "address should be aligned to 4 bytes at least"); |
| 1685 | 150 assert(type <= allocation_mask, "incorrect allocation type"); |
|
2015
79d8657be916
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
1972
diff
changeset
|
151 ResourceObj* resobj = (ResourceObj *)res; |
|
79d8657be916
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
1972
diff
changeset
|
152 resobj->_allocation_t[0] = ~(allocation + type); |
|
79d8657be916
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
1972
diff
changeset
|
153 if (type != STACK_OR_EMBEDDED) { |
|
79d8657be916
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
1972
diff
changeset
|
154 // Called from operator new() and CollectionSetChooser(), |
|
79d8657be916
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
1972
diff
changeset
|
155 // set verification value. |
|
79d8657be916
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
1972
diff
changeset
|
156 resobj->_allocation_t[1] = (uintptr_t)&(resobj->_allocation_t[1]) + type; |
|
79d8657be916
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
1972
diff
changeset
|
157 } |
| 1685 | 158 } |
| 159 | |
|
1688
2dfd013a7465
6975078: assert(allocated_on_res_area() || allocated_on_C_heap() || allocated_on_arena()
kvn
parents:
1685
diff
changeset
|
160 ResourceObj::allocation_type ResourceObj::get_allocation_type() const { |
|
2015
79d8657be916
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
1972
diff
changeset
|
161 assert(~(_allocation_t[0] | allocation_mask) == (uintptr_t)this, "lost resource object"); |
|
79d8657be916
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
1972
diff
changeset
|
162 return (allocation_type)((~_allocation_t[0]) & allocation_mask); |
|
79d8657be916
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
1972
diff
changeset
|
163 } |
|
79d8657be916
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
1972
diff
changeset
|
164 |
|
79d8657be916
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
1972
diff
changeset
|
165 bool ResourceObj::is_type_set() const { |
|
79d8657be916
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
1972
diff
changeset
|
166 allocation_type type = (allocation_type)(_allocation_t[1] & allocation_mask); |
|
79d8657be916
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
1972
diff
changeset
|
167 return get_allocation_type() == type && |
|
79d8657be916
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
1972
diff
changeset
|
168 (_allocation_t[1] - type) == (uintptr_t)(&_allocation_t[1]); |
| 1685 | 169 } |
| 170 | |
|
1688
2dfd013a7465
6975078: assert(allocated_on_res_area() || allocated_on_C_heap() || allocated_on_arena()
kvn
parents:
1685
diff
changeset
|
171 ResourceObj::ResourceObj() { // default constructor |
|
2015
79d8657be916
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
1972
diff
changeset
|
172 if (~(_allocation_t[0] | allocation_mask) != (uintptr_t)this) { |
|
79d8657be916
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
1972
diff
changeset
|
173 // Operator new() is not called for allocations |
|
79d8657be916
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
1972
diff
changeset
|
174 // on stack and for embedded objects. |
| 1685 | 175 set_allocation_type((address)this, STACK_OR_EMBEDDED); |
|
2015
79d8657be916
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
1972
diff
changeset
|
176 } else if (allocated_on_stack()) { // STACK_OR_EMBEDDED |
|
79d8657be916
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
1972
diff
changeset
|
177 // For some reason we got a value which resembles |
|
79d8657be916
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
1972
diff
changeset
|
178 // an embedded or stack object (operator new() does not |
|
79d8657be916
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
1972
diff
changeset
|
179 // set such type). Keep it since it is valid value |
|
79d8657be916
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
1972
diff
changeset
|
180 // (even if it was garbage). |
|
79d8657be916
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
1972
diff
changeset
|
181 // Ignore garbage in other fields. |
|
79d8657be916
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
1972
diff
changeset
|
182 } else if (is_type_set()) { |
|
79d8657be916
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
1972
diff
changeset
|
183 // Operator new() was called and type was set. |
|
79d8657be916
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
1972
diff
changeset
|
184 assert(!allocated_on_stack(), |
|
79d8657be916
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
1972
diff
changeset
|
185 err_msg("not embedded or stack, this(" PTR_FORMAT ") type %d a[0]=(" PTR_FORMAT ") a[1]=(" PTR_FORMAT ")", |
|
79d8657be916
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
1972
diff
changeset
|
186 this, get_allocation_type(), _allocation_t[0], _allocation_t[1])); |
| 1685 | 187 } else { |
|
2015
79d8657be916
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
1972
diff
changeset
|
188 // Operator new() was not called. |
|
79d8657be916
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
1972
diff
changeset
|
189 // Assume that it is embedded or stack object. |
|
79d8657be916
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
1972
diff
changeset
|
190 set_allocation_type((address)this, STACK_OR_EMBEDDED); |
| 1685 | 191 } |
|
2015
79d8657be916
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
1972
diff
changeset
|
192 _allocation_t[1] = 0; // Zap verification value |
| 1685 | 193 } |
| 194 | |
|
1688
2dfd013a7465
6975078: assert(allocated_on_res_area() || allocated_on_C_heap() || allocated_on_arena()
kvn
parents:
1685
diff
changeset
|
195 ResourceObj::ResourceObj(const ResourceObj& r) { // default copy constructor |
| 1685 | 196 // Used in ClassFileParser::parse_constant_pool_entries() for ClassFileStream. |
|
2015
79d8657be916
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
1972
diff
changeset
|
197 // Note: garbage may resembles valid value. |
|
79d8657be916
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
1972
diff
changeset
|
198 assert(~(_allocation_t[0] | allocation_mask) != (uintptr_t)this || !is_type_set(), |
|
79d8657be916
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
1972
diff
changeset
|
199 err_msg("embedded or stack only, this(" PTR_FORMAT ") type %d a[0]=(" PTR_FORMAT ") a[1]=(" PTR_FORMAT ")", |
|
79d8657be916
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
1972
diff
changeset
|
200 this, get_allocation_type(), _allocation_t[0], _allocation_t[1])); |
| 1685 | 201 set_allocation_type((address)this, STACK_OR_EMBEDDED); |
|
2015
79d8657be916
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
1972
diff
changeset
|
202 _allocation_t[1] = 0; // Zap verification value |
| 1685 | 203 } |
| 204 | |
| 205 ResourceObj& ResourceObj::operator=(const ResourceObj& r) { // default copy assignment | |
| 206 // Used in InlineTree::ok_to_inline() for WarmCallInfo. | |
|
2015
79d8657be916
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
1972
diff
changeset
|
207 assert(allocated_on_stack(), |
|
79d8657be916
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
1972
diff
changeset
|
208 err_msg("copy only into local, this(" PTR_FORMAT ") type %d a[0]=(" PTR_FORMAT ") a[1]=(" PTR_FORMAT ")", |
|
79d8657be916
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
1972
diff
changeset
|
209 this, get_allocation_type(), _allocation_t[0], _allocation_t[1])); |
|
79d8657be916
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
1972
diff
changeset
|
210 // Keep current _allocation_t value; |
| 1685 | 211 return *this; |
| 212 } | |
| 213 | |
| 214 ResourceObj::~ResourceObj() { | |
|
1688
2dfd013a7465
6975078: assert(allocated_on_res_area() || allocated_on_C_heap() || allocated_on_arena()
kvn
parents:
1685
diff
changeset
|
215 // allocated_on_C_heap() also checks that encoded (in _allocation) address == this. |
|
2015
79d8657be916
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
1972
diff
changeset
|
216 if (!allocated_on_C_heap()) { // ResourceObj::delete() will zap _allocation for C_heap. |
|
79d8657be916
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
1972
diff
changeset
|
217 _allocation_t[0] = (uintptr_t)badHeapOopVal; // zap type |
| 1685 | 218 } |
| 219 } | |
| 220 #endif // ASSERT | |
| 221 | |
| 222 | |
| 0 | 223 void trace_heap_malloc(size_t size, const char* name, void* p) { |
| 224 // A lock is not needed here - tty uses a lock internally | |
| 2250 | 225 tty->print_cr("Heap malloc " INTPTR_FORMAT " " SIZE_FORMAT " %s", p, size, name == NULL ? "" : name); |
| 0 | 226 } |
| 227 | |
| 228 | |
| 229 void trace_heap_free(void* p) { | |
| 230 // A lock is not needed here - tty uses a lock internally | |
| 231 tty->print_cr("Heap free " INTPTR_FORMAT, p); | |
| 232 } | |
| 233 | |
| 234 //-------------------------------------------------------------------------------------- | |
| 235 // ChunkPool implementation | |
| 236 | |
| 237 // MT-safe pool of chunks to reduce malloc/free thrashing | |
| 238 // NB: not using Mutex because pools are used before Threads are initialized | |
| 6197 | 239 class ChunkPool: public CHeapObj<mtInternal> { |
| 0 | 240 Chunk* _first; // first cached Chunk; its first word points to next chunk |
| 241 size_t _num_chunks; // number of unused chunks in pool | |
| 242 size_t _num_used; // number of chunks currently checked out | |
| 243 const size_t _size; // size of each chunk (must be uniform) | |
| 244 | |
| 245 // Our three static pools | |
| 246 static ChunkPool* _large_pool; | |
| 247 static ChunkPool* _medium_pool; | |
| 248 static ChunkPool* _small_pool; | |
| 249 | |
| 250 // return first element or null | |
| 251 void* get_first() { | |
| 252 Chunk* c = _first; | |
| 253 if (_first) { | |
| 254 _first = _first->next(); | |
| 255 _num_chunks--; | |
| 256 } | |
| 257 return c; | |
| 258 } | |
| 259 | |
| 260 public: | |
| 261 // All chunks in a ChunkPool has the same size | |
| 262 ChunkPool(size_t size) : _size(size) { _first = NULL; _num_chunks = _num_used = 0; } | |
| 263 | |
| 264 // Allocate a new chunk from the pool (might expand the pool) | |
| 6197 | 265 _NOINLINE_ void* allocate(size_t bytes) { |
| 0 | 266 assert(bytes == _size, "bad size"); |
| 267 void* p = NULL; | |
| 6197 | 268 // No VM lock can be taken inside ThreadCritical lock, so os::malloc |
| 269 // should be done outside ThreadCritical lock due to NMT | |
| 0 | 270 { ThreadCritical tc; |
| 271 _num_used++; | |
| 272 p = get_first(); | |
| 273 } | |
| 6197 | 274 if (p == NULL) p = os::malloc(bytes, mtChunk, CURRENT_PC); |
| 0 | 275 if (p == NULL) |
|
10161
746b070f5022
8011661: Insufficient memory message says "malloc" when sometimes it should say "mmap"
ccheung
parents:
10135
diff
changeset
|
276 vm_exit_out_of_memory(bytes, OOM_MALLOC_ERROR, "ChunkPool::allocate"); |
| 0 | 277 |
| 278 return p; | |
| 279 } | |
| 280 | |
| 281 // Return a chunk to the pool | |
| 282 void free(Chunk* chunk) { | |
| 283 assert(chunk->length() + Chunk::aligned_overhead_size() == _size, "bad size"); | |
| 284 ThreadCritical tc; | |
| 285 _num_used--; | |
| 286 | |
| 287 // Add chunk to list | |
| 288 chunk->set_next(_first); | |
| 289 _first = chunk; | |
| 290 _num_chunks++; | |
| 291 } | |
| 292 | |
| 293 // Prune the pool | |
| 294 void free_all_but(size_t n) { | |
| 6197 | 295 Chunk* cur = NULL; |
| 296 Chunk* next; | |
| 297 { | |
| 0 | 298 // if we have more than n chunks, free all of them |
| 299 ThreadCritical tc; | |
| 300 if (_num_chunks > n) { | |
| 301 // free chunks at end of queue, for better locality | |
| 6197 | 302 cur = _first; |
| 0 | 303 for (size_t i = 0; i < (n - 1) && cur != NULL; i++) cur = cur->next(); |
| 304 | |
| 305 if (cur != NULL) { | |
| 6197 | 306 next = cur->next(); |
| 0 | 307 cur->set_next(NULL); |
| 308 cur = next; | |
| 309 | |
| 6197 | 310 _num_chunks = n; |
| 311 } | |
| 312 } | |
| 313 } | |
| 314 | |
| 315 // Free all remaining chunks, outside of ThreadCritical | |
| 316 // to avoid deadlock with NMT | |
| 0 | 317 while(cur != NULL) { |
| 318 next = cur->next(); | |
| 6197 | 319 os::free(cur, mtChunk); |
| 0 | 320 cur = next; |
| 321 } | |
| 322 } | |
| 323 | |
| 324 // Accessors to preallocated pool's | |
| 325 static ChunkPool* large_pool() { assert(_large_pool != NULL, "must be initialized"); return _large_pool; } | |
| 326 static ChunkPool* medium_pool() { assert(_medium_pool != NULL, "must be initialized"); return _medium_pool; } | |
| 327 static ChunkPool* small_pool() { assert(_small_pool != NULL, "must be initialized"); return _small_pool; } | |
| 328 | |
| 329 static void initialize() { | |
| 330 _large_pool = new ChunkPool(Chunk::size + Chunk::aligned_overhead_size()); | |
| 331 _medium_pool = new ChunkPool(Chunk::medium_size + Chunk::aligned_overhead_size()); | |
| 332 _small_pool = new ChunkPool(Chunk::init_size + Chunk::aligned_overhead_size()); | |
| 333 } | |
|
1681
126ea7725993
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
1552
diff
changeset
|
334 |
|
126ea7725993
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
1552
diff
changeset
|
335 static void clean() { |
|
126ea7725993
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
1552
diff
changeset
|
336 enum { BlocksToKeep = 5 }; |
|
126ea7725993
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
1552
diff
changeset
|
337 _small_pool->free_all_but(BlocksToKeep); |
|
126ea7725993
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
1552
diff
changeset
|
338 _medium_pool->free_all_but(BlocksToKeep); |
|
126ea7725993
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
1552
diff
changeset
|
339 _large_pool->free_all_but(BlocksToKeep); |
|
126ea7725993
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
1552
diff
changeset
|
340 } |
| 0 | 341 }; |
| 342 | |
| 343 ChunkPool* ChunkPool::_large_pool = NULL; | |
| 344 ChunkPool* ChunkPool::_medium_pool = NULL; | |
| 345 ChunkPool* ChunkPool::_small_pool = NULL; | |
| 346 | |
| 347 void chunkpool_init() { | |
| 348 ChunkPool::initialize(); | |
| 349 } | |
| 350 | |
|
1681
126ea7725993
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
1552
diff
changeset
|
351 void |
|
126ea7725993
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
1552
diff
changeset
|
352 Chunk::clean_chunk_pool() { |
|
126ea7725993
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
1552
diff
changeset
|
353 ChunkPool::clean(); |
|
126ea7725993
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
1552
diff
changeset
|
354 } |
|
126ea7725993
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
1552
diff
changeset
|
355 |
| 0 | 356 |
| 357 //-------------------------------------------------------------------------------------- | |
| 358 // ChunkPoolCleaner implementation | |
|
1681
126ea7725993
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
1552
diff
changeset
|
359 // |
| 0 | 360 |
| 361 class ChunkPoolCleaner : public PeriodicTask { | |
|
1681
126ea7725993
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
1552
diff
changeset
|
362 enum { CleaningInterval = 5000 }; // cleaning interval in ms |
| 0 | 363 |
| 364 public: | |
| 365 ChunkPoolCleaner() : PeriodicTask(CleaningInterval) {} | |
| 366 void task() { | |
|
1681
126ea7725993
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
1552
diff
changeset
|
367 ChunkPool::clean(); |
| 0 | 368 } |
| 369 }; | |
| 370 | |
| 371 //-------------------------------------------------------------------------------------- | |
| 372 // Chunk implementation | |
| 373 | |
| 374 void* Chunk::operator new(size_t requested_size, size_t length) { | |
| 375 // requested_size is equal to sizeof(Chunk) but in order for the arena | |
| 376 // allocations to come out aligned as expected the size must be aligned | |
|
10271
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
377 // to expected arena alignment. |
| 0 | 378 // expect requested_size but if sizeof(Chunk) doesn't match isn't proper size we must align it. |
| 379 assert(ARENA_ALIGN(requested_size) == aligned_overhead_size(), "Bad alignment"); | |
| 380 size_t bytes = ARENA_ALIGN(requested_size) + length; | |
| 381 switch (length) { | |
| 382 case Chunk::size: return ChunkPool::large_pool()->allocate(bytes); | |
| 383 case Chunk::medium_size: return ChunkPool::medium_pool()->allocate(bytes); | |
| 384 case Chunk::init_size: return ChunkPool::small_pool()->allocate(bytes); | |
| 385 default: { | |
| 6197 | 386 void *p = os::malloc(bytes, mtChunk, CALLER_PC); |
| 0 | 387 if (p == NULL) |
|
10161
746b070f5022
8011661: Insufficient memory message says "malloc" when sometimes it should say "mmap"
ccheung
parents:
10135
diff
changeset
|
388 vm_exit_out_of_memory(bytes, OOM_MALLOC_ERROR, "Chunk::new"); |
| 0 | 389 return p; |
| 390 } | |
| 391 } | |
| 392 } | |
| 393 | |
| 394 void Chunk::operator delete(void* p) { | |
| 395 Chunk* c = (Chunk*)p; | |
| 396 switch (c->length()) { | |
| 397 case Chunk::size: ChunkPool::large_pool()->free(c); break; | |
| 398 case Chunk::medium_size: ChunkPool::medium_pool()->free(c); break; | |
| 399 case Chunk::init_size: ChunkPool::small_pool()->free(c); break; | |
| 6197 | 400 default: os::free(c, mtChunk); |
| 0 | 401 } |
| 402 } | |
| 403 | |
| 404 Chunk::Chunk(size_t length) : _len(length) { | |
| 405 _next = NULL; // Chain on the linked list | |
| 406 } | |
| 407 | |
| 408 | |
| 409 void Chunk::chop() { | |
| 410 Chunk *k = this; | |
| 411 while( k ) { | |
| 412 Chunk *tmp = k->next(); | |
| 413 // clear out this chunk (to detect allocation bugs) | |
| 414 if (ZapResourceArea) memset(k->bottom(), badResourceValue, k->length()); | |
| 415 delete k; // Free chunk (was malloc'd) | |
| 416 k = tmp; | |
| 417 } | |
| 418 } | |
| 419 | |
| 420 void Chunk::next_chop() { | |
| 421 _next->chop(); | |
| 422 _next = NULL; | |
| 423 } | |
| 424 | |
| 425 | |
| 426 void Chunk::start_chunk_pool_cleaner_task() { | |
| 427 #ifdef ASSERT | |
| 428 static bool task_created = false; | |
| 429 assert(!task_created, "should not start chuck pool cleaner twice"); | |
| 430 task_created = true; | |
| 431 #endif | |
| 432 ChunkPoolCleaner* cleaner = new ChunkPoolCleaner(); | |
| 433 cleaner->enroll(); | |
| 434 } | |
| 435 | |
| 436 //------------------------------Arena------------------------------------------ | |
| 6197 | 437 NOT_PRODUCT(volatile jint Arena::_instance_count = 0;) |
| 0 | 438 |
| 439 Arena::Arena(size_t init_size) { | |
| 440 size_t round_size = (sizeof (char *)) - 1; | |
| 441 init_size = (init_size+round_size) & ~round_size; | |
| 442 _first = _chunk = new (init_size) Chunk(init_size); | |
| 443 _hwm = _chunk->bottom(); // Save the cached hwm, max | |
| 444 _max = _chunk->top(); | |
| 445 set_size_in_bytes(init_size); | |
| 6197 | 446 NOT_PRODUCT(Atomic::inc(&_instance_count);) |
| 0 | 447 } |
| 448 | |
| 449 Arena::Arena() { | |
| 450 _first = _chunk = new (Chunk::init_size) Chunk(Chunk::init_size); | |
| 451 _hwm = _chunk->bottom(); // Save the cached hwm, max | |
| 452 _max = _chunk->top(); | |
| 453 set_size_in_bytes(Chunk::init_size); | |
| 6197 | 454 NOT_PRODUCT(Atomic::inc(&_instance_count);) |
| 0 | 455 } |
| 456 | |
| 457 Arena *Arena::move_contents(Arena *copy) { | |
| 458 copy->destruct_contents(); | |
| 459 copy->_chunk = _chunk; | |
| 460 copy->_hwm = _hwm; | |
| 461 copy->_max = _max; | |
| 462 copy->_first = _first; | |
|
6882
716c64bda5ba
7199092: NMT: NMT needs to deal overlapped virtual memory ranges
zgu
parents:
6872
diff
changeset
|
463 |
|
716c64bda5ba
7199092: NMT: NMT needs to deal overlapped virtual memory ranges
zgu
parents:
6872
diff
changeset
|
464 // workaround rare racing condition, which could double count |
|
716c64bda5ba
7199092: NMT: NMT needs to deal overlapped virtual memory ranges
zgu
parents:
6872
diff
changeset
|
465 // the arena size by native memory tracking |
|
716c64bda5ba
7199092: NMT: NMT needs to deal overlapped virtual memory ranges
zgu
parents:
6872
diff
changeset
|
466 size_t size = size_in_bytes(); |
|
716c64bda5ba
7199092: NMT: NMT needs to deal overlapped virtual memory ranges
zgu
parents:
6872
diff
changeset
|
467 set_size_in_bytes(0); |
|
716c64bda5ba
7199092: NMT: NMT needs to deal overlapped virtual memory ranges
zgu
parents:
6872
diff
changeset
|
468 copy->set_size_in_bytes(size); |
| 0 | 469 // Destroy original arena |
| 470 reset(); | |
| 471 return copy; // Return Arena with contents | |
| 472 } | |
| 473 | |
| 474 Arena::~Arena() { | |
| 475 destruct_contents(); | |
| 6197 | 476 NOT_PRODUCT(Atomic::dec(&_instance_count);) |
| 477 } | |
| 478 | |
| 479 void* Arena::operator new(size_t size) { | |
| 480 assert(false, "Use dynamic memory type binding"); | |
| 481 return NULL; | |
| 482 } | |
| 483 | |
| 484 void* Arena::operator new (size_t size, const std::nothrow_t& nothrow_constant) { | |
| 485 assert(false, "Use dynamic memory type binding"); | |
| 486 return NULL; | |
| 487 } | |
| 488 | |
| 489 // dynamic memory type binding | |
| 490 void* Arena::operator new(size_t size, MEMFLAGS flags) { | |
| 491 #ifdef ASSERT | |
| 492 void* p = (void*)AllocateHeap(size, flags|otArena, CALLER_PC); | |
| 493 if (PrintMallocFree) trace_heap_malloc(size, "Arena-new", p); | |
| 494 return p; | |
| 495 #else | |
| 496 return (void *) AllocateHeap(size, flags|otArena, CALLER_PC); | |
| 497 #endif | |
| 498 } | |
| 499 | |
| 500 void* Arena::operator new(size_t size, const std::nothrow_t& nothrow_constant, MEMFLAGS flags) { | |
| 501 #ifdef ASSERT | |
| 502 void* p = os::malloc(size, flags|otArena, CALLER_PC); | |
| 503 if (PrintMallocFree) trace_heap_malloc(size, "Arena-new", p); | |
| 504 return p; | |
| 505 #else | |
| 506 return os::malloc(size, flags|otArena, CALLER_PC); | |
| 507 #endif | |
| 508 } | |
| 509 | |
| 510 void Arena::operator delete(void* p) { | |
| 511 FreeHeap(p); | |
| 0 | 512 } |
| 513 | |
| 514 // Destroy this arenas contents and reset to empty | |
| 515 void Arena::destruct_contents() { | |
| 516 if (UseMallocOnly && _first != NULL) { | |
| 517 char* end = _first->next() ? _first->top() : _hwm; | |
| 518 free_malloced_objects(_first, _first->bottom(), end, _hwm); | |
| 519 } | |
|
6882
716c64bda5ba
7199092: NMT: NMT needs to deal overlapped virtual memory ranges
zgu
parents:
6872
diff
changeset
|
520 // reset size before chop to avoid a rare racing condition |
|
716c64bda5ba
7199092: NMT: NMT needs to deal overlapped virtual memory ranges
zgu
parents:
6872
diff
changeset
|
521 // that can have total arena memory exceed total chunk memory |
|
716c64bda5ba
7199092: NMT: NMT needs to deal overlapped virtual memory ranges
zgu
parents:
6872
diff
changeset
|
522 set_size_in_bytes(0); |
| 0 | 523 _first->chop(); |
| 524 reset(); | |
| 525 } | |
| 526 | |
| 6197 | 527 // This is high traffic method, but many calls actually don't |
| 528 // change the size | |
| 529 void Arena::set_size_in_bytes(size_t size) { | |
| 530 if (_size_in_bytes != size) { | |
| 531 _size_in_bytes = size; | |
| 532 MemTracker::record_arena_size((address)this, size); | |
| 533 } | |
| 534 } | |
| 0 | 535 |
| 536 // Total of all Chunks in arena | |
| 537 size_t Arena::used() const { | |
| 538 size_t sum = _chunk->length() - (_max-_hwm); // Size leftover in this Chunk | |
| 539 register Chunk *k = _first; | |
| 540 while( k != _chunk) { // Whilst have Chunks in a row | |
| 541 sum += k->length(); // Total size of this Chunk | |
| 542 k = k->next(); // Bump along to next Chunk | |
| 543 } | |
| 544 return sum; // Return total consumed space. | |
| 545 } | |
| 546 | |
|
2307
4a9604cd7c5f
6878713: Verifier heap corruption, relating to backward jsrs
kamg
parents:
2250
diff
changeset
|
547 void Arena::signal_out_of_memory(size_t sz, const char* whence) const { |
|
10161
746b070f5022
8011661: Insufficient memory message says "malloc" when sometimes it should say "mmap"
ccheung
parents:
10135
diff
changeset
|
548 vm_exit_out_of_memory(sz, OOM_MALLOC_ERROR, whence); |
|
2307
4a9604cd7c5f
6878713: Verifier heap corruption, relating to backward jsrs
kamg
parents:
2250
diff
changeset
|
549 } |
| 0 | 550 |
| 551 // Grow a new Chunk | |
|
6872
7b5885dadbdc
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
6725
diff
changeset
|
552 void* Arena::grow(size_t x, AllocFailType alloc_failmode) { |
| 0 | 553 // Get minimal required size. Either real big, or even bigger for giant objs |
| 554 size_t len = MAX2(x, (size_t) Chunk::size); | |
| 555 | |
| 556 Chunk *k = _chunk; // Get filled-up chunk address | |
| 557 _chunk = new (len) Chunk(len); | |
| 558 | |
|
2307
4a9604cd7c5f
6878713: Verifier heap corruption, relating to backward jsrs
kamg
parents:
2250
diff
changeset
|
559 if (_chunk == NULL) { |
|
6872
7b5885dadbdc
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
6725
diff
changeset
|
560 if (alloc_failmode == AllocFailStrategy::EXIT_OOM) { |
|
7b5885dadbdc
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
6725
diff
changeset
|
561 signal_out_of_memory(len * Chunk::aligned_overhead_size(), "Arena::grow"); |
|
7b5885dadbdc
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
6725
diff
changeset
|
562 } |
|
7b5885dadbdc
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
6725
diff
changeset
|
563 return NULL; |
|
2307
4a9604cd7c5f
6878713: Verifier heap corruption, relating to backward jsrs
kamg
parents:
2250
diff
changeset
|
564 } |
| 0 | 565 if (k) k->set_next(_chunk); // Append new chunk to end of linked list |
| 566 else _first = _chunk; | |
| 567 _hwm = _chunk->bottom(); // Save the cached hwm, max | |
| 568 _max = _chunk->top(); | |
| 569 set_size_in_bytes(size_in_bytes() + len); | |
| 570 void* result = _hwm; | |
| 571 _hwm += x; | |
| 572 return result; | |
| 573 } | |
| 574 | |
| 575 | |
| 576 | |
| 577 // Reallocate storage in Arena. | |
|
6872
7b5885dadbdc
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
6725
diff
changeset
|
578 void *Arena::Arealloc(void* old_ptr, size_t old_size, size_t new_size, AllocFailType alloc_failmode) { |
| 0 | 579 assert(new_size >= 0, "bad size"); |
| 580 if (new_size == 0) return NULL; | |
| 581 #ifdef ASSERT | |
| 582 if (UseMallocOnly) { | |
| 583 // always allocate a new object (otherwise we'll free this one twice) | |
|
6872
7b5885dadbdc
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
6725
diff
changeset
|
584 char* copy = (char*)Amalloc(new_size, alloc_failmode); |
|
7b5885dadbdc
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
6725
diff
changeset
|
585 if (copy == NULL) { |
|
7b5885dadbdc
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
6725
diff
changeset
|
586 return NULL; |
|
7b5885dadbdc
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
6725
diff
changeset
|
587 } |
| 0 | 588 size_t n = MIN2(old_size, new_size); |
| 589 if (n > 0) memcpy(copy, old_ptr, n); | |
| 590 Afree(old_ptr,old_size); // Mostly done to keep stats accurate | |
| 591 return copy; | |
| 592 } | |
| 593 #endif | |
| 594 char *c_old = (char*)old_ptr; // Handy name | |
| 595 // Stupid fast special case | |
| 596 if( new_size <= old_size ) { // Shrink in-place | |
| 597 if( c_old+old_size == _hwm) // Attempt to free the excess bytes | |
| 598 _hwm = c_old+new_size; // Adjust hwm | |
| 599 return c_old; | |
| 600 } | |
| 601 | |
| 602 // make sure that new_size is legal | |
| 603 size_t corrected_new_size = ARENA_ALIGN(new_size); | |
| 604 | |
| 605 // See if we can resize in-place | |
| 606 if( (c_old+old_size == _hwm) && // Adjusting recent thing | |
| 607 (c_old+corrected_new_size <= _max) ) { // Still fits where it sits | |
| 608 _hwm = c_old+corrected_new_size; // Adjust hwm | |
| 609 return c_old; // Return old pointer | |
| 610 } | |
| 611 | |
| 612 // Oops, got to relocate guts | |
|
6872
7b5885dadbdc
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
6725
diff
changeset
|
613 void *new_ptr = Amalloc(new_size, alloc_failmode); |
|
7b5885dadbdc
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
6725
diff
changeset
|
614 if (new_ptr == NULL) { |
|
7b5885dadbdc
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
6725
diff
changeset
|
615 return NULL; |
|
7b5885dadbdc
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
6725
diff
changeset
|
616 } |
| 0 | 617 memcpy( new_ptr, c_old, old_size ); |
| 618 Afree(c_old,old_size); // Mostly done to keep stats accurate | |
| 619 return new_ptr; | |
| 620 } | |
| 621 | |
| 622 | |
| 623 // Determine if pointer belongs to this Arena or not. | |
| 624 bool Arena::contains( const void *ptr ) const { | |
| 625 #ifdef ASSERT | |
| 626 if (UseMallocOnly) { | |
| 627 // really slow, but not easy to make fast | |
| 628 if (_chunk == NULL) return false; | |
| 629 char** bottom = (char**)_chunk->bottom(); | |
| 630 for (char** p = (char**)_hwm - 1; p >= bottom; p--) { | |
| 631 if (*p == ptr) return true; | |
| 632 } | |
| 633 for (Chunk *c = _first; c != NULL; c = c->next()) { | |
| 634 if (c == _chunk) continue; // current chunk has been processed | |
| 635 char** bottom = (char**)c->bottom(); | |
| 636 for (char** p = (char**)c->top() - 1; p >= bottom; p--) { | |
| 637 if (*p == ptr) return true; | |
| 638 } | |
| 639 } | |
| 640 return false; | |
| 641 } | |
| 642 #endif | |
| 643 if( (void*)_chunk->bottom() <= ptr && ptr < (void*)_hwm ) | |
| 644 return true; // Check for in this chunk | |
| 645 for (Chunk *c = _first; c; c = c->next()) { | |
| 646 if (c == _chunk) continue; // current chunk has been processed | |
| 647 if ((void*)c->bottom() <= ptr && ptr < (void*)c->top()) { | |
| 648 return true; // Check for every chunk in Arena | |
| 649 } | |
| 650 } | |
| 651 return false; // Not in any Chunk, so not in Arena | |
| 652 } | |
| 653 | |
| 654 | |
| 655 #ifdef ASSERT | |
| 656 void* Arena::malloc(size_t size) { | |
| 657 assert(UseMallocOnly, "shouldn't call"); | |
| 658 // use malloc, but save pointer in res. area for later freeing | |
| 659 char** save = (char**)internal_malloc_4(sizeof(char*)); | |
| 6197 | 660 return (*save = (char*)os::malloc(size, mtChunk)); |
| 0 | 661 } |
| 662 | |
| 663 // for debugging with UseMallocOnly | |
| 664 void* Arena::internal_malloc_4(size_t x) { | |
| 665 assert( (x&(sizeof(char*)-1)) == 0, "misaligned size" ); | |
|
2307
4a9604cd7c5f
6878713: Verifier heap corruption, relating to backward jsrs
kamg
parents:
2250
diff
changeset
|
666 check_for_overflow(x, "Arena::internal_malloc_4"); |
| 0 | 667 if (_hwm + x > _max) { |
| 668 return grow(x); | |
| 669 } else { | |
| 670 char *old = _hwm; | |
| 671 _hwm += x; | |
| 672 return old; | |
| 673 } | |
| 674 } | |
| 675 #endif | |
| 676 | |
| 677 | |
| 678 //-------------------------------------------------------------------------------------- | |
| 679 // Non-product code | |
| 680 | |
| 681 #ifndef PRODUCT | |
| 682 // The global operator new should never be called since it will usually indicate | |
| 683 // a memory leak. Use CHeapObj as the base class of such objects to make it explicit | |
| 684 // that they're allocated on the C heap. | |
| 685 // Commented out in product version to avoid conflicts with third-party C++ native code. | |
|
10271
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
686 // On certain platforms, such as Mac OS X (Darwin), in debug version, new is being called |
|
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
687 // from jdk source and causing data corruption. Such as |
|
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
688 // Java_sun_security_ec_ECKeyPairGenerator_generateECKeyPair |
|
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
689 // define ALLOW_OPERATOR_NEW_USAGE for platform on which global operator new allowed. |
|
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
690 // |
|
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
691 #ifndef ALLOW_OPERATOR_NEW_USAGE |
| 0 | 692 void* operator new(size_t size){ |
|
10271
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
693 assert(false, "Should not call global operator new"); |
|
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
694 return 0; |
|
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
695 } |
|
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
696 |
|
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
697 void* operator new [](size_t size){ |
|
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
698 assert(false, "Should not call global operator new[]"); |
|
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
699 return 0; |
|
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
700 } |
|
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
701 |
|
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
702 void* operator new(size_t size, const std::nothrow_t& nothrow_constant){ |
|
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
703 assert(false, "Should not call global operator new"); |
|
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
704 return 0; |
| 0 | 705 } |
|
10271
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
706 |
|
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
707 void* operator new [](size_t size, std::nothrow_t& nothrow_constant){ |
|
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
708 assert(false, "Should not call global operator new[]"); |
|
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
709 return 0; |
|
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
710 } |
|
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
711 |
|
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
712 void operator delete(void* p) { |
|
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
713 assert(false, "Should not call global delete"); |
|
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
714 } |
|
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
715 |
|
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
716 void operator delete [](void* p) { |
|
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
717 assert(false, "Should not call global delete []"); |
|
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
718 } |
|
f9be75d21404
8012902: remove use of global operator new - take 2
minqi
parents:
10161
diff
changeset
|
719 #endif // ALLOW_OPERATOR_NEW_USAGE |
| 0 | 720 |
| 721 void AllocatedObj::print() const { print_on(tty); } | |
| 722 void AllocatedObj::print_value() const { print_value_on(tty); } | |
| 723 | |
| 724 void AllocatedObj::print_on(outputStream* st) const { | |
| 725 st->print_cr("AllocatedObj(" INTPTR_FORMAT ")", this); | |
| 726 } | |
| 727 | |
| 728 void AllocatedObj::print_value_on(outputStream* st) const { | |
| 729 st->print("AllocatedObj(" INTPTR_FORMAT ")", this); | |
| 730 } | |
| 731 | |
| 2250 | 732 julong Arena::_bytes_allocated = 0; |
| 733 | |
| 734 void Arena::inc_bytes_allocated(size_t x) { inc_stat_counter(&_bytes_allocated, x); } | |
| 0 | 735 |
| 736 AllocStats::AllocStats() { | |
| 2250 | 737 start_mallocs = os::num_mallocs; |
| 738 start_frees = os::num_frees; | |
| 0 | 739 start_malloc_bytes = os::alloc_bytes; |
| 2250 | 740 start_mfree_bytes = os::free_bytes; |
| 741 start_res_bytes = Arena::_bytes_allocated; | |
| 0 | 742 } |
| 743 | |
| 2250 | 744 julong AllocStats::num_mallocs() { return os::num_mallocs - start_mallocs; } |
| 745 julong AllocStats::alloc_bytes() { return os::alloc_bytes - start_malloc_bytes; } | |
| 746 julong AllocStats::num_frees() { return os::num_frees - start_frees; } | |
| 747 julong AllocStats::free_bytes() { return os::free_bytes - start_mfree_bytes; } | |
| 748 julong AllocStats::resource_bytes() { return Arena::_bytes_allocated - start_res_bytes; } | |
| 0 | 749 void AllocStats::print() { |
| 2250 | 750 tty->print_cr(UINT64_FORMAT " mallocs (" UINT64_FORMAT "MB), " |
| 751 UINT64_FORMAT" frees (" UINT64_FORMAT "MB), " UINT64_FORMAT "MB resrc", | |
| 752 num_mallocs(), alloc_bytes()/M, num_frees(), free_bytes()/M, resource_bytes()/M); | |
| 0 | 753 } |
| 754 | |
| 755 | |
| 756 // debugging code | |
| 757 inline void Arena::free_all(char** start, char** end) { | |
| 758 for (char** p = start; p < end; p++) if (*p) os::free(*p); | |
| 759 } | |
| 760 | |
| 761 void Arena::free_malloced_objects(Chunk* chunk, char* hwm, char* max, char* hwm2) { | |
| 762 assert(UseMallocOnly, "should not call"); | |
| 763 // free all objects malloced since resource mark was created; resource area | |
| 764 // contains their addresses | |
| 765 if (chunk->next()) { | |
| 766 // this chunk is full, and some others too | |
| 767 for (Chunk* c = chunk->next(); c != NULL; c = c->next()) { | |
| 768 char* top = c->top(); | |
| 769 if (c->next() == NULL) { | |
| 770 top = hwm2; // last junk is only used up to hwm2 | |
| 771 assert(c->contains(hwm2), "bad hwm2"); | |
| 772 } | |
| 773 free_all((char**)c->bottom(), (char**)top); | |
| 774 } | |
| 775 assert(chunk->contains(hwm), "bad hwm"); | |
| 776 assert(chunk->contains(max), "bad max"); | |
| 777 free_all((char**)hwm, (char**)max); | |
| 778 } else { | |
| 779 // this chunk was partially used | |
| 780 assert(chunk->contains(hwm), "bad hwm"); | |
| 781 assert(chunk->contains(hwm2), "bad hwm2"); | |
| 782 free_all((char**)hwm, (char**)hwm2); | |
| 783 } | |
| 784 } | |
| 785 | |
| 786 | |
| 787 ReallocMark::ReallocMark() { | |
| 788 #ifdef ASSERT | |
| 789 Thread *thread = ThreadLocalStorage::get_thread_slow(); | |
| 790 _nesting = thread->resource_area()->nesting(); | |
| 791 #endif | |
| 792 } | |
| 793 | |
| 794 void ReallocMark::check() { | |
| 795 #ifdef ASSERT | |
| 796 if (_nesting != Thread::current()->resource_area()->nesting()) { | |
| 797 fatal("allocation bug: array could grow within nested ResourceMark"); | |
| 798 } | |
| 799 #endif | |
| 800 } | |
| 801 | |
| 802 #endif // Non-product |