scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-21 08:40:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

output buffering: set explicitly

Browse Source 
Set output buffering to "line" for stdout and "no" for stderr. This is
the case usually but not always (eg. MSYS, GUI console) so make this
explicit to be deterministic.
This commit is contained in:
Martin Pulec
2022-06-29 15:52:35 +02:00
parent 26f85aee9d
commit d4775e375e
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/host.cpp
View File

@@ -73,6 +73,7 @@
#include <iostream>
#include <list>
#include <sstream>
#include <utility>
#if defined HAVE_X || defined BUILD_LIBRARIES
#include <dlfcn.h>
@@ -150,9 +151,9 @@ ADD_TO_PARAM("stderr-buf",
"* stderr-buf={no|line|full}\n"
" Buffering for stderr\n");
bool set_output_buffering() {
const unordered_map<const char *, FILE *> outs = {
{ "stdout-buf", stdout },
{ "stderr-buf", stderr }
const unordered_map<const char *, pair<FILE *, int>> outs = { // pair<output, default mode>
{ "stdout-buf", pair{stdout, _IOLBF} },
{ "stderr-buf", pair{stderr, _IONBF} }
};
for (auto outp : outs) {
if (get_commandline_param(outp.first)) {
@@ -165,15 +166,11 @@ bool set_output_buffering() {
log_msg(LOG_LEVEL_ERROR, "Wrong buffer type: %s\n", get_commandline_param(outp.first));
return false;
} else {
setvbuf(outp.second, NULL, it->second, 0);
setvbuf(outp.second.first, NULL, it->second, 0);
}
} else {
#ifdef _WIN32
if (rang::rang_implementation::isMsysPty(_fileno(outp.second))) {
cout << rang::fg::cyan << "MSYS terminal detected, setting \"--param " << outp.first << "=no\" automatically." << rang::fg::reset << endl;
setvbuf(outp.second, NULL, _IONBF, 0);
}
#endif
} else { // default
//if (rang::rang_implementation::isMsysPty(_fileno(outp.second))) {
setvbuf(outp.second.first, NULL, outp.second.second, 0);
}
}
return true;