First draft about lock/wait thread management.

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

diff --git a/src/can_reader.cpp b/src/can_reader.cpp
index aab47b6..f984c70 100644 (file)
--- a/src/can_reader.cpp
+++ b/src/can_reader.cpp
@@ -16,20 +16,25 @@
  * 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(can_bus_t &can_bus)
+void can_reader(can_bus_dev_t &can_bus_dev, can_bus_t& can_bus)
 {
        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);
+               std::unique_lock<std::mutex> can_frame_lock(can_frame_mutex);
+               new_can_frame.wait(can_frame_lock);
+                       can_message.convert_from_canfd_frame(can_bus_dev.read());
+               can_frame_mutex.unlock();
+
+               std::lock_guard<std::mutex> can_message_lock(can_message_mutex);
+                       can_bus.push_new_can_message(can_message);
+               can_message_mutex.unlock();
+               new_can_message.notify_one();
        }
 }
\ No newline at end of file