Skip to content

nvme-print-stdout: change stdout_d() to not print all zeros #3046

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
igaw merged 2 commits into from
Jan 12, 2026
Merged

nvme-print-stdout: change stdout_d() to not print all zeros #3046

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
769a6d5
nvme-print-stdout: change stdout_d() to not print equal line
ikegami-t Jan 8, 2026
114bdc4
nvme-print-stdout: print equal line by stdout_d() for debug log level
ikegami-t Jan 9, 2026
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
26 changes: 25 additions & 1 deletion nvme-print-stdout.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4901,10 +4901,19 @@ static void stdout_lba_status_info(__u64 result)
(__u32)NVME_FEAT_LBAS_LSIRI(result));
}

static bool line_equal(unsigned char *buf, int len, int width, int offset)
{
if (!offset || len < offset + width || log_level >= LOG_DEBUG)
return false;

return !memcmp(buf + offset - width, buf + offset, width);
}

void stdout_d(unsigned char *buf, int len, int width, int group)
{
int i, offset = 0;
char ascii[32 + 1] = { 0 };
bool omitting = false;

assert(width < sizeof(ascii));

Expand All @@ -4914,8 +4923,21 @@ void stdout_d(unsigned char *buf, int len, int width, int group)
printf("%3x", i);

for (i = 0; i < len; i++) {
if (!(i % width))
if (!(i % width)) {
if (line_equal(buf, len, width, offset)) {
if (!omitting) {
omitting = true;
printf("\n*");
}
offset += width;
continue;
} else if (omitting) {
omitting = false;
}
printf("\n%04x:", offset);
}
if (omitting)
continue;
if (i % group)
printf("%02x", buf[i]);
else
Expand All @@ -4927,6 +4949,8 @@ void stdout_d(unsigned char *buf, int len, int width, int group)
memset(ascii, 0, sizeof(ascii));
}
}
if (omitting)
printf("\n%04x:\n", offset);

if (strlen(ascii)) {
unsigned int b = width - (i % width);
Expand Down