Change in osmo-bts[master]: pcu_sock: use llist_for_each_entry() in pcu_sock_close()
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20493 ) Change subject: pcu_sock: use llist_for_each_entry() in pcu_sock_close() .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20493 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4bd40ffcc1e925412a21b0a934bbfdeddbc6ad1f Gerrit-Change-Number: 20493 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 08 Oct 2020 20:32:26 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: pcu_sock: use llist_for_each_entry() in pcu_sock_close()
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/20493 )
Change subject: pcu_sock: use llist_for_each_entry() in pcu_sock_close()
..
pcu_sock: use llist_for_each_entry() in pcu_sock_close()
Using gsm_bts_trx_num() involves redundant iterations over the
list of transceivers - we definitely don't want them.
Change-Id: I4bd40ffcc1e925412a21b0a934bbfdeddbc6ad1f
---
M src/common/pcu_sock.c
1 file changed, 5 insertions(+), 8 deletions(-)
Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c
index 7f7f7cf..d54e385 100644
--- a/src/common/pcu_sock.c
+++ b/src/common/pcu_sock.c
@@ -883,7 +883,7 @@
struct gsm_bts *bts;
struct gsm_bts_trx *trx;
struct gsm_bts_trx_ts *ts;
- int i, j;
+ unsigned int tn;
/* FIXME: allow multiple BTS */
bts = llist_entry(state->net->bts_list.next, struct gsm_bts, list);
@@ -910,13 +910,10 @@
osmo_signal_dispatch(SS_GLOBAL, S_NEW_SYSINFO, bts);
#endif
- /* release PDCH */
- for (i = 0; i < 8; i++) {
- trx = gsm_bts_trx_num(bts, i);
- if (!trx)
- break;
- for (j = 0; j < 8; j++) {
- ts = >ts[j];
+ /* Deactivate all active PDCH timeslots */
+ llist_for_each_entry(trx, >trx_list, list) {
+ for (tn = 0; tn < 8; tn++) {
+ ts = >ts[tn];
if (ts->mo.nm_state.operational == NM_OPSTATE_ENABLED
&& ts->pchan == GSM_PCHAN_PDCH) {
ts->lchan[0].rel_act_kind = LCHAN_REL_ACT_PCU;
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20493
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I4bd40ffcc1e925412a21b0a934bbfdeddbc6ad1f
Gerrit-Change-Number: 20493
Gerrit-PatchSet: 2
Gerrit-Owner: Vadim Yanitskiy
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-bts[master]: pcu_sock: use llist_for_each_entry() in pcu_sock_close()
Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20493 ) Change subject: pcu_sock: use llist_for_each_entry() in pcu_sock_close() .. Patch Set 1: Ok, this is not really related and can be done in a separate change. Is there anything preventing us from merging this one? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20493 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4bd40ffcc1e925412a21b0a934bbfdeddbc6ad1f Gerrit-Change-Number: 20493 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 08 Oct 2020 20:11:36 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-bts[master]: pcu_sock: use llist_for_each_entry() in pcu_sock_close()
laforge has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/20493 )
Change subject: pcu_sock: use llist_for_each_entry() in pcu_sock_close()
..
Patch Set 1:
(1 comment)
https://gerrit.osmocom.org/c/osmo-bts/+/20493/1/src/common/pcu_sock.c
File src/common/pcu_sock.c:
https://gerrit.osmocom.org/c/osmo-bts/+/20493/1/src/common/pcu_sock.c@915
PS1, Line 915: for (tn = 0; tn < 8; tn++) {
> iirc there was a define for that 8.
The "#define" is "ARRAY_SIZE(trx->ts)" ;)
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20493
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I4bd40ffcc1e925412a21b0a934bbfdeddbc6ad1f
Gerrit-Change-Number: 20493
Gerrit-PatchSet: 1
Gerrit-Owner: Vadim Yanitskiy
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-CC: laforge
Gerrit-Comment-Date: Thu, 08 Oct 2020 19:43:45 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin
Gerrit-MessageType: comment
Change in osmo-bts[master]: pcu_sock: use llist_for_each_entry() in pcu_sock_close()
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/20493 )
Change subject: pcu_sock: use llist_for_each_entry() in pcu_sock_close()
..
Patch Set 1: Code-Review+1
(1 comment)
https://gerrit.osmocom.org/c/osmo-bts/+/20493/1/src/common/pcu_sock.c
File src/common/pcu_sock.c:
https://gerrit.osmocom.org/c/osmo-bts/+/20493/1/src/common/pcu_sock.c@915
PS1, Line 915: for (tn = 0; tn < 8; tn++) {
iirc there was a define for that 8.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20493
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I4bd40ffcc1e925412a21b0a934bbfdeddbc6ad1f
Gerrit-Change-Number: 20493
Gerrit-PatchSet: 1
Gerrit-Owner: Vadim Yanitskiy
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-Comment-Date: Thu, 08 Oct 2020 19:17:17 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in osmo-bts[master]: pcu_sock: use llist_for_each_entry() in pcu_sock_close()
Vadim Yanitskiy has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/20493 )
Change subject: pcu_sock: use llist_for_each_entry() in pcu_sock_close()
..
pcu_sock: use llist_for_each_entry() in pcu_sock_close()
Using gsm_bts_trx_num() involves redundant iterations over the
list of transceivers - we definitely don't want them.
Change-Id: I4bd40ffcc1e925412a21b0a934bbfdeddbc6ad1f
---
M src/common/pcu_sock.c
1 file changed, 5 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/93/20493/1
diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c
index 7f7f7cf..d54e385 100644
--- a/src/common/pcu_sock.c
+++ b/src/common/pcu_sock.c
@@ -883,7 +883,7 @@
struct gsm_bts *bts;
struct gsm_bts_trx *trx;
struct gsm_bts_trx_ts *ts;
- int i, j;
+ unsigned int tn;
/* FIXME: allow multiple BTS */
bts = llist_entry(state->net->bts_list.next, struct gsm_bts, list);
@@ -910,13 +910,10 @@
osmo_signal_dispatch(SS_GLOBAL, S_NEW_SYSINFO, bts);
#endif
- /* release PDCH */
- for (i = 0; i < 8; i++) {
- trx = gsm_bts_trx_num(bts, i);
- if (!trx)
- break;
- for (j = 0; j < 8; j++) {
- ts = >ts[j];
+ /* Deactivate all active PDCH timeslots */
+ llist_for_each_entry(trx, >trx_list, list) {
+ for (tn = 0; tn < 8; tn++) {
+ ts = >ts[tn];
if (ts->mo.nm_state.operational == NM_OPSTATE_ENABLED
&& ts->pchan == GSM_PCHAN_PDCH) {
ts->lchan[0].rel_act_kind = LCHAN_REL_ACT_PCU;
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20493
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I4bd40ffcc1e925412a21b0a934bbfdeddbc6ad1f
Gerrit-Change-Number: 20493
Gerrit-PatchSet: 1
Gerrit-Owner: Vadim Yanitskiy
Gerrit-MessageType: newchange
