bunnypad/android_device_samsung_a20
Watch
1
0
Fork
You've already forked android_device_samsung_a20
 0
mirror of https://github.com/chararomandroid/android_device_samsung_a20 synced 2026-08-23 12:35:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

universal7885: fm-aidl: Allocate threads on heap

Browse source 
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:
roynatech2544 2022-11-08 11:39:55 +09:00
commit f31d63aeb9
5 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
universal7885-common/apps/aidl-support/fm/default/FMDevControl.cpp
View file

@ -138,15 +138,14 @@ namespace aidl::vendor::eureka::hardware::fmradio {
} }
case SetType::SET_TYPE_FM_SEARCH_START: case SetType::SET_TYPE_FM_SEARCH_START:
lock.unlock(); lock.unlock();
search_thread = std::thread([this] { search_thread = new std::thread([this] {
const std::lock_guard<std::timed_mutex> guard(lock); const std::lock_guard<std::timed_mutex> guard(lock);
freqs_list = fm_radio_slsi::get_freqs(fd); freqs_list = fm_radio_slsi::get_freqs(fd);
std::sort(freqs_list.begin(), freqs_list.end(), std::less<int>()); std::sort(freqs_list.begin(), freqs_list.end(), std::less<int>());
}); });
search_thread.detach();
break; break;
case SetType::SET_TYPE_FM_APP_PID: { case SetType::SET_TYPE_FM_APP_PID: {
client_observe_thread = std::thread([=] { client_observe_thread = new std::thread([=] {
pid_t pid = value; pid_t pid = value;
LOG_D("FM_APP_PID: received value %d", pid); 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); fm_radio_slsi::fm_thread_set(fd, 0);
close(); close();
}); });
client_observe_thread.detach();
break; break;
} }
default: default:

2
universal7885-common/apps/aidl-support/fm/default/FMDevControl.h
View file

@ -38,7 +38,7 @@ struct FMDevControl : public BnFMDevControl {
int fd; int fd;
unsigned int index; unsigned int index;
std::timed_mutex lock; std::timed_mutex lock;
std::thread search_thread, client_observe_thread; std::thread *search_thread, *client_observe_thread;
std::vector<int> freqs_list; std::vector<int> freqs_list;
middlestate_t *kMiddleState; middlestate_t *kMiddleState;
}; };

3
universal7885-common/apps/aidl-support/fm/default/FMSupport.cpp
View file

@ -101,7 +101,7 @@ constexpr const char *FM_FREQ_SEEK = FM_SYSFS_BASE "/radio_freq_seek";
NOT_SUPPORTED; NOT_SUPPORTED;
case SetType::SET_TYPE_FM_SEARCH_START: case SetType::SET_TYPE_FM_SEARCH_START:
lock.unlock(); lock.unlock();
search_thread = std::thread([this] { search_thread = new std::thread([this] {
const std::lock_guard<std::timed_mutex> guard(lock); const std::lock_guard<std::timed_mutex> guard(lock);
for (int i = 0; i < TRACK_SIZE; i++) { for (int i = 0; i < TRACK_SIZE; i++) {
FileIO::writeline(FM_FREQ_SEEK, "1 " + std::to_string(SYSFS_SPACING * 10)); 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>()); std::sort(freqs_list.begin(), freqs_list.end(), std::less<int>());
}); });
search_thread.detach();
break; break;
default: default:
break; break;

2
universal7885-common/apps/aidl-support/fm/default/FMSupport.h
View file

@ -35,7 +35,7 @@ public:
::ndk::ScopedAStatus close(void) override; ::ndk::ScopedAStatus close(void) override;
private: private:
std::timed_mutex lock; std::timed_mutex lock;
std::thread search_thread; std::thread *search_thread;
std::vector<int> freqs_list; std::vector<int> freqs_list;
unsigned int index; unsigned int index;
middlestate_t *kMiddleState; middlestate_t *kMiddleState;

6
universal7885-common/apps/aidl-support/fm/default/libfm_slsi-impl/FMDeviceControl.cpp
View file

@ -18,6 +18,7 @@
namespace fm_radio_slsi { namespace fm_radio_slsi {
static bool FMThread = false; static bool FMThread = false;
static std::thread *poll_thread = nullptr;
constexpr const char *FM_DEV_PATH = "/dev/radio0"; 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) { void fm_thread_set(const int fd, const bool enable) {
FMThread = enable; FMThread = enable;
if (enable) { if (enable) {
std::thread thread = std::thread(fm_thread, fd); poll_thread = new std::thread(fm_thread, fd);
thread.detach(); } else {
poll_thread = nullptr;
} }
} }