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

Fix clang-diagnostics-unused-but-set-variable warnings

Browse Source
This commit is contained in:
Eduardo Almeida
2022-10-28 16:15:46 +01:00
parent 0eedaf34a0
commit b8fb0fcfc8
17 changed files with 11 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lte/model/cqa-ff-mac-scheduler.cc
View File

@@ -704,7 +704,6 @@ CqaFfMacScheduler::DoSchedDlTriggerReq(
}
// RACH Allocation
uint16_t rbAllocatedNum = 0;
std::vector<bool> ulRbMap;
ulRbMap.resize(m_cschedCellConfig.m_ulBandwidth, false);
ulRbMap = m_ffrSapProvider->GetAvailableUlRbg();
@@ -718,7 +717,6 @@ CqaFfMacScheduler::DoSchedDlTriggerReq(
{
if ((*it) == true)
{
rbAllocatedNum++;
if (tmpMinBandwidth > maxContinuousUlBandwidth)
{
maxContinuousUlBandwidth = tmpMinBandwidth;
@@ -1610,7 +1608,6 @@ CqaFfMacScheduler::DoSchedDlTriggerReq(
// RBGs of the same RNTI)
// FfMacSchedSapUser::SchedDlConfigIndParameters ret;
itMap = allocationMapPerRntiPerLCId.begin();
int counter = 0;
std::map<uint16_t, double> m_rnti_per_ratio;
while (itMap != allocationMapPerRntiPerLCId.end())
@@ -1649,7 +1646,6 @@ CqaFfMacScheduler::DoSchedDlTriggerReq(
{
worstCqi = it->second.cqi_value_for_lc;
}
counter++;
}
newDci.m_mcs.push_back(m_amc->GetMcsFromCqi(worstCqi));

2
src/lte/model/fdbet-ff-mac-scheduler.cc
View File

@@ -1346,7 +1346,6 @@ FdBetFfMacScheduler::DoSchedUlTriggerReq(
// Generate RBs map
FfMacSchedSapUser::SchedUlConfigIndParameters ret;
std::vector<bool> rbMap;
uint16_t rbAllocatedNum = 0;
std::set<uint16_t> rntiAllocated;
std::vector<uint16_t> rbgAllocationMap;
// update with RACH allocation map
@@ -1420,7 +1419,6 @@ FdBetFfMacScheduler::DoSchedUlTriggerReq(
rbMap.at(j) = true;
rbgAllocationMap.at(j) = dci.m_rnti;
NS_LOG_INFO("\tRB " << j);
rbAllocatedNum++;
}
NS_LOG_INFO(this << " Send retx in the same RBs " << (uint16_t)dci.m_rbStart
<< " to " << dci.m_rbStart + dci.m_rbLen << " RV "

2
src/lte/model/fdmt-ff-mac-scheduler.cc
View File

@@ -1306,7 +1306,6 @@ FdMtFfMacScheduler::DoSchedUlTriggerReq(
// Generate RBs map
FfMacSchedSapUser::SchedUlConfigIndParameters ret;
std::vector<bool> rbMap;
uint16_t rbAllocatedNum = 0;
std::set<uint16_t> rntiAllocated;
std::vector<uint16_t> rbgAllocationMap;
// update with RACH allocation map
@@ -1380,7 +1379,6 @@ FdMtFfMacScheduler::DoSchedUlTriggerReq(
rbMap.at(j) = true;
rbgAllocationMap.at(j) = dci.m_rnti;
NS_LOG_INFO("\tRB " << j);
rbAllocatedNum++;
}
NS_LOG_INFO(this << " Send retx in the same RBs " << (uint16_t)dci.m_rbStart
<< " to " << dci.m_rbStart + dci.m_rbLen << " RV "

2
src/lte/model/fdtbfq-ff-mac-scheduler.cc
View File

@@ -570,7 +570,6 @@ FdTbfqFfMacScheduler::DoSchedDlTriggerReq(
}
// RACH Allocation
uint16_t rbAllocatedNum = 0;
std::vector<bool> ulRbMap;
ulRbMap.resize(m_cschedCellConfig.m_ulBandwidth, false);
ulRbMap = m_ffrSapProvider->GetAvailableUlRbg();
@@ -584,7 +583,6 @@ FdTbfqFfMacScheduler::DoSchedDlTriggerReq(
{
if ((*it) == true)
{
rbAllocatedNum++;
if (tmpMinBandwidth > maxContinuousUlBandwidth)
{
maxContinuousUlBandwidth = tmpMinBandwidth;

6
src/lte/model/lte-enb-phy.cc
View File

@@ -878,17 +878,15 @@ LteEnbPhy::CreatePuschCqiReport(const SpectrumValue& sinr)
Values::const_iterator it;
FfMacSchedSapProvider::SchedUlCqiInfoReqParameters ulcqi;
ulcqi.m_ulCqi.m_type = UlCqi_s::PUSCH;
int i = 0;
for (it = sinr.ConstValuesBegin(); it != sinr.ConstValuesEnd(); it++)
{
double sinrdb = 10 * std::log10((*it));
// NS_LOG_DEBUG ("ULCQI RB " << i << " value " << sinrdb);
// NS_LOG_DEBUG ("ULCQI RB " << i << " value " << sinrdb);
// convert from double to fixed point notation Sxxxxxxxxxxx.xxx
int16_t sinrFp = LteFfConverter::double2fpS11dot3(sinrdb);
ulcqi.m_ulCqi.m_sinr.push_back(sinrFp);
i++;
}
return (ulcqi);
return ulcqi;
}
void

2
src/lte/model/lte-ue-phy.cc
View File

@@ -819,14 +819,12 @@ LteUePhy::ReportRsReceivedPower(const SpectrumValue& power)
if (m_enableUplinkPowerControl)
{
double sum = 0;
uint32_t rbNum = 0;
Values::const_iterator it;
for (it = m_rsReceivedPower.ConstValuesBegin(); it != m_rsReceivedPower.ConstValuesEnd();
it++)
{
double powerTxW = ((*it) * 180000);
sum += powerTxW;
rbNum++;
}
double rsrp = 10 * log10(sum) + 30;

2
src/lte/model/pf-ff-mac-scheduler.cc
View File

@@ -518,7 +518,6 @@ PfFfMacScheduler::DoSchedDlTriggerReq(
}
// RACH Allocation
uint16_t rbAllocatedNum = 0;
std::vector<bool> ulRbMap;
ulRbMap.resize(m_cschedCellConfig.m_ulBandwidth, false);
ulRbMap = m_ffrSapProvider->GetAvailableUlRbg();
@@ -532,7 +531,6 @@ PfFfMacScheduler::DoSchedDlTriggerReq(
{
if ((*it) == true)
{
rbAllocatedNum++;
if (tmpMinBandwidth > maxContinuousUlBandwidth)
{
maxContinuousUlBandwidth = tmpMinBandwidth;

2
src/lte/model/pss-ff-mac-scheduler.cc
View File

@@ -550,7 +550,6 @@ PssFfMacScheduler::DoSchedDlTriggerReq(
}
// RACH Allocation
uint16_t rbAllocatedNum = 0;
std::vector<bool> ulRbMap;
ulRbMap.resize(m_cschedCellConfig.m_ulBandwidth, false);
ulRbMap = m_ffrSapProvider->GetAvailableUlRbg();
@@ -564,7 +563,6 @@ PssFfMacScheduler::DoSchedDlTriggerReq(
{
if ((*it) == true)
{
rbAllocatedNum++;
if (tmpMinBandwidth > maxContinuousUlBandwidth)
{
maxContinuousUlBandwidth = tmpMinBandwidth;

2
src/lte/model/rr-ff-mac-scheduler.cc
View File

@@ -1201,7 +1201,6 @@ RrFfMacScheduler::DoSchedUlTriggerReq(
// Generate RBs map
FfMacSchedSapUser::SchedUlConfigIndParameters ret;
std::vector<bool> rbMap;
uint16_t rbAllocatedNum = 0;
std::set<uint16_t> rntiAllocated;
std::vector<uint16_t> rbgAllocationMap;
// update with RACH allocation map
@@ -1275,7 +1274,6 @@ RrFfMacScheduler::DoSchedUlTriggerReq(
rbMap.at(j) = true;
rbgAllocationMap.at(j) = dci.m_rnti;
NS_LOG_INFO("\tRB " << j);
rbAllocatedNum++;
}
NS_LOG_INFO(this << " Send retx in the same RBGs " << (uint16_t)dci.m_rbStart
<< " to " << dci.m_rbStart + dci.m_rbLen << " RV "

2
src/lte/model/tdbet-ff-mac-scheduler.cc
View File

@@ -1262,7 +1262,6 @@ TdBetFfMacScheduler::DoSchedUlTriggerReq(
// Generate RBs map
FfMacSchedSapUser::SchedUlConfigIndParameters ret;
std::vector<bool> rbMap;
uint16_t rbAllocatedNum = 0;
std::set<uint16_t> rntiAllocated;
std::vector<uint16_t> rbgAllocationMap;
// update with RACH allocation map
@@ -1336,7 +1335,6 @@ TdBetFfMacScheduler::DoSchedUlTriggerReq(
rbMap.at(j) = true;
rbgAllocationMap.at(j) = dci.m_rnti;
NS_LOG_INFO("\tRB " << j);
rbAllocatedNum++;
}
NS_LOG_INFO(this << " Send retx in the same RBs " << (uint16_t)dci.m_rbStart
<< " to " << dci.m_rbStart + dci.m_rbLen << " RV "

2
src/lte/model/tdmt-ff-mac-scheduler.cc
View File

@@ -1235,7 +1235,6 @@ TdMtFfMacScheduler::DoSchedUlTriggerReq(
// Generate RBs map
FfMacSchedSapUser::SchedUlConfigIndParameters ret;
std::vector<bool> rbMap;
uint16_t rbAllocatedNum = 0;
std::set<uint16_t> rntiAllocated;
std::vector<uint16_t> rbgAllocationMap;
// update with RACH allocation map
@@ -1309,7 +1308,6 @@ TdMtFfMacScheduler::DoSchedUlTriggerReq(
rbMap.at(j) = true;
rbgAllocationMap.at(j) = dci.m_rnti;
NS_LOG_INFO("\tRB " << j);
rbAllocatedNum++;
}
NS_LOG_INFO(this << " Send retx in the same RBs " << (uint16_t)dci.m_rbStart
<< " to " << dci.m_rbStart + dci.m_rbLen << " RV "

2
src/lte/model/tdtbfq-ff-mac-scheduler.cc
View File

@@ -568,7 +568,6 @@ TdTbfqFfMacScheduler::DoSchedDlTriggerReq(
}
// RACH Allocation
uint16_t rbAllocatedNum = 0;
std::vector<bool> ulRbMap;
ulRbMap.resize(m_cschedCellConfig.m_ulBandwidth, false);
ulRbMap = m_ffrSapProvider->GetAvailableUlRbg();
@@ -582,7 +581,6 @@ TdTbfqFfMacScheduler::DoSchedDlTriggerReq(
{
if ((*it) == true)
{
rbAllocatedNum++;
if (tmpMinBandwidth > maxContinuousUlBandwidth)
{
maxContinuousUlBandwidth = tmpMinBandwidth;

2
src/lte/model/tta-ff-mac-scheduler.cc
View File

@@ -1323,7 +1323,6 @@ TtaFfMacScheduler::DoSchedUlTriggerReq(
// Generate RBs map
FfMacSchedSapUser::SchedUlConfigIndParameters ret;
std::vector<bool> rbMap;
uint16_t rbAllocatedNum = 0;
std::set<uint16_t> rntiAllocated;
std::vector<uint16_t> rbgAllocationMap;
// update with RACH allocation map
@@ -1397,7 +1396,6 @@ TtaFfMacScheduler::DoSchedUlTriggerReq(
rbMap.at(j) = true;
rbgAllocationMap.at(j) = dci.m_rnti;
NS_LOG_INFO("\tRB " << j);
rbAllocatedNum++;
}
NS_LOG_INFO(this << " Send retx in the same RBs " << (uint16_t)dci.m_rbStart
<< " to " << dci.m_rbStart + dci.m_rbLen << " RV "

18
src/lte/test/test-lte-x2-handover.cc
View File

@@ -748,16 +748,16 @@ LteX2HandoverTestSuite::LteX2HandoverTestSuite()
ue2bwd,
};
std::string hel6name("2 fwd");
const std::list<HandoverEvent> hel6{
ue2fwd,
};
// std::string hel6name("2 fwd");
// const std::list<HandoverEvent> hel6{
// ue2fwd,
// };
std::string hel7name("2 fwd & bwd");
const std::list<HandoverEvent> hel7{
ue2fwd,
ue2bwd,
};
// std::string hel7name("2 fwd & bwd");
// const std::list<HandoverEvent> hel7{
// ue2fwd,
// ue2bwd,
// };
std::vector<std::string> schedulers{
"ns3::RrFfMacScheduler",