Mercurial > hg > truffle
comparison src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp @ 6948:e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Mon, 12 Nov 2012 23:14:12 +0100 |
parents | da91efe96a93 |
children | f34d701e952e |
comparison
equal
deleted
inserted
replaced
6711:ae13cc658b80 | 6948:e522a00b91aa |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * | 4 * |
5 * This code is free software; you can redistribute it and/or modify it | 5 * This code is free software; you can redistribute it and/or modify it |
6 * under the terms of the GNU General Public License version 2 only, as | 6 * under the terms of the GNU General Public License version 2 only, as |
7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
61 ConcurrentMarkSweepPolicy::ConcurrentMarkSweepPolicy() { | 61 ConcurrentMarkSweepPolicy::ConcurrentMarkSweepPolicy() { |
62 initialize_all(); | 62 initialize_all(); |
63 } | 63 } |
64 | 64 |
65 void ConcurrentMarkSweepPolicy::initialize_generations() { | 65 void ConcurrentMarkSweepPolicy::initialize_generations() { |
66 initialize_perm_generation(PermGen::ConcurrentMarkSweep); | |
67 _generations = new GenerationSpecPtr[number_of_generations()]; | 66 _generations = new GenerationSpecPtr[number_of_generations()]; |
68 if (_generations == NULL) | 67 if (_generations == NULL) |
69 vm_exit_during_initialization("Unable to allocate gen spec"); | 68 vm_exit_during_initialization("Unable to allocate gen spec"); |
70 | 69 |
71 if (ParNewGeneration::in_use()) { | 70 if (ParNewGeneration::in_use()) { |