diff options
Diffstat (limited to 'src/components/hmi_message_handler/src/mqueue_adapter.cc')
| -rw-r--r-- | src/components/hmi_message_handler/src/mqueue_adapter.cc | 83 |
1 files changed, 40 insertions, 43 deletions
diff --git a/src/components/hmi_message_handler/src/mqueue_adapter.cc b/src/components/hmi_message_handler/src/mqueue_adapter.cc index b1524b5f03..825c27c048 100644 --- a/src/components/hmi_message_handler/src/mqueue_adapter.cc +++ b/src/components/hmi_message_handler/src/mqueue_adapter.cc @@ -1,34 +1,34 @@ /* -* Copyright (c) 2014, Ford Motor Company -* All rights reserved. -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions are met: -* -* Redistributions of source code must retain the above copyright notice, this -* list of conditions and the following disclaimer. -* -* Redistributions in binary form must reproduce the above copyright notice, -* this list of conditions and the following -* disclaimer in the documentation and/or other materials provided with the -* distribution. -* -* Neither the name of the Ford Motor Company nor the names of its contributors -* may be used to endorse or promote products derived from this software -* without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -* POSSIBILITY OF SUCH DAMAGE. -*/ + * Copyright (c) 2014, Ford Motor Company + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following + * disclaimer in the documentation and/or other materials provided with the + * distribution. + * + * Neither the name of the Ford Motor Company nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ #include "hmi_message_handler/mqueue_adapter.h" #include "hmi_message_handler/hmi_message_handler.h" @@ -61,7 +61,7 @@ class ReceiverThreadDelegate : public threads::ThreadDelegate { continue; } const std::string message_string(buffer, buffer + size); - LOG4CXX_INFO(logger_, "Message: " << message_string); + LOG4CXX_DEBUG(logger_, "Message: " << message_string); MessageSharedPointer message(new application_manager::Message( protocol_handler::MessagePriority::kDefault)); message->set_json_message(message_string); @@ -78,7 +78,7 @@ MqueueAdapter::MqueueAdapter(HMIMessageHandler* hmi_message_handler) : HMIMessageAdapter(hmi_message_handler), sdl_to_hmi_mqueue_(-1), hmi_to_sdl_mqueue_(-1), - receiver_thread_() { + receiver_thread_(NULL) { mq_attr mq_attributes; mq_attributes.mq_maxmsg = kMqueueSize; mq_attributes.mq_msgsize = kMqueueMessageSize; @@ -96,18 +96,17 @@ MqueueAdapter::MqueueAdapter(HMIMessageHandler* hmi_message_handler) << kHmiToSdlQueue << ", error " << errno); return; } - ReceiverThreadDelegate* receiver_thread_delegate = - new ReceiverThreadDelegate(hmi_to_sdl_mqueue_, hmi_message_handler); - receiver_thread_ = - threads::CreateThread("MqueueAdapter", receiver_thread_delegate); + receiver_thread_delegate_ = new ReceiverThreadDelegate(hmi_to_sdl_mqueue_, + hmi_message_handler); + receiver_thread_ = threads::CreateThread("MqueueAdapter", + receiver_thread_delegate_); receiver_thread_->start(); } MqueueAdapter::~MqueueAdapter() { - if (receiver_thread_) { - receiver_thread_->stop(); - threads::DeleteThread(receiver_thread_); - } + receiver_thread_->join(); + delete receiver_thread_delegate_; + threads::DeleteThread(receiver_thread_); if (-1 != hmi_to_sdl_mqueue_) mq_close(hmi_to_sdl_mqueue_); if (-1 != sdl_to_hmi_mqueue_) mq_close(sdl_to_hmi_mqueue_); mq_unlink(kHmiToSdlQueue); @@ -115,7 +114,7 @@ MqueueAdapter::~MqueueAdapter() { } void MqueueAdapter::SendMessageToHMI(const MessageSharedPointer message) { - LOG4CXX_TRACE_ENTER(logger_); + LOG4CXX_AUTO_TRACE(logger_); if (-1 == sdl_to_hmi_mqueue_) { LOG4CXX_ERROR(logger_, "Message queue is not opened"); @@ -131,8 +130,6 @@ void MqueueAdapter::SendMessageToHMI(const MessageSharedPointer message) { LOG4CXX_ERROR(logger_, "Could not send message, error " << errno); return; } - - LOG4CXX_TRACE_EXIT(logger_); } void MqueueAdapter::SubscribeTo() { |