Skip to content

Commit 45dbce3

Browse files
authored
[lldb] Wrap LLDBLog Initialize/Terminate in a class (NFC) (#184469)
This matches what we do for all the other log channels (GDB Remote, POSIX, Windows, KDP, etc).
1 parent 53fbbaa commit 45dbce3

3 files changed

Lines changed: 9 additions & 10 deletions

File tree

lldb/include/lldb/Utility/LLDBLog.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,11 @@ enum class LLDBLog : Log::MaskType {
5656

5757
LLVM_ENABLE_BITMASK_ENUMS_IN_NAMESPACE();
5858

59-
void InitializeLLDBChannel();
60-
void TerminateLLDBChannel();
59+
class LLDBLogChannel {
60+
public:
61+
static void Initialize();
62+
static void Terminate();
63+
};
6164

6265
template <> Log::Channel &LogChannelFor<LLDBLog>();
6366
} // namespace lldb_private

lldb/source/Initialization/SystemInitializerCommon.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@ llvm::Error SystemInitializerCommon::Initialize() {
6262
}
6363
#endif
6464

65-
InitializeLLDBChannel();
66-
65+
LLDBLogChannel::Initialize();
6766
Diagnostics::Initialize();
6867
FileSystem::Initialize();
6968
HostInfo::Initialize();
@@ -105,6 +104,5 @@ void SystemInitializerCommon::Terminate() {
105104
Log::DisableAllLogChannels();
106105
FileSystem::Terminate();
107106
Diagnostics::Terminate();
108-
109-
TerminateLLDBChannel();
107+
LLDBLogChannel::Terminate();
110108
}

lldb/source/Utility/LLDBLog.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,6 @@ template <> Log::Channel &lldb_private::LogChannelFor<LLDBLog>() {
8484
return g_log_channel;
8585
}
8686

87-
void lldb_private::InitializeLLDBChannel() {
88-
Log::Register("lldb", g_log_channel);
89-
}
87+
void LLDBLogChannel::Initialize() { Log::Register("lldb", g_log_channel); }
9088

91-
void lldb_private::TerminateLLDBChannel() { Log::Unregister("lldb"); }
89+
void LLDBLogChannel::Terminate() { Log::Unregister("lldb"); }

0 commit comments

Comments
 (0)