Attachment #1889 for bug #1868

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

(-)a/src/core/model/int64x64.cc (-2 / +2 lines)

Lines 35-41	Link Here

  int64_t hi = absVal.GetHigh ();

  int64_t hi = absVal.GetHigh ();

  // Save stream format flags

  // Save stream format flags

  const std::streamsize precision = os.precision ();

  const std::size_t precision = static_cast<std::size_t> (os.precision ());

  std::ios_base::fmtflags ff = os.flags ();

  std::ios_base::fmtflags ff = os.flags ();

  const bool floatfield = os.flags () & std::ios_base::floatfield;

  const bool floatfield = os.flags () & std::ios_base::floatfield;

  os << std::setw (1) << std::noshowpos;

  os << std::setw (1) << std::noshowpos;

Lines 47-53	Link Here

  int64x64_t low(0, absVal.GetLow ());

  int64x64_t low(0, absVal.GetLow ());

  int places = 0;    // Number of decimal places printed so far

  std::size_t places = 0;    // Number of decimal places printed so far

  bool more = true;  // Should we print more digits?

  bool more = true;  // Should we print more digits?

#define HEXHILOW(hi, lo) \

#define HEXHILOW(hi, lo) \




///  instead of memcpy to add the PI header.
///  It might be faster in this case to use memmove and avoid the extra mallocs.
static void
AddPIHeader (uint8_t *&buf, size_t &len)
{
  // Synthesize PI header for our friend the kernel
  uint8_t *buf2 = (uint8_t*)malloc (len + 4);


  NS_ASSERT_MSG (packet->GetSize () <= m_mtu, "FdNetDevice::SendFrom(): Packet too big " << packet->GetSize ());

  size_t len =  (size_t)(packet->GetSize ());
  uint8_t *buffer = (uint8_t*)malloc (len);
  packet->CopyData (buffer, len);


  ssize_t written = write (m_fd, buffer, len);
  free (buffer);

  if (written < 0 || (size_t)(written) != len)
    {
      m_macTxDropTrace (packet);
      return false;




{
  NS_LOG_FUNCTION (this);


  // apply transmission mode gain
  NS_ASSERT (m_transmissionMode < m_txModeGain.size ());
  SpectrumValue newSinr = sinr;

    {
      cqi = m_amc->CreateCqiFeedbacks (newSinr, m_dlBandwidth);

      uint8_t nLayer = TransmissionModesLayers::TxMode2LayerNum (m_transmissionMode);
      std::size_t nbSubChannels = cqi.size ();
      double cqiSum = 0.0;
      uint32_t activeSubChannels = 0;
      // average the CQIs of the different RBs
      for (uint32_t i = 0; i < nbSubChannels; i++)
        {
          if (cqi.at (i) != -1)
            {

      dlcqi.m_cqiType = CqiListElement_s::P10; // Peridic CQI using PUCCH wideband
      NS_ASSERT_MSG (nLayer > 0, " nLayer negative");
      NS_ASSERT_MSG (nLayer < 3, " nLayer limit is 2s");
      for (uint8_t i = 0; i < nLayer; i++)
        {
          if (activeSubChannels > 0)
            {

  else if (Simulator::Now () > m_a30CqiLast + m_a30CqiPeriocity)
    {
      cqi = m_amc->CreateCqiFeedbacks (newSinr, GetRbgSize ());
      uint8_t nLayer = TransmissionModesLayers::TxMode2LayerNum (m_transmissionMode);
      std::size_t nbSubChannels = cqi.size ();
      uint8_t rbgSize = GetRbgSize ();
      double cqiSum = 0.0;
      uint8_t cqiNum = 0;
      SbMeasResult_s rbgMeas;
      //NS_LOG_DEBUG (this << " Create A30 CQI feedback, RBG " << (uint16_t) rbgSize << " cqiNum " << nbSubChannels << " band "  << (uint16_t)m_dlBandwidth);
      for (uint32_t i = 0; i < nbSubChannels; i++)
        {
          if (cqi.at (i) != -1)
            {

              //NS_LOG_DEBUG (this << " RBG CQI "  << (uint16_t) cqiSum / rbgSize);
              HigherLayerSelected_s hlCqi;
              hlCqi.m_sbPmi = 0; // not yet used
              for (uint8_t i = 0; i < nLayer; i++)
                {
                  hlCqi.m_sbCqi.push_back ((uint16_t) cqiSum / rbgSize);
                }

(-)a/src/stats/model/basic-data-calculators.h (-2 / +2 lines)

Lines 160-170	Link Here

160

161

      else

161

      else

162

163

          if (i < m_min)

163

          if (i - m_min < 0)

164

165

              m_min = i;

165

              m_min = i;

166

167

          if (i > m_max)

167

          if (i - m_max > 0)

168

169

              m_max = i;

169

              m_max = i;

170

(-)a/wscript (-1 / +1 lines)

Lines 330-336	Link Here

330

            if conf.check_compilation_flag('-march=native'):

330

            if conf.check_compilation_flag('-march=native'):

331

                env.append_value('CXXFLAGS', '-march=native')

331

                env.append_value('CXXFLAGS', '-march=native')

332

            env.append_value('CXXFLAGS', '-fstrict-overflow')

332

            env.append_value('CXXFLAGS', '-fstrict-overflow')

333

            if conf.env['CC_VERSION'] == cc_version_warn_strict_overflow:

333

            if conf.env['CC_VERSION'] >= cc_version_warn_strict_overflow:

334

                env.append_value('CXXFLAGS', '-Wstrict-overflow=5')

334

                env.append_value('CXXFLAGS', '-Wstrict-overflow=5')

335

336

        if sys.platform == 'win32':

336

        if sys.platform == 'win32':

Return to bug 1868