diff options
author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-25 17:23:38 +0000 |
---|---|---|
committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-25 17:23:38 +0000 |
commit | 8c6d4c92132c5b50afbc2880405cd857369f400d (patch) | |
tree | 780d52321a3e0fcd6c5cdae4551133a9b2d43085 /net | |
parent | 192fe9736d355adfa1b871ce9d8a838ac8a76a91 (diff) | |
download | chromium_src-8c6d4c92132c5b50afbc2880405cd857369f400d.zip chromium_src-8c6d4c92132c5b50afbc2880405cd857369f400d.tar.gz chromium_src-8c6d4c92132c5b50afbc2880405cd857369f400d.tar.bz2 |
LOG(INFO) tidying in net/
Some deletions, some to VLOG.
R=rsleevi@chromium.org
BUG=322805
Review URL: https://codereview.chromium.org/82913011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237095 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
42 files changed, 121 insertions, 126 deletions
diff --git a/net/base/int128_unittest.cc b/net/base/int128_unittest.cc index 78790e7..c0ded1a 100644 --- a/net/base/int128_unittest.cc +++ b/net/base/int128_unittest.cc @@ -109,9 +109,6 @@ TEST(Int128, AllTests) { EXPECT_EQ(two, -((-one) - 1)); EXPECT_EQ(kuint128max, -one); EXPECT_EQ(zero, -zero); - - LOG(INFO) << one; - LOG(INFO) << big_minus_one; } TEST(Int128, PodTests) { diff --git a/net/cert/x509_util_ios.cc b/net/cert/x509_util_ios.cc index 736c26e..25d3aac 100644 --- a/net/cert/x509_util_ios.cc +++ b/net/cert/x509_util_ios.cc @@ -100,8 +100,6 @@ SHA1HashValue CalculateFingerprintNSS(CERTCertificate* cert) { NSSCertificate::NSSCertificate(SecCertificateRef cert_handle) { nss_cert_handle_ = CreateNSSCertHandleFromOSHandle(cert_handle); - DLOG_IF(INFO, cert_handle && !nss_cert_handle_) - << "Could not convert SecCertificateRef to CERTCertificate*"; } NSSCertificate::~NSSCertificate() { diff --git a/net/disk_cache/rankings.cc b/net/disk_cache/rankings.cc index ff9913e..8377e9b 100644 --- a/net/disk_cache/rankings.cc +++ b/net/disk_cache/rankings.cc @@ -895,7 +895,7 @@ void Rankings::InvalidateIterators(CacheRankingsBlock* node) { for (IteratorList::iterator it = iterators_.begin(); it != iterators_.end(); ++it) { if (it->first == address) { - DLOG(INFO) << "Invalidating iterator at 0x" << std::hex << address; + DVLOG(0) << "Invalidating iterator at 0x" << std::hex << address; it->second->Discard(); } } diff --git a/net/disk_cache/simple/simple_index_file.cc b/net/disk_cache/simple/simple_index_file.cc index 5e1e4ba..c1fc053 100644 --- a/net/disk_cache/simple/simple_index_file.cc +++ b/net/disk_cache/simple/simple_index_file.cc @@ -434,7 +434,7 @@ void SimpleIndexFile::SyncRestoreFromDisk( const base::FilePath& cache_directory, const base::FilePath& index_file_path, SimpleIndexLoadResult* out_result) { - LOG(INFO) << "Simple Cache Index is being restored from disk."; + VLOG(0) << "Simple Cache Index is being restored from disk."; base::DeleteFile(index_file_path, /* recursive = */ false); out_result->Reset(); SimpleIndex::EntrySet* entries = &out_result->entries; diff --git a/net/disk_cache/simple/simple_synchronous_entry.cc b/net/disk_cache/simple/simple_synchronous_entry.cc index 81f52e1..d18352b 100644 --- a/net/disk_cache/simple/simple_synchronous_entry.cc +++ b/net/disk_cache/simple/simple_synchronous_entry.cc @@ -488,7 +488,7 @@ void SimpleSynchronousEntry::WriteSparseData( // This is a pessimistic estimate; it assumes the entire buffer is going to // be appended as a new range, not written over existing ranges. if (sparse_data_size + buf_len > max_sparse_data_size) { - DLOG(INFO) << "Truncating sparse data file (" << sparse_data_size << " + " + DVLOG(0) << "Truncating sparse data file (" << sparse_data_size << " + " << buf_len << " > " << max_sparse_data_size << ")"; TruncateSparseFile(); } @@ -624,7 +624,7 @@ void SimpleSynchronousEntry::CheckEOFRecord(int index, return; } if (has_crc32 && crc32 != expected_crc32) { - DLOG(INFO) << "EOF record had bad crc."; + DVLOG(0) << "EOF record had bad crc."; *out_result = net::ERR_CACHE_CHECKSUM_MISMATCH; RecordCheckEOFResult(cache_type_, CHECK_EOF_RESULT_CRC_MISMATCH); Doom(); @@ -645,7 +645,7 @@ void SimpleSynchronousEntry::Close( stream_0_data->data(), entry_stat.data_size(0)) != entry_stat.data_size(0)) { RecordCloseResult(cache_type_, CLOSE_RESULT_WRITE_FAILURE); - DLOG(INFO) << "Could not write stream 0 data."; + DVLOG(0) << "Could not write stream 0 data."; Doom(); } @@ -670,7 +670,7 @@ void SimpleSynchronousEntry::Close( if (stream_index == 0 && !TruncatePlatformFile(files_[file_index], eof_offset)) { RecordCloseResult(cache_type_, CLOSE_RESULT_WRITE_FAILURE); - DLOG(INFO) << "Could not truncate stream 0 file."; + DVLOG(0) << "Could not truncate stream 0 file."; Doom(); break; } @@ -679,7 +679,7 @@ void SimpleSynchronousEntry::Close( reinterpret_cast<const char*>(&eof_record), sizeof(eof_record)) != sizeof(eof_record)) { RecordCloseResult(cache_type_, CLOSE_RESULT_WRITE_FAILURE); - DLOG(INFO) << "Could not write eof record."; + DVLOG(0) << "Could not write eof record."; Doom(); break; } @@ -1005,7 +1005,7 @@ int SimpleSynchronousEntry::InitializeForOpen( DCHECK(CanOmitEmptyFile(stream2_file_index)); if (!empty_file_omitted_[stream2_file_index] && out_entry_stat->data_size(2) == 0) { - DLOG(INFO) << "Removing empty stream 2 file."; + DVLOG(0) << "Removing empty stream 2 file."; CloseFile(stream2_file_index); DeleteFileForEntryHash(path_, entry_hash_, stream2_file_index); empty_file_omitted_[stream2_file_index] = true; @@ -1113,7 +1113,7 @@ int SimpleSynchronousEntry::ReadAndValidateStream0( reinterpret_cast<const Bytef*>((*stream_0_data)->data()), stream_0_size); if (has_crc32 && read_crc32 != expected_crc32) { - DLOG(INFO) << "EOF record had bad crc."; + DVLOG(0) << "EOF record had bad crc."; RecordCheckEOFResult(cache_type_, CHECK_EOF_RESULT_CRC_MISMATCH); return net::ERR_FAILED; } @@ -1140,7 +1140,7 @@ int SimpleSynchronousEntry::GetEOFRecordData(int index, if (eof_record.final_magic_number != kSimpleFinalMagicNumber) { RecordCheckEOFResult(cache_type_, CHECK_EOF_RESULT_MAGIC_NUMBER_MISMATCH); - DLOG(INFO) << "EOF record had bad magic number."; + DVLOG(0) << "EOF record had bad magic number."; return net::ERR_CACHE_CHECKSUM_READ_FAILURE; } diff --git a/net/disk_cache/trace.cc b/net/disk_cache/trace.cc index 56ebe9b..77ee7c1 100644 --- a/net/disk_cache/trace.cc +++ b/net/disk_cache/trace.cc @@ -121,7 +121,7 @@ void Trace(const char* format, ...) { #if defined(DISK_CACHE_TRACE_TO_LOG) line[kEntrySize] = '\0'; - LOG(INFO) << line; + VLOG(0) << line; #endif va_end(ap); diff --git a/net/proxy/dhcp_proxy_script_adapter_fetcher_win.cc b/net/proxy/dhcp_proxy_script_adapter_fetcher_win.cc index 569e812..cfa213e 100644 --- a/net/proxy/dhcp_proxy_script_adapter_fetcher_win.cc +++ b/net/proxy/dhcp_proxy_script_adapter_fetcher_win.cc @@ -261,7 +261,7 @@ std::string DhcpProxyScriptAdapterFetcher::GetPacURLFromDhcp( } while (res == ERROR_MORE_DATA && retry_count <= 3); if (res != NO_ERROR) { - LOG(INFO) << "Error fetching PAC URL from DHCP: " << res; + VLOG(0) << "Error fetching PAC URL from DHCP: " << res; UMA_HISTOGRAM_COUNTS("Net.DhcpWpadUnhandledDhcpError", 1); } else if (wpad_params.nBytesData) { return SanitizeDhcpApiString( diff --git a/net/quic/congestion_control/inter_arrival_overuse_detector_test.cc b/net/quic/congestion_control/inter_arrival_overuse_detector_test.cc index 8d37749..472e673 100644 --- a/net/quic/congestion_control/inter_arrival_overuse_detector_test.cc +++ b/net/quic/congestion_control/inter_arrival_overuse_detector_test.cc @@ -269,7 +269,7 @@ TEST_F(InterArrivalOveruseDetectorTest, DISABLED_TestNoise) { count[GaussianRandom(mean, standard_deviation).ToMilliseconds()]++; } for (int j = 0; j < 100; ++j) { - DLOG(INFO) << j << ":" << count[j]; + DVLOG(0) << j << ":" << count[j]; } } diff --git a/net/quic/congestion_control/inter_arrival_sender_test.cc b/net/quic/congestion_control/inter_arrival_sender_test.cc index 1e16163..f520056 100644 --- a/net/quic/congestion_control/inter_arrival_sender_test.cc +++ b/net/quic/congestion_control/inter_arrival_sender_test.cc @@ -153,7 +153,7 @@ TEST_F(InterArrivalSenderTest, ProbeFollowedByFullRampUpCycle) { acc_arrival_time.ToMicroseconds(); EXPECT_NEAR(0.7f * probe_rate, sender_.BandwidthEstimate().ToBytesPerSecond(), 1000); - DLOG(INFO) << "After probe"; + DVLOG(0) << "After probe"; // Send 50 bursts, make sure that we move fast in the beginning. for (int i = 0; i < 50; ++i) { SendAvailableCongestionWindow(); @@ -198,7 +198,7 @@ TEST_F(InterArrivalSenderTest, ProbeFollowedByFullRampUpCycle) { EXPECT_NEAR(0.99f * probe_rate, sender_.BandwidthEstimate().ToBytesPerSecond(), 1000); EXPECT_NEAR(SenderDeltaSinceStart().ToMilliseconds(), 1560, 10); - DLOG(INFO) << "Near available channel estimate"; + DVLOG(0) << "Near available channel estimate"; // Send 50 bursts, make sure that we move very slow close to the probe rate. for (int i = 0; i < 50; ++i) { @@ -214,7 +214,7 @@ TEST_F(InterArrivalSenderTest, ProbeFollowedByFullRampUpCycle) { EXPECT_NEAR(1.00f * probe_rate, sender_.BandwidthEstimate().ToBytesPerSecond(), 2000); EXPECT_NEAR(SenderDeltaSinceStart().ToMilliseconds(), 2000, 100); - DLOG(INFO) << "At available channel estimate"; + DVLOG(0) << "At available channel estimate"; // Send 50 bursts, make sure that we move very slow close to the probe rate. for (int i = 0; i < 50; ++i) { @@ -280,7 +280,7 @@ TEST_F(InterArrivalSenderTest, ProbeFollowedByFullRampUpCycle) { EXPECT_NEAR(halfway_rate, sender_.BandwidthEstimate().ToBytesPerSecond(), 5000); EXPECT_NEAR(SenderDeltaSinceStart().ToMilliseconds(), 6600, 100); - DLOG(INFO) << "Near halfway point"; + DVLOG(0) << "Near halfway point"; // Send until we reach max channel capacity. for (int i = 0; i < 1500; ++i) { diff --git a/net/quic/congestion_control/quic_congestion_manager.cc b/net/quic/congestion_control/quic_congestion_manager.cc index c292fe7..8f68839 100644 --- a/net/quic/congestion_control/quic_congestion_manager.cc +++ b/net/quic/congestion_control/quic_congestion_manager.cc @@ -74,7 +74,7 @@ void QuicCongestionManager::SetFromConfig(const QuicConfig& config, if (config.initial_round_trip_time_us() > 0 && rtt_sample_.IsInfinite()) { // The initial rtt should already be set on the client side. - DLOG_IF(INFO, !is_server) + DVLOG_IF(0, !is_server) << "Client did not set an initial RTT, but did negotiate one."; rtt_sample_ = QuicTime::Delta::FromMicroseconds(config.initial_round_trip_time_us()); diff --git a/net/quic/crypto/aes_128_gcm_12_decrypter_test.cc b/net/quic/crypto/aes_128_gcm_12_decrypter_test.cc index cea6a6e5..5e501bf 100644 --- a/net/quic/crypto/aes_128_gcm_12_decrypter_test.cc +++ b/net/quic/crypto/aes_128_gcm_12_decrypter_test.cc @@ -310,7 +310,7 @@ QuicData* DecryptWithNonce(Aes128Gcm12Decrypter* decrypter, TEST(Aes128Gcm12DecrypterTest, Decrypt) { if (!Aes128Gcm12Decrypter::IsSupported()) { - LOG(INFO) << "AES GCM not supported. Test skipped."; + VLOG(0) << "AES GCM not supported. Test skipped."; return; } diff --git a/net/quic/quic_config_test.cc b/net/quic/quic_config_test.cc index 1529672..7d64f5b 100644 --- a/net/quic/quic_config_test.cc +++ b/net/quic/quic_config_test.cc @@ -190,7 +190,7 @@ TEST_F(QuicConfigTest, NoOverLapInCGST) { string error_details; server_config.ToHandshakeMessage(&msg); const QuicErrorCode error = config_.ProcessClientHello(msg, &error_details); - LOG(INFO) << QuicUtils::ErrorToString(error); + VLOG(0) << QuicUtils::ErrorToString(error); EXPECT_EQ(QUIC_CRYPTO_MESSAGE_PARAMETER_NO_OVERLAP, error); } diff --git a/net/quic/quic_crypto_server_stream_test.cc b/net/quic/quic_crypto_server_stream_test.cc index d2b6e99..8ad55b8 100644 --- a/net/quic/quic_crypto_server_stream_test.cc +++ b/net/quic/quic_crypto_server_stream_test.cc @@ -174,7 +174,7 @@ TEST_P(QuicCryptoServerStreamTest, ZeroRTT) { EXPECT_EQ(2, client->num_sent_client_hellos()); // Now do another handshake, hopefully in 0-RTT. - LOG(INFO) << "Resetting for 0-RTT handshake attempt"; + VLOG(0) << "Resetting for 0-RTT handshake attempt"; client_conn = new PacketSavingConnection(guid, addr, false); server_conn = new PacketSavingConnection(guid, addr, false); diff --git a/net/quic/quic_framer.cc b/net/quic/quic_framer.cc index 0902e2b..e7d0448 100644 --- a/net/quic/quic_framer.cc +++ b/net/quic/quic_framer.cc @@ -2026,7 +2026,7 @@ bool QuicFramer::AppendAckFramePayloadAndTypeByte( max_num_ranges = min(static_cast<size_t>(numeric_limits<uint8>::max()), max_num_ranges); bool truncated = ack_info.nack_ranges.size() > max_num_ranges; - DLOG_IF(INFO, truncated) << "Truncating ack from " + DVLOG_IF(0, truncated) << "Truncating ack from " << ack_info.nack_ranges.size() << " ranges to " << max_num_ranges; diff --git a/net/quic/quic_framer_test.cc b/net/quic/quic_framer_test.cc index 9f882a8..ce44432 100644 --- a/net/quic/quic_framer_test.cc +++ b/net/quic/quic_framer_test.cc @@ -199,7 +199,7 @@ class TestQuicVisitor : public ::net::QuicFramerVisitorInterface { } virtual void OnError(QuicFramer* f) OVERRIDE { - DLOG(INFO) << "QuicFramer Error: " << QuicUtils::ErrorToString(f->error()) + DVLOG(0) << "QuicFramer Error: " << QuicUtils::ErrorToString(f->error()) << " (" << f->error() << ")"; error_count_++; } @@ -221,7 +221,7 @@ class TestQuicVisitor : public ::net::QuicFramerVisitorInterface { } virtual bool OnProtocolVersionMismatch(QuicVersion version) OVERRIDE { - DLOG(INFO) << "QuicFramer Version Mismatch, version: " << version; + DVLOG(0) << "QuicFramer Version Mismatch, version: " << version; version_mismatch_++; return true; } @@ -2471,7 +2471,7 @@ TEST_P(QuicFramerTest, PublicResetPacket) { // Now test framing boundaries for (size_t i = 0; i < GetPublicResetPacketSize(); ++i) { string expected_error; - DLOG(INFO) << "iteration: " << i; + DVLOG(0) << "iteration: " << i; if (i < kGuidOffset) { expected_error = "Unable to read public flags."; CheckProcessingFails(packet, i, expected_error, diff --git a/net/quic/test_tools/crypto_test_utils.cc b/net/quic/test_tools/crypto_test_utils.cc index e14d7ab..5471c5f 100644 --- a/net/quic/test_tools/crypto_test_utils.cc +++ b/net/quic/test_tools/crypto_test_utils.cc @@ -226,15 +226,15 @@ void CryptoTestUtils::CommunicateHandshakeMessages( size_t a_i = 0, b_i = 0; while (!a->handshake_confirmed()) { ASSERT_GT(a_conn->packets_.size(), a_i); - LOG(INFO) << "Processing " << a_conn->packets_.size() - a_i + VLOG(0) << "Processing " << a_conn->packets_.size() - a_i << " packets a->b"; MovePackets(a_conn, &a_i, b, b_conn); ASSERT_GT(b_conn->packets_.size(), b_i); - LOG(INFO) << "Processing " << b_conn->packets_.size() - b_i + VLOG(0) << "Processing " << b_conn->packets_.size() - b_i << " packets b->a"; if (b_conn->packets_.size() - b_i == 2) { - LOG(INFO) << "here"; + VLOG(0) << "here"; } MovePackets(b_conn, &b_i, a, a_conn); } @@ -247,14 +247,14 @@ pair<size_t, size_t> CryptoTestUtils::AdvanceHandshake( PacketSavingConnection* b_conn, QuicCryptoStream* b, size_t b_i) { - LOG(INFO) << "Processing " << a_conn->packets_.size() - a_i + VLOG(0) << "Processing " << a_conn->packets_.size() - a_i << " packets a->b"; MovePackets(a_conn, &a_i, b, b_conn); - LOG(INFO) << "Processing " << b_conn->packets_.size() - b_i + VLOG(0) << "Processing " << b_conn->packets_.size() - b_i << " packets b->a"; if (b_conn->packets_.size() - b_i == 2) { - LOG(INFO) << "here"; + VLOG(0) << "here"; } MovePackets(b_conn, &b_i, a, a_conn); diff --git a/net/spdy/buffered_spdy_framer_unittest.cc b/net/spdy/buffered_spdy_framer_unittest.cc index 31a649d..f975fef 100644 --- a/net/spdy/buffered_spdy_framer_unittest.cc +++ b/net/spdy/buffered_spdy_framer_unittest.cc @@ -24,14 +24,14 @@ class TestBufferedSpdyVisitor : public BufferedSpdyFramerVisitorInterface { } virtual void OnError(SpdyFramer::SpdyError error_code) OVERRIDE { - LOG(INFO) << "SpdyFramer Error: " << error_code; + VLOG(0) << "SpdyFramer Error: " << error_code; error_count_++; } virtual void OnStreamError( SpdyStreamId stream_id, const std::string& description) OVERRIDE { - LOG(INFO) << "SpdyFramer Error on stream: " << stream_id << " " + VLOG(0) << "SpdyFramer Error on stream: " << stream_id << " " << description; error_count_++; } diff --git a/net/spdy/spdy_framer.cc b/net/spdy/spdy_framer.cc index 89a8309..687e9c0 100644 --- a/net/spdy/spdy_framer.cc +++ b/net/spdy/spdy_framer.cc @@ -61,7 +61,7 @@ const size_t SpdyFramer::kControlFrameBufferSize = 18; #ifdef DEBUG_SPDY_STATE_CHANGES #define CHANGE_STATE(newstate) \ do { \ - LOG(INFO) << "Changing state from: " \ + VLOG(0) << "Changing state from: " \ << StateToString(state_) \ << " to " << StateToString(newstate) << "\n"; \ DCHECK(state_ != SPDY_ERROR); \ @@ -652,7 +652,7 @@ size_t SpdyFramer::ProcessCommonHeader(const char* data, size_t len) { } else if (version != spdy_version_) { // We check version before we check validity: version can never be // 'invalid', it can only be unsupported. - DLOG(INFO) << "Unsupported SPDY version " << version + DVLOG(0) << "Unsupported SPDY version " << version << " (expected " << spdy_version_ << ")"; set_error(SPDY_UNSUPPORTED_VERSION); } else { @@ -675,7 +675,7 @@ void SpdyFramer::ProcessControlFrameHeader(uint16 control_frame_type_field) { current_frame_type_ = static_cast<SpdyFrameType>(control_frame_type_field); if (current_frame_type_ == NOOP) { - DLOG(INFO) << "NOOP control frame found. Ignoring."; + DVLOG(0) << "NOOP control frame found. Ignoring."; CHANGE_STATE(SPDY_AUTO_RESET); return; } @@ -1517,13 +1517,13 @@ size_t SpdyFramer::ParseHeaderBlockInBuffer(const char* header_data, if (spdy_version_ < 3) { uint16 temp; if (!reader.ReadUInt16(&temp)) { - DLOG(INFO) << "Unable to read number of headers."; + DVLOG(0) << "Unable to read number of headers."; return 0; } num_headers = temp; } else { if (!reader.ReadUInt32(&num_headers)) { - DLOG(INFO) << "Unable to read number of headers."; + DVLOG(0) << "Unable to read number of headers."; return 0; } } @@ -1535,7 +1535,7 @@ size_t SpdyFramer::ParseHeaderBlockInBuffer(const char* header_data, // Read header name. if ((spdy_version_ < 3) ? !reader.ReadStringPiece16(&temp) : !reader.ReadStringPiece32(&temp)) { - DLOG(INFO) << "Unable to read header name (" << index + 1 << " of " + DVLOG(0) << "Unable to read header name (" << index + 1 << " of " << num_headers << ")."; return 0; } @@ -1544,7 +1544,7 @@ size_t SpdyFramer::ParseHeaderBlockInBuffer(const char* header_data, // Read header value. if ((spdy_version_ < 3) ? !reader.ReadStringPiece16(&temp) : !reader.ReadStringPiece32(&temp)) { - DLOG(INFO) << "Unable to read header value (" << index + 1 << " of " + DVLOG(0) << "Unable to read header value (" << index + 1 << " of " << num_headers << ")."; return 0; } @@ -1552,7 +1552,7 @@ size_t SpdyFramer::ParseHeaderBlockInBuffer(const char* header_data, // Ensure no duplicates. if (block->find(name) != block->end()) { - DLOG(INFO) << "Duplicate header '" << name << "' (" << index + 1 << " of " + DVLOG(0) << "Duplicate header '" << name << "' (" << index + 1 << " of " << num_headers << ")."; return 0; } diff --git a/net/spdy/spdy_framer_test.cc b/net/spdy/spdy_framer_test.cc index d731b3a..148daf64 100644 --- a/net/spdy/spdy_framer_test.cc +++ b/net/spdy/spdy_framer_test.cc @@ -323,7 +323,7 @@ class TestSpdyVisitor : public SpdyFramerVisitorInterface, } virtual void OnError(SpdyFramer* f) OVERRIDE { - LOG(INFO) << "SpdyFramer Error: " + VLOG(0) << "SpdyFramer Error: " << SpdyFramer::ErrorCodeToString(f->error_code()); error_count_++; } @@ -438,7 +438,7 @@ class TestSpdyVisitor : public SpdyFramerVisitorInterface, if (!framer_.ParseCredentialData(credential_buffer_.get(), credential_buffer_length_, &credential_)) { - LOG(INFO) << "Error parsing credential data."; + VLOG(0) << "Error parsing credential data."; ++error_count_; } return true; diff --git a/net/tools/balsa/balsa_frame.cc b/net/tools/balsa/balsa_frame.cc index 96e9193..f004d57 100644 --- a/net/tools/balsa/balsa_frame.cc +++ b/net/tools/balsa/balsa_frame.cc @@ -630,7 +630,7 @@ void BalsaFrame::ProcessContentLengthLine( if (value_begin >= line_end) { // There is no non-whitespace value data. #if DEBUGFRAMER - LOG(INFO) << "invalid content-length -- no non-whitespace value data"; + VLOG(0) << "invalid content-length -- no non-whitespace value data"; #endif *status = BalsaHeadersEnums::INVALID_CONTENT_LENGTH; return; @@ -642,7 +642,7 @@ void BalsaFrame::ProcessContentLengthLine( // bad! content-length found, and couldn't parse all of it! *status = BalsaHeadersEnums::INVALID_CONTENT_LENGTH; #if DEBUGFRAMER - LOG(INFO) << "invalid content-length - non numeric character detected"; + VLOG(0) << "invalid content-length - non numeric character detected"; #endif // DEBUGFRAMER return; } @@ -653,7 +653,7 @@ void BalsaFrame::ProcessContentLengthLine( (std::numeric_limits<size_t>::max() - length_x_10) < c) { *status = BalsaHeadersEnums::CONTENT_LENGTH_OVERFLOW; #if DEBUGFRAMER - LOG(INFO) << "content-length overflow"; + VLOG(0) << "content-length overflow"; #endif // DEBUGFRAMER return; } @@ -661,7 +661,7 @@ void BalsaFrame::ProcessContentLengthLine( ++value_begin; } #if DEBUGFRAMER - LOG(INFO) << "content_length parsed: " << *length; + VLOG(0) << "content_length parsed: " << *length; #endif // DEBUGFRAMER *status = BalsaHeadersEnums::VALID_CONTENT_LENGTH; } @@ -758,7 +758,7 @@ void BalsaFrame::ProcessHeaderLines() { DCHECK(!lines_.empty()); #if DEBUGFRAMER - LOG(INFO) << "******@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@**********\n"; + VLOG(0) << "******@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@**********\n"; #endif // DEBUGFRAMER // There is no need to attempt to process headers if no header lines exist. @@ -786,7 +786,7 @@ void BalsaFrame::ProcessHeaderLines() { const size_t key_len = key_end - key_begin; const char c = *key_begin; #if DEBUGFRAMER - LOG(INFO) << "[" << i << "]: " << std::string(key_begin, key_len) + VLOG(0) << "[" << i << "]: " << std::string(key_begin, key_len) << " c: '" << c << "' key_len: " << key_len; #endif // DEBUGFRAMER // If a header begins with either lowercase or uppercase 'c' or 't', then @@ -1011,8 +1011,8 @@ size_t BalsaFrame::ProcessHeaders(const char* message_start, checkpoint = message_current + 1; const char* begin = headers_->OriginalHeaderStreamBegin(); #if DEBUGFRAMER - LOG(INFO) << "First line " << std::string(begin, lines_[0].second); - LOG(INFO) << "is_request_: " << is_request_; + VLOG(0) << "First line " << std::string(begin, lines_[0].second); + VLOG(0) << "is_request_: " << is_request_; #endif ProcessFirstLine(begin, begin + lines_[0].second); if (parse_state_ == BalsaFrameEnums::MESSAGE_FULLY_READ) @@ -1055,8 +1055,8 @@ size_t BalsaFrame::ProcessHeaders(const char* message_start, checkpoint = message_current + 1; const char* begin = headers_->OriginalHeaderStreamBegin(); #if DEBUGFRAMER - LOG(INFO) << "First line " << std::string(begin, lines_[0].second); - LOG(INFO) << "is_request_: " << is_request_; + VLOG(0) << "First line " << std::string(begin, lines_[0].second); + VLOG(0) << "is_request_: " << is_request_; #endif ProcessFirstLine(begin, begin + lines_[0].second); if (parse_state_ == BalsaFrameEnums::MESSAGE_FULLY_READ) @@ -1219,7 +1219,7 @@ size_t BalsaFrame::ProcessInput(const char* input, size_t size) { const char* on_entry = current; const char* end = current + size; #if DEBUGFRAMER - LOG(INFO) << "\n==============" + VLOG(0) << "\n==============" << BalsaFrameEnums::ParseStateToString(parse_state_) << "===============\n"; #endif // DEBUGFRAMER @@ -1514,7 +1514,7 @@ size_t BalsaFrame::ProcessInput(const char* input, size_t size) { // label_reading_content: case BalsaFrameEnums::READING_CONTENT: #if DEBUGFRAMER - LOG(INFO) << "ReadingContent: " << content_length_remaining_; + VLOG(0) << "ReadingContent: " << content_length_remaining_; #endif // DEBUGFRAMER while (content_length_remaining_ && current < end) { // read in the content @@ -1543,14 +1543,14 @@ size_t BalsaFrame::ProcessInput(const char* input, size_t size) { } bottom: #if DEBUGFRAMER - LOG(INFO) << "\n^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n\n" + VLOG(0) << "\n^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n\n" << std::string(input, current) << "\n$$$$$$$$$$$$$$" << BalsaFrameEnums::ParseStateToString(parse_state_) << "$$$$$$$$$$$$$$$" << " consumed: " << (current - input); if (Error()) { - LOG(INFO) << BalsaFrameEnums::ErrorCodeToString(ErrorCode()); + VLOG(0) << BalsaFrameEnums::ErrorCodeToString(ErrorCode()); } #endif // DEBUGFRAMER return current - input; diff --git a/net/tools/dump_cache/simple_cache_dumper.cc b/net/tools/dump_cache/simple_cache_dumper.cc index 56162ca..66b05d7 100644 --- a/net/tools/dump_cache/simple_cache_dumper.cc +++ b/net/tools/dump_cache/simple_cache_dumper.cc @@ -40,8 +40,8 @@ SimpleCacheDumper::~SimpleCacheDumper() { int SimpleCacheDumper::Run() { base::MessageLoopForIO main_message_loop; - LOG(INFO) << "Reading cache from: " << input_path_.value(); - LOG(INFO) << "Writing cache to: " << output_path_.value(); + VLOG(0) << "Reading cache from: " << input_path_.value(); + VLOG(0) << "Writing cache to: " << output_path_.value(); if (!cache_thread_->StartWithOptions( base::Thread::Options(base::MessageLoop::TYPE_IO, 0))) { diff --git a/net/tools/epoll_server/epoll_server.cc b/net/tools/epoll_server/epoll_server.cc index a382dba..be1bcbaa 100644 --- a/net/tools/epoll_server/epoll_server.cc +++ b/net/tools/epoll_server/epoll_server.cc @@ -147,7 +147,7 @@ EpollServer::~EpollServer() { DCHECK_EQ(in_shutdown_, false); in_shutdown_ = true; #ifdef EPOLL_SERVER_EVENT_TRACING - LOG(INFO) << "\n" << event_recorder_; + VLOG(0) << "\n" << event_recorder_; #endif VLOG(2) << "Shutting down epoll server "; CleanupFDToCBMap(); @@ -635,7 +635,7 @@ void EpollServer::WaitForEventsAndCallHandleEvents(int64 timeout_in_us, // If ready list is not empty, then don't sleep at all. timeout_in_us = 0; } else if (timeout_in_us < 0) { - LOG(INFO) << "Negative epoll timeout: " << timeout_in_us + VLOG(0) << "Negative epoll timeout: " << timeout_in_us << "us; epoll will wait forever for events."; // If timeout_in_us is < 0 we are supposed to Wait forever. This means we // should set timeout_in_us to -1000 so we will diff --git a/net/tools/epoll_server/epoll_server.h b/net/tools/epoll_server/epoll_server.h index 8822450..d167a97 100644 --- a/net/tools/epoll_server/epoll_server.h +++ b/net/tools/epoll_server/epoll_server.h @@ -720,10 +720,10 @@ class EpollServer { // When a number of events equals the record threshold, // the collected data summary for all FDs will be written - // to LOG(INFO). Note that this does not include the + // to VLOG(0). Note that this does not include the // individual events (if you'reinterested in those, you'll // have to get at them programmatically). - // After any such flushing to LOG(INFO) all events will + // After any such flushing to VLOG(0) all events will // be cleared. // Note that the definition of an 'event' is a bit 'hazy', // as it includes the 'Unregistration' event, and perhaps @@ -745,7 +745,7 @@ class EpollServer { ++num_records_; if ((num_records_ > record_threshold_) && (record_threshold_ > 0)) { - LOG(INFO) << "\n" << *this; + VLOG(0) << "\n" << *this; num_records_ = 0; Clear(); } diff --git a/net/tools/flip_server/flip_in_mem_edsm_server.cc b/net/tools/flip_server/flip_in_mem_edsm_server.cc index 79f3e5b..3639807 100644 --- a/net/tools/flip_server/flip_in_mem_edsm_server.cc +++ b/net/tools/flip_server/flip_in_mem_edsm_server.cc @@ -275,26 +275,26 @@ int main (int argc, char**argv) settings.lock_log = logging::DONT_LOCK_LOG_FILE; logging::InitLogging(settings); - LOG(INFO) << "Flip SPDY proxy started with configuration:"; - LOG(INFO) << "Logging destination : " << g_proxy_config.log_destination_; - LOG(INFO) << "Log file : " << g_proxy_config.log_filename_; - LOG(INFO) << "Forward IP Header : " + VLOG(0) << "Flip SPDY proxy started with configuration:"; + VLOG(0) << "Logging destination : " << g_proxy_config.log_destination_; + VLOG(0) << "Log file : " << g_proxy_config.log_filename_; + VLOG(0) << "Forward IP Header : " << (net::SpdySM::forward_ip_header().length() ? net::SpdySM::forward_ip_header() : "<disabled>"); - LOG(INFO) << "Wait for interfaces : " << (wait_for_iface?"true":"false"); - LOG(INFO) << "Accept backlog size : " << FLAGS_accept_backlog_size; - LOG(INFO) << "Accepts per wake : " << FLAGS_accepts_per_wake; - LOG(INFO) << "Disable nagle : " + VLOG(0) << "Wait for interfaces : " << (wait_for_iface?"true":"false"); + VLOG(0) << "Accept backlog size : " << FLAGS_accept_backlog_size; + VLOG(0) << "Accepts per wake : " << FLAGS_accepts_per_wake; + VLOG(0) << "Disable nagle : " << (FLAGS_disable_nagle?"true":"false"); - LOG(INFO) << "Reuseport : " + VLOG(0) << "Reuseport : " << (FLAGS_reuseport?"true":"false"); - LOG(INFO) << "Force SPDY : " + VLOG(0) << "Force SPDY : " << (FLAGS_force_spdy?"true":"false"); - LOG(INFO) << "SSL session expiry : " + VLOG(0) << "SSL session expiry : " << g_proxy_config.ssl_session_expiry_; - LOG(INFO) << "SSL disable compression : " + VLOG(0) << "SSL disable compression : " << g_proxy_config.ssl_disable_compression_; - LOG(INFO) << "Connection idle timeout : " + VLOG(0) << "Connection idle timeout : " << g_proxy_config.idle_socket_timeout_s_; // Proxy Acceptors diff --git a/net/tools/flip_server/loadtime_measurement.h b/net/tools/flip_server/loadtime_measurement.h index b46217e..6cf9e50 100644 --- a/net/tools/flip_server/loadtime_measurement.h +++ b/net/tools/flip_server/loadtime_measurement.h @@ -61,7 +61,7 @@ class LoadtimeMeasurement { if (action.find("test_complete") == 0) { for (std::map<std::string, int>::const_iterator it = loadtimes_.begin(); it != loadtimes_.end(); ++it) { - LOG(INFO) << it->first << " " << it->second; + VLOG(0) << it->first << " " << it->second; } loadtimes_.clear(); output.append("OK"); diff --git a/net/tools/flip_server/mem_cache.cc b/net/tools/flip_server/mem_cache.cc index 42d9343..d87c086 100644 --- a/net/tools/flip_server/mem_cache.cc +++ b/net/tools/flip_server/mem_cache.cc @@ -160,7 +160,7 @@ void MemoryCache::ReadAndStoreFileContents(const char* filename) { LOG(ERROR) << "Unable to make forward progress, or error" " framing file: " << filename; if (framer.Error()) { - LOG(INFO) << "********************************************ERROR!"; + VLOG(0) << "********************************************ERROR!"; return; } return; @@ -196,7 +196,7 @@ void MemoryCache::ReadAndStoreFileContents(const char* filename) { DCHECK_EQ(std::string(filename).substr(0, cwd_.size()), cwd_); DCHECK_EQ(filename[cwd_.size()], '/'); std::string filename_stripped = std::string(filename).substr(cwd_.size() + 1); - LOG(INFO) << "Adding file (" << visitor.body.length() << " bytes): " + VLOG(0) << "Adding file (" << visitor.body.length() << " bytes): " << filename_stripped; size_t slash_pos = filename_stripped.find('/'); if (slash_pos == std::string::npos) { diff --git a/net/tools/flip_server/streamer_interface.cc b/net/tools/flip_server/streamer_interface.cc index 8c2e0e7..ce8a3d7 100644 --- a/net/tools/flip_server/streamer_interface.cc +++ b/net/tools/flip_server/streamer_interface.cc @@ -173,11 +173,11 @@ void StreamerSM::ProcessHeaders(const BalsaHeaders& headers) { BalsaHeaders mod_headers; mod_headers.CopyFrom(headers); if (forward_ip_header_.length()) { - LOG(INFO) << "Adding forward header: " << forward_ip_header_; + VLOG(0) << "Adding forward header: " << forward_ip_header_; mod_headers.ReplaceOrAppendHeader(forward_ip_header_, connection_->client_ip()); } else { - LOG(INFO) << "NOT adding forward header."; + VLOG(0) << "NOT adding forward header."; } SimpleBuffer sb; char* buffer; diff --git a/net/tools/net_watcher/net_watcher.cc b/net/tools/net_watcher/net_watcher.cc index 67eb124..f1246b6 100644 --- a/net/tools/net_watcher/net_watcher.cc +++ b/net/tools/net_watcher/net_watcher.cc @@ -90,25 +90,25 @@ class NetWatcher : // net::NetworkChangeNotifier::IPAddressObserver implementation. virtual void OnIPAddressChanged() OVERRIDE { - LOG(INFO) << "OnIPAddressChanged()"; + VLOG(0) << "OnIPAddressChanged()"; } // net::NetworkChangeNotifier::ConnectionTypeObserver implementation. virtual void OnConnectionTypeChanged( net::NetworkChangeNotifier::ConnectionType type) OVERRIDE { - LOG(INFO) << "OnConnectionTypeChanged(" + VLOG(0) << "OnConnectionTypeChanged(" << ConnectionTypeToString(type) << ")"; } // net::NetworkChangeNotifier::DNSObserver implementation. virtual void OnDNSChanged() OVERRIDE { - LOG(INFO) << "OnDNSChanged()"; + VLOG(0) << "OnDNSChanged()"; } // net::NetworkChangeNotifier::NetworkChangeObserver implementation. virtual void OnNetworkChanged( net::NetworkChangeNotifier::ConnectionType type) OVERRIDE { - LOG(INFO) << "OnNetworkChanged(" + VLOG(0) << "OnNetworkChanged(" << ConnectionTypeToString(type) << ")"; } @@ -116,7 +116,7 @@ class NetWatcher : virtual void OnProxyConfigChanged( const net::ProxyConfig& config, net::ProxyConfigService::ConfigAvailability availability) OVERRIDE { - LOG(INFO) << "OnProxyConfigChanged(" + VLOG(0) << "OnProxyConfigChanged(" << ProxyConfigToString(config) << ", " << ConfigAvailabilityToString(availability) << ")"; } @@ -168,7 +168,7 @@ int main(int argc, char* argv[]) { proxy_config_service->AddObserver(&net_watcher); - LOG(INFO) << "Initial connection type: " + VLOG(0) << "Initial connection type: " << ConnectionTypeToString( network_change_notifier->GetCurrentConnectionType()); @@ -176,12 +176,12 @@ int main(int argc, char* argv[]) { net::ProxyConfig config; const net::ProxyConfigService::ConfigAvailability availability = proxy_config_service->GetLatestProxyConfig(&config); - LOG(INFO) << "Initial proxy config: " + VLOG(0) << "Initial proxy config: " << ProxyConfigToString(config) << ", " << ConfigAvailabilityToString(availability); } - LOG(INFO) << "Watching for network events..."; + VLOG(0) << "Watching for network events..."; // Start watching for events. network_loop.Run(); diff --git a/net/tools/quic/end_to_end_test.cc b/net/tools/quic/end_to_end_test.cc index 57da35e..a1ca17a 100644 --- a/net/tools/quic/end_to_end_test.cc +++ b/net/tools/quic/end_to_end_test.cc @@ -157,7 +157,7 @@ class EndToEndTest : public ::testing::TestWithParam<TestParams> { FLAGS_limit_rto_increase_for_tests = true; FLAGS_pad_quic_handshake_packets = GetParam().use_padding; FLAGS_enable_quic_pacing = GetParam().use_pacing; - LOG(INFO) << "Using Configuration: " << GetParam(); + VLOG(0) << "Using Configuration: " << GetParam(); client_config_.SetDefaults(); server_config_.SetDefaults(); diff --git a/net/tools/quic/quic_client.cc b/net/tools/quic/quic_client.cc index 299932df..534c7c5 100644 --- a/net/tools/quic/quic_client.cc +++ b/net/tools/quic/quic_client.cc @@ -243,7 +243,7 @@ void QuicClient::OnEvent(int fd, EpollEvent* event) { session_->connection()->OnCanWrite(); } if (event->in_events & EPOLLERR) { - DLOG(INFO) << "Epollerr"; + DVLOG(0) << "Epollerr"; } } @@ -310,11 +310,11 @@ bool QuicClient::ReadAndProcessPacket() { QuicGuid packet_guid; if (!QuicFramer::ReadGuidFromPacket(packet, &packet_guid)) { - DLOG(INFO) << "Could not read GUID from packet"; + DVLOG(0) << "Could not read GUID from packet"; return true; } if (packet_guid != our_guid) { - DLOG(INFO) << "Ignoring packet from unexpected GUID: " + DVLOG(0) << "Ignoring packet from unexpected GUID: " << packet_guid << " instead of " << our_guid; return true; } diff --git a/net/tools/quic/quic_client_bin.cc b/net/tools/quic/quic_client_bin.cc index 2f8cfac..44c313b 100644 --- a/net/tools/quic/quic_client_bin.cc +++ b/net/tools/quic/quic_client_bin.cc @@ -50,7 +50,7 @@ int main(int argc, char *argv[]) { if (line->HasSwitch("hostname")) { FLAGS_hostname = line->GetSwitchValueASCII("hostname"); } - LOG(INFO) << "server port: " << FLAGS_port + VLOG(0) << "server port: " << FLAGS_port << " address: " << FLAGS_address << " hostname: " << FLAGS_hostname; diff --git a/net/tools/quic/quic_client_session.cc b/net/tools/quic/quic_client_session.cc index f993908..331e4e2 100644 --- a/net/tools/quic/quic_client_session.cc +++ b/net/tools/quic/quic_client_session.cc @@ -28,16 +28,16 @@ QuicClientSession::~QuicClientSession() { QuicReliableClientStream* QuicClientSession::CreateOutgoingReliableStream() { if (!crypto_stream_.encryption_established()) { - DLOG(INFO) << "Encryption not active so no outgoing stream created."; + DVLOG(0) << "Encryption not active so no outgoing stream created."; return NULL; } if (GetNumOpenStreams() >= get_max_open_streams()) { - DLOG(INFO) << "Failed to create a new outgoing stream. " + DVLOG(0) << "Failed to create a new outgoing stream. " << "Already " << GetNumOpenStreams() << " open."; return NULL; } if (goaway_received()) { - DLOG(INFO) << "Failed to create a new outgoing stream. " + DVLOG(0) << "Failed to create a new outgoing stream. " << "Already received goaway."; return NULL; } diff --git a/net/tools/quic/quic_dispatcher.cc b/net/tools/quic/quic_dispatcher.cc index 69dda956..1bf107c 100644 --- a/net/tools/quic/quic_dispatcher.cc +++ b/net/tools/quic/quic_dispatcher.cc @@ -110,7 +110,7 @@ void QuicDispatcher::ProcessPacket(const IPEndPoint& server_address, } if (session == NULL) { - DLOG(INFO) << "Failed to create session for " << guid; + DVLOG(0) << "Failed to create session for " << guid; // Add this guid fo the time-wait state, to safely reject future packets. // We don't know the version here, so assume latest. // TODO(ianswett): Produce a no-version version negotiation packet. @@ -123,7 +123,7 @@ void QuicDispatcher::ProcessPacket(const IPEndPoint& server_address, packet); return; } - DLOG(INFO) << "Created new session for " << guid; + DVLOG(0) << "Created new session for " << guid; session_map_.insert(make_pair(guid, session)); } else { session = it->second; @@ -200,7 +200,7 @@ void QuicDispatcher::OnConnectionClosed(QuicGuid guid, QuicErrorCode error) { return; } - DLOG_IF(INFO, error != QUIC_NO_ERROR) << "Closing connection (" << guid + DVLOG_IF(0, error != QUIC_NO_ERROR) << "Closing connection (" << guid << ") due to error: " << QuicUtils::ErrorToString(error); diff --git a/net/tools/quic/quic_in_memory_cache.cc b/net/tools/quic/quic_in_memory_cache.cc index c7c7cd0..bde6711 100644 --- a/net/tools/quic/quic_in_memory_cache.cc +++ b/net/tools/quic/quic_in_memory_cache.cc @@ -99,7 +99,7 @@ void QuicInMemoryCache::AddSimpleResponse(StringPiece method, void QuicInMemoryCache::AddResponse(const BalsaHeaders& request_headers, const BalsaHeaders& response_headers, StringPiece response_body) { - LOG(INFO) << "Adding response for: " << GetKey(request_headers); + VLOG(0) << "Adding response for: " << GetKey(request_headers); if (ContainsKey(responses_, GetKey(request_headers))) { LOG(DFATAL) << "Response for given request already exists!"; return; @@ -125,7 +125,7 @@ void QuicInMemoryCache::Initialize() { LOG(WARNING) << "No cache directory found. Skipping initialization."; return; } - LOG(INFO) << "Attempting to initialize QuicInMemoryCache from directory: " + VLOG(0) << "Attempting to initialize QuicInMemoryCache from directory: " << FLAGS_quic_in_memory_cache_dir; FilePath directory(FLAGS_quic_in_memory_cache_dir); @@ -199,7 +199,7 @@ void QuicInMemoryCache::Initialize() { "HTTP/1.1"); request_headers.ReplaceOrAppendHeader("host", host); - LOG(INFO) << "Inserting 'http://" << GetKey(request_headers) + VLOG(0) << "Inserting 'http://" << GetKey(request_headers) << "' into QuicInMemoryCache."; AddResponse(request_headers, response_headers, caching_visitor.body()); diff --git a/net/tools/quic/quic_reliable_client_stream.cc b/net/tools/quic/quic_reliable_client_stream.cc index 359fec4..13886cb 100644 --- a/net/tools/quic/quic_reliable_client_stream.cc +++ b/net/tools/quic/quic_reliable_client_stream.cc @@ -16,7 +16,7 @@ ssize_t QuicReliableClientStream::SendBody(const string& data, bool fin) { bool QuicReliableClientStream::OnStreamFrame(const QuicStreamFrame& frame) { if (!write_side_closed()) { - DLOG(INFO) << "Got a response before the request was complete. " + DVLOG(0) << "Got a response before the request was complete. " << "Aborting request."; CloseWriteSide(); } diff --git a/net/tools/quic/quic_reliable_server_stream.cc b/net/tools/quic/quic_reliable_server_stream.cc index 58b884a..b1282e1 100644 --- a/net/tools/quic/quic_reliable_server_stream.cc +++ b/net/tools/quic/quic_reliable_server_stream.cc @@ -28,13 +28,13 @@ void QuicReliableServerStream::SendResponse() { return; } - DLOG(INFO) << "Sending response for stream " << id(); + DVLOG(0) << "Sending response for stream " << id(); SendHeaders(response->headers()); WriteData(response->body(), true); } void QuicReliableServerStream::SendErrorResponse() { - DLOG(INFO) << "Sending error response for stream " << id(); + DVLOG(0) << "Sending error response for stream " << id(); BalsaHeaders headers; headers.SetResponseFirstlineFromStringPieces( "HTTP/1.1", "500", "Server Error"); diff --git a/net/tools/quic/quic_server.cc b/net/tools/quic/quic_server.cc index d4aeedb..f3980b0 100644 --- a/net/tools/quic/quic_server.cc +++ b/net/tools/quic/quic_server.cc @@ -131,7 +131,7 @@ bool QuicServer::Listen(const IPEndPoint& address) { return false; } - LOG(INFO) << "Listening on " << address.ToString(); + VLOG(0) << "Listening on " << address.ToString(); if (port_ == 0) { SockaddrStorage storage; IPEndPoint server_address; @@ -141,7 +141,7 @@ bool QuicServer::Listen(const IPEndPoint& address) { return false; } port_ = server_address.port(); - LOG(INFO) << "Kernel assigned port is " << port_; + VLOG(0) << "Kernel assigned port is " << port_; } epoll_server_.RegisterFD(fd_, this, kEpollFlags); diff --git a/net/tools/quic/quic_server_session.cc b/net/tools/quic/quic_server_session.cc index bea957c..acaf56c 100644 --- a/net/tools/quic/quic_server_session.cc +++ b/net/tools/quic/quic_server_session.cc @@ -40,12 +40,12 @@ void QuicServerSession::OnConnectionClosed(QuicErrorCode error, bool QuicServerSession::ShouldCreateIncomingReliableStream(QuicStreamId id) { if (id % 2 == 0) { - DLOG(INFO) << "Invalid incoming even stream_id:" << id; + DVLOG(0) << "Invalid incoming even stream_id:" << id; connection()->SendConnectionClose(QUIC_INVALID_STREAM_ID); return false; } if (GetNumOpenStreams() >= get_max_open_streams()) { - DLOG(INFO) << "Failed to create a new incoming stream with id:" << id + DVLOG(0) << "Failed to create a new incoming stream with id:" << id << " Already " << GetNumOpenStreams() << " open."; connection()->SendConnectionClose(QUIC_TOO_MANY_OPEN_STREAMS); return false; diff --git a/net/tools/quic/quic_time_wait_list_manager.cc b/net/tools/quic/quic_time_wait_list_manager.cc index df9e378..6955c99 100644 --- a/net/tools/quic/quic_time_wait_list_manager.cc +++ b/net/tools/quic/quic_time_wait_list_manager.cc @@ -170,7 +170,7 @@ bool QuicTimeWaitListManager::OnCanWrite() { } void QuicTimeWaitListManager::OnError(QuicFramer* framer) { - DLOG(INFO) << QuicUtils::ErrorToString(framer->error()); + DVLOG(0) << QuicUtils::ErrorToString(framer->error()); } bool QuicTimeWaitListManager::OnProtocolVersionMismatch( diff --git a/net/tools/quic/spdy_utils.cc b/net/tools/quic/spdy_utils.cc index c350a96..b5c3c89 100644 --- a/net/tools/quic/spdy_utils.cc +++ b/net/tools/quic/spdy_utils.cc @@ -38,7 +38,7 @@ void PopulateSpdyHeaderBlock(const BalsaHeaders& headers, hi != headers.header_lines_end(); ++hi) { if ((hi->second.length() == 0) && !allow_empty_values) { - DLOG(INFO) << "Dropping empty header " << hi->first.as_string() + DVLOG(0) << "Dropping empty header " << hi->first.as_string() << " from headers"; continue; } 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 11aafb6..b546c50 100644 --- a/net/tools/quic/test_tools/packet_dropping_test_writer.cc +++ b/net/tools/quic/test_tools/packet_dropping_test_writer.cc @@ -60,7 +60,7 @@ PacketDroppingTestWriter::PacketDroppingTestWriter() fake_bandwidth_(QuicBandwidth::Zero()), buffer_size_(0) { uint32 seed = base::RandInt(0, std::numeric_limits<int32>::max()); - LOG(INFO) << "Seeding packet loss with " << seed; + VLOG(0) << "Seeding packet loss with " << seed; simple_random_.set_seed(seed); } @@ -86,13 +86,13 @@ WriteResult PacketDroppingTestWriter::WritePacket( if (fake_packet_loss_percentage_ > 0 && simple_random_.RandUint64() % 100 < static_cast<uint64>(fake_packet_loss_percentage_)) { - DLOG(INFO) << "Dropping packet."; + DVLOG(0) << "Dropping packet."; return WriteResult(WRITE_STATUS_OK, buf_len); } if (fake_blocked_socket_percentage_ > 0 && simple_random_.RandUint64() % 100 < static_cast<uint64>(fake_blocked_socket_percentage_)) { - DLOG(INFO) << "Blocking socket."; + DVLOG(0) << "Blocking socket."; if (!write_unblocked_alarm_->IsSet()) { blocked_writer_ = blocked_writer; // Set the alarm for 1ms in the future. @@ -106,7 +106,7 @@ WriteResult PacketDroppingTestWriter::WritePacket( if (!fake_packet_delay_.IsZero() || !fake_bandwidth_.IsZero()) { if (buffer_size_ > 0 && buf_len + cur_buffer_size_ > buffer_size_) { // Drop packets which do not fit into the buffer. - DLOG(INFO) << "Dropping packet because the buffer is full."; + DVLOG(0) << "Dropping packet because the buffer is full."; return WriteResult(WRITE_STATUS_OK, buf_len); } @@ -151,13 +151,13 @@ QuicTime PacketDroppingTestWriter::ReleaseNextPacket() { if (delayed_packets_.size() > 1 && fake_packet_reorder_percentage_ > 0 && simple_random_.RandUint64() % 100 < static_cast<uint64>(fake_packet_reorder_percentage_)) { - DLOG(INFO) << "Reordering packets."; + DVLOG(0) << "Reordering packets."; ++iter; // Swap the send times when re-ordering packets. delayed_packets_.begin()->send_time = iter->send_time; } - DLOG(INFO) << "Releasing packet. " << (delayed_packets_.size() - 1) + DVLOG(0) << "Releasing packet. " << (delayed_packets_.size() - 1) << " remaining."; // Grab the next one off the queue and send it. writer()->WritePacket(iter->buffer.data(), iter->buffer.length(), diff --git a/net/websockets/websocket_frame_test.cc b/net/websockets/websocket_frame_test.cc index 97fac03..1e67373 100644 --- a/net/websockets/websocket_frame_test.cc +++ b/net/websockets/websocket_frame_test.cc @@ -367,7 +367,7 @@ class WebSocketFrameTestMaskBenchmark : public testing::Test { std::copy(kMaskingKey, kMaskingKey + WebSocketFrameHeader::kMaskingKeyLength, masking_key.key); - LOG(INFO) << "Benchmarking MaskWebSocketFramePayload() for " << iterations_ + VLOG(0) << "Benchmarking MaskWebSocketFramePayload() for " << iterations_ << " iterations"; using base::TimeTicks; TimeTicks start = TimeTicks::HighResNow(); @@ -378,7 +378,7 @@ class WebSocketFrameTestMaskBenchmark : public testing::Test { double total_time_ms = 1000 * (TimeTicks::HighResNow() - start).InMillisecondsF() / iterations_; - LOG(INFO) << "Payload size " << size + VLOG(0) << "Payload size " << size << base::StringPrintf(" took %.03f microseconds per iteration", total_time_ms); } |