osmo-pcu.git branch jerlbeck/wip/pdch-alloc updated. 0.2-529-g520c291

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "UNNAMED PROJECT". The branch, jerlbeck/wip/pdch-alloc has been updated discards 838a3d11815982f89f4ee33024795cfd91c795ae (commit) discards f83fa4c3da863a35e3bf41d48d96e07a2267c380 (commit) discards dcced44b6d4b7f16ba36311475ea78fb424b537f (commit) discards aa2c339b1cf9bc7bd7562f046c4d738ce49f6e11 (commit) discards 308175b012ff0de8490c312817567a18b4247d84 (commit) discards 3c7ea0433dc690a45dcad0592990e8b39b6a5490 (commit) discards 0272b8b8f69925e12a7f3bc281165afe061f982f (commit) discards 6f094b3b61ae6b424866e8b6e06d8356b473d716 (commit) discards ea79e641b653edce592d1b16602d0f4e49cdda73 (commit) discards 4d6c8f423dcdd5c3d192332bd6d117811b119162 (commit) discards 377250f3ada5701a104ccb5388bfe13640b53eb7 (commit) via 520c2919f4bf5d0d0d6dd254e8d76a6876b3b481 (commit) via 509fdb69a9e2036b55cac7f954f9343b6c77d5af (commit) via 8b7c196e9047073de6c7d4ff2857562ce0368303 (commit) via 03ecaff5834c949058dd128a9e4f4a549db9bcf5 (commit) via cb80e6abb755bb6711a56388eb709f0995de9b1c (commit) via f297ac8e06506ddce1ab629bbc36f4fa402af915 (commit) via 17ac3f7a1bd67aad0e0682d29d5356f193403f02 (commit) via acbf887cf8fcbd56fa3fd620cb46978210398bc9 (commit) via a8af58d7d5e44b175749290ef2a76f47fb714ac2 (commit) via 3a0635c0145e5c814945b30d7eea50d3fd76b851 (commit) via 9a2c6655686fb773550b6e1050f60c821eee70b4 (commit) via efe62a73953349ba38781af2c264f273b2dde6e6 (commit) via 14376a73a5916a3dfa5bb65a2487d364a933e4c8 (commit) via 506f156f7a4aebb52dace00a760f86b2b4f5e19a (commit) via 1653f837e3be32d94eeaabf29ae89fdf1dc66bac (commit) via 20b7ba75017a590294dcd4e38135293f33f66740 (commit) via cc9358f95aca618db451faf53971c45dfe0b505a (commit) via 16c6ecc3657f62728845764731c189b3cb8daca2 (commit) via 5f494b8415ff4e5c9bf323ea7bc8326ad423c7ae (commit) via 9ae282372c9b3e10050244b8a1c9179122556175 (commit) via ed46afda6f647e47702379abacf632e7dcc9ee5b (commit) via ea65c72d069c279951c022daf337d99e3aaa670a (commit) via c91c18e6ef9ee5fca3d10b57ebddf211d3655a8d (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (838a3d11815982f89f4ee33024795cfd91c795ae) \ N -- N -- N (520c2919f4bf5d0d0d6dd254e8d76a6876b3b481) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://cgit.osmocom.org/osmo-pcu/commit/?id=520c2919f4bf5d0d0d6dd254e8d76a6… commit 520c2919f4bf5d0d0d6dd254e8d76a6876b3b481 Author: Jacob Erlbeck <jerlbeck(a)sysmocom.de> Date: Fri Jul 10 19:52:37 2015 +0200 tbf: Put the TBF list into the PDCH objects (TODO) Currently the TBFs are registered in a TFI indexed array within the TRX objects. TBFs can be searched globally by TFI and TRX number. This conflicts with the use of the same TFI for different TBF on different PDCH. This use case requires the specification of the PDCH as additional search dimension. This commit moves the TFI index TBF arrays into the PDCH objects. The related methods are updated accordingly. Sponsored-by: On-Waves ehf TODO: - corner case tests, e.g. for tfi_find_free - add test cases that crash without this fix - move this commit in front of "Allocate TFI per slot (algorithm A)" to avoid a non-operational version http://cgit.osmocom.org/osmo-pcu/commit/?id=509fdb69a9e2036b55cac7f954f9343… commit 509fdb69a9e2036b55cac7f954f9343b6c77d5af Author: Jacob Erlbeck <jerlbeck(a)sysmocom.de> Date: Fri Jul 10 12:25:25 2015 +0200 alloc: Allocate TFI per slot (algorithm A) Currently the TFI are managed per TRX, thus only a maximum of 32 TBF per direction and per TRX are possible simultaneously. This commit modifies algorithm_a() to allow the sharing of TFI between different PDCH. Since algorithm A only assigns a single slot to each TBF, the TFI of each PDCH can be assigned independently. This increases the maximum to 32 TBF per direction and per PDCH concerning the TFI allocation. Sponsored-by: On-Waves ehf http://cgit.osmocom.org/osmo-pcu/commit/?id=8b7c196e9047073de6c7d4ff2857562… commit 8b7c196e9047073de6c7d4ff2857562ce0368303 Author: Jacob Erlbeck <jerlbeck(a)sysmocom.de> Date: Fri Jul 10 10:41:36 2015 +0200 tbf: Move TFI selection into alloc_algorithm Currently the TFI and the TRX have to be determined before the actual TBF allocation function is called, passing TFI and TRX number as parameters. This does fit to TFI reuse for different slots, since this were tightly coupled with the slot selection. This commit just moves the TFI selection into the alloc_algorithm functions. The tfi parameter is removed from the the TFI alloc functions. The trx parameter is changed into use_trx to optionally limit the trx selection (same semantics like in tfi_find_free). Sponsored-by: On-Waves ehf http://cgit.osmocom.org/osmo-pcu/commit/?id=03ecaff5834c949058dd128a9e4f4a5… commit 03ecaff5834c949058dd128a9e4f4a549db9bcf5 Author: Jacob Erlbeck <jerlbeck(a)sysmocom.de> Date: Wed Jul 8 12:53:16 2015 +0200 pdch: Manage TFIs per direction Currently a single bit set is used to maintain a set of used TFI without distinguishing between uplink and downlink. Since the namespaces of UL and DL TFI are separate, this implementation is not correct. This commit changes gprs_rlcmac_pdch to use a separate bit set for each direction. It also replace the corresponding conditional fprintf statement in check_tfi_usage (AllocTest.cpp) by an equivalent OSMO_ASSERT. Sponsored-by: On-Waves ehf http://cgit.osmocom.org/osmo-pcu/commit/?id=cb80e6abb755bb6711a56388eb709f0… commit cb80e6abb755bb6711a56388eb709f0995de9b1c Author: Jacob Erlbeck <jerlbeck(a)sysmocom.de> Date: Thu Jul 9 11:35:50 2015 +0200 alloc/test: Check for TFI conflicts This commit adds the check_tfi_usage function that checks the TFI usage. It iterates through all TBFs, records on which PDCH it uses which TFI and check for conflicts. It also checks the bits returned by pdch->assigned_tfi(). The latter suffers from an bug in that method (no separation of uplink and downlink), so a conditional fprintf is used instead of an assertion. Sponsored-by: On-Waves ehf http://cgit.osmocom.org/osmo-pcu/commit/?id=f297ac8e06506ddce1ab629bbc36f4f… commit f297ac8e06506ddce1ab629bbc36f4fa402af915 Author: Jacob Erlbeck <jerlbeck(a)sysmocom.de> Date: Wed Jul 8 12:18:33 2015 +0200 alloc: Fix MS_B/MS_C interpretation Currently the handling of MS_B and MS_C is not compliant with TS 45.002, annex B.1. These values may only interpreted as 0, if frequency hopping is not enabled and if there is no change from Rx to Tx or vice-versa. This commit sets Ttb/Trb to 1 if the table entry is MS_B/MS_C, since only combined down/up access modes are supported. Sponsored-by: On-Waves ehf http://cgit.osmocom.org/osmo-pcu/commit/?id=17ac3f7a1bd67aad0e0682d29d5356f… commit 17ac3f7a1bd67aad0e0682d29d5356f193403f02 Author: Jacob Erlbeck <jerlbeck(a)sysmocom.de> Date: Thu Jul 9 12:06:56 2015 +0200 alloc: Do not use masking for multislot class type 2 MS Currently the masks are computed equally for each class type. This does not make much sense for class type 2 MS, since those are capable to work in full duplex mode. This commit sets the masks to 0xff for class type 2 MS. Sponsored-by: On-Waves ehf http://cgit.osmocom.org/osmo-pcu/commit/?id=acbf887cf8fcbd56fa3fd620cb46978… commit acbf887cf8fcbd56fa3fd620cb46978210398bc9 Author: Jacob Erlbeck <jerlbeck(a)sysmocom.de> Date: Mon Jul 6 14:55:13 2015 +0200 alloc: Select applicable Tta/Tra According to TS 45.002, 6.4.2.2 the choice whether Tta or Tra has to be applied, depends on the medium access mode (currently always dynamic) and the number of UL/DL slots. Currently either value can be used which might result in combinations not covered by the spec. This commit changes find_multi_slots() to skip non-compliant combinations. Note that this code will have to be extended, if other medium access modes are implemented. Sponsored-by: On-Waves ehf http://cgit.osmocom.org/osmo-pcu/commit/?id=a8af58d7d5e44b175749290ef2a76f4… commit a8af58d7d5e44b175749290ef2a76f47fb714ac2 Author: Jacob Erlbeck <jerlbeck(a)sysmocom.de> Date: Thu Jul 9 11:48:23 2015 +0200 alloc: Use an enum instead of numbers to select the mask The local enums MASK_TT and MASK_TR replace the hard coded indices. The variable m_idx is renamed to mask_sel for more clarity. Sponsored-by: On-Waves ehf http://cgit.osmocom.org/osmo-pcu/commit/?id=3a0635c0145e5c814945b30d7eea50d… commit 3a0635c0145e5c814945b30d7eea50d3fd76b851 Author: Jacob Erlbeck <jerlbeck(a)sysmocom.de> Date: Thu Jul 9 13:44:18 2015 +0200 alloc: Merge find_least_busy_pdch and find_least_reserved_pdch Both functions only differ in the computation of the value for num_tbfs. This commit merge both functions and adds a parameter containing a function for that compuation. Sponsored-by: On-Waves ehf ----------------------------------------------------------------------- Summary of changes: src/bts.cpp | 147 +++--- src/bts.h | 22 +- src/gprs_rlcmac.h | 6 +- src/gprs_rlcmac_ts_alloc.cpp | 315 +++++++++---- src/llc.cpp | 2 +- src/tbf.cpp | 65 +-- src/tbf.h | 5 +- src/tbf_dl.cpp | 17 +- tests/alloc/AllocTest.cpp | 214 +++++---- tests/alloc/AllocTest.err | 29 +- tests/alloc/AllocTest.ok | 1016 ++++++++++++++++++++++++++---------------- tests/tbf/TbfTest.cpp | 10 +- tests/tbf/TbfTest.err | 324 +++++++------- 13 files changed, 1283 insertions(+), 889 deletions(-) hooks/post-receive -- UNNAMED PROJECT