mirror of
https://github.com/Evolution-X/hardware_interfaces
synced 2026-02-01 16:50:18 +00:00
Before this change, a start() call will wait for previous threads to finish. However, in ListenerMultiplexer.java in the framework, start(), stop(), and deliverListener() calls are contending for the same lock. Therefore, if a waiting start() is holding the lock, while the almost-finishing thread is also going to hold that lock for calling deliverListener(), a deadlock will happen. This CL moves the waiting logic into the new thread of the start() call, so that start() will return immediately. The new thread will wait for the old thread to finish, and then start the actual work. Bug: 299563185 Test: atest CtsLocationGnssTestCases Change-Id: Ic2993a6d82c24688fa98d26d336c85518c683cf6
194 lines
6.3 KiB
C++
194 lines
6.3 KiB
C++
/*
|
|
* Copyright (C) 2020 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#define LOG_TAG "GnssMeasIfaceAidl"
|
|
|
|
#include "GnssMeasurementInterface.h"
|
|
#include <aidl/android/hardware/gnss/BnGnss.h>
|
|
#include <log/log.h>
|
|
#include "DeviceFileReader.h"
|
|
#include "Gnss.h"
|
|
#include "GnssRawMeasurementParser.h"
|
|
#include "GnssReplayUtils.h"
|
|
#include "Utils.h"
|
|
|
|
namespace aidl::android::hardware::gnss {
|
|
|
|
using Utils = ::android::hardware::gnss::common::Utils;
|
|
using ReplayUtils = ::android::hardware::gnss::common::ReplayUtils;
|
|
using GnssRawMeasurementParser = ::android::hardware::gnss::common::GnssRawMeasurementParser;
|
|
using DeviceFileReader = ::android::hardware::gnss::common::DeviceFileReader;
|
|
|
|
std::shared_ptr<IGnssMeasurementCallback> GnssMeasurementInterface::sCallback = nullptr;
|
|
|
|
GnssMeasurementInterface::GnssMeasurementInterface()
|
|
: mIntervalMs(1000), mLocationIntervalMs(1000) {
|
|
mThreads.reserve(2);
|
|
}
|
|
|
|
GnssMeasurementInterface::~GnssMeasurementInterface() {
|
|
waitForStoppingThreads();
|
|
}
|
|
|
|
ndk::ScopedAStatus GnssMeasurementInterface::setCallback(
|
|
const std::shared_ptr<IGnssMeasurementCallback>& callback, const bool enableFullTracking,
|
|
const bool enableCorrVecOutputs) {
|
|
ALOGD("setCallback: enableFullTracking: %d enableCorrVecOutputs: %d", (int)enableFullTracking,
|
|
(int)enableCorrVecOutputs);
|
|
{
|
|
std::unique_lock<std::mutex> lock(mMutex);
|
|
sCallback = callback;
|
|
}
|
|
|
|
if (mIsActive) {
|
|
ALOGW("GnssMeasurement callback already set. Resetting the callback...");
|
|
stop();
|
|
}
|
|
start(enableCorrVecOutputs, enableFullTracking);
|
|
|
|
return ndk::ScopedAStatus::ok();
|
|
}
|
|
|
|
ndk::ScopedAStatus GnssMeasurementInterface::setCallbackWithOptions(
|
|
const std::shared_ptr<IGnssMeasurementCallback>& callback, const Options& options) {
|
|
ALOGD("setCallbackWithOptions: fullTracking:%d, corrVec:%d, intervalMs:%d",
|
|
(int)options.enableFullTracking, (int)options.enableCorrVecOutputs, options.intervalMs);
|
|
{
|
|
std::unique_lock<std::mutex> lock(mMutex);
|
|
sCallback = callback;
|
|
}
|
|
|
|
if (mIsActive) {
|
|
ALOGW("GnssMeasurement callback already set. Resetting the callback...");
|
|
stop();
|
|
}
|
|
mIntervalMs = std::max(options.intervalMs, 1000);
|
|
start(options.enableCorrVecOutputs, options.enableFullTracking);
|
|
|
|
return ndk::ScopedAStatus::ok();
|
|
}
|
|
|
|
ndk::ScopedAStatus GnssMeasurementInterface::close() {
|
|
ALOGD("close");
|
|
if (mIsActive) {
|
|
stop();
|
|
}
|
|
{
|
|
std::unique_lock<std::mutex> lock(mMutex);
|
|
sCallback = nullptr;
|
|
}
|
|
mIntervalMs = 1000;
|
|
return ndk::ScopedAStatus::ok();
|
|
}
|
|
|
|
void GnssMeasurementInterface::start(const bool enableCorrVecOutputs,
|
|
const bool enableFullTracking) {
|
|
ALOGD("start");
|
|
|
|
if (mIsActive) {
|
|
ALOGD("restarting since measurement has started");
|
|
stop();
|
|
}
|
|
|
|
mIsActive = true;
|
|
mThreads.emplace_back(std::thread([this, enableCorrVecOutputs, enableFullTracking]() {
|
|
waitForStoppingThreads();
|
|
mThreadBlocker.reset();
|
|
|
|
int intervalMs;
|
|
do {
|
|
if (!mIsActive) {
|
|
break;
|
|
}
|
|
std::string rawMeasurementStr = "";
|
|
if (ReplayUtils::hasGnssDeviceFile() &&
|
|
ReplayUtils::isGnssRawMeasurement(
|
|
rawMeasurementStr =
|
|
DeviceFileReader::Instance().getGnssRawMeasurementData())) {
|
|
ALOGD("rawMeasurementStr(size: %zu) from device file: %s", rawMeasurementStr.size(),
|
|
rawMeasurementStr.c_str());
|
|
auto measurement =
|
|
GnssRawMeasurementParser::getMeasurementFromStrs(rawMeasurementStr);
|
|
if (measurement != nullptr) {
|
|
this->reportMeasurement(*measurement);
|
|
}
|
|
} else {
|
|
auto measurement =
|
|
Utils::getMockMeasurement(enableCorrVecOutputs, enableFullTracking);
|
|
this->reportMeasurement(measurement);
|
|
if (!mLocationEnabled) {
|
|
mGnss->reportSvStatus();
|
|
}
|
|
}
|
|
intervalMs =
|
|
(mLocationEnabled) ? std::min(mLocationIntervalMs, mIntervalMs) : mIntervalMs;
|
|
} while (mIsActive && mThreadBlocker.wait_for(std::chrono::milliseconds(intervalMs)));
|
|
}));
|
|
}
|
|
|
|
void GnssMeasurementInterface::stop() {
|
|
ALOGD("stop");
|
|
mIsActive = false;
|
|
mThreadBlocker.notify();
|
|
for (auto iter = mThreads.begin(); iter != mThreads.end(); ++iter) {
|
|
if (iter->joinable()) {
|
|
mFutures.push_back(std::async(std::launch::async, [this, iter] {
|
|
iter->join();
|
|
mThreads.erase(iter);
|
|
}));
|
|
} else {
|
|
mThreads.erase(iter);
|
|
}
|
|
}
|
|
}
|
|
|
|
void GnssMeasurementInterface::reportMeasurement(const GnssData& data) {
|
|
ALOGD("reportMeasurement()");
|
|
std::shared_ptr<IGnssMeasurementCallback> callbackCopy;
|
|
{
|
|
std::unique_lock<std::mutex> lock(mMutex);
|
|
if (sCallback == nullptr) {
|
|
ALOGE("%s: GnssMeasurement::sCallback is null.", __func__);
|
|
return;
|
|
}
|
|
callbackCopy = sCallback;
|
|
}
|
|
callbackCopy->gnssMeasurementCb(data);
|
|
}
|
|
|
|
void GnssMeasurementInterface::setLocationInterval(const int intervalMs) {
|
|
mLocationIntervalMs = intervalMs;
|
|
}
|
|
|
|
void GnssMeasurementInterface::setLocationEnabled(const bool enabled) {
|
|
mLocationEnabled = enabled;
|
|
}
|
|
|
|
void GnssMeasurementInterface::setGnssInterface(const std::shared_ptr<Gnss>& gnss) {
|
|
mGnss = gnss;
|
|
}
|
|
|
|
void GnssMeasurementInterface::waitForStoppingThreads() {
|
|
for (auto& future : mFutures) {
|
|
ALOGD("Stopping previous thread.");
|
|
future.wait();
|
|
ALOGD("Done stopping thread.");
|
|
}
|
|
mFutures.clear();
|
|
}
|
|
|
|
} // namespace aidl::android::hardware::gnss
|