diff --git a/dynare++/kord/journal.cc b/dynare++/kord/journal.cc index 8a0c810ee..b0bf7a4aa 100644 --- a/dynare++/kord/journal.cc +++ b/dynare++/kord/journal.cc @@ -7,6 +7,7 @@ #include #include #include +#include #ifndef _WIN32 # include // For getrusage() @@ -72,16 +73,6 @@ SystemResources::availablePhysicalPages() #endif } -long -SystemResources::onlineProcessors() -{ -#ifndef _WIN32 - return sysconf(_SC_NPROCESSORS_ONLN); -#else - return -1; // FIXME -#endif -} - long SystemResources::availableMemory() { @@ -226,11 +217,12 @@ Journal::printHeader() utsname info; uname(&info); *this << info.sysname << " " << info.release << " " << info.version << " " - << info.machine << ", processors online: " << SystemResources::onlineProcessors(); + << info.machine; #else - *this << "(not implemented for MinGW)"; + *this << "Windows"; #endif - *this << "\n\nStart time: "; + *this << ", processors online: " << std::thread::hardware_concurrency() + << "\n\nStart time: "; std::time_t t = std::time(nullptr); *this << std::put_time(std::localtime(&t), "%c %Z") << "\n\n" diff --git a/dynare++/kord/journal.hh b/dynare++/kord/journal.hh index 04a8afa9c..11c37f746 100644 --- a/dynare++/kord/journal.hh +++ b/dynare++/kord/journal.hh @@ -23,7 +23,6 @@ struct SystemResources static long pageSize(); static long physicalPages(); static long availablePhysicalPages(); - static long onlineProcessors(); static long availableMemory(); double load_avg;