| Index: net/tools/quic/test_tools/packet_dropping_test_writer.cc
|
| diff --git a/net/tools/quic/test_tools/packet_dropping_test_writer.cc b/net/tools/quic/test_tools/packet_dropping_test_writer.cc
|
| index 148591d0c0e502eb78b8b2a4c2115258b770b10e..cd8f2c2aa8841ee865eb6890a0a7d690e81e5de5 100644
|
| --- a/net/tools/quic/test_tools/packet_dropping_test_writer.cc
|
| +++ b/net/tools/quic/test_tools/packet_dropping_test_writer.cc
|
| @@ -19,7 +19,7 @@ namespace test {
|
| class WriteUnblockedAlarm : public QuicAlarm::Delegate {
|
| public:
|
| explicit WriteUnblockedAlarm(PacketDroppingTestWriter* writer)
|
| - : writer_(writer) { }
|
| + : writer_(writer) {}
|
|
|
| virtual QuicTime OnAlarm() OVERRIDE {
|
| DVLOG(1) << "Unblocking socket.";
|
| @@ -35,12 +35,9 @@ class WriteUnblockedAlarm : public QuicAlarm::Delegate {
|
| // later point.
|
| class DelayAlarm : public QuicAlarm::Delegate {
|
| public:
|
| - explicit DelayAlarm(PacketDroppingTestWriter* writer)
|
| - : writer_(writer) { }
|
| + explicit DelayAlarm(PacketDroppingTestWriter* writer) : writer_(writer) {}
|
|
|
| - virtual QuicTime OnAlarm() OVERRIDE {
|
| - return writer_->ReleaseOldPackets();
|
| - }
|
| + virtual QuicTime OnAlarm() OVERRIDE { return writer_->ReleaseOldPackets(); }
|
|
|
| private:
|
| PacketDroppingTestWriter* writer_;
|
| @@ -61,16 +58,15 @@ PacketDroppingTestWriter::PacketDroppingTestWriter()
|
| simple_random_.set_seed(seed);
|
| }
|
|
|
| -PacketDroppingTestWriter::~PacketDroppingTestWriter() {}
|
| +PacketDroppingTestWriter::~PacketDroppingTestWriter() {
|
| +}
|
|
|
| -void PacketDroppingTestWriter::Initialize(
|
| - QuicEpollConnectionHelper* helper,
|
| - Delegate* on_can_write) {
|
| +void PacketDroppingTestWriter::Initialize(QuicEpollConnectionHelper* helper,
|
| + Delegate* on_can_write) {
|
| clock_ = helper->GetClock();
|
| write_unblocked_alarm_.reset(
|
| helper->CreateAlarm(new WriteUnblockedAlarm(this)));
|
| - delay_alarm_.reset(
|
| - helper->CreateAlarm(new DelayAlarm(this)));
|
| + delay_alarm_.reset(helper->CreateAlarm(new DelayAlarm(this)));
|
| on_can_write_.reset(on_can_write);
|
| }
|
|
|
| @@ -112,14 +108,13 @@ WriteResult PacketDroppingTestWriter::WritePacket(
|
| if (!fake_bandwidth_.IsZero()) {
|
| // Calculate a time the bandwidth limit would impose.
|
| QuicTime::Delta bandwidth_delay = QuicTime::Delta::FromMicroseconds(
|
| - (buf_len * kNumMicrosPerSecond) /
|
| - fake_bandwidth_.ToBytesPerSecond());
|
| - send_time = delayed_packets_.empty() ?
|
| - send_time.Add(bandwidth_delay) :
|
| - delayed_packets_.back().send_time.Add(bandwidth_delay);
|
| + (buf_len * kNumMicrosPerSecond) / fake_bandwidth_.ToBytesPerSecond());
|
| + send_time = delayed_packets_.empty()
|
| + ? send_time.Add(bandwidth_delay)
|
| + : delayed_packets_.back().send_time.Add(bandwidth_delay);
|
| }
|
| - delayed_packets_.push_back(DelayedWrite(buffer, buf_len, self_address,
|
| - peer_address, send_time));
|
| + delayed_packets_.push_back(
|
| + DelayedWrite(buffer, buf_len, self_address, peer_address, send_time));
|
| cur_buffer_size_ += buf_len;
|
|
|
| // Set the alarm if it's not yet set.
|
| @@ -167,9 +162,10 @@ QuicTime PacketDroppingTestWriter::ReleaseNextPacket() {
|
| DVLOG(1) << "Releasing packet. " << (delayed_packets_.size() - 1)
|
| << " remaining.";
|
| // Grab the next one off the queue and send it.
|
| - QuicPacketWriterWrapper::WritePacket(
|
| - iter->buffer.data(), iter->buffer.length(),
|
| - iter->self_address, iter->peer_address);
|
| + QuicPacketWriterWrapper::WritePacket(iter->buffer.data(),
|
| + iter->buffer.length(),
|
| + iter->self_address,
|
| + iter->peer_address);
|
| DCHECK_GE(cur_buffer_size_, iter->buffer.length());
|
| cur_buffer_size_ -= iter->buffer.length();
|
| delayed_packets_.erase(iter);
|
| @@ -205,9 +201,11 @@ PacketDroppingTestWriter::DelayedWrite::DelayedWrite(
|
| : buffer(buffer, buf_len),
|
| self_address(self_address),
|
| peer_address(peer_address),
|
| - send_time(send_time) {}
|
| + send_time(send_time) {
|
| +}
|
|
|
| -PacketDroppingTestWriter::DelayedWrite::~DelayedWrite() {}
|
| +PacketDroppingTestWriter::DelayedWrite::~DelayedWrite() {
|
| +}
|
|
|
| } // namespace test
|
| } // namespace tools
|
|
|