laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27828 )
Change subject: Add rate counters for number of frames muxed/demuxed (E1 side)
......................................................................
Add rate counters for number of frames muxed/demuxed (E1 side)
Nominally this is of course 8000/s, but this patch should allow us to
verify this in monitoring. Note that the rate_ctr base of course is
"wrong" as it uses the normal system clock, which is much less precise
than the E1 clock of an icE1usb with GPS-DO.
So it really only helps us to compare Rx against Tx or against other
values/counters derived from the TDM clock.
Change-Id: I40e9fb38561410fbf0902b8a390673690a36ea5e
---
M src/e1d.h
M src/intf_line.c
M src/mux_demux.c
3 files changed, 8 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/src/e1d.h b/src/e1d.h
index 726696e..00d2149 100644
--- a/src/e1d.h
+++ b/src/e1d.h
@@ -54,6 +54,8 @@
LINE_CTR_TX_UNFL,
LINE_CTR_RX_REMOTE_E,
LINE_CTR_RX_REMOTE_A,
+ LINE_CTR_FRAMES_MUXED_E1T,
+ LINE_CTR_FRAMES_DEMUXED_E1O,
};
enum e1_ts_mode {
diff --git a/src/intf_line.c b/src/intf_line.c
index 63fd098..234f0c0 100644
--- a/src/intf_line.c
+++ b/src/intf_line.c
@@ -56,6 +56,8 @@
[LINE_CTR_TX_UNFL] = { "tx:underflow", "E1 Tx Underflow" },
[LINE_CTR_RX_REMOTE_E] ={ "rx:remote_crc_errors", "Rx Frames Reporting Remote CRC Error"},
[LINE_CTR_RX_REMOTE_A] ={ "rx:remote_alarm", "Rx Frames Reporting Remote Alarm"},
+ [LINE_CTR_FRAMES_MUXED_E1T] = { "tx:frames_muxed", "E1 Tx Frames multiplexed" },
+ [LINE_CTR_FRAMES_DEMUXED_E1O] = { "rx:frames_demuxed", "E1 Rx Frames demultiplexed" },
};
static const struct rate_ctr_group_desc line_ctrg_desc = {
diff --git a/src/mux_demux.c b/src/mux_demux.c
index 671d6d1..cd5c286 100644
--- a/src/mux_demux.c
+++ b/src/mux_demux.c
@@ -218,6 +218,8 @@
OSMO_ASSERT(0);
}
+ line_ctr_add(line, LINE_CTR_FRAMES_MUXED_E1T, fts);
+
return tsz;
}
@@ -421,6 +423,8 @@
if (frame_base >= 0)
_e1_line_demux_in_ts0(line, buf, ftr, frame_base);
+ line_ctr_add(line, LINE_CTR_FRAMES_DEMUXED_E1O, ftr);
+
switch (line->mode) {
case E1_LINE_MODE_CHANNELIZED:
return _e1_line_demux_in_channelized(line, buf, ftr);
--
To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27828
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-e1d
Gerrit-Branch: master
Gerrit-Change-Id: I40e9fb38561410fbf0902b8a390673690a36ea5e
Gerrit-Change-Number: 27828
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: merged
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27827 )
Change subject: octoi: Update RIFO depth also on dequeue
......................................................................
octoi: Update RIFO depth also on dequeue
We updated the RIFO depth on every enqueue, let's also do so on dequeue.
Otherwise the figure might be wrong in case of no further received input
frames.
Change-Id: I175f0503e7435c362f35bd8083b785197d9d7338
---
M src/octoi/octoi.c
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/src/octoi/octoi.c b/src/octoi/octoi.c
index 3137b75..d2960ac 100644
--- a/src/octoi/octoi.c
+++ b/src/octoi/octoi.c
@@ -127,5 +127,5 @@
memcpy(cur, iline->e1t.last_frame, BYTES_PER_FRAME);
}
}
- //iline_stat_set(iline, LINE_STAT_E1oIP_E1T_FIFO, frame_fifo_frames(&iline->e1t.fifo));
+ iline_stat_set(iline, LINE_STAT_E1oIP_E1T_FIFO, frame_rifo_depth(&iline->e1t.rifo));
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27827
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-e1d
Gerrit-Branch: master
Gerrit-Change-Id: I175f0503e7435c362f35bd8083b785197d9d7338
Gerrit-Change-Number: 27827
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: merged
Attention is currently required from: Christian Amsüss.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27825 )
Change subject: ts_102_222: Set number of records when creating linear files
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/27825
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I8aeb869c601ee5d1c8b02da6d72eb3c50e347982
Gerrit-Change-Number: 27825
Gerrit-PatchSet: 1
Gerrit-Owner: Christian Amsüss <chrysn(a)fsfe.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: Christian Amsüss <chrysn(a)fsfe.org>
Gerrit-Comment-Date: Tue, 19 Apr 2022 15:43:43 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment