From 9100b307dc015c0f3035a32ed277b19cdf39c565 Mon Sep 17 00:00:00 2001
From: Budiarto Herman <budiarto.herman@magister.fi>
Date: Mon, 29 Jul 2013 18:23:56 +0300
Subject: [PATCH] SIB2 trace source

---
 src/lte/model/lte-ue-rrc.cc             |  6 +++++-
 src/lte/model/lte-ue-rrc.h              |  2 ++
 src/lte/test/lte-test-cell-selection.cc | 12 +++++++++++-
 src/lte/test/lte-test-cell-selection.h  |  2 ++
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/lte/model/lte-ue-rrc.cc b/src/lte/model/lte-ue-rrc.cc
index 81eb70d07..4b05b21a0 100644
--- a/src/lte/model/lte-ue-rrc.cc
+++ b/src/lte/model/lte-ue-rrc.cc
@@ -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;
diff --git a/src/lte/model/lte-ue-rrc.h b/src/lte/model/lte-ue-rrc.h
index fdd4e0f2c..676fcfef8 100644
--- a/src/lte/model/lte-ue-rrc.h
+++ b/src/lte/model/lte-ue-rrc.h
@@ -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;
diff --git a/src/lte/test/lte-test-cell-selection.cc b/src/lte/test/lte-test-cell-selection.cc
index 5264c15bf..93fda351d 100644
--- a/src/lte/test/lte-test-cell-selection.cc
+++ b/src/lte/test/lte-test-cell-selection.cc
@@ -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,
diff --git a/src/lte/test/lte-test-cell-selection.h b/src/lte/test/lte-test-cell-selection.h
index f5f167369..446f7c79a 100644
--- a/src/lte/test/lte-test-cell-selection.h
+++ b/src/lte/test/lte-test-cell-selection.h
@@ -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);