diff --git a/zircon/kernel/object/diagnostics.cpp b/zircon/kernel/object/diagnostics.cpp index 93109db5b1753f325b62fbf3adaa8584f6c27413..46cd2416e30c22f6c62ef3de4c207662c294ebf0 100644 --- a/zircon/kernel/object/diagnostics.cpp +++ b/zircon/kernel/object/diagnostics.cpp @@ -327,7 +327,7 @@ static const char* VmoRightsToString(uint32_t rights, char str[kRightsStrLen]) { // If |handles| is true, the dumped objects are expected to have handle info. static void PrintVmoDumpHeader(bool handles) { printf( - "%s koid parent #chld #map #shr size alloc name\n", + "%s koid obj parent #chld #map #shr size alloc name\n", handles ? " handle rights " : " - - "); } @@ -382,6 +382,7 @@ static void DumpVmObject( printf(" %10s " // handle "%6s " // rights "%5" PRIu64 " " // koid + "%p " // vm_object "%6s " // clone parent koid "%5" PRIu32 " " // number of children "%4" PRIu32 " " // map count @@ -392,6 +393,7 @@ static void DumpVmObject( handle_str, rights_str, koid, + &vmo, clone_str, vmo.num_children(), vmo.num_mappings(), diff --git a/zircon/kernel/vm/vm_object_paged.cpp b/zircon/kernel/vm/vm_object_paged.cpp index bc0b258ac5ca579dc87915ed71ad16146223e1eb..b1667cb628cb3c431dd297489c7e91daa8cb2766 100644 --- a/zircon/kernel/vm/vm_object_paged.cpp +++ b/zircon/kernel/vm/vm_object_paged.cpp @@ -357,9 +357,10 @@ void VmObjectPaged::Dump(uint depth, bool verbose) { for (uint i = 0; i < depth; ++i) { printf(" "); } - printf("vmo %p/k%" PRIu64 " size %#" PRIx64 - " pages %zu ref %d parent k%" PRIu64 "\n", - this, user_id_, size_, count, ref_count_debug(), parent_id); + printf("vmo %p/k%" PRIu64 " size %#" PRIx64 " offset %#" PRIx64 + " pages %zu ref %d parent %p/k%" PRIu64 "\n", + this, user_id_, size_, parent_offset_, count, + ref_count_debug(), parent_.get(), parent_id); if (verbose) { auto f = [depth](const auto p, uint64_t offset) {