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

Fixed a bug with LTE ANR

Browse Source
This commit is contained in:
Budiarto Herman
2013-08-12 15:25:21 +03:00
parent c5d79310d3
commit c5db2d45ac
5 changed files with 66 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lte/helper/lte-helper.cc
View File

@@ -392,7 +392,7 @@ LteHelper::InstallSingleEnbDevice (Ptr<Node> n)
Ptr<LteEnbMac> mac = CreateObject<LteEnbMac> ();
Ptr<FfMacScheduler> sched = m_schedulerFactory.Create<FfMacScheduler> ();
Ptr<HandoverAlgorithm> handoverAlgorithm = m_handoverAlgorithmFactory.Create<HandoverAlgorithm> ();
Ptr<LteAnr> anr = CreateObject<LteAnr> ();
Ptr<LteAnr> anr = CreateObject<LteAnr> (cellId);
Ptr<LteEnbRrc> rrc = CreateObject<LteEnbRrc> ();
if (m_useIdealRrc)

56
src/lte/model/lte-anr.cc
View File

@@ -30,17 +30,20 @@ namespace ns3 {
NS_OBJECT_ENSURE_REGISTERED (LteAnr);
LteAnr::LteAnr ()
LteAnr::LteAnr (uint16_t servingCellId)
: m_anrSapUser (0),
m_threshold (0),
m_measId (0)
m_measId (0),
m_servingCellId (servingCellId)
{
NS_LOG_FUNCTION (this << servingCellId);
m_anrSapProvider = new MemberLteAnrSapProvider<LteAnr> (this);
}
LteAnr::~LteAnr ()
{
NS_LOG_FUNCTION (this << m_servingCellId);
}
@@ -57,7 +60,6 @@ LteAnr::GetTypeId (void)
{
static TypeId tid = TypeId ("ns3::LteAnr")
.SetParent<Object> ()
.AddConstructor<LteAnr> ()
.AddAttribute ("Threshold",
"Minimum RSRQ range value required for detecting a neighbour cell",
UintegerValue (0),
@@ -71,7 +73,12 @@ LteAnr::GetTypeId (void)
void
LteAnr::AddNeighbourRelation (uint16_t cellId)
{
NS_LOG_FUNCTION (this << cellId);
NS_LOG_FUNCTION (this << m_servingCellId << cellId);
if (cellId == m_servingCellId)
{
NS_FATAL_ERROR ("Serving cell ID " << cellId << " may not be added into NRT");
}
if (m_neighbourRelationTable.find (cellId) != m_neighbourRelationTable.end ())
{
@@ -90,7 +97,7 @@ LteAnr::AddNeighbourRelation (uint16_t cellId)
void
LteAnr::RemoveNeighbourRelation (uint16_t cellId)
{
NS_LOG_FUNCTION (this << cellId);
NS_LOG_FUNCTION (this << m_servingCellId << cellId);
NeighbourRelationTable_t::iterator it = m_neighbourRelationTable.find (cellId);
if (it != m_neighbourRelationTable.end ())
@@ -119,6 +126,8 @@ LteAnr::GetLteAnrSapProvider ()
void
LteAnr::DoInitialize ()
{
NS_LOG_LOGIC (this << " requesting Event A4 measurements"
<< " (threshold=" << (uint8_t) m_threshold << ")");
LteRrcSap::ReportConfigEutra reportConfig;
reportConfig.eventId = LteRrcSap::ReportConfigEutra::EVENT_A4;
reportConfig.threshold1.choice = LteRrcSap::ThresholdEutra::THRESHOLD_RSRQ;
@@ -133,7 +142,7 @@ void
LteAnr::DoReportUeMeas (LteRrcSap::MeasResults measResults)
{
uint8_t measId = measResults.measId;
NS_LOG_FUNCTION (this << (uint16_t) measId);
NS_LOG_FUNCTION (this << m_servingCellId << (uint16_t) measId);
if (measId != m_measId)
{
@@ -153,19 +162,27 @@ LteAnr::DoReportUeMeas (LteRrcSap::MeasResults measResults)
"RSRQ measure missing for cellId " << it->physCellId);
// Update Neighbour Relation Table
if (m_neighbourRelationTable.find (it->physCellId) != m_neighbourRelationTable.end ())
NeighbourRelationTable_t::iterator itNrt = m_neighbourRelationTable.find (it->physCellId);
if (itNrt != m_neighbourRelationTable.end ())
{
// Update neighbour info
NeighbourRelation_t neighbourRelation = m_neighbourRelationTable[it->physCellId];
if (neighbourRelation.noX2 == false)
// Update neighbour relation entry
NS_LOG_LOGIC (this << " updating NRT of cell " << m_servingCellId
<< " with entry of cell " << it->physCellId);
if (itNrt->second.noX2 == false)
{
neighbourRelation.noHo = false;
NS_LOG_LOGIC (this << " enabling handover"
<< " from cell " << m_servingCellId
<< " to cell " << it->physCellId);
itNrt->second.noHo = false;
}
neighbourRelation.detectedAsNeighbour = true;
itNrt->second.detectedAsNeighbour = true;
}
else // new neighbour
else
{
// Discovered new neighbour
NS_LOG_LOGIC (this << " inserting NRT of cell " << m_servingCellId
<< " with newly discovered neighbouring cell "
<< it->physCellId);
NeighbourRelation_t neighbourRelation;
neighbourRelation.noRemove = false;
neighbourRelation.noHo = true;
@@ -179,9 +196,8 @@ LteAnr::DoReportUeMeas (LteRrcSap::MeasResults measResults)
} // end of if (measResults.haveMeasResultNeighCells && !(measResults.measResultListEutra.empty ()))
else
{
NS_LOG_LOGIC ("WARNING");
// NS_ASSERT_MSG ("Event A4 received without measure results for neighbour cells");
// TODO Remove neighbours in the neighbourCellMeasures table
NS_LOG_WARN (this << " Event A4 received without measurement results from neighbouring cells");
// TODO Remove neighbours in the NRT
}
} // end of else of if (measId != m_measId)
@@ -199,7 +215,7 @@ LteAnr::DoAddNeighbourRelation (uint16_t cellId)
bool
LteAnr::DoGetNoRemove (uint16_t cellId)
{
NS_LOG_FUNCTION (this << cellId);
NS_LOG_FUNCTION (this << m_servingCellId << cellId);
return Find (cellId)->noRemove;
}
@@ -207,7 +223,7 @@ LteAnr::DoGetNoRemove (uint16_t cellId)
bool
LteAnr::DoGetNoHo (uint16_t cellId)
{
NS_LOG_FUNCTION (this << cellId);
NS_LOG_FUNCTION (this << m_servingCellId << cellId);
return Find (cellId)->noHo;
}
@@ -215,7 +231,7 @@ LteAnr::DoGetNoHo (uint16_t cellId)
bool
LteAnr::DoGetNoX2 (uint16_t cellId)
{
NS_LOG_FUNCTION (this << cellId);
NS_LOG_FUNCTION (this << m_servingCellId << cellId);
return Find (cellId)->noX2;
}

6
src/lte/model/lte-anr.h
View File

@@ -42,7 +42,7 @@ class LteNeighbourRelation;
class LteAnr : public Object
{
public:
LteAnr ();
LteAnr (uint16_t servingCellId);
virtual ~LteAnr ();
// inherited from Object
@@ -58,7 +58,7 @@ public:
* 3GPP TS 36.300.
*
* An entry added by this function will have NoRemove flag set to TRUE and
* NoHo flag set to TRUE. Hence, the cell may not act as the targel cell of a
* NoHo flag set to TRUE. Hence, the cell may not act as the target cell of a
* handover, unless a measurement report of the cell is received, which will
* update the NoHo flag to FALSE.
*/
@@ -131,6 +131,8 @@ private:
// The expected measurement identity
uint8_t m_measId;
uint16_t m_servingCellId;
}; // end of class LteAnr

1
src/lte/model/lte-enb-net-device.cc
View File

@@ -269,6 +269,7 @@ LteEnbNetDevice::DoInitialize (void)
m_mac->Initialize ();
m_rrc->Initialize ();
m_handoverAlgorithm->Initialize ();
m_anr->Initialize ();
}

32
src/lte/model/lte-enb-rrc.cc
View File

@@ -988,14 +988,16 @@ UeManager::RecvMeasurementReport (LteRrcSap::MeasurementReport msg)
<< " RSRQ " << (it->haveRsrqResult ? (uint16_t) it->rsrqResult : 255));
}
if (m_rrc->m_handoverMeasIds.find (measId) != m_rrc->m_handoverMeasIds.end ())
if ((m_rrc->m_handoverManagementSapProvider != 0)
&& (m_rrc->m_handoverMeasIds.find (measId) != m_rrc->m_handoverMeasIds.end ()))
{
// this measurement was requested by the handover algorithm
m_rrc->m_handoverManagementSapProvider->ReportUeMeas (m_rnti,
msg.measResults);
}
if (m_rrc->m_anrMeasIds.find (measId) != m_rrc->m_anrMeasIds.end ())
if ((m_rrc->m_anrSapProvider != 0)
&& (m_rrc->m_anrMeasIds.find (measId) != m_rrc->m_anrMeasIds.end ()))
{
// this measurement was requested by the ANR function
m_rrc->m_anrSapProvider->ReportUeMeas (msg.measResults);
@@ -2024,9 +2026,20 @@ LteEnbRrc::DoTriggerHandover (uint16_t rnti, uint16_t targetCellId)
{
NS_LOG_FUNCTION (this << rnti << targetCellId);
// ensure that proper neighbour relationship exists between source and target cells
if ((m_anrSapProvider->GetNoHo (targetCellId) == false)
&& (m_anrSapProvider->GetNoX2 (targetCellId) == false))
bool isHandoverAllowed = true;
if (m_anrSapProvider != 0)
{
// ensure that proper neighbour relationship exists between source and target cells
bool noHo = m_anrSapProvider->GetNoHo (targetCellId);
bool noX2 = m_anrSapProvider->GetNoX2 (targetCellId);
NS_LOG_DEBUG (this << " cellId=" << m_cellId
<< " targetCellId=" << targetCellId
<< " NRT.NoHo=" << noHo << " NRT.NoX2=" << noX2);
isHandoverAllowed = (noHo == false) && (noX2 == false);
}
if (isHandoverAllowed)
{
Ptr<UeManager> ueManager = GetUeManager (rnti);
NS_ASSERT_MSG (ueManager != 0, "Cannot find UE context with RNTI " << rnti);
@@ -2268,9 +2281,12 @@ LteEnbRrc::GetLogicalChannelPriority (EpsBearer bearer)
void
LteEnbRrc::SendSystemInformation ()
{
// NS_LOG_FUNCTION (this);
// for simplicity, we use the same periodicity for all sibs
// note that in real systems the periodicy of each sibs could be different
// NS_LOG_FUNCTION (this);
/*
* For simplicity, we use the same periodicity for all SIBs. Note that in real
* systems the periodicy of each SIBs could be different.
*/
LteRrcSap::SystemInformation si;
si.haveSib2 = true;
si.sib2.freqInfo.ulCarrierFreq = m_ulEarfcn;