mirrors/ugv_sdk
1
0
Fork 0
mirror of https://github.com/westonrobot/ugv_sdk synced 2023-04-08 06:32:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

async_port: fixed resource release order issue in StopService()

Browse Source
This commit is contained in:
Ruixiang Du
2021-09-02 17:06:42 +08:00
parent a8051f1bd9
commit c5faa29368
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/async_port/async_can.cpp
View File

@@ -76,15 +76,15 @@ bool AsyncCAN::SetupPort() {
} }
void AsyncCAN::StopService() { void AsyncCAN::StopService() {
// release port fd
const int close_result = ::close(can_fd_);
can_fd_ = -1;
// stop io thread // stop io thread
io_context_.stop(); io_context_.stop();
if (io_thread_.joinable()) io_thread_.join(); if (io_thread_.joinable()) io_thread_.join();
io_context_.reset(); io_context_.reset();
// release port fd
const int close_result = ::close(can_fd_);
can_fd_ = -1;
port_opened_ = false; port_opened_ = false;
} }

10
src/async_port/async_serial.cpp
View File

@@ -71,16 +71,16 @@ bool AsyncSerial::SetupPort() {
} }
void AsyncSerial::StopService() { void AsyncSerial::StopService() {
if (IsOpened()) {
serial_port_.cancel();
serial_port_.close();
}
// stop io thread // stop io thread
io_context_.stop(); io_context_.stop();
if (io_thread_.joinable()) io_thread_.join(); if (io_thread_.joinable()) io_thread_.join();
io_context_.reset(); io_context_.reset();
if (IsOpened()) {
serial_port_.cancel();
serial_port_.close();
}
port_opened_ = false; port_opened_ = false;
} }