0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix performance of MSVC OpenMP builds

Browse source 
Instead of idling at 100% CPU usage, we're back at 4-5%.

For VC2010, an additional hotfix has to be applied to the dll files: http://support.microsoft.com/en-us/kb/2689322
This commit is contained in:
aquileia 2015-03-14 06:40:30 +01:00
parent c6230014a4
commit 659b9a4141
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
projectfiles/VC9/WML_tests.cmd
View file

@ -4,6 +4,9 @@
@echo off
setlocal enabledelayedexpansion
:: if OMP_WAIT_POLICY isn't set, the process restarts itself and !ERRORLEVEL!=0
set OMP_WAIT_POLICY=PASSIVE
:: save file paths and command line arguments
cd ..\..\
set LoadFile=wml_test_schedule

12
src/wesnoth.cpp
View file

@ -103,6 +103,9 @@
#undef INADDR_NONE
#endif
#include <windows.h>
#if defined(_OPENMP) && _MSC_VER >= 1600
#include <process.h>
#endif
#endif
#ifdef DEBUG_WINDOW_LAYOUT_GRAPHS
@ -900,7 +903,7 @@ int main(int argc, char** argv)
VLDEnable();
#endif
#if defined(_OPENMP) && !defined(_WIN32) && !defined(__APPLE__)
#ifdef _OPENMP
// Wesnoth is a special case for OMP
// OMP wait strategy is to have threads busy-loop for 100ms
// if there is nothing to do, they then go to sleep.
@ -913,11 +916,18 @@ int main(int argc, char** argv)
// To avoid that problem, we need to set the OMP_WAIT_POLICY env var
// but that var is read by OMP at library loading time (before main)
// thus the relaunching of ourselves after setting the variable.
#if !defined(_WIN32) && !defined(__APPLE__)
if (!getenv("OMP_WAIT_POLICY")) {
setenv("OMP_WAIT_POLICY", "PASSIVE", 1);
execv(argv[0], argv);
}
#elif _MSC_VER >= 1600
if (!getenv("OMP_WAIT_POLICY")) {
_putenv_s("OMP_WAIT_POLICY", "PASSIVE");
_execv(argv[0], argv);
}
#endif
#endif //_OPENMP
#ifdef _WIN32
(void)argc;
(void)argv;