QUIC - (no behavior change) s/NULL/nullptr/g in .../quic/...

net/quic/quic_unacked_packet_map.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/quic_unacked_packet_map.h"
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "net/quic/quic_connection_stats.h"
 #include "net/quic/quic_utils_chromium.h"
 
 using std::max;
 
 namespace net {
 
 QuicUnackedPacketMap::QuicUnackedPacketMap()
     : largest_sent_packet_(0),
       largest_observed_(0),
       least_unacked_(1),
       bytes_in_flight_(0),
       pending_crypto_packet_count_(0) {
 }
 
 QuicUnackedPacketMap::~QuicUnackedPacketMap() {
   QuicPacketSequenceNumber index = least_unacked_;
   for (UnackedPacketMap::iterator it = unacked_packets_.begin();
        it != unacked_packets_.end(); ++it, ++index) {
     delete it->retransmittable_frames;
     // Only delete all_transmissions once, for the newest packet.
-    if (it->all_transmissions != NULL &&
+    if (it->all_transmissions != nullptr &&
         index == *it->all_transmissions->rbegin()) {
       delete it->all_transmissions;
     }
   }
 }
 
 // TODO(ianswett): Combine this method with OnPacketSent once packets are always
 // sent in order and the connection tracks RetransmittableFrames for longer.
 void QuicUnackedPacketMap::AddPacket(
     const SerializedPacket& serialized_packet) {
   DCHECK_GE(serialized_packet.sequence_number,
             least_unacked_ + unacked_packets_.size());
   while (least_unacked_ + unacked_packets_.size() <
          serialized_packet.sequence_number) {
     unacked_packets_.push_back(TransmissionInfo());
     unacked_packets_.back().is_unackable = true;
   }
   unacked_packets_.push_back(
       TransmissionInfo(serialized_packet.retransmittable_frames,
                        serialized_packet.sequence_number_length));
-  if (serialized_packet.retransmittable_frames != NULL &&
-      serialized_packet.retransmittable_frames->HasCryptoHandshake()
-          == IS_HANDSHAKE) {
+  if (serialized_packet.retransmittable_frames != nullptr &&
+      serialized_packet.retransmittable_frames->HasCryptoHandshake() ==
+          IS_HANDSHAKE) {
     ++pending_crypto_packet_count_;
   }
 }
 
 void QuicUnackedPacketMap::RemoveObsoletePackets() {
   while (!unacked_packets_.empty()) {
     if (!IsPacketRemovable(least_unacked_, unacked_packets_.front())) {
       break;
     }
     unacked_packets_.pop_front();
@@ skipping 10 matching lines @@
   DCHECK_GE(new_sequence_number, least_unacked_ + unacked_packets_.size());
   while (least_unacked_ + unacked_packets_.size() < new_sequence_number) {
     unacked_packets_.push_back(TransmissionInfo());
     unacked_packets_.back().is_unackable = true;
   }
 
   // TODO(ianswett): Discard and lose the packet lazily instead of immediately.
   TransmissionInfo* transmission_info =
       &unacked_packets_.at(old_sequence_number - least_unacked_);
   RetransmittableFrames* frames = transmission_info->retransmittable_frames;
-  LOG_IF(DFATAL, frames == NULL) << "Attempt to retransmit packet with no "
-                                 << "retransmittable frames: "
-                                 << old_sequence_number;
+  LOG_IF(DFATAL, frames == nullptr)
+      << "Attempt to retransmit packet with no "
+      << "retransmittable frames: " << old_sequence_number;
 
   // We keep the old packet in the unacked packet list until it, or one of
   // the retransmissions of it are acked.
-  transmission_info->retransmittable_frames = NULL;
+  transmission_info->retransmittable_frames = nullptr;
   // Only keep one transmission older than largest observed, because only the
   // most recent is expected to possibly be a spurious retransmission.
-  while (transmission_info->all_transmissions != NULL &&
+  while (transmission_info->all_transmissions != nullptr &&
          transmission_info->all_transmissions->size() > 1 &&
-         *(++transmission_info->all_transmissions->begin())
-             < largest_observed_) {
+         *(++transmission_info->all_transmissions->begin()) <
+             largest_observed_) {
     QuicPacketSequenceNumber old_transmission =
         *transmission_info->all_transmissions->begin();
     TransmissionInfo* old_info =
         &unacked_packets_[old_transmission - least_unacked_];
     // Don't remove old packets if they're still in flight.
     if (old_info->in_flight) {
       break;
     }
     old_info->all_transmissions->pop_front();
     // This will cause the packet be removed in RemoveObsoletePackets.
-    old_info->all_transmissions = NULL;
+    old_info->all_transmissions = nullptr;
   }
   // Don't link old transmissions to new ones when version or
   // encryption changes.
   if (transmission_type == ALL_INITIAL_RETRANSMISSION ||
       transmission_type == ALL_UNACKED_RETRANSMISSION) {
     RemoveAckability(transmission_info);
   } else {
-    if (transmission_info->all_transmissions == NULL) {
+    if (transmission_info->all_transmissions == nullptr) {
       transmission_info->all_transmissions = new SequenceNumberList();
       transmission_info->all_transmissions->push_back(old_sequence_number);
     }
     transmission_info->all_transmissions->push_back(new_sequence_number);
   }
   unacked_packets_.push_back(
       TransmissionInfo(frames,
                        transmission_info->sequence_number_length,
                        transmission_type,
                        transmission_info->all_transmissions));
   RemoveObsoletePackets();
 }
 
 void QuicUnackedPacketMap::ClearAllPreviousRetransmissions() {
   while (!unacked_packets_.empty() && least_unacked_ < largest_observed_) {
     // If this packet is in flight, or has retransmittable data, then there is
     // no point in clearing out any further packets, because they would not
     // affect the high water mark.
     TransmissionInfo* info = &unacked_packets_.front();
-    if (info->in_flight || info->retransmittable_frames != NULL) {
+    if (info->in_flight || info->retransmittable_frames != nullptr) {
       break;
     }
 
-    if (info->all_transmissions != NULL) {
+    if (info->all_transmissions != nullptr) {
       if (info->all_transmissions->size() < 2) {
-        LOG(DFATAL) << "all_transmissions must be NULL or have multiple "
+        LOG(DFATAL) << "all_transmissions must be nullptr or have multiple "
                     << "elements.  size:" << info->all_transmissions->size();
         delete info->all_transmissions;
       } else {
         info->all_transmissions->pop_front();
         if (info->all_transmissions->size() == 1) {
-          // Set the newer transmission's 'all_transmissions' entry to NULL.
+          // Set the newer transmission's 'all_transmissions' entry to nullptr.
           QuicPacketSequenceNumber new_transmission =
               info->all_transmissions->front();
           TransmissionInfo* new_info =
               &unacked_packets_.at(new_transmission - least_unacked_);
           delete new_info->all_transmissions;
-          new_info->all_transmissions = NULL;
+          new_info->all_transmissions = nullptr;
         }
       }
     }
     unacked_packets_.pop_front();
     ++least_unacked_;
   }
 }
 
 bool QuicUnackedPacketMap::HasRetransmittableFrames(
     QuicPacketSequenceNumber sequence_number) const {
   DCHECK_GE(sequence_number, least_unacked_);
   DCHECK_LT(sequence_number, least_unacked_ + unacked_packets_.size());
-  return unacked_packets_[
-      sequence_number - least_unacked_].retransmittable_frames != NULL;
+  return unacked_packets_[sequence_number - least_unacked_]
+             .retransmittable_frames != nullptr;
 }
 
 void QuicUnackedPacketMap::NackPacket(QuicPacketSequenceNumber sequence_number,
                                       size_t min_nacks) {
   DCHECK_GE(sequence_number, least_unacked_);
   DCHECK_LT(sequence_number, least_unacked_ + unacked_packets_.size());
   unacked_packets_[sequence_number - least_unacked_].nack_count =
       max(min_nacks,
           unacked_packets_[sequence_number - least_unacked_].nack_count);
 }
 
 void QuicUnackedPacketMap::RemoveRetransmittability(
     QuicPacketSequenceNumber sequence_number) {
   DCHECK_GE(sequence_number, least_unacked_);
   DCHECK_LT(sequence_number, least_unacked_ + unacked_packets_.size());
   TransmissionInfo* info = &unacked_packets_[sequence_number - least_unacked_];
   SequenceNumberList* all_transmissions = info->all_transmissions;
-  if (all_transmissions == NULL) {
+  if (all_transmissions == nullptr) {
     MaybeRemoveRetransmittableFrames(info);
     return;
   }
   // TODO(ianswett): Consider adding a check to ensure there are retransmittable
   // frames associated with this packet.
   for (SequenceNumberList::const_iterator it = all_transmissions->begin();
        it != all_transmissions->end(); ++it) {
     TransmissionInfo* transmission_info =
         &unacked_packets_[*it - least_unacked_];
     MaybeRemoveRetransmittableFrames(transmission_info);
-    transmission_info->all_transmissions = NULL;
+    transmission_info->all_transmissions = nullptr;
   }
   delete all_transmissions;
 }
 
 void QuicUnackedPacketMap::RemoveAckability(TransmissionInfo* info) {
-  DCHECK(info->retransmittable_frames == NULL);
+  DCHECK(info->retransmittable_frames == nullptr);
   info->is_unackable = true;
   SequenceNumberList* all_transmissions = info->all_transmissions;
-  if (all_transmissions == NULL) {
+  if (all_transmissions == nullptr) {
     return;
   }
   for (SequenceNumberList::const_iterator it = all_transmissions->begin();
        it != all_transmissions->end(); ++it) {
     TransmissionInfo* transmission_info =
         &unacked_packets_[*it - least_unacked_];
-    transmission_info->all_transmissions = NULL;
+    transmission_info->all_transmissions = nullptr;
     transmission_info->is_unackable = true;
   }
   delete all_transmissions;
 }
 
 void QuicUnackedPacketMap::MaybeRemoveRetransmittableFrames(
     TransmissionInfo* transmission_info) {
-  if (transmission_info->retransmittable_frames != NULL) {
+  if (transmission_info->retransmittable_frames != nullptr) {
     if (transmission_info->retransmittable_frames->HasCryptoHandshake()
             == IS_HANDSHAKE) {
       --pending_crypto_packet_count_;
     }
     delete transmission_info->retransmittable_frames;
-    transmission_info->retransmittable_frames = NULL;
+    transmission_info->retransmittable_frames = nullptr;
   }
 }
 
 void QuicUnackedPacketMap::IncreaseLargestObserved(
     QuicPacketSequenceNumber largest_observed) {
   DCHECK_LE(largest_observed_, largest_observed);
   largest_observed_ = largest_observed;
 }
 
 bool QuicUnackedPacketMap::IsPacketUseless(
     QuicPacketSequenceNumber sequence_number,
     const TransmissionInfo& info) const {
   return (info.is_unackable || sequence_number <= largest_observed_) &&
-      !info.in_flight &&
-      info.retransmittable_frames == NULL &&
-      info.all_transmissions == NULL;
+         !info.in_flight && info.retransmittable_frames == nullptr &&
+         info.all_transmissions == nullptr;
 }
 
 bool QuicUnackedPacketMap::IsPacketRemovable(
     QuicPacketSequenceNumber sequence_number,
     const TransmissionInfo& info) const {
-  return (info.is_unackable ||
-          sequence_number <= largest_observed_ ||
+  return (info.is_unackable || sequence_number <= largest_observed_ ||
           unacked_packets_.size() > kMaxTcpCongestionWindow) &&
-      !info.in_flight &&
-      info.retransmittable_frames == NULL &&
-      info.all_transmissions == NULL;
+         !info.in_flight && info.retransmittable_frames == nullptr &&
+         info.all_transmissions == nullptr;
 }
 
 bool QuicUnackedPacketMap::IsUnacked(
     QuicPacketSequenceNumber sequence_number) const {
   if (sequence_number < least_unacked_ ||
       sequence_number >= least_unacked_ + unacked_packets_.size()) {
     return false;
   }
   return !IsPacketUseless(sequence_number,
                           unacked_packets_[sequence_number - least_unacked_]);
@@ skipping 121 matching lines @@
   TransmissionInfo* info = &unacked_packets_[sequence_number - least_unacked_];
   DCHECK(!info->in_flight);
   DCHECK_NE(0u, info->bytes_sent);
   DCHECK(info->sent_time.IsInitialized());
 
   bytes_in_flight_ += info->bytes_sent;
   info->in_flight = true;
 }
 
 }  // namespace net