zenithsiz/ftmemsim-valgrind
1
0
Fork 0
mirror of https://github.com/Zenithsiz/ftmemsim-valgrind.git synced 2026-02-03 18:13:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix an obscure problem with peak finding.

Browse Source 
Currently, if there are multiple equal global peaks, `intro_Block` and
`resize_Block` record the first one while `check_for_peak` records the
last one. This could lead to inconsistent output, though it's unlikely
in practice.

This commit fixes things so that all functions record the last peak.
This commit is contained in:
Nicholas Nethercote 2020-12-01 13:46:25 +11:00
parent b092ed44ab
commit 48ba17f87d
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dhat/dh_main.c
View File

@ -287,7 +287,10 @@ static void intro_Block ( Block* bk )
g_curr_blocks++;
g_curr_bytes += bk->req_szB;
if (g_curr_bytes > g_max_bytes) {
// The use of `>=` rather than `>` means that if there are multiple equal
// peaks we record the latest one, like `check_for_peak` does.
if (g_curr_bytes >= g_max_bytes) {
g_max_blocks = g_curr_blocks;
g_max_bytes = g_curr_bytes;
g_max_instrs = g_curr_instrs;
@ -300,7 +303,10 @@ static void intro_Block ( Block* bk )
api->curr_blocks++;
api->curr_bytes += bk->req_szB;
if (api->curr_bytes > api->max_bytes) {
// The use of `>=` rather than `>` means that if there are multiple equal
// peaks we record the latest one, like `check_for_peak` does.
if (api->curr_bytes >= api->max_bytes) {
api->max_blocks = api->curr_blocks;
api->max_bytes = api->curr_bytes;
}
@ -469,7 +475,10 @@ static void resize_Block(ExeContext* ec, SizeT old_req_szB, SizeT new_req_szB)
g_curr_blocks += 0; // unchanged
g_curr_bytes += delta;
if (g_curr_bytes > g_max_bytes) {
// The use of `>=` rather than `>` means that if there are multiple equal
// peaks we record the latest one, like `check_for_peak` does.
if (g_curr_bytes >= g_max_bytes) {
g_max_blocks = g_curr_blocks;
g_max_bytes = g_curr_bytes;
g_max_instrs = g_curr_instrs;
@ -482,7 +491,10 @@ static void resize_Block(ExeContext* ec, SizeT old_req_szB, SizeT new_req_szB)
api->curr_blocks += 0; // unchanged
api->curr_bytes += delta;
if (api->curr_bytes > api->max_bytes) {
// The use of `>=` rather than `>` means that if there are multiple equal
// peaks we record the latest one, like `check_for_peak` does.
if (api->curr_bytes >= api->max_bytes) {
api->max_blocks = api->curr_blocks;
api->max_bytes = api->curr_bytes;
}