Skip to content

S
Software for White Rabbit PTP Core
Commit 04c70155 authored by Tristan Gingold's avatar Tristan Gingold
Browse files
Options

Extract task-stats.c from monitor_ppsi.c

parent f3f54239
Hide whitespace changes
Inline Side-by-side
Showing with 140 additions and 117 deletions
lib/lib.mk
View file @ 04c70155
......@@ -8,7 +8,7 @@ obj-y += \
obj-$(CONFIG_WRPC_PPSI) += \
lib/events-ptp.o \
obj-$(CONFIG_EMBEDDED_NODE) += lib/task-diags.o
obj-$(CONFIG_EMBEDDED_NODE) += lib/task-diags.o lib/task-stats.o
obj-$(CONFIG_WR_NODE) += lib/net.o
......
lib/task-stats.c 0 → 100644
View file @ 04c70155
/*
* This work is part of the White Rabbit project
*
* Copyright (C) 2021 CERN
* Author: Wesley W. Terpstra <w.terpstra@gsi.de>
*
* Released according to the GNU GPL, version 2 or any later version.
*/
/* This periodic task is responsible for printing stats (for the stats
command) */
#include <inttypes.h>
#include "wrc-task.h"
#include "sensors.h"
#include "wrpc.h"
#include "softpll/softpll_ng.h"
#include "dev/endpoint.h"
#include "dev/netif.h"
#include "dev/pps_gen.h"
#include "wrc_global.h"
#include "shell.h"
/* internal "last", exported to shell command */
uint32_t wrc_stats_last;
int wrc_log_stats(void)
{
struct wrc_port_state state;
int tx, rx, rx_err;
struct spll_aux_clock_status aux_stat;
uint64_t sec;
uint32_t nsec;
static uint32_t last_update_tick;
int n_out;
int i;
struct pp_servo *s = SRV(ppg->pp_instances);
wrh_servo_t * wrh_servo;
wr_servo_ext_t * wr_servo_ext = NULL;
/* stats update condition for Slave mode */
if (wrc_stats_last == s->update_count && ptp_mode == WRC_MODE_SLAVE) {
last_update_tick = 0;
return 0;
}
if (!wrc_stat_running) {
last_update_tick = 0;
return 0;
}
/* stats update condition for Master mode */
if (wrc_task_not_yet(&last_update_tick, wrc_ui_refperiod))
return 0;
/* Print only one time */
if (wrc_stat_running == -1)
wrc_stat_running = 0;
wrc_stats_last = s->update_count;
shw_pps_gen_get_time(&sec, &nsec);
wrpc_get_port_state(&state, NULL);
minic_get_stats(&tx, &rx, &rx_err);
pp_printf("lnk:%d rx:%d tx:%d ", (wrc_global_link.link_up == NETIF_LINK_UP), rx, tx);
pp_printf("lock:%d ", state.locked ? 1 : 0);
pp_printf("ptp:%s ", get_state_as_string(&ppi_static, ppi_static.state));
if (ptp_mode == WRC_MODE_SLAVE) {
pp_printf("sv:%d ", (s->flags & PP_SERVO_FLAG_VALID) ? 1 : 0);
pp_printf("ss:'%s' ", s->servo_state_name);
}
spll_get_num_channels(NULL, &n_out);
for (i = 0; i < n_out - 1; i++) {
aux_stat = spll_get_aux_status(i);
pp_printf("aux%d:%08x%08x ", i, (int) aux_stat.flags, (int) aux_stat.phase);
}
/* fixme: clock is not always 125 MHz */
pp_printf("sec:%d nsec:%09d ", (int) sec, (int) nsec);
wrh_servo = (ppi_static.protocol_extension == PPSI_EXT_WR && ppi_static.extState == PP_EXSTATE_ACTIVE) ?
(wrh_servo_t*) ppi_static.ext_data : NULL;
if (wrh_servo) {
wr_servo_ext = &((struct wr_data *)wrh_servo)->servo_ext;
}
if (ptp_mode == WRC_MODE_SLAVE) {
struct pp_time crtt;
/* RTT */
pp_printf("mu:%Ld ", pp_time_to_picos(&wr_servo_ext->rawDelayMM));
pp_printf("dms:%Ld ", pp_time_to_picos(&s->delayMS));
pp_printf("dtxm:%d drxm:%d ",
(int) pp_time_to_picos(&wr_servo_ext->delta_txm),
(int) pp_time_to_picos(&wr_servo_ext->delta_rxm));
pp_printf("dtxs:%d drxs:%d ",
(int) pp_time_to_picos(&wr_servo_ext->delta_txs),
(int) pp_time_to_picos(&wr_servo_ext->delta_rxs));
pp_printf("asym:%Ld ", interval_to_picos(ppi_static.portDS->delayAsymmetry));
crtt = wr_servo_ext->rawDelayMM;
pp_time_sub(&crtt, &wr_servo_ext->delta_txm);
pp_time_sub(&crtt, &wr_servo_ext->delta_rxm);
pp_time_sub(&crtt, &wr_servo_ext->delta_txs);
pp_time_sub(&crtt, &wr_servo_ext->delta_rxs);
/* Cable RTT */
pp_printf("crtt:%Ld ", pp_time_to_picos(&crtt));
/* Clock offset */
pp_printf("cko:%d ", (int) pp_time_to_picos(&s->offsetFromMaster));
pp_printf("setp:%d ", (int) wrh_servo->cur_setpoint_ps);
pp_printf("ucnt:%d ", (int) s->update_count);
pp_printf("bslide:%d ", ep_get_bitslide(&wrc_endpoint_dev));
}
pp_printf("hd:%d md:%d ad:%d ", spll_get_dac(-1), spll_get_dac(0),
spll_get_dac(1));
if (HAS_TEMP_SENSORS) {
int32_t temp;
temp = wrc_temp_get("pcb");
pp_printf("temp:%d.%04d C", (int) (temp >> 16),
(int) ((temp & 0xffff) * 10 * 1000 >> 16));
}
pp_printf("\n");
return 1;
}
monitor/monitor_ppsi.c
View file @ 04c70155
......@@ -47,8 +47,6 @@
&& (proto_ext_info[proto_id].valid == 1))
/* internal "last", exported to shell command */
uint32_t wrc_stats_last;
extern struct pp_instance ppi_static;
extern struct pp_globals *ppg;
static int prev_gui_description = 0;
......@@ -776,120 +774,6 @@ void print_servo_data(struct pp_instance *ppi)
}
int wrc_log_stats(void)
{
struct wrc_port_state state;
int tx, rx, rx_err;
struct spll_aux_clock_status aux_stat;
uint64_t sec;
uint32_t nsec;
static uint32_t last_update_tick;
int n_out;
int i;
struct pp_servo *s = SRV(ppg->pp_instances);
wrh_servo_t * wrh_servo;
wr_servo_ext_t * wr_servo_ext = NULL;
/* stats update condition for Slave mode */
if (wrc_stats_last == s->update_count && ptp_mode == WRC_MODE_SLAVE) {
last_update_tick = 0;
return 0;
}
if (!wrc_stat_running) {
last_update_tick = 0;
return 0;
}
/* stats update condition for Master mode */
if (wrc_task_not_yet(&last_update_tick, wrc_ui_refperiod))
return 0;
/* Print only one time */
if (wrc_stat_running == -1)
wrc_stat_running = 0;
wrc_stats_last = s->update_count;
shw_pps_gen_get_time(&sec, &nsec);
wrpc_get_port_state(&state, NULL);
minic_get_stats(&tx, &rx, &rx_err);
pp_printf("lnk:%d rx:%d tx:%d ", (wrc_global_link.link_up == NETIF_LINK_UP), rx, tx);
pp_printf("lock:%d ", state.locked ? 1 : 0);
pp_printf("ptp:%s ", get_state_as_string(&ppi_static, ppi_static.state));
if (ptp_mode == WRC_MODE_SLAVE) {
pp_printf("sv:%d ", (s->flags & PP_SERVO_FLAG_VALID) ? 1 : 0);
pp_printf("ss:'%s' ", s->servo_state_name);
}
spll_get_num_channels(NULL, &n_out);
for (i = 0; i < n_out - 1; i++) {
aux_stat = spll_get_aux_status(i);
pp_printf("aux%d:%08x%08x ", i, (int) aux_stat.flags, (int) aux_stat.phase);
}
/* fixme: clock is not always 125 MHz */
pp_printf("sec:%d nsec:%09d ", (int) sec, (int) nsec);
wrh_servo = (ppi_static.protocol_extension == PPSI_EXT_WR && ppi_static.extState == PP_EXSTATE_ACTIVE) ?
(wrh_servo_t*) ppi_static.ext_data : NULL;
if (wrh_servo) {
wr_servo_ext = &((struct wr_data *)wrh_servo)->servo_ext;
}
if (ptp_mode == WRC_MODE_SLAVE) {
struct pp_time crtt;
/* RTT */
pp_printf("mu:%Ld ", pp_time_to_picos(&wr_servo_ext->rawDelayMM));
pp_printf("dms:%Ld ", pp_time_to_picos(&s->delayMS));
pp_printf("dtxm:%d drxm:%d ",
(int) pp_time_to_picos(&wr_servo_ext->delta_txm),
(int) pp_time_to_picos(&wr_servo_ext->delta_rxm));
pp_printf("dtxs:%d drxs:%d ",
(int) pp_time_to_picos(&wr_servo_ext->delta_txs),
(int) pp_time_to_picos(&wr_servo_ext->delta_rxs));
pp_printf("asym:%Ld ", interval_to_picos(ppi_static.portDS->delayAsymmetry));
crtt = wr_servo_ext->rawDelayMM;
pp_time_sub(&crtt, &wr_servo_ext->delta_txm);
pp_time_sub(&crtt, &wr_servo_ext->delta_rxm);
pp_time_sub(&crtt, &wr_servo_ext->delta_txs);
pp_time_sub(&crtt, &wr_servo_ext->delta_rxs);
/* Cable RTT */
pp_printf("crtt:%Ld ", pp_time_to_picos(&crtt));
/* Clock offset */
pp_printf("cko:%d ", (int) pp_time_to_picos(&s->offsetFromMaster));
pp_printf("setp:%d ", (int) wrh_servo->cur_setpoint_ps);
pp_printf("ucnt:%d ", (int) s->update_count);
pp_printf("bslide:%d ", ep_get_bitslide(&wrc_endpoint_dev));
}
pp_printf("hd:%d md:%d ad:%d ", spll_get_dac(-1), spll_get_dac(0),
spll_get_dac(1));
if (HAS_TEMP_SENSORS) {
int32_t temp;
temp = wrc_temp_get("pcb");
pp_printf("temp:%d.%04d C", (int) (temp >> 16),
(int) ((temp & 0xffff) * 10 * 1000 >> 16));
}
pp_printf("\n");
return 1;
}
#if 0
/*
......
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