cellular-infrastructure
/
osmo-pcu
mirror of https://gerrit.osmocom.org/osmo-pcu
9
0
Fork 1
Code Issues Releases Wiki Activity

poll: Add a max_delay parameter to PollController::expireTimedout 

Currently the maximum additional delay is hard coded to 13. This
value depends on the source of the frame number value.

This commit adds the max_delay parameter to make it caller dependant.

Sponsored-by: On-Waves ehf
This commit is contained in:
Jacob Erlbeck 2015-08-27 13:18:24 +02:00
parent 16d29c7da4
commit ac49d0943a
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/bts.cpp
View File

@ -136,8 +136,16 @@ BTS::~BTS()
void BTS::set_current_frame_number(int fn)
{
/* The UL frame numbers lag 3 behind the DL frames and the data
* indication is only sent after all 4 frames of the block have been
* received. Sometimes there is an idle frame between the end of one
* and start of another frame (every 3 blocks). So the timeout should
* definitely be there if we're more than 8 frames past poll_fn. Let's
* stay on the safe side and say 13 or more. */
const static int max_delay = 13;
m_cur_fn = fn;
m_pollController.expireTimedout(m_cur_fn);
m_pollController.expireTimedout(m_cur_fn, max_delay);
}
int BTS::add_paging(uint8_t chan_needed, uint8_t *identity_lv)

15
src/poll_controller.cpp
View File

@ -28,7 +28,7 @@ PollController::PollController(BTS& bts)
: m_bts(bts)
{}
void PollController::expireTimedout(int frame_number)
void PollController::expireTimedout(int frame_number, unsigned max_delay)
{
struct gprs_rlcmac_bts *bts = m_bts.bts_data();
struct gprs_rlcmac_dl_tbf *dl_tbf;
@ -37,18 +37,11 @@ void PollController::expireTimedout(int frame_number)
struct llist_pods *lpods;
uint32_t elapsed;
/* check for poll timeout
* The UL frame numbers lag 3 behind the DL frames and the data
* indication is only sent after all 4 frames of the block have been
* received. Sometimes there is an idle frame between the end of one
* and start of another frame (every 3 blocks). So the timeout should
* definitely be there if we're more than 8 frames past poll_fn. Let's
* stay on the safe side and say 13 or more. */
llist_pods_for_each_entry(ul_tbf, &bts->ul_tbfs, list, lpods) {
if (ul_tbf->poll_state == GPRS_RLCMAC_POLL_SCHED) {
elapsed = (frame_number + 2715648 - ul_tbf->poll_fn)
% 2715648;
if (elapsed >= 13 && elapsed < 2715400)
if (elapsed > max_delay && elapsed < 2715400)
ul_tbf->poll_timeout();
}
}
@ -56,13 +49,13 @@ void PollController::expireTimedout(int frame_number)
if (dl_tbf->poll_state == GPRS_RLCMAC_POLL_SCHED) {
elapsed = (frame_number + 2715648 - dl_tbf->poll_fn)
% 2715648;
if (elapsed >= 13 && elapsed < 2715400)
if (elapsed > max_delay && elapsed < 2715400)
dl_tbf->poll_timeout();
}
}
llist_for_each_entry_safe(sba, sba2, &m_bts.sba()->m_sbas, list) {
elapsed = (frame_number + 2715648 - sba->fn) % 2715648;
if (elapsed >= 13 && elapsed < 2715400) {
if (elapsed > max_delay && elapsed < 2715400) {
/* sba will be freed here */
m_bts.sba()->timeout(sba);
}

3
src/poll_controller.h
View File

@ -34,7 +34,8 @@ class PollController {
public:
PollController(BTS& bts);
void expireTimedout(int frame_number);
/* check for poll timeout */
void expireTimedout(int frame_number, unsigned max_delay);
private:
BTS& m_bts;