Mercurial > hg > graal-jvmci-8

comparison src/share/vm/memory/heapInspection.hpp @ 14422:2b8e28fdf503

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author kvn
date Tue, 05 Nov 2013 17:38:04 -0800
parents ac9cb1d5a202
children 63a4eb8bcd23 78bbf4d43a14
comparison
equal deleted inserted replaced
14421:3068270ba476 14422:2b8e28fdf503
71 "Size of the embedded nonstatic_oop_map in InstanceKlass") \ 71 "Size of the embedded nonstatic_oop_map in InstanceKlass") \
72 f(methods_array_bytes, IK_methods, \ 72 f(methods_array_bytes, IK_methods, \
73 "Number of bytes used by the InstanceKlass::methods() array") \ 73 "Number of bytes used by the InstanceKlass::methods() array") \
74 f(method_ordering_bytes, IK_method_ordering, \ 74 f(method_ordering_bytes, IK_method_ordering, \
75 "Number of bytes used by the InstanceKlass::method_ordering() array") \ 75 "Number of bytes used by the InstanceKlass::method_ordering() array") \
76 f(default_methods_array_bytes, IK_default_methods, \
77 "Number of bytes used by the InstanceKlass::default_methods() array") \
78 f(default_vtable_indices_bytes, IK_default_vtable_indices, \
79 "Number of bytes used by the InstanceKlass::default_vtable_indices() array") \
76 f(local_interfaces_bytes, IK_local_interfaces, \ 80 f(local_interfaces_bytes, IK_local_interfaces, \
77 "Number of bytes used by the InstanceKlass::local_interfaces() array") \ 81 "Number of bytes used by the InstanceKlass::local_interfaces() array") \
78 f(transitive_interfaces_bytes, IK_transitive_interfaces, \ 82 f(transitive_interfaces_bytes, IK_transitive_interfaces, \
79 "Number of bytes used by the InstanceKlass::transitive_interfaces() array") \ 83 "Number of bytes used by the InstanceKlass::transitive_interfaces() array") \
80 f(fields_bytes, IK_fields, \ 84 f(fields_bytes, IK_fields, \
148 }; 152 };
149 153
150 HEAP_INSPECTION_COLUMNS_DO(DECLARE_KLASS_SIZE_STATS_FIELD) 154 HEAP_INSPECTION_COLUMNS_DO(DECLARE_KLASS_SIZE_STATS_FIELD)
151 155
152 static int count(oop x) { 156 static int count(oop x) {
153 return (HeapWordSize * ((x) ? (x)->size() : 0)); 157 return (HeapWordSize * (((x) != NULL) ? (x)->size() : 0));
154 } 158 }
155 159
156 static int count_array(objArrayOop x) { 160 static int count_array(objArrayOop x) {
157 return (HeapWordSize * ((x) ? (x)->size() : 0)); 161 return (HeapWordSize * (((x) != NULL) ? (x)->size() : 0));
158 } 162 }
159 163
160 template <class T> static int count(T* x) { 164 template <class T> static int count(T* x) {
161 return (HeapWordSize * ((x) ? (x)->size() : 0)); 165 return (HeapWordSize * ((x) ? (x)->size() : 0));
162 } 166 }