From 3294de270e86c0d060f6ca3cf43294286ae68222 Mon Sep 17 00:00:00 2001 From: Zachary Turner Date: Wed, 18 Mar 2015 18:20:42 +0000 Subject: [PATCH] Move lldb-log.cpp to core/Logging.cpp So that we don't have to update every single #include in the entire codebase to #include this new header (which used to get included by lldb-private-log.h, we automatically #include "Logging.h" from within "Log.h". llvm-svn: 232653 --- lldb/include/lldb/Core/Log.h | 1 + lldb/include/lldb/{lldb-private-log.h => Core/Logging.h} | 8 ++++---- lldb/include/lldb/lldb-private.h | 1 - lldb/lldb.xcodeproj/project.pbxproj | 12 ++++++------ lldb/source/Breakpoint/Breakpoint.cpp | 1 - lldb/source/Breakpoint/BreakpointLocation.cpp | 1 - lldb/source/Breakpoint/BreakpointResolver.cpp | 1 - lldb/source/Breakpoint/BreakpointResolverAddress.cpp | 1 - lldb/source/Breakpoint/BreakpointResolverFileLine.cpp | 1 - lldb/source/Breakpoint/BreakpointResolverFileRegex.cpp | 1 - lldb/source/CMakeLists.txt | 1 - lldb/source/Commands/CommandObjectLog.cpp | 2 -- lldb/source/Core/AddressResolver.cpp | 1 - lldb/source/Core/AddressResolverFileLine.cpp | 1 - lldb/source/Core/AddressResolverName.cpp | 1 - lldb/source/Core/Broadcaster.cpp | 1 - lldb/source/Core/CMakeLists.txt | 1 + lldb/source/Core/Communication.cpp | 1 - lldb/source/Core/ConnectionMachPort.cpp | 1 - lldb/source/Core/ConnectionSharedMemory.cpp | 1 - lldb/source/Core/DataBufferMemoryMap.cpp | 1 - lldb/source/Core/FileLineResolver.cpp | 1 - lldb/source/Core/Listener.cpp | 1 - lldb/source/{lldb-log.cpp => Core/Logging.cpp} | 5 ++--- lldb/source/Core/Module.cpp | 1 - lldb/source/Expression/ClangModulesDeclVendor.cpp | 1 + lldb/source/Expression/DWARFExpression.cpp | 2 -- lldb/source/Host/common/NativeRegisterContext.cpp | 2 -- lldb/source/Host/posix/ConnectionFileDescriptorPosix.cpp | 1 - lldb/source/Plugins/ObjectFile/JIT/ObjectFileJIT.cpp | 1 - lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp | 1 - lldb/source/Plugins/Process/Linux/NativeThreadLinux.cpp | 1 - lldb/source/Symbol/Block.cpp | 2 -- lldb/source/Symbol/ObjectFile.cpp | 1 - lldb/source/Target/Process.cpp | 3 --- lldb/source/Target/Target.cpp | 1 - lldb/source/Target/Thread.cpp | 1 - lldb/source/Target/ThreadPlanCallFunction.cpp | 1 - lldb/source/Target/ThreadPlanCallUserExpression.cpp | 1 - lldb/source/Target/ThreadPlanRunToAddress.cpp | 1 - lldb/source/Target/ThreadPlanStepInRange.cpp | 2 -- lldb/source/Target/ThreadPlanStepInstruction.cpp | 1 - lldb/source/Target/ThreadPlanStepOut.cpp | 1 - lldb/source/Target/ThreadPlanStepOverBreakpoint.cpp | 1 - lldb/source/Target/ThreadPlanStepOverRange.cpp | 2 -- lldb/source/Target/ThreadPlanStepRange.cpp | 2 -- lldb/source/Target/ThreadPlanStepThrough.cpp | 1 - lldb/source/Target/ThreadPlanStepUntil.cpp | 1 - lldb/source/lldb.cpp | 1 - lldb/tools/lldb-server/CMakeLists.txt | 1 - lldb/tools/lldb-server/lldb-gdbserver.cpp | 1 - lldb/tools/lldb-server/lldb-platform.cpp | 1 - 52 files changed, 15 insertions(+), 68 deletions(-) rename lldb/include/lldb/{lldb-private-log.h => Core/Logging.h} (95%) rename lldb/source/{lldb-log.cpp => Core/Logging.cpp} (99%) diff --git a/lldb/include/lldb/Core/Log.h b/lldb/include/lldb/Core/Log.h index b389946..119b29b 100644 --- a/lldb/include/lldb/Core/Log.h +++ b/lldb/include/lldb/Core/Log.h @@ -22,6 +22,7 @@ #include "lldb/lldb-private.h" #include "lldb/Core/ConstString.h" #include "lldb/Core/Flags.h" +#include "lldb/Core/Logging.h" #include "lldb/Core/PluginInterface.h" //---------------------------------------------------------------------- diff --git a/lldb/include/lldb/lldb-private-log.h b/lldb/include/lldb/Core/Logging.h similarity index 95% rename from lldb/include/lldb/lldb-private-log.h rename to lldb/include/lldb/Core/Logging.h index dc37ae2..e153ce7 100644 --- a/lldb/include/lldb/lldb-private-log.h +++ b/lldb/include/lldb/Core/Logging.h @@ -1,4 +1,4 @@ -//===-- lldb-private-log.h --------------------------------------*- C++ -*-===// +//===-- Logging.h -----------------------------------------------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#ifndef liblldb_lldb_private_log_h_ -#define liblldb_lldb_private_log_h_ +#ifndef liblldb_Core_Logging_h_ +#define liblldb_Core_Logging_h_ // C Includes // C++ Includes @@ -90,4 +90,4 @@ ListLogCategories (Stream *strm); } // namespace lldb_private -#endif // liblldb_lldb_private_log_h_ +#endif // liblldb_Core_Logging_h_ diff --git a/lldb/include/lldb/lldb-private.h b/lldb/include/lldb/lldb-private.h index 83a8e14..930683a 100644 --- a/lldb/include/lldb/lldb-private.h +++ b/lldb/include/lldb/lldb-private.h @@ -23,7 +23,6 @@ #include "lldb/lldb-public.h" #include "lldb/lldb-private-enumerations.h" #include "lldb/lldb-private-interfaces.h" -#include "lldb/lldb-private-log.h" #include "lldb/lldb-private-types.h" namespace lldb_private { diff --git a/lldb/lldb.xcodeproj/project.pbxproj b/lldb/lldb.xcodeproj/project.pbxproj index b8416a6..d60a99b 100644 --- a/lldb/lldb.xcodeproj/project.pbxproj +++ b/lldb/lldb.xcodeproj/project.pbxproj @@ -561,7 +561,6 @@ 2689011313353E8200698AC0 /* PseudoTerminal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2682F16A115EDA0D00CCFF99 /* PseudoTerminal.cpp */; }; 268901161335BBC300698AC0 /* liblldb-core.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2689FFCA13353D7A00698AC0 /* liblldb-core.a */; }; 2689FFDA13353D9D00698AC0 /* lldb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26BC7E7410F1B85900F91463 /* lldb.cpp */; }; - 2689FFDB13353DA300698AC0 /* lldb-log.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26BC7E7510F1B85900F91463 /* lldb-log.cpp */; }; 2689FFEF13353DB600698AC0 /* Breakpoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26BC7E0A10F1B83100F91463 /* Breakpoint.cpp */; }; 2689FFF113353DB600698AC0 /* BreakpointID.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26BC7E0B10F1B83100F91463 /* BreakpointID.cpp */; }; 2689FFF313353DB600698AC0 /* BreakpointIDList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26BC7E0C10F1B83100F91463 /* BreakpointIDList.cpp */; }; @@ -684,6 +683,7 @@ 33E5E8421A672A240024ED68 /* StringConvert.cpp in CopyFiles */ = {isa = PBXBuildFile; fileRef = 33E5E8411A672A240024ED68 /* StringConvert.cpp */; }; 33E5E8461A6736D30024ED68 /* StringConvert.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 33E5E8451A6736D30024ED68 /* StringConvert.h */; }; 33E5E8471A674FB60024ED68 /* StringConvert.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 33E5E8411A672A240024ED68 /* StringConvert.cpp */; }; + 3F8160A61AB9F7DD001DA9DF /* Logging.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F8160A51AB9F7DD001DA9DF /* Logging.cpp */; }; 3FDFDDBD199C3A06009756A7 /* FileAction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3FDFDDBC199C3A06009756A7 /* FileAction.cpp */; }; 3FDFDDBF199D345E009756A7 /* FileCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3FDFDDBE199D345E009756A7 /* FileCache.cpp */; }; 3FDFDDC6199D37ED009756A7 /* FileSystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3FDFDDC5199D37ED009756A7 /* FileSystem.cpp */; }; @@ -1855,7 +1855,6 @@ 26BC7D5A10F1B77400F91463 /* DataExtractor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DataExtractor.h; path = include/lldb/Core/DataExtractor.h; sourceTree = ""; }; 26BC7D5B10F1B77400F91463 /* DataBufferHeap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DataBufferHeap.h; path = include/lldb/Core/DataBufferHeap.h; sourceTree = ""; }; 26BC7D5C10F1B77400F91463 /* DataBufferMemoryMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DataBufferMemoryMap.h; path = include/lldb/Core/DataBufferMemoryMap.h; sourceTree = ""; }; - 26BC7D5D10F1B77400F91463 /* lldb-private-log.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "lldb-private-log.h"; path = "include/lldb/lldb-private-log.h"; sourceTree = ""; }; 26BC7D5E10F1B77400F91463 /* Disassembler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Disassembler.h; path = include/lldb/Core/Disassembler.h; sourceTree = ""; }; 26BC7D5F10F1B77400F91463 /* dwarf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dwarf.h; path = include/lldb/Core/dwarf.h; sourceTree = ""; }; 26BC7D6010F1B77400F91463 /* Error.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Error.h; path = include/lldb/Core/Error.h; sourceTree = ""; }; @@ -1956,7 +1955,6 @@ 26BC7E7210F1B85900F91463 /* DataBufferHeap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DataBufferHeap.cpp; path = source/Core/DataBufferHeap.cpp; sourceTree = ""; }; 26BC7E7310F1B85900F91463 /* DataBufferMemoryMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DataBufferMemoryMap.cpp; path = source/Core/DataBufferMemoryMap.cpp; sourceTree = ""; }; 26BC7E7410F1B85900F91463 /* lldb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = lldb.cpp; path = source/lldb.cpp; sourceTree = ""; }; - 26BC7E7510F1B85900F91463 /* lldb-log.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "lldb-log.cpp"; path = "source/lldb-log.cpp"; sourceTree = ""; }; 26BC7E7610F1B85900F91463 /* Disassembler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Disassembler.cpp; path = source/Core/Disassembler.cpp; sourceTree = ""; }; 26BC7E7710F1B85900F91463 /* DynamicLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DynamicLoader.cpp; path = source/Core/DynamicLoader.cpp; sourceTree = ""; }; 26BC7E7810F1B85900F91463 /* Error.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Error.cpp; path = source/Core/Error.cpp; sourceTree = ""; }; @@ -2158,6 +2156,8 @@ 33E5E8411A672A240024ED68 /* StringConvert.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StringConvert.cpp; sourceTree = ""; }; 33E5E8451A6736D30024ED68 /* StringConvert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StringConvert.h; path = include/lldb/Host/StringConvert.h; sourceTree = SOURCE_ROOT; }; 3F5E8AF31A40D4A500A73232 /* PipeBase.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = PipeBase.h; path = include/lldb/Host/PipeBase.h; sourceTree = ""; }; + 3F8160A51AB9F7DD001DA9DF /* Logging.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Logging.cpp; path = source/Core/Logging.cpp; sourceTree = ""; }; + 3F8160A71AB9F809001DA9DF /* Logging.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Logging.h; path = include/lldb/Core/Logging.h; sourceTree = ""; }; 3FDFD6C3199C396E009756A7 /* FileAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileAction.h; path = include/lldb/Target/FileAction.h; sourceTree = ""; }; 3FDFDDBC199C3A06009756A7 /* FileAction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileAction.cpp; path = source/Target/FileAction.cpp; sourceTree = ""; }; 3FDFDDBE199D345E009756A7 /* FileCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileCache.cpp; path = source/Host/common/FileCache.cpp; sourceTree = ""; }; @@ -2789,11 +2789,9 @@ children = ( 266960581199F4230075C61A /* Scripts */, 26BC7E7410F1B85900F91463 /* lldb.cpp */, - 26BC7E7510F1B85900F91463 /* lldb-log.cpp */, 26BC7C2A10F1B3BC00F91463 /* lldb-private.h */, 26217932133BCB850083B112 /* lldb-private-enumerations.h */, 26BC7C2810F1B3BC00F91463 /* lldb-private-interfaces.h */, - 26BC7D5D10F1B77400F91463 /* lldb-private-log.h */, 26217930133BC8640083B112 /* lldb-private-types.h */, 262D3190111B4341004E6F88 /* API */, 26BC7CEB10F1B70800F91463 /* Breakpoint */, @@ -3943,6 +3941,8 @@ 26BC7E7E10F1B85900F91463 /* Listener.cpp */, 26BC7D6810F1B77400F91463 /* Log.h */, 26BC7E7F10F1B85900F91463 /* Log.cpp */, + 3F8160A71AB9F809001DA9DF /* Logging.h */, + 3F8160A51AB9F7DD001DA9DF /* Logging.cpp */, 26BC7D6910F1B77400F91463 /* Mangled.h */, 26BC7E8010F1B85900F91463 /* Mangled.cpp */, 2682100C143A59AE004BCF2D /* MappedHash.h */, @@ -5817,7 +5817,6 @@ 33E5E8471A674FB60024ED68 /* StringConvert.cpp in Sources */, 26D1804216CEDF0700EDFB5B /* TimeSpecTimeout.cpp in Sources */, 2689FFDA13353D9D00698AC0 /* lldb.cpp in Sources */, - 2689FFDB13353DA300698AC0 /* lldb-log.cpp in Sources */, 26474CCD18D0CB5B0073DEBA /* RegisterContextPOSIX_x86.cpp in Sources */, 2689FFEF13353DB600698AC0 /* Breakpoint.cpp in Sources */, 2689FFF113353DB600698AC0 /* BreakpointID.cpp in Sources */, @@ -6002,6 +6001,7 @@ AF77E0A41A033D360096C0EA /* RegisterContextPOSIX_powerpc.cpp in Sources */, AF9B8F33182DB52900DA866F /* SystemRuntimeMacOSX.cpp in Sources */, 2689008113353E2200698AC0 /* CommandObject.cpp in Sources */, + 3F8160A61AB9F7DD001DA9DF /* Logging.cpp in Sources */, 2689008313353E2200698AC0 /* CommandObjectMultiword.cpp in Sources */, 2689008413353E2200698AC0 /* CommandObjectRegexCommand.cpp in Sources */, 2689008513353E2200698AC0 /* CommandReturnObject.cpp in Sources */, diff --git a/lldb/source/Breakpoint/Breakpoint.cpp b/lldb/source/Breakpoint/Breakpoint.cpp index beb0f6b..e7fc57d 100644 --- a/lldb/source/Breakpoint/Breakpoint.cpp +++ b/lldb/source/Breakpoint/Breakpoint.cpp @@ -31,7 +31,6 @@ #include "lldb/Symbol/SymbolContext.h" #include "lldb/Target/Target.h" #include "lldb/Target/ThreadSpec.h" -#include "lldb/lldb-private-log.h" #include "llvm/Support/Casting.h" using namespace lldb; diff --git a/lldb/source/Breakpoint/BreakpointLocation.cpp b/lldb/source/Breakpoint/BreakpointLocation.cpp index af868dc..f2a8d88 100644 --- a/lldb/source/Breakpoint/BreakpointLocation.cpp +++ b/lldb/source/Breakpoint/BreakpointLocation.cpp @@ -15,7 +15,6 @@ // Other libraries and framework includes // Project includes -#include "lldb/lldb-private-log.h" #include "lldb/Breakpoint/BreakpointLocation.h" #include "lldb/Breakpoint/BreakpointID.h" #include "lldb/Breakpoint/StoppointCallbackContext.h" diff --git a/lldb/source/Breakpoint/BreakpointResolver.cpp b/lldb/source/Breakpoint/BreakpointResolver.cpp index 33b0ff4..f02eadf 100644 --- a/lldb/source/Breakpoint/BreakpointResolver.cpp +++ b/lldb/source/Breakpoint/BreakpointResolver.cpp @@ -25,7 +25,6 @@ #include "lldb/Target/Target.h" #include "lldb/Symbol/CompileUnit.h" #include "lldb/Symbol/Function.h" -#include "lldb/lldb-private-log.h" using namespace lldb_private; using namespace lldb; diff --git a/lldb/source/Breakpoint/BreakpointResolverAddress.cpp b/lldb/source/Breakpoint/BreakpointResolverAddress.cpp index 89a9092..193bc41 100644 --- a/lldb/source/Breakpoint/BreakpointResolverAddress.cpp +++ b/lldb/source/Breakpoint/BreakpointResolverAddress.cpp @@ -13,7 +13,6 @@ // C++ Includes // Other libraries and framework includes // Project includes -#include "lldb/lldb-private-log.h" #include "lldb/Breakpoint/BreakpointLocation.h" #include "lldb/Core/Log.h" diff --git a/lldb/source/Breakpoint/BreakpointResolverFileLine.cpp b/lldb/source/Breakpoint/BreakpointResolverFileLine.cpp index 950054c..3b93067 100644 --- a/lldb/source/Breakpoint/BreakpointResolverFileLine.cpp +++ b/lldb/source/Breakpoint/BreakpointResolverFileLine.cpp @@ -19,7 +19,6 @@ #include "lldb/Core/StreamString.h" #include "lldb/Symbol/CompileUnit.h" #include "lldb/Symbol/Function.h" -#include "lldb/lldb-private-log.h" using namespace lldb; using namespace lldb_private; diff --git a/lldb/source/Breakpoint/BreakpointResolverFileRegex.cpp b/lldb/source/Breakpoint/BreakpointResolverFileRegex.cpp index c71d9bf..046c268 100644 --- a/lldb/source/Breakpoint/BreakpointResolverFileRegex.cpp +++ b/lldb/source/Breakpoint/BreakpointResolverFileRegex.cpp @@ -19,7 +19,6 @@ #include "lldb/Core/StreamString.h" #include "lldb/Symbol/CompileUnit.h" #include "lldb/Target/Target.h" -#include "lldb/lldb-private-log.h" using namespace lldb; using namespace lldb_private; diff --git a/lldb/source/CMakeLists.txt b/lldb/source/CMakeLists.txt index cdd46ad..ca57718 100644 --- a/lldb/source/CMakeLists.txt +++ b/lldb/source/CMakeLists.txt @@ -27,7 +27,6 @@ endif () add_lldb_library(lldbBase lldb.cpp - lldb-log.cpp ) add_subdirectory(Breakpoint) diff --git a/lldb/source/Commands/CommandObjectLog.cpp b/lldb/source/Commands/CommandObjectLog.cpp index aa09f53..d4334d5 100644 --- a/lldb/source/Commands/CommandObjectLog.cpp +++ b/lldb/source/Commands/CommandObjectLog.cpp @@ -15,8 +15,6 @@ // C++ Includes // Other libraries and framework includes // Project includes -#include "lldb/lldb-private-log.h" - #include "lldb/Interpreter/Args.h" #include "lldb/Core/Debugger.h" #include "lldb/Host/FileSpec.h" diff --git a/lldb/source/Core/AddressResolver.cpp b/lldb/source/Core/AddressResolver.cpp index 5369d96..aa45701 100644 --- a/lldb/source/Core/AddressResolver.cpp +++ b/lldb/source/Core/AddressResolver.cpp @@ -20,7 +20,6 @@ #include "lldb/Core/StreamString.h" #include "lldb/Symbol/SymbolContext.h" #include "lldb/Target/Target.h" -#include "lldb/lldb-private-log.h" using namespace lldb_private; diff --git a/lldb/source/Core/AddressResolverFileLine.cpp b/lldb/source/Core/AddressResolverFileLine.cpp index 6089abd..e45076e 100644 --- a/lldb/source/Core/AddressResolverFileLine.cpp +++ b/lldb/source/Core/AddressResolverFileLine.cpp @@ -14,7 +14,6 @@ #include "lldb/Core/StreamString.h" #include "lldb/Symbol/CompileUnit.h" #include "lldb/Symbol/SymbolContext.h" -#include "lldb/lldb-private-log.h" using namespace lldb; using namespace lldb_private; diff --git a/lldb/source/Core/AddressResolverName.cpp b/lldb/source/Core/AddressResolverName.cpp index 9f3b3f5..d47fa1e 100644 --- a/lldb/source/Core/AddressResolverName.cpp +++ b/lldb/source/Core/AddressResolverName.cpp @@ -17,7 +17,6 @@ #include "lldb/Symbol/Function.h" #include "lldb/Symbol/SymbolContext.h" #include "lldb/Symbol/Symbol.h" -#include "lldb/lldb-private-log.h" using namespace lldb; using namespace lldb_private; diff --git a/lldb/source/Core/Broadcaster.cpp b/lldb/source/Core/Broadcaster.cpp index 1cbbde2..3514874 100644 --- a/lldb/source/Core/Broadcaster.cpp +++ b/lldb/source/Core/Broadcaster.cpp @@ -16,7 +16,6 @@ #include "lldb/Core/Log.h" #include "lldb/Core/Event.h" #include "lldb/Core/StreamString.h" -#include "lldb/lldb-private-log.h" using namespace lldb; using namespace lldb_private; diff --git a/lldb/source/Core/CMakeLists.txt b/lldb/source/Core/CMakeLists.txt index b2069a0..8a62fc3 100644 --- a/lldb/source/Core/CMakeLists.txt +++ b/lldb/source/Core/CMakeLists.txt @@ -33,6 +33,7 @@ add_lldb_library(lldbCore Language.cpp Listener.cpp Log.cpp + Logging.cpp Mangled.cpp Module.cpp ModuleChild.cpp diff --git a/lldb/source/Core/Communication.cpp b/lldb/source/Core/Communication.cpp index 0b2d256..6746e59 100644 --- a/lldb/source/Core/Communication.cpp +++ b/lldb/source/Core/Communication.cpp @@ -11,7 +11,6 @@ // C++ Includes // Other libraries and framework includes // Project includes -#include "lldb/lldb-private-log.h" #include "lldb/Core/Communication.h" #include "lldb/Core/Connection.h" #include "lldb/Core/Log.h" diff --git a/lldb/source/Core/ConnectionMachPort.cpp b/lldb/source/Core/ConnectionMachPort.cpp index fe29814..cf68c80 100644 --- a/lldb/source/Core/ConnectionMachPort.cpp +++ b/lldb/source/Core/ConnectionMachPort.cpp @@ -17,7 +17,6 @@ // C++ Includes // Other libraries and framework includes // Project includes -#include "lldb/lldb-private-log.h" #include "lldb/Core/Communication.h" #include "lldb/Core/Log.h" diff --git a/lldb/source/Core/ConnectionSharedMemory.cpp b/lldb/source/Core/ConnectionSharedMemory.cpp index d3dfa3c..77daeb1 100644 --- a/lldb/source/Core/ConnectionSharedMemory.cpp +++ b/lldb/source/Core/ConnectionSharedMemory.cpp @@ -26,7 +26,6 @@ // Other libraries and framework includes // Project includes #include "llvm/Support/MathExtras.h" -#include "lldb/lldb-private-log.h" #include "lldb/Core/Communication.h" #include "lldb/Core/Log.h" diff --git a/lldb/source/Core/DataBufferMemoryMap.cpp b/lldb/source/Core/DataBufferMemoryMap.cpp index 4ca43b8..26bad43a 100644 --- a/lldb/source/Core/DataBufferMemoryMap.cpp +++ b/lldb/source/Core/DataBufferMemoryMap.cpp @@ -26,7 +26,6 @@ #include "lldb/Host/FileSpec.h" #include "lldb/Host/HostInfo.h" #include "lldb/Core/Log.h" -#include "lldb/lldb-private-log.h" using namespace lldb; using namespace lldb_private; diff --git a/lldb/source/Core/FileLineResolver.cpp b/lldb/source/Core/FileLineResolver.cpp index b1346bb..e8ef87f 100644 --- a/lldb/source/Core/FileLineResolver.cpp +++ b/lldb/source/Core/FileLineResolver.cpp @@ -10,7 +10,6 @@ #include "lldb/Core/FileLineResolver.h" // Project includes -#include "lldb/lldb-private-log.h" #include "lldb/Core/Log.h" #include "lldb/Core/StreamString.h" #include "lldb/Symbol/CompileUnit.h" diff --git a/lldb/source/Core/Listener.cpp b/lldb/source/Core/Listener.cpp index f71d766..3447549 100644 --- a/lldb/source/Core/Listener.cpp +++ b/lldb/source/Core/Listener.cpp @@ -18,7 +18,6 @@ #include "lldb/Core/StreamString.h" #include "lldb/Core/Event.h" #include "lldb/Host/TimeValue.h" -#include "lldb/lldb-private-log.h" #include using namespace lldb; diff --git a/lldb/source/lldb-log.cpp b/lldb/source/Core/Logging.cpp similarity index 99% rename from lldb/source/lldb-log.cpp rename to lldb/source/Core/Logging.cpp index 463de13..7ad5d91 100644 --- a/lldb/source/lldb-log.cpp +++ b/lldb/source/Core/Logging.cpp @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// -#include "lldb/lldb-private-log.h" +#include "lldb/Core/Logging.h" // C Includes // C++ Includes @@ -25,7 +25,7 @@ using namespace lldb_private; // We want to avoid global constructors where code needs to be run so here we // control access to our static g_log_sp by hiding it in a singleton function -// that will construct the static g_lob_sp the first time this function is +// that will construct the static g_lob_sp the first time this function is // called. static std::atomic g_log_enabled {false}; @@ -153,7 +153,6 @@ lldb_private::DisableLog (const char **categories, Stream *feedback_strm) ListLogCategories (feedback_strm); return; } - } } log->GetMask().Reset (flag_bits); diff --git a/lldb/source/Core/Module.cpp b/lldb/source/Core/Module.cpp index d394118..c5c4f5d 100644 --- a/lldb/source/Core/Module.cpp +++ b/lldb/source/Core/Module.cpp @@ -25,7 +25,6 @@ #include "lldb/Host/Symbols.h" #include "lldb/Interpreter/CommandInterpreter.h" #include "lldb/Interpreter/ScriptInterpreter.h" -#include "lldb/lldb-private-log.h" #include "lldb/Symbol/ClangASTContext.h" #include "lldb/Symbol/CompileUnit.h" #include "lldb/Symbol/ObjectFile.h" diff --git a/lldb/source/Expression/ClangModulesDeclVendor.cpp b/lldb/source/Expression/ClangModulesDeclVendor.cpp index 0800b52..32df266 100644 --- a/lldb/source/Expression/ClangModulesDeclVendor.cpp +++ b/lldb/source/Expression/ClangModulesDeclVendor.cpp @@ -11,6 +11,7 @@ #include "lldb/Expression/ClangModulesDeclVendor.h" +#include "lldb/Core/Log.h" #include "lldb/Core/StreamString.h" #include "lldb/Host/FileSpec.h" #include "lldb/Host/Host.h" diff --git a/lldb/source/Expression/DWARFExpression.cpp b/lldb/source/Expression/DWARFExpression.cpp index 77a6f7d1..9307c845 100644 --- a/lldb/source/Expression/DWARFExpression.cpp +++ b/lldb/source/Expression/DWARFExpression.cpp @@ -30,8 +30,6 @@ #include "lldb/Host/Endian.h" #include "lldb/Host/Host.h" -#include "lldb/lldb-private-log.h" - #include "lldb/Target/ABI.h" #include "lldb/Target/ExecutionContext.h" #include "lldb/Target/Process.h" diff --git a/lldb/source/Host/common/NativeRegisterContext.cpp b/lldb/source/Host/common/NativeRegisterContext.cpp index eec0594..b8f811a 100644 --- a/lldb/source/Host/common/NativeRegisterContext.cpp +++ b/lldb/source/Host/common/NativeRegisterContext.cpp @@ -12,8 +12,6 @@ #include "lldb/Core/Log.h" #include "lldb/Core/RegisterValue.h" -#include "lldb/lldb-private-log.h" - #include "lldb/Host/common/NativeProcessProtocol.h" #include "lldb/Host/common/NativeThreadProtocol.h" diff --git a/lldb/source/Host/posix/ConnectionFileDescriptorPosix.cpp b/lldb/source/Host/posix/ConnectionFileDescriptorPosix.cpp index fe70c33..f8b4645 100644 --- a/lldb/source/Host/posix/ConnectionFileDescriptorPosix.cpp +++ b/lldb/source/Host/posix/ConnectionFileDescriptorPosix.cpp @@ -39,7 +39,6 @@ #include "llvm/ADT/SmallVector.h" #endif // Project includes -#include "lldb/lldb-private-log.h" #include "lldb/Core/Communication.h" #include "lldb/Core/Log.h" #include "lldb/Core/StreamString.h" diff --git a/lldb/source/Plugins/ObjectFile/JIT/ObjectFileJIT.cpp b/lldb/source/Plugins/ObjectFile/JIT/ObjectFileJIT.cpp index 5498bed..3103ed8 100644 --- a/lldb/source/Plugins/ObjectFile/JIT/ObjectFileJIT.cpp +++ b/lldb/source/Plugins/ObjectFile/JIT/ObjectFileJIT.cpp @@ -11,7 +11,6 @@ #include "ObjectFileJIT.h" -#include "lldb/lldb-private-log.h" #include "lldb/Core/ArchSpec.h" #include "lldb/Core/DataBuffer.h" #include "lldb/Core/DataBufferHeap.h" diff --git a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp index 824ce44..e736a97 100644 --- a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp +++ b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp @@ -9,7 +9,6 @@ #include "llvm/ADT/StringRef.h" -#include "lldb/lldb-private-log.h" #include "lldb/Core/ArchSpec.h" #include "lldb/Core/DataBuffer.h" #include "lldb/Core/Debugger.h" diff --git a/lldb/source/Plugins/Process/Linux/NativeThreadLinux.cpp b/lldb/source/Plugins/Process/Linux/NativeThreadLinux.cpp index 3b60cca..148f55f 100644 --- a/lldb/source/Plugins/Process/Linux/NativeThreadLinux.cpp +++ b/lldb/source/Plugins/Process/Linux/NativeThreadLinux.cpp @@ -23,7 +23,6 @@ #include "lldb/Host/HostInfo.h" #include "lldb/Host/HostNativeThread.h" #include "lldb/lldb-enumerations.h" -#include "lldb/lldb-private-log.h" #include "llvm/ADT/SmallString.h" diff --git a/lldb/source/Symbol/Block.cpp b/lldb/source/Symbol/Block.cpp index 6a5c651..94fa166 100644 --- a/lldb/source/Symbol/Block.cpp +++ b/lldb/source/Symbol/Block.cpp @@ -9,8 +9,6 @@ #include "lldb/Symbol/Block.h" -#include "lldb/lldb-private-log.h" - #include "lldb/Core/Log.h" #include "lldb/Core/Module.h" #include "lldb/Core/Section.h" diff --git a/lldb/source/Symbol/ObjectFile.cpp b/lldb/source/Symbol/ObjectFile.cpp index c24e832..b860bcf 100644 --- a/lldb/source/Symbol/ObjectFile.cpp +++ b/lldb/source/Symbol/ObjectFile.cpp @@ -8,7 +8,6 @@ //===----------------------------------------------------------------------===// #include "lldb/lldb-private.h" -#include "lldb/lldb-private-log.h" #include "lldb/Core/DataBuffer.h" #include "lldb/Core/DataBufferHeap.h" #include "lldb/Core/Log.h" diff --git a/lldb/source/Target/Process.cpp b/lldb/source/Target/Process.cpp index 3e129cb..9cade96 100644 --- a/lldb/source/Target/Process.cpp +++ b/lldb/source/Target/Process.cpp @@ -10,9 +10,6 @@ #include "lldb/lldb-python.h" #include "lldb/Target/Process.h" - -#include "lldb/lldb-private-log.h" - #include "lldb/Breakpoint/StoppointCallbackContext.h" #include "lldb/Breakpoint/BreakpointLocation.h" #include "lldb/Core/Event.h" diff --git a/lldb/source/Target/Target.cpp b/lldb/source/Target/Target.cpp index beca403..58c6dec 100644 --- a/lldb/source/Target/Target.cpp +++ b/lldb/source/Target/Target.cpp @@ -44,7 +44,6 @@ #include "lldb/Interpreter/OptionGroupWatchpoint.h" #include "lldb/Interpreter/OptionValues.h" #include "lldb/Interpreter/Property.h" -#include "lldb/lldb-private-log.h" #include "lldb/Symbol/ClangASTContext.h" #include "lldb/Symbol/ObjectFile.h" #include "lldb/Target/LanguageRuntime.h" diff --git a/lldb/source/Target/Thread.cpp b/lldb/source/Target/Thread.cpp index 6f28a67..7dd6320 100644 --- a/lldb/source/Target/Thread.cpp +++ b/lldb/source/Target/Thread.cpp @@ -9,7 +9,6 @@ #include "lldb/lldb-python.h" -#include "lldb/lldb-private-log.h" #include "lldb/Breakpoint/BreakpointLocation.h" #include "lldb/Core/Debugger.h" #include "lldb/Core/Log.h" diff --git a/lldb/source/Target/ThreadPlanCallFunction.cpp b/lldb/source/Target/ThreadPlanCallFunction.cpp index d6c5a5c..8c564c4 100644 --- a/lldb/source/Target/ThreadPlanCallFunction.cpp +++ b/lldb/source/Target/ThreadPlanCallFunction.cpp @@ -14,7 +14,6 @@ // Other libraries and framework includes // Project includes -#include "lldb/lldb-private-log.h" #include "lldb/Breakpoint/Breakpoint.h" #include "lldb/Breakpoint/BreakpointLocation.h" #include "lldb/Core/Address.h" diff --git a/lldb/source/Target/ThreadPlanCallUserExpression.cpp b/lldb/source/Target/ThreadPlanCallUserExpression.cpp index dd43fc3..1773777 100644 --- a/lldb/source/Target/ThreadPlanCallUserExpression.cpp +++ b/lldb/source/Target/ThreadPlanCallUserExpression.cpp @@ -14,7 +14,6 @@ // Other libraries and framework includes // Project includes -#include "lldb/lldb-private-log.h" #include "lldb/Breakpoint/Breakpoint.h" #include "lldb/Breakpoint/BreakpointLocation.h" #include "lldb/Core/Address.h" diff --git a/lldb/source/Target/ThreadPlanRunToAddress.cpp b/lldb/source/Target/ThreadPlanRunToAddress.cpp index e2f85c0..54ae1dc 100644 --- a/lldb/source/Target/ThreadPlanRunToAddress.cpp +++ b/lldb/source/Target/ThreadPlanRunToAddress.cpp @@ -13,7 +13,6 @@ // C++ Includes // Other libraries and framework includes // Project includes -#include "lldb/lldb-private-log.h" #include "lldb/Core/Log.h" #include "lldb/Core/Stream.h" #include "lldb/Target/Target.h" diff --git a/lldb/source/Target/ThreadPlanStepInRange.cpp b/lldb/source/Target/ThreadPlanStepInRange.cpp index e5f057c..3c74c00 100644 --- a/lldb/source/Target/ThreadPlanStepInRange.cpp +++ b/lldb/source/Target/ThreadPlanStepInRange.cpp @@ -13,8 +13,6 @@ // C++ Includes // Other libraries and framework includes // Project includes - -#include "lldb/lldb-private-log.h" #include "lldb/Core/Log.h" #include "lldb/Core/Module.h" #include "lldb/Core/Stream.h" diff --git a/lldb/source/Target/ThreadPlanStepInstruction.cpp b/lldb/source/Target/ThreadPlanStepInstruction.cpp index 0f6d7b7..1ce26df 100644 --- a/lldb/source/Target/ThreadPlanStepInstruction.cpp +++ b/lldb/source/Target/ThreadPlanStepInstruction.cpp @@ -14,7 +14,6 @@ // C++ Includes // Other libraries and framework includes // Project includes -#include "lldb/lldb-private-log.h" #include "lldb/Core/Log.h" #include "lldb/Core/Stream.h" #include "lldb/Target/Process.h" diff --git a/lldb/source/Target/ThreadPlanStepOut.cpp b/lldb/source/Target/ThreadPlanStepOut.cpp index 17bd0f7..8b702a2 100644 --- a/lldb/source/Target/ThreadPlanStepOut.cpp +++ b/lldb/source/Target/ThreadPlanStepOut.cpp @@ -14,7 +14,6 @@ // Other libraries and framework includes // Project includes #include "lldb/Breakpoint/Breakpoint.h" -#include "lldb/lldb-private-log.h" #include "lldb/Core/Log.h" #include "lldb/Core/Value.h" #include "lldb/Core/ValueObjectConstResult.h" diff --git a/lldb/source/Target/ThreadPlanStepOverBreakpoint.cpp b/lldb/source/Target/ThreadPlanStepOverBreakpoint.cpp index 6f285e2..da0326b 100644 --- a/lldb/source/Target/ThreadPlanStepOverBreakpoint.cpp +++ b/lldb/source/Target/ThreadPlanStepOverBreakpoint.cpp @@ -13,7 +13,6 @@ // C++ Includes // Other libraries and framework includes // Project includes -#include "lldb/lldb-private-log.h" #include "lldb/Core/Log.h" #include "lldb/Core/Stream.h" #include "lldb/Target/Process.h" diff --git a/lldb/source/Target/ThreadPlanStepOverRange.cpp b/lldb/source/Target/ThreadPlanStepOverRange.cpp index a6d65e4..0296d40 100644 --- a/lldb/source/Target/ThreadPlanStepOverRange.cpp +++ b/lldb/source/Target/ThreadPlanStepOverRange.cpp @@ -13,8 +13,6 @@ // C++ Includes // Other libraries and framework includes // Project includes - -#include "lldb/lldb-private-log.h" #include "lldb/Core/Log.h" #include "lldb/Core/Stream.h" #include "lldb/Symbol/Block.h" diff --git a/lldb/source/Target/ThreadPlanStepRange.cpp b/lldb/source/Target/ThreadPlanStepRange.cpp index adc515c..55f2c2b 100644 --- a/lldb/source/Target/ThreadPlanStepRange.cpp +++ b/lldb/source/Target/ThreadPlanStepRange.cpp @@ -13,8 +13,6 @@ // C++ Includes // Other libraries and framework includes // Project includes - -#include "lldb/lldb-private-log.h" #include "lldb/Breakpoint/BreakpointLocation.h" #include "lldb/Breakpoint/BreakpointSite.h" #include "lldb/Core/Disassembler.h" diff --git a/lldb/source/Target/ThreadPlanStepThrough.cpp b/lldb/source/Target/ThreadPlanStepThrough.cpp index 5b50a41..068d8e6 100644 --- a/lldb/source/Target/ThreadPlanStepThrough.cpp +++ b/lldb/source/Target/ThreadPlanStepThrough.cpp @@ -13,7 +13,6 @@ // C++ Includes // Other libraries and framework includes // Project includes -#include "lldb/lldb-private-log.h" #include "lldb/Core/Log.h" #include "lldb/Core/Stream.h" #include "lldb/Target/DynamicLoader.h" diff --git a/lldb/source/Target/ThreadPlanStepUntil.cpp b/lldb/source/Target/ThreadPlanStepUntil.cpp index fa5ab8c..4c3d4a6 100644 --- a/lldb/source/Target/ThreadPlanStepUntil.cpp +++ b/lldb/source/Target/ThreadPlanStepUntil.cpp @@ -18,7 +18,6 @@ // Other libraries and framework includes // Project includes #include "lldb/Breakpoint/Breakpoint.h" -#include "lldb/lldb-private-log.h" #include "lldb/Core/Log.h" #include "lldb/Target/Process.h" #include "lldb/Target/RegisterContext.h" diff --git a/lldb/source/lldb.cpp b/lldb/source/lldb.cpp index 288e312..8033044 100644 --- a/lldb/source/lldb.cpp +++ b/lldb/source/lldb.cpp @@ -10,7 +10,6 @@ #include "lldb/lldb-python.h" #include "lldb/lldb-private.h" -#include "lldb/lldb-private-log.h" #include "lldb/Core/ArchSpec.h" #include "lldb/Core/Debugger.h" #include "lldb/Core/Log.h" diff --git a/lldb/tools/lldb-server/CMakeLists.txt b/lldb/tools/lldb-server/CMakeLists.txt index fd7e419..0755260 100644 --- a/lldb/tools/lldb-server/CMakeLists.txt +++ b/lldb/tools/lldb-server/CMakeLists.txt @@ -31,7 +31,6 @@ else() lldb-server.cpp lldb-gdbserver.cpp lldb-platform.cpp - ../../source/lldb-log.cpp ../../source/lldb.cpp ) diff --git a/lldb/tools/lldb-server/lldb-gdbserver.cpp b/lldb/tools/lldb-server/lldb-gdbserver.cpp index 076c7c4..8117454 100644 --- a/lldb/tools/lldb-server/lldb-gdbserver.cpp +++ b/lldb/tools/lldb-server/lldb-gdbserver.cpp @@ -23,7 +23,6 @@ // C++ Includes // Other libraries and framework includes -#include "lldb/lldb-private-log.h" #include "lldb/Core/Error.h" #include "lldb/Core/ConnectionMachPort.h" #include "lldb/Core/Debugger.h" diff --git a/lldb/tools/lldb-server/lldb-platform.cpp b/lldb/tools/lldb-server/lldb-platform.cpp index e24cd29..e5b70f5 100644 --- a/lldb/tools/lldb-server/lldb-platform.cpp +++ b/lldb/tools/lldb-server/lldb-platform.cpp @@ -23,7 +23,6 @@ // C++ Includes // Other libraries and framework includes -#include "lldb/lldb-private-log.h" #include "lldb/Core/Error.h" #include "lldb/Core/ConnectionMachPort.h" #include "lldb/Core/Debugger.h" -- 2.7.4