Skip to content

W
White Rabbit Trigger Distribution
Commit 4a86a4f6 authored by Tristan Gingold's avatar Tristan Gingold
Browse files
Options

wrtd: improve log display

parent db22eee3
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 5 deletions
software/firmware/fd/wrtd-rt-fd.c
View file @ 4a86a4f6
...@@ -359,7 +359,8 @@ static void do_output (struct wrtd_fd_channel *out) ...@@ -359,7 +359,8 @@ static void do_output (struct wrtd_fd_channel *out)
} }
} else { } else {
/* Has been triggered. */ /* Has been triggered. */
wrtd_log(WRTD_LOG_MSG_EV_CONSUMED, 0, wrtd_log(WRTD_LOG_MSG_EV_CONSUMED,
WRTD_LOG_CONSUMED_DONE,
&pq_ent->ev, NULL); &pq_ent->ev, NULL);
pulse_queue_pop(q); pulse_queue_pop(q);
......
software/tools/wrtd-logging.c
View file @ 4a86a4f6
...@@ -63,12 +63,33 @@ static void print_logging (struct wrtd_dev *wrtd, int n_read) ...@@ -63,12 +63,33 @@ static void print_logging (struct wrtd_dev *wrtd, int n_read)
break; break;
case WRTD_LOG_MSG_EV_CONSUMED: case WRTD_LOG_MSG_EV_CONSUMED:
printf("consumed "); printf("consumed ");
switch(log.reason) {
case WRTD_LOG_CONSUMED_START:
printf("start ");
break;
case WRTD_LOG_CONSUMED_DONE:
printf("done ");
break;
default:
printf("%-5u ", log.reason);
break;
}
break; break;
case WRTD_LOG_MSG_EV_DISCARDED: case WRTD_LOG_MSG_EV_DISCARDED:
printf("discarded"); printf("discarded");
break; break;
case WRTD_LOG_MSG_EV_NETWORK: case WRTD_LOG_MSG_EV_NETWORK:
printf("network "); switch(log.reason) {
case WRTD_LOG_NETWORK_TX:
printf("network tx ");
break;
case WRTD_LOG_NETWORK_RX:
printf("network rx ");
break;
default:
printf("network %-7u", log.reason);
break;
}
break; break;
case WRTD_LOG_MSG_LINK: case WRTD_LOG_MSG_LINK:
printf("link "); printf("link ");
...@@ -77,9 +98,8 @@ static void print_logging (struct wrtd_dev *wrtd, int n_read) ...@@ -77,9 +98,8 @@ static void print_logging (struct wrtd_dev *wrtd, int n_read)
printf("?%d", log.type); printf("?%d", log.type);
break; break;
} }
printf(", reason: %2d", log.reason); printf(" id: %-8.*s", WRTD_ID_LEN, log.event.id);
printf(", id: %.*s", WRTD_ID_LEN, log.event.id); printf(" ev ts: ");
printf(", ev ts: ");
print_ts(&log.event.ts); print_ts(&log.event.ts);
printf("\n"); printf("\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment