diff --git a/xmrstak/config.tpl b/xmrstak/config.tpl index 34f7656333f90698569f8686c0d3e92c3d8e3a10..14330a829f483a6262742eaae95c4f5939b84c1c 100644 --- a/xmrstak/config.tpl +++ b/xmrstak/config.tpl @@ -113,14 +113,6 @@ R"===( */ "daemon_mode" : false, -/* - * Buffered output control. - * When running the miner through a pipe, standard output is buffered. This means that the pipe won't read - * each output line immediately. This can cause delays when running in background. - * Set this option to true to flush stdout after each line, so it can be read immediately. - */ -"flush_stdout" : false, - /* * Output file * diff --git a/xmrstak/jconf.cpp b/xmrstak/jconf.cpp index c35fb51fdddcaa5711e3f638dcc41425935b41ee..33750c36ea61b5827b2e1ef73781afda01eb4fa8 100644 --- a/xmrstak/jconf.cpp +++ b/xmrstak/jconf.cpp @@ -52,7 +52,7 @@ using namespace rapidjson; */ enum configEnum { aPoolList, sCurrency, bTlsSecureAlgo, iCallTimeout, iNetRetry, iGiveUpLimit, iVerboseLevel, bPrintMotd, iAutohashTime, - bFlushStdout, bDaemonMode, sOutputFile, iHttpdPort, sHttpLogin, sHttpPass, bPreferIpv4, bAesOverride, sUseSlowMem + bDaemonMode, sOutputFile, iHttpdPort, sHttpLogin, sHttpPass, bPreferIpv4, bAesOverride, sUseSlowMem }; struct configVal { @@ -73,7 +73,6 @@ configVal oConfigValues[] = { { iVerboseLevel, "verbose_level", kNumberType }, { bPrintMotd, "print_motd", kTrueType }, { iAutohashTime, "h_print_time", kNumberType }, - { bFlushStdout, "flush_stdout", kTrueType}, { bDaemonMode, "daemon_mode", kTrueType }, { sOutputFile, "output_file", kStringType }, { iHttpdPort, "httpd_port", kNumberType }, @@ -607,16 +606,6 @@ bool jconf::parse_config(const char* sFilename, const char* sFilenamePools) } #endif // _WIN32 - if (prv->configValues[bFlushStdout]->IsBool()) - { - bool bflush = prv->configValues[bFlushStdout]->GetBool(); - printer::inst()->set_flush_stdout(bflush); - if (bflush) - { - printer::inst()->print_msg(L0, "Flush stdout forced."); - } - } - std::string ctmp = GetMiningCoin(); std::transform(ctmp.begin(), ctmp.end(), ctmp.begin(), ::tolower); diff --git a/xmrstak/misc/console.cpp b/xmrstak/misc/console.cpp index 7b14b4f8654f2489252c278b20b85e3d85f48486..4eaa08b14794c909d6119ce3ef9913d29a410b75 100644 --- a/xmrstak/misc/console.cpp +++ b/xmrstak/misc/console.cpp @@ -156,7 +156,6 @@ printer::printer() { verbose_level = LINF; logfile = nullptr; - b_flush_stdout = false; } bool printer::open_logfile(const char* file) @@ -193,11 +192,7 @@ void printer::print_msg(verbosity verbose, const char* fmt, ...) std::unique_lock<std::mutex> lck(print_mutex); fputs(buf, stdout); - - if (b_flush_stdout) - { - fflush(stdout); - } + fflush(stdout); if(logfile != nullptr) { @@ -210,11 +205,7 @@ void printer::print_str(const char* str) { std::unique_lock<std::mutex> lck(print_mutex); fputs(str, stdout); - - if (b_flush_stdout) - { - fflush(stdout); - } + fflush(stdout); if(logfile != nullptr) { @@ -223,7 +214,7 @@ void printer::print_str(const char* str) } } -//Do a press any key for the windows folk. *insert any key joke here* +// Do a press any key for the windows folk. *insert any key joke here* #ifdef _WIN32 void win_exit(int code) { diff --git a/xmrstak/misc/console.hpp b/xmrstak/misc/console.hpp index 671763105fe70a97c9741d181d4077eabd8df455..5d78772c3ea87a094f41e9c180c799d3982fbb5e 100644 --- a/xmrstak/misc/console.hpp +++ b/xmrstak/misc/console.hpp @@ -35,7 +35,6 @@ public: }; inline void set_verbose_level(size_t level) { verbose_level = (verbosity)level; } - inline void set_flush_stdout(bool status) { b_flush_stdout = status; } void print_msg(verbosity verbose, const char* fmt, ...); void print_str(const char* str); bool open_logfile(const char* file); @@ -45,7 +44,6 @@ private: std::mutex print_mutex; verbosity verbose_level; - bool b_flush_stdout; FILE* logfile; };