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

Added missing NS_LOG_FUNCTION to some LTE module files

Browse Source
This commit is contained in:
Budiarto Herman
2013-09-26 12:21:45 +03:00
parent a435cd4cf5
commit 04ecaa54cf
7 changed files with 51 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/lte/model/a3-rsrp-handover-algorithm.cc
View File

@@ -35,18 +35,21 @@ NS_OBJECT_ENSURE_REGISTERED (A3RsrpHandoverAlgorithm);
A3RsrpHandoverAlgorithm::A3RsrpHandoverAlgorithm ()
: m_handoverManagementSapUser (0)
{
NS_LOG_FUNCTION (this);
m_handoverManagementSapProvider = new MemberLteHandoverManagementSapProvider<A3RsrpHandoverAlgorithm> (this);
}
A3RsrpHandoverAlgorithm::~A3RsrpHandoverAlgorithm ()
{
NS_LOG_FUNCTION (this);
}
void
A3RsrpHandoverAlgorithm::DoDispose ()
{
NS_LOG_FUNCTION (this);
delete m_handoverManagementSapProvider;
}
@@ -78,6 +81,7 @@ A3RsrpHandoverAlgorithm::GetTypeId (void)
void
A3RsrpHandoverAlgorithm::SetLteHandoverManagementSapUser (LteHandoverManagementSapUser* s)
{
NS_LOG_FUNCTION (this << s);
m_handoverManagementSapUser = s;
}
@@ -85,6 +89,7 @@ A3RsrpHandoverAlgorithm::SetLteHandoverManagementSapUser (LteHandoverManagementS
LteHandoverManagementSapProvider*
A3RsrpHandoverAlgorithm::GetLteHandoverManagementSapProvider ()
{
NS_LOG_FUNCTION (this);
return m_handoverManagementSapProvider;
}

15
src/lte/model/epc-ue-nas.cc
View File

@@ -93,18 +93,21 @@ EpcUeNas::GetTypeId (void)
void
EpcUeNas::SetDevice (Ptr<NetDevice> dev)
{
NS_LOG_FUNCTION (this << dev);
m_device = dev;
}
void
EpcUeNas::SetImsi (uint64_t imsi)
{
NS_LOG_FUNCTION (this << imsi);
m_imsi = imsi;
}
void
EpcUeNas::SetCsgId (uint32_t csgId)
{
NS_LOG_FUNCTION (this << csgId);
m_csgId = csgId;
m_asSapProvider->SetCsgWhiteList (csgId);
}
@@ -112,31 +115,35 @@ EpcUeNas::SetCsgId (uint32_t csgId)
uint32_t
EpcUeNas::GetCsgId () const
{
NS_LOG_FUNCTION (this);
return m_csgId;
}
void
EpcUeNas::SetAsSapProvider (LteAsSapProvider* s)
{
NS_LOG_FUNCTION (this << s);
m_asSapProvider = s;
}
LteAsSapUser*
EpcUeNas::GetAsSapUser ()
{
NS_LOG_FUNCTION (this);
return m_asSapUser;
}
void
EpcUeNas::SetForwardUpCallback (Callback <void, Ptr<Packet> > cb)
{
NS_LOG_FUNCTION (this);
m_forwardUpCallback = cb;
}
void
EpcUeNas::StartCellSelection (uint16_t dlEarfcn)
{
NS_LOG_FUNCTION (this);
NS_LOG_FUNCTION (this << dlEarfcn);
m_asSapProvider->StartCellSelection (dlEarfcn);
}
@@ -152,7 +159,7 @@ EpcUeNas::Connect ()
void
EpcUeNas::Connect (uint16_t cellId, uint16_t dlEarfcn)
{
NS_LOG_FUNCTION (this);
NS_LOG_FUNCTION (this << cellId << dlEarfcn);
// force the UE RRC to be camped on a specific eNB
m_asSapProvider->ForceCampedOnEnb (cellId, dlEarfcn);
@@ -245,7 +252,7 @@ EpcUeNas::DoNotifyConnectionFailed ()
void
EpcUeNas::DoRecvData (Ptr<Packet> packet)
{
NS_LOG_FUNCTION (this);
NS_LOG_FUNCTION (this << packet);
m_forwardUpCallback (packet);
}
@@ -268,7 +275,7 @@ EpcUeNas::DoActivateEpsBearer (EpsBearer bearer, Ptr<EpcTft> tft)
void
EpcUeNas::SwitchToState (State newState)
{
NS_LOG_FUNCTION (this << newState);
NS_LOG_FUNCTION (this << ToString (newState));
State oldState = m_state;
m_state = newState;
NS_LOG_INFO ("IMSI " << m_imsi << " NAS " << ToString (oldState) << " --> " << ToString (newState));

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

@@ -50,6 +50,7 @@ LteAnr::~LteAnr ()
void
LteAnr::DoDispose ()
{
NS_LOG_FUNCTION (this);
delete m_anrSapProvider;
m_neighbourRelationTable.clear ();
}
@@ -112,6 +113,7 @@ LteAnr::RemoveNeighbourRelation (uint16_t cellId)
void
LteAnr::SetLteAnrSapUser (LteAnrSapUser* s)
{
NS_LOG_FUNCTION (this << s);
m_anrSapUser = s;
}
@@ -119,6 +121,7 @@ LteAnr::SetLteAnrSapUser (LteAnrSapUser* s)
LteAnrSapProvider*
LteAnr::GetLteAnrSapProvider ()
{
NS_LOG_FUNCTION (this);
return m_anrSapProvider;
}
@@ -126,6 +129,7 @@ LteAnr::GetLteAnrSapProvider ()
void
LteAnr::DoInitialize ()
{
NS_LOG_FUNCTION (this);
NS_LOG_LOGIC (this << " requesting Event A4 measurements"
<< " (threshold=" << (uint16_t) m_threshold << ")");
LteRrcSap::ReportConfigEutra reportConfig;
@@ -208,6 +212,7 @@ LteAnr::DoReportUeMeas (LteRrcSap::MeasResults measResults)
void
LteAnr::DoAddNeighbourRelation (uint16_t cellId)
{
NS_LOG_FUNCTION (this << cellId);
AddNeighbourRelation (cellId);
}

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

@@ -1497,6 +1497,8 @@ LteEnbRrc::GetUeManager (uint16_t rnti)
uint8_t
LteEnbRrc::AddUeMeasReportConfig (LteRrcSap::ReportConfigEutra config)
{
NS_LOG_FUNCTION (this);
// SANITY CHECK
NS_ASSERT_MSG (m_ueMeasConfig.measIdToAddModList.size () == m_ueMeasConfig.reportConfigToAddModList.size (),
@@ -1584,7 +1586,8 @@ void
LteEnbRrc::ConfigureCell (uint8_t ulBandwidth, uint8_t dlBandwidth,
uint16_t ulEarfcn, uint16_t dlEarfcn, uint16_t cellId)
{
NS_LOG_FUNCTION (this);
NS_LOG_FUNCTION (this << (uint16_t) ulBandwidth << (uint16_t) dlBandwidth
<< ulEarfcn << dlEarfcn << cellId);
NS_ASSERT (!m_configured);
m_cmacSapProvider->ConfigureMac (ulBandwidth, dlBandwidth);
m_cphySapProvider->SetBandwidth (ulBandwidth, dlBandwidth);

2
src/lte/model/lte-ue-net-device.cc
View File

@@ -172,12 +172,14 @@ LteUeNetDevice::GetImsi () const
uint16_t
LteUeNetDevice::GetDlEarfcn () const
{
NS_LOG_FUNCTION (this);
return m_dlEarfcn;
}
void
LteUeNetDevice::SetDlEarfcn (uint16_t earfcn)
{
NS_LOG_FUNCTION (this << earfcn);
m_dlEarfcn = earfcn;
}

22
src/lte/model/lte-ue-rrc.cc
View File

@@ -1475,7 +1475,7 @@ void
LteUeRrc::SaveUeMeasurements (uint16_t cellId, double rsrp, double rsrq,
bool useLayer3Filtering)
{
NS_LOG_LOGIC (this << " CellId " << cellId << " RSRP " << rsrp << " RSRQ " << rsrq);
NS_LOG_FUNCTION (this << cellId << rsrp << rsrq << useLayer3Filtering);
std::map<uint16_t, MeasValues>::iterator storedMeasIt = m_storedMeasValues.find (cellId);;
@@ -1487,7 +1487,7 @@ LteUeRrc::SaveUeMeasurements (uint16_t cellId, double rsrp, double rsrq,
storedMeasIt->second.rsrp = (1 - m_varMeasConfig.aRsrp) * storedMeasIt->second.rsrp
+ m_varMeasConfig.aRsrp * rsrp;
if (std::isnan (storedMeasIt->second.rsrq))
if (isnan (storedMeasIt->second.rsrq))
{
// the previous RSRQ measurements provided UE PHY are invalid
storedMeasIt->second.rsrq = rsrq; // replace it with unfiltered value
@@ -1517,6 +1517,10 @@ LteUeRrc::SaveUeMeasurements (uint16_t cellId, double rsrp, double rsrq,
storedMeasIt = ret.first;
}
NS_LOG_DEBUG (this << " IMSI " << m_imsi << " state " << ToString (m_state)
<< ", measured cell " << m_cellId
<< ", new RSRP " << rsrp << " stored " << storedMeasIt->second.rsrp
<< ", new RSRQ " << rsrq << " stored " << storedMeasIt->second.rsrq);
storedMeasIt->second.timestamp = Simulator::Now ();
} // end of void SaveUeMeasurements
@@ -1524,7 +1528,7 @@ LteUeRrc::SaveUeMeasurements (uint16_t cellId, double rsrp, double rsrq,
void
LteUeRrc::MeasurementReportTriggering (uint8_t measId)
{
NS_LOG_LOGIC (this << " considering measId " << (uint32_t) measId);
NS_LOG_FUNCTION (this << (uint16_t) measId);
std::map<uint8_t, LteRrcSap::MeasIdToAddMod>::iterator measIdIt =
m_varMeasConfig.measIdList.find (measId);
@@ -1552,9 +1556,9 @@ LteUeRrc::MeasurementReportTriggering (uint8_t measId)
"only triggerType == event is supported");
// only EUTRA is supported, no need to check for it
NS_LOG_LOGIC (this << " considering measId " << (uint32_t) measId);
bool eventEntryCondApplicable = false;
bool eventLeavingCondApplicable = false;
ConcernedCells_t concernedCellsEntry;
ConcernedCells_t concernedCellsLeaving;
@@ -2269,6 +2273,8 @@ LteUeRrc::MeasurementReportTriggering (uint8_t measId)
void
LteUeRrc::CancelEnteringTrigger (uint8_t measId)
{
NS_LOG_FUNCTION (this << (uint16_t) measId);
std::map<uint8_t, std::list<PendingTrigger_t> >::iterator
it1 = m_enteringTriggerQueue.find (measId);
NS_ASSERT (it1 != m_enteringTriggerQueue.end ());
@@ -2291,6 +2297,8 @@ LteUeRrc::CancelEnteringTrigger (uint8_t measId)
void
LteUeRrc::CancelEnteringTrigger (uint8_t measId, uint16_t cellId)
{
NS_LOG_FUNCTION (this << (uint16_t) measId << cellId);
std::map<uint8_t, std::list<PendingTrigger_t> >::iterator
it1 = m_enteringTriggerQueue.find (measId);
NS_ASSERT (it1 != m_enteringTriggerQueue.end ());
@@ -2327,6 +2335,8 @@ LteUeRrc::CancelEnteringTrigger (uint8_t measId, uint16_t cellId)
void
LteUeRrc::CancelLeavingTrigger (uint8_t measId)
{
NS_LOG_FUNCTION (this << (uint16_t) measId);
std::map<uint8_t, std::list<PendingTrigger_t> >::iterator
it1 = m_leavingTriggerQueue.find (measId);
NS_ASSERT (it1 != m_leavingTriggerQueue.end ());
@@ -2349,6 +2359,8 @@ LteUeRrc::CancelLeavingTrigger (uint8_t measId)
void
LteUeRrc::CancelLeavingTrigger (uint8_t measId, uint16_t cellId)
{
NS_LOG_FUNCTION (this << (uint16_t) measId << cellId);
std::map<uint8_t, std::list<PendingTrigger_t> >::iterator
it1 = m_leavingTriggerQueue.find (measId);
NS_ASSERT (it1 != m_leavingTriggerQueue.end ());
@@ -2532,7 +2544,7 @@ LteUeRrc::VarMeasReportListClear (uint8_t measId)
void
LteUeRrc::SendMeasurementReport (uint8_t measId)
{
NS_LOG_FUNCTION (this << (uint32_t) measId);
NS_LOG_FUNCTION (this << (uint16_t) measId);
// 3GPP TS 36.331 section 5.5.5 Measurement reporting
std::map<uint8_t, LteRrcSap::MeasIdToAddMod>::iterator

7
src/lte/model/no-op-handover-algorithm.cc
View File

@@ -32,18 +32,21 @@ NS_OBJECT_ENSURE_REGISTERED (NoOpHandoverAlgorithm);
NoOpHandoverAlgorithm::NoOpHandoverAlgorithm ()
: m_handoverManagementSapUser (0)
{
NS_LOG_FUNCTION (this);
m_handoverManagementSapProvider = new MemberLteHandoverManagementSapProvider<NoOpHandoverAlgorithm> (this);
}
NoOpHandoverAlgorithm::~NoOpHandoverAlgorithm ()
{
NS_LOG_FUNCTION (this);
}
void
NoOpHandoverAlgorithm::DoDispose ()
{
NS_LOG_FUNCTION (this);
delete m_handoverManagementSapProvider;
}
@@ -62,6 +65,7 @@ NoOpHandoverAlgorithm::GetTypeId (void)
void
NoOpHandoverAlgorithm::SetLteHandoverManagementSapUser (LteHandoverManagementSapUser* s)
{
NS_LOG_FUNCTION (this << s);
m_handoverManagementSapUser = s;
}
@@ -69,6 +73,7 @@ NoOpHandoverAlgorithm::SetLteHandoverManagementSapUser (LteHandoverManagementSap
LteHandoverManagementSapProvider*
NoOpHandoverAlgorithm::GetLteHandoverManagementSapProvider ()
{
NS_LOG_FUNCTION (this);
return m_handoverManagementSapProvider;
}
@@ -76,6 +81,7 @@ NoOpHandoverAlgorithm::GetLteHandoverManagementSapProvider ()
void
NoOpHandoverAlgorithm::DoInitialize ()
{
NS_LOG_FUNCTION (this);
LteHandoverAlgorithm::DoInitialize ();
}
@@ -84,6 +90,7 @@ void
NoOpHandoverAlgorithm::DoReportUeMeas (uint16_t rnti,
LteRrcSap::MeasResults measResults)
{
NS_LOG_FUNCTION (this << rnti << (uint16_t) measResults.measId);
}