Attachment #913 for bug #937

View | Details | Raw Unified | Return to bug 937
Collapse All | Expand All

(-)ns-3-dev-original/src/devices/wimax/AUTHORS (-1 / +1 lines)

Lines 22-28	Link Here

TELEMATICS LAB, Politecnico di Bari

TELEMATICS LAB, Politecnico di Bari

G.Piro@poliba.it

G.Piro@poliba.it

Flavio Kobuta, Juliana Freitag Borin, Nelson L. S. da Fonseca

Flavio Kubota, Juliana Freitag Borin, Nelson L. S. da Fonseca

==============================================================

==============================================================

Development and Integration of the mbqos uplink scheduler

Development and Integration of the mbqos uplink scheduler

(-)ns-3-dev-original/src/devices/wimax/bandwidth-manager.cc (+1 lines)

Lines 133-138	Link Here

133

134

              // bandwidth is requested for all packets

134

              // bandwidth is requested for all packets

135

              bytesToRequest = serviceFlow->GetQueue ()->GetQueueLengthWithMACOverhead ();

135

              bytesToRequest = serviceFlow->GetQueue ()->GetQueueLengthWithMACOverhead ();

136

              break;

136

137

138

139

(-)ns-3-dev-original/src/devices/wimax/bs-net-device.cc (-2 / +8 lines)

Lines 522-527	Link Here

522

void

522

void

523

BaseStationNetDevice::StartFrame (void)

523

BaseStationNetDevice::StartFrame (void)

524

525

  //setting DL/UL subframe allocation for this frame

526

  uint32_t symbolsPerFrame = GetPhy ()->GetSymbolsPerFrame ();

527

  SetNrDlSymbols ((symbolsPerFrame / 2) - ceil(GetTtg()*m_psDuration.GetSeconds ()/m_symbolDuration.GetSeconds ()));

528

  SetNrUlSymbols ((symbolsPerFrame / 2) - ceil(GetRtg()*m_psDuration.GetSeconds ()/m_symbolDuration.GetSeconds ()));

529

525

  m_frameStartTime = Simulator::Now ();

530

  m_frameStartTime = Simulator::Now ();

526

531

527

  NS_LOG_INFO ("----------------------frame" << GetNrFrames () + 1 << "----------------------");

532

  NS_LOG_INFO ("----------------------frame" << GetNrFrames () + 1 << "----------------------");

Lines 951-956	Link Here

951

      burst = pair.second;

956

      burst = pair.second;

952

      dlMapIe = pair.first;

957

      dlMapIe = pair.first;

953

      cid = dlMapIe->GetCid ();

958

      cid = dlMapIe->GetCid ();

959

      uint8_t diuc = dlMapIe->GetDiuc ();

954

960

955

      if (cid != GetInitialRangingConnection ()->GetCid () && cid != GetBroadcastConnection ()->GetCid ())

961

      if (cid != GetInitialRangingConnection ()->GetCid () && cid != GetBroadcastConnection ()->GetCid ())

956

962

Lines 958-969	Link Here

958

964

959

              if (m_serviceFlowManager->GetServiceFlow (cid)->GetIsMulticast () == true)

965

              if (m_serviceFlowManager->GetServiceFlow (cid)->GetIsMulticast () == true)

960

966

961

                  modulationType = m_serviceFlowManager->GetServiceFlow (cid)->GetModulation ();

967

                  modulationType = GetBurstProfileManager ()->GetModulationType (diuc, WimaxNetDevice::DIRECTION_DOWNLINK);

962

968

963

969

964

          else

970

          else

965

971

966

              modulationType = m_ssManager->GetSSRecord (cid)->GetModulationType ();

972

              modulationType = GetBurstProfileManager ()->GetModulationType (diuc, WimaxNetDevice::DIRECTION_DOWNLINK);

967

973

968

974

969

      else

975

      else

(-)ns-3-dev-original/src/devices/wimax/bs-scheduler-simple.cc (-1 / +5 lines)

Lines 177-187	Link Here

177

                  packet = connection->Dequeue (MacHeaderType::HEADER_TYPE_GENERIC, availableByte);

177

                  packet = connection->Dequeue (MacHeaderType::HEADER_TYPE_GENERIC, availableByte);

178

                  availableSymbols = 0;

178

                  availableSymbols = 0;

179

180

              else

180

              else if (availableSymbols >= nrSymbolsRequired)

181

182

                  packet = connection->Dequeue ();

182

                  packet = connection->Dequeue ();

183

                  availableSymbols -= nrSymbolsRequired;

183

                  availableSymbols -= nrSymbolsRequired;

184

185

              else

186

187

                  break;

188

185

              burst->AddPacket (packet);

189

              burst->AddPacket (packet);

186

190

187

          AddDownlinkBurst (connection, diuc, modulationType, burst);

191

          AddDownlinkBurst (connection, diuc, modulationType, burst);




          /*check because may be it is a bandwidth request packet (in which case a Bandwidth Request Header
            has already been added to the packet) in which case Generic MAC Header will not be added to it.
            this will only happen in the case of SS as only SS sends the bandwidth request packet. */
          m_bytes -= element.GetSize ();
          if (element.m_hdrType.GetType () == MacHeaderType::HEADER_TYPE_GENERIC)
            {
              packet->AddHeader (element.m_hdr);
            }
          packet->AddHeader (element.m_hdrType);

          m_bytes -= element.GetSize ();

          m_traceDequeue (packet);
          return packet;
        }

Return to bug 937