Skip to content

Add POH to SOS commands #1228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davmason merged 6 commits into from
Jun 18, 2020
Merged

Add POH to SOS commands #1228

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ffedce2
SOS changes for pinned object heap
davmason Jun 10, 2020
46a6cd8
code review feedback
davmason Jun 15, 2020
2b20597
updates from runtime changes
davmason Jun 16, 2020
6a51795
fix incorrect assert
davmason Jun 16, 2020
8c8b69f
fix off by 1 error, DacpGcHeapDetails has an array of size 7 (DAC_NUM…
davmason Jun 17, 2020
83f956e
fix formatting with !gcheapstat and objectiterator::nextsegment when …
davmason Jun 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix formatting with !gcheapstat and objectiterator::nextsegment when … 
…running against aruntime without a POH
  • Loading branch information
@davmason
davmason committed Jun 17, 2020
commit 83f956eeb684358bdf115d3d4f365756acacaaf9
1 change: 1 addition & 0 deletions src/SOS/Strike/sos.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,6 +611,7 @@ namespace sos
}

bPinned = false;
bLarge = false;
next = TO_TADDR(mHeaps[mCurrHeap].generation_table[GetMaxGeneration()].start_segment);
}
else if (bLarge)
Expand Down
20 changes: 13 additions & 7 deletions src/SOS/Strike/strike.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5444,14 +5444,15 @@ DECLARE_API(GCHeapStat)
if (!IsServerBuild())
{
float tempf;
DacpGcHeapDetails heapDetails;
if (heapDetails.Request(g_sos) != S_OK)
DacpGcHeapDetails dacHeapDetails;
if (dacHeapDetails.Request(g_sos) != S_OK)
{
ExtErr("Error requesting gc heap details\n");
return Status;
}

HeapUsageStat hpUsage;
GCHeapDetails heapDetails(dacHeapDetails);
if (GCHeapUsageStats(heapDetails, bIncUnreachable, &hpUsage))
{
ExtOut("Heap%-4d %12" POINTERSIZE_TYPE "u %12" POINTERSIZE_TYPE "u %12" POINTERSIZE_TYPE "u %12" POINTERSIZE_TYPE "u %12" POINTERSIZE_TYPE "u\n", 0,
Expand All @@ -5465,9 +5466,10 @@ DECLARE_API(GCHeapStat)
hpUsage.genUsage[4].freed);
tempf = ((float)(hpUsage.genUsage[0].freed + hpUsage.genUsage[1].freed + hpUsage.genUsage[2].freed)) /
(hpUsage.genUsage[0].allocd + hpUsage.genUsage[1].allocd + hpUsage.genUsage[2].allocd);
int pohFreeUsage = heapDetails.has_poh ? (int)(100*((float)hpUsage.genUsage[4].freed) / (hpUsage.genUsage[4].allocd)) : 0;
ExtOut("SOH:%3d%s LOH:%3d%s POH:%3d%s\n", (int)(100 * tempf), "%%",
(int)(100*((float)hpUsage.genUsage[3].freed) / (hpUsage.genUsage[3].allocd)), "%%",
(int)(100*((float)hpUsage.genUsage[4].freed) / (hpUsage.genUsage[4].allocd)), "%%");
pohFreeUsage, "%%");

if (bIncUnreachable)
{
Expand All @@ -5477,9 +5479,10 @@ DECLARE_API(GCHeapStat)
hpUsage.genUsage[2].unrooted, hpUsage.genUsage[3].unrooted);
tempf = ((float)(hpUsage.genUsage[0].unrooted+hpUsage.genUsage[1].unrooted+hpUsage.genUsage[2].unrooted)) /
(hpUsage.genUsage[0].allocd+hpUsage.genUsage[1].allocd+hpUsage.genUsage[2].allocd);
int pohUnrootedUsage = heapDetails.has_poh ? (int)(100*((float)hpUsage.genUsage[4].unrooted) / (hpUsage.genUsage[4].allocd)) : 0;
ExtOut("SOH:%3d%s LOH:%3d%s POH:%3d%s\n", (int)(100 * tempf), "%%",
(int)(100*((float)hpUsage.genUsage[3].unrooted) / (hpUsage.genUsage[3].allocd)), "%%",
(int)(100*((float)hpUsage.genUsage[4].unrooted) / (hpUsage.genUsage[4].allocd)), "%%");
pohUnrootedUsage, "%%");
}
}
}
Expand Down Expand Up @@ -5517,7 +5520,7 @@ DECLARE_API(GCHeapStat)

// aggregate stats across heaps / generation
GenUsageStat genUsageStat[5] = {0, 0, 0, 0, 0};

bool hasPoh = false;
for (DWORD n = 0; n < dwNHeaps; n ++)
{
DacpGcHeapDetails dacHeapDetails;
Expand All @@ -5528,6 +5531,7 @@ DECLARE_API(GCHeapStat)
}

GCHeapDetails heapDetails(dacHeapDetails, heapAddrs[n]);
hasPoh = heapDetails.has_poh;
if (GCHeapUsageStats(heapDetails, bIncUnreachable, &hpUsage[n]))
{
for (int i = 0; i < 5; ++i)
Expand Down Expand Up @@ -5564,9 +5568,10 @@ DECLARE_API(GCHeapStat)

tempf = ((float)(hpUsage[n].genUsage[0].freed + hpUsage[n].genUsage[1].freed + hpUsage[n].genUsage[2].freed)) /
(hpUsage[n].genUsage[0].allocd + hpUsage[n].genUsage[1].allocd + hpUsage[n].genUsage[2].allocd);
int pohFreeUsage = hasPoh ? (int)(100*((float)hpUsage[n].genUsage[4].freed) / (hpUsage[n].genUsage[4].allocd)) : 0;
ExtOut("SOH:%3d%s LOH:%3d%s POH:%3d%s\n", (int)(100 * tempf), "%%",
(int)(100*((float)hpUsage[n].genUsage[3].freed) / (hpUsage[n].genUsage[3].allocd)), "%%",
(int)(100*((float)hpUsage[n].genUsage[4].freed) / (hpUsage[n].genUsage[4].allocd)), "%%");
pohFreeUsage, "%%");
}
ExtOut("Total %12" POINTERSIZE_TYPE "u %12" POINTERSIZE_TYPE "u %12" POINTERSIZE_TYPE "u %12" POINTERSIZE_TYPE "u %12" POINTERSIZE_TYPE "u\n",
genUsageStat[0].freed, genUsageStat[1].freed,
Expand All @@ -5585,9 +5590,10 @@ DECLARE_API(GCHeapStat)

tempf = ((float)(hpUsage[n].genUsage[0].unrooted + hpUsage[n].genUsage[1].unrooted + hpUsage[n].genUsage[2].unrooted)) /
(hpUsage[n].genUsage[0].allocd + hpUsage[n].genUsage[1].allocd + hpUsage[n].genUsage[2].allocd);
int pohUnrootedUsage = hasPoh ? (int)(100*((float)hpUsage[n].genUsage[4].unrooted) / (hpUsage[n].genUsage[4].allocd)) : 0;
ExtOut("SOH:%3d%s LOH:%3d%s POH:%3d%s\n", (int)(100 * tempf), "%%",
(int)(100*((float)hpUsage[n].genUsage[3].unrooted) / (hpUsage[n].genUsage[3].allocd)), "%%",
(int)(100*((float)hpUsage[n].genUsage[4].unrooted) / (hpUsage[n].genUsage[4].allocd)), "%%");
pohUnrootedUsage, "%%");
}
ExtOut("Total %12" POINTERSIZE_TYPE "u %12" POINTERSIZE_TYPE "u %12" POINTERSIZE_TYPE "u %12" POINTERSIZE_TYPE "u %12" POINTERSIZE_TYPE "u\n",
genUsageStat[0].unrooted, genUsageStat[1].unrooted,
Expand Down
2 changes: 1 addition & 1 deletion src/SOS/Strike/util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1809,7 +1809,7 @@ struct GenUsageStat

struct HeapUsageStat
{
GenUsageStat genUsage[5]; // gen0, 1, 2, LOH
GenUsageStat genUsage[5]; // gen0, 1, 2, LOH, POH
};

extern DacpUsefulGlobalsData g_special_usefulGlobals;
Expand Down