tomh/ns-3-dev-spectrum-wifi: comparison src/lte/model/rr-ff-mac-scheduler.cc

equal deleted inserted replaced

-:2601b437f6aa
+:694926420210
 */
 #include <ns3/log.h>
 #include <ns3/pointer.h>
-#include "lte-amc.h"
+#include <ns3/lte-amc.h>
-#include "rr-ff-mac-scheduler.h"
+#include <ns3/rr-ff-mac-scheduler.h>
 #include <ns3/simulator.h>
+#include <ns3/lte-common.h>
 NS_LOG_COMPONENT_DEFINE ("RrFfMacScheduler");
 namespace ns3 {
 RrFfMacScheduler::RrFfMacScheduler ()
 :   m_cschedSapUser (0),
 m_schedSapUser (0),
-m_schedTtiDelay (2),
-// WILD ACK: based on a m_macChTtiDelay = 1
 m_nextRntiDl (0),
 m_nextRntiUl (0)
 {
 m_amc = CreateObject <LteAmc> ();
 m_cschedSapProvider = new RrSchedulerMemberCschedSapProvider (this);
 }
 void
 RrFfMacScheduler::DoCschedUeConfigReq (const struct FfMacCschedSapProvider::CschedUeConfigReqParameters& params)
 {
-NS_LOG_FUNCTION (this);
+NS_LOG_FUNCTION (this << " RNTI " << params.m_rnti << " txMode " << (uint16_t)params.m_transmissionMode);
-// Not used at this stage
+std::map <uint16_t,uint8_t>::iterator it = m_uesTxMode.find (params.m_rnti);
+if (it==m_uesTxMode.end ())
+{
+m_uesTxMode.insert (std::pair <uint16_t, double> (params.m_rnti, params.m_transmissionMode));
+}
+else
+{
+(*it).second = params.m_transmissionMode;
+}
 return;
 }
 void
 RrFfMacScheduler::DoCschedLcConfigReq (const struct FfMacCschedSapProvider::CschedLcConfigReqParameters& params)
 void
 RrFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::SchedDlTriggerReqParameters& params)
 {
-NS_LOG_FUNCTION (this << " Frame no. " << (params.m_sfnSf >> 4) << " subframe no. " << (0xF & params.m_sfnSf));
+NS_LOG_FUNCTION (this << " DL Frame no. " << (params.m_sfnSf >> 4) << " subframe no. " << (0xF & params.m_sfnSf));
 // API generated by RLC for triggering the scheduling of a DL subframe
 RefreshDlCqiMaps ();
 // Get the actual active flows (queue!=0)
 else
 {
 it = m_rlcBufferReq.begin ();
 m_nextRntiDl = (*it).m_rnti;
 }
+std::map <uint16_t,uint8_t>::iterator itTxMode;
 do
 {
 itLcRnti = lcActivesPerRnti.find ((*it).m_rnti);
 if (itLcRnti == lcActivesPerRnti.end ())
 {
 // restart from the first
 it = m_rlcBufferReq.begin ();
 }
 continue;
 }
+itTxMode = m_uesTxMode.find ((*it).m_rnti);
+if (itTxMode == m_uesTxMode.end())
+{
+NS_FATAL_ERROR ("No Transmission Mode info on user " << (*it).m_rnti);
+}
+int nLayer = TransmissionModesLayers::TxMode2LayerNum ((*itTxMode).second);
 int lcNum = (*itLcRnti).second;
 // create new BuildDataListElement_s for this RNTI
 BuildDataListElement_s newEl;
 newEl.m_rnti = (*it).m_rnti;
 // create the DlDciListElement_s
 DlDciListElement_s newDci;
 newDci.m_rnti = (*it).m_rnti;
 newDci.m_resAlloc = 0;
 newDci.m_rbBitmap = 0;
 std::map <uint16_t,uint8_t>::iterator itCqi = m_p10CqiRxed.find (newEl.m_rnti);
-if (itCqi == m_p10CqiRxed.end ())
+for (uint8_t i = 0; i < nLayer; i++)
 {
-newDci.m_mcs.push_back (0); // no info on this user -> lowest MCS
+if (itCqi == m_p10CqiRxed.end ())
-}
+{
-else
+newDci.m_mcs.push_back (0); // no info on this user -> lowest MCS
-{
+}
-newDci.m_mcs.push_back ( m_amc->GetMcsFromCqi ((*itCqi).second) );
+else
+{
+newDci.m_mcs.push_back ( m_amc->GetMcsFromCqi ((*itCqi).second) );
+}
 }
 // group the LCs of this RNTI
 std::vector <struct RlcPduListElement_s> newRlcPduLe;
 //       int totRbg = lcNum * rbgPerFlow;
 //       totRbg = rbgNum / nTbs;
 int tbSize = (m_amc->GetTbSizeFromMcs (newDci.m_mcs.at (0), rbgPerTb * rbgSize) / 8);
-NS_LOG_DEBUG (this << "Allocate user " << newEl.m_rnti << " LCs " << (uint16_t)(*itLcRnti).second << " bytes " << tbSize << " PRBs " << rbgPerTb * rbgSize << " mcs " << (uint16_t) newDci.m_mcs.at (0));
+NS_LOG_DEBUG (this << "Allocate user " << newEl.m_rnti << " LCs " << (uint16_t)(*itLcRnti).second << " bytes " << tbSize << " PRBs " <<  rbgAllocated * rbgSize << "..." << (rbgAllocated* rbgSize) + (rbgPerTb * rbgSize) - 1 << " mcs " << (uint16_t) newDci.m_mcs.at (0) << " layers " << nLayer);
 uint16_t rlcPduSize = tbSize / lcNum;
 for (int i = 0; i < lcNum ; i++)
 {
-RlcPduListElement_s newRlcEl;
+for (uint8_t j = 0; j < nLayer; j++)
-newRlcEl.m_logicalChannelIdentity = (*it).m_logicalChannelIdentity;
+{
-NS_LOG_DEBUG (this << "LCID " << (uint32_t) newRlcEl.m_logicalChannelIdentity << " size " << rlcPduSize << " ID " << (*it).m_rnti);
+RlcPduListElement_s newRlcEl;
-newRlcEl.m_size = rlcPduSize;
+newRlcEl.m_logicalChannelIdentity = (*it).m_logicalChannelIdentity;
-UpdateDlRlcBufferInfo ((*it).m_rnti, newRlcEl.m_logicalChannelIdentity, rlcPduSize);
+//               NS_LOG_DEBUG (this << "LCID " << (uint32_t) newRlcEl.m_logicalChannelIdentity << " size " << rlcPduSize << " ID " << (*it).m_rnti << " layer " << (uint16_t)j);
-newRlcPduLe.push_back (newRlcEl);
+newRlcEl.m_size = rlcPduSize;
+UpdateDlRlcBufferInfo ((*it).m_rnti, newRlcEl.m_logicalChannelIdentity, rlcPduSize);
+newRlcPduLe.push_back (newRlcEl);
+}
 it++;
 if (it == m_rlcBufferReq.end ())
 {
 // restart from the first
 it = m_rlcBufferReq.begin ();
 rbgMask = rbgMask + (0x1 << rbgAllocated);
 rbgAllocated++;
 }
 newDci.m_rbBitmap = rbgMask; // (32 bit bitmap see 7.1.6 of 36.213)
-int nbOfTbsInNewDci = 1;  // SISO -> only one TB
+for (int i = 0; i < nLayer; i++)
-for (int i = 0; i < nbOfTbsInNewDci; i++)
 {
 newDci.m_tbsSize.push_back (tbSize);
 newDci.m_ndi.push_back (1); // TBD (new data indicator)
 newDci.m_rv.push_back (0); // TBD (redundancy version)
 }
 }
 void
 RrFfMacScheduler::DoSchedUlTriggerReq (const struct FfMacSchedSapProvider::SchedUlTriggerReqParameters& params)
 {
-//   NS_LOG_FUNCTION (this << " Frame no. " << (params.m_sfnSf >> 4) << " subframe no. " << (0xF & params.m_sfnSf));
+NS_LOG_FUNCTION (this << " Ul - Frame no. " << (params.m_sfnSf >> 4) << " subframe no. " << (0xF & params.m_sfnSf));
 RefreshUlCqiMaps ();
 std::map <uint16_t,uint32_t>::iterator it;
 int cqi = 0;
 if (itCqi == m_ueCqi.end ())
 {
 // no cqi info about this UE
 uldci.m_mcs = 0; // MCS 0 -> UL-AMC TBD
-//NS_LOG_DEBUG (this << " UE does not have ULCQI " << (*it).first );
+NS_LOG_DEBUG (this << " UE does not have ULCQI " << (*it).first );
 }
 else
 {
 // take the lowest CQI value (worst RB)
 double minSinr = (*itCqi).second.at (uldci.m_rbStart);
 for (uint16_t i = uldci.m_rbStart; i < uldci.m_rbStart + uldci.m_rbLen; i++)
 {
-//NS_LOG_DEBUG (this << " UE " << (*it).first << " has CQI " << (*itCqi).second.at(i));
 if ((*itCqi).second.at (i) < minSinr)
 {
 minSinr = (*itCqi).second.at (i);
 }
 }
 it = m_ceBsrRxed.begin ();
 }
 continue; // CQI == 0 means "out of range" (see table 7.2.3-1 of 36.213)
 }
 uldci.m_mcs = m_amc->GetMcsFromCqi (cqi);
-//NS_LOG_DEBUG (this << " UE " <<  (*it).first << " minsinr " << minSinr << " -> mcs " << (uint16_t)uldci.m_mcs);
+//           NS_LOG_DEBUG (this << " UE " <<  (*it).first << " minsinr " << minSinr << " -> mcs " << (uint16_t)uldci.m_mcs);
 }
 rbAllocated += rbPerFlow;
 // store info on allocation for managing ul-cqi interpretation
 {
 rbgAllocationMap.push_back ((*it).first);
 }
 uldci.m_tbSize = (m_amc->GetTbSizeFromMcs (uldci.m_mcs, rbPerFlow) / 8); // MCS 0 -> UL-AMC TBD
-NS_LOG_DEBUG (this << " UE " << (*it).first << " startPRB " << (uint32_t)uldci.m_rbStart << " nPRB " << (uint32_t)uldci.m_rbLen << " CQI " << cqi << " MCS " << (uint32_t)uldci.m_mcs << " TBsize " << uldci.m_tbSize);
+NS_LOG_DEBUG (this << " UL - UE " << (*it).first << " startPRB " << (uint32_t)uldci.m_rbStart << " nPRB " << (uint32_t)uldci.m_rbLen << " CQI " << cqi << " MCS " << (uint32_t)uldci.m_mcs << " TBsize " << uldci.m_tbSize);
 UpdateUlRlcBufferInfo (uldci.m_rnti, uldci.m_tbSize);
 uldci.m_ndi = 1;
 uldci.m_cceIndex = 0;
 uldci.m_aggrLevel = 1;
 uldci.m_ueTxAntennaSelection = 3; // antenna selection OFF
 void
 RrFfMacScheduler::DoSchedUlCqiInfoReq (const struct FfMacSchedSapProvider::SchedUlCqiInfoReqParameters& params)
 {
 NS_LOG_FUNCTION (this);
-//   NS_LOG_DEBUG (this << " RX SFNID " << params.m_sfnSf);
+NS_LOG_DEBUG (this << " RX SFNID " << params.m_sfnSf);
-// correlate info on UL-CQIs with previous scheduling -> calculate m_sfnSf of transmission
-uint32_t frameNo = (0x3FF & (params.m_sfnSf >> 4));
-uint32_t subframeNo = (0xF & params.m_sfnSf);
-//NS_LOG_DEBUG (this << " sfn " << frameNo << " sbfn " << subframeNo);
-if (subframeNo <= m_schedTtiDelay)
-{
-frameNo--;
-subframeNo = (10 + subframeNo - m_schedTtiDelay) % 11;
-}
-else
-{
-subframeNo = (subframeNo - m_schedTtiDelay) % 11;
-}
-uint16_t sfnSf = ((0x3FF & frameNo) << 4) | (0xF & subframeNo);
 //     NS_LOG_DEBUG (this << " Actual sfn " << frameNo << " sbfn " << subframeNo << " sfnSf "  << sfnSf);
 // retrieve the allocation for this subframe
 std::map <uint16_t, std::vector <uint16_t> >::iterator itMap;
 std::map <uint16_t, std::vector <double> >::iterator itCqi;
-itMap = m_allocationMaps.find (sfnSf);
+itMap = m_allocationMaps.find (params.m_sfnSf);
 if (itMap == m_allocationMaps.end ())
 {
 NS_LOG_DEBUG (this << " Does not find info on allocation");
 return;
 }
 for (uint32_t i = 0; i < (*itMap).second.size (); i++)
 {
 // convert from fixed point notation Sxxxxxxxxxxx.xxx to double
 double sinr = LteFfConverter::fpS11dot3toDouble (params.m_ulCqi.m_sinr.at (i));
-//NS_LOG_DEBUG (this << " UE " << (*itMap).second.at (i) << " SINRfp " << params.m_ulCqi.m_sinr.at (i) << " sinrdb " << sinr);
+//       NS_LOG_DEBUG (this << " RB " << i << "UE " << (*itMap).second.at (i) << " SINRfp " << params.m_ulCqi.m_sinr.at (i) << " sinrdb " << sinr);
 itCqi = m_ueCqi.find ((*itMap).second.at (i));
 if (itCqi == m_ueCqi.end ())
 {
 // create a new entry
 std::vector <double> newCqi;
 NS_LOG_ERROR (this << " Does not find BSR report info of UE " << rnti);
 }
 }
-}
+void
+RrFfMacScheduler::TransmissionModeConfigurationUpdate (uint16_t rnti, uint8_t txMode)
+{
+NS_LOG_FUNCTION (this << " RNTI " << rnti << " txMode " << (uint16_t)txMode);
+FfMacCschedSapUser::CschedUeConfigUpdateIndParameters params;
+params.m_rnti = rnti;
+params.m_transmissionMode = txMode;
+m_cschedSapUser->CschedUeConfigUpdateInd (params);
+}
+}

changeset 9307	694926420210
parent 9306	2601b437f6aa
parent 8729	74de12409ee5
child 9319	dbe853670778