hotspot/src/share/vm/classfile/symbolTable.cpp
author coleenp
Sat, 30 Jan 2016 11:02:29 -0500
changeset 35898 ddc274f0052f
parent 35497 94c7c07d0161
child 37198 b96542d1afa1
permissions -rw-r--r--
8145628: hotspot metadata classes shouldn't use HeapWordSize or heap related macros like align_object_size Summary: Use align_metadata_size, align_metadata_offset and is_metadata_aligned for metadata rather than align_object_size, etc. Use wordSize rather than HeapWordSize for metadata. Use align_ptr_up rather than align_pointer_up (all the related functions are ptr). Reviewed-by: hseigel, jmasa, cjplummer
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
     1
/*
35497
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
     2
 * Copyright (c) 1997, 2016, 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"
34659
3a7071043457 8143615: compactHashtable.hpp includes .inline.hpp file
iklam
parents: 34237
diff changeset
    27
#include "classfile/compactHashtable.inline.hpp"
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    28
#include "classfile/javaClasses.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    29
#include "classfile/symbolTable.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    30
#include "classfile/systemDictionary.hpp"
30764
fec48bf5a827 8079792: GC directory structure cleanup
pliden
parents: 29081
diff changeset
    31
#include "gc/shared/collectedHeap.inline.hpp"
fec48bf5a827 8079792: GC directory structure cleanup
pliden
parents: 29081
diff changeset
    32
#include "gc/shared/gcLocker.inline.hpp"
12263
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
    33
#include "memory/allocation.inline.hpp"
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    34
#include "memory/filemap.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    35
#include "oops/oop.inline.hpp"
25351
7c198a690050 8044775: Improve usage of umbrella header atomic.inline.hpp.
goetz
parents: 24429
diff changeset
    36
#include "runtime/atomic.inline.hpp"
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    37
#include "runtime/mutexLocker.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    38
#include "utilities/hashtable.inline.hpp"
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
    39
489c9b5090e2 Initial load
duke
parents:
diff changeset
    40
// --------------------------------------------------------------------------
22545
b93a7f0e9b9d 8027476: Improve performance of Stringtable unlink
tschatzl
parents: 20283
diff changeset
    41
// the number of buckets a thread claims
b93a7f0e9b9d 8027476: Improve performance of Stringtable unlink
tschatzl
parents: 20283
diff changeset
    42
const int ClaimChunkSize = 32;
b93a7f0e9b9d 8027476: Improve performance of Stringtable unlink
tschatzl
parents: 20283
diff changeset
    43
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
    44
SymbolTable* SymbolTable::_the_table = NULL;
12263
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
    45
// 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
    46
Arena* SymbolTable::_arena = NULL;
13087
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
    47
bool SymbolTable::_needs_rehashing = false;
28363
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
    48
bool SymbolTable::_lookup_shared_first = false;
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
    49
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
    50
CompactHashtable<Symbol*, char> SymbolTable::_shared_table;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
    51
12263
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
    52
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
    53
  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
    54
12263
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
    55
  Symbol* sym;
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13199
diff changeset
    56
15934
104ff83451f1 8009829: CDS: JDK JPRT test fails crash in Symbol::equals()
coleenp
parents: 14742
diff changeset
    57
  if (DumpSharedSpaces) {
104ff83451f1 8009829: CDS: JDK JPRT test fails crash in Symbol::equals()
coleenp
parents: 14742
diff changeset
    58
    // Allocate all symbols to CLD shared metaspace
31790
4a08476437e8 8025692: Log what methods are touched at run-time
minqi
parents: 31345
diff changeset
    59
    sym = new (len, ClassLoaderData::the_null_class_loader_data(), THREAD) Symbol(name, len, PERM_REFCOUNT);
15934
104ff83451f1 8009829: CDS: JDK JPRT test fails crash in Symbol::equals()
coleenp
parents: 14742
diff changeset
    60
  } else if (c_heap) {
12263
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
    61
    // refcount starts as 1
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
    62
    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
    63
    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
    64
  } else {
15934
104ff83451f1 8009829: CDS: JDK JPRT test fails crash in Symbol::equals()
coleenp
parents: 14742
diff changeset
    65
    // Allocate to global arena
31790
4a08476437e8 8025692: Log what methods are touched at run-time
minqi
parents: 31345
diff changeset
    66
    sym = new (len, arena(), THREAD) Symbol(name, len, PERM_REFCOUNT);
12263
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
    67
  }
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
    68
  return sym;
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
    69
}
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
    70
12263
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
    71
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
    72
  // 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
    73
  if (arena_alloc_size == 0) {
25946
1572c9f03fb9 8046598: Scalable Native memory tracking development
zgu
parents: 25351
diff changeset
    74
    _arena = new (mtSymbol) Arena(mtSymbol);
12263
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
    75
  } else {
25946
1572c9f03fb9 8046598: Scalable Native memory tracking development
zgu
parents: 25351
diff changeset
    76
    _arena = new (mtSymbol) Arena(mtSymbol, arena_alloc_size);
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
    77
  }
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
    78
}
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
    79
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
    80
// 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
    81
void SymbolTable::symbols_do(SymbolClosure *cl) {
28615
1fb960ea5a7e 8067982: Some jcmd /gc/heap_dump tests failed: hprof output contains warning or error.
jiangli
parents: 28363
diff changeset
    82
  // all symbols from shared table
1fb960ea5a7e 8067982: Some jcmd /gc/heap_dump tests failed: hprof output contains warning or error.
jiangli
parents: 28363
diff changeset
    83
  _shared_table.symbols_do(cl);
1fb960ea5a7e 8067982: Some jcmd /gc/heap_dump tests failed: hprof output contains warning or error.
jiangli
parents: 28363
diff changeset
    84
1fb960ea5a7e 8067982: Some jcmd /gc/heap_dump tests failed: hprof output contains warning or error.
jiangli
parents: 28363
diff changeset
    85
  // all symbols from the dynamic table
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
    86
  const int n = the_table()->table_size();
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
    87
  for (int i = 0; i < n; i++) {
13195
be27e1b6a4b9 6995781: Native Memory Tracking (Phase 1)
zgu
parents: 13097
diff changeset
    88
    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
    89
         p != NULL;
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
    90
         p = p->next()) {
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
    91
      cl->do_symbol(p->literal_addr());
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
    92
    }
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
    93
  }
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
    94
}
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
    95
22545
b93a7f0e9b9d 8027476: Improve performance of Stringtable unlink
tschatzl
parents: 20283
diff changeset
    96
int SymbolTable::_symbols_removed = 0;
b93a7f0e9b9d 8027476: Improve performance of Stringtable unlink
tschatzl
parents: 20283
diff changeset
    97
int SymbolTable::_symbols_counted = 0;
b93a7f0e9b9d 8027476: Improve performance of Stringtable unlink
tschatzl
parents: 20283
diff changeset
    98
volatile int SymbolTable::_parallel_claimed_idx = 0;
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
    99
34237
c34adffc35c0 8143255: Remove debug logging from SymbolTable::unlink() and SymbolTable::possibly_parallel_unlink()
brutisso
parents: 33638
diff changeset
   100
void SymbolTable::buckets_unlink(int start_idx, int end_idx, int* processed, int* removed) {
22545
b93a7f0e9b9d 8027476: Improve performance of Stringtable unlink
tschatzl
parents: 20283
diff changeset
   101
  for (int i = start_idx; i < end_idx; ++i) {
13195
be27e1b6a4b9 6995781: Native Memory Tracking (Phase 1)
zgu
parents: 13097
diff changeset
   102
    HashtableEntry<Symbol*, mtSymbol>** p = the_table()->bucket_addr(i);
be27e1b6a4b9 6995781: Native Memory Tracking (Phase 1)
zgu
parents: 13097
diff changeset
   103
    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
   104
    while (entry != NULL) {
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   105
      // 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
   106
      // 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
   107
      // 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
   108
      // end of the bucket.
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   109
      if (entry->is_shared() && !use_alternate_hashcode()) {
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   110
        break;
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   111
      }
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   112
      Symbol* s = entry->literal();
22545
b93a7f0e9b9d 8027476: Improve performance of Stringtable unlink
tschatzl
parents: 20283
diff changeset
   113
      (*processed)++;
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   114
      assert(s != NULL, "just checking");
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   115
      // If reference count is zero, remove.
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   116
      if (s->refcount() == 0) {
13097
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   117
        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
   118
        delete s;
22545
b93a7f0e9b9d 8027476: Improve performance of Stringtable unlink
tschatzl
parents: 20283
diff changeset
   119
        (*removed)++;
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   120
        *p = entry->next();
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   121
        the_table()->free_entry(entry);
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   122
      } else {
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   123
        p = entry->next_addr();
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   124
      }
13097
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   125
      // get next entry
13195
be27e1b6a4b9 6995781: Native Memory Tracking (Phase 1)
zgu
parents: 13097
diff changeset
   126
      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
   127
    }
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   128
  }
22545
b93a7f0e9b9d 8027476: Improve performance of Stringtable unlink
tschatzl
parents: 20283
diff changeset
   129
}
b93a7f0e9b9d 8027476: Improve performance of Stringtable unlink
tschatzl
parents: 20283
diff changeset
   130
b93a7f0e9b9d 8027476: Improve performance of Stringtable unlink
tschatzl
parents: 20283
diff changeset
   131
// Remove unreferenced symbols from the symbol table
b93a7f0e9b9d 8027476: Improve performance of Stringtable unlink
tschatzl
parents: 20283
diff changeset
   132
// This is done late during GC.
b93a7f0e9b9d 8027476: Improve performance of Stringtable unlink
tschatzl
parents: 20283
diff changeset
   133
void SymbolTable::unlink(int* processed, int* removed) {
b93a7f0e9b9d 8027476: Improve performance of Stringtable unlink
tschatzl
parents: 20283
diff changeset
   134
  size_t memory_total = 0;
34237
c34adffc35c0 8143255: Remove debug logging from SymbolTable::unlink() and SymbolTable::possibly_parallel_unlink()
brutisso
parents: 33638
diff changeset
   135
  buckets_unlink(0, the_table()->table_size(), processed, removed);
22545
b93a7f0e9b9d 8027476: Improve performance of Stringtable unlink
tschatzl
parents: 20283
diff changeset
   136
  _symbols_removed += *removed;
b93a7f0e9b9d 8027476: Improve performance of Stringtable unlink
tschatzl
parents: 20283
diff changeset
   137
  _symbols_counted += *processed;
b93a7f0e9b9d 8027476: Improve performance of Stringtable unlink
tschatzl
parents: 20283
diff changeset
   138
}
b93a7f0e9b9d 8027476: Improve performance of Stringtable unlink
tschatzl
parents: 20283
diff changeset
   139
b93a7f0e9b9d 8027476: Improve performance of Stringtable unlink
tschatzl
parents: 20283
diff changeset
   140
void SymbolTable::possibly_parallel_unlink(int* processed, int* removed) {
b93a7f0e9b9d 8027476: Improve performance of Stringtable unlink
tschatzl
parents: 20283
diff changeset
   141
  const int limit = the_table()->table_size();
b93a7f0e9b9d 8027476: Improve performance of Stringtable unlink
tschatzl
parents: 20283
diff changeset
   142
b93a7f0e9b9d 8027476: Improve performance of Stringtable unlink
tschatzl
parents: 20283
diff changeset
   143
  size_t memory_total = 0;
b93a7f0e9b9d 8027476: Improve performance of Stringtable unlink
tschatzl
parents: 20283
diff changeset
   144
b93a7f0e9b9d 8027476: Improve performance of Stringtable unlink
tschatzl
parents: 20283
diff changeset
   145
  for (;;) {
b93a7f0e9b9d 8027476: Improve performance of Stringtable unlink
tschatzl
parents: 20283
diff changeset
   146
    // Grab next set of buckets to scan
b93a7f0e9b9d 8027476: Improve performance of Stringtable unlink
tschatzl
parents: 20283
diff changeset
   147
    int start_idx = Atomic::add(ClaimChunkSize, &_parallel_claimed_idx) - ClaimChunkSize;
b93a7f0e9b9d 8027476: Improve performance of Stringtable unlink
tschatzl
parents: 20283
diff changeset
   148
    if (start_idx >= limit) {
b93a7f0e9b9d 8027476: Improve performance of Stringtable unlink
tschatzl
parents: 20283
diff changeset
   149
      // End of table
b93a7f0e9b9d 8027476: Improve performance of Stringtable unlink
tschatzl
parents: 20283
diff changeset
   150
      break;
b93a7f0e9b9d 8027476: Improve performance of Stringtable unlink
tschatzl
parents: 20283
diff changeset
   151
    }
b93a7f0e9b9d 8027476: Improve performance of Stringtable unlink
tschatzl
parents: 20283
diff changeset
   152
b93a7f0e9b9d 8027476: Improve performance of Stringtable unlink
tschatzl
parents: 20283
diff changeset
   153
    int end_idx = MIN2(limit, start_idx + ClaimChunkSize);
34237
c34adffc35c0 8143255: Remove debug logging from SymbolTable::unlink() and SymbolTable::possibly_parallel_unlink()
brutisso
parents: 33638
diff changeset
   154
    buckets_unlink(start_idx, end_idx, processed, removed);
22545
b93a7f0e9b9d 8027476: Improve performance of Stringtable unlink
tschatzl
parents: 20283
diff changeset
   155
  }
b93a7f0e9b9d 8027476: Improve performance of Stringtable unlink
tschatzl
parents: 20283
diff changeset
   156
  Atomic::add(*processed, &_symbols_counted);
b93a7f0e9b9d 8027476: Improve performance of Stringtable unlink
tschatzl
parents: 20283
diff changeset
   157
  Atomic::add(*removed, &_symbols_removed);
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   158
}
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   159
13087
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   160
// 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
   161
// 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
   162
void SymbolTable::rehash_table() {
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   163
  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
   164
  // 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
   165
  if (DumpSharedSpaces) return;
13087
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   166
  // Create a new symbol table
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   167
  SymbolTable* new_table = new SymbolTable();
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   168
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   169
  the_table()->move_to(new_table);
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   170
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   171
  // Delete the table and buckets (entries are reused in new table).
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   172
  delete _the_table;
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   173
  // 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
   174
  // Then rehash with a new global seed.
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   175
  _needs_rehashing = false;
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   176
  _the_table = new_table;
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   177
}
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   178
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   179
// Lookup a symbol in a bucket.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   180
28363
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   181
Symbol* SymbolTable::lookup_dynamic(int index, const char* name,
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   182
                                    int len, unsigned int hash) {
13087
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   183
  int count = 0;
13195
be27e1b6a4b9 6995781: Native Memory Tracking (Phase 1)
zgu
parents: 13097
diff changeset
   184
  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
   185
    count++;  // count all entries in this bucket, not just ones with same hash
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   186
    if (e->hash() == hash) {
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   187
      Symbol* sym = e->literal();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   188
      if (sym->equals(name, len)) {
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   189
        // something is referencing this symbol now.
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   190
        sym->increment_refcount();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   191
        return sym;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   192
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   193
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   194
  }
13087
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   195
  // If the bucket size is too deep check if this hash code is insufficient.
26421
37d88e604ad0 8056084: Refactor Hashtable to allow implementations without rehashing support
mgerdin
parents: 25946
diff changeset
   196
  if (count >= rehash_count && !needs_rehashing()) {
13087
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   197
    _needs_rehashing = check_rehash_table(count);
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   198
  }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   199
  return NULL;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   200
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   201
28363
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   202
Symbol* SymbolTable::lookup_shared(const char* name,
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   203
                                   int len, unsigned int hash) {
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   204
  return _shared_table.lookup(name, hash, len);
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   205
}
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   206
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   207
Symbol* SymbolTable::lookup(int index, const char* name,
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   208
                            int len, unsigned int hash) {
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   209
  Symbol* sym;
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   210
  if (_lookup_shared_first) {
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   211
    sym = lookup_shared(name, len, hash);
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   212
    if (sym != NULL) {
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   213
      return sym;
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   214
    }
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   215
    _lookup_shared_first = false;
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   216
    return lookup_dynamic(index, name, len, hash);
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   217
  } else {
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   218
    sym = lookup_dynamic(index, name, len, hash);
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   219
    if (sym != NULL) {
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   220
      return sym;
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   221
    }
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   222
    sym = lookup_shared(name, len, hash);
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   223
    if (sym != NULL) {
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   224
      _lookup_shared_first = true;
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   225
    }
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   226
    return sym;
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   227
  }
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   228
}
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   229
13097
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   230
// Pick hashing algorithm.
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   231
unsigned int SymbolTable::hash_symbol(const char* s, int len) {
13087
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   232
  return use_alternate_hashcode() ?
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   233
           AltHashing::murmur3_32(seed(), (const jbyte*)s, len) :
33628
09241459a8b8 8141132: JEP 254: Compact Strings
thartmann
parents: 33148
diff changeset
   234
           java_lang_String::hash_code((const jbyte*)s, len);
13087
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   235
}
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   236
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   237
489c9b5090e2 Initial load
duke
parents:
diff changeset
   238
// We take care not to be blocking while holding the
489c9b5090e2 Initial load
duke
parents:
diff changeset
   239
// SymbolTable_lock. Otherwise, the system might deadlock, since the
489c9b5090e2 Initial load
duke
parents:
diff changeset
   240
// symboltable is used during compilation (VM_thread) The lock free
489c9b5090e2 Initial load
duke
parents:
diff changeset
   241
// synchronization is simplified by the fact that we do not delete
489c9b5090e2 Initial load
duke
parents:
diff changeset
   242
// entries in the symbol table during normal execution (only during
489c9b5090e2 Initial load
duke
parents:
diff changeset
   243
// safepoints).
489c9b5090e2 Initial load
duke
parents:
diff changeset
   244
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   245
Symbol* SymbolTable::lookup(const char* name, int len, TRAPS) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   246
  unsigned int hashValue = hash_symbol(name, len);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   247
  int index = the_table()->hash_to_index(hashValue);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   248
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   249
  Symbol* s = the_table()->lookup(index, name, len, hashValue);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   250
489c9b5090e2 Initial load
duke
parents:
diff changeset
   251
  // Found
489c9b5090e2 Initial load
duke
parents:
diff changeset
   252
  if (s != NULL) return s;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   253
13097
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   254
  // Grab SymbolTable_lock first.
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   255
  MutexLocker ml(SymbolTable_lock, THREAD);
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   256
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   257
  // Otherwise, add to symbol to table
27677
b1997f2f1b56 8062808: Turn on the -Wreturn-type warning
stefank
parents: 26923
diff changeset
   258
  return the_table()->basic_add(index, (u1*)name, len, hashValue, true, THREAD);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   259
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   260
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   261
Symbol* SymbolTable::lookup(const Symbol* sym, int begin, int end, TRAPS) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   262
  char* buffer;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   263
  int index, len;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   264
  unsigned int hashValue;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   265
  char* name;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   266
  {
35492
c8c0273e6b91 8146690: Make all classes in GC follow the naming convention.
david
parents: 34659
diff changeset
   267
    debug_only(NoSafepointVerifier nsv;)
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   268
489c9b5090e2 Initial load
duke
parents:
diff changeset
   269
    name = (char*)sym->base() + begin;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   270
    len = end - begin;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   271
    hashValue = hash_symbol(name, len);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   272
    index = the_table()->hash_to_index(hashValue);
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   273
    Symbol* s = the_table()->lookup(index, name, len, hashValue);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   274
489c9b5090e2 Initial load
duke
parents:
diff changeset
   275
    // Found
489c9b5090e2 Initial load
duke
parents:
diff changeset
   276
    if (s != NULL) return s;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   277
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   278
489c9b5090e2 Initial load
duke
parents:
diff changeset
   279
  // Otherwise, add to symbol to table. Copy to a C string first.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   280
  char stack_buf[128];
489c9b5090e2 Initial load
duke
parents:
diff changeset
   281
  ResourceMark rm(THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   282
  if (len <= 128) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   283
    buffer = stack_buf;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   284
  } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   285
    buffer = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, len);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   286
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   287
  for (int i=0; i<len; i++) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   288
    buffer[i] = name[i];
489c9b5090e2 Initial load
duke
parents:
diff changeset
   289
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   290
  // Make sure there is no safepoint in the code above since name can't move.
35492
c8c0273e6b91 8146690: Make all classes in GC follow the naming convention.
david
parents: 34659
diff changeset
   291
  // We can't include the code in NoSafepointVerifier because of the
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   292
  // ResourceMark.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   293
13097
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   294
  // Grab SymbolTable_lock first.
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   295
  MutexLocker ml(SymbolTable_lock, THREAD);
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   296
27677
b1997f2f1b56 8062808: Turn on the -Wreturn-type warning
stefank
parents: 26923
diff changeset
   297
  return the_table()->basic_add(index, (u1*)buffer, len, hashValue, true, THREAD);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   298
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   299
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   300
Symbol* SymbolTable::lookup_only(const char* name, int len,
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   301
                                   unsigned int& hash) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   302
  hash = hash_symbol(name, len);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   303
  int index = the_table()->hash_to_index(hash);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   304
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   305
  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
   306
  return s;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   307
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   308
11480
1bf714e8adb4 7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents: 8885
diff changeset
   309
// 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
   310
// Do not create any new symbols
1bf714e8adb4 7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents: 8885
diff changeset
   311
// 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
   312
Symbol** SymbolTable::lookup_symbol_addr(Symbol* sym){
1bf714e8adb4 7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents: 8885
diff changeset
   313
  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
   314
  int index = the_table()->hash_to_index(hash);
1bf714e8adb4 7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents: 8885
diff changeset
   315
13195
be27e1b6a4b9 6995781: Native Memory Tracking (Phase 1)
zgu
parents: 13097
diff changeset
   316
  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
   317
    if (e->hash() == hash) {
1bf714e8adb4 7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents: 8885
diff changeset
   318
      Symbol* literal_sym = e->literal();
1bf714e8adb4 7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents: 8885
diff changeset
   319
      if (sym == literal_sym) {
1bf714e8adb4 7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents: 8885
diff changeset
   320
        return e->literal_addr();
1bf714e8adb4 7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents: 8885
diff changeset
   321
      }
1bf714e8adb4 7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents: 8885
diff changeset
   322
    }
1bf714e8adb4 7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents: 8885
diff changeset
   323
  }
1bf714e8adb4 7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents: 8885
diff changeset
   324
  return NULL;
1bf714e8adb4 7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents: 8885
diff changeset
   325
}
1bf714e8adb4 7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents: 8885
diff changeset
   326
2332
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   327
// Suggestion: Push unicode-based lookup all the way into the hashing
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   328
// 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
   329
// an actual new Symbol* is created.
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   330
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
   331
  int utf8_length = UNICODE::utf8_length((jchar*) name, utf16_length);
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   332
  char stack_buf[128];
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   333
  if (utf8_length < (int) sizeof(stack_buf)) {
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   334
    char* chars = stack_buf;
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   335
    UNICODE::convert_to_utf8(name, utf16_length, chars);
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   336
    return lookup(chars, utf8_length, THREAD);
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   337
  } else {
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   338
    ResourceMark rm(THREAD);
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   339
    char* chars = NEW_RESOURCE_ARRAY(char, utf8_length + 1);;
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   340
    UNICODE::convert_to_utf8(name, utf16_length, chars);
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   341
    return lookup(chars, utf8_length, THREAD);
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   342
  }
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   343
}
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   344
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   345
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
   346
                                           unsigned int& hash) {
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   347
  int utf8_length = UNICODE::utf8_length((jchar*) name, utf16_length);
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   348
  char stack_buf[128];
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   349
  if (utf8_length < (int) sizeof(stack_buf)) {
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   350
    char* chars = stack_buf;
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   351
    UNICODE::convert_to_utf8(name, utf16_length, chars);
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   352
    return lookup_only(chars, utf8_length, hash);
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   353
  } else {
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   354
    ResourceMark rm;
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   355
    char* chars = NEW_RESOURCE_ARRAY(char, utf8_length + 1);;
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   356
    UNICODE::convert_to_utf8(name, utf16_length, chars);
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   357
    return lookup_only(chars, utf8_length, hash);
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   358
  }
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   359
}
5c7b6f4ce0a1 6814659: separable cleanups and subroutines for 6655638
jrose
parents: 2131
diff changeset
   360
33593
60764a78fa5c 8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents: 33148
diff changeset
   361
void SymbolTable::add(ClassLoaderData* loader_data, const constantPoolHandle& cp,
12263
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   362
                      int names_count,
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   363
                      const char** names, int* lengths, int* cp_indices,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   364
                      unsigned int* hashValues, TRAPS) {
13097
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   365
  // Grab SymbolTable_lock first.
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   366
  MutexLocker ml(SymbolTable_lock, THREAD);
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   367
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   368
  SymbolTable* table = the_table();
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13199
diff changeset
   369
  bool added = table->basic_add(loader_data, cp, names_count, names, lengths,
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   370
                                cp_indices, hashValues, CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   371
  if (!added) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   372
    // do it the hard way
489c9b5090e2 Initial load
duke
parents:
diff changeset
   373
    for (int i=0; i<names_count; i++) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   374
      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
   375
      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
   376
      Symbol* sym = table->basic_add(index, (u1*)names[i], lengths[i], hashValues[i], c_heap, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   377
      cp->symbol_at_put(cp_indices[i], sym);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   378
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   379
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   380
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   381
12263
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   382
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
   383
  unsigned int hash;
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   384
  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
   385
  if (result != NULL) {
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   386
    return result;
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   387
  }
13097
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   388
  // Grab SymbolTable_lock first.
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   389
  MutexLocker ml(SymbolTable_lock, THREAD);
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   390
12263
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   391
  SymbolTable* table = the_table();
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   392
  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
   393
  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
   394
}
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   395
13097
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   396
Symbol* SymbolTable::basic_add(int index_arg, u1 *name, int len,
13087
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   397
                               unsigned int hashValue_arg, bool c_heap, TRAPS) {
20079
edbc2f7b38ef 8024974: Incorrect use of GC_locker::is_active()
stefank
parents: 18091
diff changeset
   398
  assert(!Universe::heap()->is_in_reserved(name),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   399
         "proposed name of symbol must be stable");
489c9b5090e2 Initial load
duke
parents:
diff changeset
   400
13097
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   401
  // 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
   402
  if (len > Symbol::max_length()) {
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   403
    THROW_MSG_0(vmSymbols::java_lang_InternalError(),
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   404
                "name is too long to represent");
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   405
  }
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   406
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   407
  // Cannot hit a safepoint in this function because the "this" pointer can move.
35492
c8c0273e6b91 8146690: Make all classes in GC follow the naming convention.
david
parents: 34659
diff changeset
   408
  NoSafepointVerifier nsv;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   409
13087
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   410
  // 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
   411
  // the hash value and index.
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   412
  unsigned int hashValue;
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   413
  int index;
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   414
  if (use_alternate_hashcode()) {
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   415
    hashValue = hash_symbol((const char*)name, len);
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   416
    index = hash_to_index(hashValue);
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   417
  } else {
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   418
    hashValue = hashValue_arg;
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   419
    index = index_arg;
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   420
  }
13087
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   421
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   422
  // Since look-up was done lock-free, we need to check if another
489c9b5090e2 Initial load
duke
parents:
diff changeset
   423
  // 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
   424
  Symbol* test = lookup(index, (char*)name, len, hashValue);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   425
  if (test != NULL) {
12263
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   426
    // 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
   427
    assert(test->refcount() != 0, "lookup should have incremented the count");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   428
    return test;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   429
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   430
12263
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   431
  // Create a new symbol.
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   432
  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
   433
  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
   434
13195
be27e1b6a4b9 6995781: Native Memory Tracking (Phase 1)
zgu
parents: 13097
diff changeset
   435
  HashtableEntry<Symbol*, mtSymbol>* entry = new_entry(hashValue, sym);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   436
  add_entry(index, entry);
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   437
  return sym;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   438
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   439
12263
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   440
// 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
   441
// parsing.
33593
60764a78fa5c 8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents: 33148
diff changeset
   442
bool SymbolTable::basic_add(ClassLoaderData* loader_data, const constantPoolHandle& cp,
12263
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   443
                            int names_count,
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   444
                            const char** names, int* lengths,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   445
                            int* cp_indices, unsigned int* hashValues,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   446
                            TRAPS) {
12263
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   447
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   448
  // 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
   449
  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
   450
    if (lengths[i] > Symbol::max_length()) {
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   451
      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
   452
                  "name is too long to represent");
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   453
    }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   454
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   455
13097
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   456
  // Cannot hit a safepoint in this function because the "this" pointer can move.
35492
c8c0273e6b91 8146690: Make all classes in GC follow the naming convention.
david
parents: 34659
diff changeset
   457
  NoSafepointVerifier nsv;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   458
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   459
  for (int i=0; i<names_count; i++) {
13087
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   460
    // 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
   461
    // the hash value.
13097
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   462
    unsigned int hashValue;
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   463
    if (use_alternate_hashcode()) {
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   464
      hashValue = hash_symbol(names[i], lengths[i]);
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   465
    } else {
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   466
      hashValue = hashValues[i];
c146b608d91f 7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents: 13087
diff changeset
   467
    }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   468
    // Since look-up was done lock-free, we need to check if another
489c9b5090e2 Initial load
duke
parents:
diff changeset
   469
    // thread beat us in the race to insert the symbol.
13087
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   470
    int index = hash_to_index(hashValue);
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   471
    Symbol* test = lookup(index, names[i], lengths[i], hashValue);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   472
    if (test != NULL) {
2131
98f9cef66a34 6810672: Comment typos
twisti
parents: 1
diff changeset
   473
      // A race occurred and another thread introduced the symbol, this one
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   474
      // will be dropped and collected. Use test instead.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   475
      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
   476
      assert(test->refcount() != 0, "lookup should have incremented the count");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   477
    } else {
12263
d20640f4f8fe 7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents: 11480
diff changeset
   478
      // 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
   479
      // are allocated specially in a permanent arena.
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13199
diff changeset
   480
      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
   481
      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
   482
      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
   483
      HashtableEntry<Symbol*, mtSymbol>* entry = new_entry(hashValue, sym);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   484
      add_entry(index, entry);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   485
      cp->symbol_at_put(cp_indices[i], sym);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   486
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   487
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   488
  return true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   489
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   490
489c9b5090e2 Initial load
duke
parents:
diff changeset
   491
489c9b5090e2 Initial load
duke
parents:
diff changeset
   492
void SymbolTable::verify() {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   493
  for (int i = 0; i < the_table()->table_size(); ++i) {
13195
be27e1b6a4b9 6995781: Native Memory Tracking (Phase 1)
zgu
parents: 13097
diff changeset
   494
    HashtableEntry<Symbol*, mtSymbol>* p = the_table()->bucket(i);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   495
    for ( ; p != NULL; p = p->next()) {
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   496
      Symbol* s = (Symbol*)(p->literal());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   497
      guarantee(s != NULL, "symbol is NULL");
489c9b5090e2 Initial load
duke
parents:
diff changeset
   498
      unsigned int h = hash_symbol((char*)s->bytes(), s->utf8_length());
489c9b5090e2 Initial load
duke
parents:
diff changeset
   499
      guarantee(p->hash() == h, "broken hash in symbol table entry");
489c9b5090e2 Initial load
duke
parents:
diff changeset
   500
      guarantee(the_table()->hash_to_index(h) == i,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   501
                "wrong index in symbol table");
489c9b5090e2 Initial load
duke
parents:
diff changeset
   502
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   503
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   504
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   505
28363
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   506
void SymbolTable::dump(outputStream* st, bool verbose) {
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   507
  if (!verbose) {
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   508
    the_table()->dump_table(st, "SymbolTable");
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   509
  } else {
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   510
    st->print_cr("VERSION: 1.0");
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   511
    for (int i = 0; i < the_table()->table_size(); ++i) {
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   512
      HashtableEntry<Symbol*, mtSymbol>* p = the_table()->bucket(i);
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   513
      for ( ; p != NULL; p = p->next()) {
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   514
        Symbol* s = (Symbol*)(p->literal());
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   515
        const char* utf8_string = (const char*)s->bytes();
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   516
        int utf8_length = s->utf8_length();
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   517
        st->print("%d %d: ", utf8_length, s->refcount());
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   518
        HashtableTextDump::put_utf8(st, utf8_string, utf8_length);
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   519
        st->cr();
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   520
      }
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   521
    }
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   522
  }
13087
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   523
}
673ea6efaf18 7158800: Improve storage of symbol tables
coleenp
parents: 12263
diff changeset
   524
28363
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   525
bool SymbolTable::copy_compact_table(char** top, char*end) {
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   526
#if INCLUDE_CDS
31345
1bba15125d8d 8015086: add interned strings to the shared archive.
jiangli
parents: 30764
diff changeset
   527
  CompactHashtableWriter ch_table(CompactHashtable<Symbol*, char>::_symbol_table,
1bba15125d8d 8015086: add interned strings to the shared archive.
jiangli
parents: 30764
diff changeset
   528
                                  the_table()->number_of_entries(),
28363
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   529
                                  &MetaspaceShared::stats()->symbol);
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   530
  if (*top + ch_table.get_required_bytes() > end) {
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   531
    // not enough space left
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   532
    return false;
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   533
  }
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   534
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   535
  for (int i = 0; i < the_table()->table_size(); ++i) {
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   536
    HashtableEntry<Symbol*, mtSymbol>* p = the_table()->bucket(i);
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   537
    for ( ; p != NULL; p = p->next()) {
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   538
      Symbol* s = (Symbol*)(p->literal());
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   539
      unsigned int fixed_hash = hash_symbol((char*)s->bytes(), s->utf8_length());
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   540
      assert(fixed_hash == p->hash(), "must not rehash during dumping");
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   541
      ch_table.add(fixed_hash, s);
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   542
    }
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   543
  }
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   544
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   545
  ch_table.dump(top, end);
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   546
35898
ddc274f0052f 8145628: hotspot metadata classes shouldn't use HeapWordSize or heap related macros like align_object_size
coleenp
parents: 35497
diff changeset
   547
  *top = (char*)align_ptr_up(*top, sizeof(void*));
28363
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   548
#endif
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   549
  return true;
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   550
}
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   551
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   552
const char* SymbolTable::init_shared_table(const char* buffer) {
31345
1bba15125d8d 8015086: add interned strings to the shared archive.
jiangli
parents: 30764
diff changeset
   553
  const char* end = _shared_table.init(
1bba15125d8d 8015086: add interned strings to the shared archive.
jiangli
parents: 30764
diff changeset
   554
          CompactHashtable<Symbol*, char>::_symbol_table, buffer);
35898
ddc274f0052f 8145628: hotspot metadata classes shouldn't use HeapWordSize or heap related macros like align_object_size
coleenp
parents: 35497
diff changeset
   555
  return (const char*)align_ptr_up(end, sizeof(void*));
28363
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   556
}
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   557
489c9b5090e2 Initial load
duke
parents:
diff changeset
   558
//---------------------------------------------------------------------------
489c9b5090e2 Initial load
duke
parents:
diff changeset
   559
// Non-product code
489c9b5090e2 Initial load
duke
parents:
diff changeset
   560
489c9b5090e2 Initial load
duke
parents:
diff changeset
   561
#ifndef PRODUCT
489c9b5090e2 Initial load
duke
parents:
diff changeset
   562
489c9b5090e2 Initial load
duke
parents:
diff changeset
   563
void SymbolTable::print_histogram() {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   564
  MutexLocker ml(SymbolTable_lock);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   565
  const int results_length = 100;
26923
60c1555c25c5 8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents: 26421
diff changeset
   566
  int counts[results_length];
60c1555c25c5 8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents: 26421
diff changeset
   567
  int sizes[results_length];
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   568
  int i,j;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   569
489c9b5090e2 Initial load
duke
parents:
diff changeset
   570
  // initialize results to zero
489c9b5090e2 Initial load
duke
parents:
diff changeset
   571
  for (j = 0; j < results_length; j++) {
26923
60c1555c25c5 8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents: 26421
diff changeset
   572
    counts[j] = 0;
60c1555c25c5 8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents: 26421
diff changeset
   573
    sizes[j] = 0;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   574
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   575
26923
60c1555c25c5 8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents: 26421
diff changeset
   576
  int total_size = 0;
60c1555c25c5 8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents: 26421
diff changeset
   577
  int total_count = 0;
60c1555c25c5 8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents: 26421
diff changeset
   578
  int total_length = 0;
60c1555c25c5 8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents: 26421
diff changeset
   579
  int max_length = 0;
60c1555c25c5 8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents: 26421
diff changeset
   580
  int out_of_range_count = 0;
60c1555c25c5 8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents: 26421
diff changeset
   581
  int out_of_range_size = 0;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   582
  for (i = 0; i < the_table()->table_size(); i++) {
13195
be27e1b6a4b9 6995781: Native Memory Tracking (Phase 1)
zgu
parents: 13097
diff changeset
   583
    HashtableEntry<Symbol*, mtSymbol>* p = the_table()->bucket(i);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   584
    for ( ; p != NULL; p = p->next()) {
26923
60c1555c25c5 8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents: 26421
diff changeset
   585
      int size = p->literal()->size();
60c1555c25c5 8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents: 26421
diff changeset
   586
      int len = p->literal()->utf8_length();
60c1555c25c5 8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents: 26421
diff changeset
   587
      if (len < results_length) {
60c1555c25c5 8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents: 26421
diff changeset
   588
        counts[len]++;
60c1555c25c5 8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents: 26421
diff changeset
   589
        sizes[len] += size;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   590
      } else {
26923
60c1555c25c5 8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents: 26421
diff changeset
   591
        out_of_range_count++;
60c1555c25c5 8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents: 26421
diff changeset
   592
        out_of_range_size += size;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   593
      }
26923
60c1555c25c5 8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents: 26421
diff changeset
   594
      total_count++;
60c1555c25c5 8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents: 26421
diff changeset
   595
      total_size += size;
60c1555c25c5 8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents: 26421
diff changeset
   596
      total_length += len;
60c1555c25c5 8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents: 26421
diff changeset
   597
      max_length = MAX2(max_length, len);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   598
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   599
  }
26923
60c1555c25c5 8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents: 26421
diff changeset
   600
  tty->print_cr("Symbol Table Histogram:");
60c1555c25c5 8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents: 26421
diff changeset
   601
  tty->print_cr("  Total number of symbols  %7d", total_count);
60c1555c25c5 8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents: 26421
diff changeset
   602
  tty->print_cr("  Total size in memory     %7dK",
35898
ddc274f0052f 8145628: hotspot metadata classes shouldn't use HeapWordSize or heap related macros like align_object_size
coleenp
parents: 35497
diff changeset
   603
          (total_size*wordSize)/1024);
26923
60c1555c25c5 8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents: 26421
diff changeset
   604
  tty->print_cr("  Total counted            %7d", _symbols_counted);
60c1555c25c5 8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents: 26421
diff changeset
   605
  tty->print_cr("  Total removed            %7d", _symbols_removed);
22545
b93a7f0e9b9d 8027476: Improve performance of Stringtable unlink
tschatzl
parents: 20283
diff changeset
   606
  if (_symbols_counted > 0) {
26923
60c1555c25c5 8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents: 26421
diff changeset
   607
    tty->print_cr("  Percent removed          %3.2f",
22545
b93a7f0e9b9d 8027476: Improve performance of Stringtable unlink
tschatzl
parents: 20283
diff changeset
   608
          ((float)_symbols_removed/(float)_symbols_counted)* 100);
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   609
  }
26923
60c1555c25c5 8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents: 26421
diff changeset
   610
  tty->print_cr("  Reference counts         %7d", Symbol::_total_count);
33148
68fa8b6c4340 8042893: compiler: PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC needs to be removed from source files
david
parents: 31790
diff changeset
   611
  tty->print_cr("  Symbol arena used        " SIZE_FORMAT_W(7) "K", arena()->used()/1024);
68fa8b6c4340 8042893: compiler: PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC needs to be removed from source files
david
parents: 31790
diff changeset
   612
  tty->print_cr("  Symbol arena size        " SIZE_FORMAT_W(7) "K", arena()->size_in_bytes()/1024);
26923
60c1555c25c5 8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents: 26421
diff changeset
   613
  tty->print_cr("  Total symbol length      %7d", total_length);
60c1555c25c5 8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents: 26421
diff changeset
   614
  tty->print_cr("  Maximum symbol length    %7d", max_length);
60c1555c25c5 8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents: 26421
diff changeset
   615
  tty->print_cr("  Average symbol length    %7.2f", ((float) total_length / (float) total_count));
60c1555c25c5 8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents: 26421
diff changeset
   616
  tty->print_cr("  Symbol length histogram:");
60c1555c25c5 8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents: 26421
diff changeset
   617
  tty->print_cr("    %6s %10s %10s", "Length", "#Symbols", "Size");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   618
  for (i = 0; i < results_length; i++) {
26923
60c1555c25c5 8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents: 26421
diff changeset
   619
    if (counts[i] > 0) {
35898
ddc274f0052f 8145628: hotspot metadata classes shouldn't use HeapWordSize or heap related macros like align_object_size
coleenp
parents: 35497
diff changeset
   620
      tty->print_cr("    %6d %10d %10dK", i, counts[i], (sizes[i]*wordSize)/1024);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   621
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   622
  }
26923
60c1555c25c5 8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents: 26421
diff changeset
   623
  tty->print_cr("  >=%6d %10d %10dK\n", results_length,
35898
ddc274f0052f 8145628: hotspot metadata classes shouldn't use HeapWordSize or heap related macros like align_object_size
coleenp
parents: 35497
diff changeset
   624
          out_of_range_count, (out_of_range_size*wordSize)/1024);
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   625
}
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   626
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   627
void SymbolTable::print() {
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   628
  for (int i = 0; i < the_table()->table_size(); ++i) {
13195
be27e1b6a4b9 6995781: Native Memory Tracking (Phase 1)
zgu
parents: 13097
diff changeset
   629
    HashtableEntry<Symbol*, mtSymbol>** p = the_table()->bucket_addr(i);
be27e1b6a4b9 6995781: Native Memory Tracking (Phase 1)
zgu
parents: 13097
diff changeset
   630
    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
   631
    if (entry != NULL) {
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   632
      while (entry != NULL) {
33148
68fa8b6c4340 8042893: compiler: PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC needs to be removed from source files
david
parents: 31790
diff changeset
   633
        tty->print(PTR_FORMAT " ", p2i(entry->literal()));
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   634
        entry->literal()->print();
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   635
        tty->print(" %d", entry->literal()->refcount());
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7397
diff changeset
   636
        p = entry->next_addr();
13195
be27e1b6a4b9 6995781: Native Memory Tracking (Phase 1)
zgu
parents: 13097
diff changeset
   637
        entry = (HashtableEntry<Symbol*, mtSymbol>*)HashtableEntry<Symbol*, mtSymbol>::make_ptr(*p);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   638
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   639
      tty->cr();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   640
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   641
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   642
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   643
#endif // PRODUCT
28363
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   644
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   645
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   646
// Utility for dumping symbols
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   647
SymboltableDCmd::SymboltableDCmd(outputStream* output, bool heap) :
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   648
                                 DCmdWithParser(output, heap),
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   649
  _verbose("-verbose", "Dump the content of each symbol in the table",
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   650
           "BOOLEAN", false, "false") {
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   651
  _dcmdparser.add_dcmd_option(&_verbose);
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   652
}
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   653
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   654
void SymboltableDCmd::execute(DCmdSource source, TRAPS) {
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   655
  VM_DumpHashtable dumper(output(), VM_DumpHashtable::DumpSymbols,
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   656
                         _verbose.value());
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   657
  VMThread::execute(&dumper);
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   658
}
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   659
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   660
int SymboltableDCmd::num_arguments() {
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   661
  ResourceMark rm;
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   662
  SymboltableDCmd* dcmd = new SymboltableDCmd(NULL, false);
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   663
  if (dcmd != NULL) {
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   664
    DCmdMark mark(dcmd);
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   665
    return dcmd->_dcmdparser.num_arguments();
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   666
  } else {
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   667
    return 0;
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   668
  }
047115468f16 8059510: Compact symbol table layout inside shared archive.
jiangli
parents: 27677
diff changeset
   669
}
35497
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   670
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   671
#ifndef PRODUCT
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   672
// Internal test of TempNewSymbol
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   673
void Test_TempNewSymbol() {
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   674
  // Assert messages assume these symbols are unique, and the refcounts start at
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   675
  // one, but code does not rely on this.
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   676
  Thread* THREAD = Thread::current();
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   677
  Symbol* abc = SymbolTable::new_symbol("abc", CATCH);
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   678
  int abccount = abc->refcount();
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   679
  TempNewSymbol ss = abc;
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   680
  assert(ss->refcount() == abccount, "only one abc");
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   681
  assert(ss->refcount() == abc->refcount(), "should match TempNewSymbol");
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   682
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   683
  Symbol* efg = SymbolTable::new_symbol("efg", CATCH);
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   684
  Symbol* hij = SymbolTable::new_symbol("hij", CATCH);
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   685
  int efgcount = efg->refcount();
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   686
  int hijcount = hij->refcount();
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   687
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   688
  TempNewSymbol s1 = efg;
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   689
  TempNewSymbol s2 = hij;
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   690
  assert(s1->refcount() == efgcount, "one efg");
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   691
  assert(s2->refcount() == hijcount, "one hij");
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   692
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   693
  // Assignment operator
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   694
  s1 = s2;
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   695
  assert(hij->refcount() == hijcount + 1, "should be two hij");
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   696
  assert(efg->refcount() == efgcount - 1, "should be no efg");
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   697
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   698
  s1 = ss;  // s1 is abc
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   699
  assert(s1->refcount() == abccount + 1, "should be two abc (s1 and ss)");
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   700
  assert(hij->refcount() == hijcount, "should only have one hij now (s2)");
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   701
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   702
  s1 = s1; // self assignment
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   703
  assert(s1->refcount() == abccount + 1, "should still be two abc (s1 and ss)");
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   704
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   705
  TempNewSymbol s3;
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   706
  Symbol* klm = SymbolTable::new_symbol("klm", CATCH);
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   707
  int klmcount = klm->refcount();
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   708
  s3 = klm;   // assignment
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   709
  assert(s3->refcount() == klmcount, "only one klm now");
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   710
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   711
  Symbol* xyz = SymbolTable::new_symbol("xyz", CATCH);
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   712
  int xyzcount = xyz->refcount();
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   713
  { // inner scope
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   714
     TempNewSymbol s_inner = xyz;
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   715
  }
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   716
  assert(xyz->refcount() == (xyzcount - 1),
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   717
         "Should have been decremented by dtor in inner scope");
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   718
}
94c7c07d0161 8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents: 35492
diff changeset
   719
#endif // PRODUCT