ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

spdk: tweak tracedump

Browse Source 
Increased printed data width, added data offset indices.

Change-Id: I44f81396e33870109c2bece5e152657f8a24a56a
Signed-off-by: Krzysztof Jakimiak <krzysztof.jakimiak@intel.com>
This commit is contained in:
Krzysztof Jakimiak 2016-10-04 11:50:45 +02:00 committed by Jim Harris
parent 46b7d49af0
commit 25749728b6
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/spdk/log.h
View File

@ -77,7 +77,7 @@ __attribute__((constructor)) static void register_trace_flag_##flag(void) \
#define SPDK_TRACEDUMP(FLAG, LABEL, BUF, LEN) \ #define SPDK_TRACEDUMP(FLAG, LABEL, BUF, LEN) \
do { \ do { \
extern bool FLAG; \ extern bool FLAG; \
if (FLAG) { \ if ((FLAG) && (LEN)) { \
spdk_trace_dump((LABEL), (BUF), (LEN)); \ spdk_trace_dump((LABEL), (BUF), (LEN)); \
} \ } \
} while (0) } while (0)

26
lib/log/log.c
View File

@ -212,30 +212,38 @@ static void
fdump(FILE *fp, const char *label, const uint8_t *buf, size_t len) fdump(FILE *fp, const char *label, const uint8_t *buf, size_t len)
{ {
char tmpbuf[MAX_TMPBUF]; char tmpbuf[MAX_TMPBUF];
char buf8[8 + 1]; char buf16[16 + 1];
size_t total; size_t total;
size_t idx; unsigned int idx;
fprintf(fp, "%s\n", label); fprintf(fp, "%s\n", label);
memset(buf8, 0, sizeof buf8); memset(buf16, 0, sizeof buf16);
total = 0; total = 0;
for (idx = 0; idx < len; idx++) { for (idx = 0; idx < len; idx++) {
if (idx != 0 && idx % 8 == 0) { if (idx != 0 && idx % 16 == 0) {
snprintf(tmpbuf + total, sizeof tmpbuf - total, snprintf(tmpbuf + total, sizeof tmpbuf - total,
"%s", buf8); " %s", buf16);
fprintf(fp, "%s\n", tmpbuf); fprintf(fp, "%s\n", tmpbuf);
total = 0; total = 0;
} }
if (idx % 16 == 0) {
total += snprintf(tmpbuf + total, sizeof tmpbuf - total,
"%08x ", idx);
}
if (idx % 8 == 0) {
total += snprintf(tmpbuf + total, sizeof tmpbuf - total,
"%s", " ");
}
total += snprintf(tmpbuf + total, sizeof tmpbuf - total, total += snprintf(tmpbuf + total, sizeof tmpbuf - total,
"%2.2x ", buf[idx] & 0xff); "%2.2x ", buf[idx] & 0xff);
buf8[idx % 8] = isprint(buf[idx]) ? buf[idx] : '.'; buf16[idx % 16] = isprint(buf[idx]) ? buf[idx] : '.';
} }
for (; idx % 8 != 0; idx++) { for (; idx % 16 != 0; idx++) {
total += snprintf(tmpbuf + total, sizeof tmpbuf - total, " "); total += snprintf(tmpbuf + total, sizeof tmpbuf - total, " ");
buf8[idx % 8] = ' '; buf16[idx % 16] = ' ';
} }
snprintf(tmpbuf + total, sizeof tmpbuf - total, "%s", buf8); snprintf(tmpbuf + total, sizeof tmpbuf - total, " %s", buf16);
fprintf(fp, "%s\n", tmpbuf); fprintf(fp, "%s\n", tmpbuf);
fflush(fp); fflush(fp);
} }