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

sched: Attempt to improve the fairness and schedule UL/AL ACK/ASS 

It is possible that certain UL ACK messages are not sent when there
are many many uplink and downlink assignments. Try to be more fair
and schedule them round-robin. This way no starvation should occur.
This commit is contained in:
Holger Hans Peter Freyther 2013-11-26 16:39:28 +01:00
parent aadfc2e121
commit 705653b2d7
2 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/bts.h
View File

@ -67,6 +67,7 @@ struct gprs_rlcmac_pdch {
uint8_t tsc; /* TSC of this slot */
uint8_t next_ul_tfi; /* next uplink TBF/TFI to schedule (0..31) */
uint8_t next_dl_tfi; /* next downlink TBF/TFI to schedule (0..31) */
uint8_t next_ctrl_prio; /* next kind of ctrl message to schedule */
struct gprs_rlcmac_tbf *ul_tbf[32]; /* array of UL TBF, by UL TFI */
struct gprs_rlcmac_tbf *dl_tbf[32]; /* array of DL TBF, by DL TFI */
struct llist_head paging_list; /* list of paging messages */

36
src/gprs_rlcmac_sched.cpp
View File

@ -115,22 +115,30 @@ static struct msgb *sched_select_ctrl_msg(
{
struct msgb *msg = NULL;
struct gprs_rlcmac_tbf *tbf = NULL;
struct gprs_rlcmac_tbf *next_list[3] = { ul_ass_tbf, dl_ass_tbf, ul_ack_tbf };
/* schedule PACKET UPLINK ASSIGNMENT (1st priority) */
if (ul_ass_tbf) {
tbf = ul_ass_tbf;
msg = tbf->create_ul_ass(fn);
}
/* schedule PACKET DOWNLINK ASSIGNMENT (2nd priotiry) */
if (!msg && dl_ass_tbf) {
tbf = dl_ass_tbf;
msg = tbf->create_dl_ass(fn);
}
/* schedule PACKET UPLINK ACK (3rd priority) */
if (!msg && ul_ack_tbf) {
tbf = ul_ack_tbf;
msg = tbf->create_ul_ack(fn);
for (size_t i = 0; i < ARRAY_SIZE(next_list); ++i) {
tbf = next_list[(pdch->next_ctrl_prio + i) % 3];
if (!tbf)
continue;
if (tbf == ul_ass_tbf)
msg = tbf->create_ul_ass(fn);
else if (tbf == dl_ass_tbf)
msg = tbf->create_dl_ass(fn);
else
msg = tbf->create_ul_ack(fn);
if (!msg) {
tbf = NULL;
continue;
}
pdch->next_ctrl_prio += i + 1;
pdch->next_ctrl_prio %= 3;
break;
}
/* any message */
if (msg) {
tbf->rotate_in_list();