hotspot/src/share/vm/classfile/symbolTable.cpp
author stefank
Mon, 27 May 2013 12:56:34 +0200
changeset 17845 246c16282ae8
parent 17610 c6857feaac47
child 17846 68ef5934c097
permissions -rw-r--r--
8015428: Remove unused CDS support from StringTable Summary: The string in StringTable is not used by CDS anymore. Remove the unnecessary code in preparation for 8015422: Large performance hit when the StringTable is walked twice in Parallel Scavenge Reviewed-by: pliden, tschatzl, coleenp
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
     1
/*
15934
104ff83451f1 8009829: CDS: JDK JPRT test fails crash in Symbol::equals()
coleenp
parents: 14742
diff changeset
     2
 * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
489c9b5090e2 Initial load
duke
parents:
diff changeset
     4
 *
489c9b5090e2 Initial load
duke
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
489c9b5090e2 Initial load
duke
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
489c9b5090e2 Initial load
duke
parents:
diff changeset
     7
 * published by the Free Software Foundation.
489c9b5090e2 Initial load
duke
parents:
diff changeset
     8
 *
489c9b5090e2 Initial load
duke
parents:
diff changeset
     9
 * This code is distributed in the hope that it will be useful, but WITHOUT
489c9b5090e2 Initial load
duke
parents:
diff changeset
    10
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
489c9b5090e2 Initial load
duke
parents:
diff changeset
    11
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
489c9b5090e2 Initial load
duke
parents:
diff changeset
    12
 * version 2 for more details (a copy is included in the LICENSE file that
489c9b5090e2 Initial load
duke
parents:
diff changeset
    13
 * accompanied this code).
489c9b5090e2 Initial load
duke
parents:
diff changeset
    14
 *
489c9b5090e2 Initial load
duke
parents:
diff changeset
    15
 * You should have received a copy of the GNU General Public License version
489c9b5090e2 Initial load
duke
parents:
diff changeset
    16
 * 2 along with this work; if not, write to the Free Software Foundation,
489c9b5090e2 Initial load
duke
parents:
diff changeset
    17
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
489c9b5090e2 Initial load
duke
parents:
diff changeset
    18
 *
5547
f4b087cbb361 6941466: Oracle rebranding changes for Hotspot repositories
trims
parents: 2332
diff changeset
    19
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
f4b087cbb361 6941466: Oracle rebranding changes for Hotspot repositories
trims
parents: 2332
diff changeset
    20
 * or visit www.oracle.com if you need additional information or have any
f4b087cbb361 6941466: Oracle rebranding changes for Hotspot repositories
trims
parents: 2332
diff changeset
    21
 * questions.
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
    22
 *
489c9b5090e2 Initial load
duke
parents:
diff changeset
    23
 */
489c9b5090e2 Initial load
duke
parents:
diff changeset
    24
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    25
#include "precompiled.hpp"
13087
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
    26
#include "classfile/altHashing.hpp"
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    27
#include "classfile/javaClasses.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    28
#include "classfile/symbolTable.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    29
#include "classfile/systemDictionary.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    30
#include "gc_interface/collectedHeap.inline.hpp"
12263
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
    31
#include "memory/allocation.inline.hpp"
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    32
#include "memory/filemap.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    33
#include "memory/gcLocker.inline.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    34
#include "oops/oop.inline.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    35
#include "oops/oop.inline2.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    36
#include "runtime/mutexLocker.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    37
#include "utilities/hashtable.inline.hpp"
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
    38
489c9b5090e2 Initial load
duke
parents:
diff changeset
    39
// --------------------------------------------------------------------------
489c9b5090e2 Initial load
duke
parents:
diff changeset
    40
489c9b5090e2 Initial load
duke
parents:
diff changeset
    41
SymbolTable* SymbolTable::_the_table = NULL;
12263
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
    42
// Static arena for symbols that are not deallocated
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
    43
Arena* SymbolTable::_arena = NULL;
13087
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
    44
bool SymbolTable::_needs_rehashing = false;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
    45
12263
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
    46
Symbol* SymbolTable::allocate_symbol(const u1* name, int len, bool c_heap, TRAPS) {
13097
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
    47
  assert (len <= Symbol::max_length(), "should be checked by caller");
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
    48
12263
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
    49
  Symbol* sym;
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13199
diff changeset
    50
15934
104ff83451f1 8009829: CDS: JDK JPRT test fails crash in Symbol::equals()
coleenp
parents: 14742
diff changeset
    51
  if (DumpSharedSpaces) {
104ff83451f1 8009829: CDS: JDK JPRT test fails crash in Symbol::equals()
coleenp
parents: 14742
diff changeset
    52
    // Allocate all symbols to CLD shared metaspace
104ff83451f1 8009829: CDS: JDK JPRT test fails crash in Symbol::equals()
coleenp
parents: 14742
diff changeset
    53
    sym = new (len, ClassLoaderData::the_null_class_loader_data(), THREAD) Symbol(name, len, -1);
104ff83451f1 8009829: CDS: JDK JPRT test fails crash in Symbol::equals()
coleenp
parents: 14742
diff changeset
    54
  } else if (c_heap) {
12263
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
    55
    // refcount starts as 1
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
    56
    sym = new (len, THREAD) Symbol(name, len, 1);
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13199
diff changeset
    57
    assert(sym != NULL, "new should call vm_exit_out_of_memory if C_HEAP is exhausted");
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13199
diff changeset
    58
  } else {
15934
104ff83451f1 8009829: CDS: JDK JPRT test fails crash in Symbol::equals()
coleenp
parents: 14742
diff changeset
    59
    // Allocate to global arena
12263
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
    60
    sym = new (len, arena(), THREAD) Symbol(name, len, -1);
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
    61
  }
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
    62
  return sym;
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
    63
}
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
    64
12263
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
    65
void SymbolTable::initialize_symbols(int arena_alloc_size) {
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
    66
  // Initialize the arena for global symbols, size passed in depends on CDS.
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
    67
  if (arena_alloc_size == 0) {
13195
be27e1b6a4b9 6995781: Native Memory Tracking (Phase 1)
zgu
parents: 13097
diff changeset
    68
    _arena = new (mtSymbol) Arena();
12263
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
    69
  } else {
13195
be27e1b6a4b9 6995781: Native Memory Tracking (Phase 1)
zgu
parents: 13097
diff changeset
    70
    _arena = new (mtSymbol) Arena(arena_alloc_size);
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
    71
  }
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
    72
}
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
    73
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
    74
// Call function for all symbols in the symbol table.
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
    75
void SymbolTable::symbols_do(SymbolClosure *cl) {
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
    76
  const int n = the_table()->table_size();
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
    77
  for (int i = 0; i < n; i++) {
13195
be27e1b6a4b9 6995781: Native Memory Tracking (Phase 1)
zgu
parents: 13097
diff changeset
    78
    for (HashtableEntry<Symbol*, mtSymbol>* p = the_table()->bucket(i);
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
    79
         p != NULL;
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
    80
         p = p->next()) {
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
    81
      cl->do_symbol(p->literal_addr());
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
    82
    }
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
    83
  }
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
    84
}
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
    85
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
    86
int SymbolTable::symbols_removed = 0;
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
    87
int SymbolTable::symbols_counted = 0;
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
    88
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
    89
// Remove unreferenced symbols from the symbol table
12263
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
    90
// This is done late during GC.
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
    91
void SymbolTable::unlink() {
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
    92
  int removed = 0;
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
    93
  int total = 0;
8655
fec854507832 7024584: Symbol printouts shouldnt be under PrintGCDetails
coleenp
parents: 8076
diff changeset
    94
  size_t memory_total = 0;
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
    95
  for (int i = 0; i < the_table()->table_size(); ++i) {
13195
be27e1b6a4b9 6995781: Native Memory Tracking (Phase 1)
zgu
parents: 13097
diff changeset
    96
    HashtableEntry<Symbol*, mtSymbol>** p = the_table()->bucket_addr(i);
be27e1b6a4b9 6995781: Native Memory Tracking (Phase 1)
zgu
parents: 13097
diff changeset
    97
    HashtableEntry<Symbol*, mtSymbol>* entry = the_table()->bucket(i);
13097
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
    98
    while (entry != NULL) {
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
    99
      // Shared entries are normally at the end of the bucket and if we run into
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   100
      // a shared entry, then there is nothing more to remove. However, if we
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   101
      // have rehashed the table, then the shared entries are no longer at the
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   102
      // end of the bucket.
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   103
      if (entry->is_shared() && !use_alternate_hashcode()) {
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   104
        break;
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   105
      }
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   106
      Symbol* s = entry->literal();
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13199
diff changeset
   107
      memory_total += s->size();
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   108
      total++;
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   109
      assert(s != NULL, "just checking");
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   110
      // If reference count is zero, remove.
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   111
      if (s->refcount() == 0) {
13097
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   112
        assert(!entry->is_shared(), "shared entries should be kept live");
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   113
        delete s;
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   114
        removed++;
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   115
        *p = entry->next();
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   116
        the_table()->free_entry(entry);
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   117
      } else {
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   118
        p = entry->next_addr();
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   119
      }
13097
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   120
      // get next entry
13195
be27e1b6a4b9 6995781: Native Memory Tracking (Phase 1)
zgu
parents: 13097
diff changeset
   121
      entry = (HashtableEntry<Symbol*, mtSymbol>*)HashtableEntry<Symbol*, mtSymbol>::make_ptr(*p);
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   122
    }
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   123
  }
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   124
  symbols_removed += removed;
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   125
  symbols_counted += total;
8655
fec854507832 7024584: Symbol printouts shouldnt be under PrintGCDetails
coleenp
parents: 8076
diff changeset
   126
  // Exclude printing for normal PrintGCDetails because people parse
fec854507832 7024584: Symbol printouts shouldnt be under PrintGCDetails
coleenp
parents: 8076
diff changeset
   127
  // this output.
fec854507832 7024584: Symbol printouts shouldnt be under PrintGCDetails
coleenp
parents: 8076
diff changeset
   128
  if (PrintGCDetails && Verbose && WizardMode) {
fec854507832 7024584: Symbol printouts shouldnt be under PrintGCDetails
coleenp
parents: 8076
diff changeset
   129
    gclog_or_tty->print(" [Symbols=%d size=" SIZE_FORMAT "K] ", total,
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   130
                        (memory_total*HeapWordSize)/1024);
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   131
  }
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   132
}
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   133
13087
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   134
// Create a new table and using alternate hash code, populate the new table
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   135
// with the existing strings.   Set flag to use the alternate hash code afterwards.
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   136
void SymbolTable::rehash_table() {
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   137
  assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint");
13097
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   138
  // This should never happen with -Xshare:dump but it might in testing mode.
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   139
  if (DumpSharedSpaces) return;
13087
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   140
  // Create a new symbol table
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   141
  SymbolTable* new_table = new SymbolTable();
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   142
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   143
  the_table()->move_to(new_table);
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   144
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   145
  // Delete the table and buckets (entries are reused in new table).
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   146
  delete _the_table;
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   147
  // Don't check if we need rehashing until the table gets unbalanced again.
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   148
  // Then rehash with a new global seed.
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   149
  _needs_rehashing = false;
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   150
  _the_table = new_table;
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   151
}
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   152
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   153
// Lookup a symbol in a bucket.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   154
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   155
Symbol* SymbolTable::lookup(int index, const char* name,
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   156
                              int len, unsigned int hash) {
13087
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   157
  int count = 0;
13195
be27e1b6a4b9 6995781: Native Memory Tracking (Phase 1)
zgu
parents: 13097
diff changeset
   158
  for (HashtableEntry<Symbol*, mtSymbol>* e = bucket(index); e != NULL; e = e->next()) {
13087
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   159
    count++;  // count all entries in this bucket, not just ones with same hash
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   160
    if (e->hash() == hash) {
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   161
      Symbol* sym = e->literal();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   162
      if (sym->equals(name, len)) {
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   163
        // something is referencing this symbol now.
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   164
        sym->increment_refcount();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   165
        return sym;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   166
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   167
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   168
  }
13087
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   169
  // If the bucket size is too deep check if this hash code is insufficient.
13195
be27e1b6a4b9 6995781: Native Memory Tracking (Phase 1)
zgu
parents: 13097
diff changeset
   170
  if (count >= BasicHashtable<mtSymbol>::rehash_count && !needs_rehashing()) {
13087
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   171
    _needs_rehashing = check_rehash_table(count);
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   172
  }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   173
  return NULL;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   174
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   175
13097
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   176
// Pick hashing algorithm.
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   177
unsigned int SymbolTable::hash_symbol(const char* s, int len) {
13087
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   178
  return use_alternate_hashcode() ?
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   179
           AltHashing::murmur3_32(seed(), (const jbyte*)s, len) :
14742
b2a47eb99404 8004661: Comment and function name java_lang_String::toHash is wrong
brutisso
parents: 13728
diff changeset
   180
           java_lang_String::hash_code(s, len);
13087
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   181
}
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   182
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   183
489c9b5090e2 Initial load
duke
parents:
diff changeset
   184
// We take care not to be blocking while holding the
489c9b5090e2 Initial load
duke
parents:
diff changeset
   185
// SymbolTable_lock. Otherwise, the system might deadlock, since the
489c9b5090e2 Initial load
duke
parents:
diff changeset
   186
// symboltable is used during compilation (VM_thread) The lock free
489c9b5090e2 Initial load
duke
parents:
diff changeset
   187
// synchronization is simplified by the fact that we do not delete
489c9b5090e2 Initial load
duke
parents:
diff changeset
   188
// entries in the symbol table during normal execution (only during
489c9b5090e2 Initial load
duke
parents:
diff changeset
   189
// safepoints).
489c9b5090e2 Initial load
duke
parents:
diff changeset
   190
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   191
Symbol* SymbolTable::lookup(const char* name, int len, TRAPS) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   192
  unsigned int hashValue = hash_symbol(name, len);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   193
  int index = the_table()->hash_to_index(hashValue);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   194
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   195
  Symbol* s = the_table()->lookup(index, name, len, hashValue);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   196
489c9b5090e2 Initial load
duke
parents:
diff changeset
   197
  // Found
489c9b5090e2 Initial load
duke
parents:
diff changeset
   198
  if (s != NULL) return s;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   199
13097
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   200
  // Grab SymbolTable_lock first.
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   201
  MutexLocker ml(SymbolTable_lock, THREAD);
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   202
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   203
  // Otherwise, add to symbol to table
12263
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   204
  return the_table()->basic_add(index, (u1*)name, len, hashValue, true, CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   205
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   206
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   207
Symbol* SymbolTable::lookup(const Symbol* sym, int begin, int end, TRAPS) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   208
  char* buffer;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   209
  int index, len;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   210
  unsigned int hashValue;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   211
  char* name;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   212
  {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   213
    debug_only(No_Safepoint_Verifier nsv;)
489c9b5090e2 Initial load
duke
parents:
diff changeset
   214
489c9b5090e2 Initial load
duke
parents:
diff changeset
   215
    name = (char*)sym->base() + begin;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   216
    len = end - begin;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   217
    hashValue = hash_symbol(name, len);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   218
    index = the_table()->hash_to_index(hashValue);
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   219
    Symbol* s = the_table()->lookup(index, name, len, hashValue);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   220
489c9b5090e2 Initial load
duke
parents:
diff changeset
   221
    // Found
489c9b5090e2 Initial load
duke
parents:
diff changeset
   222
    if (s != NULL) return s;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   223
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   224
489c9b5090e2 Initial load
duke
parents:
diff changeset
   225
  // Otherwise, add to symbol to table. Copy to a C string first.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   226
  char stack_buf[128];
489c9b5090e2 Initial load
duke
parents:
diff changeset
   227
  ResourceMark rm(THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   228
  if (len <= 128) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   229
    buffer = stack_buf;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   230
  } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   231
    buffer = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, len);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   232
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   233
  for (int i=0; i<len; i++) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   234
    buffer[i] = name[i];
489c9b5090e2 Initial load
duke
parents:
diff changeset
   235
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   236
  // Make sure there is no safepoint in the code above since name can't move.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   237
  // We can't include the code in No_Safepoint_Verifier because of the
489c9b5090e2 Initial load
duke
parents:
diff changeset
   238
  // ResourceMark.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   239
13097
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   240
  // Grab SymbolTable_lock first.
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   241
  MutexLocker ml(SymbolTable_lock, THREAD);
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   242
12263
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   243
  return the_table()->basic_add(index, (u1*)buffer, len, hashValue, true, CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   244
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   245
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   246
Symbol* SymbolTable::lookup_only(const char* name, int len,
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   247
                                   unsigned int& hash) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   248
  hash = hash_symbol(name, len);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   249
  int index = the_table()->hash_to_index(hash);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   250
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   251
  Symbol* s = the_table()->lookup(index, name, len, hash);
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   252
  return s;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   253
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   254
11480
1bf714e8adb4 7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents: 8885
diff changeset
   255
// Look up the address of the literal in the SymbolTable for this Symbol*
1bf714e8adb4 7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents: 8885
diff changeset
   256
// Do not create any new symbols
1bf714e8adb4 7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents: 8885
diff changeset
   257
// Do not increment the reference count to keep this alive
1bf714e8adb4 7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents: 8885
diff changeset
   258
Symbol** SymbolTable::lookup_symbol_addr(Symbol* sym){
1bf714e8adb4 7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents: 8885
diff changeset
   259
  unsigned int hash = hash_symbol((char*)sym->bytes(), sym->utf8_length());
1bf714e8adb4 7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents: 8885
diff changeset
   260
  int index = the_table()->hash_to_index(hash);
1bf714e8adb4 7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents: 8885
diff changeset
   261
13195
be27e1b6a4b9 6995781: Native Memory Tracking (Phase 1)
zgu
parents: 13097
diff changeset
   262
  for (HashtableEntry<Symbol*, mtSymbol>* e = the_table()->bucket(index); e != NULL; e = e->next()) {
11480
1bf714e8adb4 7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents: 8885
diff changeset
   263
    if (e->hash() == hash) {
1bf714e8adb4 7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents: 8885
diff changeset
   264
      Symbol* literal_sym = e->literal();
1bf714e8adb4 7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents: 8885
diff changeset
   265
      if (sym == literal_sym) {
1bf714e8adb4 7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents: 8885
diff changeset
   266
        return e->literal_addr();
1bf714e8adb4 7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents: 8885
diff changeset
   267
      }
1bf714e8adb4 7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents: 8885
diff changeset
   268
    }
1bf714e8adb4 7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents: 8885
diff changeset
   269
  }
1bf714e8adb4 7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents: 8885
diff changeset
   270
  return NULL;
1bf714e8adb4 7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents: 8885
diff changeset
   271
}
1bf714e8adb4 7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents: 8885
diff changeset
   272
2332
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   273
// Suggestion: Push unicode-based lookup all the way into the hashing
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   274
// and probing logic, so there is no need for convert_to_utf8 until
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   275
// an actual new Symbol* is created.
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   276
Symbol* SymbolTable::lookup_unicode(const jchar* name, int utf16_length, TRAPS) {
2332
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   277
  int utf8_length = UNICODE::utf8_length((jchar*) name, utf16_length);
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   278
  char stack_buf[128];
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   279
  if (utf8_length < (int) sizeof(stack_buf)) {
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   280
    char* chars = stack_buf;
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   281
    UNICODE::convert_to_utf8(name, utf16_length, chars);
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   282
    return lookup(chars, utf8_length, THREAD);
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   283
  } else {
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   284
    ResourceMark rm(THREAD);
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   285
    char* chars = NEW_RESOURCE_ARRAY(char, utf8_length + 1);;
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   286
    UNICODE::convert_to_utf8(name, utf16_length, chars);
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   287
    return lookup(chars, utf8_length, THREAD);
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   288
  }
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   289
}
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   290
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   291
Symbol* SymbolTable::lookup_only_unicode(const jchar* name, int utf16_length,
2332
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   292
                                           unsigned int& hash) {
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   293
  int utf8_length = UNICODE::utf8_length((jchar*) name, utf16_length);
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   294
  char stack_buf[128];
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   295
  if (utf8_length < (int) sizeof(stack_buf)) {
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   296
    char* chars = stack_buf;
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   297
    UNICODE::convert_to_utf8(name, utf16_length, chars);
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   298
    return lookup_only(chars, utf8_length, hash);
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   299
  } else {
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   300
    ResourceMark rm;
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   301
    char* chars = NEW_RESOURCE_ARRAY(char, utf8_length + 1);;
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   302
    UNICODE::convert_to_utf8(name, utf16_length, chars);
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   303
    return lookup_only(chars, utf8_length, hash);
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   304
  }
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   305
}
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   306
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13199
diff changeset
   307
void SymbolTable::add(ClassLoaderData* loader_data, constantPoolHandle cp,
12263
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   308
                      int names_count,
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   309
                      const char** names, int* lengths, int* cp_indices,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   310
                      unsigned int* hashValues, TRAPS) {
13097
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   311
  // Grab SymbolTable_lock first.
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   312
  MutexLocker ml(SymbolTable_lock, THREAD);
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   313
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   314
  SymbolTable* table = the_table();
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13199
diff changeset
   315
  bool added = table->basic_add(loader_data, cp, names_count, names, lengths,
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   316
                                cp_indices, hashValues, CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   317
  if (!added) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   318
    // do it the hard way
489c9b5090e2 Initial load
duke
parents:
diff changeset
   319
    for (int i=0; i<names_count; i++) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   320
      int index = table->hash_to_index(hashValues[i]);
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13199
diff changeset
   321
      bool c_heap = !loader_data->is_the_null_class_loader_data();
12263
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   322
      Symbol* sym = table->basic_add(index, (u1*)names[i], lengths[i], hashValues[i], c_heap, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   323
      cp->symbol_at_put(cp_indices[i], sym);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   324
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   325
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   326
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   327
12263
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   328
Symbol* SymbolTable::new_permanent_symbol(const char* name, TRAPS) {
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   329
  unsigned int hash;
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   330
  Symbol* result = SymbolTable::lookup_only((char*)name, (int)strlen(name), hash);
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   331
  if (result != NULL) {
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   332
    return result;
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   333
  }
13097
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   334
  // Grab SymbolTable_lock first.
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   335
  MutexLocker ml(SymbolTable_lock, THREAD);
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   336
12263
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   337
  SymbolTable* table = the_table();
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   338
  int index = table->hash_to_index(hash);
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   339
  return table->basic_add(index, (u1*)name, (int)strlen(name), hash, false, THREAD);
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   340
}
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   341
13097
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   342
Symbol* SymbolTable::basic_add(int index_arg, u1 *name, int len,
13087
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   343
                               unsigned int hashValue_arg, bool c_heap, TRAPS) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   344
  assert(!Universe::heap()->is_in_reserved(name) || GC_locker::is_active(),
489c9b5090e2 Initial load
duke
parents:
diff changeset
   345
         "proposed name of symbol must be stable");
489c9b5090e2 Initial load
duke
parents:
diff changeset
   346
13097
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   347
  // Don't allow symbols to be created which cannot fit in a Symbol*.
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   348
  if (len > Symbol::max_length()) {
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   349
    THROW_MSG_0(vmSymbols::java_lang_InternalError(),
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   350
                "name is too long to represent");
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   351
  }
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   352
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   353
  // Cannot hit a safepoint in this function because the "this" pointer can move.
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   354
  No_Safepoint_Verifier nsv;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   355
13087
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   356
  // Check if the symbol table has been rehashed, if so, need to recalculate
13097
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   357
  // the hash value and index.
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   358
  unsigned int hashValue;
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   359
  int index;
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   360
  if (use_alternate_hashcode()) {
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   361
    hashValue = hash_symbol((const char*)name, len);
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   362
    index = hash_to_index(hashValue);
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   363
  } else {
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   364
    hashValue = hashValue_arg;
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   365
    index = index_arg;
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   366
  }
13087
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   367
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   368
  // Since look-up was done lock-free, we need to check if another
489c9b5090e2 Initial load
duke
parents:
diff changeset
   369
  // thread beat us in the race to insert the symbol.
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   370
  Symbol* test = lookup(index, (char*)name, len, hashValue);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   371
  if (test != NULL) {
12263
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   372
    // A race occurred and another thread introduced the symbol.
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   373
    assert(test->refcount() != 0, "lookup should have incremented the count");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   374
    return test;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   375
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   376
12263
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   377
  // Create a new symbol.
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   378
  Symbol* sym = allocate_symbol(name, len, c_heap, CHECK_NULL);
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   379
  assert(sym->equals((char*)name, len), "symbol must be properly initialized");
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   380
13195
be27e1b6a4b9 6995781: Native Memory Tracking (Phase 1)
zgu
parents: 13097
diff changeset
   381
  HashtableEntry<Symbol*, mtSymbol>* entry = new_entry(hashValue, sym);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   382
  add_entry(index, entry);
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   383
  return sym;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   384
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   385
12263
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   386
// This version of basic_add adds symbols in batch from the constant pool
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   387
// parsing.
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13199
diff changeset
   388
bool SymbolTable::basic_add(ClassLoaderData* loader_data, constantPoolHandle cp,
12263
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   389
                            int names_count,
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   390
                            const char** names, int* lengths,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   391
                            int* cp_indices, unsigned int* hashValues,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   392
                            TRAPS) {
12263
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   393
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   394
  // Check symbol names are not too long.  If any are too long, don't add any.
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   395
  for (int i = 0; i< names_count; i++) {
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   396
    if (lengths[i] > Symbol::max_length()) {
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   397
      THROW_MSG_0(vmSymbols::java_lang_InternalError(),
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   398
                  "name is too long to represent");
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   399
    }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   400
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   401
13097
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   402
  // Cannot hit a safepoint in this function because the "this" pointer can move.
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   403
  No_Safepoint_Verifier nsv;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   404
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   405
  for (int i=0; i<names_count; i++) {
13087
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   406
    // Check if the symbol table has been rehashed, if so, need to recalculate
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   407
    // the hash value.
13097
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   408
    unsigned int hashValue;
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   409
    if (use_alternate_hashcode()) {
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   410
      hashValue = hash_symbol(names[i], lengths[i]);
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   411
    } else {
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   412
      hashValue = hashValues[i];
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   413
    }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   414
    // Since look-up was done lock-free, we need to check if another
489c9b5090e2 Initial load
duke
parents:
diff changeset
   415
    // thread beat us in the race to insert the symbol.
13087
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   416
    int index = hash_to_index(hashValue);
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   417
    Symbol* test = lookup(index, names[i], lengths[i], hashValue);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   418
    if (test != NULL) {
2131
98f9cef66a34 6810672: Comment typos
twisti
parents: 1
diff changeset
   419
      // A race occurred and another thread introduced the symbol, this one
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   420
      // will be dropped and collected. Use test instead.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   421
      cp->symbol_at_put(cp_indices[i], test);
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   422
      assert(test->refcount() != 0, "lookup should have incremented the count");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   423
    } else {
12263
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   424
      // Create a new symbol.  The null class loader is never unloaded so these
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   425
      // are allocated specially in a permanent arena.
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13199
diff changeset
   426
      bool c_heap = !loader_data->is_the_null_class_loader_data();
12263
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   427
      Symbol* sym = allocate_symbol((const u1*)names[i], lengths[i], c_heap, CHECK_(false));
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   428
      assert(sym->equals(names[i], lengths[i]), "symbol must be properly initialized");  // why wouldn't it be???
13195
be27e1b6a4b9 6995781: Native Memory Tracking (Phase 1)
zgu
parents: 13097
diff changeset
   429
      HashtableEntry<Symbol*, mtSymbol>* entry = new_entry(hashValue, sym);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   430
      add_entry(index, entry);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   431
      cp->symbol_at_put(cp_indices[i], sym);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   432
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   433
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   434
  return true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   435
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   436
489c9b5090e2 Initial load
duke
parents:
diff changeset
   437
489c9b5090e2 Initial load
duke
parents:
diff changeset
   438
void SymbolTable::verify() {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   439
  for (int i = 0; i < the_table()->table_size(); ++i) {
13195
be27e1b6a4b9 6995781: Native Memory Tracking (Phase 1)
zgu
parents: 13097
diff changeset
   440
    HashtableEntry<Symbol*, mtSymbol>* p = the_table()->bucket(i);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   441
    for ( ; p != NULL; p = p->next()) {
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   442
      Symbol* s = (Symbol*)(p->literal());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   443
      guarantee(s != NULL, "symbol is NULL");
489c9b5090e2 Initial load
duke
parents:
diff changeset
   444
      unsigned int h = hash_symbol((char*)s->bytes(), s->utf8_length());
489c9b5090e2 Initial load
duke
parents:
diff changeset
   445
      guarantee(p->hash() == h, "broken hash in symbol table entry");
489c9b5090e2 Initial load
duke
parents:
diff changeset
   446
      guarantee(the_table()->hash_to_index(h) == i,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   447
                "wrong index in symbol table");
489c9b5090e2 Initial load
duke
parents:
diff changeset
   448
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   449
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   450
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   451
13087
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   452
void SymbolTable::dump(outputStream* st) {
17610
c6857feaac47 8014262: PrintStringTableStatistics should include more footprint info
iklam
parents: 17081
diff changeset
   453
  the_table()->dump_table(st, "SymbolTable");
13087
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   454
}
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   455
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   456
489c9b5090e2 Initial load
duke
parents:
diff changeset
   457
//---------------------------------------------------------------------------
489c9b5090e2 Initial load
duke
parents:
diff changeset
   458
// Non-product code
489c9b5090e2 Initial load
duke
parents:
diff changeset
   459
489c9b5090e2 Initial load
duke
parents:
diff changeset
   460
#ifndef PRODUCT
489c9b5090e2 Initial load
duke
parents:
diff changeset
   461
489c9b5090e2 Initial load
duke
parents:
diff changeset
   462
void SymbolTable::print_histogram() {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   463
  MutexLocker ml(SymbolTable_lock);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   464
  const int results_length = 100;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   465
  int results[results_length];
489c9b5090e2 Initial load
duke
parents:
diff changeset
   466
  int i,j;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   467
489c9b5090e2 Initial load
duke
parents:
diff changeset
   468
  // initialize results to zero
489c9b5090e2 Initial load
duke
parents:
diff changeset
   469
  for (j = 0; j < results_length; j++) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   470
    results[j] = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   471
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   472
489c9b5090e2 Initial load
duke
parents:
diff changeset
   473
  int total = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   474
  int max_symbols = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   475
  int out_of_range = 0;
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   476
  int memory_total = 0;
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   477
  int count = 0;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   478
  for (i = 0; i < the_table()->table_size(); i++) {
13195
be27e1b6a4b9 6995781: Native Memory Tracking (Phase 1)
zgu
parents: 13097
diff changeset
   479
    HashtableEntry<Symbol*, mtSymbol>* p = the_table()->bucket(i);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   480
    for ( ; p != NULL; p = p->next()) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13199
diff changeset
   481
      memory_total += p->literal()->size();
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   482
      count++;
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   483
      int counter = p->literal()->utf8_length();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   484
      total += counter;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   485
      if (counter < results_length) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   486
        results[counter]++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   487
      } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   488
        out_of_range++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   489
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   490
      max_symbols = MAX2(max_symbols, counter);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   491
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   492
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   493
  tty->print_cr("Symbol Table:");
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   494
  tty->print_cr("Total number of symbols  %5d", count);
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   495
  tty->print_cr("Total size in memory     %5dK",
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   496
          (memory_total*HeapWordSize)/1024);
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   497
  tty->print_cr("Total counted            %5d", symbols_counted);
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   498
  tty->print_cr("Total removed            %5d", symbols_removed);
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   499
  if (symbols_counted > 0) {
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   500
    tty->print_cr("Percent removed          %3.2f",
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   501
          ((float)symbols_removed/(float)symbols_counted)* 100);
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   502
  }
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   503
  tty->print_cr("Reference counts         %5d", Symbol::_total_count);
12263
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   504
  tty->print_cr("Symbol arena size        %5d used %5d",
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   505
                 arena()->size_in_bytes(), arena()->used());
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   506
  tty->print_cr("Histogram of symbol length:");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   507
  tty->print_cr("%8s %5d", "Total  ", total);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   508
  tty->print_cr("%8s %5d", "Maximum", max_symbols);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   509
  tty->print_cr("%8s %3.2f", "Average",
489c9b5090e2 Initial load
duke
parents:
diff changeset
   510
          ((float) total / (float) the_table()->table_size()));
489c9b5090e2 Initial load
duke
parents:
diff changeset
   511
  tty->print_cr("%s", "Histogram:");
489c9b5090e2 Initial load
duke
parents:
diff changeset
   512
  tty->print_cr(" %s %29s", "Length", "Number chains that length");
489c9b5090e2 Initial load
duke
parents:
diff changeset
   513
  for (i = 0; i < results_length; i++) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   514
    if (results[i] > 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   515
      tty->print_cr("%6d %10d", i, results[i]);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   516
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   517
  }
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   518
  if (Verbose) {
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   519
    int line_length = 70;
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   520
    tty->print_cr("%s %30s", " Length", "Number chains that length");
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   521
    for (i = 0; i < results_length; i++) {
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   522
      if (results[i] > 0) {
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   523
        tty->print("%4d", i);
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   524
        for (j = 0; (j < results[i]) && (j < line_length);  j++) {
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   525
          tty->print("%1s", "*");
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   526
        }
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   527
        if (j == line_length) {
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   528
          tty->print("%1s", "+");
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   529
        }
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   530
        tty->cr();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   531
      }
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   532
    }
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   533
  }
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   534
  tty->print_cr(" %s %d: %d\n", "Number chains longer than",
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   535
                    results_length, out_of_range);
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   536
}
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   537
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   538
void SymbolTable::print() {
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   539
  for (int i = 0; i < the_table()->table_size(); ++i) {
13195
be27e1b6a4b9 6995781: Native Memory Tracking (Phase 1)
zgu
parents: 13097
diff changeset
   540
    HashtableEntry<Symbol*, mtSymbol>** p = the_table()->bucket_addr(i);
be27e1b6a4b9 6995781: Native Memory Tracking (Phase 1)
zgu
parents: 13097
diff changeset
   541
    HashtableEntry<Symbol*, mtSymbol>* entry = the_table()->bucket(i);
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   542
    if (entry != NULL) {
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   543
      while (entry != NULL) {
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   544
        tty->print(PTR_FORMAT " ", entry->literal());
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   545
        entry->literal()->print();
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   546
        tty->print(" %d", entry->literal()->refcount());
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   547
        p = entry->next_addr();
13195
be27e1b6a4b9 6995781: Native Memory Tracking (Phase 1)
zgu
parents: 13097
diff changeset
   548
        entry = (HashtableEntry<Symbol*, mtSymbol>*)HashtableEntry<Symbol*, mtSymbol>::make_ptr(*p);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   549
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   550
      tty->cr();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   551
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   552
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   553
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   554
#endif // PRODUCT
489c9b5090e2 Initial load
duke
parents:
diff changeset
   555
489c9b5090e2 Initial load
duke
parents:
diff changeset
   556
// --------------------------------------------------------------------------
489c9b5090e2 Initial load
duke
parents:
diff changeset
   557
489c9b5090e2 Initial load
duke
parents:
diff changeset
   558
#ifdef ASSERT
489c9b5090e2 Initial load
duke
parents:
diff changeset
   559
class StableMemoryChecker : public StackObj {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   560
  enum { _bufsize = wordSize*4 };
489c9b5090e2 Initial load
duke
parents:
diff changeset
   561
489c9b5090e2 Initial load
duke
parents:
diff changeset
   562
  address _region;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   563
  jint    _size;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   564
  u1      _save_buf[_bufsize];
489c9b5090e2 Initial load
duke
parents:
diff changeset
   565
489c9b5090e2 Initial load
duke
parents:
diff changeset
   566
  int sample(u1* save_buf) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   567
    if (_size <= _bufsize) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   568
      memcpy(save_buf, _region, _size);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   569
      return _size;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   570
    } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   571
      // copy head and tail
489c9b5090e2 Initial load
duke
parents:
diff changeset
   572
      memcpy(&save_buf[0],          _region,                      _bufsize/2);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   573
      memcpy(&save_buf[_bufsize/2], _region + _size - _bufsize/2, _bufsize/2);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   574
      return (_bufsize/2)*2;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   575
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   576
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   577
489c9b5090e2 Initial load
duke
parents:
diff changeset
   578
 public:
489c9b5090e2 Initial load
duke
parents:
diff changeset
   579
  StableMemoryChecker(const void* region, jint size) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   580
    _region = (address) region;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   581
    _size   = size;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   582
    sample(_save_buf);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   583
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   584
489c9b5090e2 Initial load
duke
parents:
diff changeset
   585
  bool verify() {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   586
    u1 check_buf[sizeof(_save_buf)];
489c9b5090e2 Initial load
duke
parents:
diff changeset
   587
    int check_size = sample(check_buf);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   588
    return (0 == memcmp(_save_buf, check_buf, check_size));
489c9b5090e2 Initial load
duke
parents:
diff changeset
   589
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   590
489c9b5090e2 Initial load
duke
parents:
diff changeset
   591
  void set_region(const void* region) { _region = (address) region; }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   592
};
489c9b5090e2 Initial load
duke
parents:
diff changeset
   593
#endif
489c9b5090e2 Initial load
duke
parents:
diff changeset
   594
489c9b5090e2 Initial load
duke
parents:
diff changeset
   595
489c9b5090e2 Initial load
duke
parents:
diff changeset
   596
// --------------------------------------------------------------------------
489c9b5090e2 Initial load
duke
parents:
diff changeset
   597
StringTable* StringTable::_the_table = NULL;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   598
13087
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   599
bool StringTable::_needs_rehashing = false;
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   600
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   601
// Pick hashing algorithm
13097
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   602
unsigned int StringTable::hash_string(const jchar* s, int len) {
13087
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   603
  return use_alternate_hashcode() ? AltHashing::murmur3_32(seed(), s, len) :
14742
b2a47eb99404 8004661: Comment and function name java_lang_String::toHash is wrong
brutisso
parents: 13728
diff changeset
   604
                                    java_lang_String::hash_code(s, len);
13087
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   605
}
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   606
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   607
oop StringTable::lookup(int index, jchar* name,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   608
                        int len, unsigned int hash) {
13087
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   609
  int count = 0;
13195
be27e1b6a4b9 6995781: Native Memory Tracking (Phase 1)
zgu
parents: 13097
diff changeset
   610
  for (HashtableEntry<oop, mtSymbol>* l = bucket(index); l != NULL; l = l->next()) {
13087
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   611
    count++;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   612
    if (l->hash() == hash) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   613
      if (java_lang_String::equals(l->literal(), name, len)) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   614
        return l->literal();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   615
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   616
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   617
  }
13087
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   618
  // If the bucket size is too deep check if this hash code is insufficient.
13195
be27e1b6a4b9 6995781: Native Memory Tracking (Phase 1)
zgu
parents: 13097
diff changeset
   619
  if (count >= BasicHashtable<mtSymbol>::rehash_count && !needs_rehashing()) {
13087
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   620
    _needs_rehashing = check_rehash_table(count);
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   621
  }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   622
  return NULL;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   623
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   624
489c9b5090e2 Initial load
duke
parents:
diff changeset
   625
13097
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   626
oop StringTable::basic_add(int index_arg, Handle string, jchar* name,
13087
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   627
                           int len, unsigned int hashValue_arg, TRAPS) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   628
489c9b5090e2 Initial load
duke
parents:
diff changeset
   629
  assert(java_lang_String::equals(string(), name, len),
489c9b5090e2 Initial load
duke
parents:
diff changeset
   630
         "string must be properly initialized");
13097
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   631
  // Cannot hit a safepoint in this function because the "this" pointer can move.
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   632
  No_Safepoint_Verifier nsv;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   633
13087
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   634
  // Check if the symbol table has been rehashed, if so, need to recalculate
13097
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   635
  // the hash value and index before second lookup.
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   636
  unsigned int hashValue;
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   637
  int index;
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   638
  if (use_alternate_hashcode()) {
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   639
    hashValue = hash_string(name, len);
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   640
    index = hash_to_index(hashValue);
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   641
  } else {
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   642
    hashValue = hashValue_arg;
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   643
    index = index_arg;
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   644
  }
13087
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   645
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   646
  // Since look-up was done lock-free, we need to check if another
489c9b5090e2 Initial load
duke
parents:
diff changeset
   647
  // thread beat us in the race to insert the symbol.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   648
489c9b5090e2 Initial load
duke
parents:
diff changeset
   649
  oop test = lookup(index, name, len, hashValue); // calls lookup(u1*, int)
489c9b5090e2 Initial load
duke
parents:
diff changeset
   650
  if (test != NULL) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   651
    // Entry already added
489c9b5090e2 Initial load
duke
parents:
diff changeset
   652
    return test;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   653
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   654
13195
be27e1b6a4b9 6995781: Native Memory Tracking (Phase 1)
zgu
parents: 13097
diff changeset
   655
  HashtableEntry<oop, mtSymbol>* entry = new_entry(hashValue, string());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   656
  add_entry(index, entry);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   657
  return string();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   658
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   659
489c9b5090e2 Initial load
duke
parents:
diff changeset
   660
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   661
oop StringTable::lookup(Symbol* symbol) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   662
  ResourceMark rm;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   663
  int length;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   664
  jchar* chars = symbol->as_unicode(length);
16601
7c6db0c8952f 8009763: Add WB test for String.intern()
mgerdin
parents: 15934
diff changeset
   665
  return lookup(chars, length);
7c6db0c8952f 8009763: Add WB test for String.intern()
mgerdin
parents: 15934
diff changeset
   666
}
7c6db0c8952f 8009763: Add WB test for String.intern()
mgerdin
parents: 15934
diff changeset
   667
7c6db0c8952f 8009763: Add WB test for String.intern()
mgerdin
parents: 15934
diff changeset
   668
7c6db0c8952f 8009763: Add WB test for String.intern()
mgerdin
parents: 15934
diff changeset
   669
oop StringTable::lookup(jchar* name, int len) {
7c6db0c8952f 8009763: Add WB test for String.intern()
mgerdin
parents: 15934
diff changeset
   670
  unsigned int hash = hash_string(name, len);
7c6db0c8952f 8009763: Add WB test for String.intern()
mgerdin
parents: 15934
diff changeset
   671
  int index = the_table()->hash_to_index(hash);
7c6db0c8952f 8009763: Add WB test for String.intern()
mgerdin
parents: 15934
diff changeset
   672
  return the_table()->lookup(index, name, len, hash);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   673
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   674
489c9b5090e2 Initial load
duke
parents:
diff changeset
   675
489c9b5090e2 Initial load
duke
parents:
diff changeset
   676
oop StringTable::intern(Handle string_or_null, jchar* name,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   677
                        int len, TRAPS) {
13087
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   678
  unsigned int hashValue = hash_string(name, len);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   679
  int index = the_table()->hash_to_index(hashValue);
13097
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   680
  oop found_string = the_table()->lookup(index, name, len, hashValue);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   681
489c9b5090e2 Initial load
duke
parents:
diff changeset
   682
  // Found
13097
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   683
  if (found_string != NULL) return found_string;
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   684
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   685
  debug_only(StableMemoryChecker smc(name, len * sizeof(name[0])));
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   686
  assert(!Universe::heap()->is_in_reserved(name) || GC_locker::is_active(),
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   687
         "proposed name of symbol must be stable");
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   688
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   689
  Handle string;
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   690
  // try to reuse the string if possible
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13199
diff changeset
   691
  if (!string_or_null.is_null()) {
13097
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   692
    string = string_or_null;
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   693
  } else {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13199
diff changeset
   694
    string = java_lang_String::create_from_unicode(name, len, CHECK_NULL);
13097
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   695
  }
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   696
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   697
  // Grab the StringTable_lock before getting the_table() because it could
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   698
  // change at safepoint.
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   699
  MutexLocker ml(StringTable_lock, THREAD);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   700
489c9b5090e2 Initial load
duke
parents:
diff changeset
   701
  // Otherwise, add to symbol to table
13097
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   702
  return the_table()->basic_add(index, string, name, len,
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   703
                                hashValue, CHECK_NULL);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   704
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   705
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   706
oop StringTable::intern(Symbol* symbol, TRAPS) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   707
  if (symbol == NULL) return NULL;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   708
  ResourceMark rm(THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   709
  int length;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   710
  jchar* chars = symbol->as_unicode(length);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   711
  Handle string;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   712
  oop result = intern(string, chars, length, CHECK_NULL);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   713
  return result;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   714
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   715
489c9b5090e2 Initial load
duke
parents:
diff changeset
   716
489c9b5090e2 Initial load
duke
parents:
diff changeset
   717
oop StringTable::intern(oop string, TRAPS)
489c9b5090e2 Initial load
duke
parents:
diff changeset
   718
{
489c9b5090e2 Initial load
duke
parents:
diff changeset
   719
  if (string == NULL) return NULL;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   720
  ResourceMark rm(THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   721
  int length;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   722
  Handle h_string (THREAD, string);
17081
cf52c2bc3f8c 8011773: Some tests on Interned String crashed JVM with OOM
hseigel
parents: 16601
diff changeset
   723
  jchar* chars = java_lang_String::as_unicode_string(string, length, CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   724
  oop result = intern(h_string, chars, length, CHECK_NULL);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   725
  return result;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   726
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   727
489c9b5090e2 Initial load
duke
parents:
diff changeset
   728
489c9b5090e2 Initial load
duke
parents:
diff changeset
   729
oop StringTable::intern(const char* utf8_string, TRAPS) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   730
  if (utf8_string == NULL) return NULL;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   731
  ResourceMark rm(THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   732
  int length = UTF8::unicode_length(utf8_string);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   733
  jchar* chars = NEW_RESOURCE_ARRAY(jchar, length);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   734
  UTF8::convert_to_unicode(utf8_string, chars, length);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   735
  Handle string;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   736
  oop result = intern(string, chars, length, CHECK_NULL);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   737
  return result;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   738
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   739
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   740
void StringTable::unlink(BoolObjectClosure* is_alive) {
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   741
  // Readers of the table are unlocked, so we should only be removing
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   742
  // entries at a safepoint.
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   743
  assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint");
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   744
  for (int i = 0; i < the_table()->table_size(); ++i) {
13195
be27e1b6a4b9 6995781: Native Memory Tracking (Phase 1)
zgu
parents: 13097
diff changeset
   745
    HashtableEntry<oop, mtSymbol>** p = the_table()->bucket_addr(i);
be27e1b6a4b9 6995781: Native Memory Tracking (Phase 1)
zgu
parents: 13097
diff changeset
   746
    HashtableEntry<oop, mtSymbol>* entry = the_table()->bucket(i);
13097
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   747
    while (entry != NULL) {
17845
246c16282ae8 8015428: Remove unused CDS support from StringTable
stefank
parents: 17610
diff changeset
   748
      assert(!entry->is_shared(), "CDS not used for the StringTable");
246c16282ae8 8015428: Remove unused CDS support from StringTable
stefank
parents: 17610
diff changeset
   749
246c16282ae8 8015428: Remove unused CDS support from StringTable
stefank
parents: 17610
diff changeset
   750
      if (is_alive->do_object_b(entry->literal())) {
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   751
        p = entry->next_addr();
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   752
      } else {
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   753
        *p = entry->next();
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   754
        the_table()->free_entry(entry);
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   755
      }
17845
246c16282ae8 8015428: Remove unused CDS support from StringTable
stefank
parents: 17610
diff changeset
   756
      entry = *p;
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   757
    }
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   758
  }
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   759
}
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   760
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   761
void StringTable::oops_do(OopClosure* f) {
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   762
  for (int i = 0; i < the_table()->table_size(); ++i) {
13195
be27e1b6a4b9 6995781: Native Memory Tracking (Phase 1)
zgu
parents: 13097
diff changeset
   763
    HashtableEntry<oop, mtSymbol>* entry = the_table()->bucket(i);
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   764
    while (entry != NULL) {
17845
246c16282ae8 8015428: Remove unused CDS support from StringTable
stefank
parents: 17610
diff changeset
   765
      assert(!entry->is_shared(), "CDS not used for the StringTable");
246c16282ae8 8015428: Remove unused CDS support from StringTable
stefank
parents: 17610
diff changeset
   766
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   767
      f->do_oop((oop*)entry->literal_addr());
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   768
17845
246c16282ae8 8015428: Remove unused CDS support from StringTable
stefank
parents: 17610
diff changeset
   769
      entry = entry->next();
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   770
    }
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   771
  }
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   772
}
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   773
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   774
void StringTable::verify() {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   775
  for (int i = 0; i < the_table()->table_size(); ++i) {
13195
be27e1b6a4b9 6995781: Native Memory Tracking (Phase 1)
zgu
parents: 13097
diff changeset
   776
    HashtableEntry<oop, mtSymbol>* p = the_table()->bucket(i);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   777
    for ( ; p != NULL; p = p->next()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   778
      oop s = p->literal();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   779
      guarantee(s != NULL, "interned string is NULL");
8885
eed0ba1d011b 7032129: Native memory usage grow unexpectedly for vm/oom/*InternedString tests
never
parents: 8728
diff changeset
   780
      unsigned int h = java_lang_String::hash_string(s);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   781
      guarantee(p->hash() == h, "broken hash in string table entry");
489c9b5090e2 Initial load
duke
parents:
diff changeset
   782
      guarantee(the_table()->hash_to_index(h) == i,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   783
                "wrong index in string table");
489c9b5090e2 Initial load
duke
parents:
diff changeset
   784
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   785
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   786
}
13087
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   787
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   788
void StringTable::dump(outputStream* st) {
17610
c6857feaac47 8014262: PrintStringTableStatistics should include more footprint info
iklam
parents: 17081
diff changeset
   789
  the_table()->dump_table(st, "StringTable");
13087
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   790
}
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   791
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   792
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   793
// Create a new table and using alternate hash code, populate the new table
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   794
// with the existing strings.   Set flag to use the alternate hash code afterwards.
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   795
void StringTable::rehash_table() {
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   796
  assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint");
13097
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   797
  // This should never happen with -Xshare:dump but it might in testing mode.
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   798
  if (DumpSharedSpaces) return;
13087
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   799
  StringTable* new_table = new StringTable();
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   800
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   801
  // Rehash the table
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   802
  the_table()->move_to(new_table);
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   803
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   804
  // Delete the table and buckets (entries are reused in new table).
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   805
  delete _the_table;
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   806
  // Don't check if we need rehashing until the table gets unbalanced again.
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   807
  // Then rehash with a new global seed.
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   808
  _needs_rehashing = false;
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   809
  _the_table = new_table;
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   810
}