aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJacob Erlbeck <jerlbeck@sysmocom.de>2015-08-20 17:49:03 +0200
committerJacob Erlbeck <jerlbeck@sysmocom.de>2015-08-24 12:23:50 +0200
commit444bc82081be0fd371805017a4c97b01cb41c15d (patch)
tree754b011500c5c8f412fb47b78a27d528a3a492a1 /src
parent23c4b3f15899c0849fe63726fea404b9b215f103 (diff)
tbf: Use C++/talloc magic to support TBF constructors/destructors
The TBF object are currently created by using talloc_zero/talloc_free directly from plain functions. Therefore C++ constructors and destructors are not called. So the only initialisation that is done is setting every member to 0. Non POD members do not have their constructors called either, which makes it impossible to use the current LListHead class for real members when the LListHead::m_back member has to be set. This commit changes the TBF allocation functions to call the corresponding C++ constructor after the call to talloc_zero and to register the C++ destructor with the talloc context, so that is is called before talloc_free actually frees the memory. With this change, non-POD members and custom constructors/desctructors can be used with gprs_rlcmac_tbf, gprs_rlcmac_dl_tbf, and gprs_rlcmac_ul_tbf. Note that this change is only a single step of the plan to turn the TBF classes into real C++ classes. Sponsored-by: On-Waves ehf
Diffstat (limited to 'src')
-rw-r--r--src/tbf.cpp33
-rw-r--r--src/tbf.h5
2 files changed, 36 insertions, 2 deletions
diff --git a/src/tbf.cpp b/src/tbf.cpp
index 2e6da02..9d4363f 100644
--- a/src/tbf.cpp
+++ b/src/tbf.cpp
@@ -41,6 +41,11 @@ extern void *tall_pcu_ctx;
static void tbf_timer_cb(void *_tbf);
+gprs_rlcmac_tbf::gprs_rlcmac_tbf(gprs_rlcmac_tbf_direction dir) :
+ direction(dir)
+{
+}
+
gprs_rlcmac_bts *gprs_rlcmac_tbf::bts_data() const
{
return bts->bts_data();
@@ -523,6 +528,17 @@ static int setup_tbf(struct gprs_rlcmac_tbf *tbf, struct gprs_rlcmac_bts *bts,
return 0;
}
+gprs_rlcmac_ul_tbf::gprs_rlcmac_ul_tbf() :
+ gprs_rlcmac_tbf(GPRS_RLCMAC_UL_TBF)
+{
+};
+
+static int ul_tbf_dtor(struct gprs_rlcmac_ul_tbf *tbf)
+{
+ tbf->~gprs_rlcmac_ul_tbf();
+ return 0;
+}
+
struct gprs_rlcmac_ul_tbf *tbf_alloc_ul_tbf(struct gprs_rlcmac_bts *bts,
GprsMs *ms, int8_t use_trx,
@@ -540,7 +556,8 @@ struct gprs_rlcmac_ul_tbf *tbf_alloc_ul_tbf(struct gprs_rlcmac_bts *bts,
if (!tbf)
return NULL;
- tbf->direction = GPRS_RLCMAC_UL_TBF;
+ talloc_set_destructor(tbf, ul_tbf_dtor);
+ new (tbf) gprs_rlcmac_ul_tbf();
if (!ms)
ms = bts->bts->ms_alloc(ms_class);
@@ -558,6 +575,17 @@ struct gprs_rlcmac_ul_tbf *tbf_alloc_ul_tbf(struct gprs_rlcmac_bts *bts,
return tbf;
}
+gprs_rlcmac_dl_tbf::gprs_rlcmac_dl_tbf() :
+ gprs_rlcmac_tbf(GPRS_RLCMAC_DL_TBF)
+{
+};
+
+static int dl_tbf_dtor(struct gprs_rlcmac_dl_tbf *tbf)
+{
+ tbf->~gprs_rlcmac_dl_tbf();
+ return 0;
+}
+
struct gprs_rlcmac_dl_tbf *tbf_alloc_dl_tbf(struct gprs_rlcmac_bts *bts,
GprsMs *ms, int8_t use_trx,
uint8_t ms_class, uint8_t single_slot)
@@ -574,7 +602,8 @@ struct gprs_rlcmac_dl_tbf *tbf_alloc_dl_tbf(struct gprs_rlcmac_bts *bts,
if (!tbf)
return NULL;
- tbf->direction = GPRS_RLCMAC_DL_TBF;
+ talloc_set_destructor(tbf, dl_tbf_dtor);
+ new (tbf) gprs_rlcmac_dl_tbf();
if (!ms)
ms = bts->bts->ms_alloc(ms_class);
diff --git a/src/tbf.h b/src/tbf.h
index a596ad7..f1484f0 100644
--- a/src/tbf.h
+++ b/src/tbf.h
@@ -110,6 +110,7 @@ struct llist_pods {
prefetch(pos->member.list.next))
struct gprs_rlcmac_tbf {
+ gprs_rlcmac_tbf(gprs_rlcmac_tbf_direction dir);
static void free_all(struct gprs_rlcmac_trx *trx);
static void free_all(struct gprs_rlcmac_pdch *pdch);
@@ -306,6 +307,8 @@ inline time_t gprs_rlcmac_tbf::created_ts() const
}
struct gprs_rlcmac_dl_tbf : public gprs_rlcmac_tbf {
+ gprs_rlcmac_dl_tbf();
+
void cleanup();
/* dispatch Unitdata.DL messages */
@@ -371,6 +374,8 @@ protected:
};
struct gprs_rlcmac_ul_tbf : public gprs_rlcmac_tbf {
+ gprs_rlcmac_ul_tbf();
+
struct msgb *create_ul_ack(uint32_t fn);
/* blocks were acked */