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

Fix logging MakeVal template

Browse Source 
Types with ToLogString implemented were not being recognized correctly.
Now types like TimeDelta and Timestamp can be logged as normal.

Change-Id: Ia15f90bdd1d63a39f7452f9b4bba178d01b74352
Bug: webrtc:13995
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/259863
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Evan Shrubsole <eshr@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36646}
This commit is contained in:
Evan Shrubsole
2022-04-25 11:04:12 +02:00
committed by WebRTC LUCI CQ
parent 901736fa3c
commit 7765f9e3df
2 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
rtc_base/logging.h
View File

@ -49,6 +49,7 @@
#include <atomic> #include <atomic>
#include <sstream> // no-presubmit-check TODO(webrtc:8982) #include <sstream> // no-presubmit-check TODO(webrtc:8982)
#include <string> #include <string>
#include <type_traits>
#include <utility> #include <utility>
#include "absl/base/attributes.h" #include "absl/base/attributes.h"
@ -277,8 +278,15 @@ inline Val<LogArgType::kLogMetadataTag, LogMetadataTag> MakeVal(
template <typename T, class = void> template <typename T, class = void>
struct has_to_log_string : std::false_type {}; struct has_to_log_string : std::false_type {};
template <typename T> template <typename T>
struct has_to_log_string<T, decltype(ToLogString(std::declval<T>()))> struct has_to_log_string<T,
: std::true_type {}; absl::enable_if_t<std::is_convertible<
decltype(ToLogString(std::declval<T>())),
std::string>::value>> : std::true_type {};
template <typename T, absl::enable_if_t<has_to_log_string<T>::value>* = nullptr>
ToStringVal MakeVal(const T& x) {
return {ToLogString(x)};
}
// Handle arbitrary types other than the above by falling back to stringstream. // Handle arbitrary types other than the above by falling back to stringstream.
// TODO(bugs.webrtc.org/9278): Get rid of this overload when callers don't need // TODO(bugs.webrtc.org/9278): Get rid of this overload when callers don't need
@ -300,11 +308,6 @@ ToStringVal MakeVal(const T& x) {
return {os.str()}; return {os.str()};
} }
template <typename T, absl::enable_if_t<has_to_log_string<T>::value>* = nullptr>
ToStringVal MakeVal(const T& x) {
return {ToLogString(x)};
}
#if RTC_LOG_ENABLED() #if RTC_LOG_ENABLED()
void Log(const LogArgType* fmt, ...); void Log(const LogArgType* fmt, ...);
#else #else

16
rtc_base/logging_unittest.cc
View File

@ -22,6 +22,7 @@
#include "rtc_base/event.h" #include "rtc_base/event.h"
#include "rtc_base/platform_thread.h" #include "rtc_base/platform_thread.h"
#include "rtc_base/time_utils.h" #include "rtc_base/time_utils.h"
#include "test/gmock.h"
#include "test/gtest.h" #include "test/gtest.h"
namespace rtc { namespace rtc {
@ -299,5 +300,20 @@ TEST(LogTest, NoopSeverityDoesNotRunStringFormatting) {
EXPECT_FALSE(was_called); EXPECT_FALSE(was_called);
} }
struct TestStruct {};
std::string ToLogString(TestStruct foo) {
return "bar";
}
TEST(LogTest, ToLogStringUsedForUnknownTypes) {
std::string str;
LogSinkImpl stream(&str);
LogMessage::AddLogToStream(&stream, LS_INFO);
TestStruct t;
RTC_LOG(LS_INFO) << t;
EXPECT_THAT(str, ::testing::HasSubstr("bar"));
LogMessage::RemoveLogToStream(&stream);
}
} // namespace rtc } // namespace rtc
#endif // RTC_LOG_ENABLED() #endif // RTC_LOG_ENABLED()