November 2022 - gerrit-log - lists.osmocom.org

Change in osmocom-bb[master]: trxcon: group Rx burst params into struct l1sched_burst_ind

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30253 ) Change subject: trxcon: group Rx burst params into struct l1sched_burst_ind ...................................................................... trxcon: group Rx burst params into struct l1sched_burst_ind Change-Id: I3363c38a43d2f54f846527b70cedac8fa57bcb27 Related: OS#5599 --- M src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h M src/host/trxcon/src/sched_lchan_desc.c M src/host/trxcon/src/sched_lchan_pdtch.c M src/host/trxcon/src/sched_lchan_sch.c M src/host/trxcon/src/sched_lchan_tchf.c M src/host/trxcon/src/sched_lchan_tchh.c M src/host/trxcon/src/sched_lchan_xcch.c M src/host/trxcon/src/sched_trx.c M src/host/trxcon/src/trxcon_shim.c 9 files changed, 122 insertions(+), 101 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h index 31d4b64..5202e5e 100644 --- a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h +++ b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h @@ -145,9 +145,25 @@ size_t burst_len; }; +/* Represents a received burst */ +struct l1sched_burst_ind { + uint32_t fn; + uint8_t tn; + + /*! ToA256 (Timing of Arrival, 1/256 of a symbol) */ + int16_t toa256; + /*! RSSI (Received Signal Strength Indication) */ + int8_t rssi; + + /* Internally used by the scheduler */ + uint8_t bid; + + sbit_t burst[EDGE_BURST_LEN]; + size_t burst_len; +}; + typedef int l1sched_lchan_rx_func(struct l1sched_lchan_state *lchan, - uint32_t fn, uint8_t bid, const sbit_t *bits, - const struct l1sched_meas_set *meas); + const struct l1sched_burst_ind *bi); typedef int l1sched_lchan_tx_func(struct l1sched_lchan_state *lchan, struct l1sched_burst_req *br); @@ -459,9 +475,8 @@ void l1sched_prim_drop(struct l1sched_lchan_state *lchan); void l1sched_prim_flush_queue(struct llist_head *list); -int l1sched_handle_rx_burst(struct l1sched_state *sched, uint8_t tn, - uint32_t fn, sbit_t *bits, uint16_t nbits, - const struct l1sched_meas_set *meas); +int l1sched_handle_rx_burst(struct l1sched_state *sched, + struct l1sched_burst_ind *bi); /* Shared declarations for lchan handlers */ extern const uint8_t l1sched_nb_training_bits[8][26]; @@ -484,7 +499,8 @@ l1sched_tchh_block_map_fn(chan, fn, ul, 1, 0) /* Measurement history */ -void l1sched_lchan_meas_push(struct l1sched_lchan_state *lchan, const struct l1sched_meas_set *meas); +void l1sched_lchan_meas_push(struct l1sched_lchan_state *lchan, + const struct l1sched_burst_ind *bi); void l1sched_lchan_meas_avg(struct l1sched_lchan_state *lchan, unsigned int n); /* Clock and Downlink scheduling trigger */ diff --git a/src/host/trxcon/src/sched_lchan_desc.c b/src/host/trxcon/src/sched_lchan_desc.c index 54635ba..cb1a431 100644 --- a/src/host/trxcon/src/sched_lchan_desc.c +++ b/src/host/trxcon/src/sched_lchan_desc.c @@ -31,36 +31,31 @@ /* Forward declaration of handlers */ int rx_data_fn(struct l1sched_lchan_state *lchan, - uint32_t fn, uint8_t bid, const sbit_t *bits, - const struct l1sched_meas_set *meas); + const struct l1sched_burst_ind *bi); int tx_data_fn(struct l1sched_lchan_state *lchan, struct l1sched_burst_req *br); int rx_sch_fn(struct l1sched_lchan_state *lchan, - uint32_t fn, uint8_t bid, const sbit_t *bits, - const struct l1sched_meas_set *meas); + const struct l1sched_burst_ind *bi); int tx_rach_fn(struct l1sched_lchan_state *lchan, struct l1sched_burst_req *br); int rx_tchf_fn(struct l1sched_lchan_state *lchan, - uint32_t fn, uint8_t bid, const sbit_t *bits, - const struct l1sched_meas_set *meas); + const struct l1sched_burst_ind *bi); int tx_tchf_fn(struct l1sched_lchan_state *lchan, struct l1sched_burst_req *br); int rx_tchh_fn(struct l1sched_lchan_state *lchan, - uint32_t fn, uint8_t bid, const sbit_t *bits, - const struct l1sched_meas_set *meas); + const struct l1sched_burst_ind *bi); int tx_tchh_fn(struct l1sched_lchan_state *lchan, struct l1sched_burst_req *br); int rx_pdtch_fn(struct l1sched_lchan_state *lchan, - uint32_t fn, uint8_t bid, const sbit_t *bits, - const struct l1sched_meas_set *meas); + const struct l1sched_burst_ind *bi); int tx_pdtch_fn(struct l1sched_lchan_state *lchan, struct l1sched_burst_req *br); diff --git a/src/host/trxcon/src/sched_lchan_pdtch.c b/src/host/trxcon/src/sched_lchan_pdtch.c index 0ef4573..2951c86 100644 --- a/src/host/trxcon/src/sched_lchan_pdtch.c +++ b/src/host/trxcon/src/sched_lchan_pdtch.c @@ -34,8 +34,7 @@ #include <osmocom/bb/l1sched/logging.h> int rx_pdtch_fn(struct l1sched_lchan_state *lchan, - uint32_t fn, uint8_t bid, const sbit_t *bits, - const struct l1sched_meas_set *meas) + const struct l1sched_burst_ind *bi) { uint8_t l2[GPRS_L2_MAX_LEN], *mask; int n_errors, n_bits_total, rc; @@ -46,25 +45,26 @@ mask = &lchan->rx_burst_mask; buffer = lchan->rx_bursts; - LOGP_LCHAND(lchan, LOGL_DEBUG, "Packet data received: fn=%u bid=%u\n", fn, bid); + LOGP_LCHAND(lchan, LOGL_DEBUG, + "Packet data received: fn=%u bid=%u\n", bi->fn, bi->bid); /* Align to the first burst of a block */ - if (*mask == 0x00 && bid != 0) + if (*mask == 0x00 && bi->bid != 0) return 0; /* Update mask */ - *mask |= (1 << bid); + *mask |= (1 << bi->bid); /* Store the measurements */ - l1sched_lchan_meas_push(lchan, meas); + l1sched_lchan_meas_push(lchan, bi); /* Copy burst to buffer of 4 bursts */ - offset = buffer + bid * 116; - memcpy(offset, bits + 3, 58); - memcpy(offset + 58, bits + 87, 58); + offset = buffer + bi->bid * 116; + memcpy(offset, bi->burst + 3, 58); + memcpy(offset + 58, bi->burst + 87, 58); /* Wait until complete set of bursts */ - if (bid != 3) + if (bi->bid != 3) return 0; /* Calculate AVG of the measurements */ diff --git a/src/host/trxcon/src/sched_lchan_sch.c b/src/host/trxcon/src/sched_lchan_sch.c index d943ae8..de665cb 100644 --- a/src/host/trxcon/src/sched_lchan_sch.c +++ b/src/host/trxcon/src/sched_lchan_sch.c @@ -62,8 +62,7 @@ } int rx_sch_fn(struct l1sched_lchan_state *lchan, - uint32_t fn, uint8_t bid, const sbit_t *bits, - const struct l1sched_meas_set *meas) + const struct l1sched_burst_ind *bi) { sbit_t payload[2 * 39]; struct gsm_time time; @@ -72,13 +71,14 @@ int rc; /* Obtain payload from burst */ - memcpy(payload, bits + 3, 39); - memcpy(payload + 39, bits + 3 + 39 + 64, 39); + memcpy(payload, bi->burst + 3, 39); + memcpy(payload + 39, bi->burst + 3 + 39 + 64, 39); /* Attempt to decode */ rc = gsm0503_sch_decode(sb_info, payload); if (rc) { - LOGP_LCHAND(lchan, LOGL_ERROR, "Received bad SCH burst at fn=%u\n", fn); + LOGP_LCHAND(lchan, LOGL_ERROR, + "Received bad SCH burst at fn=%u\n", bi->fn); return rc; } @@ -87,13 +87,13 @@ LOGP_LCHAND(lchan, LOGL_DEBUG, "Received SCH: bsic=%u, fn=%u, sched_fn=%u\n", - bsic, time.fn, fn); + bsic, time.fn, bi->fn); /* Check if decoded frame number matches */ - if (time.fn != fn) { + if (time.fn != bi->fn) { LOGP_LCHAND(lchan, LOGL_ERROR, "Decoded fn=%u does not match sched_fn=%u\n", - time.fn, fn); + time.fn, bi->fn); return -EINVAL; } diff --git a/src/host/trxcon/src/sched_lchan_tchf.c b/src/host/trxcon/src/sched_lchan_tchf.c index ec87220..eed1c8a 100644 --- a/src/host/trxcon/src/sched_lchan_tchf.c +++ b/src/host/trxcon/src/sched_lchan_tchf.c @@ -58,8 +58,7 @@ }; int rx_tchf_fn(struct l1sched_lchan_state *lchan, - uint32_t fn, uint8_t bid, const sbit_t *bits, - const struct l1sched_meas_set *meas) + const struct l1sched_burst_ind *bi) { int n_errors = -1, n_bits_total = 0, rc; sbit_t *buffer, *offset; @@ -73,25 +72,26 @@ mask = &lchan->rx_burst_mask; buffer = lchan->rx_bursts; - LOGP_LCHAND(lchan, LOGL_DEBUG, "Traffic received: fn=%u bid=%u\n", fn, bid); + LOGP_LCHAND(lchan, LOGL_DEBUG, + "Traffic received: fn=%u bid=%u\n", bi->fn, bi->bid); /* Align to the first burst of a block */ - if (*mask == 0x00 && bid != 0) + if (*mask == 0x00 && bi->bid != 0) return 0; /* Update mask */ - *mask |= (1 << bid); + *mask |= (1 << bi->bid); /* Store the measurements */ - l1sched_lchan_meas_push(lchan, meas); + l1sched_lchan_meas_push(lchan, bi); /* Copy burst to end of buffer of 8 bursts */ - offset = buffer + bid * 116 + 464; - memcpy(offset, bits + 3, 58); - memcpy(offset + 58, bits + 87, 58); + offset = buffer + bi->bid * 116 + 464; + memcpy(offset, bi->burst + 3, 58); + memcpy(offset + 58, bi->burst + 87, 58); /* Wait until complete set of bursts */ - if (bid != 3) + if (bi->bid != 3) return 0; /* Calculate AVG of the measurements */ @@ -126,7 +126,7 @@ * the first FN 0,8,17 defines that CMR/CMC is included in frame. * NOTE: A frame ends 7 FN after start. */ - amr_is_cmr = !sched_tchf_dl_amr_cmi_map[fn % 26]; + amr_is_cmr = !sched_tchf_dl_amr_cmi_map[bi->fn % 26]; /* we store tch_data + 2 header bytes, the amr variable set to * 2 will allow us to skip the first 2 bytes in case we did diff --git a/src/host/trxcon/src/sched_lchan_tchh.c b/src/host/trxcon/src/sched_lchan_tchh.c index be59010..963b2d4 100644 --- a/src/host/trxcon/src/sched_lchan_tchh.c +++ b/src/host/trxcon/src/sched_lchan_tchh.c @@ -235,8 +235,7 @@ } int rx_tchh_fn(struct l1sched_lchan_state *lchan, - uint32_t fn, uint8_t bid, const sbit_t *bits, - const struct l1sched_meas_set *meas) + const struct l1sched_burst_ind *bi) { int n_errors = -1, n_bits_total = 0, rc; sbit_t *buffer, *offset; @@ -250,36 +249,37 @@ mask = &lchan->rx_burst_mask; buffer = lchan->rx_bursts; - LOGP_LCHAND(lchan, LOGL_DEBUG, "Traffic received: fn=%u bid=%u\n", fn, bid); + LOGP_LCHAND(lchan, LOGL_DEBUG, + "Traffic received: fn=%u bid=%u\n", bi->fn, bi->bid); if (*mask == 0x00) { /* Align to the first burst */ - if (bid > 0) + if (bi->bid > 0) return 0; /* Align reception of the first FACCH/H frame */ if (lchan->tch_mode == GSM48_CMODE_SIGN) { - if (!l1sched_tchh_facch_start(lchan->type, fn, 0)) + if (!l1sched_tchh_facch_start(lchan->type, bi->fn, 0)) return 0; } else { /* or TCH/H traffic frame */ - if (!l1sched_tchh_traffic_start(lchan->type, fn, 0)) + if (!l1sched_tchh_traffic_start(lchan->type, bi->fn, 0)) return 0; } } /* Update mask */ - *mask |= (1 << bid); + *mask |= (1 << bi->bid); /* Store the measurements */ - l1sched_lchan_meas_push(lchan, meas); + l1sched_lchan_meas_push(lchan, bi); /* Copy burst to the end of buffer of 6 bursts */ - offset = buffer + bid * 116 + 464; - memcpy(offset, bits + 3, 58); - memcpy(offset + 58, bits + 87, 58); + offset = buffer + bi->bid * 116 + 464; + memcpy(offset, bi->burst + 3, 58); + memcpy(offset + 58, bi->burst + 87, 58); /* Wait until the second burst */ - if (bid != 1) + if (bi->bid != 1) return 0; /* Wait for complete set of bursts */ @@ -303,19 +303,19 @@ case GSM48_CMODE_SIGN: case GSM48_CMODE_SPEECH_V1: /* HR */ rc = gsm0503_tch_hr_decode(l2, buffer, - !l1sched_tchh_facch_end(lchan->type, fn, 0), + !l1sched_tchh_facch_end(lchan->type, bi->fn, 0), &n_errors, &n_bits_total); break; case GSM48_CMODE_SPEECH_AMR: /* AMR */ /* the first FN FN 4,13,21 or 5,14,22 defines that CMI is * included in frame, the first FN FN 0,8,17 or 1,9,18 defines * that CMR/CMC is included in frame. */ - fn_is_cmi = sched_tchh_dl_amr_cmi_map[fn % 26]; + fn_is_cmi = sched_tchh_dl_amr_cmi_map[bi->fn % 26]; /* See comment in function rx_tchf_fn() */ amr = 2; rc = gsm0503_tch_ahs_decode_dtx(l2 + amr, buffer, - !sched_tchh_dl_facch_map[fn % 26], + !sched_tchh_dl_facch_map[bi->fn % 26], !fn_is_cmi, lchan->amr.codec, lchan->amr.codecs, &lchan->amr.dl_ft, &lchan->amr.dl_cmr, &n_errors, &n_bits_total, &lchan->amr.last_dtx); @@ -398,7 +398,7 @@ /* Didn't try to decode, fake measurements */ if (n_errors < 0) { lchan->meas_avg = (struct l1sched_meas_set) { - .fn = tchh_block_dl_first_fn(lchan, fn, false), + .fn = tchh_block_dl_first_fn(lchan, bi->fn, false), .toa256 = 0, .rssi = -110, }; diff --git a/src/host/trxcon/src/sched_lchan_xcch.c b/src/host/trxcon/src/sched_lchan_xcch.c index 0d24866..aff4220 100644 --- a/src/host/trxcon/src/sched_lchan_xcch.c +++ b/src/host/trxcon/src/sched_lchan_xcch.c @@ -34,8 +34,7 @@ #include <osmocom/bb/l1sched/logging.h> int rx_data_fn(struct l1sched_lchan_state *lchan, - uint32_t fn, uint8_t bid, const sbit_t *bits, - const struct l1sched_meas_set *meas) + const struct l1sched_burst_ind *bi) { uint8_t l2[GSM_MACBLOCK_LEN], *mask; int n_errors, n_bits_total, rc; @@ -45,25 +44,26 @@ mask = &lchan->rx_burst_mask; buffer = lchan->rx_bursts; - LOGP_LCHAND(lchan, LOGL_DEBUG, "Data received: fn=%u bid=%u\n", fn, bid); + LOGP_LCHAND(lchan, LOGL_DEBUG, + "Data received: fn=%u bid=%u\n", bi->fn, bi->bid); /* Align to the first burst of a block */ - if (*mask == 0x00 && bid != 0) + if (*mask == 0x00 && bi->bid != 0) return 0; /* Update mask */ - *mask |= (1 << bid); + *mask |= (1 << bi->bid); /* Store the measurements */ - l1sched_lchan_meas_push(lchan, meas); + l1sched_lchan_meas_push(lchan, bi); /* Copy burst to buffer of 4 bursts */ - offset = buffer + bid * 116; - memcpy(offset, bits + 3, 58); - memcpy(offset + 58, bits + 87, 58); + offset = buffer + bi->bid * 116; + memcpy(offset, bi->burst + 3, 58); + memcpy(offset + 58, bi->burst + 87, 58); /* Wait until complete set of bursts */ - if (bid != 3) + if (bi->bid != 3) return 0; /* Calculate AVG of the measurements */ diff --git a/src/host/trxcon/src/sched_trx.c b/src/host/trxcon/src/sched_trx.c index 92f8bf2..b7d7854 100644 --- a/src/host/trxcon/src/sched_trx.c +++ b/src/host/trxcon/src/sched_trx.c @@ -703,27 +703,29 @@ return -EIO; } - static const sbit_t bits[148] = { 0 }; - struct l1sched_meas_set fake_meas = { + struct l1sched_burst_ind bi = { .fn = lchan->tdma.last_proc, - .rssi = -120, + .tn = lchan->ts->index, .toa256 = 0, + .rssi = -120, + .burst = { 0 }, + .burst_len = GSM_BURST_LEN, }; /* Traverse from fp till the current frame */ for (i = 0; i < elapsed - 1; i++) { - fp = &mf->frames[GSM_TDMA_FN_INC(fake_meas.fn) % mf->period]; + fp = &mf->frames[GSM_TDMA_FN_INC(bi.fn) % mf->period]; if (fp->dl_chan != lchan->type) continue; LOGP_LCHANC(lchan, LOGL_NOTICE, - "Substituting lost TDMA frame fn=%u\n", - fake_meas.fn); + "Substituting lost TDMA frame fn=%u\n", bi.fn); - handler(lchan, fake_meas.fn, fp->dl_bid, bits, &fake_meas); + bi.bid = fp->dl_bid; + handler(lchan, &bi); /* Update TDMA frame statistics */ - lchan->tdma.last_proc = fake_meas.fn; + lchan->tdma.last_proc = bi.fn; lchan->tdma.num_proc++; lchan->tdma.num_lost++; } @@ -731,33 +733,31 @@ return 0; } -int l1sched_handle_rx_burst(struct l1sched_state *sched, uint8_t tn, - uint32_t fn, sbit_t *bits, uint16_t nbits, - const struct l1sched_meas_set *meas) +int l1sched_handle_rx_burst(struct l1sched_state *sched, + struct l1sched_burst_ind *bi) { struct l1sched_lchan_state *lchan; const struct l1sched_tdma_frame *frame; - struct l1sched_ts *ts; + struct l1sched_ts *ts = sched->ts[bi->tn]; l1sched_lchan_rx_func *handler; enum l1sched_lchan_type chan; - uint8_t offset, bid; + uint8_t offset; int rc; /* Check whether required timeslot is allocated and configured */ - ts = sched->ts[tn]; if (ts == NULL || ts->mf_layout == NULL) { LOGP_SCHEDD(sched, LOGL_DEBUG, - "Timeslot #%u isn't configured, ignoring burst...\n", tn); + "Timeslot #%u isn't configured, ignoring burst...\n", bi->tn); return -EINVAL; } /* Get frame from multiframe */ - offset = fn % ts->mf_layout->period; + offset = bi->fn % ts->mf_layout->period; frame = ts->mf_layout->frames + offset; /* Get required info from frame */ - bid = frame->dl_bid; + bi->bid = frame->dl_bid; chan = frame->dl_chan; handler = l1sched_lchan_desc[chan].rx_fn; @@ -776,19 +776,19 @@ return 0; /* Compensate lost TDMA frames (if any) */ - rc = subst_frame_loss(lchan, handler, fn); + rc = subst_frame_loss(lchan, handler, bi->fn); if (rc == -EALREADY) return rc; /* Perform A5/X decryption if required */ if (lchan->a5.algo) - l1sched_a5_burst_dec(lchan, fn, bits); + l1sched_a5_burst_dec(lchan, bi->fn, &bi->burst[0]); /* Put burst to handler */ - handler(lchan, fn, bid, bits, meas); + handler(lchan, bi); /* Update TDMA frame statistics */ - lchan->tdma.last_proc = fn; + lchan->tdma.last_proc = bi->fn; if (++lchan->tdma.num_proc == 0) { /* Theoretically, we may have an integer overflow of num_proc counter. @@ -810,7 +810,8 @@ (MEAS_HIST_FIRST(hist) + ARRAY_SIZE(hist->buf) - 1) /* Add a new set of measurements to the history */ -void l1sched_lchan_meas_push(struct l1sched_lchan_state *lchan, const struct l1sched_meas_set *meas) +void l1sched_lchan_meas_push(struct l1sched_lchan_state *lchan, + const struct l1sched_burst_ind *bi) { struct l1sched_lchan_meas_hist *hist = &lchan->meas_hist; @@ -820,7 +821,11 @@ else hist->head++; - *hist->head = *meas; + *hist->head = (struct l1sched_meas_set) { + .fn = bi->fn, + .toa256 = bi->toa256, + .rssi = bi->rssi, + }; } /* Calculate the AVG of n measurements from the history */ diff --git a/src/host/trxcon/src/trxcon_shim.c b/src/host/trxcon/src/trxcon_shim.c index 5329539..ee51036 100644 --- a/src/host/trxcon/src/trxcon_shim.c +++ b/src/host/trxcon/src/trxcon_shim.c @@ -220,18 +220,23 @@ } /* External L1 API for the PHYIF */ -int trxcon_phyif_handle_burst_ind(void *priv, const struct trxcon_phyif_burst_ind *bi) +int trxcon_phyif_handle_burst_ind(void *priv, const struct trxcon_phyif_burst_ind *phybi) { struct trxcon_inst *trxcon = priv; - const struct l1sched_meas_set meas = { - .fn = bi->fn, - .toa256 = bi->toa256, - .rssi = bi->rssi, + struct l1sched_burst_ind bi = { + .fn = phybi->fn, + .tn = phybi->tn, + .toa256 = phybi->toa256, + .rssi = phybi->rssi, + /* .burst[] is populated below */ + .burst_len = phybi->burst_len, }; + OSMO_ASSERT(phybi->burst_len <= sizeof(bi.burst)); + memcpy(&bi.burst[0], phybi->burst, phybi->burst_len); + /* Poke scheduler */ - return l1sched_handle_rx_burst(trxcon->sched, bi->tn, bi->fn, - bi->burst, bi->burst_len, &meas); + return l1sched_handle_rx_burst(trxcon->sched, &bi); } int trxcon_phyif_handle_clock_ind(void *priv, uint32_t fn) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30253 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3363c38a43d2f54f846527b70cedac8fa57bcb27 Gerrit-Change-Number: 30253 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: group Rx burst params into struct l1sched_burst_ind

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30253 ) Change subject: trxcon: group Rx burst params into struct l1sched_burst_ind ...................................................................... Patch Set 4: Code-Review+2 (1 comment) Patchset: PS4: Re-applying CR+2 after rebasing. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30253 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3363c38a43d2f54f846527b70cedac8fa57bcb27 Gerrit-Change-Number: 30253 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 23 Nov 2022 10:44:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmo-bsc[master]: tests/handover: move some functions to test/common

by osmith

osmith has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30271 ) Change subject: tests/handover: move some functions to test/common ...................................................................... Abandoned see Harald's comment in following patch -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3df5b26ea3a6da1c1e125e07119a91c7458c6758 Gerrit-Change-Number: 30271 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: abandon

2 years, 7 months

1
0
0 0

Change in osmo-bsc[master]: lchan: try to recover from ST_BORKEN after timeout

by osmith

osmith has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30252 ) Change subject: lchan: try to recover from ST_BORKEN after timeout ...................................................................... Abandoned see Harald's comment -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30252 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic4728b3efe843ea63e2a0b54b1ea8a925347484a Gerrit-Change-Number: 30252 Gerrit-PatchSet: 5 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: abandon

2 years, 7 months

1
0
0 0

Change in osmo-bsc[master]: Cosmetic: fix spaces around timers

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30270 ) Change subject: Cosmetic: fix spaces around timers ...................................................................... Cosmetic: fix spaces around timers Use spaces around equals signs inside structs, as expected from the kernel coding style we mostly follow. Neels wrote: > IIUC "T=123" without spaces is my personal favorite that goes against > the accepted linter standard, i guess rather than everyone else > adapting to my weird style, i should start adding spaces in my > patches. Change-Id: I01ce986a1b0cdd74d945a04ae62a07f2850d366f --- M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/lchan_rtp_fsm.c M src/osmo-bsc/net_init.c M tests/nanobts_omlattr/nanobts_omlattr_test.c 5 files changed, 54 insertions(+), 54 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index fff7e59..f00b26d 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -51,10 +51,10 @@ } static const struct osmo_tdef_state_timeout assignment_fsm_timeouts[32] = { - [ASSIGNMENT_ST_WAIT_LCHAN_ACTIVE] = { .T=10 }, - [ASSIGNMENT_ST_WAIT_RR_ASS_COMPLETE] = { .keep_timer=true }, - [ASSIGNMENT_ST_WAIT_LCHAN_ESTABLISHED] = { .keep_timer=true }, - [ASSIGNMENT_ST_WAIT_MGW_ENDPOINT_TO_MSC] = { .T=23042 }, + [ASSIGNMENT_ST_WAIT_LCHAN_ACTIVE] = { .T = 10 }, + [ASSIGNMENT_ST_WAIT_RR_ASS_COMPLETE] = { .keep_timer = true }, + [ASSIGNMENT_ST_WAIT_LCHAN_ESTABLISHED] = { .keep_timer = true }, + [ASSIGNMENT_ST_WAIT_MGW_ENDPOINT_TO_MSC] = { .T = 23042 }, }; /* Transition to a state, using the T timer defined in assignment_fsm_timeouts. diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 21b38d2..ab3fbdd 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -282,15 +282,15 @@ } struct osmo_tdef_state_timeout lchan_fsm_timeouts[32] = { - [LCHAN_ST_WAIT_TS_READY] = { .T=-5 }, - [LCHAN_ST_WAIT_ACTIV_ACK] = { .T=-6 }, - [LCHAN_ST_WAIT_RLL_RTP_ESTABLISH] = { .T=3101 }, - [LCHAN_ST_WAIT_RLL_RTP_RELEASED] = { .T=3109 }, - [LCHAN_ST_WAIT_BEFORE_RF_RELEASE] = { .T=3111 }, - [LCHAN_ST_WAIT_RF_RELEASE_ACK] = { .T=3111 }, - [LCHAN_ST_WAIT_AFTER_ERROR] = { .T=-3111 }, - [LCHAN_ST_WAIT_RR_CHAN_MODE_MODIFY_ACK] = { .T=-13 }, - [LCHAN_ST_WAIT_RSL_CHAN_MODE_MODIFY_ACK] = { .T=-14 }, + [LCHAN_ST_WAIT_TS_READY] = { .T = -5 }, + [LCHAN_ST_WAIT_ACTIV_ACK] = { .T = -6 }, + [LCHAN_ST_WAIT_RLL_RTP_ESTABLISH] = { .T = 3101 }, + [LCHAN_ST_WAIT_RLL_RTP_RELEASED] = { .T = 3109 }, + [LCHAN_ST_WAIT_BEFORE_RF_RELEASE] = { .T = 3111 }, + [LCHAN_ST_WAIT_RF_RELEASE_ACK] = { .T = 3111 }, + [LCHAN_ST_WAIT_AFTER_ERROR] = { .T = -3111 }, + [LCHAN_ST_WAIT_RR_CHAN_MODE_MODIFY_ACK] = { .T = -13 }, + [LCHAN_ST_WAIT_RSL_CHAN_MODE_MODIFY_ACK] = { .T = -14 }, }; /* Transition to a state, using the T timer defined in lchan_fsm_timeouts. diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c index 0791619..8b61f1e 100644 --- a/src/osmo-bsc/lchan_rtp_fsm.c +++ b/src/osmo-bsc/lchan_rtp_fsm.c @@ -44,10 +44,10 @@ } struct osmo_tdef_state_timeout lchan_rtp_fsm_timeouts[32] = { - [LCHAN_RTP_ST_WAIT_MGW_ENDPOINT_AVAILABLE] = { .T=-9 }, - [LCHAN_RTP_ST_WAIT_IPACC_CRCX_ACK] = { .T=-7 }, - [LCHAN_RTP_ST_WAIT_IPACC_MDCX_ACK] = { .T=-8 }, - [LCHAN_RTP_ST_WAIT_MGW_ENDPOINT_CONFIGURED] = { .T=-10 }, + [LCHAN_RTP_ST_WAIT_MGW_ENDPOINT_AVAILABLE] = { .T = -9 }, + [LCHAN_RTP_ST_WAIT_IPACC_CRCX_ACK] = { .T = -7 }, + [LCHAN_RTP_ST_WAIT_IPACC_MDCX_ACK] = { .T = -8 }, + [LCHAN_RTP_ST_WAIT_MGW_ENDPOINT_CONFIGURED] = { .T = -10 }, }; /* Transition to a state, using the T timer defined in lchan_rtp_fsm_timeouts. diff --git a/src/osmo-bsc/net_init.c b/src/osmo-bsc/net_init.c index 8f2b26c..ad2f9bf 100644 --- a/src/osmo-bsc/net_init.c +++ b/src/osmo-bsc/net_init.c @@ -28,36 +28,36 @@ #include <osmocom/bsc/bts_setup_ramp.h> static struct osmo_tdef gsm_network_T_defs[] = { - { .T=4, .default_val=5, .desc="Timeout to receive BSSMAP RESET ACKNOWLEDGE from the MSC" }, - { .T=7, .default_val=10, .desc="inter-BSC/MSC Handover outgoing, BSSMAP HO Required to HO Command timeout" }, - { .T=8, .default_val=10, .desc="inter-BSC/MSC Handover outgoing, BSSMAP HO Command to final Clear timeout" }, - { .T=10, .default_val=6, .desc="RR Assignment" }, - { .T=101, .default_val=10, .desc="inter-BSC/MSC Handover incoming, BSSMAP HO Request to HO Accept" }, - { .T=3101, .default_val=3, .desc="RR Immediate Assignment" }, - { .T=3103, .default_val=5, .desc="Handover" }, - { .T=3105, .default_val=100, .unit=OSMO_TDEF_MS, .desc="Physical Information" }, - { .T=3107, .default_val=5, .desc="(unused)" }, - { .T=3109, .default_val=5, .desc="RSL SACCH deactivation" }, - { .T=3111, .default_val=2, .desc="Wait time before RSL RF Channel Release" }, - { .T=3113, .default_val=7, .desc="Paging"}, - { .T=3115, .default_val=10, .desc="(unused)" }, - { .T=3117, .default_val=10, .desc="(unused)" }, - { .T=3119, .default_val=10, .desc="(unused)" }, - { .T=3122, .default_val=GSM_T3122_DEFAULT, .desc="Wait time after RR Immediate Assignment Reject" }, - { .T=3141, .default_val=10, .desc="(unused)" }, - { .T=3212, .default_val=5, .unit=OSMO_TDEF_CUSTOM, - .desc="Periodic Location Update timer, sent to MS (1 = 6 minutes)" }, - { .T=-4, .default_val=60, .desc="After Clear Request, wait for MSC to Clear Command (sanity)" }, - { .T=-5, .default_val=5, .desc="Timeout to switch dynamic timeslot PCHAN modes"}, - { .T=-6, .default_val=5, .desc="Timeout for RSL Channel Activate ACK after sending RSL Channel Activate" }, - { .T=-7, .default_val=5, .desc="Timeout for RSL IPA CRCX ACK after sending RSL IPA CRCX" }, - { .T=-8, .default_val=5, .desc="Timeout for RSL IPA MDCX ACK after sending RSL IPA MDCX" }, - { .T=-9, .default_val=5, .desc="Timeout for availability of MGW endpoint" }, - { .T=-10, .default_val=5, .desc="Timeout for fully configured MGW endpoint" }, - { .T=-11, .default_val=5, .desc="Timeout for Perform Location Response from SMLC" }, - { .T=-12, .default_val=5, .desc="Timeout for obtaining TA after BSSLAP TA Request" }, - { .T=-13, .default_val=5, .desc="Timeout for RR Channel Mode Modify ACK (BSC <-> MS)" }, - { .T=-14, .default_val=5, .desc="Timeout for RSL Channel Mode Modify ACK (BSC <-> BTS)" }, + { .T = 4, .default_val = 5, .desc = "Timeout to receive BSSMAP RESET ACKNOWLEDGE from the MSC" }, + { .T = 7, .default_val = 10, .desc = "inter-BSC/MSC Handover outgoing, BSSMAP HO Required to HO Command timeout" }, + { .T = 8, .default_val = 10, .desc = "inter-BSC/MSC Handover outgoing, BSSMAP HO Command to final Clear timeout" }, + { .T = 10, .default_val = 6, .desc = "RR Assignment" }, + { .T = 101, .default_val = 10, .desc = "inter-BSC/MSC Handover incoming, BSSMAP HO Request to HO Accept" }, + { .T = 3101, .default_val = 3, .desc = "RR Immediate Assignment" }, + { .T = 3103, .default_val = 5, .desc = "Handover" }, + { .T = 3105, .default_val = 100, .unit = OSMO_TDEF_MS, .desc = "Physical Information" }, + { .T = 3107, .default_val = 5, .desc = "(unused)" }, + { .T = 3109, .default_val = 5, .desc = "RSL SACCH deactivation" }, + { .T = 3111, .default_val = 2, .desc = "Wait time before RSL RF Channel Release" }, + { .T = 3113, .default_val = 7, .desc = "Paging"}, + { .T = 3115, .default_val = 10, .desc = "(unused)" }, + { .T = 3117, .default_val = 10, .desc = "(unused)" }, + { .T = 3119, .default_val = 10, .desc = "(unused)" }, + { .T = 3122, .default_val = GSM_T3122_DEFAULT, .desc = "Wait time after RR Immediate Assignment Reject" }, + { .T = 3141, .default_val = 10, .desc = "(unused)" }, + { .T = 3212, .default_val = 5, .unit = OSMO_TDEF_CUSTOM, + .desc = "Periodic Location Update timer, sent to MS (1 = 6 minutes)" }, + { .T = -4, .default_val = 60, .desc = "After Clear Request, wait for MSC to Clear Command (sanity)" }, + { .T = -5, .default_val = 5, .desc = "Timeout to switch dynamic timeslot PCHAN modes"}, + { .T = -6, .default_val = 5, .desc = "Timeout for RSL Channel Activate ACK after sending RSL Channel Activate" }, + { .T = -7, .default_val = 5, .desc = "Timeout for RSL IPA CRCX ACK after sending RSL IPA CRCX" }, + { .T = -8, .default_val = 5, .desc = "Timeout for RSL IPA MDCX ACK after sending RSL IPA MDCX" }, + { .T = -9, .default_val = 5, .desc = "Timeout for availability of MGW endpoint" }, + { .T = -10, .default_val = 5, .desc = "Timeout for fully configured MGW endpoint" }, + { .T = -11, .default_val = 5, .desc = "Timeout for Perform Location Response from SMLC" }, + { .T = -12, .default_val = 5, .desc = "Timeout for obtaining TA after BSSLAP TA Request" }, + { .T = -13, .default_val = 5, .desc = "Timeout for RR Channel Mode Modify ACK (BSC <-> MS)" }, + { .T = -14, .default_val = 5, .desc = "Timeout for RSL Channel Mode Modify ACK (BSC <-> BTS)" }, { .T = -16, .default_val = 1000, .unit = OSMO_TDEF_MS, .desc = "Granularity for all_allocated:* rate counters: amount of milliseconds that one counter increment" " represents. See also X17, X18" }, @@ -72,14 +72,14 @@ .desc = "Forget-sum period for all_allocated:* rate counters:" " after this amount of idle time, forget internally cumulated time remainders. Zero to always" " keep remainders. See also X16, X17." }, - { .T=-25, .default_val=5, .desc="Timeout for initial user data after an MSC initiated an SCCP connection to the BSS" }, - { .T=-3111, .default_val=4, .desc="Wait time after lchan was released in error (should be T3111 + 2s)" }, - { .T=-3210, .default_val=20, .desc="After L3 Complete, wait for MSC to confirm" }, + { .T = -25, .default_val = 5, .desc = "Timeout for initial user data after an MSC initiated an SCCP connection to the BSS" }, + { .T = -3111, .default_val = 4, .desc = "Wait time after lchan was released in error (should be T3111 + 2s)" }, + { .T = -3210, .default_val = 20, .desc = "After L3 Complete, wait for MSC to confirm" }, {} }; struct osmo_tdef g_mgw_tdefs[] = { - { .T=-2427, .default_val=5, .desc="timeout for MGCP response from MGW" }, + { .T = -2427, .default_val = 5, .desc = "timeout for MGCP response from MGW" }, {} }; diff --git a/tests/nanobts_omlattr/nanobts_omlattr_test.c b/tests/nanobts_omlattr/nanobts_omlattr_test.c index 83b6c5e..bccd99e 100644 --- a/tests/nanobts_omlattr/nanobts_omlattr_test.c +++ b/tests/nanobts_omlattr/nanobts_omlattr_test.c @@ -125,9 +125,9 @@ }; static struct osmo_tdef gsm_network_T_defs[] = { - { .T=3105, .default_val=100, .val=13, .unit=OSMO_TDEF_MS, .desc="Physical Information" }, - { .T=3212, .default_val=5, .unit=OSMO_TDEF_CUSTOM, - .desc="Periodic Location Update timer, sent to MS (1 = 6 minutes)" }, + { .T = 3105, .default_val = 100, .val = 13, .unit = OSMO_TDEF_MS, .desc = "Physical Information" }, + { .T = 3212, .default_val = 5, .unit = OSMO_TDEF_CUSTOM, + .desc = "Periodic Location Update timer, sent to MS (1 = 6 minutes)" }, {} }; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30270 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I01ce986a1b0cdd74d945a04ae62a07f2850d366f Gerrit-Change-Number: 30270 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

Change in osmo-bsc[master]: lchan_fsm: fix lchan_fsm_on_error size

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30269 ) Change subject: lchan_fsm: fix lchan_fsm_on_error size ...................................................................... lchan_fsm: fix lchan_fsm_on_error size Set it to 32, because osmo_fsm allows 32 states. Change-Id: I62f5e0f380513c52ea6932b270cf0c852930eb9f --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 2931f8f..21b38d2 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -324,7 +324,7 @@ } while (0) /* Which state to transition to when lchan_fail() is called in a given state. */ -uint32_t lchan_fsm_on_error[34] = { +uint32_t lchan_fsm_on_error[32] = { [LCHAN_ST_UNUSED] = LCHAN_ST_UNUSED, [LCHAN_ST_WAIT_TS_READY] = LCHAN_ST_UNUSED, [LCHAN_ST_WAIT_ACTIV_ACK] = LCHAN_ST_BORKEN, -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30269 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I62f5e0f380513c52ea6932b270cf0c852930eb9f Gerrit-Change-Number: 30269 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

Change in osmo-bsc[master]: Cosmetic: lchan_fsm: drop obsolete comment

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30268 ) Change subject: Cosmetic: lchan_fsm: drop obsolete comment ...................................................................... Cosmetic: lchan_fsm: drop obsolete comment Neels wrote: > i guess we can drop this comment now, it is a remnant from separating > osmo-nitb -> osmo-bsc + osmo-ms Change-Id: I2ce4d691715c1ea5c7c7896693a03b0aefbdb5b9 --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 0 insertions(+), 10 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index b1cef5d..2931f8f 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -1530,16 +1530,6 @@ lchan->release.rsl_error_cause = RSL_ERR_INTERWORKING; lchan->release.rr_cause = bsc_gsm48_rr_cause_from_rsl_cause(lchan->release.rsl_error_cause); lchan_fsm_state_chg(LCHAN_ST_WAIT_AFTER_ERROR); - /* TODO: we used to do this only for sysmobts: - int do_free = is_osmobts(ts->trx->bts); - LOGP(DRSL, LOGL_NOTICE, - "%s CHAN REL ACK for broken channel. %s.\n", - gsm_lchan_name(lchan), - do_free ? "Releasing it" : "Keeping it broken"); - if (do_free) - do_lchan_free(lchan); - * Clarify the reason. If a BTS sends a RF Chan Rel ACK, we can consider it released, - * independently from the BTS model, right?? */ return; case LCHAN_EV_RTP_RELEASED: -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30268 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2ce4d691715c1ea5c7c7896693a03b0aefbdb5b9 Gerrit-Change-Number: 30268 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

Change in osmo-bsc[master]: Cosmetic: lchan_fsm: drop obsolete comment

by osmith

Attention is currently required from: neels. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30268 ) Change subject: Cosmetic: lchan_fsm: drop obsolete comment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30268 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2ce4d691715c1ea5c7c7896693a03b0aefbdb5b9 Gerrit-Change-Number: 30268 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Wed, 23 Nov 2022 10:18:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmo-ci[master]: obs/srcpkg: open5gs: download all subprojects

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30263 ) Change subject: obs/srcpkg: open5gs: download all subprojects ...................................................................... obs/srcpkg: open5gs: download all subprojects With recent changes in open5gs, building the source packages we generated fails: [ 45s] ../lib/metrics/meson.build:52:4: ERROR: Automatic wrap-based subproject downloading is disabled [ 45s] dh_auto_configure: error: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 meson .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/x86_64-linux-gnu --libexecdir=lib/x86_64-linux-gnu returned exit code 1 Fix this by downloading all subprojects. This is now possible as I added a meson.build file to the prometheus-client-c repository that open5gs uses: https://github.com/open5gs/prometheus-client-c/pull/2 Change-Id: If3910b520382b177a77b216c93771ea88414723d --- M scripts/obs/lib/srcpkg.py 1 file changed, 3 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/scripts/obs/lib/srcpkg.py b/scripts/obs/lib/srcpkg.py index b37b8b3..e888ffa 100644 --- a/scripts/obs/lib/srcpkg.py +++ b/scripts/obs/lib/srcpkg.py @@ -105,10 +105,9 @@ def prepare_project_open5gs(): - """ Build fails without downloading freeDiameter sources. Also we can't - just update all subprojects because it would fail with 'Subproject - exists but has no meson.build file' for promethous-client-c. """ - lib.run_cmd(["meson", "subprojects", "download", "freeDiameter"], + """ Download the subproject sources here, so the package can be built in + OBS without Internet access. """ + lib.run_cmd(["meson", "subprojects", "download"], cwd=lib.git.get_repo_path("open5gs")) -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30263 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If3910b520382b177a77b216c93771ea88414723d Gerrit-Change-Number: 30263 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

Change in osmo-ci[master]: obs/srcpkg: open5gs: download all subprojects

by osmith

Attention is currently required from: daniel. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30263 ) Change subject: obs/srcpkg: open5gs: download all subprojects ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30263 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If3910b520382b177a77b216c93771ea88414723d Gerrit-Change-Number: 30263 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Wed, 23 Nov 2022 10:17:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2022