Commit 25749728 authored by Krzysztof Jakimiak's avatar Krzysztof Jakimiak Committed by Jim Harris
Browse files

spdk: tweak tracedump 



Increased printed data width, added data offset indices.

Change-Id: I44f81396e33870109c2bece5e152657f8a24a56a
Signed-off-by: default avatarKrzysztof Jakimiak <krzysztof.jakimiak@intel.com>
parent 46b7d49a

include/spdk/log.h

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ __attribute__((constructor)) static void register_trace_flag_##flag(void) \ 
#define SPDK_TRACEDUMP(FLAG, LABEL, BUF, LEN)						\

	do {										\

		extern bool FLAG;							\

		if (FLAG) {								\

		if ((FLAG) && (LEN)) {								\

			spdk_trace_dump((LABEL), (BUF), (LEN));				\

		}									\

	} while (0)

lib/log/log.c

+17 −9
Original line number Diff line number Diff line
@@ -212,30 +212,38 @@ static void 
fdump(FILE *fp, const char *label, const uint8_t *buf, size_t len)

{

	char tmpbuf[MAX_TMPBUF];

	char buf8[8 + 1];

	char buf16[16 + 1];

	size_t total;

	size_t idx;

	unsigned int idx;



	fprintf(fp, "%s\n", label);



	memset(buf8, 0, sizeof buf8);

	memset(buf16, 0, sizeof buf16);

	total = 0;

	for (idx = 0; idx < len; idx++) {

		if (idx != 0 && idx % 8 == 0) {

		if (idx != 0 && idx % 16 == 0) {

			snprintf(tmpbuf + total, sizeof tmpbuf - total,

				 "%s", buf8);

				 " %s", buf16);

			fprintf(fp, "%s\n", tmpbuf);

			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,

				  "%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, "   ");

		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);

	fflush(fp);

}