1.1 --- a/src/share/vm/runtime/memprofiler.cpp Fri Aug 31 16:39:35 2012 -0700
1.2 +++ b/src/share/vm/runtime/memprofiler.cpp Sat Sep 01 13:25:18 2012 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -28,7 +28,6 @@
1.11 #include "gc_interface/collectedHeap.inline.hpp"
1.12 #include "interpreter/oopMapCache.hpp"
1.13 #include "memory/generation.hpp"
1.14 -#include "memory/permGen.hpp"
1.15 #include "memory/resourceArea.hpp"
1.16 #include "runtime/handles.inline.hpp"
1.17 #include "runtime/jniHandles.hpp"
1.18 @@ -129,15 +128,12 @@
1.19 }
1.20
1.21 // Print trace line in log
1.22 - fprintf(_log_fp, "%6.1f,%5d,%5d," UINTX_FORMAT_W(6) "," UINTX_FORMAT_W(6) ","
1.23 - UINTX_FORMAT_W(6) "," UINTX_FORMAT_W(6) ",",
1.24 + fprintf(_log_fp, "%6.1f,%5d,%5d," UINTX_FORMAT_W(6) "," UINTX_FORMAT_W(6) ",",
1.25 os::elapsedTime(),
1.26 Threads::number_of_threads(),
1.27 SystemDictionary::number_of_classes(),
1.28 Universe::heap()->used() / K,
1.29 - Universe::heap()->capacity() / K,
1.30 - Universe::heap()->permanent_used() / HWperKB,
1.31 - Universe::heap()->permanent_capacity() / HWperKB);
1.32 + Universe::heap()->capacity() / K);
1.33
1.34 fprintf(_log_fp, UINTX_FORMAT_W(6) ",", CodeCache::capacity() / K);
1.35
