author | kbarrett |
Mon, 13 Aug 2018 18:21:26 -0400 | |
changeset 51390 | 135285dfc551 |
parent 51368 | adcb0bb3d1e9 |
child 51441 | 2e91d927e00c |
permissions | -rw-r--r-- |
1374 | 1 |
/* |
48961
120b61d50f85
8195103: Refactor out card table from CardTableModRefBS to flatten the BarrierSet hierarchy
eosterlund
parents:
48102
diff
changeset
|
2 |
* Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved. |
1374 | 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:
5082
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
5082
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:
5082
diff
changeset
|
21 |
* questions. |
1374 | 22 |
* |
23 |
*/ |
|
24 |
||
7397 | 25 |
#include "precompiled.hpp" |
49347
edb65305d3ac
8195148: Collapse G1SATBCardTableModRefBS and G1SATBCardTableLoggingModRefBS into a single G1BarrierSet
eosterlund
parents:
49164
diff
changeset
|
26 |
#include "gc/g1/g1BarrierSet.inline.hpp" |
49484
ee8fa73b90f9
8198949: Modularize arraycopy stub routine GC barriers
eosterlund
parents:
49455
diff
changeset
|
27 |
#include "gc/g1/g1BarrierSetAssembler.hpp" |
49164
7e958a8ebcd3
8195142: Refactor out card table from CardTableModRefBS to flatten the BarrierSet hierarchy
eosterlund
parents:
49007
diff
changeset
|
28 |
#include "gc/g1/g1CardTable.inline.hpp" |
30764 | 29 |
#include "gc/g1/g1CollectedHeap.inline.hpp" |
49752
93d84f667d12
8201318: Introduce GCThreadLocalData to abstract GC-specific data belonging to a thread
pliden
parents:
49751
diff
changeset
|
30 |
#include "gc/g1/g1ThreadLocalData.hpp" |
30764 | 31 |
#include "gc/g1/heapRegion.hpp" |
33792 | 32 |
#include "gc/g1/satbMarkQueue.hpp" |
35061 | 33 |
#include "logging/log.hpp" |
49592
77fb0be7d19f
8199946: Move load/store and encode/decode out of oopDesc
stefank
parents:
49484
diff
changeset
|
34 |
#include "oops/access.inline.hpp" |
77fb0be7d19f
8199946: Move load/store and encode/decode out of oopDesc
stefank
parents:
49484
diff
changeset
|
35 |
#include "oops/compressedOops.inline.hpp" |
29081
c61eb4914428
8072911: Remove includes of oop.inline.hpp from .hpp files
stefank
parents:
28830
diff
changeset
|
36 |
#include "oops/oop.inline.hpp" |
50180 | 37 |
#include "runtime/interfaceSupport.inline.hpp" |
7397 | 38 |
#include "runtime/mutexLocker.hpp" |
14583
d70ee55535f4
8003935: Simplify the needed includes for using Thread::current()
stefank
parents:
10565
diff
changeset
|
39 |
#include "runtime/thread.inline.hpp" |
49484
ee8fa73b90f9
8198949: Modularize arraycopy stub routine GC barriers
eosterlund
parents:
49455
diff
changeset
|
40 |
#include "utilities/macros.hpp" |
49906 | 41 |
#ifdef COMPILER1 |
42 |
#include "gc/g1/c1/g1BarrierSetC1.hpp" |
|
43 |
#endif |
|
50180 | 44 |
#ifdef COMPILER2 |
45 |
#include "gc/g1/c2/g1BarrierSetC2.hpp" |
|
46 |
#endif |
|
49906 | 47 |
|
48 |
class G1BarrierSetC1; |
|
50180 | 49 |
class G1BarrierSetC2; |
1374 | 50 |
|
49347
edb65305d3ac
8195148: Collapse G1SATBCardTableModRefBS and G1SATBCardTableLoggingModRefBS into a single G1BarrierSet
eosterlund
parents:
49164
diff
changeset
|
51 |
G1BarrierSet::G1BarrierSet(G1CardTable* card_table) : |
49484
ee8fa73b90f9
8198949: Modularize arraycopy stub routine GC barriers
eosterlund
parents:
49455
diff
changeset
|
52 |
CardTableBarrierSet(make_barrier_set_assembler<G1BarrierSetAssembler>(), |
49906 | 53 |
make_barrier_set_c1<G1BarrierSetC1>(), |
50180 | 54 |
make_barrier_set_c2<G1BarrierSetC2>(), |
49484
ee8fa73b90f9
8198949: Modularize arraycopy stub routine GC barriers
eosterlund
parents:
49455
diff
changeset
|
55 |
card_table, |
51390
135285dfc551
8209396: Make PtrQueueSets not statically allocated
kbarrett
parents:
51368
diff
changeset
|
56 |
BarrierSet::FakeRtti(BarrierSet::G1BarrierSet)), |
135285dfc551
8209396: Make PtrQueueSets not statically allocated
kbarrett
parents:
51368
diff
changeset
|
57 |
_satb_mark_queue_set(), |
135285dfc551
8209396: Make PtrQueueSets not statically allocated
kbarrett
parents:
51368
diff
changeset
|
58 |
_dirty_card_queue_set() |
135285dfc551
8209396: Make PtrQueueSets not statically allocated
kbarrett
parents:
51368
diff
changeset
|
59 |
{} |
1374 | 60 |
|
49347
edb65305d3ac
8195148: Collapse G1SATBCardTableModRefBS and G1SATBCardTableLoggingModRefBS into a single G1BarrierSet
eosterlund
parents:
49164
diff
changeset
|
61 |
void G1BarrierSet::enqueue(oop pre_val) { |
9176
42d9d1010f38
7009266: G1: assert(obj->is_oop_or_null(true )) failed: Error
johnc
parents:
7397
diff
changeset
|
62 |
// Nulls should have been already filtered. |
46968
9119841280f4
8160399: is_oop_or_null involves undefined behavior
coleenp
parents:
42598
diff
changeset
|
63 |
assert(oopDesc::is_oop(pre_val, true), "Error"); |
9176
42d9d1010f38
7009266: G1: assert(obj->is_oop_or_null(true )) failed: Error
johnc
parents:
7397
diff
changeset
|
64 |
|
51390
135285dfc551
8209396: Make PtrQueueSets not statically allocated
kbarrett
parents:
51368
diff
changeset
|
65 |
G1SATBMarkQueueSet& queue_set = satb_mark_queue_set(); |
135285dfc551
8209396: Make PtrQueueSets not statically allocated
kbarrett
parents:
51368
diff
changeset
|
66 |
if (!queue_set.is_active()) { |
135285dfc551
8209396: Make PtrQueueSets not statically allocated
kbarrett
parents:
51368
diff
changeset
|
67 |
return; |
135285dfc551
8209396: Make PtrQueueSets not statically allocated
kbarrett
parents:
51368
diff
changeset
|
68 |
} |
1374 | 69 |
Thread* thr = Thread::current(); |
70 |
if (thr->is_Java_thread()) { |
|
49752
93d84f667d12
8201318: Introduce GCThreadLocalData to abstract GC-specific data belonging to a thread
pliden
parents:
49751
diff
changeset
|
71 |
G1ThreadLocalData::satb_mark_queue(thr).enqueue(pre_val); |
1374 | 72 |
} else { |
18495
65a0d2ae4b22
8014022: G1: Non Java threads should lock the shared SATB queue lock without safepoint checks.
brutisso
parents:
14583
diff
changeset
|
73 |
MutexLockerEx x(Shared_SATB_Q_lock, Mutex::_no_safepoint_check_flag); |
51390
135285dfc551
8209396: Make PtrQueueSets not statically allocated
kbarrett
parents:
51368
diff
changeset
|
74 |
queue_set.shared_satb_queue()->enqueue(pre_val); |
1374 | 75 |
} |
76 |
} |
|
77 |
||
3262
30d1c247fc25
6700789: G1: Enable use of compressed oops with G1 heaps
ysr
parents:
1374
diff
changeset
|
78 |
template <class T> void |
49484
ee8fa73b90f9
8198949: Modularize arraycopy stub routine GC barriers
eosterlund
parents:
49455
diff
changeset
|
79 |
G1BarrierSet::write_ref_array_pre_work(T* dst, size_t count) { |
49751
c3a10df652c0
8201316: Move G1-related static members from JavaThread to G1BarrierSet
pliden
parents:
49679
diff
changeset
|
80 |
if (!_satb_mark_queue_set.is_active()) return; |
3262
30d1c247fc25
6700789: G1: Enable use of compressed oops with G1 heaps
ysr
parents:
1374
diff
changeset
|
81 |
T* elem_ptr = dst; |
49484
ee8fa73b90f9
8198949: Modularize arraycopy stub routine GC barriers
eosterlund
parents:
49455
diff
changeset
|
82 |
for (size_t i = 0; i < count; i++, elem_ptr++) { |
49592
77fb0be7d19f
8199946: Move load/store and encode/decode out of oopDesc
stefank
parents:
49484
diff
changeset
|
83 |
T heap_oop = RawAccess<>::oop_load(elem_ptr); |
77fb0be7d19f
8199946: Move load/store and encode/decode out of oopDesc
stefank
parents:
49484
diff
changeset
|
84 |
if (!CompressedOops::is_null(heap_oop)) { |
77fb0be7d19f
8199946: Move load/store and encode/decode out of oopDesc
stefank
parents:
49484
diff
changeset
|
85 |
enqueue(CompressedOops::decode_not_null(heap_oop)); |
3262
30d1c247fc25
6700789: G1: Enable use of compressed oops with G1 heaps
ysr
parents:
1374
diff
changeset
|
86 |
} |
1374 | 87 |
} |
88 |
} |
|
89 |
||
49484
ee8fa73b90f9
8198949: Modularize arraycopy stub routine GC barriers
eosterlund
parents:
49455
diff
changeset
|
90 |
void G1BarrierSet::write_ref_array_pre(oop* dst, size_t count, bool dest_uninitialized) { |
25480
190facf4e732
8048214: Linker error when compiling G1SATBCardTableModRefBS after include order changes
mgerdin
parents:
25351
diff
changeset
|
91 |
if (!dest_uninitialized) { |
190facf4e732
8048214: Linker error when compiling G1SATBCardTableModRefBS after include order changes
mgerdin
parents:
25351
diff
changeset
|
92 |
write_ref_array_pre_work(dst, count); |
190facf4e732
8048214: Linker error when compiling G1SATBCardTableModRefBS after include order changes
mgerdin
parents:
25351
diff
changeset
|
93 |
} |
190facf4e732
8048214: Linker error when compiling G1SATBCardTableModRefBS after include order changes
mgerdin
parents:
25351
diff
changeset
|
94 |
} |
47998
fb0275c320a0
8189871: Refactor GC barriers to use declarative semantics
eosterlund
parents:
47794
diff
changeset
|
95 |
|
49484
ee8fa73b90f9
8198949: Modularize arraycopy stub routine GC barriers
eosterlund
parents:
49455
diff
changeset
|
96 |
void G1BarrierSet::write_ref_array_pre(narrowOop* dst, size_t count, bool dest_uninitialized) { |
25480
190facf4e732
8048214: Linker error when compiling G1SATBCardTableModRefBS after include order changes
mgerdin
parents:
25351
diff
changeset
|
97 |
if (!dest_uninitialized) { |
190facf4e732
8048214: Linker error when compiling G1SATBCardTableModRefBS after include order changes
mgerdin
parents:
25351
diff
changeset
|
98 |
write_ref_array_pre_work(dst, count); |
190facf4e732
8048214: Linker error when compiling G1SATBCardTableModRefBS after include order changes
mgerdin
parents:
25351
diff
changeset
|
99 |
} |
190facf4e732
8048214: Linker error when compiling G1SATBCardTableModRefBS after include order changes
mgerdin
parents:
25351
diff
changeset
|
100 |
} |
190facf4e732
8048214: Linker error when compiling G1SATBCardTableModRefBS after include order changes
mgerdin
parents:
25351
diff
changeset
|
101 |
|
49347
edb65305d3ac
8195148: Collapse G1SATBCardTableModRefBS and G1SATBCardTableLoggingModRefBS into a single G1BarrierSet
eosterlund
parents:
49164
diff
changeset
|
102 |
void G1BarrierSet::write_ref_field_post_slow(volatile jbyte* byte) { |
47998
fb0275c320a0
8189871: Refactor GC barriers to use declarative semantics
eosterlund
parents:
47794
diff
changeset
|
103 |
// In the slow path, we know a card is not young |
49164
7e958a8ebcd3
8195142: Refactor out card table from CardTableModRefBS to flatten the BarrierSet hierarchy
eosterlund
parents:
49007
diff
changeset
|
104 |
assert(*byte != G1CardTable::g1_young_card_val(), "slow path invoked without filtering"); |
20403
45a89fbcd8f7
8014555: G1: Memory ordering problem with Conc refinement and card marking
mgerdin
parents:
20309
diff
changeset
|
105 |
OrderAccess::storeload(); |
49164
7e958a8ebcd3
8195142: Refactor out card table from CardTableModRefBS to flatten the BarrierSet hierarchy
eosterlund
parents:
49007
diff
changeset
|
106 |
if (*byte != G1CardTable::dirty_card_val()) { |
7e958a8ebcd3
8195142: Refactor out card table from CardTableModRefBS to flatten the BarrierSet hierarchy
eosterlund
parents:
49007
diff
changeset
|
107 |
*byte = G1CardTable::dirty_card_val(); |
1374 | 108 |
Thread* thr = Thread::current(); |
109 |
if (thr->is_Java_thread()) { |
|
49752
93d84f667d12
8201318: Introduce GCThreadLocalData to abstract GC-specific data belonging to a thread
pliden
parents:
49751
diff
changeset
|
110 |
G1ThreadLocalData::dirty_card_queue(thr).enqueue(byte); |
1374 | 111 |
} else { |
112 |
MutexLockerEx x(Shared_DirtyCardQ_lock, |
|
113 |
Mutex::_no_safepoint_check_flag); |
|
49751
c3a10df652c0
8201316: Move G1-related static members from JavaThread to G1BarrierSet
pliden
parents:
49679
diff
changeset
|
114 |
_dirty_card_queue_set.shared_dirty_card_queue()->enqueue(byte); |
1374 | 115 |
} |
116 |
} |
|
117 |
} |
|
118 |
||
49347
edb65305d3ac
8195148: Collapse G1SATBCardTableModRefBS and G1SATBCardTableLoggingModRefBS into a single G1BarrierSet
eosterlund
parents:
49164
diff
changeset
|
119 |
void G1BarrierSet::invalidate(MemRegion mr) { |
48102
08be4c1e540e
8182050: assert(_whole_heap.contains(p)) failed: Attempt to access p out of bounds of card marking array's _whole_heap
tschatzl
parents:
47998
diff
changeset
|
120 |
if (mr.is_empty()) { |
08be4c1e540e
8182050: assert(_whole_heap.contains(p)) failed: Attempt to access p out of bounds of card marking array's _whole_heap
tschatzl
parents:
47998
diff
changeset
|
121 |
return; |
08be4c1e540e
8182050: assert(_whole_heap.contains(p)) failed: Attempt to access p out of bounds of card marking array's _whole_heap
tschatzl
parents:
47998
diff
changeset
|
122 |
} |
49164
7e958a8ebcd3
8195142: Refactor out card table from CardTableModRefBS to flatten the BarrierSet hierarchy
eosterlund
parents:
49007
diff
changeset
|
123 |
volatile jbyte* byte = _card_table->byte_for(mr.start()); |
7e958a8ebcd3
8195142: Refactor out card table from CardTableModRefBS to flatten the BarrierSet hierarchy
eosterlund
parents:
49007
diff
changeset
|
124 |
jbyte* last_byte = _card_table->byte_for(mr.last()); |
1374 | 125 |
Thread* thr = Thread::current(); |
20403
45a89fbcd8f7
8014555: G1: Memory ordering problem with Conc refinement and card marking
mgerdin
parents:
20309
diff
changeset
|
126 |
// skip all consecutive young cards |
49164
7e958a8ebcd3
8195142: Refactor out card table from CardTableModRefBS to flatten the BarrierSet hierarchy
eosterlund
parents:
49007
diff
changeset
|
127 |
for (; byte <= last_byte && *byte == G1CardTable::g1_young_card_val(); byte++); |
20403
45a89fbcd8f7
8014555: G1: Memory ordering problem with Conc refinement and card marking
mgerdin
parents:
20309
diff
changeset
|
128 |
|
42598
45562c0473fb
8166898: G1SATBCardTableLoggingModRefBS::invalidate() incorrect with whole_heap == true
lmesnik
parents:
40655
diff
changeset
|
129 |
if (byte <= last_byte) { |
45562c0473fb
8166898: G1SATBCardTableLoggingModRefBS::invalidate() incorrect with whole_heap == true
lmesnik
parents:
40655
diff
changeset
|
130 |
OrderAccess::storeload(); |
45562c0473fb
8166898: G1SATBCardTableLoggingModRefBS::invalidate() incorrect with whole_heap == true
lmesnik
parents:
40655
diff
changeset
|
131 |
// Enqueue if necessary. |
45562c0473fb
8166898: G1SATBCardTableLoggingModRefBS::invalidate() incorrect with whole_heap == true
lmesnik
parents:
40655
diff
changeset
|
132 |
if (thr->is_Java_thread()) { |
45562c0473fb
8166898: G1SATBCardTableLoggingModRefBS::invalidate() incorrect with whole_heap == true
lmesnik
parents:
40655
diff
changeset
|
133 |
for (; byte <= last_byte; byte++) { |
49164
7e958a8ebcd3
8195142: Refactor out card table from CardTableModRefBS to flatten the BarrierSet hierarchy
eosterlund
parents:
49007
diff
changeset
|
134 |
if (*byte == G1CardTable::g1_young_card_val()) { |
42598
45562c0473fb
8166898: G1SATBCardTableLoggingModRefBS::invalidate() incorrect with whole_heap == true
lmesnik
parents:
40655
diff
changeset
|
135 |
continue; |
1374 | 136 |
} |
49164
7e958a8ebcd3
8195142: Refactor out card table from CardTableModRefBS to flatten the BarrierSet hierarchy
eosterlund
parents:
49007
diff
changeset
|
137 |
if (*byte != G1CardTable::dirty_card_val()) { |
7e958a8ebcd3
8195142: Refactor out card table from CardTableModRefBS to flatten the BarrierSet hierarchy
eosterlund
parents:
49007
diff
changeset
|
138 |
*byte = G1CardTable::dirty_card_val(); |
49752
93d84f667d12
8201318: Introduce GCThreadLocalData to abstract GC-specific data belonging to a thread
pliden
parents:
49751
diff
changeset
|
139 |
G1ThreadLocalData::dirty_card_queue(thr).enqueue(byte); |
42598
45562c0473fb
8166898: G1SATBCardTableLoggingModRefBS::invalidate() incorrect with whole_heap == true
lmesnik
parents:
40655
diff
changeset
|
140 |
} |
45562c0473fb
8166898: G1SATBCardTableLoggingModRefBS::invalidate() incorrect with whole_heap == true
lmesnik
parents:
40655
diff
changeset
|
141 |
} |
45562c0473fb
8166898: G1SATBCardTableLoggingModRefBS::invalidate() incorrect with whole_heap == true
lmesnik
parents:
40655
diff
changeset
|
142 |
} else { |
45562c0473fb
8166898: G1SATBCardTableLoggingModRefBS::invalidate() incorrect with whole_heap == true
lmesnik
parents:
40655
diff
changeset
|
143 |
MutexLockerEx x(Shared_DirtyCardQ_lock, |
45562c0473fb
8166898: G1SATBCardTableLoggingModRefBS::invalidate() incorrect with whole_heap == true
lmesnik
parents:
40655
diff
changeset
|
144 |
Mutex::_no_safepoint_check_flag); |
45562c0473fb
8166898: G1SATBCardTableLoggingModRefBS::invalidate() incorrect with whole_heap == true
lmesnik
parents:
40655
diff
changeset
|
145 |
for (; byte <= last_byte; byte++) { |
49164
7e958a8ebcd3
8195142: Refactor out card table from CardTableModRefBS to flatten the BarrierSet hierarchy
eosterlund
parents:
49007
diff
changeset
|
146 |
if (*byte == G1CardTable::g1_young_card_val()) { |
42598
45562c0473fb
8166898: G1SATBCardTableLoggingModRefBS::invalidate() incorrect with whole_heap == true
lmesnik
parents:
40655
diff
changeset
|
147 |
continue; |
45562c0473fb
8166898: G1SATBCardTableLoggingModRefBS::invalidate() incorrect with whole_heap == true
lmesnik
parents:
40655
diff
changeset
|
148 |
} |
49164
7e958a8ebcd3
8195142: Refactor out card table from CardTableModRefBS to flatten the BarrierSet hierarchy
eosterlund
parents:
49007
diff
changeset
|
149 |
if (*byte != G1CardTable::dirty_card_val()) { |
7e958a8ebcd3
8195142: Refactor out card table from CardTableModRefBS to flatten the BarrierSet hierarchy
eosterlund
parents:
49007
diff
changeset
|
150 |
*byte = G1CardTable::dirty_card_val(); |
49751
c3a10df652c0
8201316: Move G1-related static members from JavaThread to G1BarrierSet
pliden
parents:
49679
diff
changeset
|
151 |
_dirty_card_queue_set.shared_dirty_card_queue()->enqueue(byte); |
1374 | 152 |
} |
153 |
} |
|
154 |
} |
|
155 |
} |
|
156 |
} |
|
48961
120b61d50f85
8195103: Refactor out card table from CardTableModRefBS to flatten the BarrierSet hierarchy
eosterlund
parents:
48102
diff
changeset
|
157 |
|
49752
93d84f667d12
8201318: Introduce GCThreadLocalData to abstract GC-specific data belonging to a thread
pliden
parents:
49751
diff
changeset
|
158 |
void G1BarrierSet::on_thread_create(Thread* thread) { |
93d84f667d12
8201318: Introduce GCThreadLocalData to abstract GC-specific data belonging to a thread
pliden
parents:
49751
diff
changeset
|
159 |
// Create thread local data |
93d84f667d12
8201318: Introduce GCThreadLocalData to abstract GC-specific data belonging to a thread
pliden
parents:
49751
diff
changeset
|
160 |
G1ThreadLocalData::create(thread); |
93d84f667d12
8201318: Introduce GCThreadLocalData to abstract GC-specific data belonging to a thread
pliden
parents:
49751
diff
changeset
|
161 |
} |
93d84f667d12
8201318: Introduce GCThreadLocalData to abstract GC-specific data belonging to a thread
pliden
parents:
49751
diff
changeset
|
162 |
|
93d84f667d12
8201318: Introduce GCThreadLocalData to abstract GC-specific data belonging to a thread
pliden
parents:
49751
diff
changeset
|
163 |
void G1BarrierSet::on_thread_destroy(Thread* thread) { |
93d84f667d12
8201318: Introduce GCThreadLocalData to abstract GC-specific data belonging to a thread
pliden
parents:
49751
diff
changeset
|
164 |
// Destroy thread local data |
93d84f667d12
8201318: Introduce GCThreadLocalData to abstract GC-specific data belonging to a thread
pliden
parents:
49751
diff
changeset
|
165 |
G1ThreadLocalData::destroy(thread); |
93d84f667d12
8201318: Introduce GCThreadLocalData to abstract GC-specific data belonging to a thread
pliden
parents:
49751
diff
changeset
|
166 |
} |
93d84f667d12
8201318: Introduce GCThreadLocalData to abstract GC-specific data belonging to a thread
pliden
parents:
49751
diff
changeset
|
167 |
|
49347
edb65305d3ac
8195148: Collapse G1SATBCardTableModRefBS and G1SATBCardTableLoggingModRefBS into a single G1BarrierSet
eosterlund
parents:
49164
diff
changeset
|
168 |
void G1BarrierSet::on_thread_attach(JavaThread* thread) { |
49007
82d9d5744e5f
8197994: Move JavaThread::initialize_queues() logic to G1SATBCardTableLoggingModRefBS
pliden
parents:
48961
diff
changeset
|
169 |
// This method initializes the SATB and dirty card queues before a |
82d9d5744e5f
8197994: Move JavaThread::initialize_queues() logic to G1SATBCardTableLoggingModRefBS
pliden
parents:
48961
diff
changeset
|
170 |
// JavaThread is added to the Java thread list. Right now, we don't |
82d9d5744e5f
8197994: Move JavaThread::initialize_queues() logic to G1SATBCardTableLoggingModRefBS
pliden
parents:
48961
diff
changeset
|
171 |
// have to do anything to the dirty card queue (it should have been |
82d9d5744e5f
8197994: Move JavaThread::initialize_queues() logic to G1SATBCardTableLoggingModRefBS
pliden
parents:
48961
diff
changeset
|
172 |
// activated when the thread was created), but we have to activate |
82d9d5744e5f
8197994: Move JavaThread::initialize_queues() logic to G1SATBCardTableLoggingModRefBS
pliden
parents:
48961
diff
changeset
|
173 |
// the SATB queue if the thread is created while a marking cycle is |
82d9d5744e5f
8197994: Move JavaThread::initialize_queues() logic to G1SATBCardTableLoggingModRefBS
pliden
parents:
48961
diff
changeset
|
174 |
// in progress. The activation / de-activation of the SATB queues at |
82d9d5744e5f
8197994: Move JavaThread::initialize_queues() logic to G1SATBCardTableLoggingModRefBS
pliden
parents:
48961
diff
changeset
|
175 |
// the beginning / end of a marking cycle is done during safepoints |
82d9d5744e5f
8197994: Move JavaThread::initialize_queues() logic to G1SATBCardTableLoggingModRefBS
pliden
parents:
48961
diff
changeset
|
176 |
// so we have to make sure this method is called outside one to be |
82d9d5744e5f
8197994: Move JavaThread::initialize_queues() logic to G1SATBCardTableLoggingModRefBS
pliden
parents:
48961
diff
changeset
|
177 |
// able to safely read the active field of the SATB queue set. Right |
82d9d5744e5f
8197994: Move JavaThread::initialize_queues() logic to G1SATBCardTableLoggingModRefBS
pliden
parents:
48961
diff
changeset
|
178 |
// now, it is called just before the thread is added to the Java |
82d9d5744e5f
8197994: Move JavaThread::initialize_queues() logic to G1SATBCardTableLoggingModRefBS
pliden
parents:
48961
diff
changeset
|
179 |
// thread list in the Threads::add() method. That method is holding |
82d9d5744e5f
8197994: Move JavaThread::initialize_queues() logic to G1SATBCardTableLoggingModRefBS
pliden
parents:
48961
diff
changeset
|
180 |
// the Threads_lock which ensures we are outside a safepoint. We |
82d9d5744e5f
8197994: Move JavaThread::initialize_queues() logic to G1SATBCardTableLoggingModRefBS
pliden
parents:
48961
diff
changeset
|
181 |
// cannot do the obvious and set the active field of the SATB queue |
82d9d5744e5f
8197994: Move JavaThread::initialize_queues() logic to G1SATBCardTableLoggingModRefBS
pliden
parents:
48961
diff
changeset
|
182 |
// when the thread is created given that, in some cases, safepoints |
82d9d5744e5f
8197994: Move JavaThread::initialize_queues() logic to G1SATBCardTableLoggingModRefBS
pliden
parents:
48961
diff
changeset
|
183 |
// might happen between the JavaThread constructor being called and the |
82d9d5744e5f
8197994: Move JavaThread::initialize_queues() logic to G1SATBCardTableLoggingModRefBS
pliden
parents:
48961
diff
changeset
|
184 |
// thread being added to the Java thread list (an example of this is |
82d9d5744e5f
8197994: Move JavaThread::initialize_queues() logic to G1SATBCardTableLoggingModRefBS
pliden
parents:
48961
diff
changeset
|
185 |
// when the structure for the DestroyJavaVM thread is created). |
82d9d5744e5f
8197994: Move JavaThread::initialize_queues() logic to G1SATBCardTableLoggingModRefBS
pliden
parents:
48961
diff
changeset
|
186 |
assert(!SafepointSynchronize::is_at_safepoint(), "We should not be at a safepoint"); |
49752
93d84f667d12
8201318: Introduce GCThreadLocalData to abstract GC-specific data belonging to a thread
pliden
parents:
49751
diff
changeset
|
187 |
assert(!G1ThreadLocalData::satb_mark_queue(thread).is_active(), "SATB queue should not be active"); |
93d84f667d12
8201318: Introduce GCThreadLocalData to abstract GC-specific data belonging to a thread
pliden
parents:
49751
diff
changeset
|
188 |
assert(G1ThreadLocalData::satb_mark_queue(thread).is_empty(), "SATB queue should be empty"); |
93d84f667d12
8201318: Introduce GCThreadLocalData to abstract GC-specific data belonging to a thread
pliden
parents:
49751
diff
changeset
|
189 |
assert(G1ThreadLocalData::dirty_card_queue(thread).is_active(), "Dirty card queue should be active"); |
49007
82d9d5744e5f
8197994: Move JavaThread::initialize_queues() logic to G1SATBCardTableLoggingModRefBS
pliden
parents:
48961
diff
changeset
|
190 |
|
82d9d5744e5f
8197994: Move JavaThread::initialize_queues() logic to G1SATBCardTableLoggingModRefBS
pliden
parents:
48961
diff
changeset
|
191 |
// If we are creating the thread during a marking cycle, we should |
82d9d5744e5f
8197994: Move JavaThread::initialize_queues() logic to G1SATBCardTableLoggingModRefBS
pliden
parents:
48961
diff
changeset
|
192 |
// set the active field of the SATB queue to true. |
49751
c3a10df652c0
8201316: Move G1-related static members from JavaThread to G1BarrierSet
pliden
parents:
49679
diff
changeset
|
193 |
if (_satb_mark_queue_set.is_active()) { |
49752
93d84f667d12
8201318: Introduce GCThreadLocalData to abstract GC-specific data belonging to a thread
pliden
parents:
49751
diff
changeset
|
194 |
G1ThreadLocalData::satb_mark_queue(thread).set_active(true); |
49007
82d9d5744e5f
8197994: Move JavaThread::initialize_queues() logic to G1SATBCardTableLoggingModRefBS
pliden
parents:
48961
diff
changeset
|
195 |
} |
82d9d5744e5f
8197994: Move JavaThread::initialize_queues() logic to G1SATBCardTableLoggingModRefBS
pliden
parents:
48961
diff
changeset
|
196 |
} |
82d9d5744e5f
8197994: Move JavaThread::initialize_queues() logic to G1SATBCardTableLoggingModRefBS
pliden
parents:
48961
diff
changeset
|
197 |
|
49347
edb65305d3ac
8195148: Collapse G1SATBCardTableModRefBS and G1SATBCardTableLoggingModRefBS into a single G1BarrierSet
eosterlund
parents:
49164
diff
changeset
|
198 |
void G1BarrierSet::on_thread_detach(JavaThread* thread) { |
49007
82d9d5744e5f
8197994: Move JavaThread::initialize_queues() logic to G1SATBCardTableLoggingModRefBS
pliden
parents:
48961
diff
changeset
|
199 |
// Flush any deferred card marks, SATB buffers and dirty card queue buffers |
49455
848864ed9b17
8199604: Rename CardTableModRefBS to CardTableBarrierSet
eosterlund
parents:
49347
diff
changeset
|
200 |
CardTableBarrierSet::on_thread_detach(thread); |
49752
93d84f667d12
8201318: Introduce GCThreadLocalData to abstract GC-specific data belonging to a thread
pliden
parents:
49751
diff
changeset
|
201 |
G1ThreadLocalData::satb_mark_queue(thread).flush(); |
93d84f667d12
8201318: Introduce GCThreadLocalData to abstract GC-specific data belonging to a thread
pliden
parents:
49751
diff
changeset
|
202 |
G1ThreadLocalData::dirty_card_queue(thread).flush(); |
48961
120b61d50f85
8195103: Refactor out card table from CardTableModRefBS to flatten the BarrierSet hierarchy
eosterlund
parents:
48102
diff
changeset
|
203 |
} |