[PATCH] osmo-pcu[master]: Simplify TS alloc: avoid TS reassignment

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Max gerrit-no-reply at lists.osmocom.org
Fri Jan 26 11:57:48 UTC 2018


Hello Jenkins Builder,

I'd like you to reexamine a change.  Please visit

    https://gerrit.osmocom.org/4085

to look at the new patch set (#3).

Simplify TS alloc: avoid TS reassignment

Assign reserved_*_slots only when multislot masks are found to avoid
reassignment and make code easier to follow.

Change-Id: I9b0482f4ea75ead9855cd78e33c8e70d0ccf4484
Related: OS#2282
---
M src/gprs_rlcmac_ts_alloc.cpp
1 file changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/85/4085/3

diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp
index cd82ca7..c246676 100644
--- a/src/gprs_rlcmac_ts_alloc.cpp
+++ b/src/gprs_rlcmac_ts_alloc.cpp
@@ -770,8 +770,8 @@
 		return -EINVAL;
 	}
 
-	reserved_dl_slots = dl_slots = ms->reserved_dl_slots();
-	reserved_ul_slots = ul_slots = ms->reserved_ul_slots();
+	dl_slots = ms->reserved_dl_slots();
+	ul_slots = ms->reserved_ul_slots();
 	first_common_ts = ms->first_common_ts();
 	trx = ms->current_trx();
 
@@ -800,11 +800,11 @@
 		rc = find_multi_slots(trx, ms->ms_class(), &ul_slots, &dl_slots);
 		if (rc < 0)
 			return rc;
-
-		reserved_dl_slots = dl_slots;
-		reserved_ul_slots = ul_slots;
 	}
 
+	reserved_dl_slots = dl_slots;
+	reserved_ul_slots = ul_slots;
+
 	/* Step 3: Derive the slot set for the current TBF */
 	if (single) {
 		/* Make sure to consider the first common slot only */

-- 
To view, visit https://gerrit.osmocom.org/4085
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I9b0482f4ea75ead9855cd78e33c8e70d0ccf4484
Gerrit-PatchSet: 3
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Owner: Max <msuraev at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder



More information about the gerrit-log mailing list