author | iklam |
Mon, 08 Oct 2018 16:29:10 -0700 | |
changeset 52047 | 7bc8b456e5ac |
parent 51823 | 2a51125b2794 |
child 52514 | f4e3900c8d08 |
permissions | -rw-r--r-- |
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
1 |
/* |
48962
88ad6c676c87
8194994: Remove redundant string streams used for logging
mlarsson
parents:
47765
diff
changeset
|
2 |
* Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved. |
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
4 |
* |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
8 |
* |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
13 |
* accompanied this code). |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
14 |
* |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
18 |
* |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
21 |
* questions. |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
22 |
* |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
23 |
*/ |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
24 |
|
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
25 |
#include "precompiled.hpp" |
47765
b7c7428eaab9
8189610: Reconcile jvm.h and all jvm_md.h between java.base and hotspot
coleenp
parents:
47216
diff
changeset
|
26 |
#include "jvm.h" |
51823 | 27 |
#include "classfile/compactHashtable.hpp" |
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
28 |
#include "classfile/javaClasses.hpp" |
46522
86b13b03a053
8176132: -XX:+PrintSharedSpaces should be converted to use Unified Logging.
rprotacio
parents:
42565
diff
changeset
|
29 |
#include "logging/logMessage.hpp" |
51491
187c84a5efe1
8208658: Make CDS archived heap regions usable even if compressed oop encoding has changed
iklam
parents:
49592
diff
changeset
|
30 |
#include "memory/heapShared.inline.hpp" |
37995 | 31 |
#include "memory/metadataFactory.hpp" |
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
32 |
#include "memory/metaspaceShared.hpp" |
49592
77fb0be7d19f
8199946: Move load/store and encode/decode out of oopDesc
stefank
parents:
48962
diff
changeset
|
33 |
#include "oops/compressedOops.inline.hpp" |
46742 | 34 |
#include "runtime/vmThread.hpp" |
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
35 |
#include "utilities/numberSeq.hpp" |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
36 |
#include <sys/stat.h> |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
37 |
|
51823 | 38 |
#if INCLUDE_CDS |
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
39 |
///////////////////////////////////////////////////// |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
40 |
// |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
41 |
// The compact hash table writer implementations |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
42 |
// |
37995 | 43 |
CompactHashtableWriter::CompactHashtableWriter(int num_buckets, |
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
44 |
CompactHashtableStats* stats) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
45 |
assert(DumpSharedSpaces, "dump-time only"); |
38647
e17e25c51396
8157097: OptionsValidation/TestOptionsWithRanges.java crashes at CompactHashtableWriter::add during StringTable::copy_shared_string
rehn
parents:
37995
diff
changeset
|
46 |
assert(num_buckets > 0, "no buckets"); |
37995 | 47 |
_num_buckets = num_buckets; |
48 |
_num_entries = 0; |
|
49 |
_buckets = NEW_C_HEAP_ARRAY(GrowableArray<Entry>*, _num_buckets, mtSymbol); |
|
50 |
for (int i=0; i<_num_buckets; i++) { |
|
51 |
_buckets[i] = new (ResourceObj::C_HEAP, mtSymbol) GrowableArray<Entry>(0, true, mtSymbol); |
|
52 |
} |
|
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
53 |
|
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
54 |
_stats = stats; |
37995 | 55 |
_compact_buckets = NULL; |
56 |
_compact_entries = NULL; |
|
57 |
_num_empty_buckets = 0; |
|
58 |
_num_value_only_buckets = 0; |
|
59 |
_num_other_buckets = 0; |
|
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
60 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
61 |
|
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
62 |
CompactHashtableWriter::~CompactHashtableWriter() { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
63 |
for (int index = 0; index < _num_buckets; index++) { |
37995 | 64 |
GrowableArray<Entry>* bucket = _buckets[index]; |
65 |
delete bucket; |
|
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
66 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
67 |
|
37995 | 68 |
FREE_C_HEAP_ARRAY(GrowableArray<Entry>*, _buckets); |
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
69 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
70 |
|
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
71 |
// Add a symbol entry to the temporary hash table |
37995 | 72 |
void CompactHashtableWriter::add(unsigned int hash, u4 value) { |
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
73 |
int index = hash % _num_buckets; |
37995 | 74 |
_buckets[index]->append_if_missing(Entry(hash, value)); |
75 |
_num_entries++; |
|
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
76 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
77 |
|
37995 | 78 |
void CompactHashtableWriter::allocate_table() { |
79 |
int entries_space = 0; |
|
80 |
for (int index = 0; index < _num_buckets; index++) { |
|
81 |
GrowableArray<Entry>* bucket = _buckets[index]; |
|
82 |
int bucket_size = bucket->length(); |
|
83 |
if (bucket_size == 1) { |
|
84 |
entries_space++; |
|
85 |
} else { |
|
86 |
entries_space += 2 * bucket_size; |
|
87 |
} |
|
88 |
} |
|
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
89 |
|
37995 | 90 |
if (entries_space & ~BUCKET_OFFSET_MASK) { |
91 |
vm_exit_during_initialization("CompactHashtableWriter::allocate_table: Overflow! " |
|
92 |
"Too many entries."); |
|
93 |
} |
|
94 |
||
46746
ea379ebb9447
8072061: Automatically determine optimal sizes for the CDS regions
iklam
parents:
46742
diff
changeset
|
95 |
_compact_buckets = MetaspaceShared::new_ro_array<u4>(_num_buckets + 1); |
ea379ebb9447
8072061: Automatically determine optimal sizes for the CDS regions
iklam
parents:
46742
diff
changeset
|
96 |
_compact_entries = MetaspaceShared::new_ro_array<u4>(entries_space); |
37995 | 97 |
|
46746
ea379ebb9447
8072061: Automatically determine optimal sizes for the CDS regions
iklam
parents:
46742
diff
changeset
|
98 |
_stats->bucket_count = _num_buckets; |
ea379ebb9447
8072061: Automatically determine optimal sizes for the CDS regions
iklam
parents:
46742
diff
changeset
|
99 |
_stats->bucket_bytes = _compact_buckets->size() * BytesPerWord; |
37995 | 100 |
_stats->hashentry_count = _num_entries; |
46746
ea379ebb9447
8072061: Automatically determine optimal sizes for the CDS regions
iklam
parents:
46742
diff
changeset
|
101 |
_stats->hashentry_bytes = _compact_entries->size() * BytesPerWord; |
37995 | 102 |
} |
103 |
||
104 |
// Write the compact table's buckets |
|
105 |
void CompactHashtableWriter::dump_table(NumberSeq* summary) { |
|
106 |
u4 offset = 0; |
|
107 |
for (int index = 0; index < _num_buckets; index++) { |
|
108 |
GrowableArray<Entry>* bucket = _buckets[index]; |
|
109 |
int bucket_size = bucket->length(); |
|
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
110 |
if (bucket_size == 1) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
111 |
// bucket with one entry is compacted and only has the symbol offset |
37995 | 112 |
_compact_buckets->at_put(index, BUCKET_INFO(offset, VALUE_ONLY_BUCKET_TYPE)); |
113 |
||
114 |
Entry ent = bucket->at(0); |
|
115 |
_compact_entries->at_put(offset++, ent.value()); |
|
116 |
_num_value_only_buckets++; |
|
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
117 |
} else { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
118 |
// regular bucket, each entry is a symbol (hash, offset) pair |
37995 | 119 |
_compact_buckets->at_put(index, BUCKET_INFO(offset, REGULAR_BUCKET_TYPE)); |
120 |
||
121 |
for (int i=0; i<bucket_size; i++) { |
|
122 |
Entry ent = bucket->at(i); |
|
123 |
_compact_entries->at_put(offset++, u4(ent.hash())); // write entry hash |
|
124 |
_compact_entries->at_put(offset++, ent.value()); |
|
125 |
} |
|
126 |
if (bucket_size == 0) { |
|
127 |
_num_empty_buckets++; |
|
128 |
} else { |
|
129 |
_num_other_buckets++; |
|
130 |
} |
|
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
131 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
132 |
summary->add(bucket_size); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
133 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
134 |
|
37995 | 135 |
// Mark the end of the buckets |
136 |
_compact_buckets->at_put(_num_buckets, BUCKET_INFO(offset, TABLEEND_BUCKET_TYPE)); |
|
137 |
assert(offset == (u4)_compact_entries->length(), "sanity"); |
|
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
138 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
139 |
|
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
140 |
|
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
141 |
// Write the compact table |
37995 | 142 |
void CompactHashtableWriter::dump(SimpleCompactHashtable *cht, const char* table_name) { |
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
143 |
NumberSeq summary; |
37995 | 144 |
allocate_table(); |
145 |
dump_table(&summary); |
|
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
146 |
|
37995 | 147 |
int table_bytes = _stats->bucket_bytes + _stats->hashentry_bytes; |
148 |
address base_address = address(MetaspaceShared::shared_rs()->base()); |
|
149 |
cht->init(base_address, _num_entries, _num_buckets, |
|
150 |
_compact_buckets->data(), _compact_entries->data()); |
|
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
151 |
|
48962
88ad6c676c87
8194994: Remove redundant string streams used for logging
mlarsson
parents:
47765
diff
changeset
|
152 |
LogMessage(cds, hashtables) msg; |
88ad6c676c87
8194994: Remove redundant string streams used for logging
mlarsson
parents:
47765
diff
changeset
|
153 |
if (msg.is_info()) { |
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
154 |
double avg_cost = 0.0; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
155 |
if (_num_entries > 0) { |
37995 | 156 |
avg_cost = double(table_bytes)/double(_num_entries); |
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
157 |
} |
48962
88ad6c676c87
8194994: Remove redundant string streams used for logging
mlarsson
parents:
47765
diff
changeset
|
158 |
msg.info("Shared %s table stats -------- base: " PTR_FORMAT, |
46522
86b13b03a053
8176132: -XX:+PrintSharedSpaces should be converted to use Unified Logging.
rprotacio
parents:
42565
diff
changeset
|
159 |
table_name, (intptr_t)base_address); |
48962
88ad6c676c87
8194994: Remove redundant string streams used for logging
mlarsson
parents:
47765
diff
changeset
|
160 |
msg.info("Number of entries : %9d", _num_entries); |
88ad6c676c87
8194994: Remove redundant string streams used for logging
mlarsson
parents:
47765
diff
changeset
|
161 |
msg.info("Total bytes used : %9d", table_bytes); |
88ad6c676c87
8194994: Remove redundant string streams used for logging
mlarsson
parents:
47765
diff
changeset
|
162 |
msg.info("Average bytes per entry : %9.3f", avg_cost); |
88ad6c676c87
8194994: Remove redundant string streams used for logging
mlarsson
parents:
47765
diff
changeset
|
163 |
msg.info("Average bucket size : %9.3f", summary.avg()); |
88ad6c676c87
8194994: Remove redundant string streams used for logging
mlarsson
parents:
47765
diff
changeset
|
164 |
msg.info("Variance of bucket size : %9.3f", summary.variance()); |
88ad6c676c87
8194994: Remove redundant string streams used for logging
mlarsson
parents:
47765
diff
changeset
|
165 |
msg.info("Std. dev. of bucket size: %9.3f", summary.sd()); |
88ad6c676c87
8194994: Remove redundant string streams used for logging
mlarsson
parents:
47765
diff
changeset
|
166 |
msg.info("Empty buckets : %9d", _num_empty_buckets); |
88ad6c676c87
8194994: Remove redundant string streams used for logging
mlarsson
parents:
47765
diff
changeset
|
167 |
msg.info("Value_Only buckets : %9d", _num_value_only_buckets); |
88ad6c676c87
8194994: Remove redundant string streams used for logging
mlarsson
parents:
47765
diff
changeset
|
168 |
msg.info("Other buckets : %9d", _num_other_buckets); |
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
169 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
170 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
171 |
|
37995 | 172 |
///////////////////////////////////////////////////////////// |
173 |
// |
|
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
174 |
// The CompactHashtable implementation |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
175 |
// |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
176 |
|
52047
7bc8b456e5ac
8210388: Use hash table to store archived subgraph_info records
iklam
parents:
51823
diff
changeset
|
177 |
void SimpleCompactHashtable::serialize_header(SerializeClosure* soc) { |
37995 | 178 |
soc->do_ptr((void**)&_base_address); |
179 |
soc->do_u4(&_entry_count); |
|
180 |
soc->do_u4(&_bucket_count); |
|
181 |
soc->do_ptr((void**)&_buckets); |
|
182 |
soc->do_ptr((void**)&_entries); |
|
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
183 |
} |
51823 | 184 |
#endif // INCLUDE_CDS |
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
185 |
|
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
186 |
#ifndef O_BINARY // if defined (Win32) use binary files. |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
187 |
#define O_BINARY 0 // otherwise do nothing. |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
188 |
#endif |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
189 |
|
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
190 |
//////////////////////////////////////////////////////// |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
191 |
// |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
192 |
// HashtableTextDump |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
193 |
// |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
194 |
HashtableTextDump::HashtableTextDump(const char* filename) : _fd(-1) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
195 |
struct stat st; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
196 |
if (os::stat(filename, &st) != 0) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
197 |
quit("Unable to get hashtable dump file size", filename); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
198 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
199 |
_size = st.st_size; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
200 |
_fd = open(filename, O_RDONLY | O_BINARY, 0); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
201 |
if (_fd < 0) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
202 |
quit("Unable to open hashtable dump file", filename); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
203 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
204 |
_base = os::map_memory(_fd, filename, 0, NULL, _size, true, false); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
205 |
if (_base == NULL) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
206 |
quit("Unable to map hashtable dump file", filename); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
207 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
208 |
_p = _base; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
209 |
_end = _base + st.st_size; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
210 |
_filename = filename; |
31345
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
28615
diff
changeset
|
211 |
_prefix_type = Unknown; |
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
28615
diff
changeset
|
212 |
_line_no = 1; |
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
213 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
214 |
|
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
215 |
HashtableTextDump::~HashtableTextDump() { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
216 |
os::unmap_memory((char*)_base, _size); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
217 |
if (_fd >= 0) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
218 |
close(_fd); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
219 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
220 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
221 |
|
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
222 |
void HashtableTextDump::quit(const char* err, const char* msg) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
223 |
vm_exit_during_initialization(err, msg); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
224 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
225 |
|
31345
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
28615
diff
changeset
|
226 |
void HashtableTextDump::corrupted(const char *p, const char* msg) { |
31386
e54c60e0359c
8129446: crash when reporting corrupted classfile
kbarrett
parents:
31345
diff
changeset
|
227 |
char info[100]; |
e54c60e0359c
8129446: crash when reporting corrupted classfile
kbarrett
parents:
31345
diff
changeset
|
228 |
jio_snprintf(info, sizeof(info), |
e54c60e0359c
8129446: crash when reporting corrupted classfile
kbarrett
parents:
31345
diff
changeset
|
229 |
"%s. Corrupted at line %d (file pos %d)", |
e54c60e0359c
8129446: crash when reporting corrupted classfile
kbarrett
parents:
31345
diff
changeset
|
230 |
msg, _line_no, (int)(p - _base)); |
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
231 |
quit(info, _filename); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
232 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
233 |
|
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
234 |
bool HashtableTextDump::skip_newline() { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
235 |
if (_p[0] == '\r' && _p[1] == '\n') { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
236 |
_p += 2; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
237 |
} else if (_p[0] == '\n') { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
238 |
_p += 1; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
239 |
} else { |
31345
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
28615
diff
changeset
|
240 |
corrupted(_p, "Unexpected character"); |
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
241 |
} |
37995 | 242 |
_line_no++; |
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
243 |
return true; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
244 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
245 |
|
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
246 |
int HashtableTextDump::skip(char must_be_char) { |
35868
bf29f15cdf30
8147500: The HashtableTextDump::get_num() should check for integer overflow
jiangli
parents:
34659
diff
changeset
|
247 |
corrupted_if(remain() < 1, "Truncated"); |
bf29f15cdf30
8147500: The HashtableTextDump::get_num() should check for integer overflow
jiangli
parents:
34659
diff
changeset
|
248 |
corrupted_if(*_p++ != must_be_char, "Unexpected character"); |
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
249 |
return 0; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
250 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
251 |
|
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
252 |
void HashtableTextDump::skip_past(char c) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
253 |
for (;;) { |
35868
bf29f15cdf30
8147500: The HashtableTextDump::get_num() should check for integer overflow
jiangli
parents:
34659
diff
changeset
|
254 |
corrupted_if(remain() < 1, "Truncated"); |
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
255 |
if (*_p++ == c) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
256 |
return; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
257 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
258 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
259 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
260 |
|
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
261 |
void HashtableTextDump::check_version(const char* ver) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
262 |
int len = (int)strlen(ver); |
35868
bf29f15cdf30
8147500: The HashtableTextDump::get_num() should check for integer overflow
jiangli
parents:
34659
diff
changeset
|
263 |
corrupted_if(remain() < len, "Truncated"); |
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
264 |
if (strncmp(_p, ver, len) != 0) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
265 |
quit("wrong version of hashtable dump file", _filename); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
266 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
267 |
_p += len; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
268 |
skip_newline(); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
269 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
270 |
|
31345
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
28615
diff
changeset
|
271 |
void HashtableTextDump::scan_prefix_type() { |
37995 | 272 |
_p++; |
31345
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
28615
diff
changeset
|
273 |
if (strncmp(_p, "SECTION: String", 15) == 0) { |
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
28615
diff
changeset
|
274 |
_p += 15; |
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
28615
diff
changeset
|
275 |
_prefix_type = StringPrefix; |
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
28615
diff
changeset
|
276 |
} else if (strncmp(_p, "SECTION: Symbol", 15) == 0) { |
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
28615
diff
changeset
|
277 |
_p += 15; |
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
28615
diff
changeset
|
278 |
_prefix_type = SymbolPrefix; |
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
28615
diff
changeset
|
279 |
} else { |
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
28615
diff
changeset
|
280 |
_prefix_type = Unknown; |
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
28615
diff
changeset
|
281 |
} |
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
28615
diff
changeset
|
282 |
skip_newline(); |
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
28615
diff
changeset
|
283 |
} |
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
284 |
|
31345
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
28615
diff
changeset
|
285 |
int HashtableTextDump::scan_prefix(int* utf8_length) { |
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
28615
diff
changeset
|
286 |
if (*_p == '@') { |
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
28615
diff
changeset
|
287 |
scan_prefix_type(); |
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
28615
diff
changeset
|
288 |
} |
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
28615
diff
changeset
|
289 |
|
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
28615
diff
changeset
|
290 |
switch (_prefix_type) { |
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
28615
diff
changeset
|
291 |
case SymbolPrefix: |
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
28615
diff
changeset
|
292 |
*utf8_length = scan_symbol_prefix(); break; |
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
28615
diff
changeset
|
293 |
case StringPrefix: |
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
28615
diff
changeset
|
294 |
*utf8_length = scan_string_prefix(); break; |
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
28615
diff
changeset
|
295 |
default: |
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
28615
diff
changeset
|
296 |
tty->print_cr("Shared input data type: Unknown."); |
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
28615
diff
changeset
|
297 |
corrupted(_p, "Unknown data type"); |
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
28615
diff
changeset
|
298 |
} |
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
28615
diff
changeset
|
299 |
|
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
28615
diff
changeset
|
300 |
return _prefix_type; |
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
28615
diff
changeset
|
301 |
} |
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
28615
diff
changeset
|
302 |
|
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
28615
diff
changeset
|
303 |
int HashtableTextDump::scan_string_prefix() { |
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
304 |
// Expect /[0-9]+: / |
33589
7cbd1b2c139b
8139040: Fix initializations before ShouldNotReachHere() etc. and enable -Wuninitialized on linux.
goetz
parents:
31386
diff
changeset
|
305 |
int utf8_length = 0; |
31345
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
28615
diff
changeset
|
306 |
get_num(':', &utf8_length); |
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
307 |
if (*_p != ' ') { |
31345
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
28615
diff
changeset
|
308 |
corrupted(_p, "Wrong prefix format for string"); |
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
309 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
310 |
_p++; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
311 |
return utf8_length; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
312 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
313 |
|
31345
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
28615
diff
changeset
|
314 |
int HashtableTextDump::scan_symbol_prefix() { |
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
315 |
// Expect /[0-9]+ (-|)[0-9]+: / |
33589
7cbd1b2c139b
8139040: Fix initializations before ShouldNotReachHere() etc. and enable -Wuninitialized on linux.
goetz
parents:
31386
diff
changeset
|
316 |
int utf8_length = 0; |
31345
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
28615
diff
changeset
|
317 |
get_num(' ', &utf8_length); |
33589
7cbd1b2c139b
8139040: Fix initializations before ShouldNotReachHere() etc. and enable -Wuninitialized on linux.
goetz
parents:
31386
diff
changeset
|
318 |
if (*_p == '-') { |
7cbd1b2c139b
8139040: Fix initializations before ShouldNotReachHere() etc. and enable -Wuninitialized on linux.
goetz
parents:
31386
diff
changeset
|
319 |
_p++; |
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
320 |
} |
31345
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
28615
diff
changeset
|
321 |
int ref_num; |
33589
7cbd1b2c139b
8139040: Fix initializations before ShouldNotReachHere() etc. and enable -Wuninitialized on linux.
goetz
parents:
31386
diff
changeset
|
322 |
get_num(':', &ref_num); |
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
323 |
if (*_p != ' ') { |
31345
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
28615
diff
changeset
|
324 |
corrupted(_p, "Wrong prefix format for symbol"); |
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
325 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
326 |
_p++; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
327 |
return utf8_length; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
328 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
329 |
|
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
330 |
jchar HashtableTextDump::unescape(const char* from, const char* end, int count) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
331 |
jchar value = 0; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
332 |
|
35868
bf29f15cdf30
8147500: The HashtableTextDump::get_num() should check for integer overflow
jiangli
parents:
34659
diff
changeset
|
333 |
corrupted_if(from + count > end, "Truncated"); |
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
334 |
|
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
335 |
for (int i=0; i<count; i++) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
336 |
char c = *from++; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
337 |
switch (c) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
338 |
case '0': case '1': case '2': case '3': case '4': |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
339 |
case '5': case '6': case '7': case '8': case '9': |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
340 |
value = (value << 4) + c - '0'; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
341 |
break; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
342 |
case 'a': case 'b': case 'c': |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
343 |
case 'd': case 'e': case 'f': |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
344 |
value = (value << 4) + 10 + c - 'a'; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
345 |
break; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
346 |
case 'A': case 'B': case 'C': |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
347 |
case 'D': case 'E': case 'F': |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
348 |
value = (value << 4) + 10 + c - 'A'; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
349 |
break; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
350 |
default: |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
351 |
ShouldNotReachHere(); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
352 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
353 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
354 |
return value; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
355 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
356 |
|
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
357 |
void HashtableTextDump::get_utf8(char* utf8_buffer, int utf8_length) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
358 |
// cache in local vars |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
359 |
const char* from = _p; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
360 |
const char* end = _end; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
361 |
char* to = utf8_buffer; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
362 |
int n = utf8_length; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
363 |
|
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
364 |
for (; n > 0 && from < end; n--) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
365 |
if (*from != '\\') { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
366 |
*to++ = *from++; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
367 |
} else { |
35868
bf29f15cdf30
8147500: The HashtableTextDump::get_num() should check for integer overflow
jiangli
parents:
34659
diff
changeset
|
368 |
corrupted_if(from + 2 > end, "Truncated"); |
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
369 |
char c = from[1]; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
370 |
from += 2; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
371 |
switch (c) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
372 |
case 'x': |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
373 |
{ |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
374 |
jchar value = unescape(from, end, 2); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
375 |
from += 2; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
376 |
assert(value <= 0xff, "sanity"); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
377 |
*to++ = (char)(value & 0xff); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
378 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
379 |
break; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
380 |
case 't': *to++ = '\t'; break; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
381 |
case 'n': *to++ = '\n'; break; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
382 |
case 'r': *to++ = '\r'; break; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
383 |
case '\\': *to++ = '\\'; break; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
384 |
default: |
31345
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
28615
diff
changeset
|
385 |
corrupted(_p, "Unsupported character"); |
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
386 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
387 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
388 |
} |
35868
bf29f15cdf30
8147500: The HashtableTextDump::get_num() should check for integer overflow
jiangli
parents:
34659
diff
changeset
|
389 |
corrupted_if(n > 0, "Truncated"); // expected more chars but file has ended |
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
390 |
_p = from; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
391 |
skip_newline(); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
392 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
393 |
|
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
394 |
// NOTE: the content is NOT the same as |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
395 |
// UTF8::as_quoted_ascii(const char* utf8_str, int utf8_length, char* buf, int buflen). |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
396 |
// We want to escape \r\n\t so that output [1] is more readable; [2] can be more easily |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
397 |
// parsed by scripts; [3] quickly processed by HashtableTextDump::get_utf8() |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
398 |
void HashtableTextDump::put_utf8(outputStream* st, const char* utf8_string, int utf8_length) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
399 |
const char *c = utf8_string; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
400 |
const char *end = c + utf8_length; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
401 |
for (; c < end; c++) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
402 |
switch (*c) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
403 |
case '\t': st->print("\\t"); break; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
404 |
case '\r': st->print("\\r"); break; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
405 |
case '\n': st->print("\\n"); break; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
406 |
case '\\': st->print("\\\\"); break; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
407 |
default: |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
408 |
if (isprint(*c)) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
409 |
st->print("%c", *c); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
410 |
} else { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
411 |
st->print("\\x%02x", ((unsigned int)*c) & 0xff); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
412 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
413 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
414 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
diff
changeset
|
415 |
} |