Improve mutex lock logic.

[apps/low-level-can-service.git] / src / can_reader.cpp

diff --git a/src/can_reader.cpp b/src/can_reader.cpp
index 8088937..7ae981b 100644 (file)
--- a/src/can_reader.cpp
+++ b/src/can_reader.cpp
@@ -16,20 +16,23 @@
  * limitations under the License.
  */
 
-#include <linux/can.h>
-#include <linux/can/raw.h>
+#include "can_reader.hpp"
 
-#include <afb/afb-binding.h>
+#include "low-can-binding.hpp"
+#include "can-utils.hpp"
 
-#include "can-utils.h"
-
-void can_reader(CanBus_t &can_bus)
+void can_reader(can_bus_dev_t &can_bus_dev, can_bus_t& can_bus)
 {
-       CanMessage_c can_message;
+       can_message_t can_message;
 
-       while(can_bus.is_running())
+       while(can_bus_dev.is_running())
        {
-               can_message.convert_from_canfd_frame(canbus.read());
-               can_bus.insert_new_can_message(can_message);
+               can_message.convert_from_canfd_frame(can_bus_dev.read());
+
+               {
+                       std::lock_guard<std::mutex> can_message_lock(can_message_mutex);
+                       can_bus.push_new_can_message(can_message);
+               }
+               new_can_message.notify_one();
        }
 }
\ No newline at end of file