Change in ...osmo-pcu[master]: pdch.cpp: Refactor bitvec param passing in rcv_control_block
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15600 Change subject: pdch.cpp: Refactor bitvec param passing in rcv_control_block .. pdch.cpp: Refactor bitvec param passing in rcv_control_block Move code in rcv_block_gprs() only needed for rcv_control_block() into the later. This way rcv_block_gprs() is simplified and shows similar code paths with regards to rcv_data_block(). It can now be seen that the main difference between both is the meas param no being passed in the control case. Change-Id: I2a0133463edced93c72ccc743a0cf00d1d6922cf --- M src/pdch.cpp M src/pdch.h 2 files changed, 14 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/00/15600/1 diff --git a/src/pdch.cpp b/src/pdch.cpp index 7488b96..5ae7e63 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -680,10 +680,18 @@ } /* Received Uplink RLC control block. */ -int gprs_rlcmac_pdch::rcv_control_block( - const uint8_t *data, uint8_t data_len, bitvec *rlc_block, uint32_t fn) +int gprs_rlcmac_pdch::rcv_control_block(const uint8_t *data, uint8_t data_len, + uint32_t fn, GprsCodingScheme cs) { - RlcMacUplink_t * ul_control_block = (RlcMacUplink_t *)talloc_zero(tall_pcu_ctx, RlcMacUplink_t); + bitvec *rlc_block; + RlcMacUplink_t *ul_control_block; + unsigned len = cs.maxBytesUL(); + + if (!(rlc_block = bitvec_alloc(len, tall_pcu_ctx))) + return -ENOMEM; + bitvec_unpack(rlc_block, data); + ul_control_block = (RlcMacUplink_t *)talloc_zero(tall_pcu_ctx, RlcMacUplink_t); + LOGP(DRLCMAC, LOGL_DEBUG, "+ RX : Uplink Control Block +\n"); decode_gsm_rlcmac_uplink(rlc_block, ul_control_block); LOGPC(DCSN1, LOGL_NOTICE, "\n"); @@ -721,6 +729,7 @@ ul_control_block->u.MESSAGE_TYPE); } talloc_free(ul_control_block); + bitvec_free(rlc_block); return 1; } @@ -816,21 +825,14 @@ struct pcu_l1_meas *meas, GprsCodingScheme cs) { unsigned payload = data[0] >> 6; - bitvec *block; int rc = 0; - unsigned len = cs.maxBytesUL(); switch (payload) { case GPRS_RLCMAC_DATA_BLOCK: rc = rcv_data_block(data, data_len, fn, meas, cs); break; case GPRS_RLCMAC_CONTROL_BLOCK: - block = bitvec_alloc(len, tall_pcu_ctx); - if (!block) - return -ENOMEM; - bitvec_unpack(block, data); - rc = rcv_control_block(data, data_len, block, fn); - bitvec_free(block); + rc = rcv_control_block(data, data_len, fn, cs); break; case GPRS_RLCMAC_CONTROL_BLOCK_OPT: LOGP(DRLCMAC, LOGL_NOTICE, "GPRS_RLCMAC_CONTROL_BLOCK_OPT block payload is not supported.\n"); @@ -961,4 +963,3 @@ { return trx->bts->bts_data(); } - diff --git a/src/pdch.h b/src/pdch.h index cf9804d..e23d56f 100644 --- a/src/pdch.h +++ b/src/pdch.h @@ -94,7 +94,7 @@ #ifdef __cplusplus private: - int rcv_control_block(const uint8_t *data, uint8_t data_len, bitvec *rlc_block, uint32_t fn); + int rcv_control_block(const uint8_t *data, uint8_t data_len, uint32_t fn, GprsCodingScheme cs); void rcv_control_ack(Packet_Control_Acknowledgement_t *, uint32_t fn); void rcv_control_dl_ack_nack(Packet_Downlink_Ack_Nack_t *, uint32_t fn); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15600 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I2a0133463edced93c72ccc743a0cf00d1d6922cf Gerrit-Change-Number: 15600 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in ...osmo-pcu[master]: pdch.cpp: Use pcu_l1_meas previously filled by lower layers
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15601 Change subject: pdch.cpp: Use pcu_l1_meas previously filled by lower layers .. pdch.cpp: Use pcu_l1_meas previously filled by lower layers Otherwise, a new meas object is allocated in the stack in upper layers which doesn't contain the link_qual information (have_link_qual=0), outputting following error: osmo-pcu/src/gprs_ms.cpp:644 Unable to update UL (M)CS CS-2 because we don't have link quality measurements. Change-Id: I1980ca325c8d65f3f6310fa697dd810eec7ab077 --- M src/pdch.cpp M src/pdch.h 2 files changed, 19 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/01/15601/1 diff --git a/src/pdch.cpp b/src/pdch.cpp index 5ae7e63..241 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -373,12 +373,11 @@ "at no request\n"); } -void gprs_rlcmac_pdch::rcv_control_dl_ack_nack(Packet_Downlink_Ack_Nack_t *ack_nack, uint32_t fn) +void gprs_rlcmac_pdch::rcv_control_dl_ack_nack(Packet_Downlink_Ack_Nack_t *ack_nack, uint32_t fn, struct pcu_l1_meas *meas) { int8_t tfi = 0; /* must be signed */ struct gprs_rlcmac_dl_tbf *tbf; int rc; - struct pcu_l1_meas meas; int num_blocks; uint8_t bits_data[RLC_GPRS_WS/8]; bitvec bits; @@ -435,16 +434,15 @@ /* get measurements */ if (tbf->ms()) { - get_meas(&meas, &ack_nack->Channel_Quality_Report); - tbf->ms()->update_l1_meas(&meas); + get_meas(meas, &ack_nack->Channel_Quality_Report); + tbf->ms()->update_l1_meas(meas); } } -void gprs_rlcmac_pdch::rcv_control_egprs_dl_ack_nack(EGPRS_PD_AckNack_t *ack_nack, uint32_t fn) +void gprs_rlcmac_pdch::rcv_control_egprs_dl_ack_nack(EGPRS_PD_AckNack_t *ack_nack, uint32_t fn, struct pcu_l1_meas *meas) { int8_t tfi = 0; /* must be signed */ struct gprs_rlcmac_dl_tbf *tbf; - struct pcu_l1_meas meas; int rc; int num_blocks; uint8_t bits_data[RLC_EGPRS_MAX_WS/8]; @@ -526,13 +524,13 @@ if (tbf->ms()) { /* TODO: Implement Measurements parsing for EGPRS */ /* - get_meas(&meas, &ack_nack->Channel_Quality_Report); - tbf->ms()->update_l1_meas(&meas); + get_meas(meas, &ack_nack->Channel_Quality_Report); + tbf->ms()->update_l1_meas(meas); */ } } -void gprs_rlcmac_pdch::rcv_resource_request(Packet_Resource_Request_t *request, uint32_t fn) +void gprs_rlcmac_pdch::rcv_resource_request(Packet_Resource_Request_t *request, uint32_t fn, struct pcu_l1_meas *meas) { struct gprs_rlcmac_sba *sba; @@ -543,7 +541,6 @@ uint8_t ms_class = 0; uint8_t egprs_ms_class = 0; uint8_t ta = GSM48_TA_INVALID; - struct pcu_l1_meas meas; GprsMs *ms = bts()->ms_by_tlli(tlli); /* Keep the ms, even if it gets idle temporarily */ @@ -621,8 +618,8 @@ /* get measurements */ if (ul_tbf->ms()) { - get_meas(&meas, request); - ul_tbf->ms()->update_l1_meas(&meas); + get_meas(meas, request); + ul_tbf->ms()->update_l1_meas(meas); } return; } @@ -681,7 +678,7 @@ /* Received Uplink RLC control block. */ int gprs_rlcmac_pdch::rcv_control_block(const uint8_t *data, uint8_t data_len, - uint32_t fn, GprsCodingScheme cs) + uint32_t fn, struct pcu_l1_meas *meas, GprsCodingScheme cs) { bitvec *rlc_block; RlcMacUplink_t *ul_control_block; @@ -708,13 +705,13 @@ rcv_control_ack(&ul_control_block->u.Packet_Control_Acknowledgement, fn); break; case MT_PACKET_DOWNLINK_ACK_NACK: - rcv_control_dl_ack_nack(&ul_control_block->u.Packet_Downlink_Ack_Nack, fn); + rcv_control_dl_ack_nack(&ul_control_block->u.Packet_Downlink_Ack_Nack, fn, meas); break; case MT_EGPRS_PACKET_DOWNLINK_ACK_NACK: - rcv_control_egprs_dl_ack_nack(&ul_control_block->u.Egprs_Packet_Downlink_Ack_Nack, fn); + rcv_control_egprs_dl_ack_nack(&ul_control_block->u.Egprs_Packet_Downlink_Ack_Nack, fn, meas); break; case MT_PACKET_RESOURCE_REQUEST: - rcv_resource_request(&ul_control_block->u.Packet_Resource_Request, fn); + rcv_resource_request(&ul_control_block->u.Packet_Resource_Request, fn, meas); break; case MT_PACKET_MEASUREMENT_REPORT: rcv_measurement_report(&ul_control_block->u.Packet_Measurement_Report, fn); @@ -832,7 +829,7 @@
Change in ...osmo-pcu[master]: Move out tbf subclasses from tbf.h to their own headers
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15603 Change subject: Move out tbf subclasses from tbf.h to their own headers .. Move out tbf subclasses from tbf.h to their own headers It's a good start towards clearing current mess between parent and the 2 children classes. Change-Id: Ibc22ea2e02609af7ee058b8bc15df2115d4c6f60 --- M src/Makefile.am M src/bts.cpp M src/encoding.cpp M src/gprs_ms.cpp M src/gprs_ms.h M src/gprs_rlcmac_meas.cpp M src/gprs_rlcmac_sched.cpp M src/gprs_rlcmac_ts_alloc.cpp M src/pcu_vty_functions.cpp M src/pdch.cpp M src/poll_controller.cpp M src/tbf.cpp M src/tbf.h M src/tbf_dl.cpp A src/tbf_dl.h M src/tbf_ul.cpp A src/tbf_ul.h M tests/alloc/AllocTest.cpp M tests/ms/MsTest.cpp M tests/tbf/TbfTest.cpp M tests/types/TypesTest.cpp 21 files changed, 319 insertions(+), 238 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/03/15603/1 diff --git a/src/Makefile.am b/src/Makefile.am index 7148267..a84a511 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -91,6 +91,8 @@ pcu_vty_functions.h \ mslot_class.h \ tbf.h \ + tbf_ul.h \ + tbf_dl.h \ bts.h \ pdch.h \ poll_controller.h \ diff --git a/src/bts.cpp b/src/bts.cpp index a8760ae..df58494 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include diff --git a/src/encoding.cpp b/src/encoding.cpp index 3fac75e..8270354 100644 --- a/src/encoding.cpp +++ b/src/encoding.cpp @@ -23,6 +23,7 @@ #include #include #include +#include #include #include diff --git a/src/gprs_ms.cpp b/src/gprs_ms.cpp index 75f75e1..5b35e65 100644 --- a/src/gprs_ms.cpp +++ b/src/gprs_ms.cpp @@ -23,6 +23,7 @@ #include #include "bts.h" #include "tbf.h" +#include "tbf_ul.h" #include "gprs_debug.h" #include "gprs_codel.h" #include "pcu_utils.h" diff --git a/src/gprs_ms.h b/src/gprs_ms.h index 781dd59..688708e 100644 --- a/src/gprs_ms.h +++ b/src/gprs_ms.h @@ -26,6 +26,7 @@ #include "cxx_linuxlist.h" #include "llc.h" #include "tbf.h" +#include "tbf_dl.h" #include "pcu_l1_if.h" #include diff --git a/src/gprs_rlcmac_meas.cpp b/src/gprs_rlcmac_meas.cpp index 4e58df3..998e01c 100644 --- a/src/gprs_rlcmac_meas.cpp +++ b/src/gprs_rlcmac_meas.cpp @@ -23,6 +23,7 @@ #include #include #include +#include #include #include diff --git a/src/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp index 5fedb5a..fe6f159 100644 --- a/src/gprs_rlcmac_sched.cpp +++ b/src/gprs_rlcmac_sched.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp index 0476d6d..cf3f9a9 100644 --- a/src/gprs_rlcmac_ts_alloc.cpp +++ b/src/gprs_rlcmac_ts_alloc.cpp @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include diff --git a/src/pcu_vty_functions.cpp b/src/pcu_vty_functions.cpp index 98e8185..3008267 100644 --- a/src/pcu_vty_functions.cpp +++ b/src/pcu_vty_functions.cpp @@ -32,6 +32,7 @@ #include #include #include +#include #include extern "C" { diff --git a/src/pdch.cpp b/src/pdch.cpp index 241..e4b25e1 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -32,6 +32,7 @@ #include #include #include +#include #include #include diff --git a/src/poll_controller.cpp b/src/poll_controller.cpp index 744b612..ac79510 100644 --- a/src/poll_controller.cpp +++ b/src/poll_controller.cpp @@ -23,6 +23,7 @@ #include #include #include +#include #include #include diff --git a/src/tbf.cpp b/src/tbf.cpp index 37435f5..3ca39bf 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -21,6 +21,8 @@ #include #include +#include +#include #include #include #include diff --git a/src/tbf.h b/src/tbf.h index 6eab9d0..fd65b20 100644 --- a/src/tbf.h +++ b/src/tbf.h @@ -95,15 +95,6 @@ GPRS_RLCMAC_UL_TBF }; -enum tbf_dl_prio { - DL_PRIO_NONE, - DL_PRIO_SENT_DATA, /* the data has been sent and not (yet) nacked */ - DL_PRIO_LOW_AGE, /* the age has reached the first threshold */ - DL_PRIO_NEW_DATA, /* the data has not been sent yet or nacked */ - DL_PRIO_HIGH_AGE, /* the age has reached the second threshold */ - DL_PRIO_CONTROL, /* a control block needs to be sent */ -}; - enum tbf_rlc_counters { TBF_CTR_RLC_NACKED, }; @@ -127,28 +118,7 @@ TBF_CTR_EGPRS_DL_MCS9, }; -enum tbf_gprs_ul_counters { -TBF_CTR_GPRS_UL_CS1, -TBF_CTR_GPRS_UL_CS2, -TBF_CTR_GPRS_UL_CS3, -TBF_CTR_GPRS_UL_CS4, -}; - -enum tbf_egprs_ul_counters { -TBF_CTR_EGPRS_UL_MCS1, -TBF_CTR_EGPRS_UL_MCS2, -TBF_CTR_EGPRS_UL_MCS3, -TBF_CTR_EGPRS_UL_MCS4, -TBF_CTR_EGPRS_UL_MCS5, -TBF_CTR_EGPRS_UL_MCS6, -TBF_CTR_EGPRS_UL_MCS7, -
Change in ...osmo-pcu[master]: cosmetic: fix whitespace
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15602 Change subject: cosmetic: fix whitespace .. cosmetic: fix whitespace Change-Id: I45bbe4d3c69d573aaff010d16f338c7ec3eaf08a --- M src/gprs_rlcmac_meas.cpp M src/gprs_rlcmac_sched.cpp M src/tbf_ul.cpp M tests/types/TypesTest.cpp 4 files changed, 4 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/02/15602/1 diff --git a/src/gprs_rlcmac_meas.cpp b/src/gprs_rlcmac_meas.cpp index 9ff06db..4e58df3 100644 --- a/src/gprs_rlcmac_meas.cpp +++ b/src/gprs_rlcmac_meas.cpp @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - + #include #include @@ -189,4 +189,3 @@ return 0; } - diff --git a/src/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp index e16cf39..5fedb5a 100644 --- a/src/gprs_rlcmac_sched.cpp +++ b/src/gprs_rlcmac_sched.cpp @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - + #include #include #include diff --git a/src/tbf_ul.cpp b/src/tbf_ul.cpp index e4f0083..3fa8009 100644 --- a/src/tbf_ul.cpp +++ b/src/tbf_ul.cpp @@ -395,7 +395,7 @@ m_llc.reset_frame_space(); return -EIO; } - + llc_pdu = msgb_alloc_headroom(msg_len, msg_len,"llc_pdu"); uint8_t *buf = msgb_push(llc_pdu, TL16V_GROSS_LEN(sizeof(uint8_t)*m_llc.frame_length())); tl16v_put(buf, BSSGP_IE_LLC_PDU, sizeof(uint8_t)*m_llc.frame_length(), m_llc.frame); diff --git a/tests/types/TypesTest.cpp b/tests/types/TypesTest.cpp index b2ddc94..ee4e937 100644 --- a/tests/types/TypesTest.cpp +++ b/tests/types/TypesTest.cpp @@ -88,7 +88,7 @@ llc.append_frame(data, llc.remaining_space() - 1); OSMO_ASSERT(llc.fits_in_current_frame(1)); OSMO_ASSERT(!llc.fits_in_current_frame(2)); - } + } } static void test_rlc() -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15602 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I45bbe4d3c69d573aaff010d16f338c7ec3eaf08a Gerrit-Change-Number: 15602 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in ...osmo-bts[master]: log: set L1 SAPI log context
Hello fixeria, pespin, neels, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/15539 to look at the new patch set (#5). Change subject: log: set L1 SAPI log context .. log: set L1 SAPI log context Add a new common L1 SAPI enum, to unify all the BTS specific SAPIs. Translate to this enum, and set the context for uplink messages in each BTS specific implementation. Set the context for downlink messages in the common l1sap code, by converting the osmo_phsap_prim back to the SAPI value (mostly looking at chan_nr). The new functions for doing this conversion, get_common_sapi_by_trx_prim() and get_common_sapi_ph_data(), are based on the existing to_gsmtap() and gsmtap_ph_data() functions. Note that we can't set the uplink SAPI context in the common code, because then we can't set it as early as possible. Related: OS#2356 Depends: (libosmocore) I814cb3328d99faca9220adb5a80ffb934f219d7d Change-Id: I6b7bb2e1d61502b61214f854a4ec5cbb7267545b --- M include/osmo-bts/l1sap.h M src/common/l1sap.c M src/osmo-bts-litecell15/l1_if.c M src/osmo-bts-oc2g/l1_if.c M src/osmo-bts-octphy/l1_if.c M src/osmo-bts-sysmo/l1_if.c 6 files changed, 382 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/39/15539/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15539 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6b7bb2e1d61502b61214f854a4ec5cbb7267545b Gerrit-Change-Number: 15539 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: newpatchset
Change in ...osmo-bts[master]: log: set L1 SAPI log context
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15539 ) Change subject: log: set L1 SAPI log context .. Patch Set 5: Thanks again. I've pushed my current WIP version based on your feedback (untested, and other commits need to be adjusted). -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15539 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6b7bb2e1d61502b61214f854a4ec5cbb7267545b Gerrit-Change-Number: 15539 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 25 Sep 2019 16:15:22 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-pcu[master]: pdch.cpp: Refactor bitvec param passing in rcv_control_block
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15600 ) Change subject: pdch.cpp: Refactor bitvec param passing in rcv_control_block .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15600 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I2a0133463edced93c72ccc743a0cf00d1d6922cf Gerrit-Change-Number: 15600 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 25 Sep 2019 18:11:27 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-pcu[master]: pdch.cpp: Use pcu_l1_meas previously filled by lower layers
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15601 ) Change subject: pdch.cpp: Use pcu_l1_meas previously filled by lower layers .. Patch Set 1: Code-Review+2 Awesome! I also have been trying to fix this problem, but gave up at some point. I am about to release a TTCN-3 test case for CS adaptation, which continuously sends data blocks, so I think we need a test case for control blocks too. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15601 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I1980ca325c8d65f3f6310fa697dd810eec7ab077 Gerrit-Change-Number: 15601 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 25 Sep 2019 18:15:27 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-pcu[master]: cosmetic: fix whitespace
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15602 ) Change subject: cosmetic: fix whitespace .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15602 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I45bbe4d3c69d573aaff010d16f338c7ec3eaf08a Gerrit-Change-Number: 15602 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 25 Sep 2019 18:16:57 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: PCU_Tests_RAW.ttcn: introduce TC_ta_rach_imm_ass to test initial TA
Hello pespin, laforge, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15410 to look at the new patch set (#10). Change subject: PCU_Tests_RAW.ttcn: introduce TC_ta_rach_imm_ass to test initial TA .. PCU_Tests_RAW.ttcn: introduce TC_ta_rach_imm_ass to test initial TA The aim of this test case is to test the correctness of Timing Advance at the time of TBF establishment. In particular, the test case sends several Access Bursts (RACH.ind) with increasing 'qta' value, what causes OsmoPCU to allocate a TBF (Temporary Block Flow) for each RACH.ind and send DATA.req with Immediate Assignment on AGCH, containing the expected Timing Advance value. Change-Id: I21f76ae723519c0eb54515922a05ca8045b00ade Related: SYS#4606 --- M pcu/PCU_Tests_RAW.ttcn 1 file changed, 78 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/10/15410/10 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15410 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I21f76ae723519c0eb54515922a05ca8045b00ade Gerrit-Change-Number: 15410 Gerrit-PatchSet: 10 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in ...osmo-ttcn3-hacks[master]: library/PCUIF_CodecPort.ttcn: strip padding bytes from PCUIF_data
Hello laforge, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15571 to look at the new patch set (#2). Change subject: library/PCUIF_CodecPort.ttcn: strip padding bytes from PCUIF_data .. library/PCUIF_CodecPort.ttcn: strip padding bytes from PCUIF_data In Ieefa61232eb215a19a02e490255332e28e23b8f8, I had to revert I5808954b5c67c3239e795e43ae77035152d359ef, because that change broke encoding of messages on the PCU interface. Since we cannot use 'PADDING' attribute until its implementation is fixed in TITAN, let's work this around by stripping padding bytes manually in UD_to_PCUIF(). Change-Id: Ibd698094c897d395208e80189457444a91018beb --- M library/PCUIF_CodecPort.ttcn 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/71/15571/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15571 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibd698094c897d395208e80189457444a91018beb Gerrit-Change-Number: 15571 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset
Change in ...osmo-ttcn3-hacks[master]: PCU_Tests_RAW.ttcn: add test case for UL link quality adaptation
Hello pespin, laforge, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15526 to look at the new patch set (#3). Change subject: PCU_Tests_RAW.ttcn: add test case for UL link quality adaptation .. PCU_Tests_RAW.ttcn: add test case for UL link quality adaptation This change introduces a new test case TC_cs_lqual_ul_tbf, which is aimed to test the feedback of OsmoPCU on changing link quality measurements in Uplink Data blocks during an active TBF. Change-Id: Ia78d93e43a3c41b0b30e70df20a2da31077fd05f Related: SYS#4607 --- M library/RLCMAC_Types.ttcn M pcu/PCU_Tests_RAW.ttcn 2 files changed, 102 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/26/15526/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15526 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia78d93e43a3c41b0b30e70df20a2da31077fd05f Gerrit-Change-Number: 15526 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in ...osmo-ttcn3-hacks[master]: Introduce PCUIF, BTS and ClckGen components for RAW PCU test cases
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15430 ) Change subject: Introduce PCUIF, BTS and ClckGen components for RAW PCU test cases .. Patch Set 9: All comments should be addressed now (I hope). The main feature of this patch set is a minimalistic scheduler for the BTS component. Both DATA.ind and RTS.req messages are first stored in queues until a suitable TDMA frame-number is received fom the ClckGen_CT. This allows to send multiple DATA.ind / RTS.req messages at the same time without messing with guessing frame and block numbers. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15430 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I63a23abebab88fd5318eb4d907d6028e7c38e9a3 Gerrit-Change-Number: 15430 Gerrit-PatchSet: 9 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 25 Sep 2019 23:30:01 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Build failure of network:osmocom:nightly/osmo-trx in Debian_Testing/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 390s] ar: `u' modifier ignored since `D' is the default (see `U') [ 390s] libtool: link: ranlib .libs/libtransceiver_common.a [ 390s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 390s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 390s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 391s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 391s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 391s] collect2: error: ld returned 1 exit status [ 391s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 391s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 391s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 391s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 391s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 391s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 391s] make[1]: *** [Makefile:444: all] Error 2 [ 391s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 391s] dh_auto_build: make -j1 returned exit code 2 [ 391s] make: *** [debian/rules:6: build] Error 255 [ 391s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 391s] [ 391s] wildcard2 failed "build osmo-trx_1.1.1.28.ee2b.dsc" at Thu Sep 26 03:54:12 UTC 2019. [ 391s] [ 391s] ### VM INTERACTION START ### [ 394s] [ 368.271921] sysrq: SysRq : Power Off [ 394s] [ 368.274331] reboot: Power down [ 394s] ### VM INTERACTION END ### [ 394s] [ 394s] wildcard2 failed "build osmo-trx_1.1.1.28.ee2b.dsc" at Thu Sep 26 03:54:16 UTC 2019. [ 394s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 448s] ar: `u' modifier ignored since `D' is the default (see `U') [ 448s] libtool: link: ranlib .libs/libtransceiver_common.a [ 448s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 448s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 448s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 448s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 448s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 448s] collect2: error: ld returned 1 exit status [ 448s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 448s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 448s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 448s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 448s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 448s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 448s] make[1]: *** [Makefile:444: all] Error 2 [ 448s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 448s] dh_auto_build: make -j1 returned exit code 2 [ 448s] make: *** [debian/rules:6: build] Error 255 [ 448s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 448s] [ 448s] lamb02 failed "build osmo-trx_1.1.1.28.ee2b.dsc" at Thu Sep 26 04:21:07 UTC 2019. [ 448s] [ 448s] ### VM INTERACTION START ### [ 452s] [ 432.522175] sysrq: SysRq : Power Off [ 452s] [ 432.527517] reboot: Power down [ 452s] ### VM INTERACTION END ### [ 452s] [ 452s] lamb02 failed "build osmo-trx_1.1.1.28.ee2b.dsc" at Thu Sep 26 04:21:11 UTC 2019. [ 452s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/)