labath updated this revision to Diff 176948.
labath added a comment.
That's a good point, thanks for reminding me.
Re-clang-formatting the changed lines.
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D55361/new/
https://reviews.llvm.org/D55361
Files:
include/lldb/Breakpoint/Breakpoint.h
include/lldb/Breakpoint/BreakpointName.h
include/lldb/Core/Broadcaster.h
include/lldb/Core/Communication.h
include/lldb/Core/Debugger.h
include/lldb/Core/Event.h
include/lldb/Core/Listener.h
include/lldb/Core/StructuredDataImpl.h
include/lldb/Interpreter/CommandInterpreter.h
include/lldb/Interpreter/ScriptInterpreter.h
include/lldb/Target/Process.h
include/lldb/Target/Target.h
include/lldb/Target/TargetList.h
include/lldb/Target/Thread.h
include/lldb/Utility/Broadcaster.h
include/lldb/Utility/Event.h
include/lldb/Utility/Listener.h
source/API/SBBroadcaster.cpp
source/API/SBCommandInterpreter.cpp
source/API/SBEvent.cpp
source/API/SBListener.cpp
source/API/SBStructuredData.cpp
source/Core/Broadcaster.cpp
source/Core/CMakeLists.txt
source/Core/Communication.cpp
source/Core/Debugger.cpp
source/Core/Event.cpp
source/Core/Listener.cpp
source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.h
source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h
source/Plugins/Process/Utility/HistoryThread.h
source/Plugins/Process/gdb-remote/GDBRemoteCommunication.h
source/Plugins/Process/gdb-remote/GDBRemoteCommunicationReplayServer.cpp
source/Plugins/Process/gdb-remote/GDBRemoteCommunicationReplayServer.h
source/Plugins/Process/gdb-remote/ProcessGDBRemote.h
source/Target/Process.cpp
source/Target/Target.cpp
source/Target/TargetList.cpp
source/Utility/Broadcaster.cpp
source/Utility/CMakeLists.txt
source/Utility/Event.cpp
source/Utility/Listener.cpp
unittests/Core/BroadcasterTest.cpp
unittests/Core/CMakeLists.txt
unittests/Core/EventTest.cpp
unittests/Core/ListenerTest.cpp
unittests/Utility/BroadcasterTest.cpp
unittests/Utility/CMakeLists.txt
unittests/Utility/EventTest.cpp
unittests/Utility/ListenerTest.cpp
Index: unittests/Utility/ListenerTest.cpp
===================================================================
--- unittests/Utility/ListenerTest.cpp
+++ unittests/Utility/ListenerTest.cpp
@@ -9,8 +9,8 @@
#include "gtest/gtest.h"
-#include "lldb/Core/Broadcaster.h"
-#include "lldb/Core/Listener.h"
+#include "lldb/Utility/Broadcaster.h"
+#include "lldb/Utility/Listener.h"
#include <future>
#include <thread>
Index: unittests/Utility/EventTest.cpp
===================================================================
--- unittests/Utility/EventTest.cpp
+++ unittests/Utility/EventTest.cpp
@@ -7,7 +7,7 @@
//
//===----------------------------------------------------------------------===//
-#include "lldb/Core/Event.h"
+#include "lldb/Utility/Event.h"
#include "lldb/Utility/StreamString.h"
#include "gtest/gtest.h"
Index: unittests/Utility/CMakeLists.txt
===================================================================
--- unittests/Utility/CMakeLists.txt
+++ unittests/Utility/CMakeLists.txt
@@ -3,14 +3,17 @@
ArgsTest.cpp
OptionsWithRawTest.cpp
ArchSpecTest.cpp
+ BroadcasterTest.cpp
CleanUpTest.cpp
ConstStringTest.cpp
CompletionRequestTest.cpp
DataExtractorTest.cpp
EnvironmentTest.cpp
+ EventTest.cpp
FileSpecTest.cpp
FlagsTest.cpp
JSONTest.cpp
+ ListenerTest.cpp
LogTest.cpp
NameMatchesTest.cpp
PredicateTest.cpp
Index: unittests/Utility/BroadcasterTest.cpp
===================================================================
--- unittests/Utility/BroadcasterTest.cpp
+++ unittests/Utility/BroadcasterTest.cpp
@@ -9,9 +9,9 @@
#include "gtest/gtest.h"
-#include "lldb/Core/Broadcaster.h"
-#include "lldb/Core/Event.h"
-#include "lldb/Core/Listener.h"
+#include "lldb/Utility/Broadcaster.h"
+#include "lldb/Utility/Event.h"
+#include "lldb/Utility/Listener.h"
#include "lldb/Utility/Predicate.h"
#include <thread>
Index: unittests/Core/CMakeLists.txt
===================================================================
--- unittests/Core/CMakeLists.txt
+++ unittests/Core/CMakeLists.txt
@@ -1,7 +1,4 @@
add_lldb_unittest(LLDBCoreTests
- BroadcasterTest.cpp
- EventTest.cpp
- ListenerTest.cpp
MangledTest.cpp
RangeTest.cpp
RichManglingContextTest.cpp
Index: source/Utility/Listener.cpp
===================================================================
--- source/Utility/Listener.cpp
+++ source/Utility/Listener.cpp
@@ -7,11 +7,11 @@
//
//===----------------------------------------------------------------------===//
-#include "lldb/Core/Listener.h"
+#include "lldb/Utility/Listener.h"
-#include "lldb/Core/Broadcaster.h"
-#include "lldb/Core/Event.h"
+#include "lldb/Utility/Broadcaster.h"
#include "lldb/Utility/ConstString.h"
+#include "lldb/Utility/Event.h"
#include "lldb/Utility/Log.h"
#include "lldb/Utility/Logging.h"
Index: source/Utility/Event.cpp
===================================================================
--- source/Utility/Event.cpp
+++ source/Utility/Event.cpp
@@ -7,9 +7,9 @@
//
//===----------------------------------------------------------------------===//
-#include "lldb/Core/Event.h"
+#include "lldb/Utility/Event.h"
-#include "lldb/Core/Broadcaster.h"
+#include "lldb/Utility/Broadcaster.h"
#include "lldb/Utility/DataExtractor.h"
#include "lldb/Utility/Endian.h"
#include "lldb/Utility/Stream.h"
@@ -136,8 +136,9 @@
if (num_printable_chars == m_bytes.size())
s->Format("\"{0}\"", m_bytes);
else
- s->Format("{0:$[ ]@[x-2]}", llvm::make_range(
- reinterpret_cast<const uint8_t *>(m_bytes.data()),
+ s->Format(
+ "{0:$[ ]@[x-2]}",
+ llvm::make_range(reinterpret_cast<const uint8_t *>(m_bytes.data()),
reinterpret_cast<const uint8_t *>(m_bytes.data() +
m_bytes.size())));
}
Index: source/Utility/CMakeLists.txt
===================================================================
--- source/Utility/CMakeLists.txt
+++ source/Utility/CMakeLists.txt
@@ -45,6 +45,7 @@
ArchSpec.cpp
Args.cpp
Baton.cpp
+ Broadcaster.cpp
Connection.cpp
ConstString.cpp
CompletionRequest.cpp
@@ -53,9 +54,11 @@
DataEncoder.cpp
DataExtractor.cpp
Environment.cpp
+ Event.cpp
FileSpec.cpp
IOObject.cpp
JSON.cpp
+ Listener.cpp
LLDBAssert.cpp
Log.cpp
Logging.cpp
Index: source/Utility/Broadcaster.cpp
===================================================================
--- source/Utility/Broadcaster.cpp
+++ source/Utility/Broadcaster.cpp
@@ -7,10 +7,10 @@
//
//===----------------------------------------------------------------------===//
-#include "lldb/Core/Broadcaster.h"
+#include "lldb/Utility/Broadcaster.h"
-#include "lldb/Core/Event.h"
-#include "lldb/Core/Listener.h"
+#include "lldb/Utility/Event.h"
+#include "lldb/Utility/Listener.h"
#include "lldb/Utility/Log.h"
#include "lldb/Utility/Logging.h"
#include "lldb/Utility/Stream.h"
@@ -225,18 +225,16 @@
}
if (hijacking_listener_sp) {
- if (unique &&
- hijacking_listener_sp->PeekAtNextEventForBroadcasterWithType(
- &m_broadcaster, event_type))
+ if (unique && hijacking_listener_sp->PeekAtNextEventForBroadcasterWithType(
+ &m_broadcaster, event_type))
return;
hijacking_listener_sp->AddEvent(event_sp);
} else {
for (auto &pair : GetListeners()) {
if (!(pair.second & event_type))
continue;
- if (unique &&
- pair.first->PeekAtNextEventForBroadcasterWithType(&m_broadcaster,
- event_type))
+ if (unique && pair.first->PeekAtNextEventForBroadcasterWithType(
+ &m_broadcaster, event_type))
continue;
pair.first->AddEvent(event_sp);
Index: source/Target/TargetList.cpp
===================================================================
--- source/Target/TargetList.cpp
+++ source/Target/TargetList.cpp
@@ -8,9 +8,7 @@
//===----------------------------------------------------------------------===//
#include "lldb/Target/TargetList.h"
-#include "lldb/Core/Broadcaster.h"
#include "lldb/Core/Debugger.h"
-#include "lldb/Core/Event.h"
#include "lldb/Core/Module.h"
#include "lldb/Core/ModuleSpec.h"
#include "lldb/Host/Host.h"
@@ -20,6 +18,8 @@
#include "lldb/Symbol/ObjectFile.h"
#include "lldb/Target/Platform.h"
#include "lldb/Target/Process.h"
+#include "lldb/Utility/Broadcaster.h"
+#include "lldb/Utility/Event.h"
#include "lldb/Utility/State.h"
#include "lldb/Utility/TildeExpressionResolver.h"
#include "lldb/Utility/Timer.h"
Index: source/Target/Target.cpp
===================================================================
--- source/Target/Target.cpp
+++ source/Target/Target.cpp
@@ -7,7 +7,7 @@
//
//===----------------------------------------------------------------------===//
-#include <mutex>
+#include "lldb/Target/Target.h"
#include "Plugins/ExpressionParser/Clang/ClangASTSource.h"
#include "Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.h"
#include "Plugins/ExpressionParser/Clang/ClangPersistentVariables.h"
@@ -20,12 +20,11 @@
#include "lldb/Breakpoint/BreakpointResolverScripted.h"
#include "lldb/Breakpoint/Watchpoint.h"
#include "lldb/Core/Debugger.h"
-#include "lldb/Core/Event.h"
#include "lldb/Core/Module.h"
#include "lldb/Core/ModuleSpec.h"
#include "lldb/Core/PluginManager.h"
-#include "lldb/Core/Section.h"
#include "lldb/Core/SearchFilter.h"
+#include "lldb/Core/Section.h"
#include "lldb/Core/SourceManager.h"
#include "lldb/Core/StreamFile.h"
#include "lldb/Core/StructuredDataImpl.h"
@@ -50,15 +49,16 @@
#include "lldb/Target/SectionLoadList.h"
#include "lldb/Target/StackFrame.h"
#include "lldb/Target/SystemRuntime.h"
-#include "lldb/Target/Target.h"
#include "lldb/Target/Thread.h"
#include "lldb/Target/ThreadSpec.h"
+#include "lldb/Utility/Event.h"
#include "lldb/Utility/FileSpec.h"
#include "lldb/Utility/LLDBAssert.h"
#include "lldb/Utility/Log.h"
#include "lldb/Utility/State.h"
#include "lldb/Utility/StreamString.h"
#include "lldb/Utility/Timer.h"
+#include <mutex>
using namespace lldb;
using namespace lldb_private;
Index: source/Target/Process.cpp
===================================================================
--- source/Target/Process.cpp
+++ source/Target/Process.cpp
@@ -17,7 +17,6 @@
#include "lldb/Breakpoint/BreakpointLocation.h"
#include "lldb/Breakpoint/StoppointCallbackContext.h"
#include "lldb/Core/Debugger.h"
-#include "lldb/Core/Event.h"
#include "lldb/Core/Module.h"
#include "lldb/Core/ModuleSpec.h"
#include "lldb/Core/PluginManager.h"
@@ -62,6 +61,7 @@
#include "lldb/Target/ThreadPlan.h"
#include "lldb/Target/ThreadPlanBase.h"
#include "lldb/Target/UnixSignals.h"
+#include "lldb/Utility/Event.h"
#include "lldb/Utility/Log.h"
#include "lldb/Utility/NameMatches.h"
#include "lldb/Utility/SelectHelper.h"
Index: source/Plugins/Process/gdb-remote/ProcessGDBRemote.h
===================================================================
--- source/Plugins/Process/gdb-remote/ProcessGDBRemote.h
+++ source/Plugins/Process/gdb-remote/ProcessGDBRemote.h
@@ -16,7 +16,6 @@
#include <string>
#include <vector>
-#include "lldb/Core/Broadcaster.h"
#include "lldb/Core/LoadedModuleInfoList.h"
#include "lldb/Core/ModuleSpec.h"
#include "lldb/Core/ThreadSafeValue.h"
@@ -24,6 +23,7 @@
#include "lldb/Target/Process.h"
#include "lldb/Target/Thread.h"
#include "lldb/Utility/ArchSpec.h"
+#include "lldb/Utility/Broadcaster.h"
#include "lldb/Utility/ConstString.h"
#include "lldb/Utility/Status.h"
#include "lldb/Utility/StreamGDBRemote.h"
Index: source/Plugins/Process/gdb-remote/GDBRemoteCommunicationReplayServer.h
===================================================================
--- source/Plugins/Process/gdb-remote/GDBRemoteCommunicationReplayServer.h
+++ source/Plugins/Process/gdb-remote/GDBRemoteCommunicationReplayServer.h
@@ -15,8 +15,8 @@
#include "GDBRemoteCommunicationHistory.h"
// Project includes
-#include "lldb/Core/Broadcaster.h"
#include "lldb/Host/HostThread.h"
+#include "lldb/Utility/Broadcaster.h"
#include "lldb/lldb-private-forward.h"
#include "llvm/Support/Error.h"
Index: source/Plugins/Process/gdb-remote/GDBRemoteCommunicationReplayServer.cpp
===================================================================
--- source/Plugins/Process/gdb-remote/GDBRemoteCommunicationReplayServer.cpp
+++ source/Plugins/Process/gdb-remote/GDBRemoteCommunicationReplayServer.cpp
@@ -19,9 +19,9 @@
#include <cstring>
// Project includes
-#include "lldb/Core/Event.h"
#include "lldb/Host/ThreadLauncher.h"
#include "lldb/Utility/ConstString.h"
+#include "lldb/Utility/Event.h"
#include "lldb/Utility/FileSpec.h"
#include "lldb/Utility/StreamString.h"
#include "lldb/Utility/StringExtractorGDBRemote.h"
Index: source/Plugins/Process/gdb-remote/GDBRemoteCommunication.h
===================================================================
--- source/Plugins/Process/gdb-remote/GDBRemoteCommunication.h
+++ source/Plugins/Process/gdb-remote/GDBRemoteCommunication.h
@@ -19,12 +19,12 @@
#include <vector>
#include "lldb/Core/Communication.h"
-#include "lldb/Core/Listener.h"
#include "lldb/Host/HostThread.h"
#include "lldb/Utility/Args.h"
+#include "lldb/Utility/Listener.h"
#include "lldb/Utility/Predicate.h"
-#include "lldb/lldb-public.h"
#include "lldb/Utility/StringExtractorGDBRemote.h"
+#include "lldb/lldb-public.h"
namespace lldb_private {
namespace process_gdb_remote {
Index: source/Plugins/Process/Utility/HistoryThread.h
===================================================================
--- source/Plugins/Process/Utility/HistoryThread.h
+++ source/Plugins/Process/Utility/HistoryThread.h
@@ -12,12 +12,12 @@
#include <mutex>
-#include "lldb/Core/Broadcaster.h"
-#include "lldb/Core/Event.h"
#include "lldb/Core/UserSettingsController.h"
#include "lldb/Target/ExecutionContextScope.h"
#include "lldb/Target/StackFrameList.h"
#include "lldb/Target/Thread.h"
+#include "lldb/Utility/Broadcaster.h"
+#include "lldb/Utility/Event.h"
#include "lldb/Utility/UserID.h"
#include "lldb/lldb-private.h"
Index: source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h
===================================================================
--- source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h
+++ source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h
@@ -14,12 +14,12 @@
#include <list>
#include <vector>
-#include "lldb/Core/Broadcaster.h"
#include "lldb/Core/ThreadSafeValue.h"
#include "lldb/Host/HostThread.h"
#include "lldb/Target/Process.h"
#include "lldb/Target/Thread.h"
#include "lldb/Utility/ArchSpec.h"
+#include "lldb/Utility/Broadcaster.h"
#include "lldb/Utility/ConstString.h"
#include "lldb/Utility/Status.h"
#include "lldb/Utility/StreamString.h"
Index: source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.h
===================================================================
--- source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.h
+++ source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.h
@@ -15,8 +15,8 @@
#include <string>
#include "lldb/Core/Communication.h"
-#include "lldb/Core/Listener.h"
#include "lldb/Core/StreamBuffer.h"
+#include "lldb/Utility/Listener.h"
#include "lldb/Utility/Predicate.h"
#include "lldb/lldb-private.h"
Index: source/Core/Debugger.cpp
===================================================================
--- source/Core/Debugger.cpp
+++ source/Core/Debugger.cpp
@@ -10,9 +10,7 @@
#include "lldb/Core/Debugger.h"
#include "lldb/Breakpoint/Breakpoint.h"
-#include "lldb/Core/Event.h"
#include "lldb/Core/FormatEntity.h"
-#include "lldb/Core/Listener.h"
#include "lldb/Core/Mangled.h"
#include "lldb/Core/ModuleList.h"
#include "lldb/Core/PluginManager.h"
@@ -43,6 +41,8 @@
#include "lldb/Target/Thread.h"
#include "lldb/Target/ThreadList.h"
#include "lldb/Utility/AnsiTerminal.h"
+#include "lldb/Utility/Event.h"
+#include "lldb/Utility/Listener.h"
#include "lldb/Utility/Log.h"
#include "lldb/Utility/Reproducer.h"
#include "lldb/Utility/State.h"
Index: source/Core/Communication.cpp
===================================================================
--- source/Core/Communication.cpp
+++ source/Core/Communication.cpp
@@ -9,12 +9,12 @@
#include "lldb/Core/Communication.h"
-#include "lldb/Core/Event.h"
-#include "lldb/Core/Listener.h"
#include "lldb/Host/HostThread.h"
#include "lldb/Host/ThreadLauncher.h"
#include "lldb/Utility/Connection.h"
#include "lldb/Utility/ConstString.h"
+#include "lldb/Utility/Event.h"
+#include "lldb/Utility/Listener.h"
#include "lldb/Utility/Log.h"
#include "lldb/Utility/Logging.h"
#include "lldb/Utility/Status.h"
Index: source/Core/CMakeLists.txt
===================================================================
--- source/Core/CMakeLists.txt
+++ source/Core/CMakeLists.txt
@@ -13,7 +13,6 @@
AddressResolver.cpp
AddressResolverFileLine.cpp
AddressResolverName.cpp
- Broadcaster.cpp
Communication.cpp
Debugger.cpp
Disassembler.cpp
@@ -21,13 +20,11 @@
DumpRegisterValue.cpp
DynamicLoader.cpp
EmulateInstruction.cpp
- Event.cpp
FileLineResolver.cpp
FileSpecList.cpp
FormatEntity.cpp
Highlighter.cpp
IOHandler.cpp
- Listener.cpp
Mangled.cpp
Module.cpp
ModuleChild.cpp
Index: source/API/SBStructuredData.cpp
===================================================================
--- source/API/SBStructuredData.cpp
+++ source/API/SBStructuredData.cpp
@@ -11,9 +11,9 @@
#include "lldb/API/SBStream.h"
#include "lldb/API/SBStringList.h"
-#include "lldb/Core/Event.h"
#include "lldb/Core/StructuredDataImpl.h"
#include "lldb/Target/StructuredDataPlugin.h"
+#include "lldb/Utility/Event.h"
#include "lldb/Utility/Status.h"
#include "lldb/Utility/Stream.h"
#include "lldb/Utility/StructuredData.h"
Index: source/API/SBListener.cpp
===================================================================
--- source/API/SBListener.cpp
+++ source/API/SBListener.cpp
@@ -12,9 +12,9 @@
#include "lldb/API/SBDebugger.h"
#include "lldb/API/SBEvent.h"
#include "lldb/API/SBStream.h"
-#include "lldb/Core/Broadcaster.h"
#include "lldb/Core/Debugger.h"
-#include "lldb/Core/Listener.h"
+#include "lldb/Utility/Broadcaster.h"
+#include "lldb/Utility/Listener.h"
#include "lldb/Utility/Log.h"
#include "lldb/Utility/StreamString.h"
Index: source/API/SBEvent.cpp
===================================================================
--- source/API/SBEvent.cpp
+++ source/API/SBEvent.cpp
@@ -12,11 +12,11 @@
#include "lldb/API/SBStream.h"
#include "lldb/Breakpoint/Breakpoint.h"
-#include "lldb/Core/Event.h"
#include "lldb/Core/StreamFile.h"
#include "lldb/Interpreter/CommandInterpreter.h"
#include "lldb/Target/Process.h"
#include "lldb/Utility/ConstString.h"
+#include "lldb/Utility/Event.h"
#include "lldb/Utility/Stream.h"
using namespace lldb;
Index: source/API/SBCommandInterpreter.cpp
===================================================================
--- source/API/SBCommandInterpreter.cpp
+++ source/API/SBCommandInterpreter.cpp
@@ -9,11 +9,11 @@
#include "lldb/lldb-types.h"
-#include "lldb/Core/Listener.h"
#include "lldb/Interpreter/CommandInterpreter.h"
#include "lldb/Interpreter/CommandObjectMultiword.h"
#include "lldb/Interpreter/CommandReturnObject.h"
#include "lldb/Target/Target.h"
+#include "lldb/Utility/Listener.h"
#include "lldb/API/SBBroadcaster.h"
#include "lldb/API/SBCommandInterpreter.h"
Index: source/API/SBBroadcaster.cpp
===================================================================
--- source/API/SBBroadcaster.cpp
+++ source/API/SBBroadcaster.cpp
@@ -7,7 +7,7 @@
//
//===----------------------------------------------------------------------===//
-#include "lldb/Core/Broadcaster.h"
+#include "lldb/Utility/Broadcaster.h"
#include "lldb/Utility/Log.h"
#include "lldb/API/SBBroadcaster.h"
Index: include/lldb/Utility/Listener.h
===================================================================
--- include/lldb/Utility/Listener.h
+++ include/lldb/Utility/Listener.h
@@ -10,7 +10,7 @@
#ifndef liblldb_Select_h_
#define liblldb_Select_h_
-#include "lldb/Core/Broadcaster.h"
+#include "lldb/Utility/Broadcaster.h"
#include "lldb/Utility/Timeout.h"
#include "lldb/lldb-defines.h"
#include "lldb/lldb-forward.h"
Index: include/lldb/Utility/Event.h
===================================================================
--- include/lldb/Utility/Event.h
+++ include/lldb/Utility/Event.h
@@ -10,7 +10,7 @@
#ifndef liblldb_Event_h_
#define liblldb_Event_h_
-#include "lldb/Core/Broadcaster.h"
+#include "lldb/Utility/Broadcaster.h"
#include "lldb/Utility/ConstString.h"
#include "lldb/Utility/Predicate.h"
#include "lldb/Utility/StructuredData.h"
Index: include/lldb/Utility/Broadcaster.h
===================================================================
--- include/lldb/Utility/Broadcaster.h
+++ include/lldb/Utility/Broadcaster.h
@@ -223,7 +223,7 @@
};
//----------------------------------------------------------------------
-/// @class Broadcaster Broadcaster.h "lldb/Core/Broadcaster.h" An event
+/// @class Broadcaster Broadcaster.h "lldb/Utility/Broadcaster.h" An event
/// broadcasting class.
///
/// The Broadcaster class is designed to be subclassed by objects that wish to
@@ -548,11 +548,12 @@
llvm::SmallVector<std::pair<lldb::ListenerSP, uint32_t &>, 4>
GetListeners();
- Broadcaster &m_broadcaster; ///< The broadcaster that this implements
- event_names_map m_event_names; ///< Optionally define event names for
- ///readability and logging for each event bit
+ Broadcaster &m_broadcaster; ///< The broadcaster that this implements
+ event_names_map
+ m_event_names; ///< Optionally define event names for
+ /// readability and logging for each event bit
collection m_listeners; ///< A list of Listener / event_mask pairs that are
- ///listening to this broadcaster.
+ /// listening to this broadcaster.
std::recursive_mutex
m_listeners_mutex; ///< A mutex that protects \a m_listeners.
std::vector<lldb::ListenerSP> m_hijacking_listeners; // A simple mechanism
Index: include/lldb/Target/Thread.h
===================================================================
--- include/lldb/Target/Thread.h
+++ include/lldb/Target/Thread.h
@@ -15,12 +15,12 @@
#include <string>
#include <vector>
-#include "lldb/Core/Broadcaster.h"
-#include "lldb/Core/Event.h"
#include "lldb/Core/UserSettingsController.h"
#include "lldb/Target/ExecutionContextScope.h"
#include "lldb/Target/RegisterCheckpoint.h"
#include "lldb/Target/StackFrameList.h"
+#include "lldb/Utility/Broadcaster.h"
+#include "lldb/Utility/Event.h"
#include "lldb/Utility/StructuredData.h"
#include "lldb/Utility/UserID.h"
#include "lldb/lldb-private.h"
Index: include/lldb/Target/TargetList.h
===================================================================
--- include/lldb/Target/TargetList.h
+++ include/lldb/Target/TargetList.h
@@ -13,8 +13,8 @@
#include <mutex>
#include <vector>
-#include "lldb/Core/Broadcaster.h"
#include "lldb/Target/Target.h"
+#include "lldb/Utility/Broadcaster.h"
namespace lldb_private {
Index: include/lldb/Target/Target.h
===================================================================
--- include/lldb/Target/Target.h
+++ include/lldb/Target/Target.h
@@ -20,7 +20,6 @@
#include "lldb/Breakpoint/BreakpointName.h"
#include "lldb/Breakpoint/WatchpointList.h"
#include "lldb/Core/Architecture.h"
-#include "lldb/Core/Broadcaster.h"
#include "lldb/Core/Disassembler.h"
#include "lldb/Core/ModuleList.h"
#include "lldb/Core/UserSettingsController.h"
@@ -31,6 +30,7 @@
#include "lldb/Target/ProcessLaunchInfo.h"
#include "lldb/Target/SectionLoadHistory.h"
#include "lldb/Utility/ArchSpec.h"
+#include "lldb/Utility/Broadcaster.h"
#include "lldb/Utility/LLDBAssert.h"
#include "lldb/Utility/Timeout.h"
#include "lldb/lldb-public.h"
Index: include/lldb/Target/Process.h
===================================================================
--- include/lldb/Target/Process.h
+++ include/lldb/Target/Process.h
@@ -23,10 +23,7 @@
#include <vector>
#include "lldb/Breakpoint/BreakpointSiteList.h"
-#include "lldb/Core/Broadcaster.h"
#include "lldb/Core/Communication.h"
-#include "lldb/Core/Event.h"
-#include "lldb/Core/Listener.h"
#include "lldb/Core/LoadedModuleInfoList.h"
#include "lldb/Core/PluginInterface.h"
#include "lldb/Core/ThreadSafeValue.h"
@@ -43,6 +40,9 @@
#include "lldb/Target/QueueList.h"
#include "lldb/Target/ThreadList.h"
#include "lldb/Utility/ArchSpec.h"
+#include "lldb/Utility/Broadcaster.h"
+#include "lldb/Utility/Event.h"
+#include "lldb/Utility/Listener.h"
#include "lldb/Utility/NameMatches.h"
#include "lldb/Utility/Status.h"
#include "lldb/Utility/StructuredData.h"
Index: include/lldb/Interpreter/ScriptInterpreter.h
===================================================================
--- include/lldb/Interpreter/ScriptInterpreter.h
+++ include/lldb/Interpreter/ScriptInterpreter.h
@@ -13,9 +13,9 @@
#include "lldb/lldb-private.h"
#include "lldb/Breakpoint/BreakpointOptions.h"
-#include "lldb/Core/Broadcaster.h"
#include "lldb/Core/PluginInterface.h"
#include "lldb/Core/SearchFilter.h"
+#include "lldb/Utility/Broadcaster.h"
#include "lldb/Utility/Status.h"
#include "lldb/Utility/StructuredData.h"
Index: include/lldb/Interpreter/CommandInterpreter.h
===================================================================
--- include/lldb/Interpreter/CommandInterpreter.h
+++ include/lldb/Interpreter/CommandInterpreter.h
@@ -10,21 +10,21 @@
#ifndef liblldb_CommandInterpreter_h_
#define liblldb_CommandInterpreter_h_
-#include <mutex>
-#include "lldb/Core/Broadcaster.h"
#include "lldb/Core/Debugger.h"
-#include "lldb/Core/Event.h"
#include "lldb/Core/IOHandler.h"
#include "lldb/Interpreter/CommandAlias.h"
#include "lldb/Interpreter/CommandHistory.h"
#include "lldb/Interpreter/CommandObject.h"
#include "lldb/Interpreter/ScriptInterpreter.h"
#include "lldb/Utility/Args.h"
+#include "lldb/Utility/Broadcaster.h"
#include "lldb/Utility/CompletionRequest.h"
+#include "lldb/Utility/Event.h"
#include "lldb/Utility/Log.h"
#include "lldb/Utility/StringList.h"
#include "lldb/lldb-forward.h"
#include "lldb/lldb-private.h"
+#include <mutex>
namespace lldb_private {
Index: include/lldb/Core/StructuredDataImpl.h
===================================================================
--- include/lldb/Core/StructuredDataImpl.h
+++ include/lldb/Core/StructuredDataImpl.h
@@ -10,8 +10,8 @@
#ifndef liblldb_StructuredDataImpl_h_
#define liblldb_StructuredDataImpl_h_
-#include "lldb/Core/Event.h"
#include "lldb/Target/StructuredDataPlugin.h"
+#include "lldb/Utility/Event.h"
#include "lldb/Utility/Status.h"
#include "lldb/Utility/Stream.h"
#include "lldb/Utility/StructuredData.h"
Index: include/lldb/Core/Debugger.h
===================================================================
--- include/lldb/Core/Debugger.h
+++ include/lldb/Core/Debugger.h
@@ -15,7 +15,6 @@
#include <memory>
#include <vector>
-#include "lldb/Core/Broadcaster.h"
#include "lldb/Core/FormatEntity.h"
#include "lldb/Core/IOHandler.h"
#include "lldb/Core/SourceManager.h"
@@ -25,6 +24,7 @@
#include "lldb/Target/ExecutionContext.h"
#include "lldb/Target/Platform.h"
#include "lldb/Target/TargetList.h"
+#include "lldb/Utility/Broadcaster.h"
#include "lldb/Utility/ConstString.h"
#include "lldb/Utility/FileSpec.h"
#include "lldb/Utility/Status.h"
Index: include/lldb/Core/Communication.h
===================================================================
--- include/lldb/Core/Communication.h
+++ include/lldb/Core/Communication.h
@@ -10,8 +10,8 @@
#ifndef liblldb_Communication_h_
#define liblldb_Communication_h_
-#include "lldb/Core/Broadcaster.h"
#include "lldb/Host/HostThread.h"
+#include "lldb/Utility/Broadcaster.h"
#include "lldb/Utility/Timeout.h"
#include "lldb/lldb-defines.h"
#include "lldb/lldb-enumerations.h"
Index: include/lldb/Breakpoint/BreakpointName.h
===================================================================
--- include/lldb/Breakpoint/BreakpointName.h
+++ include/lldb/Breakpoint/BreakpointName.h
@@ -20,8 +20,8 @@
#include "lldb/Breakpoint/BreakpointLocationList.h"
#include "lldb/Breakpoint/BreakpointOptions.h"
#include "lldb/Breakpoint/Stoppoint.h"
-#include "lldb/Core/Event.h"
#include "lldb/Core/SearchFilter.h"
+#include "lldb/Utility/Event.h"
#include "lldb/Utility/Flags.h"
#include "lldb/Utility/StringList.h"
#include "lldb/Utility/StructuredData.h"
Index: include/lldb/Breakpoint/Breakpoint.h
===================================================================
--- include/lldb/Breakpoint/Breakpoint.h
+++ include/lldb/Breakpoint/Breakpoint.h
@@ -21,8 +21,8 @@
#include "lldb/Breakpoint/BreakpointName.h"
#include "lldb/Breakpoint/BreakpointOptions.h"
#include "lldb/Breakpoint/Stoppoint.h"
-#include "lldb/Core/Event.h"
#include "lldb/Core/SearchFilter.h"
+#include "lldb/Utility/Event.h"
#include "lldb/Utility/StringList.h"
#include "lldb/Utility/StructuredData.h"
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
