Beginning of work of get central configuration object

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

diff --git a/src/can/can-bus.cpp b/src/can/can-bus.cpp
index d46092b..699cb8c 100644 (file)
--- a/src/can/can-bus.cpp
+++ b/src/can/can-bus.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "can-bus.hpp"
+#include "can/can-bus.hpp"
 
 #include <map>
 #include <cerrno>
@@ -29,8 +29,8 @@
 #include <json-c/json.h>
 #include <linux/can/raw.h>
 
-#include "can-decoder.hpp"
-#include "openxc-utils.hpp"
+#include "can/can-decoder.hpp"
+#include "utils/openxc-utils.hpp"
 
 extern "C"
 {
@@ -74,7 +74,7 @@ void can_bus_t::can_decode_message()
        while(is_decoding_)
        {
                std::unique_lock<std::mutex> can_message_lock(can_message_mutex_);
-               new_can_message_.wait(can_message_lock);
+               new_can_message_cv_.wait(can_message_lock);
                can_message = next_can_message();
        
                /* First we have to found which CanSignal it is */
@@ -92,7 +92,7 @@ void can_bus_t::can_decode_message()
                        DEBUG(binder_interface, "Operator[] key char: %s, event valid? %d", sig.generic_name, afb_event_is_valid(s[sig.generic_name]));
                        DEBUG(binder_interface, "Operator[] key string: %s, event valid? %d", sig.generic_name, afb_event_is_valid(s[std::string(sig.generic_name)]));
                        DEBUG(binder_interface, "Nb elt matched char: %d", (int)s.count(sig.generic_name));
-                       DEBUG(binder_interface, "Nb elt matched string: %d", (int)s.count(std::string(sig.generic_name))); */
+                       DEBUG(binder_interface, "Nb elt matched string: %d", (int)s.count(std::string(sig.generic_name)));*/
                        if( s.find(sig->generic_name) != s.end() && afb_event_is_valid(s[sig->generic_name]))
                        {
                                decoded_message = decoder.translateSignal(*sig, can_message, get_can_signals());
@@ -144,7 +144,7 @@ void can_bus_t::can_event_push()
        */
 void can_bus_t::start_threads()
 {
-       v_ = true;
+       is_decoding_ = true;
        th_decoding_ = std::thread(&can_bus_t::can_decode_message, this);
        if(!th_decoding_.joinable())
                is_decoding_ = false;
@@ -263,9 +263,9 @@ std::vector<std::string> can_bus_t::read_conf()
 }
 
 /**
-* @brief return new_can_message_ member
+* @brief return new_can_message_cv_ member
 *
-* @return  return new_can_message_ member
+* @return  return new_can_message_cv_ member
 */
 std::condition_variable& can_bus_t::get_new_can_message_cv()
 {
@@ -363,10 +363,9 @@ std::map<std::string, std::shared_ptr<can_bus_dev_t>> can_bus_t::get_can_devices
 *
 * @param const string representing the device name into the linux /dev tree
 */
-can_bus_dev_t::can_bus_dev_t(const std::string &dev_name)
+can_bus_dev_t::can_bus_dev_t(const std::string& dev_name)
        : device_name_{dev_name}, can_socket_{-1}
-{
-}
+{}
 
 /**
 * @brief Open the can socket and returning it 
@@ -518,7 +517,7 @@ void can_bus_dev_t::can_reader(can_bus_t& can_bus)
                        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_cv_().notify_one();
+               can_bus.get_new_can_message_cv().notify_one();
        }
 }