Skip to content

Commit 111d5e1

Browse files
committed
8273915: Create 'nosafepoint' rank
Reviewed-by: dholmes, iklam
1 parent 7acec3f commit 111d5e1

25 files changed

+90
-76
lines changed

src/hotspot/share/classfile/classLoaderData.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ void ClassLoaderData::initialize_name(Handle class_loader) {
133133

134134
ClassLoaderData::ClassLoaderData(Handle h_class_loader, bool has_class_mirror_holder) :
135135
_metaspace(NULL),
136-
_metaspace_lock(new Mutex(Mutex::leaf-2, "MetaspaceAllocation_lock",
136+
_metaspace_lock(new Mutex(Mutex::nosafepoint-2, "MetaspaceAllocation_lock",
137137
Mutex::_safepoint_check_never)),
138138
_unloading(false), _has_class_mirror_holder(has_class_mirror_holder),
139139
_modified_oops(true),

src/hotspot/share/gc/g1/g1ServiceThread.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ void G1SentinelTask::execute() {
4040

4141
G1ServiceThread::G1ServiceThread() :
4242
ConcurrentGCThread(),
43-
_monitor(Mutex::leaf,
44-
"G1ServiceThread monitor",
43+
_monitor(Mutex::nosafepoint,
44+
"G1ServiceThread_lock",
4545
Monitor::_safepoint_check_never),
4646
_task_queue() {
4747
set_name("G1 Service");

src/hotspot/share/gc/parallel/psCompactionManager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ void ParCompactionManager::initialize(ParMarkBitMap* mbm) {
9292

9393
_shadow_region_array = new (ResourceObj::C_HEAP, mtGC) GrowableArray<size_t >(10, mtGC);
9494

95-
_shadow_region_monitor = new Monitor(Mutex::barrier, "CompactionManager monitor",
95+
_shadow_region_monitor = new Monitor(Mutex::nosafepoint, "CompactionManager_lock",
9696
Monitor::_safepoint_check_never);
9797
}
9898

src/hotspot/share/gc/shared/taskTerminator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ TaskTerminator::TaskTerminator(uint n_threads, TaskQueueSetSuper* queue_set) :
7272
_n_threads(n_threads),
7373
_queue_set(queue_set),
7474
_offered_termination(0),
75-
_blocker(Mutex::leaf, "TaskTerminator", Monitor::_safepoint_check_never),
75+
_blocker(Mutex::nosafepoint, "TaskTerminator_lock", Monitor::_safepoint_check_never),
7676
_spin_master(NULL) { }
7777

7878
TaskTerminator::~TaskTerminator() {

src/hotspot/share/gc/shared/workgroup.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ void GangWorker::loop() {
245245
// *** WorkGangBarrierSync
246246

247247
WorkGangBarrierSync::WorkGangBarrierSync()
248-
: _monitor(Mutex::safepoint, "work gang barrier sync",
248+
: _monitor(Mutex::nosafepoint, "WorkGangBarrierSync_lock",
249249
Monitor::_safepoint_check_never),
250250
_n_workers(0), _n_completed(0), _should_reset(false), _aborted(false) {
251251
}

src/hotspot/share/gc/z/zMessagePort.inline.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ class ZMessageRequest : public StackObj {
6666

6767
template <typename T>
6868
inline ZMessagePort<T>::ZMessagePort() :
69-
_monitor(Monitor::leaf,
70-
"ZMessagePort",
69+
_monitor(Monitor::nosafepoint,
70+
"ZMessagePort_lock",
7171
Monitor::_safepoint_check_never),
7272
_has_message(false),
7373
_seqnum(0),

src/hotspot/share/gc/z/zMetronome.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include "utilities/ticks.hpp"
2929

3030
ZMetronome::ZMetronome(uint64_t hz) :
31-
_monitor(Monitor::leaf, "ZMetronome", Monitor::_safepoint_check_never),
31+
_monitor(Monitor::nosafepoint, "ZMetronome_lock", Monitor::_safepoint_check_never),
3232
_interval_ms(MILLIUNITS / hz),
3333
_start_ms(0),
3434
_nticks(0),

src/hotspot/share/memory/heapInspection.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ class ParHeapInspectTask : public AbstractGangTask {
245245
_filter(filter),
246246
_missed_count(0),
247247
_success(true),
248-
_mutex(Mutex::leaf, "ParHeapInspectTask_lock", Mutex::_safepoint_check_never) {}
248+
_mutex(Mutex::nosafepoint, "ParHeapInspectTask_lock", Mutex::_safepoint_check_never) {}
249249

250250
uintx missed_count() const {
251251
return _missed_count;

src/hotspot/share/memory/metaspace/testHelpers.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ MetaspaceTestContext::~MetaspaceTestContext() {
9292
// Create an arena, feeding off this area.
9393
MetaspaceTestArena* MetaspaceTestContext::create_arena(Metaspace::MetaspaceType type) {
9494
const ArenaGrowthPolicy* growth_policy = ArenaGrowthPolicy::policy_for_space_type(type, false);
95-
Mutex* lock = new Mutex(Monitor::leaf, "MetaspaceTestArea-lock", Monitor::_safepoint_check_never);
95+
Mutex* lock = new Mutex(Monitor::nosafepoint, "MetaspaceTestArea_lock", Monitor::_safepoint_check_never);
9696
MetaspaceArena* arena = NULL;
9797
{
9898
MutexLocker ml(lock, Mutex::_no_safepoint_check_flag);

src/hotspot/share/prims/jvmtiTagMap.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ bool JvmtiTagMap::_has_object_free_events = false;
7272
// create a JvmtiTagMap
7373
JvmtiTagMap::JvmtiTagMap(JvmtiEnv* env) :
7474
_env(env),
75-
_lock(Mutex::leaf, "JvmtiTagMap_lock", Mutex::_safepoint_check_never),
75+
_lock(Mutex::nosafepoint, "JvmtiTagMap_lock", Mutex::_safepoint_check_never),
7676
_needs_rehashing(false),
7777
_needs_cleaning(false) {
7878

0 commit comments

Comments
 (0)