Fix TimeRollbackPrevention Test
(This is a merge of http://go/wvgerrit/107243.) This code is based on a bug report and patch from Sony. The TimeRollbackPrevention test was failing when run with CE CDM and the OEC Ref, although it passed in some other configurations. The cause was twofold: 1) The test sleep code was not accounting for rollback when calculating the clock drift, causing incorrect time values to elapse. 2) Fixing the previous exposed a bug in the CE CDM test host where it did not handle negative time passing correctly. This patch expands Sony's fix with additional comments and some code cleanup to try to make the code clearer and more robust against future errors, particularly in the error-prone TestHost code. Bug: 169942369 Test: jenkins/ce_cdm_tests Test: build_and_run_all_unit_tests.sh Test: x86-64, all CE CDM unit tests Change-Id: Id52b8c38255f70b04bc2735c4e309fb90992f53e
This commit is contained in:
@@ -23,7 +23,7 @@ namespace wvcdm {
|
|||||||
|
|
||||||
bool TestSleep::real_sleep_ = true;
|
bool TestSleep::real_sleep_ = true;
|
||||||
TestSleep::CallBack* TestSleep::callback_ = nullptr;
|
TestSleep::CallBack* TestSleep::callback_ = nullptr;
|
||||||
int TestSleep::total_clock_rollback_ = 0;
|
int TestSleep::total_clock_rollback_seconds_ = 0;
|
||||||
|
|
||||||
void TestSleep::Sleep(unsigned int seconds) {
|
void TestSleep::Sleep(unsigned int seconds) {
|
||||||
int64_t milliseconds = 1000 * seconds;
|
int64_t milliseconds = 1000 * seconds;
|
||||||
@@ -33,11 +33,15 @@ void TestSleep::Sleep(unsigned int seconds) {
|
|||||||
// total since the start, and then compare to a running total of sleep
|
// total since the start, and then compare to a running total of sleep
|
||||||
// calls. We sleep for approximately x second, and then advance the clock by
|
// calls. We sleep for approximately x second, and then advance the clock by
|
||||||
// the amount of time that has actually passed.
|
// the amount of time that has actually passed.
|
||||||
static auto start_real = std::chrono::system_clock().now();
|
static const auto start_real = std::chrono::system_clock().now();
|
||||||
static int64_t fake_clock = 0;
|
|
||||||
sleep(seconds);
|
sleep(seconds);
|
||||||
auto now_real = std::chrono::system_clock().now();
|
const auto now_real = std::chrono::system_clock().now();
|
||||||
int64_t total_real = (now_real - start_real) / std::chrono::milliseconds(1);
|
const int64_t rollback_adjustment = 1000 * total_clock_rollback_seconds_;
|
||||||
|
const int64_t total_real =
|
||||||
|
(now_real - start_real) / std::chrono::milliseconds(1) +
|
||||||
|
rollback_adjustment;
|
||||||
|
|
||||||
|
static int64_t fake_clock = 0;
|
||||||
// We want to advance the fake clock by the difference between the real
|
// We want to advance the fake clock by the difference between the real
|
||||||
// clock, and the previous value on the fake clock.
|
// clock, and the previous value on the fake clock.
|
||||||
milliseconds = total_real - fake_clock;
|
milliseconds = total_real - fake_clock;
|
||||||
@@ -90,7 +94,7 @@ bool TestSleep::RollbackSystemTime(int seconds) {
|
|||||||
|
|
||||||
// For both real and fake sleep we still update the callback and we still keep
|
// For both real and fake sleep we still update the callback and we still keep
|
||||||
// track of the total amount of time slept.
|
// track of the total amount of time slept.
|
||||||
total_clock_rollback_ += seconds;
|
total_clock_rollback_seconds_ += seconds;
|
||||||
if (callback_ != nullptr) callback_->ElapseTime(-1000 * seconds);
|
if (callback_ != nullptr) callback_->ElapseTime(-1000 * seconds);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -98,7 +102,6 @@ bool TestSleep::RollbackSystemTime(int seconds) {
|
|||||||
bool TestSleep::CanChangeSystemTime() {
|
bool TestSleep::CanChangeSystemTime() {
|
||||||
// If we are using a fake clock, then we can move the clock backwards by
|
// If we are using a fake clock, then we can move the clock backwards by
|
||||||
// just going backwards.
|
// just going backwards.
|
||||||
// ElapseTime.
|
|
||||||
if (!real_sleep_) {
|
if (!real_sleep_) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -44,8 +44,8 @@ class TestSleep {
|
|||||||
// Roll the system clock forward to undo all previous calls to
|
// Roll the system clock forward to undo all previous calls to
|
||||||
// RollBackSystemTime. Returns true on success.
|
// RollBackSystemTime. Returns true on success.
|
||||||
static bool ResetRollback() {
|
static bool ResetRollback() {
|
||||||
return total_clock_rollback_ == 0 ||
|
return total_clock_rollback_seconds_ == 0 ||
|
||||||
RollbackSystemTime(-total_clock_rollback_);
|
RollbackSystemTime(-total_clock_rollback_seconds_);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Returns true if the system time can be rolled back. This is true on some
|
// Returns true if the system time can be rolled back. This is true on some
|
||||||
@@ -67,7 +67,7 @@ class TestSleep {
|
|||||||
static CallBack* callback_;
|
static CallBack* callback_;
|
||||||
// The sum of all calls to RollBackSystemTime. Kept so we can undo all changes
|
// The sum of all calls to RollBackSystemTime. Kept so we can undo all changes
|
||||||
// at the end of a test.
|
// at the end of a test.
|
||||||
static int total_clock_rollback_;
|
static int total_clock_rollback_seconds_;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace wvcdm
|
} // namespace wvcdm
|
||||||
|
|||||||
Reference in New Issue
Block a user