Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Software for White Rabbit PTP Core
Manage
Activity
Members
Labels
Plan
Issues
39
Issue boards
Milestones
Wiki
Code
Merge requests
5
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Projects
Software for White Rabbit PTP Core
Commits
6bc87954
Commit
6bc87954
authored
12 years ago
by
Tomasz Wlostowski
Browse files
Options
Downloads
Patches
Plain Diff
monitor gui: moved utility functions to lib/
parent
7b9de0a7
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
lib/mprintf.c
+6
-31
6 additions, 31 deletions
lib/mprintf.c
lib/util.c
+94
-0
94 additions, 0 deletions
lib/util.c
monitor/monitor.c
+42
-103
42 additions, 103 deletions
monitor/monitor.c
with
142 additions
and
134 deletions
lib/mprintf.c
+
6
−
31
View file @
6bc87954
...
...
@@ -3,6 +3,7 @@
#include
<stdlib.h>
#include
"uart.h"
#include
"util.h"
int
vprintf
(
char
const
*
format
,
va_list
ap
)
{
...
...
@@ -232,11 +233,11 @@ CONVERSION_LOOP:
int
mprintf
(
char
const
*
format
,
...)
{
int
rval
;
va_list
ap
;
va_start
(
ap
,
format
);
rval
=
vprintf
(
format
,
ap
);
va_end
(
ap
);
return
rval
;
va_list
ap
;
va_start
(
ap
,
format
);
rval
=
vprintf
(
format
,
ap
);
va_end
(
ap
);
return
rval
;
}
...
...
@@ -248,29 +249,3 @@ int sprintf(char *dst, char const *format, ...)
return
r
;
}
#define C_DIM 0x80
void
m_cprintf
(
int
color
,
const
char
*
fmt
,
...)
{
va_list
ap
;
mprintf
(
"
\033
[0%d;3%dm"
,
color
&
C_DIM
?
2
:
1
,
color
&
0x7f
);
va_start
(
ap
,
fmt
);
vprintf
(
fmt
,
ap
);
va_end
(
ap
);
}
void
m_pcprintf
(
int
row
,
int
col
,
int
color
,
const
char
*
fmt
,
...)
{
va_list
ap
;
mprintf
(
"
\033
[%d;%df"
,
row
,
col
);
mprintf
(
"
\033
[0%d;3%dm"
,
color
&
C_DIM
?
2
:
1
,
color
&
0x7f
);
va_start
(
ap
,
fmt
);
vprintf
(
fmt
,
ap
);
va_end
(
ap
);
}
void
m_term_clear
()
{
mprintf
(
"
\033
[2J
\033
[1;1H"
);
}
This diff is collapsed.
Click to expand it.
lib/util.c
0 → 100644
+
94
−
0
View file @
6bc87954
#include
<stdio.h>
#include
<stdint.h>
#include
<stdarg.h>
#include
<time.h>
#include
"util.h"
/* cut from libc sources */
#define YEAR0 1900
#define EPOCH_YR 1970
#define SECS_DAY (24L * 60L * 60L)
#define LEAPYEAR(year) (!((year) % 4) && (((year) % 100) || !((year) % 400)))
#define YEARSIZE(year) (LEAPYEAR(year) ? 366 : 365)
#define FIRSTSUNDAY(timp) (((timp)->tm_yday - (timp)->tm_wday + 420) % 7)
#define FIRSTDAYOF(timp) (((timp)->tm_wday - (timp)->tm_yday + 420) % 7)
#define TIME_MAX ULONG_MAX
#define ABB_LEN 3
static
const
char
*
_days
[]
=
{
"Sun"
,
"Mon"
,
"Tue"
,
"Wed"
,
"Thu"
,
"Fri"
,
"Sat"
};
static
const
char
*
_months
[]
=
{
"Jan"
,
"Feb"
,
"Mar"
,
"Apr"
,
"May"
,
"Jun"
,
"Jul"
,
"Aug"
,
"Sep"
,
"Oct"
,
"Nov"
,
"Dec"
};
static
const
int
_ytab
[
2
][
12
]
=
{
{
31
,
28
,
31
,
30
,
31
,
30
,
31
,
31
,
30
,
31
,
30
,
31
},
{
31
,
29
,
31
,
30
,
31
,
30
,
31
,
31
,
30
,
31
,
30
,
31
}
};
char
*
format_time
(
uint32_t
utc
)
{
struct
tm
t
;
static
char
buf
[
64
];
unsigned
long
dayclock
,
dayno
;
int
year
=
EPOCH_YR
;
dayclock
=
(
unsigned
long
)
utc
%
SECS_DAY
;
dayno
=
(
unsigned
long
)
utc
/
SECS_DAY
;
t
.
tm_sec
=
dayclock
%
60
;
t
.
tm_min
=
(
dayclock
%
3600
)
/
60
;
t
.
tm_hour
=
dayclock
/
3600
;
t
.
tm_wday
=
(
dayno
+
4
)
%
7
;
/* day 0 was a thursday */
while
(
dayno
>=
YEARSIZE
(
year
))
{
dayno
-=
YEARSIZE
(
year
);
year
++
;
}
t
.
tm_year
=
year
-
YEAR0
;
t
.
tm_yday
=
dayno
;
t
.
tm_mon
=
0
;
while
(
dayno
>=
_ytab
[
LEAPYEAR
(
year
)][
t
.
tm_mon
])
{
dayno
-=
_ytab
[
LEAPYEAR
(
year
)][
t
.
tm_mon
];
t
.
tm_mon
++
;
}
t
.
tm_mday
=
dayno
+
1
;
t
.
tm_isdst
=
0
;
sprintf
(
buf
,
"%s, %s %d, %d, %2d:%2d:%2d"
,
_days
[
t
.
tm_wday
],
_months
[
t
.
tm_mon
],
t
.
tm_mday
,
t
.
tm_year
+
YEAR0
,
t
.
tm_hour
,
t
.
tm_min
,
t
.
tm_sec
);
return
buf
;
}
void
cprintf
(
int
color
,
const
char
*
fmt
,
...)
{
va_list
ap
;
mprintf
(
"
\033
[0%d;3%dm"
,
color
&
C_DIM
?
2
:
1
,
color
&
0x7f
);
va_start
(
ap
,
fmt
);
vprintf
(
fmt
,
ap
);
va_end
(
ap
);
}
void
pcprintf
(
int
row
,
int
col
,
int
color
,
const
char
*
fmt
,
...)
{
va_list
ap
;
mprintf
(
"
\033
[%d;%df"
,
row
,
col
);
mprintf
(
"
\033
[0%d;3%dm"
,
color
&
C_DIM
?
2
:
1
,
color
&
0x7f
);
va_start
(
ap
,
fmt
);
vprintf
(
fmt
,
ap
);
va_end
(
ap
);
}
void
term_clear
()
{
mprintf
(
"
\033
[2J
\033
[1;1H"
);
}
This diff is collapsed.
Click to expand it.
monitor/monitor.c
+
42
−
103
View file @
6bc87954
...
...
@@ -6,78 +6,14 @@
#include
"hal_exports.h"
#include
"softpll_ng.h"
#include
"pps_gen.h"
#include
"util.h"
#include
"timer.h"
#define UI_REFRESH_PERIOD TICS_PER_SECOND
/* 1 sec */
extern
ptpdexp_sync_state_t
cur_servo_state
;
extern
int
wrc_man_phase
;
#define C_DIM 0x80
#define C_WHITE 7
#define C_GREY (C_WHITE | C_DIM)
#define C_RED 1
#define C_GREEN 2
#define C_BLUE 4
#define YEAR0 1900
#define EPOCH_YR 1970
#define SECS_DAY (24L * 60L * 60L)
#define LEAPYEAR(year) (!((year) % 4) && (((year) % 100) || !((year) % 400)))
#define YEARSIZE(year) (LEAPYEAR(year) ? 366 : 365)
#define FIRSTSUNDAY(timp) (((timp)->tm_yday - (timp)->tm_wday + 420) % 7)
#define FIRSTDAYOF(timp) (((timp)->tm_wday - (timp)->tm_yday + 420) % 7)
#define TIME_MAX ULONG_MAX
#define ABB_LEN 3
static
const
char
*
_days
[]
=
{
"Sunday"
,
"Monday"
,
"Tuesday"
,
"Wednesday"
,
"Thursday"
,
"Friday"
,
"Saturday"
};
static
const
char
*
_months
[]
=
{
"January"
,
"February"
,
"March"
,
"April"
,
"May"
,
"June"
,
"July"
,
"August"
,
"September"
,
"October"
,
"November"
,
"December"
};
static
const
int
_ytab
[
2
][
12
]
=
{
{
31
,
28
,
31
,
30
,
31
,
30
,
31
,
31
,
30
,
31
,
30
,
31
},
{
31
,
29
,
31
,
30
,
31
,
30
,
31
,
31
,
30
,
31
,
30
,
31
}
};
static
char
*
format_time
(
uint32_t
utc
)
{
struct
tm
t
;
static
char
buf
[
64
];
unsigned
long
dayclock
,
dayno
;
int
year
=
EPOCH_YR
;
dayclock
=
(
unsigned
long
)
utc
%
SECS_DAY
;
dayno
=
(
unsigned
long
)
utc
/
SECS_DAY
;
t
.
tm_sec
=
dayclock
%
60
;
t
.
tm_min
=
(
dayclock
%
3600
)
/
60
;
t
.
tm_hour
=
dayclock
/
3600
;
t
.
tm_wday
=
(
dayno
+
4
)
%
7
;
/* day 0 was a thursday */
while
(
dayno
>=
YEARSIZE
(
year
))
{
dayno
-=
YEARSIZE
(
year
);
year
++
;
}
t
.
tm_year
=
year
-
YEAR0
;
t
.
tm_yday
=
dayno
;
t
.
tm_mon
=
0
;
while
(
dayno
>=
_ytab
[
LEAPYEAR
(
year
)][
t
.
tm_mon
])
{
dayno
-=
_ytab
[
LEAPYEAR
(
year
)][
t
.
tm_mon
];
t
.
tm_mon
++
;
}
t
.
tm_mday
=
dayno
+
1
;
t
.
tm_isdst
=
0
;
sprintf
(
buf
,
"%s, %s %d, %d, %2d:%2d:%2d"
,
_days
[
t
.
tm_wday
],
_months
[
t
.
tm_mon
],
t
.
tm_mday
,
t
.
tm_year
+
YEAR0
,
t
.
tm_hour
,
t
.
tm_min
,
t
.
tm_sec
);
return
buf
;
}
int
wrc_mon_gui
(
void
)
{
static
char
*
slave_states
[]
=
{
"Uninitialized"
,
"SYNC_UTC"
,
"SYNC_NSEC"
,
"SYNC_PHASE"
,
"TRACK_PHASE"
};
...
...
@@ -87,91 +23,91 @@ int wrc_mon_gui(void)
int
aux_stat
;
int32_t
utc
,
nsec
;
if
(
timer_get_tics
()
-
last
<
1000
)
if
(
timer_get_tics
()
-
last
<
UI_REFRESH_PERIOD
)
return
0
;
last
=
timer_get_tics
();
m_
term_clear
();
term_clear
();
m_
pcprintf
(
1
,
1
,
C_BLUE
,
"WR PTP Core Sync Monitor v 1.0"
);
m_
pcprintf
(
2
,
1
,
C_GREY
,
"Esc = exit"
);
pcprintf
(
1
,
1
,
C_BLUE
,
"WR PTP Core Sync Monitor v 1.0"
);
pcprintf
(
2
,
1
,
C_GREY
,
"Esc = exit"
);
pps_gen_get_time
(
&
utc
,
&
nsec
);
m_
cprintf
(
C_BLUE
,
"
\n\n
UTC Time: "
);
m_
cprintf
(
C_WHITE
,
"%s"
,
format_time
(
utc
));
cprintf
(
C_BLUE
,
"
\n\n
UTC Time: "
);
cprintf
(
C_WHITE
,
"%s"
,
format_time
(
utc
));
/*show_ports*/
halexp_get_port_state
(
&
ps
,
NULL
);
m_
pcprintf
(
4
,
1
,
C_BLUE
,
"
\n\n
Link status:"
);
pcprintf
(
4
,
1
,
C_BLUE
,
"
\n\n
Link status:"
);
m_
pcprintf
(
6
,
1
,
C_WHITE
,
"%s: "
,
"wru1"
);
if
(
ps
.
up
)
m_
cprintf
(
C_GREEN
,
"Link up "
);
else
m_
cprintf
(
C_RED
,
"Link down "
);
pcprintf
(
6
,
1
,
C_WHITE
,
"%s: "
,
"wru1"
);
if
(
ps
.
up
)
cprintf
(
C_GREEN
,
"Link up "
);
else
cprintf
(
C_RED
,
"Link down "
);
if
(
ps
.
up
)
{
minic_get_stats
(
&
tx
,
&
rx
);
m_
cprintf
(
C_GREY
,
"(RX: %d, TX: %d), mode: "
,
rx
,
tx
);
cprintf
(
C_GREY
,
"(RX: %d, TX: %d), mode: "
,
rx
,
tx
);
switch
(
ps
.
mode
)
{
case
HEXP_PORT_MODE_WR_MASTER
:
m_
cprintf
(
C_WHITE
,
"WR Master "
);
break
;
case
HEXP_PORT_MODE_WR_SLAVE
:
m_
cprintf
(
C_WHITE
,
"WR Slave "
);
break
;
case
HEXP_PORT_MODE_WR_MASTER
:
cprintf
(
C_WHITE
,
"WR Master "
);
break
;
case
HEXP_PORT_MODE_WR_SLAVE
:
cprintf
(
C_WHITE
,
"WR Slave "
);
break
;
}
if
(
ps
.
is_locked
)
m_
cprintf
(
C_GREEN
,
"Locked "
);
else
m_
cprintf
(
C_RED
,
"NoLock "
);
if
(
ps
.
rx_calibrated
&&
ps
.
tx_calibrated
)
m_
cprintf
(
C_GREEN
,
"Calibrated "
);
else
m_
cprintf
(
C_RED
,
"Uncalibrated "
);
if
(
ps
.
is_locked
)
cprintf
(
C_GREEN
,
"Locked "
);
else
cprintf
(
C_RED
,
"NoLock "
);
if
(
ps
.
rx_calibrated
&&
ps
.
tx_calibrated
)
cprintf
(
C_GREEN
,
"Calibrated "
);
else
cprintf
(
C_RED
,
"Uncalibrated "
);
/* show_servo */
m_
cprintf
(
C_BLUE
,
"
\n\n
Synchronization status:
\n\n
"
);
cprintf
(
C_BLUE
,
"
\n\n
Synchronization status:
\n\n
"
);
if
(
!
cur_servo_state
.
valid
)
{
m_
cprintf
(
C_RED
,
"Master mode or sync info not valid
\n\n
"
);
cprintf
(
C_RED
,
"Master mode or sync info not valid
\n\n
"
);
return
;
}
m_
cprintf
(
C_GREY
,
"Servo state: "
);
m_
cprintf
(
C_WHITE
,
"%s
\n
"
,
cur_servo_state
.
slave_servo_state
);
m_
cprintf
(
C_GREY
,
"Phase tracking: "
);
if
(
cur_servo_state
.
tracking_enabled
)
m_
cprintf
(
C_GREEN
,
"ON
\n
"
);
else
m_
cprintf
(
C_RED
,
"OFF
\n
"
);
m_
cprintf
(
C_GREY
,
"Synchronization source: "
);
m_
cprintf
(
C_WHITE
,
"%s
\n
"
,
cur_servo_state
.
sync_source
);
cprintf
(
C_GREY
,
"Servo state: "
);
cprintf
(
C_WHITE
,
"%s
\n
"
,
cur_servo_state
.
slave_servo_state
);
cprintf
(
C_GREY
,
"Phase tracking: "
);
if
(
cur_servo_state
.
tracking_enabled
)
cprintf
(
C_GREEN
,
"ON
\n
"
);
else
cprintf
(
C_RED
,
"OFF
\n
"
);
cprintf
(
C_GREY
,
"Synchronization source: "
);
cprintf
(
C_WHITE
,
"%s
\n
"
,
cur_servo_state
.
sync_source
);
m_
cprintf
(
C_GREY
,
"Aux clock status: "
);
cprintf
(
C_GREY
,
"Aux clock status: "
);
aux_stat
=
spll_get_aux_status
(
0
);
if
(
aux_stat
&
SPLL_AUX_ENABLED
)
m_
cprintf
(
C_GREEN
,
"enabled"
);
cprintf
(
C_GREEN
,
"enabled"
);
if
(
aux_stat
&
SPLL_AUX_LOCKED
)
m_
cprintf
(
C_GREEN
,
", locked"
);
cprintf
(
C_GREEN
,
", locked"
);
mprintf
(
"
\n
"
);
m_
cprintf
(
C_BLUE
,
"
\n
Timing parameters:
\n\n
"
);
cprintf
(
C_BLUE
,
"
\n
Timing parameters:
\n\n
"
);
m_
cprintf
(
C_GREY
,
"Round-trip time (mu): "
);
m_
cprintf
(
C_WHITE
,
"%d ps
\n
"
,
(
int32_t
)(
cur_servo_state
.
mu
));
m_
cprintf
(
C_GREY
,
"Master-slave delay: "
);
m_
cprintf
(
C_WHITE
,
"%d ps
\n
"
,
(
int32_t
)(
cur_servo_state
.
delay_ms
));
m_
cprintf
(
C_GREY
,
"Master PHY delays: "
);
m_
cprintf
(
C_WHITE
,
"TX: %d ps, RX: %d ps
\n
"
,
(
int32_t
)
cur_servo_state
.
delta_tx_m
,
(
int32_t
)
cur_servo_state
.
delta_rx_m
);
m_
cprintf
(
C_GREY
,
"Slave PHY delays: "
);
m_
cprintf
(
C_WHITE
,
"TX: %d ps, RX: %d ps
\n
"
,
(
int32_t
)
cur_servo_state
.
delta_tx_s
,
(
int32_t
)
cur_servo_state
.
delta_rx_s
);
m_
cprintf
(
C_GREY
,
"Total link asymmetry: "
);
m_
cprintf
(
C_WHITE
,
"%d ps
\n
"
,
(
int32_t
)(
cur_servo_state
.
total_asymmetry
));
m_
cprintf
(
C_GREY
,
"Cable rtt delay: "
);
m_
cprintf
(
C_WHITE
,
"%d ps
\n
"
,
cprintf
(
C_GREY
,
"Round-trip time (mu): "
);
cprintf
(
C_WHITE
,
"%d ps
\n
"
,
(
int32_t
)(
cur_servo_state
.
mu
));
cprintf
(
C_GREY
,
"Master-slave delay: "
);
cprintf
(
C_WHITE
,
"%d ps
\n
"
,
(
int32_t
)(
cur_servo_state
.
delay_ms
));
cprintf
(
C_GREY
,
"Master PHY delays: "
);
cprintf
(
C_WHITE
,
"TX: %d ps, RX: %d ps
\n
"
,
(
int32_t
)
cur_servo_state
.
delta_tx_m
,
(
int32_t
)
cur_servo_state
.
delta_rx_m
);
cprintf
(
C_GREY
,
"Slave PHY delays: "
);
cprintf
(
C_WHITE
,
"TX: %d ps, RX: %d ps
\n
"
,
(
int32_t
)
cur_servo_state
.
delta_tx_s
,
(
int32_t
)
cur_servo_state
.
delta_rx_s
);
cprintf
(
C_GREY
,
"Total link asymmetry: "
);
cprintf
(
C_WHITE
,
"%d ps
\n
"
,
(
int32_t
)(
cur_servo_state
.
total_asymmetry
));
cprintf
(
C_GREY
,
"Cable rtt delay: "
);
cprintf
(
C_WHITE
,
"%d ps
\n
"
,
(
int32_t
)(
cur_servo_state
.
mu
)
-
(
int32_t
)
cur_servo_state
.
delta_tx_m
-
(
int32_t
)
cur_servo_state
.
delta_rx_m
-
(
int32_t
)
cur_servo_state
.
delta_tx_s
-
(
int32_t
)
cur_servo_state
.
delta_rx_s
);
m_
cprintf
(
C_GREY
,
"Clock offset: "
);
m_
cprintf
(
C_WHITE
,
"%d ps
\n
"
,
(
int32_t
)(
cur_servo_state
.
cur_offset
));
m_
cprintf
(
C_GREY
,
"Phase setpoint: "
);
m_
cprintf
(
C_WHITE
,
"%d ps
\n
"
,
(
int32_t
)(
cur_servo_state
.
cur_setpoint
));
m_
cprintf
(
C_GREY
,
"Skew: "
);
m_
cprintf
(
C_WHITE
,
"%d ps
\n
"
,
(
int32_t
)(
cur_servo_state
.
cur_skew
));
m_
cprintf
(
C_GREY
,
"Manual phase adjustment: "
);
m_
cprintf
(
C_WHITE
,
"%d ps
\n
"
,
(
int32_t
)(
wrc_man_phase
));
cprintf
(
C_GREY
,
"Clock offset: "
);
cprintf
(
C_WHITE
,
"%d ps
\n
"
,
(
int32_t
)(
cur_servo_state
.
cur_offset
));
cprintf
(
C_GREY
,
"Phase setpoint: "
);
cprintf
(
C_WHITE
,
"%d ps
\n
"
,
(
int32_t
)(
cur_servo_state
.
cur_setpoint
));
cprintf
(
C_GREY
,
"Skew: "
);
cprintf
(
C_WHITE
,
"%d ps
\n
"
,
(
int32_t
)(
cur_servo_state
.
cur_skew
));
cprintf
(
C_GREY
,
"Manual phase adjustment: "
);
cprintf
(
C_WHITE
,
"%d ps
\n
"
,
(
int32_t
)(
wrc_man_phase
));
m_
cprintf
(
C_GREY
,
"Update counter: "
);
m_
cprintf
(
C_WHITE
,
"%d
\n
"
,
(
int32_t
)(
cur_servo_state
.
update_count
));
cprintf
(
C_GREY
,
"Update counter: "
);
cprintf
(
C_WHITE
,
"%d
\n
"
,
(
int32_t
)(
cur_servo_state
.
update_count
));
}
m_
cprintf
(
C_GREY
,
"--"
);
cprintf
(
C_GREY
,
"--"
);
return
0
;
}
...
...
@@ -183,7 +119,9 @@ int wrc_log_stats(void)
hexp_port_state_t
ps
;
int
tx
,
rx
;
int
aux_stat
;
uint32_t
utc
,
nsec
;
pps_gen_get_time
(
&
utc
,
&
nsec
);
halexp_get_port_state
(
&
ps
,
NULL
);
minic_get_stats
(
&
tx
,
&
rx
);
mprintf
(
"lnk:%d rx:%d tx:%d "
,
ps
.
up
,
rx
,
tx
);
...
...
@@ -192,6 +130,7 @@ int wrc_log_stats(void)
mprintf
(
"ss:'%s' "
,
cur_servo_state
.
slave_servo_state
);
aux_stat
=
spll_get_aux_status
(
0
);
mprintf
(
"aux:%x "
,
aux_stat
);
mprintf
(
"utc:%d nsec:%d "
,
utc
,
nsec
*
8
);
/* fixme: clock is not always 125 MHz */
mprintf
(
"mu:%d "
,
(
int32_t
)
cur_servo_state
.
mu
);
mprintf
(
"dms:%d "
,
(
int32_t
)
cur_servo_state
.
delay_ms
);
mprintf
(
"dtxm:%d drxm:%d "
,
(
int32_t
)
cur_servo_state
.
delta_tx_m
,
(
int32_t
)
cur_servo_state
.
delta_rx_m
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment