bts: Drop specific functions to add values to stats

Change-Id: I877a9c9a35b6c94c3dd6b1ab3019bc57f6c8568a
This commit is contained in:
Pau Espin 2020-05-12 22:45:04 +02:00 committed by pespin
parent a107f8f496
commit 97e88fd35f
2 changed files with 11 additions and 25 deletions

View File

@ -263,6 +263,10 @@ enum {
CTR_EGPRS_UL_MCS9,
};
enum {
STAT_MS_PRESENT,
};
#ifdef __cplusplus
/**
* I represent a GSM BTS. I have one or more TRX, I know the current
@ -271,10 +275,6 @@ enum {
*/
struct BTS {
public:
enum {
STAT_MS_PRESENT,
};
BTS();
~BTS();
void cleanup();
@ -317,13 +317,6 @@ public:
uint8_t ts_no, uint8_t channel, uint32_t fn,
const uint8_t *data, unsigned int len);
/*
* Statistics
*/
void ms_present(int32_t n);
int32_t ms_present_get();
/*
* Below for C interface for the VTY
*/
@ -331,6 +324,7 @@ public:
struct osmo_stat_item_group *stat_items() const;
void do_rate_ctr_inc(unsigned int ctr_id);
void do_rate_ctr_add(unsigned int ctr_id, int inc);
void stat_item_add(unsigned int stat_id, int inc);
LListHead<gprs_rlcmac_tbf>& ul_tbfs();
LListHead<gprs_rlcmac_tbf>& dl_tbfs();
@ -408,18 +402,10 @@ inline void BTS::do_rate_ctr_add(unsigned int ctr_id, int inc) {
rate_ctr_add(&m_ratectrs->ctr[ctr_id], inc);
}
#define CREATE_STAT_INLINE(func_name, func_name_get, stat_name) \
inline void BTS::func_name(int32_t val) {\
osmo_stat_item_set(m_statg->items[stat_name], val); \
} \
inline int32_t BTS::func_name_get() {\
return osmo_stat_item_get_last(m_statg->items[stat_name]); \
}
CREATE_STAT_INLINE(ms_present, ms_present_get, STAT_MS_PRESENT);
#undef CREATE_STAT_INLINE
inline void BTS::stat_item_add(unsigned int stat_id, int inc) {
int32_t val = osmo_stat_item_get_last(m_statg->items[stat_id]);
osmo_stat_item_set(m_statg->items[stat_id], val + inc);
}
#endif

View File

@ -55,7 +55,7 @@ void GprsMsStorage::ms_idle(class GprsMs *ms)
{
llist_del(&ms->list());
if (m_bts)
m_bts->ms_present(m_bts->ms_present_get() - 1);
m_bts->stat_item_add(STAT_MS_PRESENT, -1);
if (ms->is_idle())
delete ms;
}
@ -102,7 +102,7 @@ GprsMs *GprsMsStorage::create_ms()
ms->set_callback(this);
llist_add(&ms->list(), &m_list);
if (m_bts)
m_bts->ms_present(m_bts->ms_present_get() + 1);
m_bts->stat_item_add(STAT_MS_PRESENT, 1);
return ms;
}