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 aa148d0a0734d1cec5d588b20f81e1702c4014b9 (commit) discards 0a6e06388875adb859d33712e68b583e77e5b7bb (commit) discards 378d5075a42e6f3185f858a0b5b04dd8e42bafda (commit) discards a64aa7a65defed38baf2b344240ddf16095a9051 (commit) discards 5f16b96df993c8f44ed8ab64a39c20b9b2904db3 (commit) discards f78593d6e83dd9f26bd1f9cc0e97dabf792a6d8a (commit) discards cf01665b6bd4cc79276cb331ec20f9141c622eee (commit) discards d31560624cd55371fc9d0a3f7b8d023f5dda3558 (commit) discards 48d01a8e2fe77fa13d4f846ba730f43fa3166319 (commit) discards c86d1933900fdf4c1a296fe6fba72512fe025958 (commit) discards 0c8ebf5f511826419c37e04dd1363357c2b4ec35 (commit) discards ec4f21ddec40a9091083c23ec1f040fd52525df9 (commit) discards 0062976f9ba526c67544184f19e7d1216b3d5fcd (commit) discards 4da768b26976cd10f20be32b460d374051b20b81 (commit) discards 0023fbde402832765f083cd79a3e2fe382e8b8fe (commit) discards 01f5df9589e83f97f9b15e31b06a53cfe4192e6d (commit) discards d6108ac1e13b9701b4bc2c5b2dba360ac231b589 (commit) discards 5a7dd909fe51a9925ca844cdfcba48e0a890fb56 (commit) discards cfdd37fa164f8918fe6dea33b0212d01133f98e5 (commit) discards e3859a113af4d7865831a7f778574f830de8b23f (commit) via 27d9f3e9d45a7f7be15cd1b602cb94f8ab057c3e (commit) via 563f35eb49be3d7f1ecdc3d230c81fe28315e607 (commit) via 96a33c74849c8e92fd6e101fc633fdd27891f25e (commit) via 58070d62c88586fda707b88df6d442b480137f78 (commit) via ac4084f0c09fb3df0b1ff4cd0c406cf14b588d7d (commit) via 8a99b7a87a7fb2940333a45e17fdb452fe485ae1 (commit) via b4f2b917c24fe051d05366f78db7d2ccd22bd7ae (commit) via 4095a641fed649f3a08873963253c2ab262f0281 (commit) via 69c9bfa0897c63b8a220bdb8db6658dc5021e5da (commit) via b2439bbb8a73f00873efd7f744f70be535496e90 (commit) via 3a10dbd56428cf0e79b738f62748509bbd04aa68 (commit) via e0853cdf42e60acd7759acd4869c84756eb1fa27 (commit) via 5879c6493f74aecddc81abbd785065325bf2e117 (commit) via 47a57f6f869f19704bbb993fc157a86fd0c85e58 (commit) via 61205a7e6539b3926c3039e8dcabda6aa9b408ef (commit) via 57cf69a18ccceac4b250dceb56c4e0d5f0018a95 (commit) via dd08ac86e6fa1ea69e78c344424d72fc9d79d6d7 (commit) via bae33a70019e2344053eae3798856364cdb8aa12 (commit) via 5e46a20e030a71816a20935befadf232968e1ff6 (commit) via c135b878cd7a155431b4f000e9c00be07e157222 (commit) via 1139ec1d0f20014bb17ea5d5cb65478b4489a8e7 (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 (aa148d0a0734d1cec5d588b20f81e1702c4014b9) \ N -- N -- N (27d9f3e9d45a7f7be15cd1b602cb94f8ab057c3e) 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=27d9f3e9d45a7f7be15cd1b602cb94f8... commit 27d9f3e9d45a7f7be15cd1b602cb94f8ab057c3e Author: Jacob Erlbeck <jerlbeck@sysmocom.de> Date: Tue Jul 14 14:29:34 2015 +0200 pcu: Use alloc_algorithm_dynamic by default The dynamic algorithm behaves like B until there are no TFI left. This commit changes the default algorithm to to former. Ticket: #1934 Sponsored-by: On-Waves ehf http://cgit.osmocom.org/osmo-pcu/commit/?id=563f35eb49be3d7f1ecdc3d230c81fe2... commit 563f35eb49be3d7f1ecdc3d230c81fe28315e607 Author: Jacob Erlbeck <jerlbeck@sysmocom.de> Date: Tue Jul 14 14:02:41 2015 +0200 alloc: Add counters for successful algo A/B allocations This adds counters for algorithm A and B with count successful allocation combined for UL and DL. Ticket: #1934 Sponsored-by: On-Waves ehf http://cgit.osmocom.org/osmo-pcu/commit/?id=96a33c74849c8e92fd6e101fc633fdd2... commit 96a33c74849c8e92fd6e101fc633fdd27891f25e Author: Jacob Erlbeck <jerlbeck@sysmocom.de> Date: Tue Jul 14 13:31:48 2015 +0200 alloc: Add 'dynamic' allocation algorithm The idea behind this meta algorithm is to automatically select one of the other algorithms based on the system state. Basically algorithm B will be selected if the PDCH usage is low to improve throughput and latency. Algorithm A will be selected to support more concurrent MS. This commit adds a first simple state-less version of this algorithm that always tries B first and only if that fails A is tried afterwards. The following VTY command is added to the 'pcu' node: - alloc-algorithm dynamic Ticket: #1934 Sponsored-by: On-Waves ehf http://cgit.osmocom.org/osmo-pcu/commit/?id=58070d62c88586fda707b88df6d442b4... commit 58070d62c88586fda707b88df6d442b480137f78 Author: Jacob Erlbeck <jerlbeck@sysmocom.de> Date: Tue Jul 14 12:57:07 2015 +0200 alloc: Remove disabled code fragment for multi-UL allocation This part of algorithm_b has already been disabled. Further work may depend on this, but it is going out of sync. So this commit removes it completely. Sponsored-by: On-Waves ehf http://cgit.osmocom.org/osmo-pcu/commit/?id=ac4084f0c09fb3df0b1ff4cd0c406cf1... commit ac4084f0c09fb3df0b1ff4cd0c406cf14b588d7d Author: Jacob Erlbeck <jerlbeck@sysmocom.de> Date: Tue Jul 14 11:35:21 2015 +0200 alloc: Refactor alloc algorithms to only apply changes on success Currently these algorithms modify other objects (MS, TBF, PDCH) even if the allocation will fail later on. To implement an algorithm that dynamically tries another algorithm on failure (e.g. A after B), the first (failing) algorithm should not change or damage anything. This commit refactors algorithm A and B to delay the actual allocation until it is known that the allocation will not fail. Ticket: #1934 Sponsored-by: On-Waves ehf http://cgit.osmocom.org/osmo-pcu/commit/?id=8a99b7a87a7fb2940333a45e17fdb452... commit 8a99b7a87a7fb2940333a45e17fdb452fe485ae1 Author: Jacob Erlbeck <jerlbeck@sysmocom.de> Date: Tue Jul 14 08:26:17 2015 +0200 alloc: Optionally enforce first common TS in find_multi_slots (TODO) TODO: - This isn't probably triggered at all currently, so this commit can possibly be dropped http://cgit.osmocom.org/osmo-pcu/commit/?id=b4f2b917c24fe051d05366f78db7d2cc... commit b4f2b917c24fe051d05366f78db7d2ccd22bd7ae Author: Jacob Erlbeck <jerlbeck@sysmocom.de> Date: Mon Jul 13 15:15:18 2015 +0200 alloc: Remove redundant first_common_ts handling Currently this code path is only used, if an allocation has been taken place in a former call to an allocation algorithm function. If this was for an DL TBF, the first common TS was selected, otherwise the least used common TS was selected for an UL TBF. The shrinking of the UL set (to 1<<first_common_ts) is done in the latter case. This commit removes an additional code path that aligns the UL set to first_common_ts, because it has no more influence on the set of common TS after both UL and DL TBF have been allocated. Sponsored-by: On-Waves ehf http://cgit.osmocom.org/osmo-pcu/commit/?id=4095a641fed649f3a08873963253c2ab... commit 4095a641fed649f3a08873963253c2ab262f0281 Author: Jacob Erlbeck <jerlbeck@sysmocom.de> Date: Mon Jul 13 14:50:08 2015 +0200 alloc/test: Add test for interleaved TBF chains MS iniated TCP connections generally result in a sequence of short time UL and longer lasting DL TBFs, being interleaved between several MS. This scenario is not covered by the existing tests. This commit adds a test, that allocates as man as possible TBFs several times with different test modes without clearing the BTS (and thus the TBF list) in between. The number of allocated DL TBFs in each round is expected to be constant. Sponsored-by: On-Waves ehf http://cgit.osmocom.org/osmo-pcu/commit/?id=69c9bfa0897c63b8a220bdb8db6658dc... commit 69c9bfa0897c63b8a220bdb8db6658dc5021e5da Author: Jacob Erlbeck <jerlbeck@sysmocom.de> Date: Mon Jul 13 14:38:18 2015 +0200 alloc/test: Put TBF allocation loop into alloc_many_tbfs Currently all TBFs are deleted after the allocation loop finishes. This make it difficult to interleave the TBF allocation like it happens with real MS. This commit refactors the allocation loop into alloc_many_tbfs and adds support for TLLIs, which are derived from the counter value and used to retrieve an old MS object if alloc_many_tbfs is called a second time. Note that this does not make a difference for the existing tests. Sponsored-by: On-Waves ehf http://cgit.osmocom.org/osmo-pcu/commit/?id=b2439bbb8a73f00873efd7f744f70be5... commit b2439bbb8a73f00873efd7f744f70be535496e90 Author: Jacob Erlbeck <jerlbeck@sysmocom.de> Date: Mon Jul 13 14:23:32 2015 +0200 ms: Add is_idle() method to GprsMs::Guard Currently there is no simple way to determine, whether the MS object protected by a guard will continue to exist after the guard object is destroyed. This patch adds a is_idle() method that will return true if the MS object is just kept by the guard from being idle. In that case, the MS object would either be deleted or return true for GprsMs::is_idle() after the guard's destruction, provided that no TBF attachment took place in between. Sponsored-by: On-Waves ehf http://cgit.osmocom.org/osmo-pcu/commit/?id=3a10dbd56428cf0e79b738f62748509b... commit 3a10dbd56428cf0e79b738f62748509bbd04aa68 Author: Jacob Erlbeck <jerlbeck@sysmocom.de> Date: Fri Jul 10 19:52:37 2015 +0200 tbf: Put the TFI->TBF mapping into the PDCH objects 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. Ticket: #1793 Sponsored-by: On-Waves ehf http://cgit.osmocom.org/osmo-pcu/commit/?id=e0853cdf42e60acd7759acd4869c8475... commit e0853cdf42e60acd7759acd4869c84756eb1fa27 Author: Jacob Erlbeck <jerlbeck@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. Ticket: #1793 Sponsored-by: On-Waves ehf http://cgit.osmocom.org/osmo-pcu/commit/?id=5879c6493f74aecddc81abbd78506532... commit 5879c6493f74aecddc81abbd785065325bf2e117 Author: Jacob Erlbeck <jerlbeck@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=47a57f6f869f19704bbb993fc157a86f... commit 47a57f6f869f19704bbb993fc157a86fd0c85e58 Author: Jacob Erlbeck <jerlbeck@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=61205a7e6539b3926c3039e8dcabda6a... commit 61205a7e6539b3926c3039e8dcabda6aa9b408ef Author: Jacob Erlbeck <jerlbeck@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. The method tfi_find_free is checked for conflicts after allocations. Sponsored-by: On-Waves ehf http://cgit.osmocom.org/osmo-pcu/commit/?id=57cf69a18ccceac4b250dceb56c4e0d5... commit 57cf69a18ccceac4b250dceb56c4e0d5f0018a95 Author: Jacob Erlbeck <jerlbeck@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=dd08ac86e6fa1ea69e78c344424d72fc... commit dd08ac86e6fa1ea69e78c344424d72fc9d79d6d7 Author: Jacob Erlbeck <jerlbeck@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=bae33a70019e2344053eae3798856364... commit bae33a70019e2344053eae3798856364cdb8aa12 Author: Jacob Erlbeck <jerlbeck@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=5e46a20e030a71816a20935befadf232... commit 5e46a20e030a71816a20935befadf232968e1ff6 Author: Jacob Erlbeck <jerlbeck@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=c135b878cd7a155431b4f000e9c00be0... commit c135b878cd7a155431b4f000e9c00be07e157222 Author: Jacob Erlbeck <jerlbeck@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/sba.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- UNNAMED PROJECT