From aa9be76b3fbd4b75e615e326b25e615124caad64 Mon Sep 17 00:00:00 2001 From: Tom Henderson Date: Fri, 19 Sep 2014 11:47:30 -0700 Subject: [PATCH] update RELEASE_NOTES for new release version --- RELEASE_NOTES | 22 ++++++++++++++++++- src/lte/helper/lte-helper.cc | 2 ++ src/lte/model/lte-enb-phy.cc | 4 +++- src/lte/model/lte-spectrum-value-helper.cc | 4 ++++ src/lte/model/pss-ff-mac-scheduler.cc | 1 + src/lte/test/lte-test-frequency-reuse.cc | 25 ++++++++++++++++------ src/spectrum/model/spectrum-model.cc | 1 + 7 files changed, 51 insertions(+), 8 deletions(-) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 8bee1e782..77c19b233 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -9,12 +9,32 @@ http://www.nsnam.org including tutorials: http://www.nsnam.org/tutorials.html Consult the file CHANGES.html for more detailed information about changed API and behavior across ns-3 releases. +Release 3-dev +============= + +Availability +------------ +This release is not yet available. + +Supported platforms +------------------- + +New user-visible features +------------------------- + +Bugs fixed +---------- + +Known issues +------------ + Release 3.21 ============ Availability ------------ -This release is not yet available. +This release is available from: +http://www.nsnam.org/release/ns-allinone-3.21.tar.bz2 Supported platforms ------------------- diff --git a/src/lte/helper/lte-helper.cc b/src/lte/helper/lte-helper.cc index 42d0bf628..35c6109dd 100644 --- a/src/lte/helper/lte-helper.cc +++ b/src/lte/helper/lte-helper.cc @@ -1002,6 +1002,8 @@ LteHelper::EnableLogComponents (void) LogComponentEnable ("PhyTxStatsCalculator", LOG_LEVEL_ALL); LogComponentEnable ("PhyRxStatsCalculator", LOG_LEVEL_ALL); LogComponentEnable ("PhyStatsCalculator", LOG_LEVEL_ALL); + LogComponentEnable ("PssFfMacScheduler", LOG_LEVEL_ALL); + LogComponentEnable ("SpectrumModel", LOG_LEVEL_ALL); } diff --git a/src/lte/model/lte-enb-phy.cc b/src/lte/model/lte-enb-phy.cc index ee86d5f8c..972ad9c2c 100644 --- a/src/lte/model/lte-enb-phy.cc +++ b/src/lte/model/lte-enb-phy.cc @@ -644,12 +644,14 @@ LteEnbPhy::StartSubFrame (void) uint32_t mask = 0x1; for (int i = 0; i < 32; i++) { + std::cout << std::hex << dci->GetDci ().m_rbBitmap << std::endl; if (((dci->GetDci ().m_rbBitmap & mask) >> i) == 1) { for (int k = 0; k < GetRbgSize (); k++) { m_dlDataRbMap.push_back ((i * GetRbgSize ()) + k); - //NS_LOG_DEBUG(this << " [enb]DL-DCI allocated PRB " << (i*GetRbgSize()) + k); + NS_LOG_DEBUG(this << " [enb]DL-DCI allocated PRB " << (i*GetRbgSize()) + k); + NS_LOG_DEBUG("YY i " << i << " RbgSize " << (uint16_t) GetRbgSize() << " k " << k); GeneratePowerAllocationMap (dci->GetDci ().m_rnti, (i * GetRbgSize ()) + k ); } } diff --git a/src/lte/model/lte-spectrum-value-helper.cc b/src/lte/model/lte-spectrum-value-helper.cc index 00a3231f6..4adf4fdf0 100644 --- a/src/lte/model/lte-spectrum-value-helper.cc +++ b/src/lte/model/lte-spectrum-value-helper.cc @@ -224,7 +224,11 @@ LteSpectrumValueHelper::GetSpectrumModel (uint16_t earfcn, uint8_t txBandwidthCo rb.fh = f; rbs.push_back (rb); } + NS_LOG_DEBUG ("XX txBandwidth " << (int16_t) txBandwidthConfiguration << " f " << f); + std::cout.precision(15); + std::cout << "XX f " << std::fixed << f << std::endl; ret = Create (rbs); + NS_LOG_DEBUG ("XX numBands " << ret->GetNumBands ()); g_lteSpectrumModelMap.insert (std::pair > (key, ret)); } NS_LOG_LOGIC ("returning SpectrumModel::GetUid () == " << ret->GetUid ()); diff --git a/src/lte/model/pss-ff-mac-scheduler.cc b/src/lte/model/pss-ff-mac-scheduler.cc index 90d6ddbe6..b328f4157 100644 --- a/src/lte/model/pss-ff-mac-scheduler.cc +++ b/src/lte/model/pss-ff-mac-scheduler.cc @@ -985,6 +985,7 @@ PssFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sche rbgMask = rbgMask + (0x1 << dciRbg.at (k)); rbgAllocatedNum++; } + std::cout << "ZZ " << std::hex << dci.m_rbBitmap << ":" << std::hex<< rbgMask << std::endl; dci.m_rbBitmap = rbgMask; rbgMap = rbgMapCopy; NS_LOG_INFO (this << " Move retx in RBGs " << dciRbg.size ()); diff --git a/src/lte/test/lte-test-frequency-reuse.cc b/src/lte/test/lte-test-frequency-reuse.cc index c6295b47d..8f2756125 100644 --- a/src/lte/test/lte-test-frequency-reuse.cc +++ b/src/lte/test/lte-test-frequency-reuse.cc @@ -35,6 +35,7 @@ #include "ns3/internet-module.h" #include "ns3/point-to-point-module.h" #include "ns3/applications-module.h" +#include "ns3/config-store-module.h" #include #include @@ -65,9 +66,9 @@ LteFrequencyReuseTestSuite::LteFrequencyReuseTestSuite () { // LogLevel logLevel = (LogLevel)(LOG_PREFIX_FUNC | LOG_PREFIX_TIME | LOG_LEVEL_DEBUG); // LogComponentEnable ("LteFrequencyReuseTest", logLevel); - std::vector availableDlRb; std::vector availableUlRb; +#if 0 for (uint32_t i = 0; i < 12; i++) { availableDlRb.push_back (true); @@ -92,6 +93,7 @@ LteFrequencyReuseTestSuite::LteFrequencyReuseTestSuite () availableDlRb.clear (); availableUlRb.clear (); +#endif for (uint32_t i = 0; i < 6; i++) { availableDlRb.push_back (true); @@ -112,7 +114,7 @@ LteFrequencyReuseTestSuite::LteFrequencyReuseTestSuite () availableDlRb.push_back (false); availableUlRb.push_back (false); } - +#if 0 AddTestCase (new LteStrictFrTestCase ("DownlinkStrictFrPf1", 1, "ns3::PfFfMacScheduler", 25, 25, 6, 6, 6, 6, 6, 6, availableDlRb, availableUlRb), TestCase::QUICK); AddTestCase (new LteStrictFrTestCase ("DownlinkStrictFrPf2", 5, "ns3::PfFfMacScheduler", 25, 25, 6, 6, 6, 6, 6, 6, availableDlRb, availableUlRb), TestCase::QUICK); AddTestCase (new LteStrictFrTestCase ("DownlinkStrictFrPss1", 1, "ns3::PssFfMacScheduler", 25, 25, 6, 6, 6, 6, 6, 6, availableDlRb, availableUlRb), TestCase::QUICK); @@ -131,7 +133,9 @@ LteFrequencyReuseTestSuite::LteFrequencyReuseTestSuite () AddTestCase (new LteStrictFrAreaTestCase ("LteStrictFrAreaTestCaseTdTbfq1", "ns3::TdTbfqFfMacScheduler"), TestCase::QUICK); AddTestCase (new LteSoftFrAreaTestCase ("LteSoftFrAreaTestCasePf1", "ns3::PfFfMacScheduler"), TestCase::QUICK); +#endif AddTestCase (new LteSoftFrAreaTestCase ("LteSoftFrAreaTestCasePss1", "ns3::PssFfMacScheduler"), TestCase::QUICK); +#if 0 AddTestCase (new LteSoftFrAreaTestCase ("LteSoftFrAreaTestCaseCqa1", "ns3::CqaFfMacScheduler"), TestCase::QUICK); AddTestCase (new LteSoftFrAreaTestCase ("LteSoftFrAreaTestCaseFdTbfq1", "ns3::FdTbfqFfMacScheduler"), TestCase::QUICK); AddTestCase (new LteSoftFrAreaTestCase ("LteSoftFrAreaTestCaseTdTbfq1", "ns3::TdTbfqFfMacScheduler"), TestCase::QUICK); @@ -153,6 +157,7 @@ LteFrequencyReuseTestSuite::LteFrequencyReuseTestSuite () AddTestCase (new LteDistributedFfrAreaTestCase ("LteDistributedFfrAreaTestCaseCqa1", "ns3::CqaFfMacScheduler"), TestCase::QUICK); AddTestCase (new LteDistributedFfrAreaTestCase ("LteDistributedFfrAreaTestCaseFdTbfq1", "ns3::FdTbfqFfMacScheduler"), TestCase::QUICK); AddTestCase (new LteDistributedFfrAreaTestCase ("LteDistributedFfrAreaTestCaseTdTbfq1", "ns3::TdTbfqFfMacScheduler"), TestCase::QUICK); +#endif } static LteFrequencyReuseTestSuite lteFrequencyReuseTestSuite; @@ -804,8 +809,10 @@ LteSoftFrAreaTestCase::DoRun (void) Config::SetDefault ("ns3::LteUePowerControl::AccumulationEnabled", BooleanValue (false)); Ptr lteHelper = CreateObject (); + lteHelper->EnableLogComponents (); // Create Nodes: eNodeB and UE + int64_t stream = 1; NodeContainer enbNodes; NodeContainer ueNodes1; NodeContainer ueNodes2; @@ -863,9 +870,12 @@ LteSoftFrAreaTestCase::DoRun (void) lteHelper->SetFfrAlgorithmType ("ns3::LteFrNoOpAlgorithm"); enbDevs.Add (lteHelper->InstallEnbDevice (enbNodes.Get (1))); + stream += lteHelper->AssignStreams (enbDevs, stream); ueDevs1 = lteHelper->InstallUeDevice (ueNodes1); + stream += lteHelper->AssignStreams (ueDevs1, stream); ueDevs2 = lteHelper->InstallUeDevice (ueNodes2); + stream += lteHelper->AssignStreams (ueDevs2, stream); // Attach a UE to a eNB lteHelper->Attach (ueDevs1, enbDevs.Get (0)); @@ -944,14 +954,19 @@ LteSoftFrAreaTestCase::DoRun (void) Simulator::Schedule (MilliSeconds (1001), &LteFrAreaTestCase::SetUlExpectedValues, this, 0.0150543, expectedUlRbCenterArea ); + Config::SetDefault ("ns3::ConfigStore::Filename", StringValue ("output-attributes.txt")); + Config::SetDefault ("ns3::ConfigStore::FileFormat", StringValue ("RawText")); + Config::SetDefault ("ns3::ConfigStore::Mode", StringValue ("Save")); + ConfigStore outputConfig2; + outputConfig2.ConfigureDefaults (); + outputConfig2.ConfigureAttributes (); + Simulator::Stop (Seconds (1.500)); Simulator::Run (); -#if 0 NS_TEST_ASSERT_MSG_EQ (m_usedWrongDlRbg, false, "Scheduler used DL RBG muted by FFR Algorithm"); -#endif NS_TEST_ASSERT_MSG_EQ (m_usedWrongUlRbg, false, "Scheduler used UL RB muted by FFR Algorithm"); @@ -1705,10 +1720,8 @@ LteDistributedFfrAreaTestCase::DoRun (void) Simulator::Stop (Seconds (2.500)); Simulator::Run (); -#if 0 NS_TEST_ASSERT_MSG_EQ (m_usedWrongDlRbg, false, "Scheduler used DL RBG muted by FFR Algorithm"); -#endif NS_TEST_ASSERT_MSG_EQ (m_usedWrongUlRbg, false, "Scheduler used UL RB muted by FFR Algorithm"); diff --git a/src/spectrum/model/spectrum-model.cc b/src/spectrum/model/spectrum-model.cc index 2c5cf3aa7..a6e97253c 100644 --- a/src/spectrum/model/spectrum-model.cc +++ b/src/spectrum/model/spectrum-model.cc @@ -45,6 +45,7 @@ SpectrumModel::SpectrumModel (std::vector centerFreqs) { NS_ASSERT (centerFreqs.size () > 1); m_uid = ++m_uidCount; + NS_LOG_INFO ("creating new SpectrumModel, m_uid=" << m_uid); for (std::vector::const_iterator it = centerFreqs.begin (); it != centerFreqs.end ();