mirror of
https://github.com/Evolution-X/hardware_interfaces
synced 2026-02-08 07:49:19 +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
69 lines
2.4 KiB
C++
69 lines
2.4 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.
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <aidl/android/hardware/gnss/BnGnssMeasurementCallback.h>
|
|
#include <aidl/android/hardware/gnss/BnGnssMeasurementInterface.h>
|
|
#include <atomic>
|
|
#include <future>
|
|
#include <mutex>
|
|
#include <thread>
|
|
#include "Utils.h"
|
|
|
|
namespace aidl::android::hardware::gnss {
|
|
class Gnss;
|
|
|
|
struct GnssMeasurementInterface : public BnGnssMeasurementInterface {
|
|
public:
|
|
GnssMeasurementInterface();
|
|
~GnssMeasurementInterface();
|
|
ndk::ScopedAStatus setCallback(const std::shared_ptr<IGnssMeasurementCallback>& callback,
|
|
const bool enableFullTracking,
|
|
const bool enableCorrVecOutputs) override;
|
|
ndk::ScopedAStatus close() override;
|
|
ndk::ScopedAStatus setCallbackWithOptions(
|
|
const std::shared_ptr<IGnssMeasurementCallback>& callback,
|
|
const Options& options) override;
|
|
void setLocationInterval(const int intervalMs);
|
|
void setLocationEnabled(const bool enabled);
|
|
void setGnssInterface(const std::shared_ptr<Gnss>& gnss);
|
|
|
|
private:
|
|
void start(const bool enableCorrVecOutputs, const bool enableFullTracking);
|
|
void stop();
|
|
void reportMeasurement(const GnssData&);
|
|
void waitForStoppingThreads();
|
|
|
|
std::atomic<long> mIntervalMs;
|
|
std::atomic<long> mLocationIntervalMs;
|
|
std::atomic<bool> mIsActive;
|
|
std::atomic<bool> mLocationEnabled;
|
|
std::vector<std::thread> mThreads;
|
|
std::vector<std::future<void>> mFutures;
|
|
::android::hardware::gnss::common::ThreadBlocker mThreadBlocker;
|
|
|
|
// Guarded by mMutex
|
|
static std::shared_ptr<IGnssMeasurementCallback> sCallback;
|
|
|
|
// Synchronization lock for sCallback
|
|
mutable std::mutex mMutex;
|
|
|
|
std::shared_ptr<Gnss> mGnss;
|
|
};
|
|
|
|
} // namespace aidl::android::hardware::gnss
|