Skip to content

Commit de74756

Browse files
committed
[lldb] Remove LogHandler::Create functions (NFC)
Remove the LogHandler::Create functions. Except for the StreamHandler they were just forwarding their arguments to std::make_shared.
1 parent 8eeede9 commit de74756

File tree

3 files changed

+9
-29
lines changed

3 files changed

+9
-29
lines changed

lldb/include/lldb/Utility/Log.h

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,10 @@ class LogHandler {
5858

5959
class StreamLogHandler : public LogHandler {
6060
public:
61-
StreamLogHandler(int fd, bool should_close, bool unbuffered);
61+
StreamLogHandler(int fd, bool should_close, bool unbuffered = true);
6262

6363
void Emit(llvm::StringRef message) override;
6464

65-
static std::shared_ptr<StreamLogHandler> Create(int fd, bool unbuffered);
66-
6765
private:
6866
llvm::raw_fd_ostream m_stream;
6967
};
@@ -74,9 +72,6 @@ class CallbackLogHandler : public LogHandler {
7472

7573
void Emit(llvm::StringRef message) override;
7674

77-
static std::shared_ptr<CallbackLogHandler>
78-
Create(lldb::LogOutputCallback callback, void *baton);
79-
8075
private:
8176
lldb::LogOutputCallback m_callback;
8277
void *m_baton;
@@ -89,8 +84,6 @@ class RotatingLogHandler : public LogHandler {
8984
void Emit(llvm::StringRef message) override;
9085
void Dump(llvm::raw_ostream &stream) const;
9186

92-
static std::shared_ptr<RotatingLogHandler> Create(size_t size);
93-
9487
private:
9588
size_t NormalizeIndex(size_t i) const;
9689
size_t GetNumMessages() const;

lldb/source/Core/Debugger.cpp

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -757,7 +757,8 @@ Debugger::Debugger(lldb::LogOutputCallback log_callback, void *baton)
757757
m_forward_listener_sp(), m_clear_once() {
758758
m_instance_name.SetString(llvm::formatv("debugger_{0}", GetID()).str());
759759
if (log_callback)
760-
m_callback_handler_sp = CallbackLogHandler::Create(log_callback, baton);
760+
m_callback_handler_sp =
761+
std::make_shared<CallbackLogHandler>(log_callback, baton);
761762
m_command_interpreter_up->Initialize();
762763
// Always add our default platform to the platform list
763764
PlatformSP default_platform_sp(Platform::GetHostPlatform());
@@ -1290,7 +1291,8 @@ void Debugger::SetLoggingCallback(lldb::LogOutputCallback log_callback,
12901291
// For simplicity's sake, I am not going to deal with how to close down any
12911292
// open logging streams, I just redirect everything from here on out to the
12921293
// callback.
1293-
m_callback_handler_sp = CallbackLogHandler::Create(log_callback, baton);
1294+
m_callback_handler_sp =
1295+
std::make_shared<CallbackLogHandler>(log_callback, baton);
12941296
}
12951297

12961298
static void PrivateReportProgress(Debugger &debugger, uint64_t progress_id,
@@ -1417,8 +1419,8 @@ bool Debugger::EnableLog(llvm::StringRef channel,
14171419
log_options |=
14181420
LLDB_LOG_OPTION_PREPEND_TIMESTAMP | LLDB_LOG_OPTION_PREPEND_THREAD_NAME;
14191421
} else if (log_file.empty()) {
1420-
log_handler_sp = StreamLogHandler::Create(GetOutputFile().GetDescriptor(),
1421-
!should_close);
1422+
log_handler_sp = std::make_shared<StreamLogHandler>(
1423+
GetOutputFile().GetDescriptor(), !should_close);
14221424
} else {
14231425
auto pos = m_stream_handlers.find(log_file);
14241426
if (pos != m_stream_handlers.end())
@@ -1438,8 +1440,8 @@ bool Debugger::EnableLog(llvm::StringRef channel,
14381440
return false;
14391441
}
14401442

1441-
log_handler_sp =
1442-
StreamLogHandler::Create((*file)->GetDescriptor(), should_close);
1443+
log_handler_sp = std::make_shared<StreamLogHandler>(
1444+
(*file)->GetDescriptor(), should_close);
14431445
m_stream_handlers[log_file] = log_handler_sp;
14441446
}
14451447
}

lldb/source/Utility/Log.cpp

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -347,12 +347,6 @@ void StreamLogHandler::Emit(llvm::StringRef message) {
347347
m_stream.flush();
348348
}
349349

350-
std::shared_ptr<StreamLogHandler> StreamLogHandler::Create(int fd,
351-
bool should_close) {
352-
constexpr const bool unbuffered = true;
353-
return std::make_shared<StreamLogHandler>(fd, should_close, unbuffered);
354-
}
355-
356350
CallbackLogHandler::CallbackLogHandler(lldb::LogOutputCallback callback,
357351
void *baton)
358352
: m_callback(callback), m_baton(baton) {}
@@ -361,11 +355,6 @@ void CallbackLogHandler::Emit(llvm::StringRef message) {
361355
m_callback(message.data(), m_baton);
362356
}
363357

364-
std::shared_ptr<CallbackLogHandler>
365-
CallbackLogHandler::Create(lldb::LogOutputCallback callback, void *baton) {
366-
return std::make_shared<CallbackLogHandler>(callback, baton);
367-
}
368-
369358
RotatingLogHandler::RotatingLogHandler(size_t size)
370359
: m_messages(std::make_unique<std::string[]>(size)), m_size(size) {}
371360

@@ -395,7 +384,3 @@ void RotatingLogHandler::Dump(llvm::raw_ostream &stream) const {
395384
}
396385
stream.flush();
397386
}
398-
399-
std::shared_ptr<RotatingLogHandler> RotatingLogHandler::Create(size_t size) {
400-
return std::make_shared<RotatingLogHandler>(size);
401-
}

0 commit comments

Comments
 (0)