From: Romain Forlot Date: Wed, 9 Aug 2017 14:10:41 +0000 (+0200) Subject: Improve debugging diag and empty event X-Git-Tag: dab/4.0.1~1 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=3bc37571d22cc6cbf9c35fc26c0aff5aea887d82;p=apps%2Flow-level-can-service.git Improve debugging diag and empty event Change-Id: I64dd5b3f241a9696dc759dffff884772e3f72fd7 Signed-off-by: Romain Forlot --- diff --git a/low-can-binding/binding/low-can-subscription.cpp b/low-can-binding/binding/low-can-subscription.cpp index 5488cc5..d94a77b 100644 --- a/low-can-binding/binding/low-can-subscription.cpp +++ b/low-can-binding/binding/low-can-subscription.cpp @@ -108,22 +108,26 @@ const std::shared_ptr low_can_subscription_t::get_diagnost /// @brief Return the CAN signal name and empty string if not found /// or no CAN signal subscribed -const std::string low_can_subscription_t::get_name() const +const std::string low_can_socket_t::get_name() const { if (can_signal_ != nullptr) return can_signal_->get_name(); + else if (!diagnostic_message_.empty()) + return "diagnostic_messages"; + AFB_WARNING("No diagnostics messages nor CAN signals registered in that subscription. Name empty ! It's a bug to be reported."); return ""; } /// @brief Return name from a diagnostic message from a PID /// /// @param[in] pid - Diagnostic message PID -const std::string low_can_subscription_t::get_name(uint32_t pid) const +const std::string low_can_socket_t::get_name(uint32_t pid) const { if (!diagnostic_message_.empty()) return get_diagnostic_message(pid)->get_name() ; + AFB_WARNING("No diagnostics messages nor CAN signals registered in that subscription. Name empty ! It's a bug to be reported."); return ""; } @@ -303,4 +307,4 @@ int low_can_subscription_t::create_rx_filter(utils::simple_bcm_msg& bcm_msg) } return 0; -} \ No newline at end of file +}