archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-17 01:24:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8251557: Avoid dumping unused symbols/strings into the CDS archive

Browse source 
Reviewed-by: minqi, ccheung
This commit is contained in:
Ioi Lam 2020-08-27 22:24:28 -07:00
parent ba7f7fe417
commit 9523001f65
12 changed files with 164 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/hotspot/share/classfile/stringTable.cpp
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -719,10 +719,7 @@ oop StringTable::lookup_shared(const jchar* name, int len, unsigned int hash) {
oop StringTable::create_archived_string(oop s, Thread* THREAD) {
assert(DumpSharedSpaces, "this function is only used with -Xshare:dump");
if (HeapShared::is_archived_object(s)) {
return s;
}
assert(!HeapShared::is_archived_object(s), "sanity");
oop new_s = NULL;
typeArrayOop v = java_lang_String::value_no_keepalive(s);
@ -740,42 +737,34 @@ oop StringTable::create_archived_string(oop s, Thread* THREAD) {
return new_s;
}
struct CopyToArchive : StackObj {
class CopyToArchive : StackObj {
CompactHashtableWriter* _writer;
public:
CopyToArchive(CompactHashtableWriter* writer) : _writer(writer) {}
bool operator()(WeakHandle* val) {
oop s = val->peek();
if (s == NULL) {
return true;
}
bool do_entry(oop s, bool value_ignored) {
assert(s != NULL, "sanity");
unsigned int hash = java_lang_String::hash_code(s);
oop new_s = StringTable::create_archived_string(s, Thread::current());
if (new_s == NULL) {
return true;
}
val->replace(new_s);
// add to the compact table
_writer->add(hash, CompressedOops::encode(new_s));
return true;
}
};
void StringTable::copy_shared_string_table(CompactHashtableWriter* writer) {
assert(HeapShared::is_heap_object_archiving_allowed(), "must be");
CopyToArchive copy(writer);
_local_table->do_safepoint_scan(copy);
}
void StringTable::write_to_archive() {
void StringTable::write_to_archive(const DumpedInternedStrings* dumped_interned_strings) {
assert(HeapShared::is_heap_object_archiving_allowed(), "must be");
_shared_table.reset();
CompactHashtableWriter writer(_items_count, &MetaspaceShared::stats()->string);
// Copy the interned strings into the "string space" within the java heap
copy_shared_string_table(&writer);
CopyToArchive copier(&writer);
dumped_interned_strings->iterate(&copier);
writer.dump(&_shared_table, "string");
}