Skip to content

🍒/austria/bfab18d86b27+5a27b99825a5+097d46f41c46+116715270d07+43374bee0e06+e618eb8727b0 #4043

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

Conversation

JDevlieghere
Copy link

  • [lldb] Remove "(i.e. ANSI)" from several property descriptions.
  • [lldb] Show progress events in the command line driver
  • [lldb] Add a setting to change the progress color
  • [lldb] Always move the cursor back after printing progress
  • [lldb] Undef GetMessage when including Windows.h
  • [lldb] A few small changes to HandleProgressEvent

Addresses Adrian's feedback from D121062.

(cherry picked from commit bfab18d)
This patch adds support for showing progress events when using lldb on
the command line. It spawns a separate thread that listens for progress
events and prints them to the debugger's output stream.

It's nothing fancy (yet), for now it just prints the progress message.
If we know the total number of items being processed, we prefix the
message with something like [1/100], similar to ninja's output.

This patch doesn't use any fancy terminal manipulation: it uses a simple
carriage return (\r) to bring the cursor to the front of the line and
vt100 escape codes to clear the (rest) of the line.

Differential revision: https://reviews.llvm.org/D120972

(cherry picked from commit 5a27b99)
Add a setting to change how progress is shown in a color enabled
terminal. This follows the existing -prefix, -suffix pattern
that's used elsewhere in lldb.

Differential revision: https://reviews.llvm.org/D121062

(cherry picked from commit 097d46f)
This got lost while iterating on the patch. We need to always move the
cursor to the front of the line so that if something else
(asynchronously) prints to the debugger's output it overwrites the
progress message.

(cherry picked from commit 1167152)
GetMessage is a define that can expand to GetMessageA (ANSI) or
GetMessageW (wide). Avoid the issue when including this header by
undef'ing the macro.

(cherry picked from commit 43374be)
Of course I only noticed these things *after* landing the original
patch...

 - Flush the output after clearing the line.
 - Move up the printing the carriage return to avoid duplication.
 - Use hexadecimal instead of octal for escape codes.

(cherry picked from commit e618eb8)
@JDevlieghere
Copy link
Author

@swift-ci please test

krasimirgg and others added 2 commits March 10, 2022 12:54
No functional changes intended.

(cherry picked from commit ad709bc)
We came to the conclusion that this doesn't matter for VSCode/Xcode
because they don't use the default event loop and that other clients
who might care should use the setting.

Differential revision: https://reviews.llvm.org/D120972

(cherry picked from commit c24199e)
@JDevlieghere
Copy link
Author

@swift-ci please test

@JDevlieghere
Copy link
Author

Failed Tests (1):
  Swift(watchsimulator-i386) :: Distributed/distributed_actor_accessor_thunks_64bit.swift

@swift-ci please test macos

1 similar comment
@JDevlieghere
Copy link
Author

Failed Tests (1):
  Swift(watchsimulator-i386) :: Distributed/distributed_actor_accessor_thunks_64bit.swift

@swift-ci please test macos

@JDevlieghere JDevlieghere merged commit 127e455 into stable/20211026 Mar 11, 2022
@JDevlieghere JDevlieghere deleted the 🍒/austria/bfab18d86b27+5a27b99825a5+097d46f41c46+116715270d07+43374bee0e06+e618eb8727b0 branch March 11, 2022 17:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants