Attachment #2492 for bug #2443

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

(-)a/src/applications/model/bulk-send-application.cc (-4 / +9 lines)

Lines 59-65	Link Here

                   "that there is no limit.",

                   "that there is no limit.",

                   UintegerValue (0),

                   UintegerValue (0),

                   MakeUintegerAccessor (&BulkSendApplication::m_maxBytes),

                   MakeUintegerAccessor (&BulkSendApplication::m_maxBytes),

                   MakeUintegerChecker<uint32_t> ())

                   MakeUintegerChecker<uint64_t> ())

    .AddAttribute ("Protocol", "The type of protocol to use.",

    .AddAttribute ("Protocol", "The type of protocol to use.",

                   TypeIdValue (TcpSocketFactory::GetTypeId ()),

                   TypeIdValue (TcpSocketFactory::GetTypeId ()),

                   MakeTypeIdAccessor (&BulkSendApplication::m_tid),

                   MakeTypeIdAccessor (&BulkSendApplication::m_tid),

Lines 86-92	Link Here

void

void

BulkSendApplication::SetMaxBytes (uint32_t maxBytes)

BulkSendApplication::SetMaxBytes (uint64_t maxBytes)

  NS_LOG_FUNCTION (this << maxBytes);

  NS_LOG_FUNCTION (this << maxBytes);

  m_maxBytes = maxBytes;

  m_maxBytes = maxBytes;

Lines 175-186	Link Here

175

176

  while (m_maxBytes == 0 || m_totBytes < m_maxBytes)

176

  while (m_maxBytes == 0 || m_totBytes < m_maxBytes)

177

    { // Time to send more

177

    { // Time to send more

178

      uint32_t toSend = m_sendSize;

178

179

      // uint64_t to allow the comparison later.

180

      // the result is in a uint32_t range anyway, because

181

      // m_sendSize is uint32_t.

182

      uint64_t toSend = m_sendSize;

179

      // Make sure we don't send too many

183

      // Make sure we don't send too many

180

      if (m_maxBytes > 0)

184

      if (m_maxBytes > 0)

181

185

182

          toSend = std::min (m_sendSize, m_maxBytes - m_totBytes);

186

          toSend = std::min (toSend, m_maxBytes - m_totBytes);

183

187

188

184

      NS_LOG_LOGIC ("sending packet at " << Simulator::Now ());

189

      NS_LOG_LOGIC ("sending packet at " << Simulator::Now ());

185

      Ptr<Packet> packet = Create<Packet> (toSend);

190

      Ptr<Packet> packet = Create<Packet> (toSend);

186

      m_txTrace (packet);

191

      m_txTrace (packet);

(-)a/src/applications/model/bulk-send-application.h (-3 / +3 lines)

Lines 91-97	Link Here

   * \param maxBytes the upper bound of bytes to send

   * \param maxBytes the upper bound of bytes to send

*/

*/

  void SetMaxBytes (uint32_t maxBytes);

  void SetMaxBytes (uint64_t maxBytes);

/**

/**

   * \brief Get the socket this application is attached to.

   * \brief Get the socket this application is attached to.

Lines 115-122	Link Here

115

  Address         m_peer;         //!< Peer address

115

  Address         m_peer;         //!< Peer address

116

  bool            m_connected;    //!< True if connected

116

  bool            m_connected;    //!< True if connected

117

  uint32_t        m_sendSize;     //!< Size of data to send each time

117

  uint32_t        m_sendSize;     //!< Size of data to send each time

118

  uint32_t        m_maxBytes;     //!< Limit total number of bytes sent

118

  uint64_t        m_maxBytes;     //!< Limit total number of bytes sent

119

  uint32_t        m_totBytes;     //!< Total bytes sent so far

119

  uint64_t        m_totBytes;     //!< Total bytes sent so far

120

  TypeId          m_tid;          //!< The type of protocol to use.

120

  TypeId          m_tid;          //!< The type of protocol to use.

121

122

  /// Traced Callback: sent packets

122

  /// Traced Callback: sent packets

(-)a/src/applications/model/onoff-application.cc (-2 / +2 lines)

Lines 81-87	Link Here

                   "that there is no limit.",

                   "that there is no limit.",

                   UintegerValue (0),

                   UintegerValue (0),

                   MakeUintegerAccessor (&OnOffApplication::m_maxBytes),

                   MakeUintegerAccessor (&OnOffApplication::m_maxBytes),

                   MakeUintegerChecker<uint32_t> ())

                   MakeUintegerChecker<uint64_t> ())

    .AddAttribute ("Protocol", "The type of protocol to use.",

    .AddAttribute ("Protocol", "The type of protocol to use.",

                   TypeIdValue (UdpSocketFactory::GetTypeId ()),

                   TypeIdValue (UdpSocketFactory::GetTypeId ()),

                   MakeTypeIdAccessor (&OnOffApplication::m_tid),

                   MakeTypeIdAccessor (&OnOffApplication::m_tid),

Lines 110-116	Link Here

110

111

112

void

112

void

113

OnOffApplication::SetMaxBytes (uint32_t maxBytes)

113

OnOffApplication::SetMaxBytes (uint64_t maxBytes)

114

115

  NS_LOG_FUNCTION (this << maxBytes);

115

  NS_LOG_FUNCTION (this << maxBytes);

116

  m_maxBytes = maxBytes;

116

  m_maxBytes = maxBytes;

(-)a/src/applications/model/onoff-application.h (-3 / +3 lines)

Lines 104-110	Link Here

104

105

   * \param maxBytes the total number of bytes to send

105

   * \param maxBytes the total number of bytes to send

106

*/

106

*/

107

  void SetMaxBytes (uint32_t maxBytes);

107

  void SetMaxBytes (uint64_t maxBytes);

108

109

/**

109

/**

110

   * \brief Return a pointer to associated socket.

110

   * \brief Return a pointer to associated socket.

Lines 158-165	Link Here

158

  uint32_t        m_pktSize;      //!< Size of packets

158

  uint32_t        m_pktSize;      //!< Size of packets

159

  uint32_t        m_residualBits; //!< Number of generated, but not sent, bits

159

  uint32_t        m_residualBits; //!< Number of generated, but not sent, bits

160

  Time            m_lastStartTime; //!< Time last packet sent

160

  Time            m_lastStartTime; //!< Time last packet sent

161

  uint32_t        m_maxBytes;     //!< Limit total number of bytes sent

161

  uint64_t        m_maxBytes;     //!< Limit total number of bytes sent

162

  uint32_t        m_totBytes;     //!< Total bytes sent so far

162

  uint64_t        m_totBytes;     //!< Total bytes sent so far

163

  EventId         m_startStopEvent;     //!< Event id for next start or stop event

163

  EventId         m_startStopEvent;     //!< Event id for next start or stop event

164

  EventId         m_sendEvent;    //!< Event id of pending "send packet" event

164

  EventId         m_sendEvent;    //!< Event id of pending "send packet" event

165

  TypeId          m_tid;          //!< Type of the socket used

165

  TypeId          m_tid;          //!< Type of the socket used

(-)a/src/applications/model/packet-sink.cc (-1 / +1 lines)

Lines 75-81	Link Here

  NS_LOG_FUNCTION (this);

  NS_LOG_FUNCTION (this);

uint32_t PacketSink::GetTotalRx () const

uint64_t PacketSink::GetTotalRx () const

  NS_LOG_FUNCTION (this);

  NS_LOG_FUNCTION (this);

  return m_totalRx;

  return m_totalRx;

(-)a/src/applications/model/packet-sink.h (-2 / +2 lines)

Lines 80-86	Link Here

/**

/**

   * \return the total bytes received in this sink app

   * \return the total bytes received in this sink app

*/

*/

  uint32_t GetTotalRx () const;

  uint64_t GetTotalRx () const;

/**

/**

   * \return pointer to listening socket

   * \return pointer to listening socket

Lines 127-133	Link Here

127

  std::list<Ptr<Socket> > m_socketList; //!< the accepted sockets

127

  std::list<Ptr<Socket> > m_socketList; //!< the accepted sockets

128

129

  Address         m_local;        //!< Local address to bind to

129

  Address         m_local;        //!< Local address to bind to

130

  uint32_t        m_totalRx;      //!< Total bytes received

130

  uint64_t        m_totalRx;      //!< Total bytes received

131

  TypeId          m_tid;          //!< Protocol TypeId

131

  TypeId          m_tid;          //!< Protocol TypeId

132

133

  /// Traced Callback: received packets, source address.

133

  /// Traced Callback: received packets, source address.

(-)a/src/applications/model/udp-server.cc (-1 / +1 lines)

Lines 96-102	Link Here

  return m_lossCounter.GetLost ();

  return m_lossCounter.GetLost ();

uint32_t

uint64_t

100

UdpServer::GetReceived (void) const

100

UdpServer::GetReceived (void) const

101

102

  NS_LOG_FUNCTION (this);

102

  NS_LOG_FUNCTION (this);

(-)a/src/applications/model/udp-server.h (-2 / +2 lines)

Lines 63-69	Link Here

   * \brief Returns the number of received packets

   * \brief Returns the number of received packets

   * \return the number of received packets

   * \return the number of received packets

*/

*/

  uint32_t GetReceived (void) const;

  uint64_t GetReceived (void) const;

/**

/**

   * \brief Returns the size of the window used for checking loss.

   * \brief Returns the size of the window used for checking loss.

Lines 98-104	Link Here

  uint16_t m_port; //!< Port on which we listen for incoming packets.

  uint16_t m_port; //!< Port on which we listen for incoming packets.

  Ptr<Socket> m_socket; //!< IPv4 Socket

  Ptr<Socket> m_socket; //!< IPv4 Socket

100

  Ptr<Socket> m_socket6; //!< IPv6 Socket

100

  Ptr<Socket> m_socket6; //!< IPv6 Socket

101

  uint32_t m_received; //!< Number of received packets

101

  uint64_t m_received; //!< Number of received packets

102

  PacketLossCounter m_lossCounter; //!< Lost packet counter

102

  PacketLossCounter m_lossCounter; //!< Lost packet counter

103

};

103

};

104

Return to bug 2443