Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2024-11-23 05:40:09 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[lldb][NFCI] Remove EventData* param from BroadcastEvent (#78773)

Browse Source 
BroadcastEvent currently takes its EventData* param and shoves it into
an Event object, which takes ownership of the pointer and places it into
a shared_ptr to manage the lifetime.

Instead of relying on `new` and passing raw pointers around, I think it
would make more sense to create the shared_ptr up front.
This commit is contained in:
Alex Langford 2024-01-22 10:46:20 -08:00 committed by GitHub
parent 04952c5bec
commit 0cea54a382
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 66 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lldb/include/lldb/Breakpoint/Watchpoint.h
View File

@ -235,8 +235,6 @@ private:
void SendWatchpointChangedEvent(lldb::WatchpointEventType eventKind);
void SendWatchpointChangedEvent(WatchpointEventData *data);
Watchpoint(const Watchpoint &) = delete;
const Watchpoint &operator=(const Watchpoint &) = delete;
};

6
lldb/include/lldb/Utility/Broadcaster.h
View File

@ -177,8 +177,8 @@ public:
m_broadcaster_sp->BroadcastEvent(event_type, event_data_sp);
}
void BroadcastEvent(uint32_t event_type, EventData *event_data = nullptr) {
m_broadcaster_sp->BroadcastEvent(event_type, event_data);
void BroadcastEvent(uint32_t event_type) {
m_broadcaster_sp->BroadcastEvent(event_type);
}
void BroadcastEventIfUnique(uint32_t event_type,
@ -346,7 +346,7 @@ protected:
void BroadcastEventIfUnique(lldb::EventSP &event_sp);
void BroadcastEvent(uint32_t event_type, EventData *event_data = nullptr);
void BroadcastEvent(uint32_t event_type);
void BroadcastEvent(uint32_t event_type,
const lldb::EventDataSP &event_data_sp);

7
lldb/source/Breakpoint/BreakpointList.cpp
View File

@ -17,9 +17,12 @@ using namespace lldb_private;
static void NotifyChange(const BreakpointSP &bp, BreakpointEventType event) {
Target &target = bp->GetTarget();
if (target.EventTypeHasListeners(Target::eBroadcastBitBreakpointChanged))
if (target.EventTypeHasListeners(Target::eBroadcastBitBreakpointChanged)) {
auto event_data_sp =
std::make_shared<Breakpoint::BreakpointEventData>(event, bp);
target.BroadcastEvent(Target::eBroadcastBitBreakpointChanged,
new Breakpoint::BreakpointEventData(event, bp));
event_data_sp);
}
}
BreakpointList::BreakpointList(bool is_internal)

6
lldb/source/Breakpoint/BreakpointLocation.cpp
View File

@ -649,11 +649,11 @@ void BreakpointLocation::SendBreakpointLocationChangedEvent(
if (!m_being_created && !m_owner.IsInternal() &&
m_owner.GetTarget().EventTypeHasListeners(
Target::eBroadcastBitBreakpointChanged)) {
Breakpoint::BreakpointEventData *data = new Breakpoint::BreakpointEventData(
auto data_sp = std::make_shared<Breakpoint::BreakpointEventData>(
eventKind, m_owner.shared_from_this());
data->GetBreakpointLocationCollection().Add(shared_from_this());
data_sp->GetBreakpointLocationCollection().Add(shared_from_this());
m_owner.GetTarget().BroadcastEvent(Target::eBroadcastBitBreakpointChanged,
data);
data_sp);
}
}

22
lldb/source/Breakpoint/Watchpoint.cpp
View File

@ -462,26 +462,14 @@ const char *Watchpoint::GetConditionText() const {
void Watchpoint::SendWatchpointChangedEvent(
lldb::WatchpointEventType eventKind) {
if (!m_being_created &&
GetTarget().EventTypeHasListeners(
Target::eBroadcastBitWatchpointChanged)) {
WatchpointEventData *data =
new Watchpoint::WatchpointEventData(eventKind, shared_from_this());
GetTarget().BroadcastEvent(Target::eBroadcastBitWatchpointChanged, data);
if (!m_being_created && GetTarget().EventTypeHasListeners(
Target::eBroadcastBitWatchpointChanged)) {
auto data_sp =
std::make_shared<WatchpointEventData>(eventKind, shared_from_this());
GetTarget().BroadcastEvent(Target::eBroadcastBitWatchpointChanged, data_sp);
}
}
void Watchpoint::SendWatchpointChangedEvent(WatchpointEventData *data) {
if (data == nullptr)
return;
if (!m_being_created &&
GetTarget().EventTypeHasListeners(Target::eBroadcastBitWatchpointChanged))
GetTarget().BroadcastEvent(Target::eBroadcastBitWatchpointChanged, data);
else
delete data;
}
Watchpoint::WatchpointEventData::WatchpointEventData(
WatchpointEventType sub_type, const WatchpointSP &new_watchpoint_sp)
: m_watchpoint_event(sub_type), m_new_watchpoint_sp(new_watchpoint_sp) {}

23
lldb/source/Breakpoint/WatchpointList.cpp
View File

@ -23,10 +23,12 @@ lldb::watch_id_t WatchpointList::Add(const WatchpointSP &wp_sp, bool notify) {
m_watchpoints.push_back(wp_sp);
if (notify) {
if (wp_sp->GetTarget().EventTypeHasListeners(
Target::eBroadcastBitWatchpointChanged))
Target::eBroadcastBitWatchpointChanged)) {
auto data_sp = std::make_shared<Watchpoint::WatchpointEventData>(
eWatchpointEventTypeAdded, wp_sp);
wp_sp->GetTarget().BroadcastEvent(Target::eBroadcastBitWatchpointChanged,
new Watchpoint::WatchpointEventData(
eWatchpointEventTypeAdded, wp_sp));
data_sp);
}
}
return wp_sp->GetID();
}
@ -171,11 +173,12 @@ bool WatchpointList::Remove(lldb::watch_id_t watch_id, bool notify) {
WatchpointSP wp_sp = *pos;
if (notify) {
if (wp_sp->GetTarget().EventTypeHasListeners(
Target::eBroadcastBitWatchpointChanged))
Target::eBroadcastBitWatchpointChanged)) {
auto data_sp = std::make_shared<Watchpoint::WatchpointEventData>(
eWatchpointEventTypeRemoved, wp_sp);
wp_sp->GetTarget().BroadcastEvent(
Target::eBroadcastBitWatchpointChanged,
new Watchpoint::WatchpointEventData(eWatchpointEventTypeRemoved,
wp_sp));
Target::eBroadcastBitWatchpointChanged, data_sp);
}
}
m_watchpoints.erase(pos);
return true;
@ -234,10 +237,10 @@ void WatchpointList::RemoveAll(bool notify) {
for (pos = m_watchpoints.begin(); pos != end; ++pos) {
if ((*pos)->GetTarget().EventTypeHasListeners(
Target::eBroadcastBitBreakpointChanged)) {
auto data_sp = std::make_shared<Watchpoint::WatchpointEventData>(
eWatchpointEventTypeRemoved, *pos);
(*pos)->GetTarget().BroadcastEvent(
Target::eBroadcastBitWatchpointChanged,
new Watchpoint::WatchpointEventData(eWatchpointEventTypeRemoved,
*pos));
Target::eBroadcastBitWatchpointChanged, data_sp);
}
}
}

17
lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
View File

@ -1089,8 +1089,8 @@ Status ProcessGDBRemote::DoAttachToProcessWithID(
const int packet_len =
::snprintf(packet, sizeof(packet), "vAttach;%" PRIx64, attach_pid);
SetID(attach_pid);
m_async_broadcaster.BroadcastEvent(
eBroadcastBitAsyncContinue, new EventDataBytes(packet, packet_len));
auto data_sp = std::make_shared<EventDataBytes>(packet, packet_len);
m_async_broadcaster.BroadcastEvent(eBroadcastBitAsyncContinue, data_sp);
} else
SetExitStatus(-1, error.AsCString());
}
@ -1127,9 +1127,9 @@ Status ProcessGDBRemote::DoAttachToProcessWithName(
endian::InlHostByteOrder(),
endian::InlHostByteOrder());
m_async_broadcaster.BroadcastEvent(
eBroadcastBitAsyncContinue,
new EventDataBytes(packet.GetString().data(), packet.GetSize()));
auto data_sp = std::make_shared<EventDataBytes>(packet.GetString().data(),
packet.GetSize());
m_async_broadcaster.BroadcastEvent(eBroadcastBitAsyncContinue, data_sp);
} else
SetExitStatus(-1, error.AsCString());
@ -1374,10 +1374,9 @@ Status ProcessGDBRemote::DoResume() {
return error;
}
m_async_broadcaster.BroadcastEvent(
eBroadcastBitAsyncContinue,
new EventDataBytes(continue_packet.GetString().data(),
continue_packet.GetSize()));
auto data_sp = std::make_shared<EventDataBytes>(
continue_packet.GetString().data(), continue_packet.GetSize());
m_async_broadcaster.BroadcastEvent(eBroadcastBitAsyncContinue, data_sp);
if (!listener_sp->GetEvent(event_sp, std::chrono::seconds(5))) {
error.SetErrorString("Resume timed out.");

6
lldb/source/Target/Process.cpp
View File

@ -4304,9 +4304,9 @@ void Process::BroadcastAsyncProfileData(const std::string &one_profile_data) {
void Process::BroadcastStructuredData(const StructuredData::ObjectSP &object_sp,
const StructuredDataPluginSP &plugin_sp) {
BroadcastEvent(
eBroadcastBitStructuredData,
new EventDataStructuredData(shared_from_this(), object_sp, plugin_sp));
auto data_sp = std::make_shared<EventDataStructuredData>(
shared_from_this(), object_sp, plugin_sp);
BroadcastEvent(eBroadcastBitStructuredData, data_sp);
}
StructuredDataPluginSP

15
lldb/source/Target/Target.cpp
View File

@ -1704,8 +1704,9 @@ void Target::ModulesDidLoad(ModuleList &module_list) {
if (m_process_sp) {
m_process_sp->ModulesDidLoad(module_list);
}
BroadcastEvent(eBroadcastBitModulesLoaded,
new TargetEventData(this->shared_from_this(), module_list));
auto data_sp =
std::make_shared<TargetEventData>(shared_from_this(), module_list);
BroadcastEvent(eBroadcastBitModulesLoaded, data_sp);
}
}
@ -1719,16 +1720,18 @@ void Target::SymbolsDidLoad(ModuleList &module_list) {
m_breakpoint_list.UpdateBreakpoints(module_list, true, false);
m_internal_breakpoint_list.UpdateBreakpoints(module_list, true, false);
BroadcastEvent(eBroadcastBitSymbolsLoaded,
new TargetEventData(this->shared_from_this(), module_list));
auto data_sp =
std::make_shared<TargetEventData>(shared_from_this(), module_list);
BroadcastEvent(eBroadcastBitSymbolsLoaded, data_sp);
}
}
void Target::ModulesDidUnload(ModuleList &module_list, bool delete_locations) {
if (m_valid && module_list.GetSize()) {
UnloadModuleSections(module_list);
BroadcastEvent(eBroadcastBitModulesUnloaded,
new TargetEventData(this->shared_from_this(), module_list));
auto data_sp =
std::make_shared<TargetEventData>(shared_from_this(), module_list);
BroadcastEvent(eBroadcastBitModulesUnloaded, data_sp);
m_breakpoint_list.UpdateBreakpoints(module_list, false, delete_locations);
m_internal_breakpoint_list.UpdateBreakpoints(module_list, false,
delete_locations);

15
lldb/source/Target/Thread.cpp
View File

@ -253,9 +253,11 @@ void Thread::DestroyThread() {
}
void Thread::BroadcastSelectedFrameChange(StackID &new_frame_id) {
if (EventTypeHasListeners(eBroadcastBitSelectedFrameChanged))
BroadcastEvent(eBroadcastBitSelectedFrameChanged,
new ThreadEventData(this->shared_from_this(), new_frame_id));
if (EventTypeHasListeners(eBroadcastBitSelectedFrameChanged)) {
auto data_sp =
std::make_shared<ThreadEventData>(shared_from_this(), new_frame_id);
BroadcastEvent(eBroadcastBitSelectedFrameChanged, data_sp);
}
}
lldb::StackFrameSP
@ -1507,9 +1509,10 @@ Status Thread::ReturnFromFrame(lldb::StackFrameSP frame_sp,
if (copy_success) {
thread->DiscardThreadPlans(true);
thread->ClearStackFrames();
if (broadcast && EventTypeHasListeners(eBroadcastBitStackChanged))
BroadcastEvent(eBroadcastBitStackChanged,
new ThreadEventData(this->shared_from_this()));
if (broadcast && EventTypeHasListeners(eBroadcastBitStackChanged)) {
auto data_sp = std::make_shared<ThreadEventData>(shared_from_this());
BroadcastEvent(eBroadcastBitStackChanged, data_sp);
}
} else {
return_error.SetErrorString("Could not reset register values.");
}

10
lldb/source/Target/ThreadList.cpp
View File

@ -726,10 +726,12 @@ bool ThreadList::SetSelectedThreadByIndexID(uint32_t index_id, bool notify) {
void ThreadList::NotifySelectedThreadChanged(lldb::tid_t tid) {
ThreadSP selected_thread_sp(FindThreadByID(tid));
if (selected_thread_sp->EventTypeHasListeners(
Thread::eBroadcastBitThreadSelected))
selected_thread_sp->BroadcastEvent(
Thread::eBroadcastBitThreadSelected,
new Thread::ThreadEventData(selected_thread_sp));
Thread::eBroadcastBitThreadSelected)) {
auto data_sp =
std::make_shared<Thread::ThreadEventData>(selected_thread_sp);
selected_thread_sp->BroadcastEvent(Thread::eBroadcastBitThreadSelected,
data_sp);
}
}
void ThreadList::Update(ThreadList &rhs) {

5
lldb/source/Utility/Broadcaster.cpp
View File

@ -300,9 +300,8 @@ void Broadcaster::BroadcasterImpl::PrivateBroadcastEvent(EventSP &event_sp,
}
}
void Broadcaster::BroadcasterImpl::BroadcastEvent(uint32_t event_type,
EventData *event_data) {
auto event_sp = std::make_shared<Event>(event_type, event_data);
void Broadcaster::BroadcasterImpl::BroadcastEvent(uint32_t event_type) {
auto event_sp = std::make_shared<Event>(event_type, /*data = */ nullptr);
PrivateBroadcastEvent(event_sp, false);
}