Mercurial > hg > truffle
diff src/share/vm/runtime/memprofiler.cpp @ 7066:7d815d842ee0
Merge.
author | Christian Haeubl <haeubl@ssw.jku.at> |
---|---|
date | Fri, 23 Nov 2012 11:50:27 +0100 |
parents | da91efe96a93 |
children | f34d701e952e |
line wrap: on
line diff
--- a/src/share/vm/runtime/memprofiler.cpp Fri Nov 23 11:40:17 2012 +0100 +++ b/src/share/vm/runtime/memprofiler.cpp Fri Nov 23 11:50:27 2012 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -28,7 +28,6 @@ #include "gc_interface/collectedHeap.inline.hpp" #include "interpreter/oopMapCache.hpp" #include "memory/generation.hpp" -#include "memory/permGen.hpp" #include "memory/resourceArea.hpp" #include "runtime/handles.inline.hpp" #include "runtime/jniHandles.hpp" @@ -129,15 +128,12 @@ } // Print trace line in log - fprintf(_log_fp, "%6.1f,%5d,%5d," UINTX_FORMAT_W(6) "," UINTX_FORMAT_W(6) "," - UINTX_FORMAT_W(6) "," UINTX_FORMAT_W(6) ",", + fprintf(_log_fp, "%6.1f,%5d,%5d," UINTX_FORMAT_W(6) "," UINTX_FORMAT_W(6) ",", os::elapsedTime(), Threads::number_of_threads(), SystemDictionary::number_of_classes(), Universe::heap()->used() / K, - Universe::heap()->capacity() / K, - Universe::heap()->permanent_used() / HWperKB, - Universe::heap()->permanent_capacity() / HWperKB); + Universe::heap()->capacity() / K); fprintf(_log_fp, UINTX_FORMAT_W(6) ",", CodeCache::capacity() / K);