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

lte: temp workaround to avoid crash

Browse Source
This commit is contained in:
Manuel Requena
2018-06-08 17:46:00 +02:00
parent 7066bb1874
commit 7b1bd04853
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/lte/helper/radio-bearer-stats-calculator.cc
View File

@@ -295,8 +295,10 @@ RadioBearerStatsCalculator::WriteUlResults (std::ofstream& outFile)
{ {
ImsiLcidPair_t p = *it; ImsiLcidPair_t p = *it;
FlowIdMap::const_iterator flowIdIt = m_flowId.find (p); FlowIdMap::const_iterator flowIdIt = m_flowId.find (p);
NS_ASSERT_MSG (flowIdIt != m_flowId.end (), // \TODO Temporary workaround until traces are connected correctly in LteEnbRrc and LteUeRrc
"FlowId (imsi " << p.m_imsi << " lcid " << (uint32_t) p.m_lcId << ") is missing"); if (flowIdIt == m_flowId.end ()) continue;
// NS_ASSERT_MSG (flowIdIt != m_flowId.end (),
// "FlowId (imsi " << p.m_imsi << " lcid " << (uint32_t) p.m_lcId << ") is missing");
LteFlowId_t flowId = flowIdIt->second; LteFlowId_t flowId = flowIdIt->second;
NS_ASSERT_MSG (flowId.m_lcId == p.m_lcId, "lcid mismatch"); NS_ASSERT_MSG (flowId.m_lcId == p.m_lcId, "lcid mismatch");
@@ -354,8 +356,10 @@ RadioBearerStatsCalculator::WriteDlResults (std::ofstream& outFile)
{ {
ImsiLcidPair_t p = *pair; ImsiLcidPair_t p = *pair;
FlowIdMap::const_iterator flowIdIt = m_flowId.find (p); FlowIdMap::const_iterator flowIdIt = m_flowId.find (p);
NS_ASSERT_MSG (flowIdIt != m_flowId.end (), // \TODO Temporary workaround until traces are connected correctly in LteEnbRrc and LteUeRrc
"FlowId (imsi " << p.m_imsi << " lcid " << (uint32_t) p.m_lcId << ") is missing"); if (flowIdIt == m_flowId.end ()) continue;
// NS_ASSERT_MSG (flowIdIt != m_flowId.end (),
// "FlowId (imsi " << p.m_imsi << " lcid " << (uint32_t) p.m_lcId << ") is missing");
LteFlowId_t flowId = flowIdIt->second; LteFlowId_t flowId = flowIdIt->second;
NS_ASSERT_MSG (flowId.m_lcId == p.m_lcId, "lcid mismatch"); NS_ASSERT_MSG (flowId.m_lcId == p.m_lcId, "lcid mismatch");