Print this page
rev 2755 : 7099824: G1: we should take the pending list lock before doing the remark pause
Summary: Acquire the pending list lock in the prologue method of G1's
concurrent VM_Operation and release the lock in the epilogue() method.
The locking/unlocking order of the pending list lock and the Heap_lock
should match that in the prologue and epilogue methods of VM_GC_Operation.
Reviewed-by:
| Split |
Close |
| Expand all |
| Collapse all |
--- old/src/share/vm/gc_implementation/g1/vm_operations_g1.hpp
+++ new/src/share/vm/gc_implementation/g1/vm_operations_g1.hpp
1 1 /*
2 2 * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
3 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 4 *
5 5 * This code is free software; you can redistribute it and/or modify it
6 6 * under the terms of the GNU General Public License version 2 only, as
7 7 * published by the Free Software Foundation.
8 8 *
9 9 * This code is distributed in the hope that it will be useful, but WITHOUT
10 10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11 11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12 12 * version 2 for more details (a copy is included in the LICENSE file that
13 13 * accompanied this code).
14 14 *
15 15 * You should have received a copy of the GNU General Public License version
16 16 * 2 along with this work; if not, write to the Free Software Foundation,
17 17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18 18 *
19 19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20 20 * or visit www.oracle.com if you need additional information or have any
21 21 * questions.
22 22 *
23 23 */
24 24
25 25 #ifndef SHARE_VM_GC_IMPLEMENTATION_G1_VM_OPERATIONS_G1_HPP
26 26 #define SHARE_VM_GC_IMPLEMENTATION_G1_VM_OPERATIONS_G1_HPP
27 27
28 28 #include "gc_implementation/shared/vmGCOperations.hpp"
29 29
30 30 // VM_operations for the G1 collector.
31 31 // VM_GC_Operation:
32 32 // - VM_CGC_Operation
33 33 // - VM_G1CollectFull
34 34 // - VM_G1OperationWithAllocRequest
35 35 // - VM_G1CollectForAllocation
36 36 // - VM_G1IncCollectionPause
37 37
38 38 class VM_G1OperationWithAllocRequest: public VM_GC_Operation {
39 39 protected:
40 40 size_t _word_size;
41 41 HeapWord* _result;
42 42 bool _pause_succeeded;
43 43
44 44 public:
45 45 VM_G1OperationWithAllocRequest(unsigned int gc_count_before,
46 46 size_t word_size)
47 47 : VM_GC_Operation(gc_count_before, GCCause::_allocation_failure),
48 48 _word_size(word_size), _result(NULL), _pause_succeeded(false) { }
49 49 HeapWord* result() { return _result; }
50 50 bool pause_succeeded() { return _pause_succeeded; }
51 51 };
52 52
53 53 class VM_G1CollectFull: public VM_GC_Operation {
54 54 public:
55 55 VM_G1CollectFull(unsigned int gc_count_before,
56 56 unsigned int full_gc_count_before,
57 57 GCCause::Cause cause)
58 58 : VM_GC_Operation(gc_count_before, cause, full_gc_count_before) { }
59 59 virtual VMOp_Type type() const { return VMOp_G1CollectFull; }
60 60 virtual void doit();
61 61 virtual const char* name() const {
62 62 return "full garbage-first collection";
63 63 }
64 64 };
65 65
66 66 class VM_G1CollectForAllocation: public VM_G1OperationWithAllocRequest {
67 67 public:
68 68 VM_G1CollectForAllocation(unsigned int gc_count_before,
69 69 size_t word_size);
70 70 virtual VMOp_Type type() const { return VMOp_G1CollectForAllocation; }
71 71 virtual void doit();
72 72 virtual const char* name() const {
73 73 return "garbage-first collection to satisfy allocation";
74 74 }
75 75 };
76 76
77 77 class VM_G1IncCollectionPause: public VM_G1OperationWithAllocRequest {
78 78 private:
79 79 bool _should_initiate_conc_mark;
80 80 double _target_pause_time_ms;
81 81 unsigned int _full_collections_completed_before;
82 82 public:
83 83 VM_G1IncCollectionPause(unsigned int gc_count_before,
84 84 size_t word_size,
85 85 bool should_initiate_conc_mark,
|
↓ open down ↓ |
85 lines elided |
↑ open up ↑ |
86 86 double target_pause_time_ms,
87 87 GCCause::Cause gc_cause);
88 88 virtual VMOp_Type type() const { return VMOp_G1IncCollectionPause; }
89 89 virtual void doit();
90 90 virtual void doit_epilogue();
91 91 virtual const char* name() const {
92 92 return "garbage-first incremental collection pause";
93 93 }
94 94 };
95 95
96 -// Concurrent GC stop-the-world operations such as initial and final mark;
96 +// Concurrent GC stop-the-world operations such as final mark and cleanup;
97 97 // consider sharing these with CMS's counterparts.
98 98 class VM_CGC_Operation: public VM_Operation {
99 99 VoidClosure* _cl;
100 100 const char* _printGCMessage;
101 +
102 +protected:
103 + // java.lang.ref.Reference support
104 + void acquire_pending_list_lock();
105 + void release_and_notify_pending_list_lock();
106 +
101 107 public:
102 108 VM_CGC_Operation(VoidClosure* cl, const char *printGCMsg)
103 109 : _cl(cl), _printGCMessage(printGCMsg) { }
104 110 virtual VMOp_Type type() const { return VMOp_CGC_Operation; }
105 111 virtual void doit();
106 112 virtual bool doit_prologue();
107 113 virtual void doit_epilogue();
108 114 virtual const char* name() const {
109 115 return "concurrent gc";
110 116 }
111 117 };
112 118
113 119 #endif // SHARE_VM_GC_IMPLEMENTATION_G1_VM_OPERATIONS_G1_HPP
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX