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

8227605: Kitchensink fails "assert((((klass)->trace_id() & (JfrTraceIdEpoch::leakp_in_use_this_epoch_bit())) != 0)) failed: invariant"

Browse Source 
Reviewed-by: dholmes, dcubed, egahlin
This commit is contained in:
Markus Grönlund 2019-07-31 16:09:17 +02:00
parent dcf57abbc1
commit f508e14d9a
2 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdBits.inline.hpp
View File

@ -27,7 +27,6 @@
#include "jfr/utilities/jfrTypes.hpp"
#include "runtime/atomic.hpp"
#include "runtime/orderAccess.hpp"
#include "utilities/macros.hpp"
#ifdef VM_LITTLE_ENDIAN
@ -40,46 +39,45 @@ static const int leakp_offset = low_offset - 1;
inline void set_bits(jbyte bits, jbyte* const dest) {
assert(dest != NULL, "invariant");
const jbyte current = OrderAccess::load_acquire(dest);
if (bits != (current & bits)) {
if (bits != (*dest & bits)) {
*dest |= bits;
}
}
inline void set_mask(jbyte mask, jbyte* const dest) {
inline jbyte traceid_and(jbyte current, jbyte bits) {
return current & bits;
}
inline jbyte traceid_or(jbyte current, jbyte bits) {
return current | bits;
}
inline jbyte traceid_xor(jbyte current, jbyte bits) {
return current ^ bits;
}
template <jbyte op(jbyte, jbyte)>
inline void set_bits_cas_form(jbyte bits, jbyte* const dest) {
assert(dest != NULL, "invariant");
const jbyte current = OrderAccess::load_acquire(dest);
if (mask != (current & mask)) {
*dest &= mask;
}
do {
const jbyte current = *dest;
const jbyte new_value = op(current, bits);
if (Atomic::cmpxchg(new_value, dest, current) == current) {
return;
}
} while (true);
}
inline void set_bits_cas(jbyte bits, jbyte* const dest) {
assert(dest != NULL, "invariant");
do {
const jbyte current = OrderAccess::load_acquire(dest);
if (bits == (current & bits)) {
return;
}
const jbyte new_value = current | bits;
if (Atomic::cmpxchg(new_value, dest, current) == current) {
return;
}
} while (true);
set_bits_cas_form<traceid_or>(bits, dest);
}
inline void clear_bits_cas(jbyte bits, jbyte* const dest) {
assert(dest != NULL, "invariant");
do {
const jbyte current = OrderAccess::load_acquire(dest);
if (bits != (current & bits)) {
return;
}
const jbyte new_value = current ^ bits;
if (Atomic::cmpxchg(new_value, dest, current) == current) {
return;
}
} while (true);
set_bits_cas_form<traceid_xor>(bits, dest);
}
inline void set_mask(jbyte mask, jbyte* const dest) {
set_bits_cas_form<traceid_and>(mask, dest);
}
inline void set_traceid_bits(jbyte bits, traceid* dest) {

2
src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdMacros.hpp
View File

@ -108,7 +108,7 @@
#define SET_USED_THIS_EPOCH(ptr) (SET_TAG(ptr, IN_USE_THIS_EPOCH_BIT))
#define SET_USED_PREV_EPOCH(ptr) (SET_TAG_CAS(ptr, IN_USE_PREV_EPOCH_BIT))
#define SET_LEAKP_USED_THIS_EPOCH(ptr) (SET_LEAKP_TAG(ptr, IN_USE_THIS_EPOCH_BIT))
#define SET_LEAKP_USED_PREV_EPOCH(ptr) (SET_LEAKP_TAG(ptr, IN_USE_PREV_EPOCH_BIT))
#define SET_LEAKP_USED_PREV_EPOCH(ptr) (SET_LEAKP_TAG_CAS(ptr, IN_USE_PREV_EPOCH_BIT))
#define SET_METHOD_AND_CLASS_USED_THIS_EPOCH(kls) (SET_TAG(kls, METHOD_AND_CLASS_IN_USE_THIS_EPOCH_BITS))
#define USED_THIS_EPOCH(ptr) (((ptr)->trace_id() & IN_USE_THIS_EPOCH_BIT) != 0)