Skip to content
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

Make individual print calls thread safe #1290

Open
wants to merge 17 commits into
base: main
Choose a base branch
from
Open

Make individual print calls thread safe #1290

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
8acdd51
Make printing thread safe
Thomas1664 Nov 28, 2023
834af9e
[WIP] Add Console class
Thomas1664 Dec 16, 2023
950dec4
Merge branch 'main' into thread-safe-print
Thomas1664 Dec 16, 2023
f9ec46b
Merge branch 'main' of https://github.com/microsoft/vcpkg-tool into t…
Thomas1664 Apr 28, 2024
bb8f6b6
Finish Console implementation
Thomas1664 Apr 28, 2024
30958be
Fix include
Thomas1664 Apr 28, 2024
6c9b436
fix msg::println
Thomas1664 Apr 28, 2024
f7a1365
Fixes
Thomas1664 Apr 28, 2024
b4164ed
format
Thomas1664 Apr 28, 2024
36610e3
fix attribute error
Thomas1664 Apr 28, 2024
3995a51
use fdatasync
Thomas1664 Apr 28, 2024
faaf02f
add missing !
Thomas1664 Apr 28, 2024
0cb5e68
use fsync
Thomas1664 Apr 28, 2024
362dd6b
Fix print to stderr
Thomas1664 Apr 28, 2024
415fbc7
revert unneeded changes
Thomas1664 Apr 28, 2024
2af3640
format
Thomas1664 Apr 28, 2024
b1a4a0d
improve clarity
Thomas1664 Apr 30, 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
15 changes: 11 additions & 4 deletions src/vcpkg/base/messages.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,9 +307,12 @@ namespace vcpkg::msg
{
if (sv.empty()) return;

static std::mutex mtx;

if (is_console)
{
WORD original_color = 0;
std::lock_guard lck(mtx);
if (c != Color::none)
{
CONSOLE_SCREEN_BUFFER_INFO console_screen_buffer_info{};
Expand Down Expand Up @@ -340,6 +343,7 @@ namespace vcpkg::msg
{
const char* pointer = sv.data();
::size_t size = sv.size();
std::lock_guard lck(mtx);

while (size != 0)
{
Expand All @@ -365,14 +369,15 @@ namespace vcpkg::msg
return write_unlocalized_text_impl(c, sv, stderr_handle, stderr_is_console);
}
#else
static void write_all(const char* ptr, size_t to_write, int fd)
static void write_all(const char* ptr, size_t to_write, int fd, std::unique_lock<std::mutex>& lck)
{
while (to_write != 0)
{
auto written = ::write(fd, ptr, to_write);
if (written == -1)
{
::fprintf(stderr, "[DEBUG] Failed to print to stdout: %d\n", errno);
lck.unlock();
Thomas1664 marked this conversation as resolved.
Show resolved Hide resolved
std::abort();
}
ptr += written;
Expand All @@ -383,23 +388,25 @@ namespace vcpkg::msg
static void write_unlocalized_text_impl(Color c, StringView sv, int fd, bool is_a_tty)
{
static constexpr char reset_color_sequence[] = {'\033', '[', '0', 'm'};
static std::mutex mtx;

if (sv.empty()) return;

std::unique_lock<std::mutex> lck(mtx);
bool reset_color = false;
if (is_a_tty && c != Color::none)
{
reset_color = true;

const char set_color_sequence[] = {'\033', '[', '9', static_cast<char>(c), 'm'};
write_all(set_color_sequence, sizeof(set_color_sequence), fd);
write_all(set_color_sequence, sizeof(set_color_sequence), fd, lck);
}

write_all(sv.data(), sv.size(), fd);
write_all(sv.data(), sv.size(), fd, lck);

if (reset_color)
{
write_all(reset_color_sequence, sizeof(reset_color_sequence), fd);
write_all(reset_color_sequence, sizeof(reset_color_sequence), fd, lck);
}
}

Expand Down