Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_hotspot
提交
f5125255
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看板
提交
f5125255
编写于
6月 24, 2010
作者:
J
jmasa
浏览文件
操作
浏览文件
下载
差异文件
Merge
上级
be82a9f4
ba4d6645
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
174 addition
and
82 deletion
+174
-82
src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
+9
-2
src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp
src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp
+3
-3
src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
+90
-27
src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp
src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp
+17
-22
src/share/vm/gc_implementation/g1/g1RemSet.cpp
src/share/vm/gc_implementation/g1/g1RemSet.cpp
+0
-5
src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.cpp
...gc_implementation/parallelScavenge/cardTableExtension.cpp
+20
-8
src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.hpp
...gc_implementation/parallelScavenge/cardTableExtension.hpp
+4
-2
src/share/vm/memory/cardTableModRefBS.cpp
src/share/vm/memory/cardTableModRefBS.cpp
+30
-7
src/share/vm/runtime/arguments.cpp
src/share/vm/runtime/arguments.cpp
+0
-5
src/share/vm/runtime/globals.hpp
src/share/vm/runtime/globals.hpp
+1
-1
未找到文件。
src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
浏览文件 @
f5125255
...
@@ -3972,6 +3972,10 @@ public:
...
@@ -3972,6 +3972,10 @@ public:
void
work
(
int
i
)
{
void
work
(
int
i
)
{
if
(
i
>=
_n_workers
)
return
;
// no work needed this round
if
(
i
>=
_n_workers
)
return
;
// no work needed this round
double
start_time_ms
=
os
::
elapsedTime
()
*
1000.0
;
_g1h
->
g1_policy
()
->
record_gc_worker_start_time
(
i
,
start_time_ms
);
ResourceMark
rm
;
ResourceMark
rm
;
HandleMark
hm
;
HandleMark
hm
;
...
@@ -4019,7 +4023,7 @@ public:
...
@@ -4019,7 +4023,7 @@ public:
double
elapsed_ms
=
(
os
::
elapsedTime
()
-
start
)
*
1000.0
;
double
elapsed_ms
=
(
os
::
elapsedTime
()
-
start
)
*
1000.0
;
double
term_ms
=
pss
.
term_time
()
*
1000.0
;
double
term_ms
=
pss
.
term_time
()
*
1000.0
;
_g1h
->
g1_policy
()
->
record_obj_copy_time
(
i
,
elapsed_ms
-
term_ms
);
_g1h
->
g1_policy
()
->
record_obj_copy_time
(
i
,
elapsed_ms
-
term_ms
);
_g1h
->
g1_policy
()
->
record_termination
_time
(
i
,
term_ms
);
_g1h
->
g1_policy
()
->
record_termination
(
i
,
term_ms
,
pss
.
term_attempts
()
);
}
}
_g1h
->
g1_policy
()
->
record_thread_age_table
(
pss
.
age_table
());
_g1h
->
g1_policy
()
->
record_thread_age_table
(
pss
.
age_table
());
_g1h
->
update_surviving_young_words
(
pss
.
surviving_young_words
()
+
1
);
_g1h
->
update_surviving_young_words
(
pss
.
surviving_young_words
()
+
1
);
...
@@ -4043,7 +4047,8 @@ public:
...
@@ -4043,7 +4047,8 @@ public:
double
term
=
pss
.
term_time
();
double
term
=
pss
.
term_time
();
gclog_or_tty
->
print
(
" Elapsed: %7.2f ms.
\n
"
gclog_or_tty
->
print
(
" Elapsed: %7.2f ms.
\n
"
" Strong roots: %7.2f ms (%6.2f%%)
\n
"
" Strong roots: %7.2f ms (%6.2f%%)
\n
"
" Termination: %7.2f ms (%6.2f%%) (in %d entries)
\n
"
,
" Termination: %7.2f ms (%6.2f%%) "
"(in "
SIZE_FORMAT
" entries)
\n
"
,
elapsed
*
1000.0
,
elapsed
*
1000.0
,
strong_roots
*
1000.0
,
(
strong_roots
*
100.0
/
elapsed
),
strong_roots
*
1000.0
,
(
strong_roots
*
100.0
/
elapsed
),
term
*
1000.0
,
(
term
*
100.0
/
elapsed
),
term
*
1000.0
,
(
term
*
100.0
/
elapsed
),
...
@@ -4059,6 +4064,8 @@ public:
...
@@ -4059,6 +4064,8 @@ public:
assert
(
pss
.
refs_to_scan
()
==
0
,
"Task queue should be empty"
);
assert
(
pss
.
refs_to_scan
()
==
0
,
"Task queue should be empty"
);
assert
(
pss
.
overflowed_refs_to_scan
()
==
0
,
"Overflow queue should be empty"
);
assert
(
pss
.
overflowed_refs_to_scan
()
==
0
,
"Overflow queue should be empty"
);
double
end_time_ms
=
os
::
elapsedTime
()
*
1000.0
;
_g1h
->
g1_policy
()
->
record_gc_worker_end_time
(
i
,
end_time_ms
);
}
}
};
};
...
...
src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp
浏览文件 @
f5125255
...
@@ -1549,7 +1549,7 @@ protected:
...
@@ -1549,7 +1549,7 @@ protected:
int
_hash_seed
;
int
_hash_seed
;
int
_queue_num
;
int
_queue_num
;
in
t
_term_attempts
;
size_
t
_term_attempts
;
#if G1_DETAILED_STATS
#if G1_DETAILED_STATS
int
_pushes
,
_pops
,
_steals
,
_steal_attempts
;
int
_pushes
,
_pops
,
_steals
,
_steal_attempts
;
int
_overflow_pushes
;
int
_overflow_pushes
;
...
@@ -1727,8 +1727,8 @@ public:
...
@@ -1727,8 +1727,8 @@ public:
int
*
hash_seed
()
{
return
&
_hash_seed
;
}
int
*
hash_seed
()
{
return
&
_hash_seed
;
}
int
queue_num
()
{
return
_queue_num
;
}
int
queue_num
()
{
return
_queue_num
;
}
in
t
term_attempts
()
{
return
_term_attempts
;
}
size_
t
term_attempts
()
{
return
_term_attempts
;
}
void
note_term_attempt
()
{
_term_attempts
++
;
}
void
note_term_attempt
()
{
_term_attempts
++
;
}
#if G1_DETAILED_STATS
#if G1_DETAILED_STATS
int
pushes
()
{
return
_pushes
;
}
int
pushes
()
{
return
_pushes
;
}
...
...
src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
浏览文件 @
f5125255
...
@@ -231,20 +231,21 @@ G1CollectorPolicy::G1CollectorPolicy() :
...
@@ -231,20 +231,21 @@ G1CollectorPolicy::G1CollectorPolicy() :
_recent_prev_end_times_for_all_gcs_sec
->
add
(
os
::
elapsedTime
());
_recent_prev_end_times_for_all_gcs_sec
->
add
(
os
::
elapsedTime
());
_prev_collection_pause_end_ms
=
os
::
elapsedTime
()
*
1000.0
;
_prev_collection_pause_end_ms
=
os
::
elapsedTime
()
*
1000.0
;
_par_last_gc_worker_start_times_ms
=
new
double
[
_parallel_gc_threads
];
_par_last_ext_root_scan_times_ms
=
new
double
[
_parallel_gc_threads
];
_par_last_ext_root_scan_times_ms
=
new
double
[
_parallel_gc_threads
];
_par_last_mark_stack_scan_times_ms
=
new
double
[
_parallel_gc_threads
];
_par_last_mark_stack_scan_times_ms
=
new
double
[
_parallel_gc_threads
];
_par_last_update_rs_start_times_ms
=
new
double
[
_parallel_gc_threads
];
_par_last_update_rs_times_ms
=
new
double
[
_parallel_gc_threads
];
_par_last_update_rs_times_ms
=
new
double
[
_parallel_gc_threads
];
_par_last_update_rs_processed_buffers
=
new
double
[
_parallel_gc_threads
];
_par_last_update_rs_processed_buffers
=
new
double
[
_parallel_gc_threads
];
_par_last_scan_rs_start_times_ms
=
new
double
[
_parallel_gc_threads
];
_par_last_scan_rs_times_ms
=
new
double
[
_parallel_gc_threads
];
_par_last_scan_rs_times_ms
=
new
double
[
_parallel_gc_threads
];
_par_last_scan_new_refs_times_ms
=
new
double
[
_parallel_gc_threads
];
_par_last_scan_new_refs_times_ms
=
new
double
[
_parallel_gc_threads
];
_par_last_obj_copy_times_ms
=
new
double
[
_parallel_gc_threads
];
_par_last_obj_copy_times_ms
=
new
double
[
_parallel_gc_threads
];
_par_last_termination_times_ms
=
new
double
[
_parallel_gc_threads
];
_par_last_termination_times_ms
=
new
double
[
_parallel_gc_threads
];
_par_last_termination_attempts
=
new
double
[
_parallel_gc_threads
];
_par_last_gc_worker_end_times_ms
=
new
double
[
_parallel_gc_threads
];
// start conservatively
// start conservatively
_expensive_region_limit_ms
=
0.5
*
(
double
)
MaxGCPauseMillis
;
_expensive_region_limit_ms
=
0.5
*
(
double
)
MaxGCPauseMillis
;
...
@@ -274,10 +275,64 @@ G1CollectorPolicy::G1CollectorPolicy() :
...
@@ -274,10 +275,64 @@ G1CollectorPolicy::G1CollectorPolicy() :
// </NEW PREDICTION>
// </NEW PREDICTION>
double
time_slice
=
(
double
)
GCPauseIntervalMillis
/
1000.0
;
// Below, we might need to calculate the pause time target based on
// the pause interval. When we do so we are going to give G1 maximum
// flexibility and allow it to do pauses when it needs to. So, we'll
// arrange that the pause interval to be pause time target + 1 to
// ensure that a) the pause time target is maximized with respect to
// the pause interval and b) we maintain the invariant that pause
// time target < pause interval. If the user does not want this
// maximum flexibility, they will have to set the pause interval
// explicitly.
// First make sure that, if either parameter is set, its value is
// reasonable.
if
(
!
FLAG_IS_DEFAULT
(
MaxGCPauseMillis
))
{
if
(
MaxGCPauseMillis
<
1
)
{
vm_exit_during_initialization
(
"MaxGCPauseMillis should be "
"greater than 0"
);
}
}
if
(
!
FLAG_IS_DEFAULT
(
GCPauseIntervalMillis
))
{
if
(
GCPauseIntervalMillis
<
1
)
{
vm_exit_during_initialization
(
"GCPauseIntervalMillis should be "
"greater than 0"
);
}
}
// Then, if the pause time target parameter was not set, set it to
// the default value.
if
(
FLAG_IS_DEFAULT
(
MaxGCPauseMillis
))
{
if
(
FLAG_IS_DEFAULT
(
GCPauseIntervalMillis
))
{
// The default pause time target in G1 is 200ms
FLAG_SET_DEFAULT
(
MaxGCPauseMillis
,
200
);
}
else
{
// We do not allow the pause interval to be set without the
// pause time target
vm_exit_during_initialization
(
"GCPauseIntervalMillis cannot be set "
"without setting MaxGCPauseMillis"
);
}
}
// Then, if the interval parameter was not set, set it according to
// the pause time target (this will also deal with the case when the
// pause time target is the default value).
if
(
FLAG_IS_DEFAULT
(
GCPauseIntervalMillis
))
{
FLAG_SET_DEFAULT
(
GCPauseIntervalMillis
,
MaxGCPauseMillis
+
1
);
}
// Finally, make sure that the two parameters are consistent.
if
(
MaxGCPauseMillis
>=
GCPauseIntervalMillis
)
{
char
buffer
[
256
];
jio_snprintf
(
buffer
,
256
,
"MaxGCPauseMillis (%u) should be less than "
"GCPauseIntervalMillis (%u)"
,
MaxGCPauseMillis
,
GCPauseIntervalMillis
);
vm_exit_during_initialization
(
buffer
);
}
double
max_gc_time
=
(
double
)
MaxGCPauseMillis
/
1000.0
;
double
max_gc_time
=
(
double
)
MaxGCPauseMillis
/
1000.0
;
guarantee
(
max_gc_time
<
time_slice
,
double
time_slice
=
(
double
)
GCPauseIntervalMillis
/
1000.0
;
"Max GC time should not be greater than the time slice"
);
_mmu_tracker
=
new
G1MMUTrackerQueue
(
time_slice
,
max_gc_time
);
_mmu_tracker
=
new
G1MMUTrackerQueue
(
time_slice
,
max_gc_time
);
_sigma
=
(
double
)
G1ConfidencePercent
/
100.0
;
_sigma
=
(
double
)
G1ConfidencePercent
/
100.0
;
...
@@ -782,16 +837,17 @@ void G1CollectorPolicy::record_collection_pause_start(double start_time_sec,
...
@@ -782,16 +837,17 @@ void G1CollectorPolicy::record_collection_pause_start(double start_time_sec,
// if they are not set properly
// if they are not set properly
for
(
int
i
=
0
;
i
<
_parallel_gc_threads
;
++
i
)
{
for
(
int
i
=
0
;
i
<
_parallel_gc_threads
;
++
i
)
{
_par_last_ext_root_scan_times_ms
[
i
]
=
-
666.0
;
_par_last_gc_worker_start_times_ms
[
i
]
=
-
1234.0
;
_par_last_mark_stack_scan_times_ms
[
i
]
=
-
666.0
;
_par_last_ext_root_scan_times_ms
[
i
]
=
-
1234.0
;
_par_last_update_rs_start_times_ms
[
i
]
=
-
666.0
;
_par_last_mark_stack_scan_times_ms
[
i
]
=
-
1234.0
;
_par_last_update_rs_times_ms
[
i
]
=
-
666.0
;
_par_last_update_rs_times_ms
[
i
]
=
-
1234.0
;
_par_last_update_rs_processed_buffers
[
i
]
=
-
666.0
;
_par_last_update_rs_processed_buffers
[
i
]
=
-
1234.0
;
_par_last_scan_rs_start_times_ms
[
i
]
=
-
666.0
;
_par_last_scan_rs_times_ms
[
i
]
=
-
1234.0
;
_par_last_scan_rs_times_ms
[
i
]
=
-
666.0
;
_par_last_scan_new_refs_times_ms
[
i
]
=
-
1234.0
;
_par_last_scan_new_refs_times_ms
[
i
]
=
-
666.0
;
_par_last_obj_copy_times_ms
[
i
]
=
-
1234.0
;
_par_last_obj_copy_times_ms
[
i
]
=
-
666.0
;
_par_last_termination_times_ms
[
i
]
=
-
1234.0
;
_par_last_termination_times_ms
[
i
]
=
-
666.0
;
_par_last_termination_attempts
[
i
]
=
-
1234.0
;
_par_last_gc_worker_end_times_ms
[
i
]
=
-
1234.0
;
}
}
#endif
#endif
...
@@ -942,9 +998,9 @@ T sum_of(T* sum_arr, int start, int n, int N) {
...
@@ -942,9 +998,9 @@ T sum_of(T* sum_arr, int start, int n, int N) {
return
sum
;
return
sum
;
}
}
void
G1CollectorPolicy
::
print_par_stats
(
int
level
,
void
G1CollectorPolicy
::
print_par_stats
(
int
level
,
const
char
*
str
,
const
char
*
str
,
double
*
data
,
double
*
data
,
bool
summary
)
{
bool
summary
)
{
double
min
=
data
[
0
],
max
=
data
[
0
];
double
min
=
data
[
0
],
max
=
data
[
0
];
double
total
=
0.0
;
double
total
=
0.0
;
...
@@ -973,10 +1029,10 @@ void G1CollectorPolicy::print_par_stats (int level,
...
@@ -973,10 +1029,10 @@ void G1CollectorPolicy::print_par_stats (int level,
gclog_or_tty
->
print_cr
(
"]"
);
gclog_or_tty
->
print_cr
(
"]"
);
}
}
void
G1CollectorPolicy
::
print_par_
buffers
(
int
level
,
void
G1CollectorPolicy
::
print_par_
sizes
(
int
level
,
const
char
*
str
,
const
char
*
str
,
double
*
data
,
double
*
data
,
bool
summary
)
{
bool
summary
)
{
double
min
=
data
[
0
],
max
=
data
[
0
];
double
min
=
data
[
0
],
max
=
data
[
0
];
double
total
=
0.0
;
double
total
=
0.0
;
int
j
;
int
j
;
...
@@ -1321,15 +1377,22 @@ void G1CollectorPolicy::record_collection_pause_end(bool abandoned) {
...
@@ -1321,15 +1377,22 @@ void G1CollectorPolicy::record_collection_pause_end(bool abandoned) {
}
}
if
(
parallel
)
{
if
(
parallel
)
{
print_stats
(
1
,
"Parallel Time"
,
_cur_collection_par_time_ms
);
print_stats
(
1
,
"Parallel Time"
,
_cur_collection_par_time_ms
);
print_par_stats
(
2
,
"Update RS (Start)"
,
_par_last_update_rs_start_times_ms
,
false
);
print_par_stats
(
2
,
"GC Worker Start Time"
,
_par_last_gc_worker_start_times_ms
,
false
);
print_par_stats
(
2
,
"Update RS"
,
_par_last_update_rs_times_ms
);
print_par_stats
(
2
,
"Update RS"
,
_par_last_update_rs_times_ms
);
print_par_buffers
(
3
,
"Processed Buffers"
,
print_par_sizes
(
3
,
"Processed Buffers"
,
_par_last_update_rs_processed_buffers
,
true
);
_par_last_update_rs_processed_buffers
,
true
);
print_par_stats
(
2
,
"Ext Root Scanning"
,
_par_last_ext_root_scan_times_ms
);
print_par_stats
(
2
,
"Ext Root Scanning"
,
print_par_stats
(
2
,
"Mark Stack Scanning"
,
_par_last_mark_stack_scan_times_ms
);
_par_last_ext_root_scan_times_ms
);
print_par_stats
(
2
,
"Mark Stack Scanning"
,
_par_last_mark_stack_scan_times_ms
);
print_par_stats
(
2
,
"Scan RS"
,
_par_last_scan_rs_times_ms
);
print_par_stats
(
2
,
"Scan RS"
,
_par_last_scan_rs_times_ms
);
print_par_stats
(
2
,
"Object Copy"
,
_par_last_obj_copy_times_ms
);
print_par_stats
(
2
,
"Object Copy"
,
_par_last_obj_copy_times_ms
);
print_par_stats
(
2
,
"Termination"
,
_par_last_termination_times_ms
);
print_par_stats
(
2
,
"Termination"
,
_par_last_termination_times_ms
);
print_par_sizes
(
3
,
"Termination Attempts"
,
_par_last_termination_attempts
,
true
);
print_par_stats
(
2
,
"GC Worker End Time"
,
_par_last_gc_worker_end_times_ms
,
false
);
print_stats
(
2
,
"Other"
,
parallel_other_time
);
print_stats
(
2
,
"Other"
,
parallel_other_time
);
print_stats
(
1
,
"Clear CT"
,
_cur_clear_ct_time_ms
);
print_stats
(
1
,
"Clear CT"
,
_cur_clear_ct_time_ms
);
}
else
{
}
else
{
...
...
src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp
浏览文件 @
f5125255
...
@@ -171,16 +171,17 @@ protected:
...
@@ -171,16 +171,17 @@ protected:
double
*
_cur_aux_times_ms
;
double
*
_cur_aux_times_ms
;
bool
*
_cur_aux_times_set
;
bool
*
_cur_aux_times_set
;
double
*
_par_last_gc_worker_start_times_ms
;
double
*
_par_last_ext_root_scan_times_ms
;
double
*
_par_last_ext_root_scan_times_ms
;
double
*
_par_last_mark_stack_scan_times_ms
;
double
*
_par_last_mark_stack_scan_times_ms
;
double
*
_par_last_update_rs_start_times_ms
;
double
*
_par_last_update_rs_times_ms
;
double
*
_par_last_update_rs_times_ms
;
double
*
_par_last_update_rs_processed_buffers
;
double
*
_par_last_update_rs_processed_buffers
;
double
*
_par_last_scan_rs_start_times_ms
;
double
*
_par_last_scan_rs_times_ms
;
double
*
_par_last_scan_rs_times_ms
;
double
*
_par_last_scan_new_refs_times_ms
;
double
*
_par_last_scan_new_refs_times_ms
;
double
*
_par_last_obj_copy_times_ms
;
double
*
_par_last_obj_copy_times_ms
;
double
*
_par_last_termination_times_ms
;
double
*
_par_last_termination_times_ms
;
double
*
_par_last_termination_attempts
;
double
*
_par_last_gc_worker_end_times_ms
;
// indicates that we are in young GC mode
// indicates that we are in young GC mode
bool
_in_young_gc_mode
;
bool
_in_young_gc_mode
;
...
@@ -559,13 +560,14 @@ public:
...
@@ -559,13 +560,14 @@ public:
}
}
protected:
protected:
void
print_stats
(
int
level
,
const
char
*
str
,
double
value
);
void
print_stats
(
int
level
,
const
char
*
str
,
double
value
);
void
print_stats
(
int
level
,
const
char
*
str
,
int
value
);
void
print_stats
(
int
level
,
const
char
*
str
,
int
value
);
void
print_par_stats
(
int
level
,
const
char
*
str
,
double
*
data
)
{
void
print_par_stats
(
int
level
,
const
char
*
str
,
double
*
data
)
{
print_par_stats
(
level
,
str
,
data
,
true
);
print_par_stats
(
level
,
str
,
data
,
true
);
}
}
void
print_par_stats
(
int
level
,
const
char
*
str
,
double
*
data
,
bool
summary
);
void
print_par_stats
(
int
level
,
const
char
*
str
,
double
*
data
,
bool
summary
);
void
print_par_
buffers
(
int
level
,
const
char
*
str
,
double
*
data
,
bool
summary
);
void
print_par_
sizes
(
int
level
,
const
char
*
str
,
double
*
data
,
bool
summary
);
void
check_other_times
(
int
level
,
void
check_other_times
(
int
level
,
NumberSeq
*
other_times_ms
,
NumberSeq
*
other_times_ms
,
...
@@ -891,6 +893,10 @@ public:
...
@@ -891,6 +893,10 @@ public:
virtual
void
record_full_collection_start
();
virtual
void
record_full_collection_start
();
virtual
void
record_full_collection_end
();
virtual
void
record_full_collection_end
();
void
record_gc_worker_start_time
(
int
worker_i
,
double
ms
)
{
_par_last_gc_worker_start_times_ms
[
worker_i
]
=
ms
;
}
void
record_ext_root_scan_time
(
int
worker_i
,
double
ms
)
{
void
record_ext_root_scan_time
(
int
worker_i
,
double
ms
)
{
_par_last_ext_root_scan_times_ms
[
worker_i
]
=
ms
;
_par_last_ext_root_scan_times_ms
[
worker_i
]
=
ms
;
}
}
...
@@ -912,10 +918,6 @@ public:
...
@@ -912,10 +918,6 @@ public:
_all_mod_union_times_ms
->
add
(
ms
);
_all_mod_union_times_ms
->
add
(
ms
);
}
}
void
record_update_rs_start_time
(
int
thread
,
double
ms
)
{
_par_last_update_rs_start_times_ms
[
thread
]
=
ms
;
}
void
record_update_rs_time
(
int
thread
,
double
ms
)
{
void
record_update_rs_time
(
int
thread
,
double
ms
)
{
_par_last_update_rs_times_ms
[
thread
]
=
ms
;
_par_last_update_rs_times_ms
[
thread
]
=
ms
;
}
}
...
@@ -925,10 +927,6 @@ public:
...
@@ -925,10 +927,6 @@ public:
_par_last_update_rs_processed_buffers
[
thread
]
=
processed_buffers
;
_par_last_update_rs_processed_buffers
[
thread
]
=
processed_buffers
;
}
}
void
record_scan_rs_start_time
(
int
thread
,
double
ms
)
{
_par_last_scan_rs_start_times_ms
[
thread
]
=
ms
;
}
void
record_scan_rs_time
(
int
thread
,
double
ms
)
{
void
record_scan_rs_time
(
int
thread
,
double
ms
)
{
_par_last_scan_rs_times_ms
[
thread
]
=
ms
;
_par_last_scan_rs_times_ms
[
thread
]
=
ms
;
}
}
...
@@ -953,16 +951,13 @@ public:
...
@@ -953,16 +951,13 @@ public:
_par_last_obj_copy_times_ms
[
thread
]
+=
ms
;
_par_last_obj_copy_times_ms
[
thread
]
+=
ms
;
}
}
void
record_obj_copy_time
(
double
ms
)
{
void
record_termination
(
int
thread
,
double
ms
,
size_t
attempts
)
{
record_obj_copy_time
(
0
,
ms
);
}
void
record_termination_time
(
int
thread
,
double
ms
)
{
_par_last_termination_times_ms
[
thread
]
=
ms
;
_par_last_termination_times_ms
[
thread
]
=
ms
;
_par_last_termination_attempts
[
thread
]
=
(
double
)
attempts
;
}
}
void
record_
termination_time
(
double
ms
)
{
void
record_
gc_worker_end_time
(
int
worker_i
,
double
ms
)
{
record_termination_time
(
0
,
ms
)
;
_par_last_gc_worker_end_times_ms
[
worker_i
]
=
ms
;
}
}
void
record_pause_time_ms
(
double
ms
)
{
void
record_pause_time_ms
(
double
ms
)
{
...
...
src/share/vm/gc_implementation/g1/g1RemSet.cpp
浏览文件 @
f5125255
...
@@ -303,7 +303,6 @@ void HRInto_G1RemSet::scanRS(OopsInHeapRegionClosure* oc, int worker_i) {
...
@@ -303,7 +303,6 @@ void HRInto_G1RemSet::scanRS(OopsInHeapRegionClosure* oc, int worker_i) {
assert
(
_cards_scanned
!=
NULL
,
"invariant"
);
assert
(
_cards_scanned
!=
NULL
,
"invariant"
);
_cards_scanned
[
worker_i
]
=
scanRScl
.
cards_done
();
_cards_scanned
[
worker_i
]
=
scanRScl
.
cards_done
();
_g1p
->
record_scan_rs_start_time
(
worker_i
,
rs_time_start
*
1000.0
);
_g1p
->
record_scan_rs_time
(
worker_i
,
scan_rs_time_sec
*
1000.0
);
_g1p
->
record_scan_rs_time
(
worker_i
,
scan_rs_time_sec
*
1000.0
);
}
}
...
@@ -311,8 +310,6 @@ void HRInto_G1RemSet::updateRS(int worker_i) {
...
@@ -311,8 +310,6 @@ void HRInto_G1RemSet::updateRS(int worker_i) {
ConcurrentG1Refine
*
cg1r
=
_g1
->
concurrent_g1_refine
();
ConcurrentG1Refine
*
cg1r
=
_g1
->
concurrent_g1_refine
();
double
start
=
os
::
elapsedTime
();
double
start
=
os
::
elapsedTime
();
_g1p
->
record_update_rs_start_time
(
worker_i
,
start
*
1000.0
);
// Apply the appropriate closure to all remaining log entries.
// Apply the appropriate closure to all remaining log entries.
_g1
->
iterate_dirty_card_closure
(
false
,
worker_i
);
_g1
->
iterate_dirty_card_closure
(
false
,
worker_i
);
// Now there should be no dirty cards.
// Now there should be no dirty cards.
...
@@ -471,7 +468,6 @@ HRInto_G1RemSet::oops_into_collection_set_do(OopsInHeapRegionClosure* oc,
...
@@ -471,7 +468,6 @@ HRInto_G1RemSet::oops_into_collection_set_do(OopsInHeapRegionClosure* oc,
updateRS
(
worker_i
);
updateRS
(
worker_i
);
scanNewRefsRS
(
oc
,
worker_i
);
scanNewRefsRS
(
oc
,
worker_i
);
}
else
{
}
else
{
_g1p
->
record_update_rs_start_time
(
worker_i
,
os
::
elapsedTime
()
*
1000.0
);
_g1p
->
record_update_rs_processed_buffers
(
worker_i
,
0.0
);
_g1p
->
record_update_rs_processed_buffers
(
worker_i
,
0.0
);
_g1p
->
record_update_rs_time
(
worker_i
,
0.0
);
_g1p
->
record_update_rs_time
(
worker_i
,
0.0
);
_g1p
->
record_scan_new_refs_time
(
worker_i
,
0.0
);
_g1p
->
record_scan_new_refs_time
(
worker_i
,
0.0
);
...
@@ -479,7 +475,6 @@ HRInto_G1RemSet::oops_into_collection_set_do(OopsInHeapRegionClosure* oc,
...
@@ -479,7 +475,6 @@ HRInto_G1RemSet::oops_into_collection_set_do(OopsInHeapRegionClosure* oc,
if
(
G1UseParallelRSetScanning
||
(
worker_i
==
0
))
{
if
(
G1UseParallelRSetScanning
||
(
worker_i
==
0
))
{
scanRS
(
oc
,
worker_i
);
scanRS
(
oc
,
worker_i
);
}
else
{
}
else
{
_g1p
->
record_scan_rs_start_time
(
worker_i
,
os
::
elapsedTime
()
*
1000.0
);
_g1p
->
record_scan_rs_time
(
worker_i
,
0.0
);
_g1p
->
record_scan_rs_time
(
worker_i
,
0.0
);
}
}
}
else
{
}
else
{
...
...
src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.cpp
浏览文件 @
f5125255
/*
/*
* Copyright (c) 2001, 20
08
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 20
10
, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
*
* This code is free software; you can redistribute it and/or modify it
* This code is free software; you can redistribute it and/or modify it
...
@@ -566,14 +566,14 @@ void CardTableExtension::resize_covered_region_by_end(int changed_region,
...
@@ -566,14 +566,14 @@ void CardTableExtension::resize_covered_region_by_end(int changed_region,
#endif
#endif
// Commit new or uncommit old pages, if necessary.
// Commit new or uncommit old pages, if necessary.
resize_commit_uncommit
(
changed_region
,
new_region
);
if
(
resize_commit_uncommit
(
changed_region
,
new_region
))
{
// Set the new start of the committed region
resize_update_committed_table
(
changed_region
,
new_region
);
}
// Update card table entries
// Update card table entries
resize_update_card_table_entries
(
changed_region
,
new_region
);
resize_update_card_table_entries
(
changed_region
,
new_region
);
// Set the new start of the committed region
resize_update_committed_table
(
changed_region
,
new_region
);
// Update the covered region
// Update the covered region
resize_update_covered_table
(
changed_region
,
new_region
);
resize_update_covered_table
(
changed_region
,
new_region
);
...
@@ -604,8 +604,9 @@ void CardTableExtension::resize_covered_region_by_end(int changed_region,
...
@@ -604,8 +604,9 @@ void CardTableExtension::resize_covered_region_by_end(int changed_region,
debug_only
(
verify_guard
();)
debug_only
(
verify_guard
();)
}
}
void
CardTableExtension
::
resize_commit_uncommit
(
int
changed_region
,
bool
CardTableExtension
::
resize_commit_uncommit
(
int
changed_region
,
MemRegion
new_region
)
{
MemRegion
new_region
)
{
bool
result
=
false
;
// Commit new or uncommit old pages, if necessary.
// Commit new or uncommit old pages, if necessary.
MemRegion
cur_committed
=
_committed
[
changed_region
];
MemRegion
cur_committed
=
_committed
[
changed_region
];
assert
(
_covered
[
changed_region
].
end
()
==
new_region
.
end
(),
assert
(
_covered
[
changed_region
].
end
()
==
new_region
.
end
(),
...
@@ -675,20 +676,31 @@ void CardTableExtension::resize_commit_uncommit(int changed_region,
...
@@ -675,20 +676,31 @@ void CardTableExtension::resize_commit_uncommit(int changed_region,
"card table expansion"
);
"card table expansion"
);
}
}
}
}
result
=
true
;
}
else
if
(
new_start_aligned
>
cur_committed
.
start
())
{
}
else
if
(
new_start_aligned
>
cur_committed
.
start
())
{
// Shrink the committed region
// Shrink the committed region
#if 0 // uncommitting space is currently unsafe because of the interactions
// of growing and shrinking regions. One region A can uncommit space
// that it owns but which is being used by another region B (maybe).
// Region B has not committed the space because it was already
// committed by region A.
MemRegion uncommit_region = committed_unique_to_self(changed_region,
MemRegion uncommit_region = committed_unique_to_self(changed_region,
MemRegion(cur_committed.start(), new_start_aligned));
MemRegion(cur_committed.start(), new_start_aligned));
if (!uncommit_region.is_empty()) {
if (!uncommit_region.is_empty()) {
if (!os::uncommit_memory((char*)uncommit_region.start(),
if (!os::uncommit_memory((char*)uncommit_region.start(),
uncommit_region.byte_size())) {
uncommit_region.byte_size())) {
vm_exit_out_of_memory
(
uncommit_region
.
byte_size
(),
// If the uncommit fails, ignore it. Let the
"card table contraction"
);
// committed table resizing go even though the committed
// table will over state the committed space.
}
}
}
}
#else
assert
(
!
result
,
"Should be false with current workaround"
);
#endif
}
}
assert
(
_committed
[
changed_region
].
end
()
==
cur_committed
.
end
(),
assert
(
_committed
[
changed_region
].
end
()
==
cur_committed
.
end
(),
"end should not change"
);
"end should not change"
);
return
result
;
}
}
void
CardTableExtension
::
resize_update_committed_table
(
int
changed_region
,
void
CardTableExtension
::
resize_update_committed_table
(
int
changed_region
,
...
...
src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.hpp
浏览文件 @
f5125255
/*
/*
* Copyright (c) 2001, 20
08
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 20
10
, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
*
* This code is free software; you can redistribute it and/or modify it
* This code is free software; you can redistribute it and/or modify it
...
@@ -30,7 +30,9 @@ class GCTaskQueue;
...
@@ -30,7 +30,9 @@ class GCTaskQueue;
class
CardTableExtension
:
public
CardTableModRefBS
{
class
CardTableExtension
:
public
CardTableModRefBS
{
private:
private:
// Support methods for resizing the card table.
// Support methods for resizing the card table.
void
resize_commit_uncommit
(
int
changed_region
,
MemRegion
new_region
);
// resize_commit_uncommit() returns true if the pages were committed or
// uncommitted
bool
resize_commit_uncommit
(
int
changed_region
,
MemRegion
new_region
);
void
resize_update_card_table_entries
(
int
changed_region
,
void
resize_update_card_table_entries
(
int
changed_region
,
MemRegion
new_region
);
MemRegion
new_region
);
void
resize_update_committed_table
(
int
changed_region
,
MemRegion
new_region
);
void
resize_update_committed_table
(
int
changed_region
,
MemRegion
new_region
);
...
...
src/share/vm/memory/cardTableModRefBS.cpp
浏览文件 @
f5125255
/*
/*
* Copyright (c) 2000, 20
09
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 20
10
, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
*
* This code is free software; you can redistribute it and/or modify it
* This code is free software; you can redistribute it and/or modify it
...
@@ -284,12 +284,19 @@ void CardTableModRefBS::resize_covered_region(MemRegion new_region) {
...
@@ -284,12 +284,19 @@ void CardTableModRefBS::resize_covered_region(MemRegion new_region) {
committed_unique_to_self
(
ind
,
MemRegion
(
new_end_aligned
,
committed_unique_to_self
(
ind
,
MemRegion
(
new_end_aligned
,
cur_committed
.
end
()));
cur_committed
.
end
()));
if
(
!
uncommit_region
.
is_empty
())
{
if
(
!
uncommit_region
.
is_empty
())
{
if
(
!
os
::
uncommit_memory
((
char
*
)
uncommit_region
.
start
(),
// It is not safe to uncommit cards if the boundary between
uncommit_region
.
byte_size
()))
{
// the generations is moving. A shrink can uncommit cards
assert
(
false
,
"Card table contraction failed"
);
// owned by generation A but being used by generation B.
// The call failed so don't change the end of the
if
(
!
UseAdaptiveGCBoundary
)
{
// committed region. This is better than taking the
if
(
!
os
::
uncommit_memory
((
char
*
)
uncommit_region
.
start
(),
// VM down.
uncommit_region
.
byte_size
()))
{
assert
(
false
,
"Card table contraction failed"
);
// The call failed so don't change the end of the
// committed region. This is better than taking the
// VM down.
new_end_aligned
=
_committed
[
ind
].
end
();
}
}
else
{
new_end_aligned
=
_committed
[
ind
].
end
();
new_end_aligned
=
_committed
[
ind
].
end
();
}
}
}
}
...
@@ -297,6 +304,19 @@ void CardTableModRefBS::resize_covered_region(MemRegion new_region) {
...
@@ -297,6 +304,19 @@ void CardTableModRefBS::resize_covered_region(MemRegion new_region) {
// In any case, we can reset the end of the current committed entry.
// In any case, we can reset the end of the current committed entry.
_committed
[
ind
].
set_end
(
new_end_aligned
);
_committed
[
ind
].
set_end
(
new_end_aligned
);
#ifdef ASSERT
// Check that the last card in the new region is committed according
// to the tables.
bool
covered
=
false
;
for
(
int
cr
=
0
;
cr
<
_cur_covered_regions
;
cr
++
)
{
if
(
_committed
[
cr
].
contains
(
new_end
-
1
))
{
covered
=
true
;
break
;
}
}
assert
(
covered
,
"Card for end of new region not committed"
);
#endif
// The default of 0 is not necessarily clean cards.
// The default of 0 is not necessarily clean cards.
jbyte
*
entry
;
jbyte
*
entry
;
if
(
old_region
.
last
()
<
_whole_heap
.
start
())
{
if
(
old_region
.
last
()
<
_whole_heap
.
start
())
{
...
@@ -354,6 +374,9 @@ void CardTableModRefBS::resize_covered_region(MemRegion new_region) {
...
@@ -354,6 +374,9 @@ void CardTableModRefBS::resize_covered_region(MemRegion new_region) {
addr_for
((
jbyte
*
)
_committed
[
ind
].
start
()),
addr_for
((
jbyte
*
)
_committed
[
ind
].
start
()),
addr_for
((
jbyte
*
)
_committed
[
ind
].
last
()));
addr_for
((
jbyte
*
)
_committed
[
ind
].
last
()));
}
}
// Touch the last card of the covered region to show that it
// is committed (or SEGV).
debug_only
(
*
byte_for
(
_covered
[
ind
].
last
());)
debug_only
(
verify_guard
();)
debug_only
(
verify_guard
();)
}
}
...
...
src/share/vm/runtime/arguments.cpp
浏览文件 @
f5125255
...
@@ -1376,11 +1376,6 @@ void Arguments::set_g1_gc_flags() {
...
@@ -1376,11 +1376,6 @@ void Arguments::set_g1_gc_flags() {
}
}
no_shared_spaces
();
no_shared_spaces
();
// Set the maximum pause time goal to be a reasonable default.
if
(
FLAG_IS_DEFAULT
(
MaxGCPauseMillis
))
{
FLAG_SET_DEFAULT
(
MaxGCPauseMillis
,
200
);
}
if
(
FLAG_IS_DEFAULT
(
MarkStackSize
))
{
if
(
FLAG_IS_DEFAULT
(
MarkStackSize
))
{
FLAG_SET_DEFAULT
(
MarkStackSize
,
128
*
TASKQUEUE_SIZE
);
FLAG_SET_DEFAULT
(
MarkStackSize
,
128
*
TASKQUEUE_SIZE
);
}
}
...
...
src/share/vm/runtime/globals.hpp
浏览文件 @
f5125255
...
@@ -1975,7 +1975,7 @@ class CommandLineFlags {
...
@@ -1975,7 +1975,7 @@ class CommandLineFlags {
"Adaptive size policy maximum GC pause time goal in msec, " \
"Adaptive size policy maximum GC pause time goal in msec, " \
"or (G1 Only) the max. GC time per MMU time slice") \
"or (G1 Only) the max. GC time per MMU time slice") \
\
\
product(
intx, GCPauseIntervalMillis, 500,
\
product(
uintx, GCPauseIntervalMillis, 0,
\
"Time slice for MMU specification") \
"Time slice for MMU specification") \
\
\
product(uintx, MaxGCMinorPauseMillis, max_uintx, \
product(uintx, MaxGCMinorPauseMillis, max_uintx, \
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录