Author: labath Date: Mon Aug 15 04:53:08 2016 New Revision: 278664 URL: http://llvm.org/viewvc/llvm-project?rev=278664&view=rev Log: Fix a race in Broadcaster/Listener interaction
Summary: The following problem was occuring: - broadcaster B had two listeners: L1 and L2 (thread T1) - (T1) B has started to broadcast an event, it has locked a shared_ptr to L1 (in ListenerIterator()) - on another thread T2 the penultimate reference to L1 was destroyed (the transient object in B is now the last reference) - (T2) the last reference to L2 was destroyed as well - (T1) B has finished broadcasting the event to L1 and destroyed the last shared_ptr - (T1) this triggered the destructor, which called into B->RemoveListener() - (T1) all pointers in the m_listeners list were now stale, so RemoveListener emptied the list - (T1) Eventually control returned to the ListenerIterator() for doing broadcasting, which was still in the middle of iterating through the list - (T1) Only now, it was holding onto a dangling iterator. BOOM. I fix this issue by making sure nothing can interfere with the iterate-and-remove-expired-pointers loop, by moving this logic into a single function, which first locks (or clears) the whole list and then returns the list of valid and locked Listeners for further processing. Instead of std::list I use an llvm::SmallVector which should hopefully offset the fact that we create a copy of the list for the common case where we have only a few listeners (no heap allocations). A slight difference in behaviour is that now RemoveListener does not remove an element from the list -- it only sets it's mask to 0, which means it will be removed during the next iteration of GetListeners(). This is purely an implementation detail and it should not be externally noticable. I was not able to reproduce this bug reliably without inserting sleep statements into the code, so I do not add a test for it. Instead, I add some unit tests for the functions that I do modify. Reviewers: clayborg, jingham Subscribers: tberghammer, lldb-commits Differential Revision: https://reviews.llvm.org/D23406 Added: lldb/trunk/unittests/Core/BroadcasterTest.cpp Modified: lldb/trunk/include/lldb/Core/Broadcaster.h lldb/trunk/source/Core/Broadcaster.cpp lldb/trunk/unittests/Core/CMakeLists.txt Modified: lldb/trunk/include/lldb/Core/Broadcaster.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Broadcaster.h?rev=278664&r1=278663&r2=278664&view=diff ============================================================================== --- lldb/trunk/include/lldb/Core/Broadcaster.h (original) +++ lldb/trunk/include/lldb/Core/Broadcaster.h Mon Aug 15 04:53:08 2016 @@ -24,6 +24,8 @@ #include "lldb/lldb-private.h" #include "lldb/Core/ConstString.h" +#include "llvm/ADT/SmallVector.h" + namespace lldb_private { //---------------------------------------------------------------------- @@ -615,12 +617,11 @@ protected: //------------------------------------------------------------------ // //------------------------------------------------------------------ - typedef std::list< std::pair<lldb::ListenerWP,uint32_t> > collection; + typedef llvm::SmallVector<std::pair<lldb::ListenerWP, uint32_t>, 4> collection; typedef std::map<uint32_t, std::string> event_names_map; - void - ListenerIterator (std::function <bool (const lldb::ListenerSP &listener_sp, uint32_t &event_mask)> const &callback); - + llvm::SmallVector<std::pair<lldb::ListenerSP, uint32_t&>, 4> + GetListeners(); Broadcaster &m_broadcaster; ///< The broadcsater that this implements event_names_map m_event_names; ///< Optionally define event names for readability and logging for each event bit Modified: lldb/trunk/source/Core/Broadcaster.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/Broadcaster.cpp?rev=278664&r1=278663&r2=278664&view=diff ============================================================================== --- lldb/trunk/source/Core/Broadcaster.cpp (original) +++ lldb/trunk/source/Core/Broadcaster.cpp Mon Aug 15 04:53:08 2016 @@ -56,31 +56,25 @@ Broadcaster::CheckInWithManager () } } -void -Broadcaster::BroadcasterImpl::ListenerIterator (std::function <bool (const lldb::ListenerSP &listener_sp, uint32_t &event_mask)> const &callback) +llvm::SmallVector<std::pair<ListenerSP, uint32_t &>, 4> +Broadcaster::BroadcasterImpl::GetListeners() { - // Private iterator that should be used by everyone except BroadcasterImpl::RemoveListener(). - // We have weak pointers to our listeners which means that at any point the listener can - // expire which means we will need to take it out of our list. To take care of this, we - // iterate and check that the weak pointer can be made into a valid shared pointer before - // we call the callback. If the weak pointer has expired, we remove it from our list. - collection::iterator pos = m_listeners.begin(); - while (pos != m_listeners.end()) + llvm::SmallVector<std::pair<ListenerSP, uint32_t &>, 4> listeners; + listeners.reserve(m_listeners.size()); + + for (auto it = m_listeners.begin(); it != m_listeners.end();) { - lldb::ListenerSP curr_listener_sp(pos->first.lock()); - if (curr_listener_sp) + lldb::ListenerSP curr_listener_sp(it->first.lock()); + if (curr_listener_sp && it->second) { - if (callback(curr_listener_sp, pos->second)) - ++pos; // Keep iterating - else - return; // Done iterating + listeners.emplace_back(std::move(curr_listener_sp), it->second); + ++it; } else - { - // The listener has been expired. Remove this entry. - pos = m_listeners.erase(pos); - } + it = m_listeners.erase(it); } + + return listeners; } void @@ -91,11 +85,8 @@ Broadcaster::BroadcasterImpl::Clear() // Make sure the listener forgets about this broadcaster. We do // this in the broadcaster in case the broadcaster object initiates // the removal. - - ListenerIterator([this](const lldb::ListenerSP &curr_listener_sp, uint32_t &curr_event_mask) -> bool { - curr_listener_sp->BroadcasterWillDestruct (&m_broadcaster); - return true; // Keep iterating - }); + for(auto &pair : GetListeners()) + pair.first->BroadcasterWillDestruct (&m_broadcaster); m_listeners.clear(); } @@ -154,16 +145,16 @@ Broadcaster::BroadcasterImpl::AddListene bool handled = false; - ListenerIterator([this, &listener_sp, &handled, event_mask](const lldb::ListenerSP &curr_listener_sp, uint32_t &curr_event_mask) -> bool { - if (curr_listener_sp == listener_sp) + for(auto &pair: GetListeners()) + { + if (pair.first == listener_sp) { handled = true; - curr_event_mask |= event_mask; + pair.second |= event_mask; m_broadcaster.AddInitialEventsToListener (listener_sp, event_mask); - return false; // Stop iterating + break; } - return true; // Keep iterating - }); + } if (!handled) { @@ -187,55 +178,27 @@ Broadcaster::BroadcasterImpl::EventTypeH if (!m_hijacking_listeners.empty() && event_type & m_hijacking_masks.back()) return true; - if (m_listeners.empty()) - return false; - - bool result = false; - ListenerIterator([this, event_type, &result](const lldb::ListenerSP &curr_listener_sp, uint32_t &curr_event_mask) -> bool { - - if (curr_event_mask & event_type) - { - result = true; - return false; // Stop iterating - } - else - { - return true; // Keep iterating - } - }); - return result; + for(auto &pair: GetListeners()) + { + if (pair.second & event_type) + return true; + } + return false; } bool Broadcaster::BroadcasterImpl::RemoveListener (lldb_private::Listener *listener, uint32_t event_mask) { - if (listener) + if (!listener) + return false; + + std::lock_guard<std::recursive_mutex> guard(m_listeners_mutex); + for (auto &pair : GetListeners()) { - std::lock_guard<std::recursive_mutex> guard(m_listeners_mutex); - collection::iterator pos = m_listeners.begin(); - // See if we already have this listener, and if so, update its mask - while (pos != m_listeners.end()) + if (pair.first.get() == listener) { - lldb::ListenerSP curr_listener_sp(pos->first.lock()); - if (curr_listener_sp) - { - if (curr_listener_sp.get() == listener) - { - // Relinquish all event bits in "event_mask" - pos->second &= ~event_mask; - // If all bits have been relinquished then remove this listener - if (pos->second == 0) - m_listeners.erase (pos); - return true; - } - ++pos; - } - else - { - // The listener has been destroyed since we couldn't turn the std::weak_ptr - // into a valid shared pointer, so we can remove it. - pos = m_listeners.erase (pos); - } + pair.second &= ~event_mask; + return true; } } return false; @@ -302,16 +265,15 @@ Broadcaster::BroadcasterImpl::PrivateBro } else { + for (auto &pair : GetListeners()) + { + if (!(pair.second & event_type)) + continue; + if (unique && pair.first->PeekAtNextEventForBroadcasterWithType (&m_broadcaster, event_type)) + continue; - ListenerIterator([this, unique, event_type, &event_sp](const lldb::ListenerSP &curr_listener_sp, uint32_t &curr_event_mask) -> bool { - - if (event_type & curr_event_mask) - { - if (!unique || curr_listener_sp->PeekAtNextEventForBroadcasterWithType (&m_broadcaster, event_type) == nullptr) - curr_listener_sp->AddEvent (event_sp); - } - return true; // Keep iterating - }); + pair.first->AddEvent (event_sp); + } } } Added: lldb/trunk/unittests/Core/BroadcasterTest.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/Core/BroadcasterTest.cpp?rev=278664&view=auto ============================================================================== --- lldb/trunk/unittests/Core/BroadcasterTest.cpp (added) +++ lldb/trunk/unittests/Core/BroadcasterTest.cpp Mon Aug 15 04:53:08 2016 @@ -0,0 +1,72 @@ +//===-- BroadcasterTest.cpp -------------------------------------*- C++ -*-===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +#include "gtest/gtest.h" + +#include "lldb/Core/Broadcaster.h" +#include "lldb/Core/Listener.h" +#include "lldb/Host/Predicate.h" + +#include <thread> + +using namespace lldb; +using namespace lldb_private; + +TEST(BroadcasterTest, BroadcastEvent) +{ + EventSP event_sp; + Broadcaster broadcaster(nullptr, "test-broadcaster"); + + // Create a listener, sign it up, make sure it recieves an event. + ListenerSP listener1_sp = Listener::MakeListener("test-listener1"); + const uint32_t event_mask1 = 1; + EXPECT_EQ(event_mask1, listener1_sp->StartListeningForEvents(&broadcaster, event_mask1)); + broadcaster.BroadcastEvent(event_mask1, nullptr); + EXPECT_TRUE(listener1_sp->GetNextEvent(event_sp)); + EXPECT_EQ(event_mask1, event_sp->GetType()); + + { + // Add one more listener, make sure it works as well. + ListenerSP listener2_sp = Listener::MakeListener("test-listener2"); + const uint32_t event_mask2 = 1; + EXPECT_EQ(event_mask2, listener2_sp->StartListeningForEvents(&broadcaster, event_mask1 | event_mask2)); + broadcaster.BroadcastEvent(event_mask2, nullptr); + EXPECT_TRUE(listener2_sp->GetNextEvent(event_sp)); + EXPECT_EQ(event_mask2, event_sp->GetType()); + + // Both listeners should get this event. + broadcaster.BroadcastEvent(event_mask1, nullptr); + EXPECT_TRUE(listener1_sp->GetNextEvent(event_sp)); + EXPECT_EQ(event_mask1, event_sp->GetType()); + EXPECT_TRUE(listener2_sp->GetNextEvent(event_sp)); + EXPECT_EQ(event_mask2, event_sp->GetType()); + } + + // Now again only one listener should be active. + broadcaster.BroadcastEvent(event_mask1, nullptr); + EXPECT_TRUE(listener1_sp->GetNextEvent(event_sp)); + EXPECT_EQ(event_mask1, event_sp->GetType()); +} + +TEST(BroadcasterTest, EventTypeHasListeners) +{ + EventSP event_sp; + Broadcaster broadcaster(nullptr, "test-broadcaster"); + + const uint32_t event_mask = 1; + EXPECT_FALSE(broadcaster.EventTypeHasListeners(event_mask)); + + { + ListenerSP listener_sp = Listener::MakeListener("test-listener"); + EXPECT_EQ(event_mask, listener_sp->StartListeningForEvents(&broadcaster, event_mask)); + EXPECT_TRUE(broadcaster.EventTypeHasListeners(event_mask)); + } + + EXPECT_FALSE(broadcaster.EventTypeHasListeners(event_mask)); +} Modified: lldb/trunk/unittests/Core/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/Core/CMakeLists.txt?rev=278664&r1=278663&r2=278664&view=diff ============================================================================== --- lldb/trunk/unittests/Core/CMakeLists.txt (original) +++ lldb/trunk/unittests/Core/CMakeLists.txt Mon Aug 15 04:53:08 2016 @@ -1,4 +1,5 @@ add_lldb_unittest(LLDBCoreTests + BroadcasterTest.cpp DataExtractorTest.cpp ScalarTest.cpp ) _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
