Use logging in client/service base classes. As these are template
classes the log macros need to be made more explicit about the used
logger object.
diff --git a/vsomeip/include/vsomeip_internal/client_impl.hpp b/vsomeip/include/vsomeip_internal/client_impl.hpp
index d36ca86..4aa383b 100644
--- a/vsomeip/include/vsomeip_internal/client_impl.hpp
+++ b/vsomeip/include/vsomeip_internal/client_impl.hpp
@@ -25,10 +25,10 @@
class endpoint;
-template <typename Protocol, int MaxBufferSize>
+template < typename Protocol, int MaxBufferSize >
class client_impl
: virtual public client,
- public participant_impl<MaxBufferSize> {
+ public participant_impl< MaxBufferSize > {
public:
client_impl(managing_proxy_impl *_owner, const endpoint *_location);
virtual ~client_impl();
diff --git a/vsomeip/include/vsomeip_internal/log_macros.hpp b/vsomeip/include/vsomeip_internal/log_macros.hpp
index e10573f..c1debe1 100644
--- a/vsomeip/include/vsomeip_internal/log_macros.hpp
+++ b/vsomeip/include/vsomeip_internal/log_macros.hpp
@@ -9,11 +9,11 @@
#ifndef LOG_MACROS_HPP_
#define VSOMEIP_INTERNAL_LOG_MACROS_HPPL_LOG_MACROS_HPP
-#define VSOMEIP_FATAL BOOST_LOG_SEV(logger_, boost::log::trivial::severity_level::fatal)
-#define VSOMEIP_ERROR BOOST_LOG_SEV(logger_, boost::log::trivial::severity_level::error)
-#define VSOMEIP_WARNING BOOST_LOG_SEV(logger_, boost::log::trivial::severity_level::warning)
-#define VSOMEIP_INFO BOOST_LOG_SEV(logger_, boost::log::trivial::severity_level::info)
-#define VSOMEIP_DEBUG BOOST_LOG_SEV(logger_, boost::log::trivial::severity_level::debug)
-#define VSOMEIP_TRACE BOOST_LOG_SEV(logger_, boost::log::trivial::severity_level::trace)
+#define VSOMEIP_FATAL BOOST_LOG_SEV(this->logger_, boost::log::trivial::severity_level::fatal)
+#define VSOMEIP_ERROR BOOST_LOG_SEV(this->logger_, boost::log::trivial::severity_level::error)
+#define VSOMEIP_WARNING BOOST_LOG_SEV(this->logger_, boost::log::trivial::severity_level::warning)
+#define VSOMEIP_INFO BOOST_LOG_SEV(this->logger_, boost::log::trivial::severity_level::info)
+#define VSOMEIP_DEBUG BOOST_LOG_SEV(this->logger_, boost::log::trivial::severity_level::debug)
+#define VSOMEIP_TRACE BOOST_LOG_SEV(this->logger_, boost::log::trivial::severity_level::trace)
#endif // VSOMEIP_INTERNAL_LOG_MACROS_HPP
diff --git a/vsomeip/src/vsomeip/client_impl.cpp b/vsomeip/src/vsomeip/client_impl.cpp
index e94d5ba..de6e022 100644
--- a/vsomeip/src/vsomeip/client_impl.cpp
+++ b/vsomeip/src/vsomeip/client_impl.cpp
@@ -68,7 +68,7 @@
bool is_queue_empty(packet_queue_.empty());
if (packetizer_.size() + _size > MaxBufferSize) {
- //VSOMEIP_INFO << "Implicit flush because new message cannot be buffered.";
+ VSOMEIP_WARNING << "Implicitly flushing.";
packet_queue_.push_back(packetizer_);
packetizer_.clear();
if (is_queue_empty && is_connected_)
diff --git a/vsomeip/src/vsomeip/participant_impl.cpp b/vsomeip/src/vsomeip/participant_impl.cpp
index f7bdbdb..e9a7d91 100644
--- a/vsomeip/src/vsomeip/participant_impl.cpp
+++ b/vsomeip/src/vsomeip/participant_impl.cpp
@@ -19,6 +19,8 @@
#include <vsomeip_internal/participant_impl.hpp>
#include <vsomeip_internal/managing_proxy_impl.hpp>
+#include <vsomeip_internal/log_macros.hpp>
+
namespace vsomeip {
template < int MaxBufferSize >
@@ -29,6 +31,8 @@
service_(_owner->get_service()),
is_supporting_magic_cookies_(false),
has_enabled_magic_cookies_(false) {
+
+ VSOMEIP_INFO << "BLUB";
}
template < int MaxBufferSize >
diff --git a/vsomeip/src/vsomeip/service_impl.cpp b/vsomeip/src/vsomeip/service_impl.cpp
index f7abec0..9fff11b 100644
--- a/vsomeip/src/vsomeip/service_impl.cpp
+++ b/vsomeip/src/vsomeip/service_impl.cpp
@@ -23,13 +23,13 @@
template < typename Protocol, int MaxBufferSize >
service_impl< Protocol, MaxBufferSize >::service_impl(managing_proxy_impl *_owner, const endpoint *_location)
- : participant_impl<MaxBufferSize>(_owner, _location),
+ : participant_impl< MaxBufferSize >(_owner, _location),
current_queue_(packet_queues_.end()),
flush_timer_(_owner->get_service()) {
}
template < typename Protocol, int MaxBufferSize >
-bool service_impl<Protocol, MaxBufferSize>::is_client() const {
+bool service_impl< Protocol, MaxBufferSize >::is_client() const {
return false;
}
@@ -53,6 +53,7 @@
current_queue_ = packet_queues_.find(_target);
if (target_packetizer.size() + _size > MaxBufferSize) {
+ VSOMEIP_WARNING << "Implicitly flushing.";
target_packet_queue.push_back(target_packetizer);
target_packetizer.clear();
