zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prepare to rename RTC_NOTREACHED to RTC_DCHECK_NOTREACHED

Browse Source 
Add implementation of RTC_DCHECK_NOTREACHED equal to the RTC_NOTREACHED.
The new macros will replace the old one when old one's usage will be
removed. The idea of the renaming to provide a clear signal that this
is debug build only macros and will be stripped in the production build.

Bug: webrtc:9065
Change-Id: I4c35d8b03e74a4b3fd1ae75dba2f9c05643101db
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/237802
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#35348}
This commit is contained in:
Artem Titov
2021-11-15 16:57:07 +01:00
committed by WebRTC LUCI CQ
parent f5ea3b96cd
commit d3251968d1
263 changed files with 604 additions and 583 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
logging/rtc_event_log/encoder/delta_encoding_unittest.cc
View File

@ -44,7 +44,7 @@ void MaybeSetSignedness(DeltaSignedness signedness) {
SetFixedLengthEncoderDeltaSignednessForTesting(true);
return;
}
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
}
uint64_t RandomWithMaxBitWidth(Random* prng, uint64_t max_width) {

38
logging/rtc_event_log/encoder/rtc_event_log_encoder_legacy.cc
View File

@ -78,9 +78,9 @@ rtclog::DelayBasedBweUpdate::DetectorState ConvertDetectorState(
case BandwidthUsage::kBwOverusing:
return rtclog::DelayBasedBweUpdate::BWE_OVERUSING;
case BandwidthUsage::kLast:
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
}
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return rtclog::DelayBasedBweUpdate::BWE_NORMAL;
}
@ -94,9 +94,9 @@ rtclog::BweProbeResult::ResultType ConvertProbeResultType(
case ProbeFailureReason::kTimeout:
return rtclog::BweProbeResult::TIMEOUT;
case ProbeFailureReason::kLast:
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
}
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return rtclog::BweProbeResult::SUCCESS;
}
@ -107,9 +107,9 @@ rtclog::VideoReceiveConfig_RtcpMode ConvertRtcpMode(RtcpMode rtcp_mode) {
case RtcpMode::kReducedSize:
return rtclog::VideoReceiveConfig::RTCP_REDUCEDSIZE;
case RtcpMode::kOff:
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
}
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return rtclog::VideoReceiveConfig::RTCP_COMPOUND;
}
@ -125,9 +125,9 @@ ConvertIceCandidatePairConfigType(IceCandidatePairConfigType type) {
case IceCandidatePairConfigType::kSelected:
return rtclog::IceCandidatePairConfig::SELECTED;
case IceCandidatePairConfigType::kNumValues:
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
}
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return rtclog::IceCandidatePairConfig::ADDED;
}
@ -145,9 +145,9 @@ rtclog::IceCandidatePairConfig::IceCandidateType ConvertIceCandidateType(
case IceCandidateType::kRelay:
return rtclog::IceCandidatePairConfig::RELAY;
case IceCandidateType::kNumValues:
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
}
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return rtclog::IceCandidatePairConfig::UNKNOWN_CANDIDATE_TYPE;
}
@ -165,9 +165,9 @@ rtclog::IceCandidatePairConfig::Protocol ConvertIceCandidatePairProtocol(
case IceCandidatePairProtocol::kTls:
return rtclog::IceCandidatePairConfig::TLS;
case IceCandidatePairProtocol::kNumValues:
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
}
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return rtclog::IceCandidatePairConfig::UNKNOWN_PROTOCOL;
}
@ -182,9 +182,9 @@ ConvertIceCandidatePairAddressFamily(
case IceCandidatePairAddressFamily::kIpv6:
return rtclog::IceCandidatePairConfig::IPV6;
case IceCandidatePairAddressFamily::kNumValues:
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
}
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return rtclog::IceCandidatePairConfig::UNKNOWN_ADDRESS_FAMILY;
}
@ -204,9 +204,9 @@ rtclog::IceCandidatePairConfig::NetworkType ConvertIceCandidateNetworkType(
case IceCandidateNetworkType::kCellular:
return rtclog::IceCandidatePairConfig::CELLULAR;
case IceCandidateNetworkType::kNumValues:
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
}
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return rtclog::IceCandidatePairConfig::UNKNOWN_NETWORK_TYPE;
}
@ -222,9 +222,9 @@ ConvertIceCandidatePairEventType(IceCandidatePairEventType type) {
case IceCandidatePairEventType::kCheckResponseReceived:
return rtclog::IceCandidatePairEvent::CHECK_RESPONSE_RECEIVED;
case IceCandidatePairEventType::kNumValues:
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
}
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return rtclog::IceCandidatePairEvent::CHECK_SENT;
}
@ -374,7 +374,7 @@ std::string RtcEventLogEncoderLegacy::Encode(const RtcEvent& event) {
}
int event_type = static_cast<int>(event.GetType());
RTC_NOTREACHED() << "Unknown event type (" << event_type << ")";
RTC_DCHECK_NOTREACHED() << "Unknown event type (" << event_type << ")";
return "";
}

38
logging/rtc_event_log/encoder/rtc_event_log_encoder_new_format.cc
View File

@ -86,9 +86,9 @@ rtclog2::DelayBasedBweUpdates::DetectorState ConvertToProtoFormat(
case BandwidthUsage::kBwOverusing:
return rtclog2::DelayBasedBweUpdates::BWE_OVERUSING;
case BandwidthUsage::kLast:
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
}
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return rtclog2::DelayBasedBweUpdates::BWE_UNKNOWN_STATE;
}
@ -108,7 +108,7 @@ rtclog2::FrameDecodedEvents::Codec ConvertToProtoFormat(VideoCodecType codec) {
// This codec type is afaik not used.
return rtclog2::FrameDecodedEvents::CODEC_UNKNOWN;
}
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return rtclog2::FrameDecodedEvents::CODEC_UNKNOWN;
}
@ -122,9 +122,9 @@ rtclog2::BweProbeResultFailure::FailureReason ConvertToProtoFormat(
case ProbeFailureReason::kTimeout:
return rtclog2::BweProbeResultFailure::TIMEOUT;
case ProbeFailureReason::kLast:
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
}
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return rtclog2::BweProbeResultFailure::UNKNOWN;
}
@ -167,9 +167,9 @@ rtclog2::DtlsTransportStateEvent::DtlsTransportState ConvertToProtoFormat(
case webrtc::DtlsTransportState::kFailed:
return rtclog2::DtlsTransportStateEvent::DTLS_TRANSPORT_FAILED;
case webrtc::DtlsTransportState::kNumValues:
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
}
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return rtclog2::DtlsTransportStateEvent::UNKNOWN_DTLS_TRANSPORT_STATE;
}
@ -185,9 +185,9 @@ ConvertToProtoFormat(IceCandidatePairConfigType type) {
case IceCandidatePairConfigType::kSelected:
return rtclog2::IceCandidatePairConfig::SELECTED;
case IceCandidatePairConfigType::kNumValues:
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
}
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return rtclog2::IceCandidatePairConfig::UNKNOWN_CONFIG_TYPE;
}
@ -205,9 +205,9 @@ rtclog2::IceCandidatePairConfig::IceCandidateType ConvertToProtoFormat(
case IceCandidateType::kRelay:
return rtclog2::IceCandidatePairConfig::RELAY;
case IceCandidateType::kNumValues:
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
}
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return rtclog2::IceCandidatePairConfig::UNKNOWN_CANDIDATE_TYPE;
}
@ -225,9 +225,9 @@ rtclog2::IceCandidatePairConfig::Protocol ConvertToProtoFormat(
case IceCandidatePairProtocol::kTls:
return rtclog2::IceCandidatePairConfig::TLS;
case IceCandidatePairProtocol::kNumValues:
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
}
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return rtclog2::IceCandidatePairConfig::UNKNOWN_PROTOCOL;
}
@ -241,9 +241,9 @@ rtclog2::IceCandidatePairConfig::AddressFamily ConvertToProtoFormat(
case IceCandidatePairAddressFamily::kIpv6:
return rtclog2::IceCandidatePairConfig::IPV6;
case IceCandidatePairAddressFamily::kNumValues:
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
}
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return rtclog2::IceCandidatePairConfig::UNKNOWN_ADDRESS_FAMILY;
}
@ -263,9 +263,9 @@ rtclog2::IceCandidatePairConfig::NetworkType ConvertToProtoFormat(
case IceCandidateNetworkType::kCellular:
return rtclog2::IceCandidatePairConfig::CELLULAR;
case IceCandidateNetworkType::kNumValues:
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
}
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return rtclog2::IceCandidatePairConfig::UNKNOWN_NETWORK_TYPE;
}
@ -281,9 +281,9 @@ rtclog2::IceCandidatePairEvent::IceCandidatePairEventType ConvertToProtoFormat(
case IceCandidatePairEventType::kCheckResponseReceived:
return rtclog2::IceCandidatePairEvent::CHECK_RESPONSE_RECEIVED;
case IceCandidatePairEventType::kNumValues:
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
}
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return rtclog2::IceCandidatePairEvent::UNKNOWN_CHECK_TYPE;
}

4
logging/rtc_event_log/events/rtc_event_field_encoding.cc
View File

@ -76,10 +76,10 @@ std::string EncodeSingleValue(uint64_t value, FieldType field_type) {
case FieldType::kVarInt:
return EncodeVarInt(value);
case FieldType::kString:
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return std::string();
}
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return std::string();
}

4
logging/rtc_event_log/events/rtc_event_field_encoding_parser.cc
View File

@ -109,11 +109,11 @@ uint64_t EventParser::ReadSingleValue(FieldType field_type) {
case FieldType::kVarInt:
return ReadVarInt();
case FieldType::kString:
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
SetError();
return 0;
}
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
SetError();
return 0;
}

2
logging/rtc_event_log/events/rtc_event_field_encoding_unittest.cc
View File

@ -52,7 +52,7 @@ size_t ExpectedBaseValueSize(const FieldParameters& params, T value) {
default:
break;
}
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return 0;
}

2
logging/rtc_event_log/rtc_event_log_impl.cc
View File

@ -48,7 +48,7 @@ std::unique_ptr<RtcEventLogEncoder> CreateEncoder(
default:
RTC_LOG(LS_ERROR) << "Unknown RtcEventLog encoder type (" << int(type)
<< ")";
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return std::unique_ptr<RtcEventLogEncoder>(nullptr);
}
}

42
logging/rtc_event_log/rtc_event_log_parser.cc
View File

@ -174,7 +174,7 @@ RtcpMode GetRuntimeRtcpMode(rtclog::VideoReceiveConfig::RtcpMode rtcp_mode) {
case rtclog::VideoReceiveConfig::RTCP_REDUCEDSIZE:
return RtcpMode::kReducedSize;
}
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return RtcpMode::kOff;
}
@ -188,7 +188,7 @@ BandwidthUsage GetRuntimeDetectorState(
case rtclog::DelayBasedBweUpdate::BWE_OVERUSING:
return BandwidthUsage::kBwOverusing;
}
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return BandwidthUsage::kBwNormal;
}
@ -204,7 +204,7 @@ IceCandidatePairConfigType GetRuntimeIceCandidatePairConfigType(
case rtclog::IceCandidatePairConfig::SELECTED:
return IceCandidatePairConfigType::kSelected;
}
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return IceCandidatePairConfigType::kAdded;
}
@ -222,7 +222,7 @@ IceCandidateType GetRuntimeIceCandidateType(
case rtclog::IceCandidatePairConfig::UNKNOWN_CANDIDATE_TYPE:
return IceCandidateType::kUnknown;
}
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return IceCandidateType::kUnknown;
}
@ -240,7 +240,7 @@ IceCandidatePairProtocol GetRuntimeIceCandidatePairProtocol(
case rtclog::IceCandidatePairConfig::UNKNOWN_PROTOCOL:
return IceCandidatePairProtocol::kUnknown;
}
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return IceCandidatePairProtocol::kUnknown;
}
@ -254,7 +254,7 @@ IceCandidatePairAddressFamily GetRuntimeIceCandidatePairAddressFamily(
case rtclog::IceCandidatePairConfig::UNKNOWN_ADDRESS_FAMILY:
return IceCandidatePairAddressFamily::kUnknown;
}
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return IceCandidatePairAddressFamily::kUnknown;
}
@ -274,7 +274,7 @@ IceCandidateNetworkType GetRuntimeIceCandidateNetworkType(
case rtclog::IceCandidatePairConfig::UNKNOWN_NETWORK_TYPE:
return IceCandidateNetworkType::kUnknown;
}
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return IceCandidateNetworkType::kUnknown;
}
@ -290,7 +290,7 @@ IceCandidatePairEventType GetRuntimeIceCandidatePairEventType(
case rtclog::IceCandidatePairEvent::CHECK_RESPONSE_RECEIVED:
return IceCandidatePairEventType::kCheckResponseReceived;
}
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return IceCandidatePairEventType::kCheckSent;
}
@ -311,7 +311,7 @@ VideoCodecType GetRuntimeCodecType(rtclog2::FrameDecodedEvents::Codec codec) {
"VideoCodecType::kVideoCodecMultiplex";
return VideoCodecType::kVideoCodecMultiplex;
}
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return VideoCodecType::kVideoCodecMultiplex;
}
@ -768,7 +768,7 @@ BandwidthUsage GetRuntimeDetectorState(
case rtclog2::DelayBasedBweUpdates::BWE_UNKNOWN_STATE:
break;
}
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return BandwidthUsage::kBwNormal;
}
@ -784,7 +784,7 @@ ProbeFailureReason GetRuntimeProbeFailureReason(
case rtclog2::BweProbeResultFailure::UNKNOWN:
break;
}
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return ProbeFailureReason::kTimeout;
}
@ -802,10 +802,10 @@ DtlsTransportState GetRuntimeDtlsTransportState(
case rtclog2::DtlsTransportStateEvent::DTLS_TRANSPORT_FAILED:
return DtlsTransportState::kFailed;
case rtclog2::DtlsTransportStateEvent::UNKNOWN_DTLS_TRANSPORT_STATE:
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return DtlsTransportState::kNumValues;
}
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return DtlsTransportState::kNumValues;
}
@ -823,7 +823,7 @@ IceCandidatePairConfigType GetRuntimeIceCandidatePairConfigType(
case rtclog2::IceCandidatePairConfig::UNKNOWN_CONFIG_TYPE:
break;
}
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return IceCandidatePairConfigType::kAdded;
}
@ -841,7 +841,7 @@ IceCandidateType GetRuntimeIceCandidateType(
case rtclog2::IceCandidatePairConfig::UNKNOWN_CANDIDATE_TYPE:
return IceCandidateType::kUnknown;
}
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return IceCandidateType::kUnknown;
}
@ -859,7 +859,7 @@ IceCandidatePairProtocol GetRuntimeIceCandidatePairProtocol(
case rtclog2::IceCandidatePairConfig::UNKNOWN_PROTOCOL:
return IceCandidatePairProtocol::kUnknown;
}
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return IceCandidatePairProtocol::kUnknown;
}
@ -873,7 +873,7 @@ IceCandidatePairAddressFamily GetRuntimeIceCandidatePairAddressFamily(
case rtclog2::IceCandidatePairConfig::UNKNOWN_ADDRESS_FAMILY:
return IceCandidatePairAddressFamily::kUnknown;
}
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return IceCandidatePairAddressFamily::kUnknown;
}
@ -893,7 +893,7 @@ IceCandidateNetworkType GetRuntimeIceCandidateNetworkType(
case rtclog2::IceCandidatePairConfig::UNKNOWN_NETWORK_TYPE:
return IceCandidateNetworkType::kUnknown;
}
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return IceCandidateNetworkType::kUnknown;
}
@ -911,7 +911,7 @@ IceCandidatePairEventType GetRuntimeIceCandidatePairEventType(
case rtclog2::IceCandidatePairEvent::UNKNOWN_CHECK_TYPE:
break;
}
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return IceCandidatePairEventType::kCheckSent;
}
@ -1892,7 +1892,7 @@ ParsedRtcEventLog::GetBweProbeFailure(const rtclog::Event& event) const {
} else if (pr_event.result() == rtclog::BweProbeResult::TIMEOUT) {
res.failure_reason = ProbeFailureReason::kTimeout;
} else {
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
}
RTC_PARSE_CHECK_OR_RETURN(!pr_event.has_bitrate_bps());
@ -2360,7 +2360,7 @@ ParsedRtcEventLog::ParseStatus ParsedRtcEventLog::StoreParsedNewFormatEvent(
} else if (stream.frame_decoded_events_size() == 1) {
return StoreFrameDecodedEvents(stream.frame_decoded_events(0));
} else {
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return ParseStatus::Success();
}
}

2
logging/rtc_event_log/rtc_event_log_unittest.cc
View File

@ -546,7 +546,7 @@ void RtcEventLogSession::WriteLog(EventCounts count,
}
selection -= count.generic_acks_received;
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
}
event_log->StopLogging();

4
logging/rtc_event_log/rtc_event_log_unittest_helper.cc
View File

@ -462,7 +462,7 @@ EventGenerator::NewRtcpPacketIncoming() {
return std::make_unique<RtcEventRtcpPacketIncoming>(buffer);
}
default:
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
rtc::Buffer buffer;
return std::make_unique<RtcEventRtcpPacketIncoming>(buffer);
}
@ -531,7 +531,7 @@ EventGenerator::NewRtcpPacketOutgoing() {
return std::make_unique<RtcEventRtcpPacketOutgoing>(buffer);
}
default:
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
rtc::Buffer buffer;
return std::make_unique<RtcEventRtcpPacketOutgoing>(buffer);
}