April 2022 - gerrit-log - lists.osmocom.org

Change in osmo-e1d[master]: octoi: Simple RX priming / pre-filling

by laforge

Attention is currently required from: tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27834 ) Change subject: octoi: Simple RX priming / pre-filling ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27834 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I3a4b3846d3dbd1c99989e994ad95e609f2757219 Gerrit-Change-Number: 27834 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Tue, 19 Apr 2022 18:02:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-e1d[master]: octoi: Reset FIFO/RIFO when entering ACCEPTED state

by manawyrm

Attention is currently required from: laforge. manawyrm has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27833 ) Change subject: octoi: Reset FIFO/RIFO when entering ACCEPTED state ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: Should be fine 😊 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27833 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I9e721b5dbf22728cb2361ed121d12def7016dcc2 Gerrit-Change-Number: 27833 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 19 Apr 2022 17:45:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-e1d[master]: octoi: Reset FIFO/RIFO when entering ACCEPTED state

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27833 ) Change subject: octoi: Reset FIFO/RIFO when entering ACCEPTED state ...................................................................... octoi: Reset FIFO/RIFO when entering ACCEPTED state For both OCTOI client + server FSM, whenever we enter the ACCEPTED state (we disconnect), let's reset the RIFO/FIFO state. This makes sure no left-over frames from some earlier connection are present, and also ensures our initial frame number expectations are correct. Change-Id: I9e721b5dbf22728cb2361ed121d12def7016dcc2 --- M src/octoi/e1oip.c M src/octoi/e1oip.h M src/octoi/octoi_clnt_fsm.c M src/octoi/octoi_srv_fsm.c 4 files changed, 19 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/33/27833/1 diff --git a/src/octoi/e1oip.c b/src/octoi/e1oip.c index 9461818..5dd3bbf 100644 --- a/src/octoi/e1oip.c +++ b/src/octoi/e1oip.c @@ -288,11 +288,7 @@ iline->cfg.batching_factor = 32; iline->cfg.prefill_frame_count = 400; /* 50ms */ - frame_fifo_init(&iline->e1o.fifo, iline->cfg.batching_factor, fifo_threshold_cb, iline); - memset(&iline->e1o.last_frame, 0xff, sizeof(iline->e1o.last_frame)); - - frame_rifo_init(&iline->e1t.rifo); - memset(&iline->e1t.last_frame, 0xff, sizeof(iline->e1o.last_frame)); + e1oip_line_reset(iline); iline->peer = peer; peer->iline = iline; @@ -300,6 +296,17 @@ return iline; } +void e1oip_line_reset(struct e1oip_line *iline) +{ + frame_fifo_init(&iline->e1o.fifo, iline->cfg.batching_factor, fifo_threshold_cb, iline); + memset(&iline->e1o.last_frame, 0xff, sizeof(iline->e1o.last_frame)); + iline->e1o.next_seq = 0; + + frame_rifo_init(&iline->e1t.rifo); + memset(&iline->e1t.last_frame, 0xff, sizeof(iline->e1t.last_frame)); + iline->e1t.next_fn32 = 0; +} + void e1oip_line_destroy(struct e1oip_line *iline) { if (!iline) diff --git a/src/octoi/e1oip.h b/src/octoi/e1oip.h index 233e8ee..70e1bbb 100644 --- a/src/octoi/e1oip.h +++ b/src/octoi/e1oip.h @@ -60,6 +60,7 @@ struct e1oip_line *e1oip_line_alloc(struct octoi_peer *peer); void e1oip_line_set_name(struct e1oip_line *line, const char *name); +void e1oip_line_reset(struct e1oip_line *iline); void e1oip_line_destroy(struct e1oip_line *iline); int e1oip_rcvmsg_tdm_data(struct e1oip_line *iline, struct msgb *msg); diff --git a/src/octoi/octoi_clnt_fsm.c b/src/octoi/octoi_clnt_fsm.c index 1c38bc8..f2fe989 100644 --- a/src/octoi/octoi_clnt_fsm.c +++ b/src/octoi/octoi_clnt_fsm.c @@ -115,6 +115,9 @@ { struct clnt_state *st = fi->priv; + /* reset RIFO/FIFO etc. */ + e1oip_line_reset(st->peer->iline); + st->peer->tdm_permitted = true; osmo_timer_schedule(&st->rx_alive_timer, 3, 0); } diff --git a/src/octoi/octoi_srv_fsm.c b/src/octoi/octoi_srv_fsm.c index 9f1019a..3990a16 100644 --- a/src/octoi/octoi_srv_fsm.c +++ b/src/octoi/octoi_srv_fsm.c @@ -169,6 +169,9 @@ { struct srv_state *st = fi->priv; + /* reset RIFO/FIFO etc. */ + e1oip_line_reset(st->peer->iline); + st->peer->tdm_permitted = true; osmo_timer_schedule(&st->rx_alive_timer, 3, 0); } -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27833 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I9e721b5dbf22728cb2361ed121d12def7016dcc2 Gerrit-Change-Number: 27833 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-e1d[master]: octoi: Simple RX priming / pre-filling

by laforge

Attention is currently required from: tnt. Hello tnt, I'd like you to do a code review. Please visit https://gerrit.osmocom.org/c/osmo-e1d/+/27834 to review the following change. Change subject: octoi: Simple RX priming / pre-filling ...................................................................... octoi: Simple RX priming / pre-filling This was not an issue with the original FIFO code, which dynamically substituted frames and always created the minimal required backlog. The RIFO can by principle not operate this way, so we really have to prime / pre-fill it with a number of TDM frames. That initial fill level has to be sufficient to cover RTT jitter of the OCTOI link as well as clock drift between (GPS synced) receiver and transmitter. Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I3a4b3846d3dbd1c99989e994ad95e609f2757219 --- M src/octoi/e1oip.c M src/octoi/e1oip.h M src/octoi/octoi.c 3 files changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/34/27834/1 diff --git a/src/octoi/e1oip.c b/src/octoi/e1oip.c index 5dd3bbf..6a5a240 100644 --- a/src/octoi/e1oip.c +++ b/src/octoi/e1oip.c @@ -286,7 +286,7 @@ e1oip_line_set_name(iline, peer->name); iline->cfg.batching_factor = 32; - iline->cfg.prefill_frame_count = 400; /* 50ms */ + iline->cfg.prefill_frame_count = 200; /* 25ms */ e1oip_line_reset(iline); @@ -305,6 +305,7 @@ frame_rifo_init(&iline->e1t.rifo); memset(&iline->e1t.last_frame, 0xff, sizeof(iline->e1t.last_frame)); iline->e1t.next_fn32 = 0; + iline->e1t.primed_rx_tdm = false; } void e1oip_line_destroy(struct e1oip_line *iline) diff --git a/src/octoi/e1oip.h b/src/octoi/e1oip.h index 70e1bbb..1a184d2 100644 --- a/src/octoi/e1oip.h +++ b/src/octoi/e1oip.h @@ -53,6 +53,7 @@ struct frame_rifo rifo; uint8_t last_frame[BYTES_PER_FRAME]; /* last frame on the E1 side */ uint32_t next_fn32; /* next expected frame number */ + bool primed_rx_tdm; /* Was RX RIFO primed */ } e1t; /* TODO: statistics (RTT, frame loss, std deviation, alarms */ diff --git a/src/octoi/octoi.c b/src/octoi/octoi.c index d2960ac..8585f0d 100644 --- a/src/octoi/octoi.c +++ b/src/octoi/octoi.c @@ -118,6 +118,12 @@ if (!peer->tdm_permitted) return; + if (!iline->e1t.primed_rx_tdm) { + if (frame_rifo_frames(&iline->e1t.rifo) > iline->cfg.prefill_frame_count) + iline->e1t.primed_rx_tdm = true; + return; + } + for (int i = 0; i < fts; i++) { uint8_t *cur = buf + BYTES_PER_FRAME*i; rc = frame_rifo_out(&iline->e1t.rifo, cur); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27834 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I3a4b3846d3dbd1c99989e994ad95e609f2757219 Gerrit-Change-Number: 27834 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-dev[master]: gen_makefile.py: use '$(nproc)' for '--jobs' by default

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/27832 ) Change subject: gen_makefile.py: use '$(nproc)' for '--jobs' by default ...................................................................... gen_makefile.py: use '$(nproc)' for '--jobs' by default Change-Id: I769f032ebf197bac34468683526acf6614e74692 --- M gen_makefile.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/32/27832/1 diff --git a/gen_makefile.py b/gen_makefile.py index abf3288..d83072f 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -84,7 +84,7 @@ parser.add_argument('-o', '--output', dest='output', default='Makefile', help='''Makefile filename (default: 'Makefile').''') -parser.add_argument('-j', '--jobs', dest='jobs', default='9', +parser.add_argument('-j', '--jobs', dest='jobs', default='$(nproc)', help='''-j option to pass to 'make'.''') parser.add_argument('-I', '--sudo-make-install', dest='sudo_make_install', -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27832 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I769f032ebf197bac34468683526acf6614e74692 Gerrit-Change-Number: 27832 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-dev[master]: osmo-add-gerrit-hooks.sh: do not use ssh host alias 'go'

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/27831 ) Change subject: osmo-add-gerrit-hooks.sh: do not use ssh host alias 'go' ...................................................................... osmo-add-gerrit-hooks.sh: do not use ssh host alias 'go' ... because it may not be defined. Specify the address explicitly. Change-Id: I55c1501de61fe6b63be12b8e138742bd4b8baf64 --- M src/osmo-add-gerrit-hooks.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/31/27831/1 diff --git a/src/osmo-add-gerrit-hooks.sh b/src/osmo-add-gerrit-hooks.sh index 1fbba38..05f1b90 100755 --- a/src/osmo-add-gerrit-hooks.sh +++ b/src/osmo-add-gerrit-hooks.sh @@ -13,7 +13,7 @@ for r in $(find . -maxdepth 2 -name '.git'); do cd "$base/$r" if [ ! -f "hooks/commit-msg" ]; then - scp go:hooks/commit-msg hooks/ + scp -P 29418 gerrit.osmocom.org:hooks/commit-msg hooks/ fi sed -i 's/if (unprinted /if (0 \&\& unprinted /' hooks/commit-msg done -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27831 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I55c1501de61fe6b63be12b8e138742bd4b8baf64 Gerrit-Change-Number: 27831 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-e1d[master]: OCTOI: Fix the extension of 16b FN from packet to full 32b FN

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27826 ) Change subject: OCTOI: Fix the extension of 16b FN from packet to full 32b FN ...................................................................... OCTOI: Fix the extension of 16b FN from packet to full 32b FN Only frames withing a certain window are even accepted for processing the rest is dropped since it could corrupt our state. Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I25b2e150d924aa8c714b766cb92e9e23e67cfa4c --- M src/octoi/e1oip.c M src/octoi/e1oip.h 2 files changed, 22 insertions(+), 24 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/octoi/e1oip.c b/src/octoi/e1oip.c index e14d719..9461818 100644 --- a/src/octoi/e1oip.c +++ b/src/octoi/e1oip.c @@ -47,6 +47,7 @@ [LINE_CTR_E1oIP_UNDERRUN] = { "e1oip:underrun", "Frames missing/substituted in IP->E1 direction"}, [LINE_CTR_E1oIP_OVERFLOW] = { "e1oip:overflow", "Frames overflowed in IP->E1 direction"}, [LINE_CTR_E1oIP_RX_OUT_OF_ORDER] = { "e1oip:rx:pkt_out_of_order", "Packets out-of-order in IP->E1 direction"}, + [LINE_CTR_E1oIP_RX_OUT_OF_WIN] = { "e1oip:rx:pkt_out_of_win", "Packets out-of-rx-window in IP->E1 direction"}, }; static const struct rate_ctr_group_desc iline_ctrg_desc = { @@ -167,10 +168,12 @@ /* An E1OIP_MSGT_TDM_DATA message was received from a remote IP peer */ int e1oip_rcvmsg_tdm_data(struct e1oip_line *iline, struct msgb *msg) { + const int WIN = 8000; struct octoi_peer *peer = iline->peer; const struct e1oip_tdm_hdr *e1th; uint16_t frame_nr; uint32_t fn32; + bool update_next; uint32_t ts_mask; uint8_t idx2ts[BYTES_PER_FRAME]; unsigned int n_frames; @@ -196,33 +199,28 @@ ts_mask = ntohl(e1th->ts_mask); if (frame_nr != exp_next_seq) { - int delta = frame_nr - exp_next_seq; - bool re_ordering; - if (delta > 0 && delta < 5 * iline->cfg.batching_factor) { - /* assume re-ordering */ - re_ordering = true; - } else { - /* assume packet loss */ - re_ordering = false; + uint16_t frame_nr_ofs; + + LOGPEER(peer, LOGL_NOTICE, "RxIP: frame_nr=%u, but expected %u\n", + frame_nr, exp_next_seq); + + frame_nr_ofs = frame_nr - (exp_next_seq - WIN); + if (frame_nr_ofs > (2 * WIN)) { + /* Outside window, throw packet away */ + LOGPEER(peer, LOGL_NOTICE, "RxIP: frame_nr=%u at exp_next_fn32=%u; " + "received frame outside +/- 1s window of expected frame\n", + frame_nr, iline->e1t.next_fn32); + iline_ctr_add(iline, LINE_CTR_E1oIP_RX_OUT_OF_WIN, 1); + return -EINVAL; } iline_ctr_add(iline, LINE_CTR_E1oIP_RX_OUT_OF_ORDER, 1); - LOGPEER(peer, LOGL_NOTICE, "RxIP: frame_nr=%u, but expected %u: delta=%d - assuming %s\n", - frame_nr, exp_next_seq, delta, re_ordering ? "re-ordering" : "packet loss"); - fn32 = (iline->e1t.next_fn32 & 0xffff0000) + frame_nr; - if (fn32 > iline->e1t.next_fn32 + 8000) { - /* more than 1s in the future: was this a wrap-around? */ - fn32 = ((iline->e1t.next_fn32 & 0xffff0000) - 0x10000) + frame_nr; - if (fn32 < iline->e1t.next_fn32 - 8000) { - /* also no match: give up */ - LOGPEER(peer, LOGL_NOTICE, "RxIP: frame_nr=%u at exp_next_fn32=%u; " - "received frame outside +/- 1s window of expected frame\n", - frame_nr, iline->e1t.next_fn32); - } - } + fn32 = iline->e1t.next_fn32 + frame_nr_ofs - WIN; + update_next = frame_nr_ofs >= WIN; } else { fn32 = iline->e1t.next_fn32; + update_next = true; } /* compute E1oIP idx to timeslot table */ @@ -255,9 +253,8 @@ } /* update local state */ memcpy(iline->e1t.last_frame, frame_buf, BYTES_PER_FRAME); - /* FIXME: only in some cases */ - //if (fn32 >= iline->e1t.next_fn32I - iline->e1t.next_fn32 = fn32 + n_frames; + if (update_next) + iline->e1t.next_fn32 = fn32 + n_frames; iline_stat_set(iline, LINE_STAT_E1oIP_E1T_FIFO, frame_rifo_depth(&iline->e1t.rifo)); diff --git a/src/octoi/e1oip.h b/src/octoi/e1oip.h index 1a71f6c..233e8ee 100644 --- a/src/octoi/e1oip.h +++ b/src/octoi/e1oip.h @@ -17,6 +17,7 @@ LINE_CTR_E1oIP_UNDERRUN, LINE_CTR_E1oIP_OVERFLOW, LINE_CTR_E1oIP_RX_OUT_OF_ORDER, + LINE_CTR_E1oIP_RX_OUT_OF_WIN, }; enum e1oip_line_stat { -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27826 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I25b2e150d924aa8c714b766cb92e9e23e67cfa4c Gerrit-Change-Number: 27826 Gerrit-PatchSet: 2 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in osmo-e1d[master]: OCTOI: Fix the extension of 16b FN from packet to full 32b FN

by laforge

Attention is currently required from: tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27826 ) Change subject: OCTOI: Fix the extension of 16b FN from packet to full 32b FN ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27826 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I25b2e150d924aa8c714b766cb92e9e23e67cfa4c Gerrit-Change-Number: 27826 Gerrit-PatchSet: 2 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Tue, 19 Apr 2022 17:02:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-e1d[master]: e1d: stat_items for the GPS-DO related bits

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27830 ) Change subject: e1d: stat_items for the GPS-DO related bits ...................................................................... e1d: stat_items for the GPS-DO related bits It is interesting from a monitoring point of view to be able to correlate the GPSDO state with other performance counters we export. While each GPS-DO only exists once per icE1usb, we still export the state per line, to make it easy for external monitoring to have one set of counters per line. Change-Id: I1f98610b7c725146a3f016a8737440be5baae858 --- M src/e1d.h M src/intf_line.c M src/usb.c 3 files changed, 45 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/e1d.h b/src/e1d.h index 00d2149..42be1b4 100644 --- a/src/e1d.h +++ b/src/e1d.h @@ -28,6 +28,7 @@ #include <osmocom/core/isdnhdlc.h> #include <osmocom/core/linuxlist.h> #include <osmocom/core/rate_ctr.h> +#include <osmocom/core/stat_item.h> #include <osmocom/core/timer.h> #include <osmocom/vty/command.h> @@ -45,6 +46,8 @@ }; #define line_ctr_add(line, idx, add) rate_ctr_add(rate_ctr_group_get_ctr((line)->ctrs, idx), add) +#define line_stat_set(line, idx, add) \ + osmo_stat_item_set(osmo_stat_item_group_get_item((line)->stats, idx), add) enum e1d_line_ctr { LINE_CTR_LOS, @@ -58,6 +61,14 @@ LINE_CTR_FRAMES_DEMUXED_E1O, }; +enum e1d_line_stat_item { + LINE_GPSDO_STATE, + LINE_GPSDO_ANTENNA, + LINE_GPSDO_TUNE_COARSE, + LINE_GPSDO_TUNE_FINE, + LINE_GPSDO_FREQ_EST, +}; + enum e1_ts_mode { E1_TS_MODE_OFF = 0, E1_TS_MODE_RAW, @@ -118,6 +129,7 @@ void *drv_data; struct rate_ctr_group *ctrs; + struct osmo_stat_item_group *stats; /* timeslots for channelized mode */ struct e1_ts ts[32]; diff --git a/src/intf_line.c b/src/intf_line.c index 234f0c0..a645cd3 100644 --- a/src/intf_line.c +++ b/src/intf_line.c @@ -35,6 +35,7 @@ #include <osmocom/core/utils.h> #include <osmocom/core/stats.h> #include <osmocom/core/rate_ctr.h> +#include <osmocom/core/stat_item.h> #include <osmocom/core/timer.h> #include <osmocom/e1d/proto.h> @@ -68,6 +69,23 @@ .ctr_desc = line_ctr_description, }; +static const struct osmo_stat_item_desc line_stat_description[] = { + [LINE_GPSDO_STATE] = { "gpsdo:state", "GPSDO State" }, + [LINE_GPSDO_ANTENNA] = { "gpsdo:antenna", "GSPDO Antenna State" }, + [LINE_GPSDO_TUNE_COARSE]= { "gpsdo:tune:coarse", "GSPDO Coarse Tuning" }, + [LINE_GPSDO_TUNE_FINE] = { "gpsdo:tune:fine", "GSPDO Fine Tuning" }, + [LINE_GPSDO_FREQ_EST] = { "gpsdo:freq_est", "GSPDO Frequency Estimate" }, +}; + +static const struct osmo_stat_item_group_desc line_stats_desc = { + .group_name_prefix = "e1d_line", + .group_description = "Stat items for E1 line", + .class_id = OSMO_STATS_CLASS_GLOBAL, + .num_items = ARRAY_SIZE(line_stat_description), + .item_desc = line_stat_description, +}; + + /* watchdog timer, called once per second to check if we still receive data on the line */ static void line_watchdog_cb(void *data) { @@ -253,8 +271,13 @@ line->ctrs = rate_ctr_group_alloc(line, &line_ctrg_desc, intf->id << 8 | line->id); OSMO_ASSERT(line->ctrs); + + line->stats = osmo_stat_item_group_alloc(line, &line_stats_desc, intf->id << 8 | line->id); + OSMO_ASSERT(line->stats); + snprintf(name, sizeof(name), "I%u:L%u", intf->id, line->id); rate_ctr_group_set_name(line->ctrs, name); + osmo_stat_item_group_set_name(line->stats, name); llist_add_tail(&line->list, &intf->lines); diff --git a/src/usb.c b/src/usb.c index 1949485..fa6ddee 100644 --- a/src/usb.c +++ b/src/usb.c @@ -707,6 +707,7 @@ struct e1_usb_intf_data *id = intf->drv_data; struct e1usb_gpsdo_status *last_st = &id->gpsdo.last_status; const struct e1usb_gpsdo_status *st; + struct e1_line *line; if (len < sizeof(*st)) { LOGPIF(intf, DE1D, LOGL_ERROR, "GPSDO status %zu < %zu!\n", len, sizeof(*st)); @@ -742,6 +743,15 @@ LOGPIF(intf, DE1D, LOGL_ERROR, "GPS Fix LOST\n"); } + /* update stat_items for statsd / monitoring */ + llist_for_each_entry(line, &intf->lines, list) { + line_stat_set(line, LINE_GPSDO_STATE, st->state); + line_stat_set(line, LINE_GPSDO_ANTENNA, st->antenna_state); + line_stat_set(line, LINE_GPSDO_TUNE_COARSE, libusb_le16_to_cpu(st->tune.coarse)); + line_stat_set(line, LINE_GPSDO_TUNE_FINE, libusb_le16_to_cpu(st->tune.fine)); + line_stat_set(line, LINE_GPSDO_FREQ_EST, osmo_load32le(&st->freq_est)); + } + /* update our state */ memcpy(last_st, st, sizeof(*last_st)); } -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27830 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I1f98610b7c725146a3f016a8737440be5baae858 Gerrit-Change-Number: 27830 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in osmo-e1d[master]: e1d: stat_items for the GPS-DO related bits

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27830 ) Change subject: e1d: stat_items for the GPS-DO related bits ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27830 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I1f98610b7c725146a3f016a8737440be5baae858 Gerrit-Change-Number: 27830 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 19 Apr 2022 16:00:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2022