stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
David Holmes 2016-02-02 04:48:05 +01:00
commit 6ba5364f40
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hotspot/src/share/vm/gc/g1/concurrentMark.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2001, 2015, 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
@ -489,11 +489,11 @@ ConcurrentMark::ConcurrentMark(G1CollectedHeap* g1h, G1RegionToSpaceMapper* prev
double overall_cm_overhead = double overall_cm_overhead =
(double) MaxGCPauseMillis * marking_overhead / (double) MaxGCPauseMillis * marking_overhead /
(double) GCPauseIntervalMillis; (double) GCPauseIntervalMillis;
double cpu_ratio = 1.0 / (double) os::active_processor_count(); double cpu_ratio = 1.0 / (double) os::processor_count();
double marking_thread_num = ceil(overall_cm_overhead / cpu_ratio); double marking_thread_num = ceil(overall_cm_overhead / cpu_ratio);
double marking_task_overhead = double marking_task_overhead =
overall_cm_overhead / marking_thread_num * overall_cm_overhead / marking_thread_num *
(double) os::active_processor_count(); (double) os::processor_count();
double sleep_factor = double sleep_factor =
(1.0 - marking_task_overhead) / marking_task_overhead; (1.0 - marking_task_overhead) / marking_task_overhead;

4
hotspot/src/share/vm/gc/g1/dirtyCardQueue.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2001, 2015, 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
@ -160,7 +160,7 @@ DirtyCardQueueSet::DirtyCardQueueSet(bool notify_when_complete) :
// Determines how many mutator threads can process the buffers in parallel. // Determines how many mutator threads can process the buffers in parallel.
uint DirtyCardQueueSet::num_par_ids() { uint DirtyCardQueueSet::num_par_ids() {
return (uint)os::active_processor_count(); return (uint)os::processor_count();
} }
void DirtyCardQueueSet::initialize(CardTableEntryClosure* cl, void DirtyCardQueueSet::initialize(CardTableEntryClosure* cl,