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

Change in osmo-e1d[master]: Set rate_ctr_group name for each line

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27812 ) Change subject: Set rate_ctr_group name for each line ...................................................................... Set rate_ctr_group name for each line "Counters for each line in e1d 256" is not very useful unless you know that it's "(intf_nr << 8) | line_nr" and 256 == I1/L0. Let's set the name string explicitly. Change-Id: I200e068f1bbc495fb806402877551924beea214e --- M src/intf_line.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/12/27812/1 diff --git a/src/intf_line.c b/src/intf_line.c index 9b33141..63fd098 100644 --- a/src/intf_line.c +++ b/src/intf_line.c @@ -217,6 +217,7 @@ e1_line_new(struct e1_intf *intf, int line_id, void *drv_data) { struct e1_line *line; + char name[32]; if (line_id != -1) { line = e1_intf_find_line(intf, line_id); @@ -250,6 +251,8 @@ line->ctrs = rate_ctr_group_alloc(line, &line_ctrg_desc, intf->id << 8 | line->id); OSMO_ASSERT(line->ctrs); + snprintf(name, sizeof(name), "I%u:L%u", intf->id, line->id); + rate_ctr_group_set_name(line->ctrs, name); llist_add_tail(&line->list, &intf->lines); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27812 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I200e068f1bbc495fb806402877551924beea214e Gerrit-Change-Number: 27812 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]: octo: give rate_ctr / stat_items meaningful identifiers

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27810 ) Change subject: octo: give rate_ctr / stat_items meaningful identifiers ...................................................................... octo: give rate_ctr / stat_items meaningful identifiers We don't want useless identifiers like 'E1oIP line 5518' but something that we can understand, like the user account name, or in absence of that, at least the IP/port. Change-Id: Ibd98b9606a1d9d5b76d63be83eb3df9e431ab3ad --- M src/octoi/e1oip.c M src/octoi/e1oip.h M src/octoi/octoi_srv_fsm.c 3 files changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/10/27810/1 diff --git a/src/octoi/e1oip.c b/src/octoi/e1oip.c index 490b7f4..27eb201 100644 --- a/src/octoi/e1oip.c +++ b/src/octoi/e1oip.c @@ -261,9 +261,14 @@ return 0; } -/* TODO: more meaningful identifiers? */ static int g_ctr_idx = 0; +void e1oip_line_set_name(struct e1oip_line *iline, const char *name) +{ + rate_ctr_group_set_name(iline->ctrs, name); + osmo_stat_item_group_set_name(iline->stats, name); +} + struct e1oip_line *e1oip_line_alloc(struct octoi_peer *peer) { struct e1oip_line *iline; @@ -278,6 +283,7 @@ iline->ctrs = rate_ctr_group_alloc(iline, &iline_ctrg_desc, ctr_idx); iline->stats = osmo_stat_item_group_alloc(iline, &iline_stats_desc, ctr_idx); + e1oip_line_set_name(iline, peer->name); iline->cfg.batching_factor = 32; iline->cfg.prefill_frame_count = 400; /* 50ms */ diff --git a/src/octoi/e1oip.h b/src/octoi/e1oip.h index 50ed9ff..54fbadd 100644 --- a/src/octoi/e1oip.h +++ b/src/octoi/e1oip.h @@ -57,6 +57,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_destroy(struct e1oip_line *iline); int e1oip_rcvmsg_tdm_data(struct e1oip_line *iline, struct msgb *msg); diff --git a/src/octoi/octoi_srv_fsm.c b/src/octoi/octoi_srv_fsm.c index 07dc1a7..9f1019a 100644 --- a/src/octoi/octoi_srv_fsm.c +++ b/src/octoi/octoi_srv_fsm.c @@ -114,6 +114,7 @@ goto reject; } osmo_talloc_replace_string(st->peer, &st->peer->name, acc->user_id); + e1oip_line_set_name(st->peer->iline, acc->user_id); osmo_fsm_inst_state_chg(fi, SRV_ST_ACCEPTED, 0, 0); octoi_tx_service_ack(st->peer, st->service, "TODO-SRV", PACKAGE_NAME, PACKAGE_VERSION, st->capability_flags); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27810 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ibd98b9606a1d9d5b76d63be83eb3df9e431ab3ad Gerrit-Change-Number: 27810 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]: Make use of libosmcoore cpu_sched_vty

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27811 ) Change subject: Make use of libosmcoore cpu_sched_vty ...................................................................... Make use of libosmcoore cpu_sched_vty osmo-e1d automatically uses SCHED_RR already, but for consistency it actually makes sense to add this, so people can configure the scheduler priority and/or the cpu affinity this way. The existing call to SCHED_RR is left in place for backwards compatibility. The new VTY commands can just override that, if needed. Change-Id: I1b8021e6dc864af6e301fced427e24c8bb21ca2f --- M src/osmo-e1d.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/11/27811/1 diff --git a/src/osmo-e1d.c b/src/osmo-e1d.c index 1e18f88..ee7c0fb 100644 --- a/src/osmo-e1d.c +++ b/src/osmo-e1d.c @@ -41,6 +41,7 @@ #include <osmocom/vty/logging.h> #include <osmocom/vty/stats.h> #include <osmocom/vty/misc.h> +#include <osmocom/vty/cpu_sched_vty.h> #include <osmocom/e1d/proto_srv.h> #include <osmocom/e1d/proto.h> @@ -186,6 +187,7 @@ osmo_stats_vty_add_cmds(); osmo_talloc_vty_add_cmds(); osmo_fsm_vty_add_cmds(); + osmo_cpu_sched_vty_init(e1d); handle_options(argc, argv); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27811 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I1b8021e6dc864af6e301fced427e24c8bb21ca2f Gerrit-Change-Number: 27811 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: re-implement LINE_STAT_E1oIP_E1T_FIFO

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27809 ) Change subject: OCTOI: re-implement LINE_STAT_E1oIP_E1T_FIFO ...................................................................... OCTOI: re-implement LINE_STAT_E1oIP_E1T_FIFO There use to be a stat_item for the depth of the E1-terminated FIFO, as in a FIFO this is very easy to determine. When we switched to RIFO, it was lost. Let's re-introduce it with the approximate depth of the RIFO. Change-Id: I960cbf196ae930b1b72745b8bfe9c2a21fd53325 --- M src/octoi/e1oip.c M src/octoi/frame_rifo.c M src/octoi/frame_rifo.h 3 files changed, 13 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/09/27809/1 diff --git a/src/octoi/e1oip.c b/src/octoi/e1oip.c index 00c671d..490b7f4 100644 --- a/src/octoi/e1oip.c +++ b/src/octoi/e1oip.c @@ -256,7 +256,7 @@ //if (fn32 >= iline->e1t.next_fn32I iline->e1t.next_fn32 = fn32 + n_frames; - //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)); return 0; } diff --git a/src/octoi/frame_rifo.c b/src/octoi/frame_rifo.c index 9f25cf0..94758e9 100644 --- a/src/octoi/frame_rifo.c +++ b/src/octoi/frame_rifo.c @@ -122,6 +122,7 @@ OSMO_ASSERT(dst + BYTES_PER_FRAME <= RIFO_BUF_END(rifo)); memcpy(dst, frame, BYTES_PER_FRAME); bucket_bit_set(rifo, bucket); + rifo->last_in_fn = fn; return 0; } @@ -147,9 +148,13 @@ /* advance by one frame */ rifo->next_out += BYTES_PER_FRAME; - rifo->next_out_fn += 1; if (rifo->next_out >= RIFO_BUF_END(rifo)) rifo->next_out -= sizeof(rifo->buf); + rifo->next_out_fn += 1; + /* make sure that frame_rifo_depth() doing last_in - next_out won't overflow */ + if (rifo->next_out_fn == rifo->last_in_fn + 1) + rifo->last_in_fn = rifo->next_out_fn; + return rc; } diff --git a/src/octoi/frame_rifo.h b/src/octoi/frame_rifo.h index 6988710..401e873 100644 --- a/src/octoi/frame_rifo.h +++ b/src/octoi/frame_rifo.h @@ -7,6 +7,7 @@ uint8_t buf[BYTES_PER_FRAME * FRAMES_PER_FIFO]; + uint32_t last_in_fn; /* frame number of most recently inserted frame */ uint32_t next_out_fn; /* frame number of next output frame */ uint8_t bitvec[FRAMES_PER_FIFO/8]; /* bit-vector of occupied (data received) slots in FIFO, @@ -20,6 +21,11 @@ return d < FRAMES_PER_FIFO; } +/* current depth of RIFO */ +static inline unsigned int frame_rifo_depth(struct frame_rifo *rifo) +{ + return rifo->last_in_fn - rifo->next_out_fn; +} void frame_rifo_init(struct frame_rifo *rifo); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27809 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I960cbf196ae930b1b72745b8bfe9c2a21fd53325 Gerrit-Change-Number: 27809 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in docker-playground[master]: Revert "osmo-bsc-{master,latest}/osmo-bsc.cfg: set AMR link adaptatio...

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/27807 ) Change subject: Revert "osmo-bsc-{master,latest}/osmo-bsc.cfg: set AMR link adaptation params" ...................................................................... Revert "osmo-bsc-{master,latest}/osmo-bsc.cfg: set AMR link adaptation params" This reverts commit 029c8df99981bb08ff6aaf35506ea3bf491e446e. I actually meant to change osmo-bsc.cfg in ttcn3-bsc-test. Change-Id: I85c577cbc608a77d6d6a5816f1fb7205361f7b4a Related: SYS#5917 --- M osmo-bsc-latest/osmo-bsc.cfg M osmo-bsc-master/osmo-bsc.cfg 2 files changed, 0 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/07/27807/1 diff --git a/osmo-bsc-latest/osmo-bsc.cfg b/osmo-bsc-latest/osmo-bsc.cfg index a128946..861bcc8 100644 --- a/osmo-bsc-latest/osmo-bsc.cfg +++ b/osmo-bsc-latest/osmo-bsc.cfg @@ -90,18 +90,6 @@ si5 neighbor-list add arfcn 10 si5 neighbor-list add arfcn 20 codec-support fr - amr tch-f modes 0 2 4 7 - amr tch-f threshold ms 32 32 32 - amr tch-f hysteresis ms 8 8 8 - amr tch-f threshold bts 32 32 32 - amr tch-f hysteresis bts 8 8 8 - amr tch-f start-mode auto - amr tch-h modes 0 2 4 - amr tch-h threshold ms 32 32 - amr tch-h hysteresis ms 8 8 - amr tch-h threshold bts 32 32 - amr tch-h hysteresis bts 8 8 - amr tch-h start-mode auto gprs mode gprs gprs routing area 0 gprs network-control-order nc0 diff --git a/osmo-bsc-master/osmo-bsc.cfg b/osmo-bsc-master/osmo-bsc.cfg index 0ca91ef..5731014 100644 --- a/osmo-bsc-master/osmo-bsc.cfg +++ b/osmo-bsc-master/osmo-bsc.cfg @@ -93,18 +93,6 @@ si5 neighbor-list add arfcn 10 si5 neighbor-list add arfcn 20 codec-support fr - amr tch-f modes 0 2 4 7 - amr tch-f threshold ms 32 32 32 - amr tch-f hysteresis ms 8 8 8 - amr tch-f threshold bts 32 32 32 - amr tch-f hysteresis bts 8 8 8 - amr tch-f start-mode auto - amr tch-h modes 0 2 4 - amr tch-h threshold ms 32 32 - amr tch-h hysteresis ms 8 8 - amr tch-h threshold bts 32 32 - amr tch-h hysteresis bts 8 8 - amr tch-h start-mode auto gprs mode gprs gprs routing area 0 gprs network-control-order nc0 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27807 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I85c577cbc608a77d6d6a5816f1fb7205361f7b4a Gerrit-Change-Number: 27807 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in docker-playground[master]: ttcn3-bsc-test/osmo-bsc.cfg: set AMR link adaptation params

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/27808 ) Change subject: ttcn3-bsc-test/osmo-bsc.cfg: set AMR link adaptation params ...................................................................... ttcn3-bsc-test/osmo-bsc.cfg: set AMR link adaptation params Change-Id: Idf5b22c7d50d283d24edf5ccd8de9051f7c2642f Related: osmo-bsc.git Ic5f8d55d250976d8d4c9cae2d89480fd52326717 Related: SYS#5917 --- M ttcn3-bsc-test/osmo-bsc.cfg 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/08/27808/1 diff --git a/ttcn3-bsc-test/osmo-bsc.cfg b/ttcn3-bsc-test/osmo-bsc.cfg index 2044346..532999e 100644 --- a/ttcn3-bsc-test/osmo-bsc.cfg +++ b/ttcn3-bsc-test/osmo-bsc.cfg @@ -114,6 +114,18 @@ si5 neighbor-list add arfcn 10 si5 neighbor-list add arfcn 20 codec-support fr hr efr amr + amr tch-f modes 0 2 4 7 + amr tch-f threshold ms 32 32 32 + amr tch-f hysteresis ms 8 8 8 + amr tch-f threshold bts 32 32 32 + amr tch-f hysteresis bts 8 8 8 + amr tch-f start-mode auto + amr tch-h modes 0 2 4 + amr tch-h threshold ms 32 32 + amr tch-h hysteresis ms 8 8 + amr tch-h threshold bts 32 32 + amr tch-h hysteresis bts 8 8 + amr tch-h start-mode auto gprs mode gprs gprs routing area 0 gprs network-control-order nc0 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27808 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Idf5b22c7d50d283d24edf5ccd8de9051f7c2642f Gerrit-Change-Number: 27808 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: osmo-bts-trx: fix scheduling of dummy FACCH/H and FACCH/F

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27805 ) Change subject: osmo-bts-trx: fix scheduling of dummy FACCH/H and FACCH/F ...................................................................... Patch Set 1: (1 comment) File src/osmo-bts-trx/sched_lchan_tchf.c: https://gerrit.osmocom.org/c/osmo-bts/+/27805/comment/02cd1fec_3babd0b7 PS1, Line 333: chan_state->dl_facch_bursts = 8; > you're not setting dl_ongoing_facch here (unlike TCH/H). […] Yes, this is intentional: dl_ongoing_facch is only used in tx_tchh_fn(), where you need to skip encoding of the buffer while sending the middle two bursts of FACCH/H. Here both speech and FACCH/F have equal interleaving period. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27805 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ief12eb67ad80de3b71f5226858dc2e0c8ae76948 Gerrit-Change-Number: 27805 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sat, 16 Apr 2022 15:52:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: osmo-bts-trx: fix scheduling of dummy FACCH/H and FACCH/F

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27805 ) Change subject: osmo-bts-trx: fix scheduling of dummy FACCH/H and FACCH/F ...................................................................... Patch Set 1: (1 comment) File src/osmo-bts-trx/sched_lchan_tchf.c: https://gerrit.osmocom.org/c/osmo-bts/+/27805/comment/1197182a_bba4ab3f PS1, Line 333: chan_state->dl_facch_bursts = 8; you're not setting dl_ongoing_facch here (unlike TCH/H). Is this intentional? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27805 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ief12eb67ad80de3b71f5226858dc2e0c8ae76948 Gerrit-Change-Number: 27805 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sat, 16 Apr 2022 14:27:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: osmo-bts-trx: de-duplicate generation of BFI TCH frames

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27803 ) Change subject: osmo-bts-trx: de-duplicate generation of BFI TCH frames ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27803 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3efcd4a547beb0c0be6a959dc6f140b61b448b4e Gerrit-Change-Number: 27803 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sat, 16 Apr 2022 14:24:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: osmo-bts-trx: move tx_tch_common() into a separate file

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27802 ) Change subject: osmo-bts-trx: move tx_tch_common() into a separate file ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: do we have actual evidence to that? I'm always skeptical making theoretical assumptions/claims about what the compiler might or might not do. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27802 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id0b9d604e6969a8db73ef451fbcad00f57325fc4 Gerrit-Change-Number: 27802 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sat, 16 Apr 2022 14:24:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2022