Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_hotspot
提交
bbb0dffc
D
dragonwell8_hotspot
项目概览
openanolis
/
dragonwell8_hotspot
通知
2
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_hotspot
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
bbb0dffc
编写于
5月 06, 2013
作者:
J
jwilhelm
浏览文件
操作
浏览文件
下载
差异文件
Merge
上级
75f509f9
9df0f0fd
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
50 addition
and
9 deletion
+50
-9
src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
+2
-1
src/share/vm/memory/collectorPolicy.cpp
src/share/vm/memory/collectorPolicy.cpp
+7
-3
src/share/vm/runtime/arguments.cpp
src/share/vm/runtime/arguments.cpp
+5
-5
test/gc/g1/TestRegionAlignment.java
test/gc/g1/TestRegionAlignment.java
+36
-0
未找到文件。
src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
浏览文件 @
bbb0dffc
...
...
@@ -309,7 +309,8 @@ G1CollectorPolicy::G1CollectorPolicy() :
void
G1CollectorPolicy
::
initialize_flags
()
{
set_min_alignment
(
HeapRegion
::
GrainBytes
);
set_max_alignment
(
GenRemSet
::
max_alignment_constraint
(
rem_set_name
()));
size_t
card_table_alignment
=
GenRemSet
::
max_alignment_constraint
(
rem_set_name
());
set_max_alignment
(
MAX2
(
card_table_alignment
,
min_alignment
()));
if
(
SurvivorRatio
<
1
)
{
vm_exit_during_initialization
(
"Invalid survivor ratio specified"
);
}
...
...
src/share/vm/memory/collectorPolicy.cpp
浏览文件 @
bbb0dffc
...
...
@@ -48,6 +48,13 @@
// CollectorPolicy methods.
void
CollectorPolicy
::
initialize_flags
()
{
assert
(
max_alignment
()
>=
min_alignment
(),
err_msg
(
"max_alignment: "
SIZE_FORMAT
" less than min_alignment: "
SIZE_FORMAT
,
max_alignment
(),
min_alignment
()));
assert
(
max_alignment
()
%
min_alignment
()
==
0
,
err_msg
(
"max_alignment: "
SIZE_FORMAT
" not aligned by min_alignment: "
SIZE_FORMAT
,
max_alignment
(),
min_alignment
()));
if
(
MetaspaceSize
>
MaxMetaspaceSize
)
{
MaxMetaspaceSize
=
MetaspaceSize
;
}
...
...
@@ -201,9 +208,6 @@ void GenCollectorPolicy::initialize_flags() {
// All sizes must be multiples of the generation granularity.
set_min_alignment
((
uintx
)
Generation
::
GenGrain
);
set_max_alignment
(
compute_max_alignment
());
assert
(
max_alignment
()
>=
min_alignment
()
&&
max_alignment
()
%
min_alignment
()
==
0
,
"invalid alignment constraints"
);
CollectorPolicy
::
initialize_flags
();
...
...
src/share/vm/runtime/arguments.cpp
浏览文件 @
bbb0dffc
...
...
@@ -747,16 +747,16 @@ void Arguments::add_string(char*** bldarray, int* count, const char* arg) {
return
;
}
int
index
=
*
count
;
int
new_count
=
*
count
+
1
;
// expand the array and add arg to the last element
(
*
count
)
++
;
if
(
*
bldarray
==
NULL
)
{
*
bldarray
=
NEW_C_HEAP_ARRAY
(
char
*
,
*
count
,
mtInternal
);
*
bldarray
=
NEW_C_HEAP_ARRAY
(
char
*
,
new_
count
,
mtInternal
);
}
else
{
*
bldarray
=
REALLOC_C_HEAP_ARRAY
(
char
*
,
*
bldarray
,
*
count
,
mtInternal
);
*
bldarray
=
REALLOC_C_HEAP_ARRAY
(
char
*
,
*
bldarray
,
new_
count
,
mtInternal
);
}
(
*
bldarray
)[
index
]
=
strdup
(
arg
);
(
*
bldarray
)[
*
count
]
=
strdup
(
arg
);
*
count
=
new_count
;
}
void
Arguments
::
build_jvm_args
(
const
char
*
arg
)
{
...
...
test/gc/g1/TestRegionAlignment.java
0 → 100644
浏览文件 @
bbb0dffc
/*
* Copyright (c) 2013, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test TestRegionAlignment.java
* @bug 8013791
* @summary Make sure that G1 ergonomics pick a heap size that is aligned with the region size
* @run main/othervm -XX:+UseG1GC -XX:G1HeapRegionSize=32m -XX:MaxRAM=555m TestRegionAlignment
*
* When G1 ergonomically picks a maximum heap size it must be aligned to the region size.
* This test tries to get the VM to pick a small and unaligned heap size (by using MaxRAM=555) and a
* large region size (by using -XX:G1HeapRegionSize=32m). This will fail without the fix for 8013791.
*/
public
class
TestRegionAlignment
{
public
static
void
main
(
String
[]
args
)
{
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录