admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TaskQueueStdlib: Stop spamming on idle.

Browse Source 
When the stdlib task queue has no work for >= 3s on
Android, it will emit bogus deadlock warnings. Fix
this by ensuring we're not triggering this behavior.

Fixed: b/364436627
Change-Id: I3fe02e13993cbb4a59d5669df06c4c293d237bc4
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/361721
Commit-Queue: Markus Handell <handellm@webrtc.org>
Reviewed-by: Jonas Oreland <jonaso@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42955}
This commit is contained in:
Markus Handell 2024-09-05 00:24:29 +02:00 committed by WebRTC LUCI CQ
parent 3144e204ae
commit 2fbaa8e3a3
4 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rtc_base/BUILD.gn
View File

@ -739,8 +739,13 @@ if (rtc_include_tests) {
sources = [ "task_queue_stdlib_unittest.cc" ]
deps = [
":gunit_helpers",
":logging",
":rtc_event",
":rtc_task_queue_stdlib",
"../api/task_queue",
"../api/task_queue:task_queue_test",
"../api/units:time_delta",
"../system_wrappers",
"../test:test_main",
"../test:test_support",
]

4
rtc_base/event.h
View File

@ -58,6 +58,8 @@ class Event {
// TODO(bugs.webrtc.org/14366): Consider removing this redundant alias.
static constexpr webrtc::TimeDelta kForever =
webrtc::TimeDelta::PlusInfinity();
static constexpr webrtc::TimeDelta kDefaultWarnDuration =
webrtc::TimeDelta::Seconds(3);
Event();
Event(bool manual_reset, bool initially_signaled);
@ -83,7 +85,7 @@ class Event {
// Waits with the given timeout and a reasonable default warning timeout.
bool Wait(webrtc::TimeDelta give_up_after) {
return Wait(give_up_after, give_up_after.IsPlusInfinity()
? webrtc::TimeDelta::Seconds(3)
? kDefaultWarnDuration
: kForever);
}

2
rtc_base/task_queue_stdlib.cc
View File

@ -249,7 +249,7 @@ void TaskQueueStdlib::ProcessTasks() {
continue;
}
flag_notify_.Wait(task.sleep_time);
flag_notify_.Wait(task.sleep_time, task.sleep_time);
}
// Ensure remaining deleted tasks are destroyed with Current() set up to this

30
rtc_base/task_queue_stdlib_unittest.cc
View File

@ -10,7 +10,12 @@
#include "rtc_base/task_queue_stdlib.h"
#include "api/task_queue/task_queue_factory.h"
#include "api/task_queue/task_queue_test.h"
#include "api/units/time_delta.h"
#include "rtc_base/event.h"
#include "rtc_base/logging.h"
#include "system_wrappers/include/sleep.h"
#include "test/gtest.h"
namespace webrtc {
@ -25,5 +30,30 @@ INSTANTIATE_TEST_SUITE_P(TaskQueueStdlib,
TaskQueueTest,
::testing::Values(CreateTaskQueueFactory));
class StringPtrLogSink : public rtc::LogSink {
public:
explicit StringPtrLogSink(std::string* log_data) : log_data_(log_data) {}
private:
void OnLogMessage(const std::string& message) override {
OnLogMessage(absl::string_view(message));
}
void OnLogMessage(absl::string_view message) override {
log_data_->append(message.begin(), message.end());
}
std::string* const log_data_;
};
TEST(TaskQueueStdlib, AvoidsSpammingLogOnInactivity) {
std::string log_output;
StringPtrLogSink stream(&log_output);
rtc::LogMessage::AddLogToStream(&stream, rtc::LS_VERBOSE);
auto task_queue = CreateTaskQueueStdlibFactory()->CreateTaskQueue(
"test", TaskQueueFactory::Priority::NORMAL);
auto wait_duration = rtc::Event::kDefaultWarnDuration + TimeDelta::Seconds(1);
SleepMs(wait_duration.ms());
EXPECT_EQ(log_output.length(), 0u);
}
} // namespace
} // namespace webrtc