graal-jvmci-8: src/share/vm/memory/heapInspection.cpp comparison

comparison src/share/vm/memory/heapInspection.cpp @ 7956:16fb9f942703

6479360: PrintClassHistogram improvements Summary: jcmd <pid> GC.class_stats (UnlockDiagnosticVMOptions) Reviewed-by: coleenp, hseigel, sla, acorn Contributed-by: ioi.lam@oracle.com

author	acorn
date	Fri, 25 Jan 2013 15:06:18 -0500
parents	da91efe96a93
children	3c9bc17b9403

comparison

equal deleted inserted replaced

-:6cf2530f7fd3
+:16fb9f942703
 /*
-* Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2002, 2013, 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
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.
 * questions.
 *
 */
 #include "precompiled.hpp"
+#include "classfile/classLoaderData.hpp"
 #include "gc_interface/collectedHeap.hpp"
 #include "memory/genCollectedHeap.hpp"
 #include "memory/heapInspection.hpp"
 #include "memory/resourceArea.hpp"
 #include "runtime/os.hpp"
 if(e1->_instance_words > e2->_instance_words) {
 return -1;
 } else if(e1->_instance_words < e2->_instance_words) {
 return 1;
 }
-return 0;
+// Sort alphabetically, note 'Z' < '[' < 'a', but it's better to group
-}
+// the array classes before all the instance classes.
-void KlassInfoEntry::print_on(outputStream* st) const {
 ResourceMark rm;
-const char* name;;
+const char* name1 = e1->klass()->external_name();
+const char* name2 = e2->klass()->external_name();
+bool d1 = (name1[0] == '[');
+bool d2 = (name2[0] == '[');
+if (d1 && !d2) {
+return -1;
+} else if (d2 && !d1) {
+return 1;
+} else {
+return strcmp(name1, name2);
+}
+}
+const char* KlassInfoEntry::name() const {
+const char* name;
 if (_klass->name() != NULL) {
 name = _klass->external_name();
 } else {
 if (_klass == Universe::boolArrayKlassObj())         name = "<boolArrayKlass>";         else
 if (_klass == Universe::charArrayKlassObj())         name = "<charArrayKlass>";         else
 if (_klass == Universe::shortArrayKlassObj())        name = "<shortArrayKlass>";        else
 if (_klass == Universe::intArrayKlassObj())          name = "<intArrayKlass>";          else
 if (_klass == Universe::longArrayKlassObj())         name = "<longArrayKlass>";         else
 name = "<no name>";
 }
+return name;
+}
+void KlassInfoEntry::print_on(outputStream* st) const {
+ResourceMark rm;
 // simplify the formatting (ILP32 vs LP64) - always cast the numbers to 64-bit
 st->print_cr(INT64_FORMAT_W(13) "  " UINT64_FORMAT_W(13) "  %s",
 (jlong)  _instance_count,
 (julong) _instance_words * HeapWordSize,
-name);
+name());
 }
 KlassInfoEntry* KlassInfoBucket::lookup(Klass* const k) {
 KlassInfoEntry* elt = _list;
 while (elt != NULL) {
 delete elt;
 elt = next;
 }
 }
-KlassInfoTable::KlassInfoTable(int size, HeapWord* ref) {
+void KlassInfoTable::AllClassesFinder::do_klass(Klass* k) {
+// This has the SIDE EFFECT of creating a KlassInfoEntry
+// for <k>, if one doesn't exist yet.
+_table->lookup(k);
+}
+KlassInfoTable::KlassInfoTable(int size, HeapWord* ref,
+bool need_class_stats) {
 _size = 0;
 _ref = ref;
 _buckets = NEW_C_HEAP_ARRAY(KlassInfoBucket, size, mtInternal);
 if (_buckets != NULL) {
 _size = size;
 for (int index = 0; index < _size; index++) {
 _buckets[index].initialize();
+}
+if (need_class_stats) {
+AllClassesFinder finder(this);
+ClassLoaderDataGraph::classes_do(&finder);
 }
 }
 }
 KlassInfoTable::~KlassInfoTable() {
 int KlassInfoHisto::sort_helper(KlassInfoEntry** e1, KlassInfoEntry** e2) {
 return (*e1)->compare(*e1,*e2);
 }
-KlassInfoHisto::KlassInfoHisto(const char* title, int estimatedCount) :
+KlassInfoHisto::KlassInfoHisto(KlassInfoTable* cit, const char* title, int estimatedCount) :
+_cit(cit),
 _title(title) {
 _elements = new (ResourceObj::C_HEAP, mtInternal) GrowableArray<KlassInfoEntry*>(estimatedCount,true);
 }
 KlassInfoHisto::~KlassInfoHisto() {
 }
 st->print_cr("Total " INT64_FORMAT_W(13) "  " UINT64_FORMAT_W(13),
 total, totalw * HeapWordSize);
 }
-void KlassInfoHisto::print_on(outputStream* st) const {
+#define MAKE_COL_NAME(field, name, help)     #name,
-st->print_cr("%s",title());
+#define MAKE_COL_HELP(field, name, help)     help,
-print_elements(st);
+static const char *name_table[] = {
+HEAP_INSPECTION_COLUMNS_DO(MAKE_COL_NAME)
+};
+static const char *help_table[] = {
+HEAP_INSPECTION_COLUMNS_DO(MAKE_COL_HELP)
+};
+bool KlassInfoHisto::is_selected(const char *col_name) {
+if (_selected_columns == NULL) {
+return true;
+}
+if (strcmp(_selected_columns, col_name) == 0) {
+return true;
+}
+const char *start = strstr(_selected_columns, col_name);
+if (start == NULL) {
+return false;
+}
+// The following must be true, because _selected_columns != col_name
+if (start > _selected_columns && start[-1] != ',') {
+return false;
+}
+char x = start[strlen(col_name)];
+if (x != ',' && x != '\0') {
+return false;
+}
+return true;
+}
+void KlassInfoHisto::print_title(outputStream* st, bool csv_format,
+bool selected[], int width_table[],
+const char *name_table[]) {
+if (csv_format) {
+st->print("Index,Super");
+for (int c=0; c<KlassSizeStats::_num_columns; c++) {
+if (selected[c]) {st->print(",%s", name_table[c]);}
+}
+st->print(",ClassName");
+} else {
+st->print("Index Super");
+for (int c=0; c<KlassSizeStats::_num_columns; c++) {
+if (selected[c]) {st->print(str_fmt(width_table[c]), name_table[c]);}
+}
+st->print(" ClassName");
+}
+if (is_selected("ClassLoader")) {
+st->print(",ClassLoader");
+}
+st->cr();
+}
+void KlassInfoHisto::print_class_stats(outputStream* st,
+bool csv_format, const char *columns) {
+ResourceMark rm;
+KlassSizeStats sz, sz_sum;
+int i;
+julong *col_table = (julong*)(&sz);
+julong *colsum_table = (julong*)(&sz_sum);
+int width_table[KlassSizeStats::_num_columns];
+bool selected[KlassSizeStats::_num_columns];
+_selected_columns = columns;
+memset(&sz_sum, 0, sizeof(sz_sum));
+for (int c=0; c<KlassSizeStats::_num_columns; c++) {
+selected[c] = is_selected(name_table[c]);
+}
+for(i=0; i < elements()->length(); i++) {
+elements()->at(i)->set_index(i+1);
+}
+for (int pass=1; pass<=2; pass++) {
+if (pass == 2) {
+print_title(st, csv_format, selected, width_table, name_table);
+}
+for(i=0; i < elements()->length(); i++) {
+KlassInfoEntry* e = (KlassInfoEntry*)elements()->at(i);
+const Klass* k = e->klass();
+memset(&sz, 0, sizeof(sz));
+sz._inst_count = e->count();
+sz._inst_bytes = HeapWordSize * e->words();
+k->collect_statistics(&sz);
+sz._total_bytes = sz._ro_bytes + sz._rw_bytes;
+if (pass == 1) {
+for (int c=0; c<KlassSizeStats::_num_columns; c++) {
+colsum_table[c] += col_table[c];
+}
+} else {
+int super_index = -1;
+if (k->oop_is_instance()) {
+Klass* super = ((InstanceKlass*)k)->java_super();
+if (super) {
+KlassInfoEntry* super_e = _cit->lookup(super);
+if (super_e) {
+super_index = super_e->index();
+}
+}
+}
+if (csv_format) {
+st->print("%d,%d", e->index(), super_index);
+for (int c=0; c<KlassSizeStats::_num_columns; c++) {
+if (selected[c]) {st->print("," JULONG_FORMAT, col_table[c]);}
+}
+st->print(",%s",e->name());
+} else {
+st->print("%5d %5d", e->index(), super_index);
+for (int c=0; c<KlassSizeStats::_num_columns; c++) {
+if (selected[c]) {print_julong(st, width_table[c], col_table[c]);}
+}
+st->print(" %s", e->name());
+}
+if (is_selected("ClassLoader")) {
+ClassLoaderData* loader_data = k->class_loader_data();
+st->print(",");
+loader_data->print_value_on(st);
+}
+st->cr();
+}
+}
+if (pass == 1) {
+for (int c=0; c<KlassSizeStats::_num_columns; c++) {
+width_table[c] = col_width(colsum_table[c], name_table[c]);
+}
+}
+}
+sz_sum._inst_size = 0;
+if (csv_format) {
+st->print(",");
+for (int c=0; c<KlassSizeStats::_num_columns; c++) {
+if (selected[c]) {st->print("," JULONG_FORMAT, colsum_table[c]);}
+}
+} else {
+st->print("           ");
+for (int c=0; c<KlassSizeStats::_num_columns; c++) {
+if (selected[c]) {print_julong(st, width_table[c], colsum_table[c]);}
+}
+st->print(" Total");
+if (sz_sum._total_bytes > 0) {
+st->cr();
+st->print("           ");
+for (int c=0; c<KlassSizeStats::_num_columns; c++) {
+if (selected[c]) {
+switch (c) {
+case KlassSizeStats::_index_inst_size:
+case KlassSizeStats::_index_inst_count:
+case KlassSizeStats::_index_method_count:
+st->print(str_fmt(width_table[c]), "-");
+break;
+default:
+{
+double perc = (double)(100) * (double)(colsum_table[c]) / (double)sz_sum._total_bytes;
+st->print(perc_fmt(width_table[c]), perc);
+}
+}
+}
+}
+}
+}
+st->cr();
+if (!csv_format) {
+print_title(st, csv_format, selected, width_table, name_table);
+}
+}
+julong KlassInfoHisto::annotations_bytes(Array<AnnotationArray*>* p) const {
+julong bytes = 0;
+if (p != NULL) {
+for (int i = 0; i < p->length(); i++) {
+bytes += count_bytes_array(p->at(i));
+}
+bytes += count_bytes_array(p);
+}
+return bytes;
+}
+void KlassInfoHisto::print_histo_on(outputStream* st, bool print_stats,
+bool csv_format, const char *columns) {
+if (print_stats) {
+print_class_stats(st, csv_format, columns);
+} else {
+st->print_cr("%s",title());
+print_elements(st);
+}
 }
 class HistoClosure : public KlassInfoClosure {
 private:
 KlassInfoHisto* _cih;
 // Get some random number for ref (the hash key)
 HeapWord* ref = (HeapWord*) Universe::boolArrayKlassObj();
 CollectedHeap* heap = Universe::heap();
 bool is_shared_heap = false;
+if (_print_help) {
+for (int c=0; c<KlassSizeStats::_num_columns; c++) {
+st->print("%s:\n\t", name_table[c]);
+const int max_col = 60;
+int col = 0;
+for (const char *p = help_table[c]; *p; p++,col++) {
+if (col >= max_col && *p == ' ') {
+st->print("\n\t");
+col = 0;
+} else {
+st->print("%c", *p);
+}
+}
+st->print_cr(".\n");
+}
+return;
+}
 // Collect klass instance info
-KlassInfoTable cit(KlassInfoTable::cit_size, ref);
+KlassInfoTable cit(KlassInfoTable::cit_size, ref, _print_class_stats);
 if (!cit.allocation_failed()) {
 // Iterate over objects in the heap
 RecordInstanceClosure ric(&cit);
 Universe::heap()->object_iterate(&ric);
 st->print_cr("WARNING: Ran out of C-heap; undercounted " SIZE_FORMAT
 " total instances in data below",
 missed_count);
 }
 // Sort and print klass instance info
-KlassInfoHisto histo("\n"
+const char *title = "\n"
 " num     #instances         #bytes  class name\n"
-"----------------------------------------------",
+"----------------------------------------------";
-KlassInfoHisto::histo_initial_size);
+KlassInfoHisto histo(&cit, title, KlassInfoHisto::histo_initial_size);
 HistoClosure hc(&histo);
 cit.iterate(&hc);
 histo.sort();
-histo.print_on(st);
+histo.print_histo_on(st, _print_class_stats, _csv_format, _columns);
 } else {
 st->print_cr("WARNING: Ran out of C-heap; histogram not generated");
 }
 st->flush();

Mercurial > hg > graal-jvmci-8

comparison src/share/vm/memory/heapInspection.cpp @ 7956:16fb9f942703