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/master has been updated 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) from c91c18e6ef9ee5fca3d10b57ebddf211d3655a8d (commit) 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=efe62a73953349ba38781af2c264f273... commit efe62a73953349ba38781af2c264f273b2dde6e6 Author: Jacob Erlbeck <jerlbeck@sysmocom.de> Date: Thu Jul 2 15:48:25 2015 +0200 alloc: Use least reserved PDCH for algo A Currently the slot selection of algorithm A is based on the current slot usage by active TBF. Especially in the Dl after UL case which reflects the commen use case "MS initiates TCP connection", the resulting distribution is not optimal with respect to PDCH usage. This commit changes the implementation to use the slot reservation information instead. Sponsored-by: On-Waves ehf http://cgit.osmocom.org/osmo-pcu/commit/?id=14376a73a5916a3dfa5bb65a2487d364... commit 14376a73a5916a3dfa5bb65a2487d364a933e4c8 Author: Jacob Erlbeck <jerlbeck@sysmocom.de> Date: Tue Jul 7 11:31:28 2015 +0200 alloc/test: Delete first TBF after the second is allocated Currently when using the test modes TEST_MODE_DL_AFTER_UL or TEST_MODE_UL_AFTER_DL, the first TBF is deleted before the second is allocated. The far more interesting case were to keep the first TBF a little bit longer until the second TBF has been created and delete then. This comes closer the the situation observed with real MS, where the first TBF takes some time (timeout or waiting for Ack) before it gets deleted and thus detached from the MS object. This commit delays the call to tbf_free accordingly. The effect can be observed in the results of the algo A tests, where the uniform distribution of the allocated PDCH is lost. Sponsored-by: On-Waves ehf http://cgit.osmocom.org/osmo-pcu/commit/?id=506f156f7a4aebb52dace00a760f86b2... commit 506f156f7a4aebb52dace00a760f86b2b4f5e19a Author: Jacob Erlbeck <jerlbeck@sysmocom.de> Date: Thu Jul 2 13:19:49 2015 +0200 sba: Reverse TS search order Currently the search for an enabled PDCH slot for SBA start with the first TS. If there are more than 2 PDCH slots enabled, this slot will conflict with an existing multislot reservation for most multislot classes. This were less likely if the search were reversed and started with the last slot due to the 3 slot shift between Tx and Rx. When multislot allocation is enabled and several MS are connected, and increased rate of poll timeouts can be observed. This commit tries to reduce the number of poll timeouts by reverting the slot search order for SBA allocation. Sponsored-by: On-Waves ehf http://cgit.osmocom.org/osmo-pcu/commit/?id=1653f837e3be32d94eeaabf29ae89fdf... commit 1653f837e3be32d94eeaabf29ae89fdf1dc66bac Author: Jacob Erlbeck <jerlbeck@sysmocom.de> Date: Tue Jun 30 14:48:13 2015 +0200 alloc: Disable inner loop debugging by default The current logging statements within the inner loop of find_multi_slots drain quite a lot of CPU resources even if LOGL_DEBUG is not enabled. This might cause issues on the target hardware. This commit disables these LOGP calls unless the ENABLE_TS_ALLOC_DEBUG macro has been set explicitly. This results in a reduction in the CPU usage reported by callgrind for find_multi_slots from 42% to 25% when executing AllocTest. Sponsored-by: On-Waves ehf http://cgit.osmocom.org/osmo-pcu/commit/?id=20b7ba75017a590294dcd4e38135293f... commit 20b7ba75017a590294dcd4e38135293f33f66740 Author: Jacob Erlbeck <jerlbeck@sysmocom.de> Date: Tue Jun 30 14:34:24 2015 +0200 alloc: Optimize find_free_usf According to callgrind, this function consumes 33% CPU when running the AllocTest program. This commit uses the assigned_usf() method to get the USFs allocated by a PDCH instead of traversing the TBFs. Sponsored-by: On-Waves ehf http://cgit.osmocom.org/osmo-pcu/commit/?id=cc9358f95aca618db451faf53971c45d... commit cc9358f95aca618db451faf53971c45dfe0b505a Author: Jacob Erlbeck <jerlbeck@sysmocom.de> Date: Tue Jun 30 14:10:13 2015 +0200 tbf: Keep a set of used TFI and USF per PDCH Currently is is rather expensive to get TFI and USF usage per PDCH, because the TBFs need to be scanned to get that information. This commit adds corresponding bit sets which get updated by the attach_tbf/detach_tbf methods of the gprs_rlcmac_pdch class. Sponsored-by: On-Waves ehf http://cgit.osmocom.org/osmo-pcu/commit/?id=16c6ecc3657f62728845764731c189b3... commit 16c6ecc3657f62728845764731c189b3cb8daca2 Author: Jacob Erlbeck <jerlbeck@sysmocom.de> Date: Tue Jun 30 13:40:18 2015 +0200 alloc: Skip common TS without free USF when rating Currently the search of the "best" slot combination is done separately from the UL slot selection, which can lead to an allocation failure due to USF exhaustion even if another combination had been possible. This commit reduces the probability for this event by skipping UL slots without free USF while calculation the capacity. Note that the implementation is rather inefficient which will be fixed by the following commits. Sponsored-by: On-Waves ehf http://cgit.osmocom.org/osmo-pcu/commit/?id=5f494b8415ff4e5c9bf323ea7bc8326a... commit 5f494b8415ff4e5c9bf323ea7bc8326ad423c7ae Author: Jacob Erlbeck <jerlbeck@sysmocom.de> Date: Wed Jul 1 13:10:41 2015 +0200 alloc: Only reserve 1 UL slot with algorithm B Since currently the algorithm B will only allocate a single UL slot and will have to stick to it (first common TS), the other possible UL slots will not be allocated while the reservation is kept. This commit adds code to update the reserved set of UL slots to only reserve the single common TS when the UL TBF is allocated. Interestingly this leads to fewer allocated TBF in some cases due to USF exhaustion. This will be improved by the following commit "alloc: Skip common TS without free USF". Sponsored-by: On-Waves ehf http://cgit.osmocom.org/osmo-pcu/commit/?id=9ae282372c9b3e10050244b8a1c91791... commit 9ae282372c9b3e10050244b8a1c9179122556175 Author: Jacob Erlbeck <jerlbeck@sysmocom.de> Date: Wed Jul 1 12:27:30 2015 +0200 alloc: Set minimum slot capacity to 1 Currently the capacity of a PDCH slot is calculated as 32 - N_reserved for each direction. This can result in a capacity of 0 and even negative values. This commit forces the capacity of an usable slot to be at least zero under the assumption, that an overly reserved PDCH is still better than none. Sponsored-by: On-Waves ehf http://cgit.osmocom.org/osmo-pcu/commit/?id=ed46afda6f647e47702379abacf632e7... commit ed46afda6f647e47702379abacf632e7dcc9ee5b Author: Jacob Erlbeck <jerlbeck@sysmocom.de> Date: Wed Jul 1 12:19:40 2015 +0200 alloc: Only use common UL slots when calculating the capacity Currently al possible UL slots are included in the capacity calculation which is the base of the slot selection. Nevertheless UL-only slots will never be used, since only one uplink slot (which must be a common slot) will be used. This patch changes the code to only include common slots in the capacity sum. Note that this might not be optimal if algorithm B supported multiple uplink slots. Sponsored-by: On-Waves ehf http://cgit.osmocom.org/osmo-pcu/commit/?id=ea65c72d069c279951c022daf337d99e... commit ea65c72d069c279951c022daf337d99e3aaa670a Author: Jacob Erlbeck <jerlbeck@sysmocom.de> Date: Mon Jun 22 16:14:23 2015 +0200 alloc: Replace Algorithm B implementation The current implementation always starts the downlink slot allocation with the first possible slot, depending on which channels are enabled and which multislot class is offered by the MS. So in configurations with many (>4) PDCH, some PDCH are not really used. The new implementation introduced by this commit differs as follows: - The reservation mechanism provided by GprsMs is used to avoid incompatibilities is used in the same way like algo A does. This basically means, that the allocation is done once when the first TBF is requested and then used until all TBF have been released. - All combinations of Rx and Tx slots are checked for compatibility with the multiscot class. Basically the combination with the most usable PDCH and the least number of reservations is used. - Only one UL slots is provided. - Tta and Tra are checked. Sponsored-by: On-Waves ehf ----------------------------------------------------------------------- Summary of changes: src/bts.cpp | 28 +- src/bts.h | 15 + src/gprs_rlcmac_ts_alloc.cpp | 882 ++++++++++++++++++++++--------------------- src/sba.cpp | 4 +- tests/alloc/AllocTest.cpp | 46 +-- tests/alloc/AllocTest.err | 14 +- tests/alloc/AllocTest.ok | 470 ++++++++++++++--------- tests/tbf/TbfTest.err | 106 +++--- 8 files changed, 878 insertions(+), 687 deletions(-) hooks/post-receive -- UNNAMED PROJECT