aboutsummaryrefslogtreecommitdiffstats
path: root/src/bts.cpp
diff options
context:
space:
mode:
authorMax <msuraev@sysmocom.de>2019-03-18 15:48:38 +0100
committerMax <msuraev@sysmocom.de>2019-03-19 15:42:10 +0000
commitd5ffeb5e63eb223852a577b8f9a3c89bf0809fb3 (patch)
treeda05a2e642d69ca9683ffee45156f58c36919d8f /src/bts.cpp
parentf4d3973688a0d07cadb9e1f3529712b5e50624ea (diff)
Explicitly clean up BTS singleton
Add method to explicitly cleanup BTS singleton similar to GprsMsStorage class and use it from main(). The destructor becomes trivial wrapper around cleanup() method. This prevents annoying SIGABRT on exit of OsmoPCU caused by rate_ctr_group_free() being called after talloc_free() which removes the context in which counter group is allocated. Change-Id: I796d56a7de3f3a1f9d59708995c8e3e9b05a2747
Diffstat (limited to 'src/bts.cpp')
-rw-r--r--src/bts.cpp22
1 files changed, 19 insertions, 3 deletions
diff --git a/src/bts.cpp b/src/bts.cpp
index 1804c52..e07b840 100644
--- a/src/bts.cpp
+++ b/src/bts.cpp
@@ -197,6 +197,11 @@ struct gprs_rlcmac_bts *bts_main_data()
return BTS::main_bts()->bts_data();
}
+void bts_cleanup()
+{
+ return BTS::main_bts()->cleanup();
+}
+
struct rate_ctr_group *bts_main_data_stats()
{
return BTS::main_bts()->rate_counters();
@@ -239,16 +244,27 @@ BTS::BTS()
OSMO_ASSERT(m_statg);
}
-BTS::~BTS()
+void BTS::cleanup()
{
/* this can cause counter updates and must not be left to the
* m_ms_store's destructor */
m_ms_store.cleanup();
- rate_ctr_group_free(m_ratectrs);
- osmo_stat_item_group_free(m_statg);
+ if (m_ratectrs) {
+ rate_ctr_group_free(m_ratectrs);
+ m_ratectrs = NULL;
+ }
+
+ if (m_statg) {
+ osmo_stat_item_group_free(m_statg);
+ m_statg = NULL;
+ }
}
+BTS::~BTS()
+{
+ cleanup();
+}
void BTS::set_current_frame_number(int fn)
{