Fix: wrong format to display can_message_t information
[apps/agl-service-can-low-level.git] / src / can-bus.cpp
index 29cadba..6279a2a 100644 (file)
@@ -18,6 +18,7 @@
 #include "can-bus.hpp"
 
 #include <map>
+#include <cerrno>
 #include <vector>
 #include <string>
 #include <fcntl.h>
@@ -28,6 +29,9 @@
 #include <json-c/json.h>
 #include <linux/can/raw.h>
 
+#include "can-decoder.hpp"
+#include "openxc-utils.hpp"
+
 extern "C"
 {
        #include <afb/afb-binding.h>
@@ -39,33 +43,106 @@ extern "C"
 *
 *********************************************************************************/
 
-can_bus_t::can_bus_t(int& conf_file)
+can_bus_t::can_bus_t(int conf_file)
        : conf_file_{conf_file}
 {
 }
 
-void can_bus_t::start_threads()
+void can_bus_t::can_decode_message()
 {
-       th_decoding_ = std::thread(can_decode_message, std::ref(*this));
-       is_decoding_ = true;
-       th_pushing_ = std::thread(can_event_push, std::ref(*this));
-       is_pushing_ = true;
+       can_message_t can_message;
+       std::vector <CanSignal> signals;
+       std::vector <CanSignal>::iterator signals_i;
+       openxc_VehicleMessage vehicle_message;
+       openxc_DynamicField search_key, decoded_message;
+
+       decoder_t decoder;
+
+       DEBUG(binder_interface, "Beginning of decoding thread.");
+       while(is_decoding_)
+       {
+               {
+                       std::unique_lock<std::mutex> can_message_lock(can_message_mutex_);
+                       new_can_message_.wait(can_message_lock);
+                       can_message = next_can_message();
+               }
+
+               /* First we have to found which CanSignal it is */
+               search_key = build_DynamicField((double)can_message.get_id());
+               signals = find_can_signals(search_key);
+
+               /* Decoding the message ! Don't kill the messenger ! */
+               for(auto& sig : signals)
+               {
+                       {
+                               std::lock_guard<std::mutex> subscribed_signals_lock(get_subscribed_signals_mutex());
+                               std::map<std::string, struct afb_event> subscribed_signals = get_subscribed_signals();
+                               const auto& it_event = subscribed_signals.find(sig.genericName);
+                               
+                               if(it_event != subscribed_signals.end() && afb_event_is_valid(it_event->second))
+                               {
+                                       decoded_message = decoder.translateSignal(sig, can_message, getSignals());
+
+                                       openxc_SimpleMessage s_message = build_SimpleMessage(sig.genericName, decoded_message);
+                                       vehicle_message = build_VehicleMessage_with_SimpleMessage(openxc_DynamicField_Type::openxc_DynamicField_Type_NUM, s_message);
+
+                                       std::lock_guard<std::mutex> decoded_can_message_lock(decoded_can_message_mutex_);
+                                       push_new_vehicle_message(vehicle_message);
+                               }
+                               new_decoded_can_message_.notify_one();
+                       }
+               }
+       }
 }
 
-void can_bus_t::stop_threads()
+void can_bus_t::can_event_push()
 {
-       is_decoding_ = false;
-       is_pushing_ = false;
+       openxc_VehicleMessage v_message;
+       openxc_SimpleMessage s_message;
+       json_object* jo;
+       
+       DEBUG(binder_interface, "Beginning of the pushing thread");
+       while(is_pushing_)
+       {
+               {
+                       std::unique_lock<std::mutex> decoded_can_message_lock(decoded_can_message_mutex_);
+                       new_decoded_can_message_.wait(decoded_can_message_lock);
+                       v_message = next_vehicle_message();
+               }
+
+               s_message = get_simple_message(v_message);
+
+               {
+                       std::lock_guard<std::mutex> subscribed_signals_lock(get_subscribed_signals_mutex());
+                       std::map<std::string, struct afb_event> subscribed_signals = get_subscribed_signals();
+                       const auto& it_event = subscribed_signals.find(s_message.name);
+                       if(it_event != subscribed_signals.end() && afb_event_is_valid(it_event->second))
+                       {
+                               jo = json_object_new_object();
+                               jsonify_simple(s_message, jo);
+                               afb_event_push(it_event->second, jo);
+                       }
+               }
+       }
 }
 
-bool can_bus_t::is_decoding()
+void can_bus_t::start_threads()
 {
-       return is_decoding_;
+       is_decoding_ = true;
+       th_decoding_ = std::thread(&can_bus_t::can_decode_message, this);
+       if(!th_decoding_.joinable())
+               is_decoding_ = false;
+       
+       is_pushing_ = true;
+       th_pushing_ = std::thread(&can_bus_t::can_event_push, this);
+       if(!th_pushing_.joinable())
+               is_pushing_ = false;
 }
 
-bool can_bus_t::is_pushing()
+void can_bus_t::stop_threads()
 {
-       return is_pushing_;
+       is_decoding_ = false;
+       is_pushing_ = false;
 }
 
 int can_bus_t::init_can_dev()
@@ -83,14 +160,15 @@ int can_bus_t::init_can_dev()
 
                for(const auto& device : devices_name)
                {
-                       can_bus_dev_t can_bus_device_handler(device);
-                       if (can_bus_device_handler.open())
+                       can_devices_m_[device] = std::make_shared<can_bus_dev_t>(device);
+                       if (can_devices_m_[device]->open() == 0)
                        {
                                i++;
-                               can_bus_device_handler.start_reading(std::ref(*this));
+                               DEBUG(binder_interface, "Start reading thread");
+                               can_devices_m_[device]->start_reading(*this);
                        }
                        else
-                               ERROR(binder_interface, "Can't open device %s", device);
+                               ERROR(binder_interface, "Can't open device %s", device.c_str());
                }
 
                NOTICE(binder_interface, "Initialized %d/%d can bus device(s)", i, t);
@@ -117,7 +195,7 @@ std::vector<std::string> can_bus_t::read_conf()
                std::fread(&fd_conf_content[0], 1, fd_conf_content.size(), fd);
                std::fclose(fd);
 
-               DEBUG(binder_interface, "Conf file content : %s", fd_conf_content.c_str());
+               DEBUG(binder_interface, "Configuration file content : %s", fd_conf_content.c_str());
                jo = json_tokener_parse(fd_conf_content.c_str());
 
                if (jo == NULL || !json_object_object_get_ex(jo, "canbus", &canbus))
@@ -154,16 +232,6 @@ std::mutex& can_bus_t::get_can_message_mutex()
        return can_message_mutex_;
 }
 
-std::condition_variable& can_bus_t::get_new_decoded_can_message()
-{
-       return new_decoded_can_message_;
-}
-
-std::mutex& can_bus_t::get_decoded_can_message_mutex()
-{
-       return decoded_can_message_mutex_;
-}
-
 can_message_t can_bus_t::next_can_message()
 {
        can_message_t can_msg;
@@ -172,7 +240,7 @@ can_message_t can_bus_t::next_can_message()
        {
                can_msg = can_message_q_.front();
                can_message_q_.pop();
-               DEBUG(binder_interface, "next_can_message: Here is the next can message : id %d, length %d", can_msg.get_id(), can_msg.get_length());
+               DEBUG(binder_interface, "next_can_message: Here is the next can message : id %X, length %X", can_msg.get_id(), can_msg.get_length());
                return can_msg;
        }
        
@@ -186,11 +254,6 @@ void can_bus_t::push_new_can_message(const can_message_t& can_msg)
        can_message_q_.push(can_msg);
 }
 
-bool can_bus_t::has_can_message() const
-{
-       return has_can_message_;
-}
-
 openxc_VehicleMessage can_bus_t::next_vehicle_message()
 {
        openxc_VehicleMessage v_msg;
@@ -214,9 +277,9 @@ void can_bus_t::push_new_vehicle_message(const openxc_VehicleMessage& v_msg)
        has_vehicle_message_ = true;
 }
 
-bool can_bus_t::has_vehicle_message() const
+std::map<std::string, std::shared_ptr<can_bus_dev_t>> can_bus_t::get_can_devices()
 {
-       return has_vehicle_message_;
+       return can_devices_m_;
 }
 
 /********************************************************************************
@@ -226,50 +289,57 @@ bool can_bus_t::has_vehicle_message() const
 *********************************************************************************/
 
 can_bus_dev_t::can_bus_dev_t(const std::string &dev_name)
-       : device_name_{dev_name}
+       : device_name_{dev_name}, can_socket_{-1}
 {
 }
 
 int can_bus_dev_t::open()
 {
        const int canfd_on = 1;
+       const int timestamp_on = 1;
        struct ifreq ifr;
-       struct timeval timeout = {1, 0};
+       struct timeval timeout;
 
        DEBUG(binder_interface, "CAN Handler socket : %d", can_socket_);
        if (can_socket_ >= 0)
                return 0;
 
        can_socket_ = ::socket(PF_CAN, SOCK_RAW, CAN_RAW);
+       DEBUG(binder_interface, "CAN Handler socket correctly initialized : %d", can_socket_);
        if (can_socket_ < 0)
-       {
-               ERROR(binder_interface, "socket could not be created");
-       }
+               ERROR(binder_interface, "socket could not be created. Error was : %s", ::strerror(errno));
        else
        {
                /* Set timeout for read */
                ::setsockopt(can_socket_, SOL_SOCKET, SO_RCVTIMEO, (char *)&timeout, sizeof(timeout));
+               /* Set timestamp for receveid frame */
+               if (::setsockopt(can_socket_, SOL_SOCKET, SO_TIMESTAMP, &timestamp_on, sizeof(timestamp_on)) < 0)
+                       WARNING(binder_interface, "setsockopt SO_TIMESTAMP error: %s", ::strerror(errno));
+               DEBUG(binder_interface, "Switch CAN Handler socket to use fd mode");
                /* try to switch the socket into CAN_FD mode */
                if (::setsockopt(can_socket_, SOL_CAN_RAW, CAN_RAW_FD_FRAMES, &canfd_on, sizeof(canfd_on)) < 0)
                {
                        NOTICE(binder_interface, "Can not switch into CAN Extended frame format.");
                        is_fdmode_on_ = false;
                } else {
+                       DEBUG(binder_interface, "Correctly set up CAN socket to use FD frames.");
                        is_fdmode_on_ = true;
                }
 
                /* Attempts to open a socket to CAN bus */
                ::strcpy(ifr.ifr_name, device_name_.c_str());
+               DEBUG(binder_interface, "ifr_name is : %s", ifr.ifr_name);
                if(::ioctl(can_socket_, SIOCGIFINDEX, &ifr) < 0)
-                       ERROR(binder_interface, "ioctl failed");
+                       ERROR(binder_interface, "ioctl failed. Error was : %s", strerror(errno));
                else
                {
                        txAddress_.can_family = AF_CAN;
                        txAddress_.can_ifindex = ifr.ifr_ifindex;
 
                        /* And bind it to txAddress */
+                       DEBUG(binder_interface, "Bind the socket");
                        if (::bind(can_socket_, (struct sockaddr *)&txAddress_, sizeof(txAddress_)) < 0)
-                               ERROR(binder_interface, "Bind failed");
+                               ERROR(binder_interface, "Bind failed. %s", strerror(errno));
                        else
                                return 0;
                }
@@ -289,7 +359,7 @@ canfd_frame can_bus_dev_t::read()
 {
        ssize_t nbytes;
        //int maxdlen;
-       canfd_frame canfd_frame;
+       struct canfd_frame cfd;
 
        /* Test that socket is really opened */
        if (can_socket_ < 0)
@@ -298,42 +368,49 @@ canfd_frame can_bus_dev_t::read()
                is_running_ = false;
        }
 
-       nbytes = ::read(can_socket_, &canfd_frame, CANFD_MTU);
+       nbytes = ::read(can_socket_, &cfd, CANFD_MTU);
 
-       switch(nbytes)
+       /* if we did not fit into CAN sized messages then stop_reading. */
+       if (nbytes != CANFD_MTU && nbytes != CAN_MTU)
        {
-               case CANFD_MTU:
-                       DEBUG(binder_interface, "read_can: Got an CAN FD frame with length %d", canfd_frame.len);
-                       //maxdlen = CANFD_MAX_DLEN;
-                       break;
-               case CAN_MTU:
-                       DEBUG(binder_interface, "read_can: Got a legacy CAN frame with length %d", canfd_frame.len);
-                       //maxdlen = CAN_MAX_DLEN;
-                       break;
-               default:
-                       if (errno == ENETDOWN)
-                                       ERROR(binder_interface, "read_can: %s binder_interface down", device_name_);
-                       ERROR(binder_interface, "read_can: Error reading CAN bus");
-                       ::memset(&canfd_frame, 0, sizeof(canfd_frame));
-                       is_running_ = false;
-                       break;
+               if (errno == ENETDOWN)
+                       ERROR(binder_interface, "read: %s CAN device down", device_name_);
+               ERROR(binder_interface, "read: Incomplete CAN(FD) frame");
+               ::memset(&cfd, 0, sizeof(cfd));
        }
-       
-       return canfd_frame;
+
+       return cfd;
 }
 
 void can_bus_dev_t::start_reading(can_bus_t& can_bus)
 {
-       th_reading_ = std::thread(can_reader, std::ref(*this), std::ref(can_bus));
+       DEBUG(binder_interface, "Launching reading thread");
        is_running_ = true;
+       th_reading_ = std::thread(&can_bus_dev_t::can_reader, this, std::ref(can_bus));
+       if(!th_reading_.joinable())
+               is_running_ = false;
 }
 
-/*
- * Return is_running_ bool
- */
-bool can_bus_dev_t::is_running()
+void can_bus_dev_t::stop_reading()
 {
-       return is_running_;
+       is_running_ = false;
+}
+
+void can_bus_dev_t::can_reader(can_bus_t& can_bus)
+{
+       can_message_t can_message;
+
+       DEBUG(binder_interface, "Beginning of reading thread");
+       while(is_running_)
+       {
+               can_message.convert_from_canfd_frame(read());
+
+               {
+                       std::lock_guard<std::mutex> can_message_lock(can_bus.get_can_message_mutex());
+                       can_bus.push_new_can_message(can_message);
+               }
+               can_bus.get_new_can_message().notify_one();
+       }
 }
 
 int can_bus_dev_t::send_can_message(can_message_t& can_msg)