Skip to content

W
White Rabbit Switch - Software
Commit f913547f authored by Adam Wujek's avatar Adam Wujek 💬
Browse files
Options

[FEATURE: 1617] userspace/tools: inform about leap seconds in wr_mon 

And Distinguish TAI/UTC
modify wr_mon to show that "Switch time" is UTC, "WR time" is TAI, and display
number of leap seconds

Was:
Switch time: 2017-03-11 23:30:08
WR time:     2017-03-11 23:30:46

No is:
WR time (TAI):     2017-03-11 23:30:46
Switch time (UTC): 2017-03-11 23:30:08
Leap seconds: 37
Signed-off-by: Adam Wujek's avatarAdam Wujek <adam.wujek@cern.ch>
parent 009dd6ca
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 4 deletions
userspace/tools/wr_mon.c
View file @ f913547f
......@@ -4,6 +4,7 @@
#include <getopt.h>
#include <unistd.h>
#include <time.h>
#include <sys/timex.h>
#include <ppsi/ppsi.h>
#include <libwr/shmem.h>
#include <libwr/hal_shmem.h>
......@@ -266,12 +267,14 @@ void show_ports(int alive)
{
int i, j;
time_t t;
struct timex timex_val;
struct tm *tm;
char datestr[32];
struct hal_port_state *port_state;
struct pp_instance *pp_array;
int vlan_i;
int nvlans;
int *p;
if (!alive) {
if (mode == SHOW_GUI)
......@@ -284,17 +287,26 @@ void show_ports(int alive)
pp_array = wrs_shm_follow(ppsi_head, ppg->pp_instances);
if (mode == SHOW_GUI) {
time(&t);
t = (time_t)_fpga_readl(FPGA_BASE_PPS_GEN + 8 /* UTC_LO */);
tm = localtime(&t);
strftime(datestr, sizeof(datestr), "%Y-%m-%d %H:%M:%S", tm);
term_cprintf(C_BLUE, "Switch time: ");
term_cprintf(C_BLUE, "WR time (TAI): ");
term_cprintf(C_WHITE, "%s\n", datestr);
t = (time_t)_fpga_readl(FPGA_BASE_PPS_GEN + 8 /* UTC_LO */);
time(&t);
tm = localtime(&t);
strftime(datestr, sizeof(datestr), "%Y-%m-%d %H:%M:%S", tm);
term_cprintf(C_BLUE, "WR time: ");
term_cprintf(C_BLUE, "Switch time (UTC): ");
term_cprintf(C_WHITE, "%s\n", datestr);
term_cprintf(C_BLUE, "Leap seconds: ");
if (adjtimex(&timex_val) < 0) {
term_cprintf(C_WHITE, "error\n");
} else {
p = (int *)(&timex_val.stbcnt) + 1;
term_cprintf(C_WHITE, "%3d\n", *p);
}
/* -------------------------------------------------------------------------------*/
term_cprintf(C_CYAN, "------------- HAL -----------|-------------- PPSI -----------------------------\n");
term_cprintf(C_CYAN, " Port | Link | WRconf | Freq |Inst| MAC of peer port | PTP state | Pro | VLANs\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