jdk-sandbox: comparison hotspot/src/share/vm/classfile/stringTable.cpp

equal deleted inserted replaced

-:1527aaaeb42d
+:45644c5f6b8e
 oop result = intern(string, chars, length, CHECK_NULL);
 return result;
 }
 void StringTable::unlink_or_oops_do(BoolObjectClosure* is_alive, OopClosure* f, int* processed, int* removed) {
-buckets_unlink_or_oops_do(is_alive, f, 0, the_table()->table_size(), processed, removed);
+BucketUnlinkContext context;
+buckets_unlink_or_oops_do(is_alive, f, 0, the_table()->table_size(), &context);
+_the_table->bulk_free_entries(&context);
+*processed = context._num_processed;
+*removed = context._num_removed;
 }
 void StringTable::possibly_parallel_unlink_or_oops_do(BoolObjectClosure* is_alive, OopClosure* f, int* processed, int* removed) {
 // Readers of the table are unlocked, so we should only be removing
 // entries at a safepoint.
 assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint");
 const int limit = the_table()->table_size();
+BucketUnlinkContext context;
 for (;;) {
 // Grab next set of buckets to scan
 int start_idx = Atomic::add(ClaimChunkSize, &_parallel_claimed_idx) - ClaimChunkSize;
 if (start_idx >= limit) {
 // End of table
 break;
 }
 int end_idx = MIN2(limit, start_idx + ClaimChunkSize);
-buckets_unlink_or_oops_do(is_alive, f, start_idx, end_idx, processed, removed);
+buckets_unlink_or_oops_do(is_alive, f, start_idx, end_idx, &context);
 }
+_the_table->bulk_free_entries(&context);
+*processed = context._num_processed;
+*removed = context._num_removed;
 }
 void StringTable::buckets_oops_do(OopClosure* f, int start_idx, int end_idx) {
 const int limit = the_table()->table_size();
 entry = entry->next();
 }
 }
 }
-void StringTable::buckets_unlink_or_oops_do(BoolObjectClosure* is_alive, OopClosure* f, int start_idx, int end_idx, int* processed, int* removed) {
+void StringTable::buckets_unlink_or_oops_do(BoolObjectClosure* is_alive, OopClosure* f, int start_idx, int end_idx, BucketUnlinkContext* context) {
 const int limit = the_table()->table_size();
 assert(0 <= start_idx && start_idx <= limit,
 "start_idx (%d) is out of bounds", start_idx);
 assert(0 <= end_idx && end_idx <= limit,
 f->do_oop((oop*)entry->literal_addr());
 }
 p = entry->next_addr();
 } else {
 *p = entry->next();
-the_table()->free_entry(entry);
+context->free_entry(entry);
-(*removed)++;
+}
-}
+context->_num_processed++;
-(*processed)++;
 entry = *p;
 }
 }
 }

changeset 45114	45644c5f6b8e
parent 44323	1566bea4793a
child 46488	01c282163d38