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

RlcStatsCalculator --> RadioBearerStatsCalculator

Browse Source
This commit is contained in:
Nicola Baldo
2011-12-05 21:19:59 +01:00
parent 744f8bc2b1
commit 17854f46ca
10 changed files with 71 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/lte/doc/source/lte-user.rst
View File

@@ -209,9 +209,9 @@ level Key Performance Indicators (KPIs). You can enable it in the following way:
RLC KPIs are calculated over a time interval and stored on two ASCII
files, one for uplink and one for downlink. The time interval duration
and the name of the files can be controlled using the attributes
``ns3::RlcStatsCalculator::EpochDuration``,
``ns3::RlcStatsCalculator::DlOutputFilename`` and
``ns3::RlcStatsCalculator::UlOutputFilename``.
``ns3::RadioBearerStatsCalculator::EpochDuration``,
``ns3::RadioBearerStatsCalculator::DlOutputFilename`` and
``ns3::RadioBearerStatsCalculator::UlOutputFilename``.
The content of the columns of these files is the following (the same
for uplink and downlink):

2
src/lte/examples/lena-intercell-interference.cc
View File

@@ -25,7 +25,7 @@
#include "ns3/mobility-module.h"
#include "ns3/lte-module.h"
#include "ns3/config-store.h"
#include "ns3/rlc-stats-calculator.h"
#include "ns3/radio-bearer-stats-calculator.h"
#include <iomanip>
#include <string>

2
src/lte/examples/lena-pathloss-traces.cc
View File

@@ -25,7 +25,7 @@
#include "ns3/mobility-module.h"
#include "ns3/lte-module.h"
#include "ns3/config-store.h"
#include "ns3/rlc-stats-calculator.h"
#include "ns3/radio-bearer-stats-calculator.h"
#include <iomanip>
#include <string>

18
src/lte/helper/lte-helper.cc
View File

@@ -109,10 +109,10 @@ LteHelper::DoStart (void)
m_macStats = CreateObject<MacStatsCalculator> ();
m_macStats->SetDlOutputFilename("DlMacStats.csv");
m_macStats->SetUlOutputFilename("UlMacStats.csv");
m_rlcStats = CreateObject<RlcStatsCalculator> ();
m_rlcStats = CreateObject<RadioBearerStatsCalculator> ();
m_rlcStats->SetDlOutputFilename("DlRlcStats.csv");
m_rlcStats->SetUlOutputFilename("UlRlcStats.csv");
m_pdcpStats = CreateObject<RlcStatsCalculator> ();
m_pdcpStats = CreateObject<RadioBearerStatsCalculator> ();
m_pdcpStats->SetDlOutputFilename("DlPdcpStats.csv");
m_pdcpStats->SetUlOutputFilename("UlPdcpStats.csv");
@@ -568,7 +568,7 @@ LteHelper::EnableLogComponents (void)
LogComponentEnable ("LteUeNetDevice", LOG_LEVEL_ALL);
LogComponentEnable ("LteEnbNetDevice", LOG_LEVEL_ALL);
LogComponentEnable ("RlcStatsCalculator", LOG_LEVEL_ALL);
LogComponentEnable ("RadioBearerStatsCalculator", LOG_LEVEL_ALL);
LogComponentEnable ("MacStatsCalculator", LOG_LEVEL_ALL);
}
@@ -687,7 +687,7 @@ FindCellIdFromEnbMac (std::string path, uint16_t rnti)
void
DlTxPduCallback (Ptr<RlcStatsCalculator> rlcStats, std::string path,
DlTxPduCallback (Ptr<RadioBearerStatsCalculator> rlcStats, std::string path,
uint16_t rnti, uint8_t lcid, uint32_t packetSize)
{
NS_LOG_FUNCTION (rlcStats << path << rnti << lcid << packetSize);
@@ -715,7 +715,7 @@ DlTxPduCallback (Ptr<RlcStatsCalculator> rlcStats, std::string path,
}
void
DlRxPduCallback (Ptr<RlcStatsCalculator> rlcStats, std::string path,
DlRxPduCallback (Ptr<RadioBearerStatsCalculator> rlcStats, std::string path,
uint16_t rnti, uint8_t lcid, uint32_t packetSize, uint64_t delay)
{
NS_LOG_FUNCTION (rlcStats << path << rnti << lcid << packetSize << delay);
@@ -743,7 +743,7 @@ LteHelper::EnableDlRlcTraces (void)
}
void
UlTxPduCallback (Ptr<RlcStatsCalculator> rlcStats, std::string path,
UlTxPduCallback (Ptr<RadioBearerStatsCalculator> rlcStats, std::string path,
uint16_t rnti, uint8_t lcid, uint32_t packetSize)
{
NS_LOG_FUNCTION (rlcStats << path << rnti << lcid << packetSize);
@@ -761,7 +761,7 @@ UlTxPduCallback (Ptr<RlcStatsCalculator> rlcStats, std::string path,
}
void
UlRxPduCallback (Ptr<RlcStatsCalculator> rlcStats, std::string path,
UlRxPduCallback (Ptr<RadioBearerStatsCalculator> rlcStats, std::string path,
uint16_t rnti, uint8_t lcid, uint32_t packetSize, uint64_t delay)
{
NS_LOG_FUNCTION (rlcStats << path << rnti << lcid << packetSize << delay);
@@ -896,7 +896,7 @@ LteHelper::SetTraceDirectory (std::string path)
m_rlcStats->SetUlOutputFilename(path + m_rlcStats->GetUlOutputFilename());
}
Ptr<RlcStatsCalculator>
Ptr<RadioBearerStatsCalculator>
LteHelper::GetRlcStats (void)
{
return m_rlcStats;
@@ -928,7 +928,7 @@ LteHelper::EnableUlPdcpTraces (void)
MakeBoundCallback (&UlRxPduCallback, m_pdcpStats));
}
Ptr<RlcStatsCalculator>
Ptr<RadioBearerStatsCalculator>
LteHelper::GetPdcpStats (void)
{
return m_pdcpStats;

10
src/lte/helper/lte-helper.h
View File

@@ -30,7 +30,7 @@
#include <ns3/node-container.h>
#include <ns3/eps-bearer.h>
#include <ns3/mac-stats-calculator.h>
#include <ns3/rlc-stats-calculator.h>
#include <ns3/radio-bearer-stats-calculator.h>
#include <ns3/lte-tft.h>
#include <ns3/trace-fading-loss-model.h>
@@ -232,7 +232,7 @@ public:
*
* \return the RLC stats calculator object
*/
Ptr<RlcStatsCalculator> GetRlcStats (void);
Ptr<RadioBearerStatsCalculator> GetRlcStats (void);
/**
* Enable trace sinks for PDCP layer
@@ -253,7 +253,7 @@ public:
*
* \return the PDCP stats calculator object
*/
Ptr<RlcStatsCalculator> GetPdcpStats (void);
Ptr<RadioBearerStatsCalculator> GetPdcpStats (void);
protected:
// inherited from Object
@@ -282,8 +282,8 @@ private:
Ptr<TraceFadingLossModel> m_fadingModule;
Ptr<MacStatsCalculator> m_macStats;
Ptr<RlcStatsCalculator> m_rlcStats;
Ptr<RlcStatsCalculator> m_pdcpStats;
Ptr<RadioBearerStatsCalculator> m_rlcStats;
Ptr<RadioBearerStatsCalculator> m_pdcpStats;
enum LteEpsBearerToRlcMapping_t {RLC_SM_ALWAYS = 1,
RLC_UM_ALWAYS = 2,

72
src/lte/helper/rlc-stats-calculator.cc → src/lte/helper/radio-bearer-stats-calculator.cc
View File

@@ -18,7 +18,7 @@
* Author: Jaume Nin <jnin@cttc.es>
*/
#include "rlc-stats-calculator.h"
#include "radio-bearer-stats-calculator.h"
#include "ns3/string.h"
#include "ns3/nstime.h"
#include <ns3/log.h>
@@ -27,45 +27,45 @@
namespace ns3 {
NS_LOG_COMPONENT_DEFINE ("RlcStatsCalculator");
NS_LOG_COMPONENT_DEFINE ("RadioBearerStatsCalculator");
NS_OBJECT_ENSURE_REGISTERED (RlcStatsCalculator);
NS_OBJECT_ENSURE_REGISTERED (RadioBearerStatsCalculator);
RlcStatsCalculator::RlcStatsCalculator ()
RadioBearerStatsCalculator::RadioBearerStatsCalculator ()
: m_firstWrite (true)
{
NS_LOG_FUNCTION (this);
}
RlcStatsCalculator::~RlcStatsCalculator ()
RadioBearerStatsCalculator::~RadioBearerStatsCalculator ()
{
NS_LOG_FUNCTION (this);
ShowResults ();
}
TypeId
RlcStatsCalculator::GetTypeId (void)
RadioBearerStatsCalculator::GetTypeId (void)
{
static TypeId tid =
TypeId ("ns3::RlcStatsCalculator")
TypeId ("ns3::RadioBearerStatsCalculator")
.SetParent<Object> ()
.AddConstructor<RlcStatsCalculator> ()
.AddConstructor<RadioBearerStatsCalculator> ()
.AddAttribute ("StartTime",
"Start time of the on going epoch.",
TimeValue (Seconds (0.)),
MakeTimeAccessor (&RlcStatsCalculator::m_startTime),
MakeTimeAccessor (&RadioBearerStatsCalculator::m_startTime),
MakeTimeChecker ())
.AddAttribute ("EpochDuration",
"Epoch duration.",
TimeValue (Seconds (0.25)),
MakeTimeAccessor (&RlcStatsCalculator::m_epochDuration),
MakeTimeAccessor (&RadioBearerStatsCalculator::m_epochDuration),
MakeTimeChecker ());
return tid;
}
void
RlcStatsCalculator::UlTxPdu (uint64_t imsi, uint16_t rnti,
RadioBearerStatsCalculator::UlTxPdu (uint64_t imsi, uint16_t rnti,
uint8_t lcid, uint32_t packetSize)
{
NS_LOG_FUNCTION (this << "UlTxPDU" << imsi << rnti << (uint32_t) lcid << packetSize);
@@ -80,7 +80,7 @@ RlcStatsCalculator::UlTxPdu (uint64_t imsi, uint16_t rnti,
}
void
RlcStatsCalculator::DlTxPdu (uint16_t cellId, uint64_t imsi, uint16_t rnti,
RadioBearerStatsCalculator::DlTxPdu (uint16_t cellId, uint64_t imsi, uint16_t rnti,
uint8_t lcid, uint32_t packetSize)
{
NS_LOG_FUNCTION (this << "DlTxPDU" << imsi << rnti << (uint32_t) lcid << packetSize);
@@ -106,7 +106,7 @@ RlcStatsCalculator::DlTxPdu (uint16_t cellId, uint64_t imsi, uint16_t rnti,
}
void
RlcStatsCalculator::UlRxPdu (uint16_t cellId, uint64_t imsi, uint16_t rnti,
RadioBearerStatsCalculator::UlRxPdu (uint16_t cellId, uint64_t imsi, uint16_t rnti,
uint8_t lcid, uint32_t packetSize, uint64_t delay)
{
NS_LOG_FUNCTION (this << "UlRxPDU" << imsi << rnti << (uint32_t) lcid << packetSize << delay);
@@ -143,7 +143,7 @@ RlcStatsCalculator::UlRxPdu (uint16_t cellId, uint64_t imsi, uint16_t rnti,
}
void
RlcStatsCalculator::DlRxPdu (uint64_t imsi, uint16_t rnti,
RadioBearerStatsCalculator::DlRxPdu (uint64_t imsi, uint16_t rnti,
uint8_t lcid, uint32_t packetSize, uint64_t delay)
{
NS_LOG_FUNCTION (this << "DlRxPDU" << imsi << rnti << (uint32_t) lcid << packetSize << delay);
@@ -167,7 +167,7 @@ RlcStatsCalculator::DlRxPdu (uint64_t imsi, uint16_t rnti,
}
void
RlcStatsCalculator::ShowResults (void)
RadioBearerStatsCalculator::ShowResults (void)
{
NS_LOG_FUNCTION (this << GetUlOutputFilename ().c_str () << GetDlOutputFilename ().c_str () );
@@ -227,7 +227,7 @@ RlcStatsCalculator::ShowResults (void)
}
void
RlcStatsCalculator::WriteUlResults (std::ofstream& outFile)
RadioBearerStatsCalculator::WriteUlResults (std::ofstream& outFile)
{
NS_LOG_FUNCTION (this);
@@ -276,7 +276,7 @@ RlcStatsCalculator::WriteUlResults (std::ofstream& outFile)
}
void
RlcStatsCalculator::WriteDlResults (std::ofstream& outFile)
RadioBearerStatsCalculator::WriteDlResults (std::ofstream& outFile)
{
NS_LOG_FUNCTION (this);
@@ -324,7 +324,7 @@ RlcStatsCalculator::WriteDlResults (std::ofstream& outFile)
}
void
RlcStatsCalculator::ResetResults (void)
RadioBearerStatsCalculator::ResetResults (void)
{
NS_LOG_FUNCTION (this);
@@ -344,7 +344,7 @@ RlcStatsCalculator::ResetResults (void)
}
void
RlcStatsCalculator::CheckEpoch (bool forceEpoch)
RadioBearerStatsCalculator::CheckEpoch (bool forceEpoch)
{
NS_LOG_FUNCTION (this);
@@ -358,14 +358,14 @@ RlcStatsCalculator::CheckEpoch (bool forceEpoch)
}
void
RlcStatsCalculator::StartEpoch (void)
RadioBearerStatsCalculator::StartEpoch (void)
{
NS_LOG_FUNCTION (this);
m_startTime += m_epochDuration;
}
uint32_t
RlcStatsCalculator::GetUlTxPackets (uint64_t imsi, uint8_t lcid)
RadioBearerStatsCalculator::GetUlTxPackets (uint64_t imsi, uint8_t lcid)
{
NS_LOG_FUNCTION (this << imsi << (uint16_t) lcid);
ImsiLcidPair_t p (imsi, lcid);
@@ -373,7 +373,7 @@ RlcStatsCalculator::GetUlTxPackets (uint64_t imsi, uint8_t lcid)
}
uint32_t
RlcStatsCalculator::GetUlRxPackets (uint64_t imsi, uint8_t lcid)
RadioBearerStatsCalculator::GetUlRxPackets (uint64_t imsi, uint8_t lcid)
{
NS_LOG_FUNCTION (this << imsi << (uint16_t) lcid);
ImsiLcidPair_t p (imsi, lcid);
@@ -381,7 +381,7 @@ RlcStatsCalculator::GetUlRxPackets (uint64_t imsi, uint8_t lcid)
}
uint64_t
RlcStatsCalculator::GetUlTxData (uint64_t imsi, uint8_t lcid)
RadioBearerStatsCalculator::GetUlTxData (uint64_t imsi, uint8_t lcid)
{
NS_LOG_FUNCTION (this << imsi << (uint16_t) lcid);
ImsiLcidPair_t p (imsi, lcid);
@@ -389,7 +389,7 @@ RlcStatsCalculator::GetUlTxData (uint64_t imsi, uint8_t lcid)
}
uint64_t
RlcStatsCalculator::GetUlRxData (uint64_t imsi, uint8_t lcid)
RadioBearerStatsCalculator::GetUlRxData (uint64_t imsi, uint8_t lcid)
{
NS_LOG_FUNCTION (this << imsi << (uint16_t) lcid);
ImsiLcidPair_t p (imsi, lcid);
@@ -397,7 +397,7 @@ RlcStatsCalculator::GetUlRxData (uint64_t imsi, uint8_t lcid)
}
double
RlcStatsCalculator::GetUlDelay (uint64_t imsi, uint8_t lcid)
RadioBearerStatsCalculator::GetUlDelay (uint64_t imsi, uint8_t lcid)
{
NS_LOG_FUNCTION (this << imsi << (uint16_t) lcid);
ImsiLcidPair_t p (imsi, lcid);
@@ -412,7 +412,7 @@ RlcStatsCalculator::GetUlDelay (uint64_t imsi, uint8_t lcid)
}
std::vector<double>
RlcStatsCalculator::GetUlDelayStats (uint64_t imsi, uint8_t lcid)
RadioBearerStatsCalculator::GetUlDelayStats (uint64_t imsi, uint8_t lcid)
{
NS_LOG_FUNCTION (this << imsi << (uint16_t) lcid);
ImsiLcidPair_t p (imsi, lcid);
@@ -432,7 +432,7 @@ RlcStatsCalculator::GetUlDelayStats (uint64_t imsi, uint8_t lcid)
}
std::vector<double>
RlcStatsCalculator::GetUlPduSizeStats (uint64_t imsi, uint8_t lcid)
RadioBearerStatsCalculator::GetUlPduSizeStats (uint64_t imsi, uint8_t lcid)
{
NS_LOG_FUNCTION (this << imsi << (uint16_t) lcid);
ImsiLcidPair_t p (imsi, lcid);
@@ -452,7 +452,7 @@ RlcStatsCalculator::GetUlPduSizeStats (uint64_t imsi, uint8_t lcid)
}
uint32_t
RlcStatsCalculator::GetDlTxPackets (uint64_t imsi, uint8_t lcid)
RadioBearerStatsCalculator::GetDlTxPackets (uint64_t imsi, uint8_t lcid)
{
NS_LOG_FUNCTION (this << imsi << (uint16_t) lcid);
ImsiLcidPair_t p (imsi, lcid);
@@ -460,7 +460,7 @@ RlcStatsCalculator::GetDlTxPackets (uint64_t imsi, uint8_t lcid)
}
uint32_t
RlcStatsCalculator::GetDlRxPackets (uint64_t imsi, uint8_t lcid)
RadioBearerStatsCalculator::GetDlRxPackets (uint64_t imsi, uint8_t lcid)
{
NS_LOG_FUNCTION (this << imsi << (uint16_t) lcid);
ImsiLcidPair_t p (imsi, lcid);
@@ -468,7 +468,7 @@ RlcStatsCalculator::GetDlRxPackets (uint64_t imsi, uint8_t lcid)
}
uint64_t
RlcStatsCalculator::GetDlTxData (uint64_t imsi, uint8_t lcid)
RadioBearerStatsCalculator::GetDlTxData (uint64_t imsi, uint8_t lcid)
{
NS_LOG_FUNCTION (this << imsi << (uint16_t) lcid);
ImsiLcidPair_t p (imsi, lcid);
@@ -476,7 +476,7 @@ RlcStatsCalculator::GetDlTxData (uint64_t imsi, uint8_t lcid)
}
uint64_t
RlcStatsCalculator::GetDlRxData (uint64_t imsi, uint8_t lcid)
RadioBearerStatsCalculator::GetDlRxData (uint64_t imsi, uint8_t lcid)
{
NS_LOG_FUNCTION (this << imsi << (uint16_t) lcid);
ImsiLcidPair_t p (imsi, lcid);
@@ -484,7 +484,7 @@ RlcStatsCalculator::GetDlRxData (uint64_t imsi, uint8_t lcid)
}
uint32_t
RlcStatsCalculator::GetUlCellId (uint64_t imsi, uint8_t lcid)
RadioBearerStatsCalculator::GetUlCellId (uint64_t imsi, uint8_t lcid)
{
NS_LOG_FUNCTION (this << imsi << (uint16_t) lcid);
ImsiLcidPair_t p (imsi, lcid);
@@ -492,7 +492,7 @@ RlcStatsCalculator::GetUlCellId (uint64_t imsi, uint8_t lcid)
}
uint32_t
RlcStatsCalculator::GetDlCellId (uint64_t imsi, uint8_t lcid)
RadioBearerStatsCalculator::GetDlCellId (uint64_t imsi, uint8_t lcid)
{
NS_LOG_FUNCTION (this << imsi << (uint16_t) lcid);
ImsiLcidPair_t p (imsi, lcid);
@@ -500,7 +500,7 @@ RlcStatsCalculator::GetDlCellId (uint64_t imsi, uint8_t lcid)
}
double
RlcStatsCalculator::GetDlDelay (uint64_t imsi, uint8_t lcid)
RadioBearerStatsCalculator::GetDlDelay (uint64_t imsi, uint8_t lcid)
{
NS_LOG_FUNCTION (this << imsi << (uint16_t) lcid);
ImsiLcidPair_t p (imsi, lcid);
@@ -514,7 +514,7 @@ RlcStatsCalculator::GetDlDelay (uint64_t imsi, uint8_t lcid)
}
std::vector<double>
RlcStatsCalculator::GetDlDelayStats (uint64_t imsi, uint8_t lcid)
RadioBearerStatsCalculator::GetDlDelayStats (uint64_t imsi, uint8_t lcid)
{
NS_LOG_FUNCTION (this << imsi << (uint16_t) lcid);
ImsiLcidPair_t p (imsi, lcid);
@@ -535,7 +535,7 @@ RlcStatsCalculator::GetDlDelayStats (uint64_t imsi, uint8_t lcid)
}
std::vector<double>
RlcStatsCalculator::GetDlPduSizeStats (uint64_t imsi, uint8_t lcid)
RadioBearerStatsCalculator::GetDlPduSizeStats (uint64_t imsi, uint8_t lcid)
{
NS_LOG_FUNCTION (this << imsi << (uint16_t) lcid);
ImsiLcidPair_t p (imsi, lcid);

12
src/lte/helper/rlc-stats-calculator.h → src/lte/helper/radio-bearer-stats-calculator.h
View File

@@ -18,8 +18,8 @@
* Author: Jaume Nin <jnin@cttc.es>
*/
#ifndef RLC_STATS_CALCULATOR_H_
#define RLC_STATS_CALCULATOR_H_
#ifndef RADIO_BEARER_STATS_CALCULATOR_H_
#define RADIO_BEARER_STATS_CALCULATOR_H_
#include "ns3/lte-stats-calculator.h"
#include "ns3/lte-common.h"
@@ -52,18 +52,18 @@ typedef std::map<ImsiLcidPair_t, LteFlowId_t> FlowIdMap;
* - Average, min, max and standard deviation of RLC to RLC delay
* - Average, min, max and standard deviation of RLC PDU size
*/
class RlcStatsCalculator : public LteStatsCalculator
class RadioBearerStatsCalculator : public LteStatsCalculator
{
public:
/**
* Class constructor
*/
RlcStatsCalculator ();
RadioBearerStatsCalculator ();
/**
* Class destructor
*/
virtual ~RlcStatsCalculator ();
virtual ~RadioBearerStatsCalculator ();
/**
* Inherited from ns3::Object
@@ -281,4 +281,4 @@ private:
} // namespace ns3
#endif /* RLC_STATS_CALCULATOR_H_ */
#endif /* RADIO_BEARER_STATS_CALCULATOR_H_ */

10
src/lte/test/lte-test-pf-ff-mac-scheduler.cc
View File

@@ -31,7 +31,7 @@
#include <ns3/simulator.h>
#include <ns3/packet.h>
#include <ns3/ptr.h>
#include "ns3/rlc-stats-calculator.h"
#include "ns3/radio-bearer-stats-calculator.h"
#include <ns3/constant-position-mobility-model.h>
#include "ns3/lte-test-pf-ff-mac-scheduler.h"
#include <ns3/eps-bearer.h>
@@ -233,7 +233,7 @@ LenaPfFfMacSchedulerTestCase1::DoRun (void)
// LogComponentEnable ("PfFfMacScheduler", LOG_LEVEL_ALL);
LogComponentEnable ("LenaTestPfFfMacCheduler", LOG_LEVEL_ALL);
// LogComponentEnable ("LteAmc", LOG_LEVEL_ALL);
// LogComponentEnable ("RlcStatsCalculator", LOG_LEVEL_ALL);
// LogComponentEnable ("RadioBearerStatsCalculator", LOG_LEVEL_ALL);
/**
* Initialize Simulation Scenario: 1 eNB and m_nUser UEs
@@ -293,7 +293,7 @@ LenaPfFfMacSchedulerTestCase1::DoRun (void)
double tolerance = 0.1;
Simulator::Stop (Seconds (simulationTime));
Ptr<RlcStatsCalculator> rlcStats = lteHelper->GetRlcStats ();
Ptr<RadioBearerStatsCalculator> rlcStats = lteHelper->GetRlcStats ();
rlcStats->SetAttribute ("EpochDuration", TimeValue (Seconds (simulationTime)));
Simulator::Run ();
@@ -414,7 +414,7 @@ LenaPfFfMacSchedulerTestCase2::DoRun (void)
// LogComponentEnable ("PfFfMacScheduler", LOG_LEVEL_ALL);
LogComponentEnable ("LenaTestPfFfMacCheduler", LOG_LEVEL_ALL);
// LogComponentEnable ("LteAmc", LOG_LEVEL_ALL);
// LogComponentEnable ("RlcStatsCalculator", LOG_LEVEL_ALL);
// LogComponentEnable ("RadioBearerStatsCalculator", LOG_LEVEL_ALL);
/**
* Initialize Simulation Scenario: 1 eNB and m_nUser UEs
@@ -474,7 +474,7 @@ LenaPfFfMacSchedulerTestCase2::DoRun (void)
double tolerance = 0.1;
Simulator::Stop (Seconds (simulationTime));
Ptr<RlcStatsCalculator> rlcStats = lteHelper->GetRlcStats ();
Ptr<RadioBearerStatsCalculator> rlcStats = lteHelper->GetRlcStats ();
rlcStats->SetAttribute ("EpochDuration", TimeValue (Seconds (simulationTime)));
Simulator::Run ();

6
src/lte/test/lte-test-rr-ff-mac-scheduler.cc
View File

@@ -27,7 +27,7 @@
#include <ns3/packet.h>
#include <ns3/ptr.h>
#include <iostream>
#include "ns3/rlc-stats-calculator.h"
#include "ns3/radio-bearer-stats-calculator.h"
#include <ns3/constant-position-mobility-model.h>
#include "ns3/lte-test-rr-ff-mac-scheduler.h"
#include <ns3/eps-bearer.h>
@@ -219,7 +219,7 @@ LenaRrFfMacSchedulerTestCase::DoRun (void)
// LogComponentEnable ("RrFfMacScheduler", LOG_LEVEL_ALL);
// LogComponentEnable ("LenaTestRrFfMacCheduler", LOG_LEVEL_ALL);
// LogComponentEnable ("LteHelper", LOG_LEVEL_ALL);
// LogComponentEnable ("RlcStatsCalculator", LOG_LEVEL_ALL);
// LogComponentEnable ("RadioBearerStatsCalculator", LOG_LEVEL_ALL);
/**
@@ -281,7 +281,7 @@ LenaRrFfMacSchedulerTestCase::DoRun (void)
double tolerance = 0.1;
Simulator::Stop (Seconds (simulationTime));
Ptr<RlcStatsCalculator> rlcStats = lteHelper->GetRlcStats ();
Ptr<RadioBearerStatsCalculator> rlcStats = lteHelper->GetRlcStats ();
rlcStats->SetAttribute ("EpochDuration", TimeValue (Seconds (simulationTime)));

4
src/lte/wscript
View File

@@ -36,7 +36,7 @@ def build(bld):
'helper/gtpu-tunnel-helper.cc',
'helper/lte-stats-calculator.cc',
'helper/epc-helper.cc',
'helper/rlc-stats-calculator.cc',
'helper/radio-bearer-stats-calculator.cc',
'helper/mac-stats-calculator.cc',
'model/ff-mac-csched-sap.cc',
'model/ff-mac-sched-sap.cc',
@@ -123,7 +123,7 @@ def build(bld):
'helper/lte-stats-calculator.h',
'helper/epc-helper.h',
'helper/mac-stats-calculator.h',
'helper/rlc-stats-calculator.h',
'helper/radio-bearer-stats-calculator.h',
'model/ff-mac-common.h',
'model/ff-mac-csched-sap.h',
'model/ff-mac-sched-sap.h',