Attachment #3039 for bug #2726

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




	den = _cairo_int64_negate (den);
    uqr = _cairo_uint64_divrem (num, den);
    if (num_neg)
	qr.rem = _cairo_int64_negate ((cairo_int64_t)uqr.rem);  //PDB cast
    else
	qr.rem = uqr.rem;
    if (num_neg != den_neg)
	qr.quo = (cairo_int64_t) _cairo_int64_negate ((cairo_int64_t)uqr.quo);  //PDB cast
    else
	qr.quo = (cairo_int64_t) uqr.quo;
    return qr;

    cairo_uint64_t x = _cairo_uint128_to_uint64 (_cairo_uint128_rsl(num, 32));

    /* Initialise the result to indicate overflow. */
    result.quo = _cairo_uint32s_to_uint64 (UINT_MAX, UINT_MAX);  //PDB cast
    result.rem = den;

    /* Don't bother if the quotient is going to overflow. */

	/* Add the main term's contribution to quotient.  Note B-v =
	 * -v as an uint32 (unless v = 0) */
	if (v)
	    quorem = _cairo_uint64_divrem (_cairo_uint32x32_64_mul (q, -(int32_t)v), den);  //PDB cast
	else
	    quorem = _cairo_uint64_divrem (_cairo_uint32s_to_uint64 (q, 0), den);
	quotient += _cairo_uint64_to_uint32 (quorem.quo);

    uqr = _cairo_uint_96by64_32x64_divrem (num, nonneg_den);
    if (_cairo_uint64_eq (uqr.rem, _cairo_int64_to_uint64 (nonneg_den))) {
	/* bail on overflow. */
	qr.quo = _cairo_uint32s_to_uint64 (0x7FFFFFFF, UINT_MAX);  //PDB cast
	qr.rem = den;
	return qr;
    }

    if (num_neg)
	qr.rem = _cairo_int64_negate ((cairo_int64_t)uqr.rem);  //PDB cast
    else
	qr.rem = uqr.rem;
    if (num_neg != den_neg)
	qr.quo = _cairo_int64_negate ((cairo_int64_t)uqr.quo);  //PDB cast
    else
	qr.quo = uqr.quo;
    return qr;




  return static_cast<uint32_t>(m_objects.size ());
}
Ptr<Object>
MatchContainer::Get (std::size_t i) const
{
  NS_LOG_FUNCTION (this << i);
  return m_objects[i];

  void UnregisterRootNamespaceObject (Ptr<Object> obj);

  /** \copydoc Config::GetRootNamespaceObjectN() */
  std::size_t GetRootNamespaceObjectN (void) const;
  /** \copydoc Config::GetRootNamespaceObject() */
  Ptr<Object> GetRootNamespaceObject (std::size_t i) const;

private:
  /**

  return static_cast<uint32_t>(m_roots.size ());
}
Ptr<Object> 
ConfigImpl::GetRootNamespaceObject (std::size_t i) const 
{
  NS_LOG_FUNCTION (this << i);
  return m_roots[i];

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

Lines 493-500	Link Here

493

  h1 += h2;

493

  h1 += h2;

494

  h2 += h1;

494

  h2 += h1;

495

496

  ((uint32_t *)out)[0] = static_cast<uint32_t> (h1);  //PDB

496

  ((uint32_t *)out)[0] = static_cast<uint32_t> (h1);  //PDB cast

497

  ((uint32_t *)out)[1] = static_cast<uint32_t> (h2);  //PDB

497

  ((uint32_t *)out)[1] = static_cast<uint32_t> (h2);  //PDB cast

498

499

500




ObjectPtrContainerValue::GetN (void) const
{
  NS_LOG_FUNCTION (this);
  return m_objects.size ();
}
Ptr<Object>
ObjectPtrContainerValue::Get (std::size_t i) const
{
  NS_LOG_FUNCTION (this << i);
  Iterator it = m_objects.find (i);
  Iterator it = m_objects.find (j); 
  Ptr<Object> value = 0;
  if ( it != m_objects.end () )
  {
    value = m_objects.find (i)->second;
  }
  return value;
}

    {
      return false;
    }
  for (std::size_t i = 0; i < n; i++)
    {
      std::size_t index;
      Ptr<Object> o = DoGet (object, i, &index);
      v->m_objects[index] = o;
    }
  return true;
}

(-)a/src/core/model/object-ptr-container.h (-2 / +2 lines)

Lines 46-52	Link Here

public:

public:

  /** Iterator type for traversing this container. */

  /** Iterator type for traversing this container. */

  typedef std::map<uint32_t, Ptr<Object> >::const_iterator Iterator;

  typedef std::map<std::size_t, Ptr<Object> >::const_iterator Iterator;

  /** Default constructor. */

  /** Default constructor. */

  ObjectPtrContainerValue ();

  ObjectPtrContainerValue ();

Lines 104-110	Link Here

104

private:

104

private:

105

  friend class ObjectPtrContainerAccessor;

105

  friend class ObjectPtrContainerAccessor;

106

  /** The container implementation. */

106

  /** The container implementation. */

107

  std::map<uint32_t, Ptr<Object> > m_objects;

107

  std::map<std::size_t, Ptr<Object> > m_objects;

108

};

108

};

109

110

/**

110

/**

(-)a/src/core/model/random-variable-stream.cc (-1 / +1 lines)

Lines 1488-1494	Link Here

1488

1489

1490

void

1490

void

1491

DeterministicRandomVariable::SetValueArray(double* values, std::size_t length)

1491

DeterministicRandomVariable::SetValueArray (double* values, std::size_t length)

1492

1493

  NS_LOG_FUNCTION (this << values << length);

1493

  NS_LOG_FUNCTION (this << values << length);

1494

  // Delete any values currently set.

1494

  // Delete any values currently set.

(-)a/src/core/model/simple-ref-count.h (-1 / +3 lines)

Lines 83-89	Link Here

*/

*/

  SimpleRefCount (const SimpleRefCount &o)

  SimpleRefCount (const SimpleRefCount &o)

    : m_count (1)

    : m_count (1)

  {NS_UNUSED(o);}

    NS_UNUSED(o);

/**

/**

   * Assignment operator

   * Assignment operator

   * \param [in] o The object to copy

   * \param [in] o The object to copy




  static uint32_t GetContext (void);

  /**
   * Context enum values.
   *
   * \internal
   * This enum type is fixed to match the representation size
   * of simulation context.
   */
  enum : uint32_t {
    /**
     * Flag for events not associated with any particular context.
     */




   * 
   * \returns The new test vector index
   */
  std::size_t Add (T vector);

  /**
   * \brief Get the total number of test vectors.
   * \return The number of test vectors
   */
  std::size_t GetN (void) const;
  /**
   * \brief Get the i'th test vector
   * \param [in] i The requested vector index
   * \return The requested vector
   */
  T Get (std::size_t i) const;

private:
  typedef std::vector<T> TestVector;    //!< Container type

std::size_t
TestVectors<T>::Add (T vector)
{
  std::size_t index = m_vectors.size ();
  m_vectors.push_back (vector);
  return index;
}


template <typename T>
T
TestVectors<T>::Get (std::size_t i) const
{
  NS_ABORT_MSG_UNLESS (m_vectors.size () > i, "TestVectors::Get(): Bad index");
  return m_vectors[i];




   * Get the total number of type ids.
   * \returns The total number.
   */
  uint16_t GetRegisteredN (void) const;
  /**
   * Get a type id by index.
   *

   * \param [in] i The attribute to manipulate
   * \param [in] initialValue The new initial value to use for this attribute.
   */
  void SetAttributeInitialValue (uint16_t uid,
                                 std::size_t i,
                                 Ptr<const AttributeValue> initialValue);
  /**
   * Get the number of attributes.
   * \param [in] uid The id.
   * \returns The number of attributes associated to this TypeId
   */
  std::size_t GetAttributeN (uint16_t uid) const;
  /**
   * Get Attribute information by index.
   * \param [in] uid The id.
   * \param [in] i Index into attribute array
   * \returns The information associated to attribute whose index is \p i.
   */
  struct TypeId::AttributeInformation GetAttribute (uint16_t uid, std::size_t i) const;
  /**
   * Record a new TraceSource.
   * \param [in] uid The id.

   * \param [in] uid The id.
   * \returns The number of trace sources defined in this TypeId.
   */
  std::size_t GetTraceSourceN (uint16_t uid) const;
  /**
   * Get the trace source by index.
   * \param [in] uid The id.
   * \param [in] i Index into trace source array.
   * \returns Detailed information about the requested trace source.
   */
  struct TypeId::TraceSourceInformation GetTraceSource (uint16_t uid, std::size_t i) const;
  /**
   * Check if this TypeId should not be listed in documentation.
   * \param [in] uid The id.

    else
      { // chain old type
        NS_LOG_LOGIC (IIDL << "Old TypeId '" << hinfo->name << "' getting chained.");
        uint16_t oldUid = GetUid (hinfo->hash);
        m_hashmap.erase (m_hashmap.find (hinfo->hash));
        hinfo->hash = hash | HashChainFlag;
        m_hashmap.insert (std::make_pair (hinfo->hash, oldUid));

  information.hasConstructor = false;
  information.mustHideFromDocumentation = false;
  m_information.push_back (information);
  std::size_t tuid = m_information.size ();
  NS_ASSERT (tuid <= 0xffff);
  uint16_t uid = static_cast<uint16_t> (tuid);

  // Add to both maps:
  m_namemap.insert (std::make_pair (name, uid));
  m_hashmap.insert (std::make_pair (hash, uid));
  NS_LOG_LOGIC (IIDL << uid);
  return static_cast<uint16_t> (uid);
}

struct IidManager::IidInformation *

  NS_LOG_LOGIC (IIDL << information->attributes.size () - 1);
}
void 
IidManager::SetAttributeInitialValue (uint16_t uid,
                                      std::size_t i,
                                      Ptr<const AttributeValue> initialValue)
{
  NS_LOG_FUNCTION (IID << uid << i << initialValue);
  struct IidInformation *information = LookupInformation (uid);

{
  NS_LOG_FUNCTION (IID << uid);
  struct IidInformation *information = LookupInformation (uid);
  std::size_t size = information->attributes.size ();
  NS_LOG_LOGIC (IIDL << size);
  return size;
}
struct TypeId::AttributeInformation 
IidManager::GetAttribute (uint16_t uid, std::size_t i) const
{
  NS_LOG_FUNCTION (IID << uid << i);
  struct IidInformation *information = LookupInformation (uid);

{
  NS_LOG_FUNCTION (IID << uid);
  struct IidInformation *information = LookupInformation (uid);
  std::size_t size = information->traceSources.size ();
  NS_LOG_LOGIC (IIDL << size);
  return size;
}
struct TypeId::TraceSourceInformation 
IidManager::GetTraceSource (uint16_t uid, std::size_t i) const
{
  NS_LOG_FUNCTION (IID << uid << i);
  struct IidInformation *information = LookupInformation (uid);

  TypeId nextTid = *this;
  do {
      tid = nextTid;
      for (std::size_t i = 0; i < tid.GetAttributeN (); i++)
        {
          struct TypeId::AttributeInformation tmp = tid.GetAttribute (i);
          if (tmp.name == name)
            {
              if (tmp.supportLevel == TypeId::SUPPORTED)

}

bool 
TypeId::SetAttributeInitialValue (std::size_t i,
                                  Ptr<const AttributeValue> initialValue)
{
  NS_LOG_FUNCTION (this << i << initialValue);
  IidManager::Get ()->SetAttributeInitialValue (m_tid, i, initialValue);

TypeId::GetAttributeN (void) const
{
  NS_LOG_FUNCTION (this);
  std::size_t n = IidManager::Get ()->GetAttributeN (m_tid);
  return n;
}
struct TypeId::AttributeInformation 
TypeId::GetAttribute (std::size_t i) const
{
  NS_LOG_FUNCTION (this << i);
  return IidManager::Get ()->GetAttribute (m_tid, i);
}
std::string 
TypeId::GetAttributeFullName (std::size_t i) const
{
  NS_LOG_FUNCTION (this << i);
  struct TypeId::AttributeInformation info = GetAttribute (i);
  return GetName () + "::" + info.name;
}


  return IidManager::Get ()->GetTraceSourceN (m_tid);
}
struct TypeId::TraceSourceInformation 
TypeId::GetTraceSource (std::size_t i) const
{
  NS_LOG_FUNCTION (this << i);
  return IidManager::Get ()->GetTraceSource (m_tid, i);
}

TypeId 

  struct TypeId::TraceSourceInformation tmp;
  do {
      tid = nextTid;
      for (std::size_t i = 0; i < tid.GetTraceSourceN (); i++)
        {
          tmp = tid.GetTraceSource (i);
          if (tmp.name == name)




   * \param [in] i Index into attribute array
   * \returns The information associated to attribute whose index is \p i.
   */
  struct TypeId::AttributeInformation GetAttribute (std::size_t i) const;
  /**
   * Get the Attribute name by index.
   *
   * \param [in] i Index into attribute array
   * \returns The full name associated to the attribute whose index is \p i.
   */
  std::string GetAttributeFullName (std::size_t i) const;

  /**
   * Get the constructor callback.

   *
   * \returns The number of trace sources defined in this TypeId.
   */
  std::size_t GetTraceSourceN (void) const;
  /**
   * Get the trace source by index.
   *
   * \param [in] i Index into trace source array.
   * \returns Detailed information about the requested trace source.
   */
  struct TypeId::TraceSourceInformation GetTraceSource (std::size_t i) const;

  /**
   * Set the parent TypeId.

   * \param [in] initialValue The new initial value to use for this attribute.
   * \returns \c true if the call was successfuly.
   */
  bool SetAttributeInitialValue (std::size_t i,
                                 Ptr<const AttributeValue> initialValue);

  /**
   * Record in this TypeId the fact that a new attribute exists.

(-)a/src/core/test/attribute-test-suite.cc (-1 / +1 lines)

Lines 264-270	Link Here

264

  int16_t DoGetInt16 (void) const { return m_int16SetGet; }

264

  int16_t DoGetInt16 (void) const { return m_int16SetGet; }

265

  void DoSetInt16 (int16_t v) { m_int16SetGet = v; }

265

  void DoSetInt16 (int16_t v) { m_int16SetGet = v; }

266

  std::size_t DoGetVectorN (void) const { return m_vector2.size (); }

266

  std::size_t DoGetVectorN (void) const { return m_vector2.size (); }

267

  Ptr<Derived> DoGetVector(std::size_t i) const { return m_vector2[i]; }

267

  Ptr<Derived> DoGetVector (std::size_t i) const { return m_vector2[i]; }

268

  bool DoSetIntSrc (int8_t v) { m_intSrc2 = v; return true; }

268

  bool DoSetIntSrc (int8_t v) { m_intSrc2 = v; return true; }

269

  int8_t DoGetIntSrc (void) const { return m_intSrc2; }

269

  int8_t DoGetIntSrc (void) const { return m_intSrc2; }

270

  bool DoSetEnum (Test_e v) { m_enumSetGet = v; return true; }

270

  bool DoSetEnum (Test_e v) { m_enumSetGet = v; return true; }

(-)a/src/lte/test/lte-test-cell-selection.cc (-1 / +1 lines)

Lines 154-160	Link Here

154

155

  NS_LOG_FUNCTION (this << GetName ());

155

  NS_LOG_FUNCTION (this << GetName ());

156

157

  Config::SetGlobal ("RngRun", UintegerValue(m_rngRun));

157

  Config::SetGlobal ("RngRun", UintegerValue (m_rngRun));

158

159

  Ptr<LteHelper> lteHelper = CreateObject<LteHelper> ();

159

  Ptr<LteHelper> lteHelper = CreateObject<LteHelper> ();

160

  lteHelper->SetAttribute ("PathlossModel",

160

  lteHelper->SetAttribute ("PathlossModel",

(-)a/src/lte/test/lte-test-phy-error-model.cc (-2 / +2 lines)

Lines 166-172	Link Here

166

  Config::SetDefault ("ns3::LteSpectrumPhy::CtrlErrorModelEnabled", BooleanValue (false));

166

  Config::SetDefault ("ns3::LteSpectrumPhy::CtrlErrorModelEnabled", BooleanValue (false));

167

  Config::SetDefault ("ns3::LteSpectrumPhy::DataErrorModelEnabled", BooleanValue (true));

167

  Config::SetDefault ("ns3::LteSpectrumPhy::DataErrorModelEnabled", BooleanValue (true));

168

  Config::SetDefault ("ns3::RrFfMacScheduler::HarqEnabled", BooleanValue (false));

168

  Config::SetDefault ("ns3::RrFfMacScheduler::HarqEnabled", BooleanValue (false));

169

  Config::SetGlobal("RngRun", UintegerValue(m_rngRun));

169

  Config::SetGlobal ("RngRun", UintegerValue (m_rngRun));

170

171

  //Disable Uplink Power Control

171

  //Disable Uplink Power Control

172

  Config::SetDefault ("ns3::LteUePhy::EnableUplinkPowerControl", BooleanValue (false));

172

  Config::SetDefault ("ns3::LteUePhy::EnableUplinkPowerControl", BooleanValue (false));

Lines 322-328	Link Here

322

  Config::SetDefault ("ns3::LteSpectrumPhy::CtrlErrorModelEnabled", BooleanValue (true));

322

  Config::SetDefault ("ns3::LteSpectrumPhy::CtrlErrorModelEnabled", BooleanValue (true));

323

  Config::SetDefault ("ns3::LteSpectrumPhy::DataErrorModelEnabled", BooleanValue (false));

323

  Config::SetDefault ("ns3::LteSpectrumPhy::DataErrorModelEnabled", BooleanValue (false));

324

  Config::SetDefault ("ns3::RrFfMacScheduler::HarqEnabled", BooleanValue (false));

324

  Config::SetDefault ("ns3::RrFfMacScheduler::HarqEnabled", BooleanValue (false));

325

  Config::SetGlobal ("RngRun", UintegerValue(m_rngRun));

325

  Config::SetGlobal ("RngRun", UintegerValue (m_rngRun));

326

327

  //Disable Uplink Power Control

327

  //Disable Uplink Power Control

328

  Config::SetDefault ("ns3::LteUePhy::EnableUplinkPowerControl", BooleanValue (false));

328

  Config::SetDefault ("ns3::LteUePhy::EnableUplinkPowerControl", BooleanValue (false));




{
  uint16_t numberOfNodes = 1;

  // LogLevel level = (LogLevel) (LOG_LEVEL_ALL | LOG_PREFIX_TIME | LOG_PREFIX_NODE | LOG_PREFIX_FUNC);
  // LogComponentEnable ("LteRlcAmE2eTest", level);
  // LogComponentEnable ("ErrorModel", level);
  // LogComponentEnable ("LteSimpleHelper", level);
  // LogComponentEnable ("LteSimpleNetDevice", level);
  // LogComponentEnable ("SimpleNetDevice", level);
  // LogComponentEnable ("SimpleChannel", level);
  // LogComponentEnable ("LteTestEntities", level);
  // LogComponentEnable ("LtePdcp", level);
  // LogComponentEnable ("LteRlc", level);
  // LogComponentEnable ("LteRlcUm", level);
  // LogComponentEnable ("LteRlcAm", level);
  LogComponentEnable ("LteRlcAm", level);
#endif

  Config::SetGlobal ("RngRun", UintegerValue (m_run));
  Config::SetDefault ("ns3::LteRlcAm::PollRetransmitTimer", TimeValue (MilliSeconds (20)));
  Config::SetDefault ("ns3::LteRlcAm::ReorderingTimer", TimeValue (MilliSeconds (10)));
  Config::SetDefault ("ns3::LteRlcAm::StatusProhibitTimer", TimeValue (MilliSeconds (40)));

Return to bug 2726