1.1 --- a/src/share/vm/oops/instanceRefKlass.cpp Thu Sep 06 07:28:30 2012 -0700
1.2 +++ b/src/share/vm/oops/instanceRefKlass.cpp Fri Sep 07 12:04:16 2012 -0400
1.3 @@ -45,12 +45,12 @@
1.4 #endif
1.5
1.6 template <class T>
1.7 -void specialized_oop_follow_contents(instanceRefKlass* ref, oop obj) {
1.8 +void specialized_oop_follow_contents(InstanceRefKlass* ref, oop obj) {
1.9 T* referent_addr = (T*)java_lang_ref_Reference::referent_addr(obj);
1.10 T heap_oop = oopDesc::load_heap_oop(referent_addr);
1.11 debug_only(
1.12 if(TraceReferenceGC && PrintGCDetails) {
1.13 - gclog_or_tty->print_cr("instanceRefKlass::oop_follow_contents " INTPTR_FORMAT, obj);
1.14 + gclog_or_tty->print_cr("InstanceRefKlass::oop_follow_contents " INTPTR_FORMAT, obj);
1.15 }
1.16 )
1.17 if (!oopDesc::is_null(heap_oop)) {
1.18 @@ -112,7 +112,7 @@
1.19 ref->InstanceKlass::oop_follow_contents(obj);
1.20 }
1.21
1.22 -void instanceRefKlass::oop_follow_contents(oop obj) {
1.23 +void InstanceRefKlass::oop_follow_contents(oop obj) {
1.24 if (UseCompressedOops) {
1.25 specialized_oop_follow_contents<narrowOop>(this, obj);
1.26 } else {
1.27 @@ -122,14 +122,14 @@
1.28
1.29 #ifndef SERIALGC
1.30 template <class T>
1.31 -void specialized_oop_follow_contents(instanceRefKlass* ref,
1.32 +void specialized_oop_follow_contents(InstanceRefKlass* ref,
1.33 ParCompactionManager* cm,
1.34 oop obj) {
1.35 T* referent_addr = (T*)java_lang_ref_Reference::referent_addr(obj);
1.36 T heap_oop = oopDesc::load_heap_oop(referent_addr);
1.37 debug_only(
1.38 if(TraceReferenceGC && PrintGCDetails) {
1.39 - gclog_or_tty->print_cr("instanceRefKlass::oop_follow_contents " INTPTR_FORMAT, obj);
1.40 + gclog_or_tty->print_cr("InstanceRefKlass::oop_follow_contents " INTPTR_FORMAT, obj);
1.41 }
1.42 )
1.43 if (!oopDesc::is_null(heap_oop)) {
1.44 @@ -186,7 +186,7 @@
1.45 ref->InstanceKlass::oop_follow_contents(cm, obj);
1.46 }
1.47
1.48 -void instanceRefKlass::oop_follow_contents(ParCompactionManager* cm,
1.49 +void InstanceRefKlass::oop_follow_contents(ParCompactionManager* cm,
1.50 oop obj) {
1.51 if (UseCompressedOops) {
1.52 specialized_oop_follow_contents<narrowOop>(this, cm, obj);
1.53 @@ -218,18 +218,18 @@
1.54 }
1.55 #endif
1.56
1.57 -template <class T> void specialized_oop_adjust_pointers(instanceRefKlass *ref, oop obj) {
1.58 +template <class T> void specialized_oop_adjust_pointers(InstanceRefKlass *ref, oop obj) {
1.59 T* referent_addr = (T*)java_lang_ref_Reference::referent_addr(obj);
1.60 MarkSweep::adjust_pointer(referent_addr);
1.61 T* next_addr = (T*)java_lang_ref_Reference::next_addr(obj);
1.62 MarkSweep::adjust_pointer(next_addr);
1.63 T* discovered_addr = (T*)java_lang_ref_Reference::discovered_addr(obj);
1.64 MarkSweep::adjust_pointer(discovered_addr);
1.65 - debug_only(trace_reference_gc("instanceRefKlass::oop_adjust_pointers", obj,
1.66 + debug_only(trace_reference_gc("InstanceRefKlass::oop_adjust_pointers", obj,
1.67 referent_addr, next_addr, discovered_addr);)
1.68 }
1.69
1.70 -int instanceRefKlass::oop_adjust_pointers(oop obj) {
1.71 +int InstanceRefKlass::oop_adjust_pointers(oop obj) {
1.72 int size = size_helper();
1.73 InstanceKlass::oop_adjust_pointers(obj);
1.74
1.75 @@ -298,12 +298,12 @@
1.76
1.77 template <class T> bool contains(T *t) { return true; }
1.78
1.79 -// Macro to define instanceRefKlass::oop_oop_iterate for virtual/nonvirtual for
1.80 +// Macro to define InstanceRefKlass::oop_oop_iterate for virtual/nonvirtual for
1.81 // all closures. Macros calling macros above for each oop size.
1.82
1.83 #define InstanceRefKlass_OOP_OOP_ITERATE_DEFN(OopClosureType, nv_suffix) \
1.84 \
1.85 -int instanceRefKlass:: \
1.86 +int InstanceRefKlass:: \
1.87 oop_oop_iterate##nv_suffix(oop obj, OopClosureType* closure) { \
1.88 /* Get size before changing pointers */ \
1.89 SpecializationStats::record_iterate_call##nv_suffix(SpecializationStats::irk);\
1.90 @@ -320,7 +320,7 @@
1.91 #ifndef SERIALGC
1.92 #define InstanceRefKlass_OOP_OOP_ITERATE_BACKWARDS_DEFN(OopClosureType, nv_suffix) \
1.93 \
1.94 -int instanceRefKlass:: \
1.95 +int InstanceRefKlass:: \
1.96 oop_oop_iterate_backwards##nv_suffix(oop obj, OopClosureType* closure) { \
1.97 /* Get size before changing pointers */ \
1.98 SpecializationStats::record_iterate_call##nv_suffix(SpecializationStats::irk);\
1.99 @@ -338,7 +338,7 @@
1.100
1.101 #define InstanceRefKlass_OOP_OOP_ITERATE_DEFN_m(OopClosureType, nv_suffix) \
1.102 \
1.103 -int instanceRefKlass:: \
1.104 +int InstanceRefKlass:: \
1.105 oop_oop_iterate##nv_suffix##_m(oop obj, \
1.106 OopClosureType* closure, \
1.107 MemRegion mr) { \
1.108 @@ -363,7 +363,7 @@
1.109
1.110 #ifndef SERIALGC
1.111 template <class T>
1.112 -void specialized_oop_push_contents(instanceRefKlass *ref,
1.113 +void specialized_oop_push_contents(InstanceRefKlass *ref,
1.114 PSPromotionManager* pm, oop obj) {
1.115 T* referent_addr = (T*)java_lang_ref_Reference::referent_addr(obj);
1.116 if (PSScavenge::should_scavenge(referent_addr)) {
1.117 @@ -414,7 +414,7 @@
1.118 ref->InstanceKlass::oop_push_contents(pm, obj);
1.119 }
1.120
1.121 -void instanceRefKlass::oop_push_contents(PSPromotionManager* pm, oop obj) {
1.122 +void InstanceRefKlass::oop_push_contents(PSPromotionManager* pm, oop obj) {
1.123 if (UseCompressedOops) {
1.124 specialized_oop_push_contents<narrowOop>(this, pm, obj);
1.125 } else {
1.126 @@ -423,7 +423,7 @@
1.127 }
1.128
1.129 template <class T>
1.130 -void specialized_oop_update_pointers(instanceRefKlass *ref,
1.131 +void specialized_oop_update_pointers(InstanceRefKlass *ref,
1.132 ParCompactionManager* cm, oop obj) {
1.133 T* referent_addr = (T*)java_lang_ref_Reference::referent_addr(obj);
1.134 PSParallelCompact::adjust_pointer(referent_addr);
1.135 @@ -431,11 +431,11 @@
1.136 PSParallelCompact::adjust_pointer(next_addr);
1.137 T* discovered_addr = (T*)java_lang_ref_Reference::discovered_addr(obj);
1.138 PSParallelCompact::adjust_pointer(discovered_addr);
1.139 - debug_only(trace_reference_gc("instanceRefKlass::oop_update_ptrs", obj,
1.140 + debug_only(trace_reference_gc("InstanceRefKlass::oop_update_ptrs", obj,
1.141 referent_addr, next_addr, discovered_addr);)
1.142 }
1.143
1.144 -int instanceRefKlass::oop_update_pointers(ParCompactionManager* cm, oop obj) {
1.145 +int InstanceRefKlass::oop_update_pointers(ParCompactionManager* cm, oop obj) {
1.146 InstanceKlass::oop_update_pointers(cm, obj);
1.147 if (UseCompressedOops) {
1.148 specialized_oop_update_pointers<narrowOop>(this, cm, obj);
1.149 @@ -446,7 +446,7 @@
1.150 }
1.151 #endif // SERIALGC
1.152
1.153 -void instanceRefKlass::update_nonstatic_oop_maps(Klass* k) {
1.154 +void InstanceRefKlass::update_nonstatic_oop_maps(Klass* k) {
1.155 // Clear the nonstatic oop-map entries corresponding to referent
1.156 // and nextPending field. They are treated specially by the
1.157 // garbage collector.
1.158 @@ -485,7 +485,7 @@
1.159
1.160 // Verification
1.161
1.162 -void instanceRefKlass::oop_verify_on(oop obj, outputStream* st) {
1.163 +void InstanceRefKlass::oop_verify_on(oop obj, outputStream* st) {
1.164 InstanceKlass::oop_verify_on(obj, st);
1.165 // Verify referent field
1.166 oop referent = java_lang_ref_Reference::referent(obj);
1.167 @@ -506,13 +506,13 @@
1.168 }
1.169 }
1.170
1.171 -bool instanceRefKlass::owns_pending_list_lock(JavaThread* thread) {
1.172 +bool InstanceRefKlass::owns_pending_list_lock(JavaThread* thread) {
1.173 if (java_lang_ref_Reference::pending_list_lock() == NULL) return false;
1.174 Handle h_lock(thread, java_lang_ref_Reference::pending_list_lock());
1.175 return ObjectSynchronizer::current_thread_holds_lock(thread, h_lock);
1.176 }
1.177
1.178 -void instanceRefKlass::acquire_pending_list_lock(BasicLock *pending_list_basic_lock) {
1.179 +void InstanceRefKlass::acquire_pending_list_lock(BasicLock *pending_list_basic_lock) {
1.180 // we may enter this with pending exception set
1.181 PRESERVE_EXCEPTION_MARK; // exceptions are never thrown, needed for TRAPS argument
1.182
1.183 @@ -529,7 +529,7 @@
1.184 if (HAS_PENDING_EXCEPTION) CLEAR_PENDING_EXCEPTION;
1.185 }
1.186
1.187 -void instanceRefKlass::release_and_notify_pending_list_lock(
1.188 +void InstanceRefKlass::release_and_notify_pending_list_lock(
1.189 BasicLock *pending_list_basic_lock) {
1.190 // we may enter this with pending exception set
1.191 PRESERVE_EXCEPTION_MARK; // exceptions are never thrown, needed for TRAPS argument
