summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-03-01 17:07:20 +0100
committerRomain Forlot <romain.forlot@iot.bzh>2017-03-01 17:07:20 +0100
commit5800150cb6611075b712c0104773335550dd66e6 (patch)
tree9debe5b00a068967c390fca245fadce7c6301238 /src
parentd10240e4c0d05ae6ccd633f7b82cbdd48ec27d7c (diff)
Wrong call to thread.join cause deadlock and thread termination.
Positionning the controlling boolean value will be enough for now Change-Id: I28e2d175e23370746cc30c2403829ebdeec7c2bb Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'src')
-rw-r--r--src/can-bus.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/can-bus.cpp b/src/can-bus.cpp
index 81dee9a7..52c81cf1 100644
--- a/src/can-bus.cpp
+++ b/src/can-bus.cpp
@@ -143,8 +143,6 @@ void can_bus_t::stop_threads()
{
is_decoding_ = false;
is_pushing_ = false;
- th_decoding_.join();
- th_pushing_.join();
}
int can_bus_t::init_can_dev()
@@ -396,7 +394,6 @@ void can_bus_dev_t::start_reading(can_bus_t& can_bus)
void can_bus_dev_t::stop_reading()
{
is_running_ = false;
- th_reading_.join();
}
void can_bus_dev_t::can_reader(can_bus_t& can_bus)