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

Convert UL-CQI from IdealControlMessage to PhySap Primitive

Browse Source
This commit is contained in:
mmiozzo
2011-03-31 16:57:24 +02:00
parent 31b03f738a 4b10c1117e
commit e455da9754
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/lte/helper/rlc-stats-calculator.cc
View File

@@ -66,16 +66,16 @@ RlcStatsCalculator::SetOutputFilename (std::string outputFilename)
void
RlcStatsCalculator::TxPdu (uint16_t rnti, uint8_t lcid, uint32_t packetSize)
{
NS_LOG_FUNCTION (this << " TxPDU " << rnti << (uint32_t) lcid << packetSize);
NS_LOG_FUNCTION (this << "TxPDU" << rnti << (uint32_t) lcid << packetSize);
RntiLcidPair pair = RntiLcidPair(rnti, lcid);
uint32Map::iterator it = m_txPackets.find (pair);
m_txPackets[pair]++;
}
void
RlcStatsCalculator::RxPdu (uint16_t rnti, uint8_t lcid, uint32_t packetSize, uint64_t delay)
{
NS_LOG_FUNCTION (this << " RxPDU " << rnti << (uint32_t) lcid << packetSize << delay);
NS_LOG_FUNCTION (this << "RxPDU" << rnti << (uint32_t) lcid << packetSize << delay);
RntiLcidPair pair = RntiLcidPair(rnti, lcid);
m_rxPackets [pair]++;
@@ -175,6 +175,7 @@ double
RlcStatsCalculator::GetThroughput (RntiLcidPair p)
{
// TODO: Fix throughput calculation with the correct time
// NOTE: At this moment, Simulator::Now() is not available anymore
//return (double) m_rxData[p] / Simulator::Now().GetSeconds();
return 0;
}

11
src/lte/helper/rlc-stats-calculator.h
View File

@@ -43,20 +43,21 @@ struct RntiLcidPair
friend bool operator == (const RntiLcidPair &a, const RntiLcidPair &b)
{
return (a.lcid == b.lcid) && (a.rnti == b.rnti);
return ( (a.rnti == b.rnti) && (a.lcid == b.lcid) );
}
friend bool operator < (const RntiLcidPair &a, const RntiLcidPair &b)
{
return (a.lcid < b.lcid) || (a.rnti < b.rnti);
return ( (a.rnti < b.rnti) || ( (a.rnti == b.rnti) && (a.lcid < b.lcid) ) );
}
};
typedef std::map<RntiLcidPair, uint32_t> uint32Map;
typedef std::map<RntiLcidPair, uint64_t> uint64Map;
typedef std::map<RntiLcidPair, Ptr<MinMaxAvgTotalCalculator<uint64_t> > > uint64StatsMap;
typedef std::pair<RntiLcidPair, std::string> uint32Pair;
typedef std::pair<RntiLcidPair, uint64_t> uint64Pair;
typedef std::pair<RntiLcidPair, Ptr<MinMaxAvgTotalCalculator<uint64_t> > > uint64StatsPair;
// TODO: Really useful? Maybe to remove
// typedef std::pair<RntiLcidPair, std::string> uint32Pair;
// typedef std::pair<RntiLcidPair, uint64_t> uint64Pair;
// typedef std::pair<RntiLcidPair, Ptr<MinMaxAvgTotalCalculator<uint64_t> > > uint64StatsPair;
class RlcStatsCalculator : public Object
{