diff options
41 files changed, 74 insertions, 74 deletions
diff --git a/lldb/include/lldb/Breakpoint/Breakpoint.h b/lldb/include/lldb/Breakpoint/Breakpoint.h index 2ba0c97369c..5861a3be36e 100644 --- a/lldb/include/lldb/Breakpoint/Breakpoint.h +++ b/lldb/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" diff --git a/lldb/include/lldb/Breakpoint/BreakpointName.h b/lldb/include/lldb/Breakpoint/BreakpointName.h index 3a253ae2506..5e5a04fe911 100644 --- a/lldb/include/lldb/Breakpoint/BreakpointName.h +++ b/lldb/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" diff --git a/lldb/include/lldb/Core/Communication.h b/lldb/include/lldb/Core/Communication.h index 0d5b2842032..f129b8f879d 100644 --- a/lldb/include/lldb/Core/Communication.h +++ b/lldb/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" diff --git a/lldb/include/lldb/Core/Debugger.h b/lldb/include/lldb/Core/Debugger.h index f7de9ff281a..09f75ef0f8c 100644 --- a/lldb/include/lldb/Core/Debugger.h +++ b/lldb/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" diff --git a/lldb/include/lldb/Core/StructuredDataImpl.h b/lldb/include/lldb/Core/StructuredDataImpl.h index 819d1d9e5d2..2912f4ec7de 100644 --- a/lldb/include/lldb/Core/StructuredDataImpl.h +++ b/lldb/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" diff --git a/lldb/include/lldb/Interpreter/CommandInterpreter.h b/lldb/include/lldb/Interpreter/CommandInterpreter.h index 832ad4e463c..558246037ad 100644 --- a/lldb/include/lldb/Interpreter/CommandInterpreter.h +++ b/lldb/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 { diff --git a/lldb/include/lldb/Interpreter/ScriptInterpreter.h b/lldb/include/lldb/Interpreter/ScriptInterpreter.h index 68cfba8b951..640d9d34c61 100644 --- a/lldb/include/lldb/Interpreter/ScriptInterpreter.h +++ b/lldb/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" diff --git a/lldb/include/lldb/Target/Process.h b/lldb/include/lldb/Target/Process.h index c85061a9b67..20abbd67fa6 100644 --- a/lldb/include/lldb/Target/Process.h +++ b/lldb/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" diff --git a/lldb/include/lldb/Target/Target.h b/lldb/include/lldb/Target/Target.h index febd348d73a..b70f123989c 100644 --- a/lldb/include/lldb/Target/Target.h +++ b/lldb/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" diff --git a/lldb/include/lldb/Target/TargetList.h b/lldb/include/lldb/Target/TargetList.h index abfd16417f6..90c480745a0 100644 --- a/lldb/include/lldb/Target/TargetList.h +++ b/lldb/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 { diff --git a/lldb/include/lldb/Target/Thread.h b/lldb/include/lldb/Target/Thread.h index be8f7789cc7..2c88e3829a9 100644 --- a/lldb/include/lldb/Target/Thread.h +++ b/lldb/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" diff --git a/lldb/include/lldb/Core/Broadcaster.h b/lldb/include/lldb/Utility/Broadcaster.h index bf2b84d8e19..8763a63b0d5 100644 --- a/lldb/include/lldb/Core/Broadcaster.h +++ b/lldb/include/lldb/Utility/Broadcaster.h @@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#ifndef liblldb_Broadcaster_h_ -#define liblldb_Broadcaster_h_ +#ifndef LLDB_UTILITY_BROADCASTER_H +#define LLDB_UTILITY_BROADCASTER_H #include "lldb/Utility/ConstString.h" #include "lldb/lldb-defines.h" @@ -223,7 +223,7 @@ private: }; //---------------------------------------------------------------------- -/// @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 @@ -595,4 +595,4 @@ private: } // namespace lldb_private -#endif // liblldb_Broadcaster_h_ +#endif // LLDB_UTILITY_BROADCASTER_H diff --git a/lldb/include/lldb/Core/Event.h b/lldb/include/lldb/Utility/Event.h index 2a61b7a8861..d65043f564f 100644 --- a/lldb/include/lldb/Core/Event.h +++ b/lldb/include/lldb/Utility/Event.h @@ -7,10 +7,10 @@ // //===----------------------------------------------------------------------===// -#ifndef liblldb_Event_h_ -#define liblldb_Event_h_ +#ifndef LLDB_UTILITY_EVENT_H +#define LLDB_UTILITY_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" @@ -271,4 +271,4 @@ private: } // namespace lldb_private -#endif // liblldb_Event_h_ +#endif // LLDB_UTILITY_EVENT_H diff --git a/lldb/include/lldb/Core/Listener.h b/lldb/include/lldb/Utility/Listener.h index 5f8d5def016..11f89d7aeec 100644 --- a/lldb/include/lldb/Core/Listener.h +++ b/lldb/include/lldb/Utility/Listener.h @@ -7,10 +7,10 @@ // //===----------------------------------------------------------------------===// -#ifndef liblldb_Select_h_ -#define liblldb_Select_h_ +#ifndef LLDB_UTILITY_LISTENER_H +#define LLDB_UTILITY_LISTENER_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" @@ -158,4 +158,4 @@ private: } // namespace lldb_private -#endif // liblldb_Select_h_ +#endif // LLDB_UTILITY_LISTENER_H diff --git a/lldb/source/API/SBBroadcaster.cpp b/lldb/source/API/SBBroadcaster.cpp index 278576b5ddc..7868c38a818 100644 --- a/lldb/source/API/SBBroadcaster.cpp +++ b/lldb/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" diff --git a/lldb/source/API/SBCommandInterpreter.cpp b/lldb/source/API/SBCommandInterpreter.cpp index 5fda8d4fa01..a4a9a2ae748 100644 --- a/lldb/source/API/SBCommandInterpreter.cpp +++ b/lldb/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" diff --git a/lldb/source/API/SBEvent.cpp b/lldb/source/API/SBEvent.cpp index 65eb71c0928..0556f50f654 100644 --- a/lldb/source/API/SBEvent.cpp +++ b/lldb/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; diff --git a/lldb/source/API/SBListener.cpp b/lldb/source/API/SBListener.cpp index 50fed4e1ee7..e671d9f2ce8 100644 --- a/lldb/source/API/SBListener.cpp +++ b/lldb/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" diff --git a/lldb/source/API/SBStructuredData.cpp b/lldb/source/API/SBStructuredData.cpp index d901f915dad..277193424e9 100644 --- a/lldb/source/API/SBStructuredData.cpp +++ b/lldb/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" diff --git a/lldb/source/Core/CMakeLists.txt b/lldb/source/Core/CMakeLists.txt index d50a1ed78c7..15f2dcf6ed9 100644 --- a/lldb/source/Core/CMakeLists.txt +++ b/lldb/source/Core/CMakeLists.txt @@ -13,7 +13,6 @@ add_lldb_library(lldbCore AddressResolver.cpp AddressResolverFileLine.cpp AddressResolverName.cpp - Broadcaster.cpp Communication.cpp Debugger.cpp Disassembler.cpp @@ -21,13 +20,11 @@ add_lldb_library(lldbCore 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 diff --git a/lldb/source/Core/Communication.cpp b/lldb/source/Core/Communication.cpp index 3f678c45efe..afdabc0c7ce 100644 --- a/lldb/source/Core/Communication.cpp +++ b/lldb/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" diff --git a/lldb/source/Core/Debugger.cpp b/lldb/source/Core/Debugger.cpp index 6e86519b501..765b59c8865 100644 --- a/lldb/source/Core/Debugger.cpp +++ b/lldb/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" diff --git a/lldb/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.h b/lldb/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.h index f6133511531..64bfe551473 100644 --- a/lldb/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.h +++ b/lldb/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" diff --git a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h index 66fdcc0b7a8..f9102442de9 100644 --- a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h +++ b/lldb/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" diff --git a/lldb/source/Plugins/Process/Utility/HistoryThread.h b/lldb/source/Plugins/Process/Utility/HistoryThread.h index e441d4f8c92..dc24922e7c1 100644 --- a/lldb/source/Plugins/Process/Utility/HistoryThread.h +++ b/lldb/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" diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.h b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.h index 2284c4f263b..d2e21f4b2ab 100644 --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.h +++ b/lldb/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 { diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationReplayServer.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationReplayServer.cpp index a0ebf42d810..6a78eb20992 100644 --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationReplayServer.cpp +++ b/lldb/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" diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationReplayServer.h b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationReplayServer.h index 95f75dba490..5b840c8459b 100644 --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationReplayServer.h +++ b/lldb/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" diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h index a0c76c5dd90..14a5237e434 100644 --- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h +++ b/lldb/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" diff --git a/lldb/source/Target/Process.cpp b/lldb/source/Target/Process.cpp index 7ec772b079e..ba3dadabfa0 100644 --- a/lldb/source/Target/Process.cpp +++ b/lldb/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" diff --git a/lldb/source/Target/Target.cpp b/lldb/source/Target/Target.cpp index fe46c7b7d5d..d6e54defceb 100644 --- a/lldb/source/Target/Target.cpp +++ b/lldb/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; diff --git a/lldb/source/Target/TargetList.cpp b/lldb/source/Target/TargetList.cpp index e4b46f6e29a..5c83dfbebe2 100644 --- a/lldb/source/Target/TargetList.cpp +++ b/lldb/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" diff --git a/lldb/source/Core/Broadcaster.cpp b/lldb/source/Utility/Broadcaster.cpp index d2eff1341ab..5b9b99801b2 100644 --- a/lldb/source/Core/Broadcaster.cpp +++ b/lldb/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" diff --git a/lldb/source/Utility/CMakeLists.txt b/lldb/source/Utility/CMakeLists.txt index 07569074fd9..893d0326be9 100644 --- a/lldb/source/Utility/CMakeLists.txt +++ b/lldb/source/Utility/CMakeLists.txt @@ -45,6 +45,7 @@ add_lldb_library(lldbUtility ArchSpec.cpp Args.cpp Baton.cpp + Broadcaster.cpp Connection.cpp ConstString.cpp CompletionRequest.cpp @@ -53,10 +54,12 @@ add_lldb_library(lldbUtility DataEncoder.cpp DataExtractor.cpp Environment.cpp + Event.cpp FileSpec.cpp IOObject.cpp JSON.cpp LLDBAssert.cpp + Listener.cpp Log.cpp Logging.cpp NameMatches.cpp diff --git a/lldb/source/Core/Event.cpp b/lldb/source/Utility/Event.cpp index 6ae52c082c1..ad9f6e340f8 100644 --- a/lldb/source/Core/Event.cpp +++ b/lldb/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" diff --git a/lldb/source/Core/Listener.cpp b/lldb/source/Utility/Listener.cpp index 24813418b80..eba93ebf405 100644 --- a/lldb/source/Core/Listener.cpp +++ b/lldb/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" diff --git a/lldb/unittests/Core/CMakeLists.txt b/lldb/unittests/Core/CMakeLists.txt index 1d3ce6f2084..c188d5ab504 100644 --- a/lldb/unittests/Core/CMakeLists.txt +++ b/lldb/unittests/Core/CMakeLists.txt @@ -1,7 +1,4 @@ add_lldb_unittest(LLDBCoreTests - BroadcasterTest.cpp - EventTest.cpp - ListenerTest.cpp MangledTest.cpp RangeTest.cpp RichManglingContextTest.cpp diff --git a/lldb/unittests/Core/BroadcasterTest.cpp b/lldb/unittests/Utility/BroadcasterTest.cpp index e59999cc437..6c9d8771dd8 100644 --- a/lldb/unittests/Core/BroadcasterTest.cpp +++ b/lldb/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> diff --git a/lldb/unittests/Utility/CMakeLists.txt b/lldb/unittests/Utility/CMakeLists.txt index 9d606894466..b3970fe3d7b 100644 --- a/lldb/unittests/Utility/CMakeLists.txt +++ b/lldb/unittests/Utility/CMakeLists.txt @@ -3,14 +3,17 @@ add_lldb_unittest(UtilityTests 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 diff --git a/lldb/unittests/Core/EventTest.cpp b/lldb/unittests/Utility/EventTest.cpp index 32c6f4b1ce4..57e934ba8e4 100644 --- a/lldb/unittests/Core/EventTest.cpp +++ b/lldb/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" diff --git a/lldb/unittests/Core/ListenerTest.cpp b/lldb/unittests/Utility/ListenerTest.cpp index f548d767bce..fa49c258f5d 100644 --- a/lldb/unittests/Core/ListenerTest.cpp +++ b/lldb/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> |
