comparison src/share/vm/runtime/memprofiler.cpp @ 1930:2d26b0046e0d

Merge.
author Thomas Wuerthinger <wuerthinger@ssw.jku.at>
date Tue, 30 Nov 2010 14:53:30 +0100
parents c18cbe5936b8
children f95d63e2154a
comparison
equal deleted inserted replaced
1484:6b7001391c97 1930:2d26b0046e0d
1 /* 1 /*
2 * Copyright 1998-2009 Sun Microsystems, Inc. All Rights Reserved. 2 * Copyright (c) 1998, 2009, 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.
14 * 14 *
15 * You should have received a copy of the GNU General Public License version 15 * You should have received a copy of the GNU General Public License version
16 * 2 along with this work; if not, write to the Free Software Foundation, 16 * 2 along with this work; if not, write to the Free Software Foundation,
17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18 * 18 *
19 * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20 * CA 95054 USA or visit www.sun.com if you need additional information or 20 * or visit www.oracle.com if you need additional information or have any
21 * have any questions. 21 * questions.
22 * 22 *
23 */ 23 */
24 24
25 # include "incls/_precompiled.incl" 25 # include "incls/_precompiled.incl"
26 # include "incls/_memprofiler.cpp.incl" 26 # include "incls/_memprofiler.cpp.incl"
60 const char *log_name = "mprofile.log"; 60 const char *log_name = "mprofile.log";
61 if (!is_active()) { 61 if (!is_active()) {
62 // Create log file 62 // Create log file
63 _log_fp = fopen(log_name , "w+"); 63 _log_fp = fopen(log_name , "w+");
64 if (_log_fp == NULL) { 64 if (_log_fp == NULL) {
65 fatal1("MemProfiler: Cannot create log file: %s", log_name); 65 fatal(err_msg("MemProfiler: Cannot create log file: %s", log_name));
66 } 66 }
67 fprintf(_log_fp, "MemProfiler: sizes are in Kb, time is in seconds since startup\n\n"); 67 fprintf(_log_fp, "MemProfiler: sizes are in Kb, time is in seconds since startup\n\n");
68 fprintf(_log_fp, " time, #thr, #cls, heap, heap, perm, perm, code, hndls, rescs, oopmp\n"); 68 fprintf(_log_fp, " time, #thr, #cls, heap, heap, perm, perm, code, hndls, rescs, oopmp\n");
69 fprintf(_log_fp, " used, total, used, total, total, total, total, total\n"); 69 fprintf(_log_fp, " used, total, used, total, total, total, total, total\n");
70 fprintf(_log_fp, "--------------------------------------------------------------------------\n"); 70 fprintf(_log_fp, "--------------------------------------------------------------------------\n");