tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Clear notification count to handle different flows" into oc-dr1-dev

Browse source 
am: b0f192f654

Change-Id: Ie93f3d900a424e84848050e8dcd812b0aee75ab5
This commit is contained in:
Wyatt Riley 2017-06-20 00:35:02 +00:00 committed by android-build-merger
commit 256b74bccd
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gnss/1.0/vts/functional/VtsHalGnssV1_0TargetTest.cpp
View file

@ -49,6 +49,7 @@ class GnssHalTest : public ::testing::VtsHalHidlTargetTestBase {
capabilities_called_count_ = 0;
location_called_count_ = 0;
info_called_count_ = 0;
notify_count_ = 0;
gnss_hal_ = ::testing::VtsHalHidlTargetTestBase::getService<IGnss>();
ASSERT_NE(gnss_hal_, nullptr);
@ -93,12 +94,15 @@ class GnssHalTest : public ::testing::VtsHalHidlTargetTestBase {
if (gnss_hal_ != nullptr) {
gnss_hal_->cleanup();
}
if (notify_count_ > 0) {
ALOGW("%d unprocessed callbacks discarded", notify_count_);
}
}
/* Used as a mechanism to inform the test that a callback has occurred */
inline void notify() {
std::unique_lock<std::mutex> lock(mtx_);
count++;
notify_count_++;
cv_.notify_one();
}
@ -108,11 +112,11 @@ class GnssHalTest : public ::testing::VtsHalHidlTargetTestBase {
std::cv_status status = std::cv_status::no_timeout;
auto now = std::chrono::system_clock::now();
while (count == 0) {
status = cv_.wait_until(lock, now + std::chrono::seconds(timeoutSeconds));
if (status == std::cv_status::timeout) return status;
while (notify_count_ == 0) {
status = cv_.wait_until(lock, now + std::chrono::seconds(timeoutSeconds));
if (status == std::cv_status::timeout) return status;
}
count--;
notify_count_--;
return status;
}
@ -306,7 +310,7 @@ class GnssHalTest : public ::testing::VtsHalHidlTargetTestBase {
private:
std::mutex mtx_;
std::condition_variable cv_;
int count;
int notify_count_;
};
/*