From 81e7eca28691eba4f150fb5022e5bd491f76be1b Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Fri, 7 Sep 2012 16:40:05 +0000 Subject: Fixed profiling to work under the new project layout git-svn-id: http://mc-server.googlecode.com/svn/trunk@844 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- VC2008/JsonCpp.vcproj | 2 +- VC2008/Lua.vcproj | 2 +- VC2008/MCServer.vcproj | 2 +- VC2008/Squirrel3.vcproj | 2 +- VC2008/ToLua.vcproj | 2 +- VC2008/WebServer.vcproj | 2 +- VC2008/profile_run.cmd | 38 +++++++++++++++++++++++++++++++++++--- VC2008/zlib.vcproj | 2 +- 8 files changed, 42 insertions(+), 10 deletions(-) (limited to 'VC2008') diff --git a/VC2008/JsonCpp.vcproj b/VC2008/JsonCpp.vcproj index 3cd921aa4..0c8f6ccc8 100644 --- a/VC2008/JsonCpp.vcproj +++ b/VC2008/JsonCpp.vcproj @@ -170,7 +170,7 @@ EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="../jsoncpp-src-0.5.0/include" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" - RuntimeLibrary="2" + RuntimeLibrary="0" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" WarningLevel="3" diff --git a/VC2008/Lua.vcproj b/VC2008/Lua.vcproj index c8bffdf8c..6e9a5fe87 100644 --- a/VC2008/Lua.vcproj +++ b/VC2008/Lua.vcproj @@ -167,7 +167,7 @@ Optimization="2" EnableIntrinsicFunctions="true" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS" - RuntimeLibrary="2" + RuntimeLibrary="0" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" WarningLevel="3" diff --git a/VC2008/MCServer.vcproj b/VC2008/MCServer.vcproj index bb37dc87c..7c6b901b5 100644 --- a/VC2008/MCServer.vcproj +++ b/VC2008/MCServer.vcproj @@ -200,7 +200,7 @@ WholeProgramOptimization="true" AdditionalIncludeDirectories=""../zlib-1.2.7";"../jsoncpp-src-0.5.0/include";"../lua-5.1.4/src";"../tolua++-1.0.93/include";../squirrel_3_0_1_stable/include;../squirrel_3_0_1_stable;../squirrel_3_0_1_stable/sqrat;.." PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;" - RuntimeLibrary="2" + RuntimeLibrary="0" UsePrecompiledHeader="2" PrecompiledHeaderThrough="Globals.h" WarningLevel="3" diff --git a/VC2008/Squirrel3.vcproj b/VC2008/Squirrel3.vcproj index 9eaaed9d2..928930842 100644 --- a/VC2008/Squirrel3.vcproj +++ b/VC2008/Squirrel3.vcproj @@ -166,7 +166,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories="../squirrel_3_0_1_stable/include" PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS" - RuntimeLibrary="2" + RuntimeLibrary="0" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" diff --git a/VC2008/ToLua.vcproj b/VC2008/ToLua.vcproj index ff2f4c277..b1210bb17 100644 --- a/VC2008/ToLua.vcproj +++ b/VC2008/ToLua.vcproj @@ -170,7 +170,7 @@ EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="../tolua++-1.0.93/include;../lua-5.1.4/src" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS" - RuntimeLibrary="2" + RuntimeLibrary="0" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" WarningLevel="3" diff --git a/VC2008/WebServer.vcproj b/VC2008/WebServer.vcproj index 8e7617c27..460f0920c 100644 --- a/VC2008/WebServer.vcproj +++ b/VC2008/WebServer.vcproj @@ -169,7 +169,7 @@ Optimization="2" EnableIntrinsicFunctions="true" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" - RuntimeLibrary="2" + RuntimeLibrary="0" EnableFunctionLevelLinking="true" UsePrecompiledHeader="2" PrecompiledHeaderThrough="Globals.h" diff --git a/VC2008/profile_run.cmd b/VC2008/profile_run.cmd index e2d9491e1..fa34ebd27 100644 --- a/VC2008/profile_run.cmd +++ b/VC2008/profile_run.cmd @@ -9,32 +9,64 @@ set pt="C:\Program Files\Microsoft Visual Studio 9.0\Team Tools\Performance Tools" -set app="vc2008\Release profiled\mcserver.exe" -set output=MCServer_profiledata.vsp +set appdir=..\MCServer +set app=MCServer.exe +:: outputdir is relative to appdir! +set outputdir=..\Profiling +set output=%outputdir%\profile.vsp + + + + + +:: Must cd to MCServer's directory so that it can find settings.ini etc. +cd %appdir% + +::Create the output directory, if it didn't exist +mkdir %outputdir% -cd .. :: Start the profiler %pt%\vsperfcmd /start:sample /output:%output% +if errorlevel 1 goto haderror :: Launch the application via the profiler %pt%\vsperfcmd /launch:%app% +if errorlevel 1 goto haderror :: Shut down the profiler (this command waits, until the application is terminated) %pt%\vsperfcmd /shutdown +if errorlevel 1 goto haderror +:: cd to outputdir, so that the reports are generated there +cd %outputdir% + :: generate the report files (.csv) %pt%\vsperfreport /summary:all %output% /symbolpath:"srv*C:\Programovani\Symbols*http://msdl.microsoft.com/download/symbols" +if errorlevel 1 goto haderror + + + + + +goto finished + + + +:haderror +echo An error was encountered +pause +:finished diff --git a/VC2008/zlib.vcproj b/VC2008/zlib.vcproj index 354cd6a46..adc62ac0b 100644 --- a/VC2008/zlib.vcproj +++ b/VC2008/zlib.vcproj @@ -169,7 +169,7 @@ Optimization="2" EnableIntrinsicFunctions="true" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS" - RuntimeLibrary="2" + RuntimeLibrary="0" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" WarningLevel="3" -- cgit v1.2.3