comparison src/share/vm/gc_interface/gcCause.cpp @ 4970:33df1aeaebbf

Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Mon, 27 Feb 2012 13:10:13 +0100
parents 9509c20bba28
children da91efe96a93
comparison
equal deleted inserted replaced
4703:2cfb7fb2dce7 4970:33df1aeaebbf
1 /* 1 /*
2 * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 2002, 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.
82 return "Ergonomics"; 82 return "Ergonomics";
83 83
84 case _g1_inc_collection_pause: 84 case _g1_inc_collection_pause:
85 return "G1 Evacuation Pause"; 85 return "G1 Evacuation Pause";
86 86
87 case _g1_humongous_allocation:
88 return "G1 Humongous Allocation";
89
87 case _last_ditch_collection: 90 case _last_ditch_collection:
88 return "Last ditch collection"; 91 return "Last ditch collection";
89 92
90 case _last_gc_cause: 93 case _last_gc_cause:
91 return "ILLEGAL VALUE - last gc cause - ILLEGAL VALUE"; 94 return "ILLEGAL VALUE - last gc cause - ILLEGAL VALUE";