mirror of
https://github.com/chararomandroid/android_device_samsung_a20
synced 2026-08-22 12:05:32 -04:00
universal7885: fm-aidl: Allocate threads on heap
Then we don't have to call detach() to keep running without terminating, so we can keep a reference to thread object so its better
This commit is contained in:
parent
d222619857
commit
f31d63aeb9
5 changed files with 9 additions and 10 deletions
|
|
@ -138,15 +138,14 @@ namespace aidl::vendor::eureka::hardware::fmradio {
|
|||
}
|
||||
case SetType::SET_TYPE_FM_SEARCH_START:
|
||||
lock.unlock();
|
||||
search_thread = std::thread([this] {
|
||||
search_thread = new std::thread([this] {
|
||||
const std::lock_guard<std::timed_mutex> guard(lock);
|
||||
freqs_list = fm_radio_slsi::get_freqs(fd);
|
||||
std::sort(freqs_list.begin(), freqs_list.end(), std::less<int>());
|
||||
});
|
||||
search_thread.detach();
|
||||
break;
|
||||
case SetType::SET_TYPE_FM_APP_PID: {
|
||||
client_observe_thread = std::thread([=] {
|
||||
client_observe_thread = new std::thread([=] {
|
||||
pid_t pid = value;
|
||||
|
||||
LOG_D("FM_APP_PID: received value %d", pid);
|
||||
|
|
@ -158,7 +157,6 @@ namespace aidl::vendor::eureka::hardware::fmradio {
|
|||
fm_radio_slsi::fm_thread_set(fd, 0);
|
||||
close();
|
||||
});
|
||||
client_observe_thread.detach();
|
||||
break;
|
||||
}
|
||||
default:
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ struct FMDevControl : public BnFMDevControl {
|
|||
int fd;
|
||||
unsigned int index;
|
||||
std::timed_mutex lock;
|
||||
std::thread search_thread, client_observe_thread;
|
||||
std::thread *search_thread, *client_observe_thread;
|
||||
std::vector<int> freqs_list;
|
||||
middlestate_t *kMiddleState;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@ constexpr const char *FM_FREQ_SEEK = FM_SYSFS_BASE "/radio_freq_seek";
|
|||
NOT_SUPPORTED;
|
||||
case SetType::SET_TYPE_FM_SEARCH_START:
|
||||
lock.unlock();
|
||||
search_thread = std::thread([this] {
|
||||
search_thread = new std::thread([this] {
|
||||
const std::lock_guard<std::timed_mutex> guard(lock);
|
||||
for (int i = 0; i < TRACK_SIZE; i++) {
|
||||
FileIO::writeline(FM_FREQ_SEEK, "1 " + std::to_string(SYSFS_SPACING * 10));
|
||||
|
|
@ -111,7 +111,6 @@ constexpr const char *FM_FREQ_SEEK = FM_SYSFS_BASE "/radio_freq_seek";
|
|||
}
|
||||
std::sort(freqs_list.begin(), freqs_list.end(), std::less<int>());
|
||||
});
|
||||
search_thread.detach();
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ public:
|
|||
::ndk::ScopedAStatus close(void) override;
|
||||
private:
|
||||
std::timed_mutex lock;
|
||||
std::thread search_thread;
|
||||
std::thread *search_thread;
|
||||
std::vector<int> freqs_list;
|
||||
unsigned int index;
|
||||
middlestate_t *kMiddleState;
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@
|
|||
namespace fm_radio_slsi {
|
||||
|
||||
static bool FMThread = false;
|
||||
static std::thread *poll_thread = nullptr;
|
||||
|
||||
constexpr const char *FM_DEV_PATH = "/dev/radio0";
|
||||
|
||||
|
|
@ -227,8 +228,9 @@ static void fm_thread(int fd) {
|
|||
void fm_thread_set(const int fd, const bool enable) {
|
||||
FMThread = enable;
|
||||
if (enable) {
|
||||
std::thread thread = std::thread(fm_thread, fd);
|
||||
thread.detach();
|
||||
poll_thread = new std::thread(fm_thread, fd);
|
||||
} else {
|
||||
poll_thread = nullptr;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue