ms: Get rid of ms->delay field
Simply apply the content of the configured timer when the MS goes idle.
Having that field is convenient to do tricky stuff in unit tests, but
makes the main osmo-pcu app more complex for no good enough reason.
Change-Id: I8d44318b37b6605afd84db8ccec0d75e6db293b9
diff --git a/src/bts.cpp b/src/bts.cpp
index 4cbe68e..d4bb35f 100644
--- a/src/bts.cpp
+++ b/src/bts.cpp
@@ -241,11 +241,8 @@
static int bts_talloc_destructor(struct gprs_rlcmac_bts* bts)
{
struct GprsMs *ms;
- while ((ms = llist_first_entry_or_null(&bts->ms_list, struct GprsMs, list))) {
- ms_set_timeout(ms, 0);
- bts_stat_item_dec(bts, STAT_MS_PRESENT);
+ while ((ms = llist_first_entry_or_null(&bts->ms_list, struct GprsMs, list)))
talloc_free(ms);
- }
gprs_bssgp_destroy(bts);
diff --git a/src/gprs_ms.c b/src/gprs_ms.c
index 877422f..1450d19 100644
--- a/src/gprs_ms.c
+++ b/src/gprs_ms.c
@@ -170,8 +170,6 @@
if (!ms->ctrs)
goto free_ret;
- ms_set_timeout(ms, osmo_tdef_get(bts->pcu->T_defs, -2030, OSMO_TDEF_S, -1));
-
if (use_ref)
ms_ref(ms, use_ref);
return ms;
@@ -219,6 +217,8 @@
/* MS has no attached TBFs anymore. */
static void ms_becomes_idle(struct GprsMs *ms)
{
+ unsigned long delay_rel_sec = osmo_tdef_get(ms->bts->pcu->T_defs, -2030, OSMO_TDEF_S, -1);
+
ms_set_reserved_slots(ms, NULL, 0, 0);
ms->first_common_ts = NULL;
@@ -226,7 +226,7 @@
* Skip delaying free() through release timer if delay is configured to be 0.
* This is useful for synced freed during unit tests.
*/
- if (ms->delay == 0) {
+ if (delay_rel_sec == 0) {
talloc_free(ms);
return;
}
@@ -240,8 +240,8 @@
return;
}
- LOGPMS(ms, DMS, LOGL_INFO, "Schedule MS release in %u secs\n", ms->delay);
- osmo_timer_schedule(&ms->timer, ms->delay, 0);
+ LOGPMS(ms, DMS, LOGL_INFO, "Schedule MS release in %lu secs\n", delay_rel_sec);
+ osmo_timer_schedule(&ms->timer, delay_rel_sec, 0);
}
static void ms_becomes_active(struct GprsMs *ms)
@@ -398,9 +398,6 @@
struct llist_item *pos;
struct gprs_rlcmac_tbf *tbf;
- /* free immediately when it becomes idle: */
- ms->delay = 0;
-
tbf = ul_tbf_as_tbf(ms_ul_tbf(ms));
if (tbf && !tbf_timers_pending(tbf, T_MAX))
tbf_free(tbf);
@@ -415,7 +412,8 @@
}
/* Flag it with invalid data so that it cannot be looked up anymore and
- * shows up specially if listed in VTY: */
+ * shows up specially if listed in VTY. Furthermore, it will also trigger
+ * immediate free() when it becomes idle: */
ms->tlli = GSM_RESERVED_TMSI;
ms->new_dl_tlli = ms->tlli;
ms->new_ul_tlli = ms->tlli;
diff --git a/src/gprs_ms.h b/src/gprs_ms.h
index 03508ff..4f6456e 100644
--- a/src/gprs_ms.h
+++ b/src/gprs_ms.h
@@ -80,7 +80,6 @@
struct osmo_use_count use_count;
struct osmo_timer_list timer;
- unsigned delay;
int64_t last_cs_not_low;
@@ -216,11 +215,6 @@
return ms->mode;
}
-static inline void ms_set_timeout(struct GprsMs *ms, unsigned secs)
-{
- ms->delay = secs;
-}
-
static inline unsigned ms_nack_rate_dl(const struct GprsMs *ms)
{
return ms->nack_rate_dl;