mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 05:40:42 +01:00
5162dc3370
This reverts commit9463095df8. Reason for revert: Problem fixed. Original change's description: > Revert "TaskQueueStdlib: Stop spamming on idle." > > This reverts commit2fbaa8e3a3. > > Reason for revert: Breaks tests > > Original change's description: > > TaskQueueStdlib: Stop spamming on idle. > > > > 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} > > Change-Id: Ie80d86f6aa0cdff3bc5ee1d79fa4c8144009e33f > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/361741 > Auto-Submit: Markus Handell <handellm@webrtc.org> > Reviewed-by: Björn Terelius <terelius@webrtc.org> > Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> > Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> > Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> > Cr-Commit-Position: refs/heads/main@{#42960} Fixed: b/364436627 Change-Id: I7baa8c5c169e5c63b28e1a5363c06e3d8d3f4c7c Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/361742 Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Auto-Submit: Markus Handell <handellm@webrtc.org> Commit-Queue: Markus Handell <handellm@webrtc.org> Cr-Commit-Position: refs/heads/main@{#42963}
61 lines
1.9 KiB
C++
61 lines
1.9 KiB
C++
/*
|
|
* Copyright 2022 The WebRTC Project Authors. All rights reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#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 {
|
|
namespace {
|
|
|
|
std::unique_ptr<TaskQueueFactory> CreateTaskQueueFactory(
|
|
const webrtc::FieldTrialsView*) {
|
|
return CreateTaskQueueStdlibFactory();
|
|
}
|
|
|
|
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);
|
|
task_queue = nullptr;
|
|
rtc::LogMessage::RemoveLogToStream(&stream);
|
|
}
|
|
|
|
} // namespace
|
|
} // namespace webrtc
|