Skip to content

Commit 8e6b31c

Browse files
committed
[LLDB] Move Trace-specific classes into separate library
These two classes, TraceSessionFileParser and ThreadPostMortemTrace, seem to be useful primarily for tracing. Currently it looks like intel-pt is the sole user of these, but that other tracing plugins could be written in the future that take advantage of these. Unfortunately with them in Target, there is a dependency on PluginProcessUtility. I'd like to sever that dependency, so I moved them into a `TraceCommon` plugin. Differential Revision: https://reviews.llvm.org/D105649
1 parent aa5adc0 commit 8e6b31c

File tree

10 files changed

+15
-8
lines changed

10 files changed

+15
-8
lines changed

lldb/include/lldb/lldb-forward.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,6 @@ class ThreadSpec;
230230
class ThreadPostMortemTrace;
231231
class Trace;
232232
class TraceCursor;
233-
class TraceSessionFileParser;
234233
class Type;
235234
class TypeAndOrName;
236235
class TypeCategoryImpl;
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
option(LLDB_BUILD_INTEL_PT "Enable Building of Intel(R) Processor Trace Tool" OFF)
22

3+
add_subdirectory(common)
4+
35
if (LLDB_BUILD_INTEL_PT)
46
add_subdirectory(intel-pt)
57
endif()
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
add_lldb_library(lldbPluginTraceCommon
2+
ThreadPostMortemTrace.cpp
3+
TraceSessionFileParser.cpp
4+
5+
LINK_LIBS
6+
lldbCore
7+
lldbTarget
8+
)

lldb/source/Target/ThreadPostMortemTrace.cpp renamed to lldb/source/Plugins/Trace/common/ThreadPostMortemTrace.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
#include "lldb/Target/ThreadPostMortemTrace.h"
9+
#include "ThreadPostMortemTrace.h"
1010

1111
#include <memory>
1212

lldb/source/Target/TraceSessionFileParser.cpp renamed to lldb/source/Plugins/Trace/common/TraceSessionFileParser.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
//
77
//===----------------------------------------------------------------------===/
88

9-
#include "lldb/Target/TraceSessionFileParser.h"
9+
#include "TraceSessionFileParser.h"
10+
#include "ThreadPostMortemTrace.h"
1011

1112
#include <sstream>
1213

1314
#include "lldb/Core/Debugger.h"
1415
#include "lldb/Core/Module.h"
1516
#include "lldb/Target/Process.h"
1617
#include "lldb/Target/Target.h"
17-
#include "lldb/Target/ThreadPostMortemTrace.h"
1818

1919
using namespace lldb;
2020
using namespace lldb_private;

lldb/include/lldb/Target/TraceSessionFileParser.h renamed to lldb/source/Plugins/Trace/common/TraceSessionFileParser.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#include "llvm/Support/JSON.h"
1313

14-
#include "lldb/Target/ThreadPostMortemTrace.h"
14+
#include "ThreadPostMortemTrace.h"
1515

1616
namespace lldb_private {
1717

lldb/source/Plugins/Trace/intel-pt/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ add_lldb_library(lldbPluginTraceIntelPT PLUGIN
2525
lldbCore
2626
lldbSymbol
2727
lldbTarget
28+
lldbPluginTraceCommon
2829
${LIBIPT_LIBRARY}
2930
LINK_COMPONENTS
3031
Support

lldb/source/Target/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,9 @@ add_lldb_library(lldbTarget
6666
ThreadPlanTracer.cpp
6767
ThreadPlanStack.cpp
6868
ThreadSpec.cpp
69-
ThreadPostMortemTrace.cpp
7069
Trace.cpp
7170
TraceCursor.cpp
7271
TraceInstructionDumper.cpp
73-
TraceSessionFileParser.cpp
7472
UnixSignals.cpp
7573
UnwindAssembly.cpp
7674
UnwindLLDB.cpp

lldb/source/Target/Trace.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include "lldb/Target/Process.h"
1818
#include "lldb/Target/SectionLoadList.h"
1919
#include "lldb/Target/Thread.h"
20-
#include "lldb/Target/ThreadPostMortemTrace.h"
2120
#include "lldb/Utility/Stream.h"
2221

2322
using namespace lldb;

0 commit comments

Comments
 (0)