mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-13 13:50:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reland "Replace RTC_WARN_UNUSED_RESULT with ABSL_MUST_USE_RESULT in c++ code"

Browse source 
This is a reland of 8c2250eddc

Original change's description:
> Replace RTC_WARN_UNUSED_RESULT with ABSL_MUST_USE_RESULT in c++ code
>
> Bug: webrtc:12336
> Change-Id: If76f00d0883b5c8a90d3ef5554f5e22384b3fb58
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/197620
> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
> Reviewed-by: Christoffer Rodbro <crodbro@webrtc.org>
> Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#32978}

Bug: webrtc:12336
Change-Id: I1cd017d45c1578528dec4532345950e9823f4a63
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/201732
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Christoffer Rodbro <crodbro@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#33003}
This commit is contained in:
Danil Chapovalov 2021-01-14 16:15:31 +01:00 committed by Commit Bot
parent ba91dbcb3e
commit 098da17f35
13 changed files with 39 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
api/voip/BUILD.gn
View file

@ -25,7 +25,10 @@ rtc_source_set("voip_api") {
"../audio_codecs:audio_codecs_api", "../audio_codecs:audio_codecs_api",
"../neteq:neteq_api", "../neteq:neteq_api",
] ]
absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ] absl_deps = [
"//third_party/abseil-cpp/absl/base:core_headers",
"//third_party/abseil-cpp/absl/types:optional",
]
} }
rtc_library("voip_engine_factory") { rtc_library("voip_engine_factory") {

3
api/voip/voip_base.h
View file

@ -11,6 +11,7 @@
#ifndef API_VOIP_VOIP_BASE_H_ #ifndef API_VOIP_VOIP_BASE_H_
#define API_VOIP_VOIP_BASE_H_ #define API_VOIP_VOIP_BASE_H_
#include "absl/base/attributes.h"
#include "absl/types/optional.h" #include "absl/types/optional.h"
#include "rtc_base/system/unused.h" #include "rtc_base/system/unused.h"
@ -36,7 +37,7 @@ class Transport;
enum class ChannelId : int {}; enum class ChannelId : int {};
enum class RTC_WARN_UNUSED_RESULT VoipResult { enum class ABSL_MUST_USE_RESULT VoipResult {
// kOk indicates the function was successfully invoked with no error. // kOk indicates the function was successfully invoked with no error.
kOk, kOk,
// kInvalidArgument indicates the caller specified an invalid argument, such // kInvalidArgument indicates the caller specified an invalid argument, such

2
modules/congestion_controller/goog_cc/BUILD.gn
View file

@ -226,10 +226,10 @@ rtc_library("probe_controller") {
"../../../rtc_base:macromagic", "../../../rtc_base:macromagic",
"../../../rtc_base:safe_conversions", "../../../rtc_base:safe_conversions",
"../../../rtc_base/experiments:field_trial_parser", "../../../rtc_base/experiments:field_trial_parser",
"../../../rtc_base/system:unused",
"../../../system_wrappers:metrics", "../../../system_wrappers:metrics",
] ]
absl_deps = [ absl_deps = [
"//third_party/abseil-cpp/absl/base:core_headers",
"//third_party/abseil-cpp/absl/strings", "//third_party/abseil-cpp/absl/strings",
"//third_party/abseil-cpp/absl/types:optional", "//third_party/abseil-cpp/absl/types:optional",
] ]

18
modules/congestion_controller/goog_cc/probe_controller.h
View file

@ -16,6 +16,7 @@
#include <initializer_list> #include <initializer_list>
#include <vector> #include <vector>
#include "absl/base/attributes.h"
#include "absl/types/optional.h" #include "absl/types/optional.h"
#include "api/rtc_event_log/rtc_event_log.h" #include "api/rtc_event_log/rtc_event_log.h"
#include "api/transport/network_control.h" #include "api/transport/network_control.h"
@ -23,7 +24,6 @@
#include "api/units/data_rate.h" #include "api/units/data_rate.h"
#include "rtc_base/constructor_magic.h" #include "rtc_base/constructor_magic.h"
#include "rtc_base/experiments/field_trial_parser.h" #include "rtc_base/experiments/field_trial_parser.h"
#include "rtc_base/system/unused.h"
namespace webrtc { namespace webrtc {
@ -63,7 +63,7 @@ class ProbeController {
RtcEventLog* event_log); RtcEventLog* event_log);
~ProbeController(); ~ProbeController();
RTC_WARN_UNUSED_RESULT std::vector<ProbeClusterConfig> SetBitrates( ABSL_MUST_USE_RESULT std::vector<ProbeClusterConfig> SetBitrates(
int64_t min_bitrate_bps, int64_t min_bitrate_bps,
int64_t start_bitrate_bps, int64_t start_bitrate_bps,
int64_t max_bitrate_bps, int64_t max_bitrate_bps,
@ -71,14 +71,14 @@ class ProbeController {
// The total bitrate, as opposed to the max bitrate, is the sum of the // The total bitrate, as opposed to the max bitrate, is the sum of the
// configured bitrates for all active streams. // configured bitrates for all active streams.
RTC_WARN_UNUSED_RESULT std::vector<ProbeClusterConfig> ABSL_MUST_USE_RESULT std::vector<ProbeClusterConfig>
OnMaxTotalAllocatedBitrate(int64_t max_total_allocated_bitrate, OnMaxTotalAllocatedBitrate(int64_t max_total_allocated_bitrate,
int64_t at_time_ms); int64_t at_time_ms);
RTC_WARN_UNUSED_RESULT std::vector<ProbeClusterConfig> OnNetworkAvailability( ABSL_MUST_USE_RESULT std::vector<ProbeClusterConfig> OnNetworkAvailability(
NetworkAvailability msg); NetworkAvailability msg);
RTC_WARN_UNUSED_RESULT std::vector<ProbeClusterConfig> SetEstimatedBitrate( ABSL_MUST_USE_RESULT std::vector<ProbeClusterConfig> SetEstimatedBitrate(
int64_t bitrate_bps, int64_t bitrate_bps,
int64_t at_time_ms); int64_t at_time_ms);
@ -87,7 +87,7 @@ class ProbeController {
void SetAlrStartTimeMs(absl::optional<int64_t> alr_start_time); void SetAlrStartTimeMs(absl::optional<int64_t> alr_start_time);
void SetAlrEndedTimeMs(int64_t alr_end_time); void SetAlrEndedTimeMs(int64_t alr_end_time);
RTC_WARN_UNUSED_RESULT std::vector<ProbeClusterConfig> RequestProbe( ABSL_MUST_USE_RESULT std::vector<ProbeClusterConfig> RequestProbe(
int64_t at_time_ms); int64_t at_time_ms);
// Sets a new maximum probing bitrate, without generating a new probe cluster. // Sets a new maximum probing bitrate, without generating a new probe cluster.
@ -97,7 +97,7 @@ class ProbeController {
// created EXCEPT for |enable_periodic_alr_probing_|. // created EXCEPT for |enable_periodic_alr_probing_|.
void Reset(int64_t at_time_ms); void Reset(int64_t at_time_ms);
RTC_WARN_UNUSED_RESULT std::vector<ProbeClusterConfig> Process( ABSL_MUST_USE_RESULT std::vector<ProbeClusterConfig> Process(
int64_t at_time_ms); int64_t at_time_ms);
private: private:
@ -110,9 +110,9 @@ class ProbeController {
kProbingComplete, kProbingComplete,
}; };
RTC_WARN_UNUSED_RESULT std::vector<ProbeClusterConfig> ABSL_MUST_USE_RESULT std::vector<ProbeClusterConfig>
InitiateExponentialProbing(int64_t at_time_ms); InitiateExponentialProbing(int64_t at_time_ms);
RTC_WARN_UNUSED_RESULT std::vector<ProbeClusterConfig> InitiateProbing( ABSL_MUST_USE_RESULT std::vector<ProbeClusterConfig> InitiateProbing(
int64_t now_ms, int64_t now_ms,
std::vector<int64_t> bitrates_to_probe, std::vector<int64_t> bitrates_to_probe,
bool probe_further); bool probe_further);

2
modules/rtp_rtcp/BUILD.gn
View file

@ -117,7 +117,6 @@ rtc_library("rtp_rtcp_format") {
"../../rtc_base:deprecation", "../../rtc_base:deprecation",
"../../rtc_base:divide_round", "../../rtc_base:divide_round",
"../../rtc_base:rtc_base_approved", "../../rtc_base:rtc_base_approved",
"../../rtc_base/system:unused",
"../../system_wrappers", "../../system_wrappers",
"../video_coding:codec_globals_headers", "../video_coding:codec_globals_headers",
] ]
@ -352,6 +351,7 @@ rtc_library("rtcp_transceiver") {
] ]
absl_deps = [ absl_deps = [
"//third_party/abseil-cpp/absl/algorithm:container", "//third_party/abseil-cpp/absl/algorithm:container",
"//third_party/abseil-cpp/absl/base:core_headers",
"//third_party/abseil-cpp/absl/memory", "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional", "//third_party/abseil-cpp/absl/types:optional",
] ]

12
modules/rtp_rtcp/source/rtcp_packet/loss_notification.h
View file

@ -11,9 +11,9 @@
#ifndef MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_LOSS_NOTIFICATION_H_ #ifndef MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_LOSS_NOTIFICATION_H_
#define MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_LOSS_NOTIFICATION_H_ #define MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_LOSS_NOTIFICATION_H_
#include "absl/base/attributes.h"
#include "modules/rtp_rtcp/source/rtcp_packet/common_header.h" #include "modules/rtp_rtcp/source/rtcp_packet/common_header.h"
#include "modules/rtp_rtcp/source/rtcp_packet/psfb.h" #include "modules/rtp_rtcp/source/rtcp_packet/psfb.h"
#include "rtc_base/system/unused.h"
namespace webrtc { namespace webrtc {
namespace rtcp { namespace rtcp {
@ -29,14 +29,15 @@ class LossNotification : public Psfb {
size_t BlockLength() const override; size_t BlockLength() const override;
ABSL_MUST_USE_RESULT
bool Create(uint8_t* packet, bool Create(uint8_t* packet,
size_t* index, size_t* index,
size_t max_length, size_t max_length,
PacketReadyCallback callback) const override PacketReadyCallback callback) const override;
RTC_WARN_UNUSED_RESULT;
// Parse assumes header is already parsed and validated. // Parse assumes header is already parsed and validated.
bool Parse(const CommonHeader& packet) RTC_WARN_UNUSED_RESULT; ABSL_MUST_USE_RESULT
bool Parse(const CommonHeader& packet);
// Set all of the values transmitted by the loss notification message. // Set all of the values transmitted by the loss notification message.
// If the values may not be represented by a loss notification message, // If the values may not be represented by a loss notification message,
@ -44,9 +45,10 @@ class LossNotification : public Psfb {
// when |last_recieved| is ahead of |last_decoded| by more than 0x7fff. // when |last_recieved| is ahead of |last_decoded| by more than 0x7fff.
// This is because |last_recieved| is represented on the wire as a delta, // This is because |last_recieved| is represented on the wire as a delta,
// and only 15 bits are available for that delta. // and only 15 bits are available for that delta.
ABSL_MUST_USE_RESULT
bool Set(uint16_t last_decoded, bool Set(uint16_t last_decoded,
uint16_t last_received, uint16_t last_received,
bool decodability_flag) RTC_WARN_UNUSED_RESULT; bool decodability_flag);
// RTP sequence number of the first packet belong to the last decoded // RTP sequence number of the first packet belong to the last decoded
// non-discardable frame. // non-discardable frame.

6
rtc_base/BUILD.gn
View file

@ -78,10 +78,12 @@ rtc_library("rtc_base_approved") {
"system:arch", "system:arch",
"system:no_unique_address", "system:no_unique_address",
"system:rtc_export", "system:rtc_export",
"system:unused",
"third_party/base64", "third_party/base64",
] ]
absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ] absl_deps = [
"//third_party/abseil-cpp/absl/base:core_headers",
"//third_party/abseil-cpp/absl/types:optional",
]
public_deps = [] # no-presubmit-check TODO(webrtc:8603) public_deps = [] # no-presubmit-check TODO(webrtc:8603)
sources = [ sources = [

6
rtc_base/swap_queue.h
View file

@ -17,8 +17,8 @@
#include <utility> #include <utility>
#include <vector> #include <vector>
#include "absl/base/attributes.h"
#include "rtc_base/checks.h" #include "rtc_base/checks.h"
#include "rtc_base/system/unused.h"
namespace webrtc { namespace webrtc {
@ -127,7 +127,7 @@ class SwapQueue {
// When specified, the T given in *input must pass the ItemVerifier() test. // When specified, the T given in *input must pass the ItemVerifier() test.
// The contents of *input after the call are then also guaranteed to pass the // The contents of *input after the call are then also guaranteed to pass the
// ItemVerifier() test. // ItemVerifier() test.
bool Insert(T* input) RTC_WARN_UNUSED_RESULT { ABSL_MUST_USE_RESULT bool Insert(T* input) {
RTC_DCHECK(input); RTC_DCHECK(input);
RTC_DCHECK(queue_item_verifier_(*input)); RTC_DCHECK(queue_item_verifier_(*input));
@ -168,7 +168,7 @@ class SwapQueue {
// empty). When specified, The T given in *output must pass the ItemVerifier() // empty). When specified, The T given in *output must pass the ItemVerifier()
// test and the contents of *output after the call are then also guaranteed to // test and the contents of *output after the call are then also guaranteed to
// pass the ItemVerifier() test. // pass the ItemVerifier() test.
bool Remove(T* output) RTC_WARN_UNUSED_RESULT { ABSL_MUST_USE_RESULT bool Remove(T* output) {
RTC_DCHECK(output); RTC_DCHECK(output);
RTC_DCHECK(queue_item_verifier_(*output)); RTC_DCHECK(queue_item_verifier_(*output));

1
rtc_base/synchronization/BUILD.gn
View file

@ -36,7 +36,6 @@ rtc_library("mutex") {
"..:checks", "..:checks",
"..:macromagic", "..:macromagic",
"..:platform_thread_types", "..:platform_thread_types",
"../system:unused",
] ]
absl_deps = [ "//third_party/abseil-cpp/absl/base:core_headers" ] absl_deps = [ "//third_party/abseil-cpp/absl/base:core_headers" ]
if (rtc_use_absl_mutex) { if (rtc_use_absl_mutex) {

4
rtc_base/synchronization/mutex.h
View file

@ -13,9 +13,9 @@
#include <atomic> #include <atomic>
#include "absl/base/attributes.h"
#include "absl/base/const_init.h" #include "absl/base/const_init.h"
#include "rtc_base/checks.h" #include "rtc_base/checks.h"
#include "rtc_base/system/unused.h"
#include "rtc_base/thread_annotations.h" #include "rtc_base/thread_annotations.h"
#if defined(WEBRTC_ABSL_MUTEX) #if defined(WEBRTC_ABSL_MUTEX)
@ -41,7 +41,7 @@ class RTC_LOCKABLE Mutex final {
void Lock() RTC_EXCLUSIVE_LOCK_FUNCTION() { void Lock() RTC_EXCLUSIVE_LOCK_FUNCTION() {
impl_.Lock(); impl_.Lock();
} }
RTC_WARN_UNUSED_RESULT bool TryLock() RTC_EXCLUSIVE_TRYLOCK_FUNCTION(true) { ABSL_MUST_USE_RESULT bool TryLock() RTC_EXCLUSIVE_TRYLOCK_FUNCTION(true) {
return impl_.TryLock(); return impl_.TryLock();
} }
void Unlock() RTC_UNLOCK_FUNCTION() { void Unlock() RTC_UNLOCK_FUNCTION() {

3
rtc_base/synchronization/mutex_abseil.h
View file

@ -11,6 +11,7 @@
#ifndef RTC_BASE_SYNCHRONIZATION_MUTEX_ABSEIL_H_ #ifndef RTC_BASE_SYNCHRONIZATION_MUTEX_ABSEIL_H_
#define RTC_BASE_SYNCHRONIZATION_MUTEX_ABSEIL_H_ #define RTC_BASE_SYNCHRONIZATION_MUTEX_ABSEIL_H_
#include "absl/base/attributes.h"
#include "absl/synchronization/mutex.h" #include "absl/synchronization/mutex.h"
#include "rtc_base/thread_annotations.h" #include "rtc_base/thread_annotations.h"
@ -23,7 +24,7 @@ class RTC_LOCKABLE MutexImpl final {
MutexImpl& operator=(const MutexImpl&) = delete; MutexImpl& operator=(const MutexImpl&) = delete;
void Lock() RTC_EXCLUSIVE_LOCK_FUNCTION() { mutex_.Lock(); } void Lock() RTC_EXCLUSIVE_LOCK_FUNCTION() { mutex_.Lock(); }
RTC_WARN_UNUSED_RESULT bool TryLock() RTC_EXCLUSIVE_TRYLOCK_FUNCTION(true) { ABSL_MUST_USE_RESULT bool TryLock() RTC_EXCLUSIVE_TRYLOCK_FUNCTION(true) {
return mutex_.TryLock(); return mutex_.TryLock();
} }
void Unlock() RTC_UNLOCK_FUNCTION() { mutex_.Unlock(); } void Unlock() RTC_UNLOCK_FUNCTION() { mutex_.Unlock(); }

3
rtc_base/synchronization/mutex_critical_section.h
View file

@ -23,6 +23,7 @@
#include <sal.h> // must come after windows headers. #include <sal.h> // must come after windows headers.
// clang-format on // clang-format on
#include "absl/base/attributes.h"
#include "rtc_base/thread_annotations.h" #include "rtc_base/thread_annotations.h"
namespace webrtc { namespace webrtc {
@ -37,7 +38,7 @@ class RTC_LOCKABLE MutexImpl final {
void Lock() RTC_EXCLUSIVE_LOCK_FUNCTION() { void Lock() RTC_EXCLUSIVE_LOCK_FUNCTION() {
EnterCriticalSection(&critical_section_); EnterCriticalSection(&critical_section_);
} }
RTC_WARN_UNUSED_RESULT bool TryLock() RTC_EXCLUSIVE_TRYLOCK_FUNCTION(true) { ABSL_MUST_USE_RESULT bool TryLock() RTC_EXCLUSIVE_TRYLOCK_FUNCTION(true) {
return TryEnterCriticalSection(&critical_section_) != FALSE; return TryEnterCriticalSection(&critical_section_) != FALSE;
} }
void Unlock() RTC_UNLOCK_FUNCTION() { void Unlock() RTC_UNLOCK_FUNCTION() {

3
rtc_base/synchronization/mutex_pthread.h
View file

@ -18,6 +18,7 @@
#include <pthread_spis.h> #include <pthread_spis.h>
#endif #endif
#include "absl/base/attributes.h"
#include "rtc_base/thread_annotations.h" #include "rtc_base/thread_annotations.h"
namespace webrtc { namespace webrtc {
@ -39,7 +40,7 @@ class RTC_LOCKABLE MutexImpl final {
~MutexImpl() { pthread_mutex_destroy(&mutex_); } ~MutexImpl() { pthread_mutex_destroy(&mutex_); }
void Lock() RTC_EXCLUSIVE_LOCK_FUNCTION() { pthread_mutex_lock(&mutex_); } void Lock() RTC_EXCLUSIVE_LOCK_FUNCTION() { pthread_mutex_lock(&mutex_); }
RTC_WARN_UNUSED_RESULT bool TryLock() RTC_EXCLUSIVE_TRYLOCK_FUNCTION(true) { ABSL_MUST_USE_RESULT bool TryLock() RTC_EXCLUSIVE_TRYLOCK_FUNCTION(true) {
return pthread_mutex_trylock(&mutex_) == 0; return pthread_mutex_trylock(&mutex_) == 0;
} }
void Unlock() RTC_UNLOCK_FUNCTION() { pthread_mutex_unlock(&mutex_); } void Unlock() RTC_UNLOCK_FUNCTION() { pthread_mutex_unlock(&mutex_); }