stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8236878: Use atomic instruction to update StringDedupTable's entries and entries_removed counters

Browse Source 
Reviewed-by: rkennke, shade
This commit is contained in:
Zhengyu Gu 2020-01-16 18:36:24 -05:00
parent 163875d24b
commit 0b2da9e239
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/hotspot/share/gc/shared/stringdedup/stringDedupTable.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -215,7 +215,7 @@ const uintx StringDedupTable::_rehash_multiple = 60; // Hash buck
const uintx StringDedupTable::_rehash_threshold = (uintx)(_rehash_multiple * _grow_load_factor); const uintx StringDedupTable::_rehash_threshold = (uintx)(_rehash_multiple * _grow_load_factor);
uintx StringDedupTable::_entries_added = 0; uintx StringDedupTable::_entries_added = 0;
uintx StringDedupTable::_entries_removed = 0; volatile uintx StringDedupTable::_entries_removed = 0;
uintx StringDedupTable::_resize_count = 0; uintx StringDedupTable::_resize_count = 0;
uintx StringDedupTable::_rehash_count = 0; uintx StringDedupTable::_rehash_count = 0;
@ -477,11 +477,13 @@ void StringDedupTable::unlink_or_oops_do(StringDedupUnlinkOrOopsDoClosure* cl, u
removed += unlink_or_oops_do(cl, table_half + partition_begin, table_half + partition_end, worker_id); removed += unlink_or_oops_do(cl, table_half + partition_begin, table_half + partition_end, worker_id);
} }
// Delayed update to avoid contention on the table lock // Do atomic update here instead of taking StringDedupTable_lock. This allows concurrent
// cleanup when multiple workers are cleaning up the table, while the mutators are blocked
// on StringDedupTable_lock.
if (removed > 0) { if (removed > 0) {
MutexLocker ml(StringDedupTable_lock, Mutex::_no_safepoint_check_flag); assert_locked_or_safepoint_weak(StringDedupTable_lock);
_table->_entries -= removed; Atomic::sub(&_table->_entries, removed);
_entries_removed += removed; Atomic::add(&_entries_removed, removed);
} }
} }

6
src/hotspot/share/gc/shared/stringdedup/stringDedupTable.hpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -122,7 +122,7 @@ private:
StringDedupEntry** _buckets; StringDedupEntry** _buckets;
size_t _size; size_t _size;
uintx _entries; volatile uintx _entries;
uintx _shrink_threshold; uintx _shrink_threshold;
uintx _grow_threshold; uintx _grow_threshold;
bool _rehash_needed; bool _rehash_needed;
@ -144,7 +144,7 @@ private:
// Table statistics, only used for logging. // Table statistics, only used for logging.
static uintx _entries_added; static uintx _entries_added;
static uintx _entries_removed; static volatile uintx _entries_removed;
static uintx _resize_count; static uintx _resize_count;
static uintx _rehash_count; static uintx _rehash_count;