Attachment #1891 for bug #938

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

(-)a/src/internet/model/codel-queue.cc (-2 / +24 lines)

Lines 35-40	Link Here

NS_LOG_COMPONENT_DEFINE ("CoDelQueue");

NS_LOG_COMPONENT_DEFINE ("CoDelQueue");

/**

 * Performs a reciprocal divide, similar to the

 * Linux kernel reciprocal_divide function

 * \param A numerator

 * \param R reciprocal of the denominator B

 * \return the value of A/B

*/

/* borrowed from the linux kernel */

/* borrowed from the linux kernel */

static inline uint32_t ReciprocalDivide (uint32_t A, uint32_t R)

static inline uint32_t ReciprocalDivide (uint32_t A, uint32_t R)

Lines 43-48	Link Here

/* end kernel borrowings */

/* end kernel borrowings */

/**

 * Returns the current time translated in CoDel time representation

 * \return the current time

*/

static uint32_t CoDelGetTime (void)

static uint32_t CoDelGetTime (void)

  Time time = Simulator::Now ();

  Time time = Simulator::Now ();

Lines 51-60	Link Here

  return ns >> CODEL_SHIFT;

  return ns >> CODEL_SHIFT;

/**

 * CoDel time stamp, used to carry CoDel time informations.

*/

class CoDelTimestampTag : public Tag

class CoDelTimestampTag : public Tag

public:

public:

  CoDelTimestampTag ();

  CoDelTimestampTag ();

/**

   * \brief Get the type ID.

   * \return the object TypeId

*/

  static TypeId GetTypeId (void);

  static TypeId GetTypeId (void);

  virtual TypeId GetInstanceTypeId (void) const;

  virtual TypeId GetInstanceTypeId (void) const;

Lines 63-71	Link Here

  virtual void Deserialize (TagBuffer i);

  virtual void Deserialize (TagBuffer i);

  virtual void Print (std::ostream &os) const;

  virtual void Print (std::ostream &os) const;

/**

   * Gets the Tag creation time

   * @return the time object stored in the tag

*/

  Time GetTxTime (void) const;

  Time GetTxTime (void) const;

private:

private:

  uint64_t m_creationTime;

  uint64_t m_creationTime; //!< Tag creation time

};

};

CoDelTimestampTag::CoDelTimestampTag ()

CoDelTimestampTag::CoDelTimestampTag ()

Lines 292-298	Link Here

292

  NS_LOG_FUNCTION (this);

314

  NS_LOG_FUNCTION (this);

293

  CoDelTimestampTag tag;

315

  CoDelTimestampTag tag;

294

  bool okToDrop;

316

  bool okToDrop;

295

  p->FindFirstMatchingByteTag (tag);

317

296

  bool found = p->RemovePacketTag (tag);

318

  bool found = p->RemovePacketTag (tag);

297

  NS_ASSERT_MSG (found, "found a packet without an input timestamp tag");

319

  NS_ASSERT_MSG (found, "found a packet without an input timestamp tag");

298

  NS_UNUSED (found);    //silence compiler warning

320

  NS_UNUSED (found);    //silence compiler warning

(-)a/src/internet/model/codel-queue.h (-2 / +35 lines)

Lines 42-50	Link Here

namespace ns3 {

namespace ns3 {

/**

 * Number of bits discarded from the time representation.

 * The time is assumed to be in nanoseconds.

*/

static const int  CODEL_SHIFT = 10;

static const int  CODEL_SHIFT = 10;

static const int DEFAULT_CODEL_LIMIT = 1000;

#define DEFAULT_CODEL_LIMIT 1000

#define REC_INV_SQRT_BITS (8 * sizeof(uint16_t))

#define REC_INV_SQRT_BITS (8 * sizeof(uint16_t))

#define REC_INV_SQRT_SHIFT (32 - REC_INV_SQRT_BITS)

#define REC_INV_SQRT_SHIFT (32 - REC_INV_SQRT_BITS)

Lines 59-64	Link Here

class CoDelQueue : public Queue

class CoDelQueue : public Queue

public:

public:

/**

   * Get the type ID.

   * \brief Get the type ID.

   * \return the object TypeId

*/

  static TypeId GetTypeId (void);

  static TypeId GetTypeId (void);

/**

/**

Lines 179-187	Link Here

179

*/

188

*/

180

  bool OkToDrop (Ptr<Packet> p, uint32_t now);

189

  bool OkToDrop (Ptr<Packet> p, uint32_t now);

181

190

191

/**

192

   * Check if CoDel time a is successive to b

193

   * @param a left operand

194

   * @param b right operand

195

   * @return true if a is greater than b

196

*/

182

  bool CoDelTimeAfter (uint32_t a, uint32_t b);

197

  bool CoDelTimeAfter (uint32_t a, uint32_t b);

198

/**

199

   * Check if CoDel time a is successive or equal to b

200

   * @param a left operand

201

   * @param b right operand

202

   * @return true if a is greater than or equal to b

203

*/

183

  bool CoDelTimeAfterEq (uint32_t a, uint32_t b);

204

  bool CoDelTimeAfterEq (uint32_t a, uint32_t b);

205

/**

206

   * Check if CoDel time a is preceding b

207

   * @param a left operand

208

   * @param b right operand

209

   * @return true if a is less than to b

210

*/

184

  bool CoDelTimeBefore (uint32_t a, uint32_t b);

211

  bool CoDelTimeBefore (uint32_t a, uint32_t b);

212

/**

213

   * Check if CoDel time a is preceding or equal to b

214

   * @param a left operand

215

   * @param b right operand

216

   * @return true if a is less than or equal to b

217

*/

185

  bool CoDelTimeBeforeEq (uint32_t a, uint32_t b);

218

  bool CoDelTimeBeforeEq (uint32_t a, uint32_t b);

186

219

187

/**

220

/**

Lines 199-205	Link Here

199

  Time m_target;                          //!< 5 ms target queue delay

232

  Time m_target;                          //!< 5 ms target queue delay

200

  TracedValue<uint32_t> m_count;          //!< Number of packets dropped since entering drop state

233

  TracedValue<uint32_t> m_count;          //!< Number of packets dropped since entering drop state

201

  TracedValue<uint32_t> m_dropCount;      //!< Number of dropped packets according CoDel algorithm

234

  TracedValue<uint32_t> m_dropCount;      //!< Number of dropped packets according CoDel algorithm

202

  TracedValue<uint32_t> m_lastCount;      //<! Last number of packets dropped since entering drop state

235

  TracedValue<uint32_t> m_lastCount;      //!< Last number of packets dropped since entering drop state

203

  TracedValue<bool> m_dropping;           //!< True if in dropping state

236

  TracedValue<bool> m_dropping;           //!< True if in dropping state

204

  uint16_t m_recInvSqrt;                  //!< Reciprocal inverse square root

237

  uint16_t m_recInvSqrt;                  //!< Reciprocal inverse square root

205

  uint32_t m_firstAboveTime;              //!< Time to declare sojourn time above target

238

  uint32_t m_firstAboveTime;              //!< Time to declare sojourn time above target

(-)a/src/internet/model/tcp-header.h (+7 lines)

Lines 169-174	Link Here

169

/**

169

/**

170

   * \brief Append an option to the TCP header

170

   * \brief Append an option to the TCP header

171

   * \param option The option to append

171

   * \param option The option to append

172

   * \return true if optionhas been appended, false otherwise

172

*/

173

*/

173

  bool AppendOption (Ptr<TcpOption> option);

174

  bool AppendOption (Ptr<TcpOption> option);

174

175

Lines 259-264	Link Here

259

*/

260

*/

260

  bool IsChecksumOk (void) const;

261

  bool IsChecksumOk (void) const;

261

262

263

/**

264

   * Comparison operator

265

   * \param lhs left operand

266

   * \param rhs right operand

267

   * \return true if the operands are equal

268

*/

262

  friend bool operator== (const TcpHeader &lhs, const TcpHeader &rhs);

269

  friend bool operator== (const TcpHeader &lhs, const TcpHeader &rhs);

263

270

264

private:

271

private:




   *
   * Calculate our factor from the rxBuffer max size
   *
   * \returns the Window Scale factor
   */
  uint8_t CalculateWScale () const;


  TracedValue<uint32_t> m_rWnd;        //!< Flow control window at remote side

  // Options
  bool    m_winScalingEnabled;    //!< Window Scale option enabled
  uint8_t m_sndScaleFactor;       //!< Sent Window Scale (i.e., the one of the node)
  uint8_t m_rcvScaleFactor;       //!< Received Window Scale (i.e., the one of the peer)

  bool     m_timestampEnabled;    //!< Timestamp option enabled
  uint32_t m_timestampToEcho;     //!< Timestamp to echo
  uint32_t m_lastEchoedTime;      //!< Last echoed timestamp
};

} // namespace ns3

Return to bug 938