ich777/px4_drv
1
0
Fork 0
mirror of https://github.com/tsukumijima/px4_drv.git synced 2025-07-23 20:20:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

winusb: DriverHost_PX4: チューナーオープン処理のバグを修正

Browse Source 
同じチューナーを何度も開こうとして無限ループに陥ることのあるバグを修正

https://mevius.5ch.net/test/read.cgi/avi/1629554684/129
https://mevius.5ch.net/test/read.cgi/avi/1629554684/131
This commit is contained in:
nns779
2021-09-09 20:13:46 +09:00
parent 9e3483d1eb
commit cfe0712251
3 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
winusb/src/DriverHost_PX4/ctrl_server.cpp
View File

@@ -62,25 +62,12 @@ void CtrlServer::CtrlConnection::Worker() noexcept
} }
px4::command::CtrlOpenCmd *open = reinterpret_cast<px4::command::CtrlOpenCmd *>(buf.get()); px4::command::CtrlOpenCmd *open = reinterpret_cast<px4::command::CtrlOpenCmd *>(buf.get());
std::uint32_t data_id;
while (true) { receiver = receiver_manager_.SearchAndOpen(open->receiver_info, info, data_id);
receiver = receiver_manager_.Search(open->receiver_info, info); if (receiver) {
if (!receiver)
break;
if (receiver->Open())
continue;
std::uint32_t data_id;
if (!receiver_manager_.GenerateDataId(receiver, data_id)) {
receiver->Close();
continue;
}
open->receiver_info = info; open->receiver_info = info;
open->receiver_info.data_id = data_id; open->receiver_info.data_id = data_id;
break;
} }
open->status = (receiver) ? px4::command::CtrlStatusCode::SUCCEEDED : px4::command::CtrlStatusCode::FAILED; open->status = (receiver) ? px4::command::CtrlStatusCode::SUCCEEDED : px4::command::CtrlStatusCode::FAILED;

14
winusb/src/DriverHost_PX4/receiver_manager.cpp
View File

@@ -30,7 +30,7 @@ bool ReceiverManager::Unregister(px4::ReceiverBase *receiver)
static GUID empty_guid = { 0 }; static GUID empty_guid = { 0 };
px4::ReceiverBase* ReceiverManager::Search(px4::command::ReceiverInfo &key, px4::command::ReceiverInfo &info) px4::ReceiverBase* ReceiverManager::SearchAndOpen(px4::command::ReceiverInfo &key, px4::command::ReceiverInfo &info, std::uint32_t &data_id)
{ {
std::shared_lock<std::shared_mutex> lock(mtx_); std::shared_lock<std::shared_mutex> lock(mtx_);
@@ -58,9 +58,19 @@ px4::ReceiverBase* ReceiverManager::Search(px4::command::ReceiverInfo &key, px4:
if ((key.index >= 0) && (key.index != k.index)) if ((key.index >= 0) && (key.index != k.index))
continue; continue;
px4::ReceiverBase *r = it->first;
if (r->Open())
continue;
if (!GenerateDataId(r, data_id)) {
r->Close();
continue;
}
info = k; info = k;
return it->first; return r;
} }
return nullptr; return nullptr;

2
winusb/src/DriverHost_PX4/receiver_manager.hpp
View File

@@ -25,7 +25,7 @@ public:
bool Register(px4::command::ReceiverInfo &info, px4::ReceiverBase *receiver); bool Register(px4::command::ReceiverInfo &info, px4::ReceiverBase *receiver);
bool Unregister(px4::ReceiverBase *receiver); bool Unregister(px4::ReceiverBase *receiver);
px4::ReceiverBase* Search(px4::command::ReceiverInfo &key, px4::command::ReceiverInfo &info); px4::ReceiverBase* SearchAndOpen(px4::command::ReceiverInfo &key, px4::command::ReceiverInfo &info, std::uint32_t &data_id);
px4::ReceiverBase* SearchByDataId(std::uint32_t data_id); px4::ReceiverBase* SearchByDataId(std::uint32_t data_id);
bool GenerateDataId(px4::ReceiverBase *receiver, std::uint32_t &data_id); bool GenerateDataId(px4::ReceiverBase *receiver, std::uint32_t &data_id);
void ClearDataId(px4::ReceiverBase *receiver); void ClearDataId(px4::ReceiverBase *receiver);