Attention is currently required from: pespin.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32552 )
Change subject: osmo-bts-trx: fix trx_ctrl_read_cb(): do not send CMDs twice
......................................................................
Patch Set 2:
(1 comment)
File src/osmo-bts-trx/trx_if.c:
https://gerrit.osmocom.org/c/osmo-bts/+/32552/comment/67b03158_3750c81f
PS1, Line 743: re-schedule last cmd in rc seconds time
I am wondering how this is supposed to work, given that we have unlinked the last cmd at this point already... This looks really weird.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32552
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ibdffa4644aa3a7d219452644d3e74b411734f1df
Gerrit-Change-Number: 32552
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Sat, 29 Apr 2023 07:54:06 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: pespin.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32552 )
Change subject: osmo-bts-trx: fix trx_ctrl_read_cb(): do not send CMDs twice
......................................................................
Patch Set 2:
(1 comment)
File src/osmo-bts-trx/trx_if.c:
https://gerrit.osmocom.org/c/osmo-bts/+/32552/comment/c381a351_47a48f80
PS1, Line 737:
> what about moving "trx_ctrl_send(l1h);" here before call to trx_ctrl_rx_rsp()? this way we don't get […]
I was thinking about this too. But this would make the logging/flow a bit confusing:
* first we say we received a response for previously sent command,
* then we send the next command from the queue,
* and then we handle the received response for previous command.
IMO, it's more logical as it is now.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32552
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ibdffa4644aa3a7d219452644d3e74b411734f1df
Gerrit-Change-Number: 32552
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Sat, 29 Apr 2023 07:48:14 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: pespin.
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-bts/+/32552
to look at the new patch set (#2).
Change subject: osmo-bts-trx: fix trx_ctrl_read_cb(): do not send CMDs twice
......................................................................
osmo-bts-trx: fix trx_ctrl_read_cb(): do not send CMDs twice
Sometimes osmo-bts-trx may be sending the same TRXC CMD twice. This
happens when the trx_ctrl_list becomes empty in trx_ctrl_read_cb(),
and a command specific response handler enqueues more commands.
The problem is that in trx_ctrl_cmd_cb() we send() the given command
stright away, if the trx_ctrl_list is empty. This must be taken into
account in trx_ctrl_read_cb() when calling trx_ctrl_send().
Change-Id: Ibdffa4644aa3a7d219452644d3e74b411734f1df
Fixes: OS#6020
---
M src/osmo-bts-trx/trx_if.c
1 file changed, 28 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/52/32552/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32552
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ibdffa4644aa3a7d219452644d3e74b411734f1df
Gerrit-Change-Number: 32552
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: pespin.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32552 )
Change subject: osmo-bts-trx: fix trx_ctrl_read_cb(): do not send CMDs twice
......................................................................
Patch Set 1:
(3 comments)
File src/osmo-bts-trx/trx_if.c:
https://gerrit.osmocom.org/c/osmo-bts/+/32552/comment/34988df9_f0880039
PS1, Line 732: /* Calling trx_ctrl_rx_rsp() may trigger code patch(s) queueing more CMDs.
> typo: path
Done
https://gerrit.osmocom.org/c/osmo-bts/+/32552/comment/ed7e9dad_e2653ea5
PS1, Line 736: more_cmds = !llist_empty(&l1h->trx_ctrl_list);
> It would be much more clearing storing this in a var called list_was_empty = llist_empty()
Ack
https://gerrit.osmocom.org/c/osmo-bts/+/32552/comment/f71beec7_b236ada6
PS1, Line 751: if (more_cmds)
> Nevermind this comment.
This would not solve the problem of sending the same CMD twice.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32552
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ibdffa4644aa3a7d219452644d3e74b411734f1df
Gerrit-Change-Number: 32552
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Sat, 29 Apr 2023 07:32:49 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32554 )
Change subject: fix mscpool for large msc NRs
......................................................................
fix mscpool for large msc NRs
Use the proper type that can handle the entire range of MSC numbers we
allow on the VTY, we have:
#define MSC_NR_RANGE "<0-1000>"
Before this patch, MSC pool round robin would glitch around for any
'msc' numbers 'msc 256' thru 'msc 1000'.
Change-Id: I98bee022c1a78508554d2ff4a10fbce3c53f1128
---
M include/osmocom/bsc/gsm_data.h
M src/osmo-bsc/gsm_08_08.c
2 files changed, 19 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/54/32554/1
diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h
index 6e81610..c2bd7ad 100644
--- a/include/osmocom/bsc/gsm_data.h
+++ b/include/osmocom/bsc/gsm_data.h
@@ -930,10 +930,10 @@
/* msc configuration */
struct llist_head mscs;
- uint8_t mscs_round_robin_next_nr;
+ unsigned int mscs_round_robin_next_nr;
/* Emergency calls potentially select a different set of MSCs, so to not mess up the normal round-robin
* behavior, emergency calls need a separate round-robin counter. */
- uint8_t mscs_round_robin_next_emerg_nr;
+ unsigned int mscs_round_robin_next_emerg_nr;
/* rf ctl related bits */
int mid_call_timeout;
diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c
index 769cec4..692e35c 100644
--- a/src/osmo-bsc/gsm_08_08.c
+++ b/src/osmo-bsc/gsm_08_08.c
@@ -182,7 +182,7 @@
struct bsc_msc_data *msc_target = NULL;
struct bsc_msc_data *msc_round_robin_next = NULL;
struct bsc_msc_data *msc_round_robin_first = NULL;
- uint8_t round_robin_next_nr;
+ unsigned int round_robin_next_nr;
int16_t nri_v = -1;
bool is_null_nri = false;
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32554
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I98bee022c1a78508554d2ff4a10fbce3c53f1128
Gerrit-Change-Number: 32554
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-MessageType: newchange