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

LenaRrFfMacSchedulerTestCase works, to be refined

Browse Source
This commit is contained in:
Marco Miozzo
2011-05-02 17:37:17 +02:00
parent a10e5520b7
commit 74e2ceebe8
2 changed files with 44 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,33 +41,33 @@ NS_LOG_COMPONENT_DEFINE ("LenaTestRrFfMacCheduler");
using namespace ns3;
// void
// UlTxPduCallback(Ptr<RlcStatsCalculator> rlcStats, std::string path,
// uint16_t rnti, uint8_t lcid, uint32_t packetSize)
// {
// rlcStats->UlTxPdu(rnti, lcid, packetSize);
// }
//
// void
// UlRxPduCallback(Ptr<RlcStatsCalculator> rlcStats, std::string path,
// uint16_t rnti, uint8_t lcid, uint32_t packetSize, uint64_t delay)
// {
// rlcStats->UlRxPdu(rnti, lcid, packetSize, delay);
// }
//
// void
// DlTxPduCallback(Ptr<RlcStatsCalculator> rlcStats, std::string path,
// uint16_t rnti, uint8_t lcid, uint32_t packetSize)
// {
// rlcStats->DlTxPdu(rnti, lcid, packetSize);
// }
//
// void
// DlRxPduCallback(Ptr<RlcStatsCalculator> rlcStats, std::string path,
// uint16_t rnti, uint8_t lcid, uint32_t packetSize, uint64_t delay)
// {
// rlcStats->DlRxPdu(rnti, lcid, packetSize, delay);
// }
void
UlTxPduCallback(Ptr<RlcStatsCalculator> rlcStats, std::string path,
uint16_t rnti, uint8_t lcid, uint32_t packetSize)
{
rlcStats->UlTxPdu(rnti, lcid, packetSize);
}
void
UlRxPduCallback(Ptr<RlcStatsCalculator> rlcStats, std::string path,
uint16_t rnti, uint8_t lcid, uint32_t packetSize, uint64_t delay)
{
rlcStats->UlRxPdu(rnti, lcid, packetSize, delay);
}
void
DlTxPduCallback(Ptr<RlcStatsCalculator> rlcStats, std::string path,
uint16_t rnti, uint8_t lcid, uint32_t packetSize)
{
rlcStats->DlTxPdu(rnti, lcid, packetSize);
}
void
DlRxPduCallback(Ptr<RlcStatsCalculator> rlcStats, std::string path,
uint16_t rnti, uint8_t lcid, uint32_t packetSize, uint64_t delay)
{
rlcStats->DlRxPdu(rnti, lcid, packetSize, delay);
}
@@ -120,8 +120,9 @@ LenaRrFfMacSchedulerTestCase::DoRun (void)
LogComponentEnable ("LteUeNetDevice", LOG_LEVEL_ALL);
LogComponentEnable ("LteEnbNetDevice", LOG_LEVEL_ALL);
LogComponentEnable ("LenaTestSinrChunkProcessor", LOG_LEVEL_ALL);
LogComponentEnable ("LenaTest", LOG_LEVEL_ALL);
LogComponentEnable ("LenaTestRrFfMacCheduler", LOG_LEVEL_ALL);
LogComponentEnable ("RlcStatsCalculator", LOG_LEVEL_ALL);
/**
* Initialize Simulation Scenario: 1 eNB and 2 UEs
@@ -159,9 +160,18 @@ LenaRrFfMacSchedulerTestCase::DoRun (void)
lena->ActivateEpsBearer (ueDevs, bearer);
Simulator::Stop (Seconds (0.005));
Simulator::Stop (Seconds (0.050));
Ptr<RlcStatsCalculator> rlcStats = CreateObject<RlcStatsCalculator> ();
Config::Connect("/NodeList/0/DeviceList/0/LteEnbRrc/UeMap/*/RadioBearerMap/*/LteRlc/TxPDU",
MakeBoundCallback(&DlTxPduCallback, rlcStats));
Config::Connect("/NodeList/*/DeviceList/0/LteUeRrc/RlcMap/*/RxPDU",
MakeBoundCallback(&DlRxPduCallback, rlcStats));
Config::Connect("/NodeList/*/DeviceList/0/LteUeRrc/RlcMap/*/TxPDU",
MakeBoundCallback(&UlTxPduCallback, rlcStats));
Config::Connect ("/NodeList/0/DeviceList/0/LteEnbRrc/UeMap/*/RadioBearerMap/*/LteRlc/RxPDU",
MakeBoundCallback(&UlRxPduCallback, rlcStats));
Simulator::Run ();

8
src/lte/wscript
View File

@@ -48,8 +48,8 @@ def build(bld):
'test/lena-test-suite.cc',
'test/lena-test-downlink-sinr.cc',
'test/lena-test-sinr-chunk-processor.cc',
'test/lena-test-rr-ff-mac-scheduler.cc',
'test/lena-test-pf-ff-mac-scheduler.cc',
'test/lte-test-rr-ff-mac-scheduler.cc',
'test/lte-test-pf-ff-mac-scheduler.cc',
]
headers = bld.new_task_gen('ns3header')
@@ -99,8 +99,8 @@ def build(bld):
'model/pf-ff-mac-scheduler.h',
'test/lena-test-downlink-sinr.h',
'test/lena-test-sinr-chunk-processor.h',
'test/lena-test-rr-ff-mac-scheduler.h',
'test/lena-test-pf-ff-mac-scheduler.h',
'test/lte-test-rr-ff-mac-scheduler.h',
'test/lte-test-pf-ff-mac-scheduler.h',
]
if (bld.env['ENABLE_EXAMPLES']):