mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-12 13:20:44 +01:00
ad5037b4a8
This reverts commit793bac569f. Reason for revert: rare compilation error fixed Original change's description: > Revert "Refactor the PlatformThread API." > > This reverts commitc89fdd716c. > > Reason for revert: Causes rare compilation error on win-libfuzzer-asan trybot. > See https://ci.chromium.org/p/chromium/builders/try/win-libfuzzer-asan-rel/713745? > > Original change's description: > > Refactor the PlatformThread API. > > > > PlatformThread's API is using old style function pointers, causes > > casting, is unintuitive and forces artificial call sequences, and > > is additionally possible to misuse in release mode. > > > > Fix this by an API face lift: > > 1. The class is turned into a handle, which can be empty. > > 2. The only way of getting a non-empty PlatformThread is by calling > > SpawnJoinable or SpawnDetached, clearly conveying the semantics to the > > code reader. > > 3. Handles can be Finalized, which works differently for joinable and > > detached threads: > > a) Handles for detached threads are simply closed where applicable. > > b) Joinable threads are joined before handles are closed. > > 4. The destructor finalizes handles. No explicit call is needed. > > > > Fixed: webrtc:12727 > > Change-Id: Id00a0464edf4fc9e552b6a1fbb5d2e1280e88811 > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/215075 > > Commit-Queue: Markus Handell <handellm@webrtc.org> > > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > > Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> > > Reviewed-by: Tommi <tommi@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#33923} > > # Not skipping CQ checks because original CL landed > 1 day ago. > > TBR=handellm@webrtc.org > > Bug: webrtc:12727 > Change-Id: Ic0146be8866f6dd3ad9c364fb8646650b8e07419 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/217583 > Reviewed-by: Guido Urdaneta <guidou@webrtc.org> > Reviewed-by: Markus Handell <handellm@webrtc.org> > Commit-Queue: Guido Urdaneta <guidou@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#33936} # Not skipping CQ checks because this is a reland. Bug: webrtc:12727 Change-Id: Ifd6f44eac72fed84474277a1be03eb84d2f4376e Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/217881 Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Markus Handell <handellm@webrtc.org> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Cr-Commit-Position: refs/heads/master@{#33950}
102 lines
3.7 KiB
C++
102 lines
3.7 KiB
C++
/*
|
|
* Copyright (c) 2017 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/cpu_time.h"
|
|
|
|
#include "rtc_base/platform_thread.h"
|
|
#include "rtc_base/time_utils.h"
|
|
#include "system_wrappers/include/sleep.h"
|
|
#include "test/gtest.h"
|
|
|
|
// Only run these tests on non-instrumented builds, because timing on
|
|
// instrumented builds is unreliable, causing the test to be flaky.
|
|
#if defined(THREAD_SANITIZER) || defined(MEMORY_SANITIZER) || \
|
|
defined(ADDRESS_SANITIZER)
|
|
#define MAYBE_TEST(test_name) DISABLED_##test_name
|
|
#else
|
|
#define MAYBE_TEST(test_name) test_name
|
|
#endif
|
|
|
|
namespace {
|
|
const int kAllowedErrorMillisecs = 30;
|
|
const int kProcessingTimeMillisecs = 500;
|
|
const int kWorkingThreads = 2;
|
|
|
|
// Consumes approximately kProcessingTimeMillisecs of CPU time in single thread.
|
|
void WorkingFunction(int64_t* counter) {
|
|
*counter = 0;
|
|
int64_t stop_cpu_time =
|
|
rtc::GetThreadCpuTimeNanos() +
|
|
kProcessingTimeMillisecs * rtc::kNumNanosecsPerMillisec;
|
|
while (rtc::GetThreadCpuTimeNanos() < stop_cpu_time) {
|
|
(*counter)++;
|
|
}
|
|
}
|
|
} // namespace
|
|
|
|
namespace rtc {
|
|
|
|
// A minimal test which can be run on instrumented builds, so that they're at
|
|
// least exercising the code to check for memory leaks/etc.
|
|
TEST(CpuTimeTest, BasicTest) {
|
|
int64_t process_start_time_nanos = GetProcessCpuTimeNanos();
|
|
int64_t thread_start_time_nanos = GetThreadCpuTimeNanos();
|
|
int64_t process_duration_nanos =
|
|
GetProcessCpuTimeNanos() - process_start_time_nanos;
|
|
int64_t thread_duration_nanos =
|
|
GetThreadCpuTimeNanos() - thread_start_time_nanos;
|
|
EXPECT_GE(process_duration_nanos, 0);
|
|
EXPECT_GE(thread_duration_nanos, 0);
|
|
}
|
|
|
|
TEST(CpuTimeTest, MAYBE_TEST(TwoThreads)) {
|
|
int64_t process_start_time_nanos = GetProcessCpuTimeNanos();
|
|
int64_t thread_start_time_nanos = GetThreadCpuTimeNanos();
|
|
int64_t counter1;
|
|
int64_t counter2;
|
|
auto thread1 = PlatformThread::SpawnJoinable(
|
|
[&counter1] { WorkingFunction(&counter1); }, "Thread1");
|
|
auto thread2 = PlatformThread::SpawnJoinable(
|
|
[&counter2] { WorkingFunction(&counter2); }, "Thread2");
|
|
thread1.Finalize();
|
|
thread2.Finalize();
|
|
|
|
EXPECT_GE(counter1, 0);
|
|
EXPECT_GE(counter2, 0);
|
|
int64_t process_duration_nanos =
|
|
GetProcessCpuTimeNanos() - process_start_time_nanos;
|
|
int64_t thread_duration_nanos =
|
|
GetThreadCpuTimeNanos() - thread_start_time_nanos;
|
|
// This thread did almost nothing. Definetly less work than kProcessingTime.
|
|
// Therefore GetThreadCpuTime is not a wall clock.
|
|
EXPECT_LE(thread_duration_nanos,
|
|
(kProcessingTimeMillisecs - kAllowedErrorMillisecs) *
|
|
kNumNanosecsPerMillisec);
|
|
// Total process time is at least twice working threads' CPU time.
|
|
// Therefore process and thread times are correctly related.
|
|
EXPECT_GE(process_duration_nanos,
|
|
kWorkingThreads *
|
|
(kProcessingTimeMillisecs - kAllowedErrorMillisecs) *
|
|
kNumNanosecsPerMillisec);
|
|
}
|
|
|
|
TEST(CpuTimeTest, MAYBE_TEST(Sleeping)) {
|
|
int64_t process_start_time_nanos = GetProcessCpuTimeNanos();
|
|
webrtc::SleepMs(kProcessingTimeMillisecs);
|
|
int64_t process_duration_nanos =
|
|
GetProcessCpuTimeNanos() - process_start_time_nanos;
|
|
// Sleeping should not introduce any additional CPU time.
|
|
// Therefore GetProcessCpuTime is not a wall clock.
|
|
EXPECT_LE(process_duration_nanos,
|
|
(kProcessingTimeMillisecs - kAllowedErrorMillisecs) *
|
|
kNumNanosecsPerMillisec);
|
|
}
|
|
|
|
} // namespace rtc
|