< prev index next >
src/hotspot/share/prims/jvmtiTagMap.cpp
Print this page
rev 47972 : [mq]: Access_jvmtiTagMap
*** 28,37 ****
--- 28,38 ----
#include "classfile/systemDictionary.hpp"
#include "classfile/vmSymbols.hpp"
#include "code/codeCache.hpp"
#include "jvmtifiles/jvmtiEnv.hpp"
#include "memory/resourceArea.hpp"
+ #include "oops/access.inline.hpp"
#include "oops/instanceMirrorKlass.hpp"
#include "oops/objArrayKlass.hpp"
#include "oops/objArrayOop.inline.hpp"
#include "oops/oop.inline.hpp"
#include "prims/jvmtiEventController.hpp"
*** 50,63 ****
#include "runtime/vframe.hpp"
#include "runtime/vmThread.hpp"
#include "runtime/vm_operations.hpp"
#include "services/serviceUtil.hpp"
#include "utilities/macros.hpp"
- #if INCLUDE_ALL_GCS
- #include "gc/g1/g1SATBCardTableModRefBS.hpp"
- #include "gc/parallel/parallelScavengeHeap.hpp"
- #endif // INCLUDE_ALL_GCS
// JvmtiTagHashmapEntry
//
// Each entry encapsulates a reference to the tagged object
// and the tag value. In addition an entry includes a next pointer which
--- 51,60 ----
*** 81,99 ****
JvmtiTagHashmapEntry(oop object, jlong tag) { init(object, tag); }
public:
// accessor methods
- inline oop object() const { return _object; }
inline oop* object_addr() { return &_object; }
inline jlong tag() const { return _tag; }
inline void set_tag(jlong tag) {
assert(tag != 0, "can't be zero");
_tag = tag;
}
inline JvmtiTagHashmapEntry* next() const { return _next; }
inline void set_next(JvmtiTagHashmapEntry* next) { _next = next; }
};
--- 78,105 ----
JvmtiTagHashmapEntry(oop object, jlong tag) { init(object, tag); }
public:
// accessor methods
inline oop* object_addr() { return &_object; }
+ inline oop object() { return RootAccess<ON_PHANTOM_OOP_REF>::oop_load(object_addr()); }
+ // Peek at the object without keeping it alive. The returned object must be
+ // kept alive using a normal access if it leaks out of a thread transition from VM.
+ inline oop object_peek() {
+ return RootAccess<ON_PHANTOM_OOP_REF | AS_NO_KEEPALIVE>::oop_load(object_addr());
+ }
inline jlong tag() const { return _tag; }
inline void set_tag(jlong tag) {
assert(tag != 0, "can't be zero");
_tag = tag;
}
+ inline bool equals(oop object) {
+ return object == object_peek();
+ }
+
inline JvmtiTagHashmapEntry* next() const { return _next; }
inline void set_next(JvmtiTagHashmapEntry* next) { _next = next; }
};
*** 209,219 ****
// rehash all entries into the new table
for (i=0; i<_size; i++) {
JvmtiTagHashmapEntry* entry = _table[i];
while (entry != NULL) {
JvmtiTagHashmapEntry* next = entry->next();
! oop key = entry->object();
assert(key != NULL, "jni weak reference cleared!!");
unsigned int h = hash(key, new_size);
JvmtiTagHashmapEntry* anchor = new_table[h];
if (anchor == NULL) {
new_table[h] = entry;
--- 215,225 ----
// rehash all entries into the new table
for (i=0; i<_size; i++) {
JvmtiTagHashmapEntry* entry = _table[i];
while (entry != NULL) {
JvmtiTagHashmapEntry* next = entry->next();
! oop key = entry->object_peek();
assert(key != NULL, "jni weak reference cleared!!");
unsigned int h = hash(key, new_size);
JvmtiTagHashmapEntry* anchor = new_table[h];
if (anchor == NULL) {
new_table[h] = entry;
*** 302,312 ****
// find an entry in the hashmap, returns NULL if not found.
inline JvmtiTagHashmapEntry* find(oop key) {
unsigned int h = hash(key);
JvmtiTagHashmapEntry* entry = _table[h];
while (entry != NULL) {
! if (entry->object() == key) {
return entry;
}
entry = entry->next();
}
return NULL;
--- 308,318 ----
// find an entry in the hashmap, returns NULL if not found.
inline JvmtiTagHashmapEntry* find(oop key) {
unsigned int h = hash(key);
JvmtiTagHashmapEntry* entry = _table[h];
while (entry != NULL) {
! if (entry->equals(key)) {
return entry;
}
entry = entry->next();
}
return NULL;
*** 343,353 ****
inline JvmtiTagHashmapEntry* remove(oop key) {
unsigned int h = hash(key);
JvmtiTagHashmapEntry* entry = _table[h];
JvmtiTagHashmapEntry* prev = NULL;
while (entry != NULL) {
! if (key == entry->object()) {
break;
}
prev = entry;
entry = entry->next();
}
--- 349,359 ----
inline JvmtiTagHashmapEntry* remove(oop key) {
unsigned int h = hash(key);
JvmtiTagHashmapEntry* entry = _table[h];
JvmtiTagHashmapEntry* prev = NULL;
while (entry != NULL) {
! if (entry->equals(key)) {
break;
}
prev = entry;
entry = entry->next();
}
*** 1533,1552 ****
// and record the reference and tag value.
//
void do_entry(JvmtiTagHashmapEntry* entry) {
for (int i=0; i<_tag_count; i++) {
if (_tags[i] == entry->tag()) {
- oop o = entry->object();
- assert(o != NULL && Universe::heap()->is_in_reserved(o), "sanity check");
- #if INCLUDE_ALL_GCS
- if (UseG1GC) {
// The reference in this tag map could be the only (implicitly weak)
// reference to that object. If we hand it out, we need to keep it live wrt
! // SATB marking similar to other j.l.ref.Reference referents.
! G1SATBCardTableModRefBS::enqueue(o);
! }
! #endif
jobject ref = JNIHandles::make_local(JavaThread::current(), o);
_object_results->append(ref);
_tag_results->append((uint64_t)entry->tag());
}
}
--- 1539,1554 ----
// and record the reference and tag value.
//
void do_entry(JvmtiTagHashmapEntry* entry) {
for (int i=0; i<_tag_count; i++) {
if (_tags[i] == entry->tag()) {
// The reference in this tag map could be the only (implicitly weak)
// reference to that object. If we hand it out, we need to keep it live wrt
! // SATB marking similar to other j.l.ref.Reference referents. This is
! // achieved by using a phantom load in the object() accessor.
! oop o = entry->object();
! assert(o != NULL && Universe::heap()->is_in_reserved(o), "sanity check");
jobject ref = JNIHandles::make_local(JavaThread::current(), o);
_object_results->append(ref);
_tag_results->append((uint64_t)entry->tag());
}
}
*** 3361,3374 ****
JvmtiTagHashmapEntry* prev = NULL;
while (entry != NULL) {
JvmtiTagHashmapEntry* next = entry->next();
- oop* obj = entry->object_addr();
-
// has object been GC'ed
! if (!is_alive->do_object_b(entry->object())) {
// grab the tag
jlong tag = entry->tag();
guarantee(tag != 0, "checking");
// remove GC'ed entry from hashmap and return the
--- 3363,3374 ----
JvmtiTagHashmapEntry* prev = NULL;
while (entry != NULL) {
JvmtiTagHashmapEntry* next = entry->next();
// has object been GC'ed
! if (!is_alive->do_object_b(entry->object_peek())) {
// grab the tag
jlong tag = entry->tag();
guarantee(tag != 0, "checking");
// remove GC'ed entry from hashmap and return the
*** 3382,3392 ****
}
++freed;
} else {
f->do_oop(entry->object_addr());
! oop new_oop = entry->object();
// if the object has moved then re-hash it and move its
// entry to its new location.
unsigned int new_pos = JvmtiTagHashmap::hash(new_oop, size);
if (new_pos != (unsigned int)pos) {
--- 3382,3392 ----
}
++freed;
} else {
f->do_oop(entry->object_addr());
! oop new_oop = entry->object_peek();
// if the object has moved then re-hash it and move its
// entry to its new location.
unsigned int new_pos = JvmtiTagHashmap::hash(new_oop, size);
if (new_pos != (unsigned int)pos) {
*** 3416,3426 ****
}
// Re-add all the entries which were kept aside
while (delayed_add != NULL) {
JvmtiTagHashmapEntry* next = delayed_add->next();
! unsigned int pos = JvmtiTagHashmap::hash(delayed_add->object(), size);
delayed_add->set_next(table[pos]);
table[pos] = delayed_add;
delayed_add = next;
}
--- 3416,3426 ----
}
// Re-add all the entries which were kept aside
while (delayed_add != NULL) {
JvmtiTagHashmapEntry* next = delayed_add->next();
! unsigned int pos = JvmtiTagHashmap::hash(delayed_add->object_peek(), size);
delayed_add->set_next(table[pos]);
table[pos] = delayed_add;
delayed_add = next;
}
< prev index next >