comparison src/share/vm/memory/sharedHeap.cpp @ 2379:b099aaf51bf8

6962931: move interned strings out of the perm gen Reviewed-by: never, coleenp, ysr, jwilhelm
author jcoomes
date Tue, 22 Mar 2011 13:36:33 -0700
parents 3582bf76420e
children 1d1603768966
comparison
equal deleted inserted replaced
2378:924777755fad 2379:b099aaf51bf8
169 169
170 if (!_process_strong_tasks->is_task_claimed(SH_PS_SymbolTable_oops_do)) { 170 if (!_process_strong_tasks->is_task_claimed(SH_PS_SymbolTable_oops_do)) {
171 } 171 }
172 172
173 if (!_process_strong_tasks->is_task_claimed(SH_PS_StringTable_oops_do)) { 173 if (!_process_strong_tasks->is_task_claimed(SH_PS_StringTable_oops_do)) {
174 if (so & SO_Strings) { 174 if (so & SO_Strings || (!collecting_perm_gen && !JavaObjectsInPerm)) {
175 StringTable::oops_do(roots); 175 StringTable::oops_do(roots);
176 } 176 }
177 // Verify if the string table contents are in the perm gen 177 if (JavaObjectsInPerm) {
178 NOT_PRODUCT(StringTable::oops_do(&assert_is_perm_closure)); 178 // Verify the string table contents are in the perm gen
179 NOT_PRODUCT(StringTable::oops_do(&assert_is_perm_closure));
180 }
179 } 181 }
180 182
181 if (!_process_strong_tasks->is_task_claimed(SH_PS_CodeCache_oops_do)) { 183 if (!_process_strong_tasks->is_task_claimed(SH_PS_CodeCache_oops_do)) {
182 if (so & SO_CodeCache) { 184 if (so & SO_CodeCache) {
183 // (Currently, CMSCollector uses this to do intermediate-strength collections.) 185 // (Currently, CMSCollector uses this to do intermediate-strength collections.)