summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-02-24 07:56:25 +0000
committerRomain Forlot <romain.forlot@iot.bzh>2017-02-24 07:56:25 +0000
commit92bc628a7b7cbf141c2bbc7e4ea3eeac62cd30dd (patch)
tree33da9227dfdd15634e3830b935d444171e9c181b
parent035493b81d5bb6d909de05e9a06a0f61588a35aa (diff)
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 <romain.forlot@iot.bzh>
-rw-r--r--src/can-utils.cpp7
-rw-r--r--src/low-can-binding.cpp6
2 files changed, 8 insertions, 5 deletions
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<std::mutex> 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;
}
diff --git a/src/low-can-binding.cpp b/src/low-can-binding.cpp
index 233f002a..2fee1146 100644
--- a/src/low-can-binding.cpp
+++ b/src/low-can-binding.cpp
@@ -60,20 +60,22 @@ can_bus_t *can_bus_handler;
int can_frame_received(sd_event_source *s, int fd, uint32_t revents, void *userdata)
{
can_bus_dev_t *can_bus_dev = (can_bus_dev_t*)userdata;
- std::lock_guard<std::mutex> can_frame_lock(can_frame_mutex);
/* Notify reading thread that there is something to read */
if ((revents & EPOLLIN) != 0) {
new_can_frame.notify_one();
}
- /* check if error or hangup */
+ /* check if error or hangup and reopen the socket and event_loop.
+ * socket is protected by a mutex */
if ((revents & (EPOLLERR|EPOLLRDHUP|EPOLLHUP)) != 0)
{
+ std::lock_guard<std::mutex> can_frame_lock(can_frame_mutex);
sd_event_source_unref(s);
can_bus_dev->close();
can_bus_dev->open();
can_bus_dev->start_reading(*can_bus_handler);
+ can_bus_dev->event_loop_connection();
}
return 0;