Skip to content

[lldb] Remove Listener::SetShadow #97555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 8, 2024
Merged

[lldb] Remove Listener::SetShadow #97555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f81f80
[lldb] Remove Listener::SetShadow
labath Jul 3, 2024
7259eab
rid of log
labath Jul 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions lldb/include/lldb/Utility/Listener.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,6 @@ class Listener : public std::enable_shared_from_this<Listener> {

size_t HandleBroadcastEvent(lldb::EventSP &event_sp);

void SetShadow(bool is_shadow) { m_is_shadow = is_shadow; }

private:
// Classes that inherit from Listener can see and modify these
struct BroadcasterInfo {
Expand Down Expand Up @@ -132,7 +130,6 @@ class Listener : public std::enable_shared_from_this<Listener> {
std::mutex m_events_mutex; // Protects m_broadcasters and m_events
std::condition_variable m_events_condition;
broadcaster_manager_collection m_broadcaster_managers;
bool m_is_shadow = false;

void BroadcasterWillDestruct(Broadcaster *);

Expand Down
8 changes: 1 addition & 7 deletions lldb/source/API/SBAttachInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,13 +266,7 @@ SBListener SBAttachInfo::GetShadowListener() {
void SBAttachInfo::SetShadowListener(SBListener &listener) {
LLDB_INSTRUMENT_VA(this, listener);

ListenerSP listener_sp = listener.GetSP();
if (listener_sp && listener.IsValid())
listener_sp->SetShadow(true);
else
listener_sp = nullptr;

m_opaque_sp->SetShadowListener(listener_sp);
m_opaque_sp->SetShadowListener(listener.GetSP());
}

const char *SBAttachInfo::GetScriptedProcessClassName() const {
Expand Down
8 changes: 1 addition & 7 deletions lldb/source/API/SBLaunchInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,11 +402,5 @@ SBListener SBLaunchInfo::GetShadowListener() {
void SBLaunchInfo::SetShadowListener(SBListener &listener) {
LLDB_INSTRUMENT_VA(this, listener);

ListenerSP listener_sp = listener.GetSP();
if (listener_sp && listener.IsValid())
listener_sp->SetShadow(true);
else
listener_sp = nullptr;

m_opaque_sp->SetShadowListener(listener_sp);
m_opaque_sp->SetShadowListener(listener.GetSP());
}
16 changes: 5 additions & 11 deletions lldb/source/Utility/Listener.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,16 @@
using namespace lldb;
using namespace lldb_private;

Listener::Listener(const char *name)
: m_name(name), m_broadcasters(), m_broadcasters_mutex(), m_events(),
m_events_mutex(), m_is_shadow() {
Log *log = GetLog(LLDBLog::Object);
if (log != nullptr)
LLDB_LOGF(log, "%p Listener::Listener('%s')", static_cast<void *>(this),
m_name.c_str());
Listener::Listener(const char *name) : m_name(name) {
LLDB_LOGF(GetLog(LLDBLog::Object), "%p Listener::Listener('%s')",
static_cast<void *>(this), m_name.c_str());
}

Listener::~Listener() {
Log *log = GetLog(LLDBLog::Object);

// Don't call Clear() from here as that can cause races. See #96750.

LLDB_LOGF(log, "%p Listener::%s('%s')", static_cast<void *>(this),
__FUNCTION__, m_name.c_str());
LLDB_LOGF(GetLog(LLDBLog::Object), "%p Listener::%s('%s')",
static_cast<void *>(this), __FUNCTION__, m_name.c_str());
}

void Listener::Clear() {
Expand Down
Loading