author | kbarrett |
Mon, 31 Dec 2018 15:40:50 -0500 | |
changeset 53108 | e90315ae8aa9 |
parent 49734 | f946776e9354 |
child 53703 | 24341625d8f2 |
permissions | -rw-r--r-- |
1 | 1 |
/* |
48794
ea0d0781c63c
8178351: Simplify MetaspaceShared::is_in_shared_space and MetaspaceObj::is_shared
iklam
parents:
47216
diff
changeset
|
2 |
* Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved. |
1 | 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 |
* |
|
5547
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1
diff
changeset
|
21 |
* questions. |
1 | 22 |
* |
23 |
*/ |
|
24 |
||
7397 | 25 |
#include "precompiled.hpp" |
26 |
#include "memory/allocation.hpp" |
|
27 |
#include "memory/allocation.inline.hpp" |
|
46818 | 28 |
#include "memory/arena.hpp" |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
29 |
#include "memory/metaspaceShared.hpp" |
7397 | 30 |
#include "memory/resourceArea.hpp" |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
31 |
#include "memory/universe.hpp" |
40655
9f644073d3a0
8157907: Incorrect inclusion of atomic.hpp instead of atomic.inline.hpp
dholmes
parents:
38254
diff
changeset
|
32 |
#include "runtime/atomic.hpp" |
7397 | 33 |
#include "runtime/os.hpp" |
34 |
#include "runtime/task.hpp" |
|
35 |
#include "runtime/threadCritical.hpp" |
|
13195 | 36 |
#include "services/memTracker.hpp" |
7397 | 37 |
#include "utilities/ostream.hpp" |
13195 | 38 |
|
49465
4881673579b7
8199698: Change 8199275 breaks template instantiation for xlC (and potentially other compliers)
simonis
parents:
49392
diff
changeset
|
39 |
// allocate using malloc; will fail if no memory available |
4881673579b7
8199698: Change 8199275 breaks template instantiation for xlC (and potentially other compliers)
simonis
parents:
49392
diff
changeset
|
40 |
char* AllocateHeap(size_t size, |
4881673579b7
8199698: Change 8199275 breaks template instantiation for xlC (and potentially other compliers)
simonis
parents:
49392
diff
changeset
|
41 |
MEMFLAGS flags, |
4881673579b7
8199698: Change 8199275 breaks template instantiation for xlC (and potentially other compliers)
simonis
parents:
49392
diff
changeset
|
42 |
const NativeCallStack& stack, |
4881673579b7
8199698: Change 8199275 breaks template instantiation for xlC (and potentially other compliers)
simonis
parents:
49392
diff
changeset
|
43 |
AllocFailType alloc_failmode /* = AllocFailStrategy::EXIT_OOM*/) { |
4881673579b7
8199698: Change 8199275 breaks template instantiation for xlC (and potentially other compliers)
simonis
parents:
49392
diff
changeset
|
44 |
char* p = (char*) os::malloc(size, flags, stack); |
4881673579b7
8199698: Change 8199275 breaks template instantiation for xlC (and potentially other compliers)
simonis
parents:
49392
diff
changeset
|
45 |
if (p == NULL && alloc_failmode == AllocFailStrategy::EXIT_OOM) { |
4881673579b7
8199698: Change 8199275 breaks template instantiation for xlC (and potentially other compliers)
simonis
parents:
49392
diff
changeset
|
46 |
vm_exit_out_of_memory(size, OOM_MALLOC_ERROR, "AllocateHeap"); |
4881673579b7
8199698: Change 8199275 breaks template instantiation for xlC (and potentially other compliers)
simonis
parents:
49392
diff
changeset
|
47 |
} |
4881673579b7
8199698: Change 8199275 breaks template instantiation for xlC (and potentially other compliers)
simonis
parents:
49392
diff
changeset
|
48 |
return p; |
4881673579b7
8199698: Change 8199275 breaks template instantiation for xlC (and potentially other compliers)
simonis
parents:
49392
diff
changeset
|
49 |
} |
4881673579b7
8199698: Change 8199275 breaks template instantiation for xlC (and potentially other compliers)
simonis
parents:
49392
diff
changeset
|
50 |
|
4881673579b7
8199698: Change 8199275 breaks template instantiation for xlC (and potentially other compliers)
simonis
parents:
49392
diff
changeset
|
51 |
char* AllocateHeap(size_t size, |
4881673579b7
8199698: Change 8199275 breaks template instantiation for xlC (and potentially other compliers)
simonis
parents:
49392
diff
changeset
|
52 |
MEMFLAGS flags, |
4881673579b7
8199698: Change 8199275 breaks template instantiation for xlC (and potentially other compliers)
simonis
parents:
49392
diff
changeset
|
53 |
AllocFailType alloc_failmode /* = AllocFailStrategy::EXIT_OOM*/) { |
4881673579b7
8199698: Change 8199275 breaks template instantiation for xlC (and potentially other compliers)
simonis
parents:
49392
diff
changeset
|
54 |
return AllocateHeap(size, flags, CALLER_PC); |
4881673579b7
8199698: Change 8199275 breaks template instantiation for xlC (and potentially other compliers)
simonis
parents:
49392
diff
changeset
|
55 |
} |
4881673579b7
8199698: Change 8199275 breaks template instantiation for xlC (and potentially other compliers)
simonis
parents:
49392
diff
changeset
|
56 |
|
4881673579b7
8199698: Change 8199275 breaks template instantiation for xlC (and potentially other compliers)
simonis
parents:
49392
diff
changeset
|
57 |
char* ReallocateHeap(char *old, |
4881673579b7
8199698: Change 8199275 breaks template instantiation for xlC (and potentially other compliers)
simonis
parents:
49392
diff
changeset
|
58 |
size_t size, |
4881673579b7
8199698: Change 8199275 breaks template instantiation for xlC (and potentially other compliers)
simonis
parents:
49392
diff
changeset
|
59 |
MEMFLAGS flag, |
4881673579b7
8199698: Change 8199275 breaks template instantiation for xlC (and potentially other compliers)
simonis
parents:
49392
diff
changeset
|
60 |
AllocFailType alloc_failmode) { |
4881673579b7
8199698: Change 8199275 breaks template instantiation for xlC (and potentially other compliers)
simonis
parents:
49392
diff
changeset
|
61 |
char* p = (char*) os::realloc(old, size, flag, CALLER_PC); |
4881673579b7
8199698: Change 8199275 breaks template instantiation for xlC (and potentially other compliers)
simonis
parents:
49392
diff
changeset
|
62 |
if (p == NULL && alloc_failmode == AllocFailStrategy::EXIT_OOM) { |
4881673579b7
8199698: Change 8199275 breaks template instantiation for xlC (and potentially other compliers)
simonis
parents:
49392
diff
changeset
|
63 |
vm_exit_out_of_memory(size, OOM_MALLOC_ERROR, "ReallocateHeap"); |
4881673579b7
8199698: Change 8199275 breaks template instantiation for xlC (and potentially other compliers)
simonis
parents:
49392
diff
changeset
|
64 |
} |
4881673579b7
8199698: Change 8199275 breaks template instantiation for xlC (and potentially other compliers)
simonis
parents:
49392
diff
changeset
|
65 |
return p; |
4881673579b7
8199698: Change 8199275 breaks template instantiation for xlC (and potentially other compliers)
simonis
parents:
49392
diff
changeset
|
66 |
} |
4881673579b7
8199698: Change 8199275 breaks template instantiation for xlC (and potentially other compliers)
simonis
parents:
49392
diff
changeset
|
67 |
|
4881673579b7
8199698: Change 8199275 breaks template instantiation for xlC (and potentially other compliers)
simonis
parents:
49392
diff
changeset
|
68 |
void FreeHeap(void* p) { |
4881673579b7
8199698: Change 8199275 breaks template instantiation for xlC (and potentially other compliers)
simonis
parents:
49392
diff
changeset
|
69 |
os::free(p); |
4881673579b7
8199698: Change 8199275 breaks template instantiation for xlC (and potentially other compliers)
simonis
parents:
49392
diff
changeset
|
70 |
} |
4881673579b7
8199698: Change 8199275 breaks template instantiation for xlC (and potentially other compliers)
simonis
parents:
49392
diff
changeset
|
71 |
|
48794
ea0d0781c63c
8178351: Simplify MetaspaceShared::is_in_shared_space and MetaspaceObj::is_shared
iklam
parents:
47216
diff
changeset
|
72 |
void* MetaspaceObj::_shared_metaspace_base = NULL; |
ea0d0781c63c
8178351: Simplify MetaspaceShared::is_in_shared_space and MetaspaceObj::is_shared
iklam
parents:
47216
diff
changeset
|
73 |
void* MetaspaceObj::_shared_metaspace_top = NULL; |
ea0d0781c63c
8178351: Simplify MetaspaceShared::is_in_shared_space and MetaspaceObj::is_shared
iklam
parents:
47216
diff
changeset
|
74 |
|
19696
bd5a0131bde1
8021954: VM SIGSEGV during classloading on MacOS; hs_err_pid file produced
coleenp
parents:
18686
diff
changeset
|
75 |
void* StackObj::operator new(size_t size) throw() { ShouldNotCallThis(); return 0; } |
bd5a0131bde1
8021954: VM SIGSEGV during classloading on MacOS; hs_err_pid file produced
coleenp
parents:
18686
diff
changeset
|
76 |
void StackObj::operator delete(void* p) { ShouldNotCallThis(); } |
bd5a0131bde1
8021954: VM SIGSEGV during classloading on MacOS; hs_err_pid file produced
coleenp
parents:
18686
diff
changeset
|
77 |
void* StackObj::operator new [](size_t size) throw() { ShouldNotCallThis(); return 0; } |
bd5a0131bde1
8021954: VM SIGSEGV during classloading on MacOS; hs_err_pid file produced
coleenp
parents:
18686
diff
changeset
|
78 |
void StackObj::operator delete [](void* p) { ShouldNotCallThis(); } |
17376
4ee999c3c007
8012902: remove use of global operator new - take 2
minqi
parents:
17087
diff
changeset
|
79 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
80 |
void* MetaspaceObj::operator new(size_t size, ClassLoaderData* loader_data, |
46746
ea379ebb9447
8072061: Automatically determine optimal sizes for the CDS regions
iklam
parents:
40655
diff
changeset
|
81 |
size_t word_size, |
19696
bd5a0131bde1
8021954: VM SIGSEGV during classloading on MacOS; hs_err_pid file produced
coleenp
parents:
18686
diff
changeset
|
82 |
MetaspaceObj::Type type, TRAPS) throw() { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
83 |
// Klass has it's own operator new |
46746
ea379ebb9447
8072061: Automatically determine optimal sizes for the CDS regions
iklam
parents:
40655
diff
changeset
|
84 |
return Metaspace::allocate(loader_data, word_size, type, THREAD); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
85 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
86 |
|
14579
7f6ce6e3dd80
8003635: NPG: AsynchGetCallTrace broken by Method* virtual call
coleenp
parents:
14120
diff
changeset
|
87 |
bool MetaspaceObj::is_metaspace_object() const { |
24457
0e20b36df5c4
8038212: Method::is_valid_method() check has performance regression impact for stackwalking
coleenp
parents:
24431
diff
changeset
|
88 |
return Metaspace::contains((void*)this); |
14579
7f6ce6e3dd80
8003635: NPG: AsynchGetCallTrace broken by Method* virtual call
coleenp
parents:
14120
diff
changeset
|
89 |
} |
7f6ce6e3dd80
8003635: NPG: AsynchGetCallTrace broken by Method* virtual call
coleenp
parents:
14120
diff
changeset
|
90 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
91 |
void MetaspaceObj::print_address_on(outputStream* st) const { |
24424
2658d7834c6e
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
23446
diff
changeset
|
92 |
st->print(" {" INTPTR_FORMAT "}", p2i(this)); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
93 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
94 |
|
46818 | 95 |
void* ResourceObj::operator new(size_t size, Arena *arena) throw() { |
96 |
address res = (address)arena->Amalloc(size); |
|
97 |
DEBUG_ONLY(set_allocation_type(res, ARENA);) |
|
98 |
return res; |
|
99 |
} |
|
100 |
||
101 |
void* ResourceObj::operator new [](size_t size, Arena *arena) throw() { |
|
102 |
address res = (address)arena->Amalloc(size); |
|
103 |
DEBUG_ONLY(set_allocation_type(res, ARENA);) |
|
104 |
return res; |
|
105 |
} |
|
106 |
||
19696
bd5a0131bde1
8021954: VM SIGSEGV during classloading on MacOS; hs_err_pid file produced
coleenp
parents:
18686
diff
changeset
|
107 |
void* ResourceObj::operator new(size_t size, allocation_type type, MEMFLAGS flags) throw() { |
33589
7cbd1b2c139b
8139040: Fix initializations before ShouldNotReachHere() etc. and enable -Wuninitialized on linux.
goetz
parents:
33105
diff
changeset
|
108 |
address res = NULL; |
1 | 109 |
switch (type) { |
110 |
case C_HEAP: |
|
13195 | 111 |
res = (address)AllocateHeap(size, flags, CALLER_PC); |
6180 | 112 |
DEBUG_ONLY(set_allocation_type(res, C_HEAP);) |
1 | 113 |
break; |
114 |
case RESOURCE_AREA: |
|
6183
4c74cfe14f20
6975078: assert(allocated_on_res_area() || allocated_on_C_heap() || allocated_on_arena()
kvn
parents:
6180
diff
changeset
|
115 |
// new(size) sets allocation type RESOURCE_AREA. |
1 | 116 |
res = (address)operator new(size); |
117 |
break; |
|
118 |
default: |
|
119 |
ShouldNotReachHere(); |
|
120 |
} |
|
121 |
return res; |
|
122 |
} |
|
123 |
||
19696
bd5a0131bde1
8021954: VM SIGSEGV during classloading on MacOS; hs_err_pid file produced
coleenp
parents:
18686
diff
changeset
|
124 |
void* ResourceObj::operator new [](size_t size, allocation_type type, MEMFLAGS flags) throw() { |
17376
4ee999c3c007
8012902: remove use of global operator new - take 2
minqi
parents:
17087
diff
changeset
|
125 |
return (address) operator new(size, type, flags); |
4ee999c3c007
8012902: remove use of global operator new - take 2
minqi
parents:
17087
diff
changeset
|
126 |
} |
4ee999c3c007
8012902: remove use of global operator new - take 2
minqi
parents:
17087
diff
changeset
|
127 |
|
14083
103054a71a30
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
13728
diff
changeset
|
128 |
void* ResourceObj::operator new(size_t size, const std::nothrow_t& nothrow_constant, |
19696
bd5a0131bde1
8021954: VM SIGSEGV during classloading on MacOS; hs_err_pid file produced
coleenp
parents:
18686
diff
changeset
|
129 |
allocation_type type, MEMFLAGS flags) throw() { |
33589
7cbd1b2c139b
8139040: Fix initializations before ShouldNotReachHere() etc. and enable -Wuninitialized on linux.
goetz
parents:
33105
diff
changeset
|
130 |
// should only call this with std::nothrow, use other operator new() otherwise |
7cbd1b2c139b
8139040: Fix initializations before ShouldNotReachHere() etc. and enable -Wuninitialized on linux.
goetz
parents:
33105
diff
changeset
|
131 |
address res = NULL; |
14083
103054a71a30
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
13728
diff
changeset
|
132 |
switch (type) { |
103054a71a30
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
13728
diff
changeset
|
133 |
case C_HEAP: |
103054a71a30
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
13728
diff
changeset
|
134 |
res = (address)AllocateHeap(size, flags, CALLER_PC, AllocFailStrategy::RETURN_NULL); |
103054a71a30
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
13728
diff
changeset
|
135 |
DEBUG_ONLY(if (res!= NULL) set_allocation_type(res, C_HEAP);) |
103054a71a30
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
13728
diff
changeset
|
136 |
break; |
103054a71a30
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
13728
diff
changeset
|
137 |
case RESOURCE_AREA: |
103054a71a30
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
13728
diff
changeset
|
138 |
// new(size) sets allocation type RESOURCE_AREA. |
103054a71a30
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
13728
diff
changeset
|
139 |
res = (address)operator new(size, std::nothrow); |
103054a71a30
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
13728
diff
changeset
|
140 |
break; |
103054a71a30
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
13728
diff
changeset
|
141 |
default: |
103054a71a30
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
13728
diff
changeset
|
142 |
ShouldNotReachHere(); |
103054a71a30
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
13728
diff
changeset
|
143 |
} |
103054a71a30
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
13728
diff
changeset
|
144 |
return res; |
103054a71a30
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
13728
diff
changeset
|
145 |
} |
103054a71a30
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
13728
diff
changeset
|
146 |
|
17376
4ee999c3c007
8012902: remove use of global operator new - take 2
minqi
parents:
17087
diff
changeset
|
147 |
void* ResourceObj::operator new [](size_t size, const std::nothrow_t& nothrow_constant, |
19696
bd5a0131bde1
8021954: VM SIGSEGV during classloading on MacOS; hs_err_pid file produced
coleenp
parents:
18686
diff
changeset
|
148 |
allocation_type type, MEMFLAGS flags) throw() { |
17376
4ee999c3c007
8012902: remove use of global operator new - take 2
minqi
parents:
17087
diff
changeset
|
149 |
return (address)operator new(size, nothrow_constant, type, flags); |
4ee999c3c007
8012902: remove use of global operator new - take 2
minqi
parents:
17087
diff
changeset
|
150 |
} |
14083
103054a71a30
8000617: It should be possible to allocate memory without the VM dying.
nloodin
parents:
13728
diff
changeset
|
151 |
|
1 | 152 |
void ResourceObj::operator delete(void* p) { |
153 |
assert(((ResourceObj *)p)->allocated_on_C_heap(), |
|
154 |
"delete only allowed for C_HEAP objects"); |
|
7440
eabaf35910a1
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
7397
diff
changeset
|
155 |
DEBUG_ONLY(((ResourceObj *)p)->_allocation_t[0] = (uintptr_t)badHeapOopVal;) |
1 | 156 |
FreeHeap(p); |
157 |
} |
|
158 |
||
17376
4ee999c3c007
8012902: remove use of global operator new - take 2
minqi
parents:
17087
diff
changeset
|
159 |
void ResourceObj::operator delete [](void* p) { |
4ee999c3c007
8012902: remove use of global operator new - take 2
minqi
parents:
17087
diff
changeset
|
160 |
operator delete(p); |
4ee999c3c007
8012902: remove use of global operator new - take 2
minqi
parents:
17087
diff
changeset
|
161 |
} |
4ee999c3c007
8012902: remove use of global operator new - take 2
minqi
parents:
17087
diff
changeset
|
162 |
|
6180 | 163 |
#ifdef ASSERT |
164 |
void ResourceObj::set_allocation_type(address res, allocation_type type) { |
|
53108
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
165 |
// Set allocation type in the resource object |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
166 |
uintptr_t allocation = (uintptr_t)res; |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
167 |
assert((allocation & allocation_mask) == 0, "address should be aligned to 4 bytes at least: " INTPTR_FORMAT, p2i(res)); |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
168 |
assert(type <= allocation_mask, "incorrect allocation type"); |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
169 |
ResourceObj* resobj = (ResourceObj *)res; |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
170 |
resobj->_allocation_t[0] = ~(allocation + type); |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
171 |
if (type != STACK_OR_EMBEDDED) { |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
172 |
// Called from operator new() and CollectionSetChooser(), |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
173 |
// set verification value. |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
174 |
resobj->_allocation_t[1] = (uintptr_t)&(resobj->_allocation_t[1]) + type; |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
175 |
} |
6180 | 176 |
} |
177 |
||
6183
4c74cfe14f20
6975078: assert(allocated_on_res_area() || allocated_on_C_heap() || allocated_on_arena()
kvn
parents:
6180
diff
changeset
|
178 |
ResourceObj::allocation_type ResourceObj::get_allocation_type() const { |
53108
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
179 |
assert(~(_allocation_t[0] | allocation_mask) == (uintptr_t)this, "lost resource object"); |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
180 |
return (allocation_type)((~_allocation_t[0]) & allocation_mask); |
7440
eabaf35910a1
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
7397
diff
changeset
|
181 |
} |
eabaf35910a1
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
7397
diff
changeset
|
182 |
|
eabaf35910a1
6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
kvn
parents:
7397
diff
changeset
|
183 |
bool ResourceObj::is_type_set() const { |
53108
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
184 |
allocation_type type = (allocation_type)(_allocation_t[1] & allocation_mask); |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
185 |
return get_allocation_type() == type && |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
186 |
(_allocation_t[1] - type) == (uintptr_t)(&_allocation_t[1]); |
6180 | 187 |
} |
188 |
||
53108
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
189 |
// This whole business of passing information from ResourceObj::operator new |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
190 |
// to the ResourceObj constructor via fields in the "object" is technically UB. |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
191 |
// But it seems to work within the limitations of HotSpot usage (such as no |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
192 |
// multiple inheritance) with the compilers and compiler options we're using. |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
193 |
// And it gives some possibly useful checking for misuse of ResourceObj. |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
194 |
void ResourceObj::initialize_allocation_info() { |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
195 |
if (~(_allocation_t[0] | allocation_mask) != (uintptr_t)this) { |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
196 |
// Operator new() is not called for allocations |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
197 |
// on stack and for embedded objects. |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
198 |
set_allocation_type((address)this, STACK_OR_EMBEDDED); |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
199 |
} else if (allocated_on_stack()) { // STACK_OR_EMBEDDED |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
200 |
// For some reason we got a value which resembles |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
201 |
// an embedded or stack object (operator new() does not |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
202 |
// set such type). Keep it since it is valid value |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
203 |
// (even if it was garbage). |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
204 |
// Ignore garbage in other fields. |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
205 |
} else if (is_type_set()) { |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
206 |
// Operator new() was called and type was set. |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
207 |
assert(!allocated_on_stack(), |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
208 |
"not embedded or stack, this(" PTR_FORMAT ") type %d a[0]=(" PTR_FORMAT ") a[1]=(" PTR_FORMAT ")", |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
209 |
p2i(this), get_allocation_type(), _allocation_t[0], _allocation_t[1]); |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
210 |
} else { |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
211 |
// Operator new() was not called. |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
212 |
// Assume that it is embedded or stack object. |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
213 |
set_allocation_type((address)this, STACK_OR_EMBEDDED); |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
214 |
} |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
215 |
_allocation_t[1] = 0; // Zap verification value |
6180 | 216 |
} |
217 |
||
53108
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
218 |
ResourceObj::ResourceObj() { |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
219 |
initialize_allocation_info(); |
6180 | 220 |
} |
221 |
||
53108
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
222 |
ResourceObj::ResourceObj(const ResourceObj&) { |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
223 |
// Initialize _allocation_t as a new object, ignoring object being copied. |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
224 |
initialize_allocation_info(); |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
225 |
} |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
226 |
|
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
227 |
ResourceObj& ResourceObj::operator=(const ResourceObj& r) { |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
228 |
assert(allocated_on_stack(), |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
229 |
"copy only into local, this(" PTR_FORMAT ") type %d a[0]=(" PTR_FORMAT ") a[1]=(" PTR_FORMAT ")", |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
230 |
p2i(this), get_allocation_type(), _allocation_t[0], _allocation_t[1]); |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
231 |
// Keep current _allocation_t value; |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
232 |
return *this; |
6180 | 233 |
} |
234 |
||
235 |
ResourceObj::~ResourceObj() { |
|
53108
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
236 |
// allocated_on_C_heap() also checks that encoded (in _allocation) address == this. |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
237 |
if (!allocated_on_C_heap()) { // ResourceObj::delete() will zap _allocation for C_heap. |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
238 |
_allocation_t[0] = (uintptr_t)badHeapOopVal; // zap type |
e90315ae8aa9
8213481: [REDO] Fix incorrect copy constructors in hotspot
kbarrett
parents:
49734
diff
changeset
|
239 |
} |
6180 | 240 |
} |
241 |
#endif // ASSERT |
|
242 |
||
1 | 243 |
//-------------------------------------------------------------------------------------- |
244 |
// Non-product code |
|
245 |
||
246 |
#ifndef PRODUCT |
|
247 |
void AllocatedObj::print() const { print_on(tty); } |
|
248 |
void AllocatedObj::print_value() const { print_value_on(tty); } |
|
249 |
||
250 |
void AllocatedObj::print_on(outputStream* st) const { |
|
24424
2658d7834c6e
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
23446
diff
changeset
|
251 |
st->print_cr("AllocatedObj(" INTPTR_FORMAT ")", p2i(this)); |
1 | 252 |
} |
253 |
||
254 |
void AllocatedObj::print_value_on(outputStream* st) const { |
|
24424
2658d7834c6e
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
23446
diff
changeset
|
255 |
st->print("AllocatedObj(" INTPTR_FORMAT ")", p2i(this)); |
1 | 256 |
} |
257 |
||
258 |
AllocStats::AllocStats() { |
|
8320 | 259 |
start_mallocs = os::num_mallocs; |
260 |
start_frees = os::num_frees; |
|
1 | 261 |
start_malloc_bytes = os::alloc_bytes; |
8320 | 262 |
start_mfree_bytes = os::free_bytes; |
263 |
start_res_bytes = Arena::_bytes_allocated; |
|
1 | 264 |
} |
265 |
||
8320 | 266 |
julong AllocStats::num_mallocs() { return os::num_mallocs - start_mallocs; } |
267 |
julong AllocStats::alloc_bytes() { return os::alloc_bytes - start_malloc_bytes; } |
|
268 |
julong AllocStats::num_frees() { return os::num_frees - start_frees; } |
|
269 |
julong AllocStats::free_bytes() { return os::free_bytes - start_mfree_bytes; } |
|
270 |
julong AllocStats::resource_bytes() { return Arena::_bytes_allocated - start_res_bytes; } |
|
1 | 271 |
void AllocStats::print() { |
8320 | 272 |
tty->print_cr(UINT64_FORMAT " mallocs (" UINT64_FORMAT "MB), " |
31592
43f48e165466
8081202: Hotspot compile warning: "Invalid suffix on literal; C++11 requires a space between literal and identifier"
bpittore
parents:
30764
diff
changeset
|
273 |
UINT64_FORMAT " frees (" UINT64_FORMAT "MB), " UINT64_FORMAT "MB resrc", |
8320 | 274 |
num_mallocs(), alloc_bytes()/M, num_frees(), free_bytes()/M, resource_bytes()/M); |
1 | 275 |
} |
276 |
||
277 |
ReallocMark::ReallocMark() { |
|
278 |
#ifdef ASSERT |
|
34633
2a6c7c7b30a7
8132510: Replace ThreadLocalStorage with compiler/language-based thread-local variables
dholmes
parents:
33589
diff
changeset
|
279 |
Thread *thread = Thread::current(); |
1 | 280 |
_nesting = thread->resource_area()->nesting(); |
281 |
#endif |
|
282 |
} |
|
283 |
||
284 |
void ReallocMark::check() { |
|
285 |
#ifdef ASSERT |
|
286 |
if (_nesting != Thread::current()->resource_area()->nesting()) { |
|
287 |
fatal("allocation bug: array could grow within nested ResourceMark"); |
|
288 |
} |
|
289 |
#endif |
|
290 |
} |
|
291 |
||
292 |
#endif // Non-product |