forked from llvm/llvm-project
-
Notifications
You must be signed in to change notification settings - Fork 345
🍒 [windows][lldb] implement system logging on Windows (#150213) #11096
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.
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
Open
charles-zablit
wants to merge
1
commit into
swiftlang:swift/release/6.2
Choose a base branch
from
charles-zablit:charles-zablit/lldb/windows/fix-verbose-health-logs-windows-to-6.2
base: swift/release/6.2
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -22,7 +22,9 @@ | |
#include "lldb/Utility/StreamString.h" | ||
#include "lldb/Utility/StructuredData.h" | ||
|
||
#include "llvm/ADT/StringRef.h" | ||
#include "llvm/Support/ConvertUTF.h" | ||
#include "llvm/Support/ManagedStatic.h" | ||
|
||
// Windows includes | ||
#include <tlhelp32.h> | ||
|
@@ -302,3 +304,64 @@ Environment Host::GetEnvironment() { | |
} | ||
return env; | ||
} | ||
|
||
/// Manages the lifecycle of a Windows Event's Source. | ||
/// The destructor will call DeregisterEventSource. | ||
/// This class is meant to be used with \ref llvm::ManagedStatic. | ||
class WindowsEventLog { | ||
public: | ||
WindowsEventLog() : handle(RegisterEventSource(nullptr, L"lldb")) {} | ||
|
||
~WindowsEventLog() { | ||
if (handle) | ||
DeregisterEventSource(handle); | ||
} | ||
|
||
HANDLE GetHandle() const { return handle; } | ||
|
||
private: | ||
HANDLE handle; | ||
}; | ||
|
||
static llvm::ManagedStatic<WindowsEventLog> event_log; | ||
|
||
static std::wstring AnsiToUtf16(const std::string &ansi) { | ||
if (ansi.empty()) | ||
return {}; | ||
|
||
const int unicode_length = | ||
MultiByteToWideChar(CP_ACP, 0, ansi.c_str(), -1, nullptr, 0); | ||
if (unicode_length == 0) | ||
return {}; | ||
|
||
std::wstring unicode(unicode_length, L'\0'); | ||
MultiByteToWideChar(CP_ACP, 0, ansi.c_str(), -1, &unicode[0], unicode_length); | ||
return unicode; | ||
} | ||
|
||
void Host::SystemLog(Severity severity, llvm::StringRef message) { | ||
HANDLE h = event_log->GetHandle(); | ||
if (!h) | ||
return; | ||
|
||
std::wstring wide_message = AnsiToUtf16(message.str()); | ||
if (wide_message.empty()) | ||
return; | ||
|
||
LPCWSTR msg_ptr = wide_message.c_str(); | ||
|
||
WORD event_type; | ||
switch (severity) { | ||
case lldb::eSeverityWarning: | ||
event_type = EVENTLOG_WARNING_TYPE; | ||
break; | ||
case lldb::eSeverityError: | ||
event_type = EVENTLOG_ERROR_TYPE; | ||
break; | ||
case lldb::eSeverityInfo: | ||
default: | ||
event_type = EVENTLOG_INFORMATION_TYPE; | ||
} | ||
|
||
ReportEventW(h, event_type, 0, 0, nullptr, 1, 0, &msg_ptr, nullptr); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is this really the best place to put the messages? The Event Log is for system events, this feels more developer oriented and feels like the kernel debug buffer might be better ( |
||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why re-implement
UTF8ToUTF16
andUTF16ToUTF8
from LLVM?