Mercurial > hg > truffle
comparison 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 |
comparison
equal
deleted
inserted
replaced
7065:cfacf5d5bade | 7066:7d815d842ee0 |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 1998, 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. |
26 #include "classfile/systemDictionary.hpp" | 26 #include "classfile/systemDictionary.hpp" |
27 #include "code/codeCache.hpp" | 27 #include "code/codeCache.hpp" |
28 #include "gc_interface/collectedHeap.inline.hpp" | 28 #include "gc_interface/collectedHeap.inline.hpp" |
29 #include "interpreter/oopMapCache.hpp" | 29 #include "interpreter/oopMapCache.hpp" |
30 #include "memory/generation.hpp" | 30 #include "memory/generation.hpp" |
31 #include "memory/permGen.hpp" | |
32 #include "memory/resourceArea.hpp" | 31 #include "memory/resourceArea.hpp" |
33 #include "runtime/handles.inline.hpp" | 32 #include "runtime/handles.inline.hpp" |
34 #include "runtime/jniHandles.hpp" | 33 #include "runtime/jniHandles.hpp" |
35 #include "runtime/memprofiler.hpp" | 34 #include "runtime/memprofiler.hpp" |
36 #include "runtime/mutexLocker.hpp" | 35 #include "runtime/mutexLocker.hpp" |
127 resource_memory_usage += cur->resource_area()->size_in_bytes(); | 126 resource_memory_usage += cur->resource_area()->size_in_bytes(); |
128 cur = cur->next(); | 127 cur = cur->next(); |
129 } | 128 } |
130 | 129 |
131 // Print trace line in log | 130 // Print trace line in log |
132 fprintf(_log_fp, "%6.1f,%5d,%5d," UINTX_FORMAT_W(6) "," UINTX_FORMAT_W(6) "," | 131 fprintf(_log_fp, "%6.1f,%5d,%5d," UINTX_FORMAT_W(6) "," UINTX_FORMAT_W(6) ",", |
133 UINTX_FORMAT_W(6) "," UINTX_FORMAT_W(6) ",", | |
134 os::elapsedTime(), | 132 os::elapsedTime(), |
135 Threads::number_of_threads(), | 133 Threads::number_of_threads(), |
136 SystemDictionary::number_of_classes(), | 134 SystemDictionary::number_of_classes(), |
137 Universe::heap()->used() / K, | 135 Universe::heap()->used() / K, |
138 Universe::heap()->capacity() / K, | 136 Universe::heap()->capacity() / K); |
139 Universe::heap()->permanent_used() / HWperKB, | |
140 Universe::heap()->permanent_capacity() / HWperKB); | |
141 | 137 |
142 fprintf(_log_fp, UINTX_FORMAT_W(6) ",", CodeCache::capacity() / K); | 138 fprintf(_log_fp, UINTX_FORMAT_W(6) ",", CodeCache::capacity() / K); |
143 | 139 |
144 fprintf(_log_fp, UINTX_FORMAT_W(6) "," UINTX_FORMAT_W(6) ",%6ld\n", | 140 fprintf(_log_fp, UINTX_FORMAT_W(6) "," UINTX_FORMAT_W(6) ",%6ld\n", |
145 handles_memory_usage / K, | 141 handles_memory_usage / K, |