F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update RR and PF schedulers for avoiding the allocation of UEs that do not have HARQ processes available for transmitting

Browse Source
This commit is contained in:
Marco Miozzo
2012-10-26 15:57:59 +02:00
parent e73397daaf
commit b1418abe84
4 changed files with 102 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/lte/model/pf-ff-mac-scheduler.cc
View File

@@ -467,10 +467,49 @@ PfFfMacScheduler::LcActivePerFlow (uint16_t rnti)
}
uint8_t
PfFfMacScheduler::HarqProcessAvailability (uint16_t rnti)
{
NS_LOG_FUNCTION (this << rnti);
std::map <uint16_t, uint8_t>::iterator it = m_dlHarqCurrentProcessId.find (rnti);
if (it==m_dlHarqCurrentProcessId.end ())
{
NS_FATAL_ERROR ("No Process Id found for this RNTI " << rnti);
}
std::map <uint16_t, DlHarqProcessesStatus_t>::iterator itStat = m_dlHarqProcessesStatus.find (rnti);
if (itStat==m_dlHarqProcessesStatus.end ())
{
NS_FATAL_ERROR ("No Process Id Statusfound for this RNTI " << rnti);
}
uint8_t i = (*it).second;
do
{
i = (i + 1) % HARQ_PROC_NUM;
// NS_LOG_DEBUG (this << " check i " << (uint16_t)i << " stat " << (uint16_t)(*itStat).second.at (i));
} while ( ((*itStat).second.at (i)!=0)&&(i!=(*it).second));
if ((*itStat).second.at (i)==0)
{
return (true);
}
else
{
return (false); // return a not valid harq proc id
}
}
uint8_t
PfFfMacScheduler::UpdateHarqProcessId (uint16_t rnti)
{
NS_LOG_FUNCTION (this << rnti);
if (m_harqOn == false)
{
return (0);
}
std::map <uint16_t, uint8_t>::iterator it = m_dlHarqCurrentProcessId.find (rnti);
if (it==m_dlHarqCurrentProcessId.end ())
@@ -495,7 +534,7 @@ PfFfMacScheduler::UpdateHarqProcessId (uint16_t rnti)
}
else
{
return (9); // return a not valid harq proc id
NS_FATAL_ERROR ("No HARQ process available for RNTI " << rnti << " check before update with HarqProcessAvailability");
}
return ((*it).second);
@@ -778,9 +817,9 @@ PfFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sched
for (it = m_flowStatsDl.begin (); it != m_flowStatsDl.end (); it++)
{
std::set <uint16_t>::iterator itRnti = rntiAllocated.find ((*it).first);
if (itRnti != rntiAllocated.end ())
if ((itRnti != rntiAllocated.end ())||(!HarqProcessAvailability ((*it).first)))
{
// UE already allocated for HARQ -> drop it
// UE already allocated for HARQ or without HARQ process available -> drop it
continue;
}
std::map <uint16_t,SbMeasResult_s>::iterator itCqi;
@@ -891,21 +930,7 @@ PfFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sched
// create the DlDciListElement_s
DlDciListElement_s newDci;
newDci.m_rnti = (*itMap).first;
if (m_harqOn == true)
{
newDci.m_harqProcess = UpdateHarqProcessId ((*itMap).first);
if (newDci.m_harqProcess>8)
{
// not valid HARQ ID -> no more HARQ proc available, stop allocation for this user
itMap++;
NS_LOG_DEBUG (this << " All HARQ process busy, drop UE allocation, RNTI " << (*itMap).first);
continue;
}
}
else
{
newDci.m_harqProcess = 0;
}
newDci.m_harqProcess = UpdateHarqProcessId ((*itMap).first);
uint16_t lcActives = LcActivePerFlow ((*itMap).first);
// NS_LOG_DEBUG (this << "Allocate user " << newEl.m_rnti << " rbg " << lcActives);

8
src/lte/model/pf-ff-mac-scheduler.h
View File

@@ -163,6 +163,14 @@ private:
* \return the process id value
*/
uint8_t UpdateHarqProcessId (uint16_t rnti);
/**
* \brief Return the availability of free process for the RNTI specified
*
* \param rnti the RNTI of the UE to be updated
* \return the process id value
*/
uint8_t HarqProcessAvailability (uint16_t rnti);
Ptr<LteAmc> m_amc;

64
src/lte/model/rr-ff-mac-scheduler.cc
View File

@@ -435,11 +435,50 @@ RrFfMacScheduler::SortRlcBufferReq (FfMacSchedSapProvider::SchedDlRlcBufferReqPa
}
uint8_t
RrFfMacScheduler::HarqProcessAvailability (uint16_t rnti)
{
NS_LOG_FUNCTION (this << rnti);
std::map <uint16_t, uint8_t>::iterator it = m_dlHarqCurrentProcessId.find (rnti);
if (it==m_dlHarqCurrentProcessId.end ())
{
NS_FATAL_ERROR ("No Process Id found for this RNTI " << rnti);
}
std::map <uint16_t, DlHarqProcessesStatus_t>::iterator itStat = m_dlHarqProcessesStatus.find (rnti);
if (itStat==m_dlHarqProcessesStatus.end ())
{
NS_FATAL_ERROR ("No Process Id Statusfound for this RNTI " << rnti);
}
uint8_t i = (*it).second;
do
{
i = (i + 1) % HARQ_PROC_NUM;
// NS_LOG_DEBUG (this << " check i " << (uint16_t)i << " stat " << (uint16_t)(*itStat).second.at (i));
} while ( ((*itStat).second.at (i)!=0)&&(i!=(*it).second));
if ((*itStat).second.at (i)==0)
{
return (true);
}
else
{
return (false); // return a not valid harq proc id
}
}
uint8_t
RrFfMacScheduler::UpdateHarqProcessId (uint16_t rnti)
{
NS_LOG_FUNCTION (this << rnti);
if (m_harqOn == false)
{
return (0);
}
std::map <uint16_t, uint8_t>::iterator it = m_dlHarqCurrentProcessId.find (rnti);
if (it==m_dlHarqCurrentProcessId.end ())
{
@@ -742,7 +781,9 @@ RrFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sched
if ( (((*it).m_rlcTransmissionQueueSize > 0)
|| ((*it).m_rlcRetransmissionQueueSize > 0)
|| ((*it).m_rlcStatusPduSize > 0))
&& (itRnti == rntiAllocated.end ()) ) // UE must not be allocated for HARQ retx
&& (itRnti == rntiAllocated.end ()) // UE must not be allocated for HARQ retx
&& (HarqProcessAvailability ((*it).m_rnti)) ) // UE needs HARQ proc free
{
std::map <uint16_t,uint8_t>::iterator itCqi = m_p10CqiRxed.find ((*it).m_rnti);
uint8_t cqi = 0;
@@ -843,26 +884,7 @@ RrFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sched
// create the DlDciListElement_s
DlDciListElement_s newDci;
newDci.m_rnti = (*it).m_rnti;
if (m_harqOn == true)
{
newDci.m_harqProcess = UpdateHarqProcessId ((*it).m_rnti);
if (newDci.m_harqProcess>8)
{
// not valid HARQ ID -> no more HARQ proc available, stop allocation for this user
it++;
if (it == m_rlcBufferReq.end ())
{
// restart from the first
it = m_rlcBufferReq.begin ();
}
NS_LOG_DEBUG (this << " All HARQ process busy, drop UE allocation");
continue;
}
}
else
{
newDci.m_harqProcess = 0;
}
newDci.m_harqProcess = UpdateHarqProcessId ((*it).m_rnti);
newDci.m_resAlloc = 0;
newDci.m_rbBitmap = 0;
std::map <uint16_t,uint8_t>::iterator itCqi = m_p10CqiRxed.find (newEl.m_rnti);

8
src/lte/model/rr-ff-mac-scheduler.h
View File

@@ -148,6 +148,14 @@ private:
* \return the process id value
*/
uint8_t UpdateHarqProcessId (uint16_t rnti);
/**
* \brief Return the availability of free process for the RNTI specified
*
* \param rnti the RNTI of the UE to be updated
* \return the process id value
*/
uint8_t HarqProcessAvailability (uint16_t rnti);
Ptr<LteAmc> m_amc;