intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-02-05 22:17:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

[lldb][NFCI] DecodedThread::TraceItemStorage::error should own its own data

Browse Source 
The way it works now, it stores a `const char *` that it does not
explicitly own. It's owned by the ConstString StringPool. This is purely
to manage its lifetime, we don't really benefit from deduplication (nor
should we try to, they are errors). We also don't really benefit from
quick comparisons.

This may make the size of TraceItemStorage larger, but you have to pay
the cost of owning the data somewhere. The ConstString StringPool is an
attractive choice but ultimately a poor one.

Differential Revision: https://reviews.llvm.org/D152326
This commit is contained in:
Alex Langford
2023-06-06 18:10:48 -07:00
parent 5df492302e
commit 4bae706682
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lldb/include/lldb/Target/TraceCursor.h
View File

@@ -217,7 +217,7 @@ public:
/// \return
/// The error message the cursor is pointing at.
virtual const char *GetError() const = 0;
virtual llvm::StringRef GetError() const = 0;
/// \return
/// Whether the cursor points to an event or not.

10
lldb/source/Plugins/Trace/intel-pt/DecodedThread.cpp
View File

@@ -186,14 +186,12 @@ void DecodedThread::AppendInstruction(const pt_insn &insn) {
}
void DecodedThread::AppendError(const IntelPTError &error) {
CreateNewTraceItem(lldb::eTraceItemKindError).error =
ConstString(error.message()).AsCString();
CreateNewTraceItem(lldb::eTraceItemKindError).error = error.message();
m_error_stats.RecordError(/*fatal=*/false);
}
void DecodedThread::AppendCustomError(StringRef err, bool fatal) {
CreateNewTraceItem(lldb::eTraceItemKindError).error =
ConstString(err).AsCString();
CreateNewTraceItem(lldb::eTraceItemKindError).error = err.str();
m_error_stats.RecordError(fatal);
}
@@ -238,7 +236,9 @@ DecodedThread::GetItemKindByIndex(uint64_t item_index) const {
return static_cast<lldb::TraceItemKind>(m_item_kinds[item_index]);
}
const char *DecodedThread::GetErrorByIndex(uint64_t item_index) const {
llvm::StringRef DecodedThread::GetErrorByIndex(uint64_t item_index) const {
if (item_index >= m_item_data.size())
return llvm::StringRef();
return m_item_data[item_index].error;
}

4
lldb/source/Plugins/Trace/intel-pt/DecodedThread.h
View File

@@ -159,7 +159,7 @@ public:
/// \return
/// The error associated with a given trace item.
const char *GetErrorByIndex(uint64_t item_index) const;
llvm::StringRef GetErrorByIndex(uint64_t item_index) const;
/// \return
/// The trace item kind given an item index.
@@ -275,7 +275,7 @@ private:
lldb::TraceEvent event;
/// The string message of this item if it's an error
const char *error;
std::string error;
};
/// Create a new trace item.

2
lldb/source/Plugins/Trace/intel-pt/TraceCursorIntelPT.cpp
View File

@@ -95,7 +95,7 @@ lldb::TraceItemKind TraceCursorIntelPT::GetItemKind() const {
return m_decoded_thread_sp->GetItemKindByIndex(m_pos);
}
const char *TraceCursorIntelPT::GetError() const {
llvm::StringRef TraceCursorIntelPT::GetError() const {
return m_decoded_thread_sp->GetErrorByIndex(m_pos);
}

2
lldb/source/Plugins/Trace/intel-pt/TraceCursorIntelPT.h
View File

@@ -28,7 +28,7 @@ public:
bool HasValue() const override;
const char *GetError() const override;
llvm::StringRef GetError() const override;
lldb::addr_t GetLoadAddress() const override;