From 92bc628a7b7cbf141c2bbc7e4ea3eeac62cd30dd Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Fri, 24 Feb 2017 07:56:25 +0000 Subject: Fix mutex about can_frame. Wrong location about can frame mutex and adding around can socket init. Change-Id: I90c2200abf517ad4a9660c99a3ca02e52e069374 Signed-off-by: Romain Forlot --- src/can-utils.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/can-utils.cpp') diff --git a/src/can-utils.cpp b/src/can-utils.cpp index 5a845b31..8bf05670 100644 --- a/src/can-utils.cpp +++ b/src/can-utils.cpp @@ -187,18 +187,19 @@ int can_bus_t::init_can_dev() t = devices_name.size(); i=0; + std::lock_guard can_frame_lock(can_frame_mutex); for(const auto& device : devices_name) { can_bus_dev_t can_bus_device_handler(device); - can_bus_device_handler.open(); + (can_bus_device_handler.open()) ? i++ : ERROR(binder_interface, "Can't open device %s", device); can_bus_device_handler.start_reading(std::ref(*this)); - i++; } + can_frame_mutex.unlock(); NOTICE(binder_interface, "Initialized %d/%d can bus device(s)", i, t); return 0; } - ERROR(binder_interface, "init_can_dev: Error at CAN device initialization. No devices read into configuration file. Did you specify canbus JSON object ?"); + ERROR(binder_interface, "init_can_dev: Error at CAN device initialization. No devices read from configuration file. Did you specify canbus JSON object ?"); return 1; } -- cgit 1.2.3-korg