mirror of
https://github.com/Evolution-X/hardware_interfaces
synced 2026-02-01 16:50:18 +00:00
e28dd7900d
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
129 lines
4.0 KiB
C++
129 lines
4.0 KiB
C++
/*
|
|
* Copyright (C) 2021 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 "GnssNavigationMessageAidl"
|
|
|
|
#include "GnssNavigationMessageInterface.h"
|
|
#include <aidl/android/hardware/gnss/BnGnss.h>
|
|
#include <log/log.h>
|
|
#include "Utils.h"
|
|
|
|
namespace aidl::android::hardware::gnss {
|
|
|
|
using namespace ::android::hardware::gnss;
|
|
using GnssNavigationMessage = IGnssNavigationMessageCallback::GnssNavigationMessage;
|
|
using GnssNavigationMessageType = GnssNavigationMessage::GnssNavigationMessageType;
|
|
|
|
std::shared_ptr<IGnssNavigationMessageCallback> GnssNavigationMessageInterface::sCallback = nullptr;
|
|
|
|
GnssNavigationMessageInterface::GnssNavigationMessageInterface() : mMinIntervalMillis(1000) {
|
|
mThreads.reserve(2);
|
|
}
|
|
|
|
GnssNavigationMessageInterface::~GnssNavigationMessageInterface() {
|
|
waitForStoppingThreads();
|
|
}
|
|
|
|
ndk::ScopedAStatus GnssNavigationMessageInterface::setCallback(
|
|
const std::shared_ptr<IGnssNavigationMessageCallback>& callback) {
|
|
ALOGD("setCallback");
|
|
std::unique_lock<std::mutex> lock(mMutex);
|
|
sCallback = callback;
|
|
start();
|
|
return ndk::ScopedAStatus::ok();
|
|
}
|
|
|
|
ndk::ScopedAStatus GnssNavigationMessageInterface::close() {
|
|
ALOGD("close");
|
|
if (mIsActive) {
|
|
stop();
|
|
}
|
|
std::unique_lock<std::mutex> lock(mMutex);
|
|
sCallback = nullptr;
|
|
return ndk::ScopedAStatus::ok();
|
|
}
|
|
|
|
void GnssNavigationMessageInterface::start() {
|
|
ALOGD("start");
|
|
|
|
if (mIsActive) {
|
|
ALOGD("restarting since nav msg has started");
|
|
stop();
|
|
}
|
|
|
|
mIsActive = true;
|
|
mThreads.emplace_back(std::thread([this]() {
|
|
waitForStoppingThreads();
|
|
mThreadBlocker.reset();
|
|
do {
|
|
if (!mIsActive) {
|
|
break;
|
|
}
|
|
GnssNavigationMessage message = {
|
|
.svid = 19,
|
|
.type = GnssNavigationMessageType::GPS_L1CA,
|
|
.status = GnssNavigationMessage::STATUS_PARITY_PASSED,
|
|
.messageId = 2,
|
|
.submessageId = 3,
|
|
.data = std::vector<uint8_t>(40, 0xF9),
|
|
};
|
|
this->reportMessage(message);
|
|
} while (mIsActive &&
|
|
mThreadBlocker.wait_for(std::chrono::milliseconds(mMinIntervalMillis)));
|
|
}));
|
|
}
|
|
|
|
void GnssNavigationMessageInterface::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 GnssNavigationMessageInterface::reportMessage(const GnssNavigationMessage& message) {
|
|
ALOGD("reportMessage()");
|
|
std::shared_ptr<IGnssNavigationMessageCallback> callbackCopy;
|
|
{
|
|
std::unique_lock<std::mutex> lock(mMutex);
|
|
if (sCallback == nullptr) {
|
|
ALOGE("%s: GnssNavigationMessageInterface::sCallback is null.", __func__);
|
|
return;
|
|
}
|
|
callbackCopy = sCallback;
|
|
}
|
|
callbackCopy->gnssNavigationMessageCb(message);
|
|
}
|
|
|
|
void GnssNavigationMessageInterface::waitForStoppingThreads() {
|
|
for (auto& future : mFutures) {
|
|
ALOGD("Stopping previous thread.");
|
|
future.wait();
|
|
ALOGD("Done stopping thread.");
|
|
}
|
|
mFutures.clear();
|
|
}
|
|
|
|
} // namespace aidl::android::hardware::gnss
|