s416496/musique
1
0
Fork 0
Code Issues 3 Pull Requests 1 Projects Releases Wiki Activity

Don't deadlock during nested evaluation in print context

Browse Source 
Lock for stdout should only hold when things are ready to be printed.
This prevents any double locking issues
This commit is contained in:
Robert Bendun 2022-11-24 01:23:31 +01:00
parent 381f79f63c
commit c509b6ccc5
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
musique/main.cc
View File

@ -191,12 +191,19 @@ struct Runner
Env::global->force_define("print", +[](Interpreter &interpreter, std::vector<Value> args) -> Result<Value> { Env::global->force_define("print", +[](Interpreter &interpreter, std::vector<Value> args) -> Result<Value> {
static std::mutex stdio_mutex; static std::mutex stdio_mutex;
std::lock_guard guard{stdio_mutex};
for (auto it = args.begin(); it != args.end(); ++it) { for (auto it = args.begin(); it != args.end(); ++it) {
std::cout << Try(format(interpreter, *it)); {
if (std::next(it) != args.end()) auto result = Try(format(interpreter, *it));
std::lock_guard guard{stdio_mutex};
std::cout << result;
}
if (std::next(it) != args.end()) {
std::lock_guard guard{stdio_mutex};
std::cout << ' '; std::cout << ' ';
}
} }
std::lock_guard guard{stdio_mutex};
std::cout << std::endl; std::cout << std::endl;
return {}; return {};
}); });