Ticket #4056: profiler-fixheader.patch

File profiler-fixheader.patch, 17.0 KB (added by wraitii, 8 years ago)

Fix mistaken header in script.interface: should be SVN compatible

  • source/graphics/MapGenerator.cpp

     
    2121
    2222#include "lib/timer.h"
    2323#include "ps/CLogger.h"
     24#include "ps/Profile.h"
    2425
    2526
    2627// TODO: what's a good default? perhaps based on map size

  • source/graphics/scripting/JSInterface_GameView.cpp

     
    2121#include "graphics/GameView.h"
    2222#include "ps/Game.h"
    2323#include "ps/CLogger.h"
     24#include "ps/Profile.h"
    2425#include "scriptinterface/ScriptInterface.h"
    2526
    2627#define IMPLEMENT_BOOLEAN_SCRIPT_SETTING(NAME) \

  • source/gui/CList.cpp

     
    2323
    2424#include "lib/external_libraries/libsdl.h"
    2525#include "ps/CLogger.h"
     26#include "ps/Profile.h"
    2627#include "soundmanager/ISoundManager.h"
    2728
    2829

  • source/gui/IGUIObject.cpp

     
    2222#include "gui/scripting/JSInterface_GUITypes.h"
    2323#include "gui/scripting/JSInterface_IGUIObject.h"
    2424#include "ps/CLogger.h"
     25#include "ps/Profile.h"
    2526#include "scriptinterface/ScriptInterface.h"
    2627
    2728

  • source/gui/scripting/ScriptFunctions.cpp

     
    4949#include "ps/Globals.h" // g_frequencyFilter
    5050#include "ps/Hotkey.h"
    5151#include "ps/ProfileViewer.h"
     52#include "ps/Profile.h"
    5253#include "ps/Pyrogenesis.h"
    5354#include "ps/Replay.h"
    5455#include "ps/SavedGame.h"

  • source/i18n/scripting/JSInterface_L10n.cpp

     
    2222#include "i18n/L10n.h"
    2323#include "lib/utf8.h"
    2424
     25#include "ps/Profile.h"
     26
    2527// Returns a translation of the specified English string into the current language.
    2628std::wstring JSI_L10n::Translate(ScriptInterface::CxPrivate* UNUSED(pCxPrivate), const std::wstring& sourceString)
    2729{

  • source/lobby/scripting/JSInterface_Lobby.cpp

     
    2222#include "gui/GUIManager.h"
    2323#include "lib/utf8.h"
    2424#include "lobby/IXmppClient.h"
     25#include "ps/Profile.h"
    2526#include "scriptinterface/ScriptInterface.h"
    2627#include "third_party/encryption/pkcs5_pbkdf2.h"
    2728#include "third_party/encryption/sha.h"

  • source/network/NetServer.cpp

     
    2828#include "lib/external_libraries/enet.h"
    2929#include "ps/CLogger.h"
    3030#include "ps/ConfigDB.h"
     31#include "ps/Profile.h"
    3132#include "scriptinterface/ScriptInterface.h"
    3233#include "scriptinterface/ScriptRuntime.h"
    3334#include "simulation2/Simulation2.h"

  • source/network/NetSession.cpp

     
    2323#include "NetStats.h"
    2424#include "lib/external_libraries/enet.h"
    2525#include "ps/CLogger.h"
     26#include "ps/Profile.h"
    2627#include "scriptinterface/ScriptInterface.h"
    2728
    2829const u32 NETWORK_WARNING_TIMEOUT = 4000;

  • source/ps/CConsole.cpp

     
    4040#include "ps/Filesystem.h"
    4141#include "ps/Globals.h"
    4242#include "ps/Hotkey.h"
     43#include "ps/Profile.h"
    4344#include "ps/Pyrogenesis.h"
    4445#include "renderer/Renderer.h"
    4546#include "scriptinterface/ScriptInterface.h"

  • source/ps/GameSetup/HWDetect.cpp

     
    3838#include "ps/CLogger.h"
    3939#include "ps/ConfigDB.h"
    4040#include "ps/Filesystem.h"
     41#include "ps/Profile.h"
    4142#include "ps/UserReport.h"
    4243#include "ps/VideoMode.h"
    4344#include "ps/GameSetup/Config.h"

  • source/ps/scripting/JSInterface_ConfigDB.cpp

     
    2121
    2222#include "ps/ConfigDB.h"
    2323#include "ps/CLogger.h"
     24#include "ps/Profile.h"
    2425#include "scriptinterface/ScriptInterface.h"
    2526
    2627bool JSI_ConfigDB::GetConfigNamespace(const std::wstring& cfgNsString, EConfigNamespace& cfgNs)

  • source/ps/scripting/JSInterface_Console.cpp

     
    2121#include "JSInterface_Console.h"
    2222#include "ps/CConsole.h"
    2323#include "ps/CLogger.h"
     24#include "ps/Profile.h"
    2425
    2526bool JSI_Console::CheckGlobalInitialized()
    2627{   

  • source/ps/scripting/JSInterface_Mod.cpp

     
    2727#include "ps/GameSetup/GameSetup.h"
    2828#include "ps/GameSetup/Paths.h"
    2929#include "ps/Mod.h"
     30#include "ps/Profile.h"
    3031#include "ps/scripting/JSInterface_Mod.h"
    3132
    3233#include <algorithm>

  • source/ps/scripting/JSInterface_VisualReplay.cpp

     
    1717
    1818#include "precompiled.h"
    1919
     20#include "ps/Profile.h"
    2021#include "ps/VisualReplay.h"
    2122#include "ps/scripting/JSInterface_VisualReplay.h"
    2223

  • source/renderer/scripting/JSInterface_Renderer.cpp

     
    1919
    2020#include "JSInterface_Renderer.h"
    2121#include "renderer/Renderer.h"
     22#include "ps/Profile.h"
    2223
    2324#define IMPLEMENT_BOOLEAN_SCRIPT_SETTING(NAME, SCRIPTNAME) \
    2425bool JSI_Renderer::Get##SCRIPTNAME##Enabled(ScriptInterface::CxPrivate* UNUSED(pCxPrivate)) \

  • source/scriptinterface/ScriptInterface.h

     
    2626#include "ScriptTypes.h"
    2727#include "ScriptVal.h"
    2828#include "ps/Errors.h"
    29 #include "ps/Profile.h"
    3029
    3130ERROR_GROUP(Scripting);
    3231ERROR_TYPE(Scripting, SetupFailed);

  • source/simulation2/components/CCmpAIManager.cpp

     
    2828#include "lib/allocators/shared_ptr.h"
    2929#include "ps/CLogger.h"
    3030#include "ps/Filesystem.h"
     31#include "ps/Profile.h"
    3132#include "ps/Util.h"
    3233#include "simulation2/components/ICmpAIInterface.h"
    3334#include "simulation2/components/ICmpCommandQueue.h"

  • source/simulation2/components/CCmpCommandQueue.cpp

     
    2222
    2323#include "ps/CLogger.h"
    2424#include "ps/Game.h"
     25#include "ps/Profile.h"
    2526#include "network/NetTurnManager.h"
    2627
    2728class CCmpCommandQueue : public ICmpCommandQueue

  • source/simulation2/components/CCmpDecay.cpp

     
    2020#include "simulation2/system/Component.h"
    2121#include "ICmpDecay.h"
    2222
     23#include "ps/Profile.h"
     24
    2325#include "simulation2/MessageTypes.h"
    2426
    2527#include "ICmpPosition.h"
    … …  
    129131        {
    130132        case MT_Interpolate:
    131133        {
    132             PROFILE3("Decay::Interpolate");
     134            PROFILE("Decay::Interpolate");
    133135
    134136            if (!m_Active)
    135137                break;

  • source/simulation2/components/CCmpOverlayRenderer.cpp

     
    2828#include "renderer/Renderer.h"
    2929
    3030#include "ps/CLogger.h"
     31#include "ps/Profile.h"
    3132
    3233class CCmpOverlayRenderer : public ICmpOverlayRenderer
    3334{
    … …  
    7980        {
    8081        case MT_Interpolate:
    8182        {
    82             PROFILE3("OverlayRenderer::Interpolate");
     83            PROFILE("OverlayRenderer::Interpolate");
    8384            const CMessageInterpolate& msgData = static_cast<const CMessageInterpolate&> (msg);
    8485            Interpolate(msgData.deltaSimTime, msgData.offset);
    8586            break;
    … …  
    8687        }
    8788        case MT_RenderSubmit:
    8889        {
    89             PROFILE3("OverlayRenderer::RenderSubmit");
     90            PROFILE("OverlayRenderer::RenderSubmit");
    9091            const CMessageRenderSubmit& msgData = static_cast<const CMessageRenderSubmit&> (msg);
    9192            RenderSubmit(msgData.collector);
    9293            break;

  • source/simulation2/components/CCmpPathfinder_Vertex.cpp

     
    513513    entity_pos_t x0, entity_pos_t z0, entity_pos_t clearance,
    514514    entity_pos_t range, const PathGoal& goal, pass_class_t passClass, WaypointPath& path)
    515515{
    516     PROFILE3("ComputeShortPath");
     516    PROFILE("ComputeShortPath");
    517517
    518518    m_DebugOverlayShortPathLines.clear();
    519519

  • source/simulation2/components/CCmpPosition.cpp

     
    3434#include "maths/Vector3D.h"
    3535#include "maths/Vector2D.h"
    3636#include "ps/CLogger.h"
     37#include "ps/Profile.h"
    3738
    3839/**
    3940 * Basic ICmpPosition implementation.
    … …  
    758759        {
    759760        case MT_Interpolate:
    760761        {
    761             PROFILE3("Position::Interpolate");
     762            PROFILE("Position::Interpolate");
    762763
    763764            const CMessageInterpolate& msgData = static_cast<const CMessageInterpolate&> (msg);
    764765

  • source/simulation2/components/CCmpRallyPointRenderer.cpp

     
    3535#include "simulation2/system/Component.h"
    3636
    3737#include "ps/CLogger.h"
     38#include "ps/Profile.h"
     39
    3840#include "graphics/Overlay.h"
    3941#include "graphics/TextureManager.h"
    4042#include "renderer/Renderer.h"
    … …  
    217219        {
    218220        case MT_RenderSubmit:
    219221            {
    220                 PROFILE3("RallyPoint::RenderSubmit");
     222                PROFILE("RallyPoint::RenderSubmit");
    221223                if (m_Displayed && IsSet())
    222224                {
    223225                    const CMessageRenderSubmit& msgData = static_cast<const CMessageRenderSubmit&> (msg);

  • source/simulation2/components/CCmpRangeManager.cpp

     
    16491649
    16501650    void UpdateVisibilityData()
    16511651    {
    1652         PROFILE("UpdateVisibilityData");
     1652        PROFILE3("UpdateVisibilityData");
    16531653
    16541654        for (i32 n = 0; n < m_LosTilesPerSide * m_LosTilesPerSide; ++n)
    16551655        {

  • source/simulation2/components/CCmpSelectable.cpp

     
    2727#include "maths/Matrix3D.h"
    2828#include "maths/Vector3D.h"
    2929#include "maths/Vector2D.h"
     30#include "ps/Profile.h"
    3031#include "renderer/Scene.h"
    3132#include "renderer/Renderer.h"
    3233#include "simulation2/MessageTypes.h"
    … …  
    288289    {
    289290    case MT_Interpolate:
    290291    {
    291         PROFILE3("Selectable::Interpolate");
     292        PROFILE("Selectable::Interpolate");
    292293
    293294        const CMessageInterpolate& msgData = static_cast<const CMessageInterpolate&> (msg);
    294295
    … …  
    362363        break;
    363364    case MT_RenderSubmit:
    364365    {
    365         PROFILE3("Selectable::RenderSubmit");
     366        PROFILE("Selectable::RenderSubmit");
    366367
    367368        const CMessageRenderSubmit& msgData = static_cast<const CMessageRenderSubmit&> (msg);
    368369        RenderSubmit(msgData.collector);

  • source/simulation2/components/CCmpTerritoryManager.cpp

     
    2525#include "graphics/TextureManager.h"
    2626#include "graphics/TerritoryBoundary.h"
    2727#include "maths/MathUtil.h"
     28#include "ps/Profile.h"
    2829#include "ps/XML/Xeromyces.h"
    2930#include "renderer/Renderer.h"
    3031#include "renderer/Scene.h"

  • source/simulation2/components/CCmpTest.cpp

     
    2020#include "simulation2/system/Component.h"
    2121#include "ICmpTest.h"
    2222
     23#include "ps/Profile.h"
    2324#include "simulation2/scripting/ScriptComponent.h"
    2425#include "simulation2/MessageTypes.h"
    2526

  • source/simulation2/components/CCmpUnitMotion.cpp

     
    395395        }
    396396        case MT_RenderSubmit:
    397397        {
    398             PROFILE3("UnitMotion::RenderSubmit");
     398            PROFILE("UnitMotion::RenderSubmit");
    399399            const CMessageRenderSubmit& msgData = static_cast<const CMessageRenderSubmit&> (msg);
    400400            RenderSubmit(msgData.collector);
    401401            break;

  • source/simulation2/components/CCmpUnitRenderer.cpp

     
    3535#include "graphics/Unit.h"
    3636#include "maths/BoundingSphere.h"
    3737#include "maths/Matrix3D.h"
     38#include "ps/Profile.h"
    3839#include "renderer/Scene.h"
    3940
    4041#include "tools/atlas/GameInterface/GameLoop.h"

  • source/simulation2/components/tests/test_scripts.h

     
    1818#include "simulation2/system/ComponentTest.h"
    1919
    2020#include "ps/Filesystem.h"
     21#include "ps/Profile.h"
    2122
    2223class TestComponentScripts : public CxxTest::TestSuite
    2324{

  • source/simulation2/system/InterfaceScripted.h

     
    1919#define INCLUDED_INTERFACE_SCRIPTED
    2020
    2121#include "scriptinterface/ScriptInterface.h"
     22#include "ps/Profile.h"
    2223
    2324#define BEGIN_INTERFACE_WRAPPER(iname) \
    2425    JSClass class_ICmp##iname = { \

  • source/soundmanager/scripting/JSInterface_Sound.cpp

     
    2323#include "lib/utf8.h"
    2424#include "maths/Vector3D.h"
    2525#include "ps/Filesystem.h"
     26#include "ps/Profile.h"
    2627#include "soundmanager/SoundManager.h"
    2728
    2829#include <sstream>

  • source/test_setup.cpp

     
    3535
    3636#include "lib/timer.h"
    3737#include "lib/sysdep/sysdep.h"
    38 #include "ps/Profiler2.h"
     38#include "ps/Profile.h"
    3939#include "scriptinterface/ScriptInterface.h"
    4040
    4141class LeakReporter : public CxxTest::GlobalFixture