Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorctornqvi
Thu, 19 Nov 2015 19:38:54 +0000
changeset 34239 5a67344e5ef3
parent 34237 c34adffc35c0 (diff)
parent 34238 60e87df08f1e (current diff)
child 34240 62db4b48cbef
Merge
hotspot/test/runtime/8087223/BadMethodHandles.java file | annotate | diff | comparison | revisions
hotspot/test/runtime/8087223/IntfMethod.java file | annotate | diff | comparison | revisions 
--- a/hotspot/src/share/vm/classfile/symbolTable.cpp	Thu Nov 19 10:34:11 2015 -0800
+++ b/hotspot/src/share/vm/classfile/symbolTable.cpp	Thu Nov 19 19:38:54 2015 +0000
@@ -97,7 +97,7 @@
 int SymbolTable::_symbols_counted = 0;
 volatile int SymbolTable::_parallel_claimed_idx = 0;
 
-void SymbolTable::buckets_unlink(int start_idx, int end_idx, int* processed, int* removed, size_t* memory_total) {
+void SymbolTable::buckets_unlink(int start_idx, int end_idx, int* processed, int* removed) {
   for (int i = start_idx; i < end_idx; ++i) {
     HashtableEntry<Symbol*, mtSymbol>** p = the_table()->bucket_addr(i);
     HashtableEntry<Symbol*, mtSymbol>* entry = the_table()->bucket(i);
@@ -110,7 +110,6 @@
         break;
       }
       Symbol* s = entry->literal();
-      (*memory_total) += s->size();
       (*processed)++;
       assert(s != NULL, "just checking");
       // If reference count is zero, remove.
@@ -133,15 +132,9 @@
 // This is done late during GC.
 void SymbolTable::unlink(int* processed, int* removed) {
   size_t memory_total = 0;
-  buckets_unlink(0, the_table()->table_size(), processed, removed, &memory_total);
+  buckets_unlink(0, the_table()->table_size(), processed, removed);
   _symbols_removed += *removed;
   _symbols_counted += *processed;
-  // Exclude printing for normal PrintGCDetails because people parse
-  // this output.
-  if (PrintGCDetails && Verbose && WizardMode) {
-    gclog_or_tty->print(" [Symbols=%d size=" SIZE_FORMAT "K] ", *processed,
-                        (memory_total*HeapWordSize)/1024);
-  }
 }
 
 void SymbolTable::possibly_parallel_unlink(int* processed, int* removed) {
@@ -158,16 +151,10 @@
     }
 
     int end_idx = MIN2(limit, start_idx + ClaimChunkSize);
-    buckets_unlink(start_idx, end_idx, processed, removed, &memory_total);
+    buckets_unlink(start_idx, end_idx, processed, removed);
   }
   Atomic::add(*processed, &_symbols_counted);
   Atomic::add(*removed, &_symbols_removed);
-  // Exclude printing for normal PrintGCDetails because people parse
-  // this output.
-  if (PrintGCDetails && Verbose && WizardMode) {
-    gclog_or_tty->print(" [Symbols: scanned=%d removed=%d size=" SIZE_FORMAT "K] ", *processed, *removed,
-                        (memory_total*HeapWordSize)/1024);
-  }
 }
 
 // Create a new table and using alternate hash code, populate the new table
--- a/hotspot/src/share/vm/classfile/symbolTable.hpp	Thu Nov 19 10:34:11 2015 -0800
+++ b/hotspot/src/share/vm/classfile/symbolTable.hpp	Thu Nov 19 19:38:54 2015 +0000
@@ -132,7 +132,7 @@
   static volatile int _parallel_claimed_idx;
 
   // Release any dead symbols
-  static void buckets_unlink(int start_idx, int end_idx, int* processed, int* removed, size_t* memory_total);
+  static void buckets_unlink(int start_idx, int end_idx, int* processed, int* removed);
 public:
   enum {
     symbol_alloc_batch_size = 8,
jdk-sandbox