diff options
Diffstat (limited to 'source/Utility/Listener.cpp')
| -rw-r--r-- | source/Utility/Listener.cpp | 69 |
1 files changed, 34 insertions, 35 deletions
diff --git a/source/Utility/Listener.cpp b/source/Utility/Listener.cpp index 50c56406c2ca..c2e537ba7dee 100644 --- a/source/Utility/Listener.cpp +++ b/source/Utility/Listener.cpp @@ -42,8 +42,8 @@ Listener::Listener(const char *name) m_events_mutex() { Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_OBJECT)); if (log != nullptr) - log->Printf("%p Listener::Listener('%s')", static_cast<void *>(this), - m_name.c_str()); + LLDB_LOGF(log, "%p Listener::Listener('%s')", static_cast<void *>(this), + m_name.c_str()); } Listener::~Listener() { @@ -51,9 +51,8 @@ Listener::~Listener() { Clear(); - if (log) - log->Printf("%p Listener::%s('%s')", static_cast<void *>(this), - __FUNCTION__, m_name.c_str()); + LLDB_LOGF(log, "%p Listener::%s('%s')", static_cast<void *>(this), + __FUNCTION__, m_name.c_str()); } void Listener::Clear() { @@ -78,9 +77,8 @@ void Listener::Clear() { manager_sp->RemoveListener(this); } - if (log) - log->Printf("%p Listener::%s('%s')", static_cast<void *>(this), - __FUNCTION__, m_name.c_str()); + LLDB_LOGF(log, "%p Listener::%s('%s')", static_cast<void *>(this), + __FUNCTION__, m_name.c_str()); } uint32_t Listener::StartListeningForEvents(Broadcaster *broadcaster, @@ -101,10 +99,11 @@ uint32_t Listener::StartListeningForEvents(Broadcaster *broadcaster, Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_EVENTS)); if (log != nullptr) - log->Printf("%p Listener::StartListeningForEvents (broadcaster = %p, " - "mask = 0x%8.8x) acquired_mask = 0x%8.8x for %s", - static_cast<void *>(this), static_cast<void *>(broadcaster), - event_mask, acquired_mask, m_name.c_str()); + LLDB_LOGF(log, + "%p Listener::StartListeningForEvents (broadcaster = %p, " + "mask = 0x%8.8x) acquired_mask = 0x%8.8x for %s", + static_cast<void *>(this), static_cast<void *>(broadcaster), + event_mask, acquired_mask, m_name.c_str()); return acquired_mask; } @@ -132,12 +131,13 @@ uint32_t Listener::StartListeningForEvents(Broadcaster *broadcaster, Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_EVENTS)); if (log != nullptr) { void **pointer = reinterpret_cast<void **>(&callback); - log->Printf("%p Listener::StartListeningForEvents (broadcaster = %p, " - "mask = 0x%8.8x, callback = %p, user_data = %p) " - "acquired_mask = 0x%8.8x for %s", - static_cast<void *>(this), static_cast<void *>(broadcaster), - event_mask, *pointer, static_cast<void *>(callback_user_data), - acquired_mask, m_name.c_str()); + LLDB_LOGF(log, + "%p Listener::StartListeningForEvents (broadcaster = %p, " + "mask = 0x%8.8x, callback = %p, user_data = %p) " + "acquired_mask = 0x%8.8x for %s", + static_cast<void *>(this), static_cast<void *>(broadcaster), + event_mask, *pointer, static_cast<void *>(callback_user_data), + acquired_mask, m_name.c_str()); } return acquired_mask; @@ -202,9 +202,9 @@ void Listener::BroadcasterManagerWillDestruct(BroadcasterManagerSP manager_sp) { void Listener::AddEvent(EventSP &event_sp) { Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_EVENTS)); if (log != nullptr) - log->Printf("%p Listener('%s')::AddEvent (event_sp = {%p})", - static_cast<void *>(this), m_name.c_str(), - static_cast<void *>(event_sp.get())); + LLDB_LOGF(log, "%p Listener('%s')::AddEvent (event_sp = {%p})", + static_cast<void *>(this), m_name.c_str(), + static_cast<void *>(event_sp.get())); std::lock_guard<std::mutex> guard(m_events_mutex); m_events.push_back(event_sp); @@ -290,14 +290,15 @@ bool Listener::FindNextEventInternal( event_sp = *pos; if (log != nullptr) - log->Printf("%p '%s' Listener::FindNextEventInternal(broadcaster=%p, " - "broadcaster_names=%p[%u], event_type_mask=0x%8.8x, " - "remove=%i) event %p", - static_cast<void *>(this), GetName(), - static_cast<void *>(broadcaster), - static_cast<const void *>(broadcaster_names), - num_broadcaster_names, event_type_mask, remove, - static_cast<void *>(event_sp.get())); + LLDB_LOGF(log, + "%p '%s' Listener::FindNextEventInternal(broadcaster=%p, " + "broadcaster_names=%p[%u], event_type_mask=0x%8.8x, " + "remove=%i) event %p", + static_cast<void *>(this), GetName(), + static_cast<void *>(broadcaster), + static_cast<const void *>(broadcaster_names), + num_broadcaster_names, event_type_mask, remove, + static_cast<void *>(event_sp.get())); if (remove) { m_events.erase(pos); @@ -366,15 +367,13 @@ bool Listener::GetEventInternal( if (result == std::cv_status::timeout) { log = lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_EVENTS); - if (log) - log->Printf("%p Listener::GetEventInternal() timed out for %s", - static_cast<void *>(this), m_name.c_str()); + LLDB_LOGF(log, "%p Listener::GetEventInternal() timed out for %s", + static_cast<void *>(this), m_name.c_str()); return false; } else if (result != std::cv_status::no_timeout) { log = lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_EVENTS); - if (log) - log->Printf("%p Listener::GetEventInternal() unknown error for %s", - static_cast<void *>(this), m_name.c_str()); + LLDB_LOGF(log, "%p Listener::GetEventInternal() unknown error for %s", + static_cast<void *>(this), m_name.c_str()); return false; } } |