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

SIB2 trace source

Browse Source
This commit is contained in:
Budiarto Herman
2013-07-29 18:23:56 +03:00
parent 6db0fffd14
commit 9100b307dc
4 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -194,6 +194,9 @@ LteUeRrc::GetTypeId (void)
.AddTraceSource ("Sib1Received",
"trace fired upon reception of System Information Block Type 1",
MakeTraceSourceAccessor (&LteUeRrc::m_sib1ReceivedTrace))
.AddTraceSource ("Sib2Received",
"trace fired upon reception of System Information Block Type 2",
MakeTraceSourceAccessor (&LteUeRrc::m_sib2ReceivedTrace))
.AddTraceSource ("StateTransition",
"trace fired upon every UE RRC state transition",
MakeTraceSourceAccessor (&LteUeRrc::m_stateTransitionTrace))
@@ -395,7 +398,7 @@ LteUeRrc::DoInitialize (void)
lcConfig.logicalChannelGroup = 0; // all SRBs mapped to LCG 0
m_cmacSapProvider->AddLc (lcid, lcConfig, rlc->GetLteMacSapUser ());
}
@@ -658,6 +661,7 @@ LteUeRrc::DoRecvSystemInformation (LteRrcSap::SystemInformation msg)
m_hasReceivedSib2 = true;
m_ulBandwidth = msg.sib2.freqInfo.ulBandwidth;
m_ulEarfcn = msg.sib2.freqInfo.ulCarrierFreq;
m_sib2ReceivedTrace (m_imsi, m_cellId, m_rnti);
LteUeCmacSapProvider::RachConfig rc;
rc.numberOfRaPreambles = msg.sib2.radioResourceConfigCommon.rachConfigCommon.preambleInfo.numberOfRaPreambles;
rc.preambleTransMax = msg.sib2.radioResourceConfigCommon.rachConfigCommon.raSupervisionInfo.preambleTransMax;

2
src/lte/model/lte-ue-rrc.h
View File

@@ -354,6 +354,8 @@ private:
// imsi cellId rnti, sourceCellId
TracedCallback<uint64_t, uint16_t, uint16_t, uint16_t> m_sib1ReceivedTrace;
// imsi cellId rnti
TracedCallback<uint64_t, uint16_t, uint16_t> m_sib2ReceivedTrace;
// imsi cellId rnti
TracedCallback<uint64_t, uint16_t, uint16_t, State, State> m_stateTransitionTrace;
// imsi cellId
TracedCallback<uint64_t, uint16_t> m_initialCellSelectionEndOkTrace;

12
src/lte/test/lte-test-cell-selection.cc
View File

@@ -129,7 +129,7 @@ LteCellSelectionTestSuite::LteCellSelectionTestSuite ()
x.push_back (LteCellSelectionTestCase::UeSetup_t (Vector (240, 10, 0), 1, 2));
AddTestCase (new LteCellSelectionTestCase ("[EPC] Some CSG 2",
true, true, x, MilliSeconds (361)),
TestCase::QUICK);
TestCase::EXTENSIVE);
} // end of LteCellSelectionTestSuite::LteCellSelectionTestSuite ()
@@ -318,6 +318,8 @@ LteCellSelectionTestCase::DoRun ()
MakeCallback (&LteCellSelectionTestCase::MibReceivedCallback, this));
Config::Connect ("/NodeList/*/DeviceList/*/LteUeRrc/Sib1Received",
MakeCallback (&LteCellSelectionTestCase::Sib1ReceivedCallback, this));
Config::Connect ("/NodeList/*/DeviceList/*/LteUeRrc/Sib2Received",
MakeCallback (&LteCellSelectionTestCase::Sib2ReceivedCallback, this));
Config::Connect ("/NodeList/*/DeviceList/*/LteUeRrc/StateTransition",
MakeCallback (&LteCellSelectionTestCase::StateTransitionCallback, this));
Config::Connect ("/NodeList/*/DeviceList/*/LteUeRrc/InitialCellSelectionEndOk",
@@ -369,6 +371,14 @@ LteCellSelectionTestCase::Sib1ReceivedCallback (
}
void
LteCellSelectionTestCase::Sib2ReceivedCallback (
std::string context, uint64_t imsi, uint16_t cellId, uint16_t rnti)
{
NS_LOG_FUNCTION (this << context << imsi << cellId << rnti);
}
void
LteCellSelectionTestCase::StateTransitionCallback (std::string context,
uint64_t imsi,

2
src/lte/test/lte-test-cell-selection.h
View File

@@ -89,6 +89,8 @@ private:
void Sib1ReceivedCallback (std::string context, uint64_t imsi,
uint16_t cellId, uint16_t rnti,
uint16_t sourceCellId);
void Sib2ReceivedCallback (std::string context, uint64_t imsi,
uint16_t cellId, uint16_t rnti);
void StateTransitionCallback (std::string context, uint64_t imsi,
uint16_t cellId, uint16_t rnti,
LteUeRrc::State oldState, LteUeRrc::State newState);