Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kernel debug: rewrite dump_block to use a single dprintf call

Browse Source 
In the syslog, each dprintf call is prefixed with a KERN: prefix,
rendering the dump unreadable. Bufferize things to print each line with
a single call.

Change-Id: I27c1b1f74434fbc6e554acb0a716f0700821bc8d
Reviewed-on: https://review.haiku-os.org/c/haiku/+/5305
Reviewed-by: Adrien Destugues <pulkomandy@gmail.com>
This commit is contained in:
PulkoMandy 2022-05-11 17:48:53 +02:00 committed by Adrien Destugues
parent a5c0d1a80e
commit 580f28da6d
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/system/kernel/debug/debug.cpp
View File

@ -2329,33 +2329,34 @@ dump_block(const char* buffer, int size, const char* prefix)
{ {
const int DUMPED_BLOCK_SIZE = 16; const int DUMPED_BLOCK_SIZE = 16;
int i; int i;
char lineBuffer[3 + DUMPED_BLOCK_SIZE * 4];
for (i = 0; i < size;) { for (i = 0; i < size;) {
char* pointer = lineBuffer;
int start = i; int start = i;
dprintf("%s%04x ", prefix, i);
for (; i < start + DUMPED_BLOCK_SIZE; i++) { for (; i < start + DUMPED_BLOCK_SIZE; i++) {
if (!(i % 4)) if (!(i % 4))
dprintf(" "); pointer += sprintf(pointer, " ");
if (i >= size) if (i >= size)
dprintf(" "); pointer += sprintf(pointer, " ");
else else
dprintf("%02x", *(unsigned char*)(buffer + i)); pointer += sprintf(pointer, "%02x", *(unsigned char*)(buffer + i));
} }
dprintf(" "); pointer += sprintf(pointer, " ");
for (i = start; i < start + DUMPED_BLOCK_SIZE; i++) { for (i = start; i < start + DUMPED_BLOCK_SIZE; i++) {
if (i < size) { if (i < size) {
char c = buffer[i]; char c = buffer[i];
if (c < 30) if (c < 30)
dprintf("."); pointer += sprintf(pointer, ".");
else else
dprintf("%c", c); pointer += sprintf(pointer, "%c", c);
} else } else
break; break;
} }
dprintf("\n"); dprintf("%s%04x%s\n", prefix, start, lineBuffer);
} }
} }